Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Sync.php #1086

Merged
merged 3 commits into from
Aug 17, 2021
Merged

Update Sync.php #1086

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4e878a
Update Sync.php
pchampio Aug 14, 2021
18680b7
Update Sync.php
pchampio Aug 14, 2021
312a801
Improve CLI arguments and their evaluation.
nagmat84 Aug 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions app/Console/Commands/Sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,20 @@ class Sync extends Command
/**
* The name and signature of the console command.
*
* The placeholder %s will be filled by the constructor with the default
* value from the user configuration.
*
* @var string
*/
protected $signature = 'lychee:sync {dir : directory to sync} {--album_id=0 : Album ID to import to} {--owner_id=0 : Owner ID of imported photos} {--resync_metadata : Re-sync metadata of existing files}';
protected $signature =
'lychee:sync ' .
'{dir : directory to sync} ' .
'{--album_id=0 : Album ID to import to} ' .
'{--owner_id=0 : Owner ID of imported photos} ' .
'{--resync_metadata : Re-sync metadata of existing files} ' .
'{--delete_imported=%s : Delete the original files} ' .
'{--import_via_symlink=%s : Imports photos from via a symlink instead of copying the files} ' .
'{--skip_duplicates=%s : Don\'t Skip photos and albums if they already exist in the gallery}';

/**
* The console command description.
Expand All @@ -24,28 +35,48 @@ class Sync extends Command
*/
protected $description = 'Sync a directory to lychee';

public function __construct()
{
// Fill signature with default values from user configuration
$this->signature = sprintf(
$this->signature,
Configs::get_value('delete_imported', '0'),
Configs::get_value('import_via_symlink', '0'),
Configs::get_value('skip_duplicates', '0')
);
parent::__construct();
}

/**
* Execute the console command.
*
* @return mixed
*/
public function handle(Exec $exec)
{
$this->info('Start syncing.');
$directory = $this->argument('dir');
$owner_id = (int) $this->option('owner_id'); // in case no ID provided -> import as root user
$album_id = (int) $this->option('album_id'); // in case no ID provided -> import to root folder

// Enable CLI formatting of status
$exec->statusCLIFormatting = true;
$exec->memCheck = false;
$exec->delete_imported = false; // we want to sync -> do not delete imported files
$exec->import_via_symlink = (Configs::get_value('import_via_symlink', '0') === '1');
$exec->skip_duplicates = true;
$exec->resync_metadata = $this->option('resync_metadata');
$exec->delete_imported = $this->option('delete_imported') === '1';
$exec->import_via_symlink = $this->option('import_via_symlink') === '1';
$exec->skip_duplicates = $this->option('skip_duplicates') === '1';

if ($exec->import_via_symlink && $exec->delete_imported) {
$this->error('The settings for import via symbolic links and deletion of imported files are conflicting');
$this->info(' Use --import_via_symlink={0|1} and --delete-imported={0|1} explicitly to apply a conflict-free setting');

return 1;
}

AccessControl::log_as_id($owner_id);

$this->info('Start syncing.');

try {
$exec->do($directory, $album_id);
} catch (Exception $e) {
Expand Down