Update Exec.php (#1153)

* support multiple paths, space separated, use requests check rather than split
* Update app/Locale/German.php

app/Actions/Import/FromServer.php

@@ -10,13 +10,13 @@
 class FromServer
 {
 	/**
-	 * @param string     $path       the server path to import from
+	 * @param string[]   $paths      the server path to import from
 	 * @param Album|null $album      the album to import into
 	 * @param ImportMode $importMode the import mode
 	 *
 	 * @return StreamedResponse
 	 */
-	public function do(string $path, ?Album $album, ImportMode $importMode): StreamedResponse
+	public function do(array $paths, ?Album $album, ImportMode $importMode): StreamedResponse
 	{
 		$exec = new Exec($importMode, false, $this->determineMemLimit());
 
@@ -25,10 +25,12 @@ public function do(string $path, ?Album $album, ImportMode $importMode): Streame
 		$response->headers->set('Cache-Control', 'no-store');
 		// nginx-specific voodoo, as per https://symfony.com/doc/current/components/http_foundation.html#streaming-a-response
 		$response->headers->set('X-Accel-Buffering', 'no');
-		$response->setCallback(function () use ($path, $album, $exec) {
+		$response->setCallback(function () use ($paths, $album, $exec) {
 			// Surround the response by `[]` to make it a valid JSON array.
 			echo '[';
-			$exec->do($path, $album);
+			foreach ($paths as $path) {
+				$exec->do($path, $album);
+			}
 			echo ']';
 		});
 

app/Console/Commands/Sync.php

@@ -27,7 +27,7 @@ class Sync extends Command
 	 */
 	protected $signature =
 	'lychee:sync ' .
-		'{dir : directory to sync} ' . // string
+		'{dir* : directory to sync} ' . // string[]
 		'{--album_id= : Album ID to import to} ' . // string or null
 		'{--owner_id=0 : Owner ID of imported photos} ' . // string
 		'{--resync_metadata : Re-sync metadata of existing files}  ' . // bool
@@ -71,9 +71,9 @@ public function __construct()
 	public function handle(): int
 	{
 		try {
-			$directory = $this->argument('dir');
-			if (is_array($directory) || $directory === null) {
-				$this->error('Synchronize one folder at a time.');
+			$directories = $this->argument('dir');
+			if (!is_array($directories)) {
+				$this->error('List of directories not recognized.');
 
 				return 1;
 			}
@@ -114,10 +114,12 @@ public function handle(): int
 
 			$this->info('Start syncing.');
 
-			try {
-				$exec->do($directory, $album);
-			} catch (Exception $e) {
-				$this->error($e);
+			foreach ($directories as $directory) {
+				try {
+					$exec->do($directory, $album);
+				} catch (Exception $e) {
+					$this->error($e);
+				}
 			}
 
 			$this->info('Done syncing.');

app/Http/Controllers/ImportController.php

@@ -67,7 +67,7 @@ public function url(ImportFromUrlRequest $request, FromUrl $fromUrl): Collection
 	public function server(ImportServerRequest $request, FromServer $fromServer): StreamedResponse
 	{
 		return $fromServer->do(
-			$request->path(), $request->album(), $request->importMode()
+			$request->paths(), $request->album(), $request->importMode()
 		);
 	}
 

app/Http/Requests/Import/ImportServerRequest.php

@@ -17,13 +17,15 @@ class ImportServerRequest extends BaseApiRequest implements HasAlbum
 {
 	use HasAlbumTrait;
 
-	public const PATH_ATTRIBUTE = 'path';
+	public const PATH_ATTRIBUTE = 'paths';
 	public const DELETE_IMPORTED_ATTRIBUTE = 'delete_imported';
 	public const SKIP_DUPLICATES_ATTRIBUTE = 'skip_duplicates';
 	public const IMPORT_VIA_SYMLINK_ATTRIBUTE = 'import_via_symlink';
 	public const RESYNC_METADATA_ATTRIBUTE = 'resync_metadata';
 
-	protected string $path;
+	/** @var string[] */
+	protected array $paths;
+
 	protected ImportMode $importMode;
 
 	/**
@@ -45,7 +47,8 @@ public function rules(): array
 	{
 		return [
 			HasAbstractAlbum::ALBUM_ID_ATTRIBUTE => ['present', new RandomIDRule(true)],
-			self::PATH_ATTRIBUTE => 'required|string',
+			self::PATH_ATTRIBUTE => 'required|array|min:1',
+			self::PATH_ATTRIBUTE . '.*' => 'required|string|distinct',
 			self::DELETE_IMPORTED_ATTRIBUTE => 'sometimes|boolean',
 			self::SKIP_DUPLICATES_ATTRIBUTE => 'sometimes|boolean',
 			self::IMPORT_VIA_SYMLINK_ATTRIBUTE => 'sometimes|boolean',
@@ -62,7 +65,7 @@ protected function processValidatedValues(array $values, array $files): void
 		$this->album = $albumID === null ?
 			null :
 			Album::query()->findOrFail($albumID);
-		$this->path = $values[self::PATH_ATTRIBUTE];
+		$this->paths = $values[self::PATH_ATTRIBUTE];
 		$this->importMode = new ImportMode(
 			isset($values[self::DELETE_IMPORTED_ATTRIBUTE]) ?
 				static::toBoolean($values[self::DELETE_IMPORTED_ATTRIBUTE]) :
@@ -78,9 +81,12 @@ protected function processValidatedValues(array $values, array $files): void
 		);
 	}
 
-	public function path(): string
+	/**
+	 * @return string[]
+	 */
+	public function paths(): array
 	{
-		return $this->path;
+		return $this->paths;
 	}
 
 	public function importMode(): ImportMode

app/Locale/ChineseSimplified.php

@@ -437,8 +437,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => '导入',
 			'UPLOAD_IMPORT_SERVER' => '从服务器导入',
 			'UPLOAD_IMPORT_SERVER_FOLD' => '文件夹为空或其中没有可读的文件。请查看日志（设置->显示日志）以获取详细信息。',
-			'UPLOAD_IMPORT_SERVER_INSTR' => '此操作将会导入位于下列目录中的所有图片、文件夹和子文件夹。',
-			'UPLOAD_ABSOLUTE_PATH' => '目录的绝对路径',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => '无法导入空文件夹！',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => '删除原始图像',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => '原始图像将在导入后尝试删除。',

app/Locale/ChineseTraditional.php

@@ -436,8 +436,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => '導入',
 			'UPLOAD_IMPORT_SERVER' => '從伺服器導入',
 			'UPLOAD_IMPORT_SERVER_FOLD' => '文件夾中沒有可讀的文件。請查看日誌（設置->顯示日誌）以獲取詳細信息。',
-			'UPLOAD_IMPORT_SERVER_INSTR' => '此操作將導入位於以下目錄中的所有照片，文件夾和子文件夾。',
-			'UPLOAD_ABSOLUTE_PATH' => '絕對路徑',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => '無法導入空文件夾！',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => '刪除原件',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => '如果可能，原始文件將在導入後刪除。',

app/Locale/Czech.php

@@ -443,8 +443,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Importovat',
 			'UPLOAD_IMPORT_SERVER' => 'Import ze serveru',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Složka je prázdná nebo neobsahuje soubory, které lze zpracovat. Podrobnosti si prosím prohlédněte v protokolu (Nastavení -> Protokoly).',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Tato akce importuje všechny fotografie, včetně složek a podsložek, které jsou v uvedeném umístění k dispozici.',
-			'UPLOAD_ABSOLUTE_PATH' => 'Absolutní cesta ke složce',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Import neproběhl, protože složka je prázdná!',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Odstranit původní soubory',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'Pokud to bude možné, původní soubory budou po importu odstraněny.',

app/Locale/Dutch.php

@@ -436,8 +436,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Import',
 			'UPLOAD_IMPORT_SERVER' => 'Importing from server',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Folder empty or no readable files to process. Please take a look at the log (Settings -> Laat logs zien) voor meer informatie.',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Deze actie importeert alle foto\'s, folders en sub-folders vanuit de volgende folder.',
-			'UPLOAD_ABSOLUTE_PATH' => 'Absoluut pad naar de folder',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Kan de import niet starten, folder is leeg!',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Delete originals',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'De orginele bestanden worden verwijderd na de import indien mogelijk.',

app/Locale/English.php

@@ -437,8 +437,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Import',
 			'UPLOAD_IMPORT_SERVER' => 'Importing from server',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Folder empty or no readable files to process. Please take a look at the log (Settings -> Show Log) for further details.',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folder with the following absolute path (on server):',
-			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directory',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Could not start import because the folder was empty!',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Delete originals',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'Original files will be deleted after the import when possible.',

app/Locale/French.php

@@ -436,8 +436,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Importer',
 			'UPLOAD_IMPORT_SERVER' => 'Importation à partir du serveur',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Dossier vide ou aucun fichier lisible à traiter. Veuillez consulter le journal (Paramètres -> Afficher le journal) pour obtenir plus de détails.',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Cette action importera toutes les photos ainsi que tous les dossiers et sous-dossiers situés dans le répertoire suivant.',
-			'UPLOAD_ABSOLUTE_PATH' => 'Chemin absolu du répertoire',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Cette action importera toutes les photos ainsi que tous les dossiers et sous-dossiers situés dans les répertoires suivants séparés par des espaces. Utilisez \\ pour les espaces dans les chemins.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Chemin absolu des répertoires, séparés par des espaces',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Impossible de démarrer l’importation car le dossier était vide !',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Supprimer les originaux',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'Les fichiers originaux seront supprimés après l’importation lorsque cela est possible.',

app/Locale/German.php

@@ -445,8 +445,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Importieren',
 			'UPLOAD_IMPORT_SERVER' => 'Importieren von Server',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Der Ordner ist leer oder enthält keine lesbaren Dateien zum Verarbeiten. Schauen Sie bitte ins Protokoll (Einstellungen/Protokoll ansehen).',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Diese Aktion wird alle Fotos, Ordner und Unterordner importieren, die sich in folgendem Verzeichnis befinden.',
-			'UPLOAD_ABSOLUTE_PATH' => 'Absoluter Pfad zum Verzeichnis',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Importiert alle Fotos, Ordner und Unterordner in den folgenden absoluten Pfaden (auf dem Server). Mehrere Pfade können mit Leerzeichen getrennt werden; mit \\ können Sie ein Leerzeichen im Pfad verwenden.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute Pfade zu Verzeichnissen, mit Leerzeichen getrennt',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Konnte Import nicht starten, weil der Ordner leer ist.',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Originale löschen',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'Die Originaldateien werden nach dem Import gelöscht, falls möglich.',

app/Locale/Greek.php

@@ -436,8 +436,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Εισαγωγή',
 			'UPLOAD_IMPORT_SERVER' => 'Γίνεται εισαγωγή από εξυπηρετητή',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Ο φάκελος είναι άδειος ή μη αναγνώσιμα αρχεία προς επεξεργασία. Παρακαλούμε ρίξτε μια ματία στις καταγραφές (Ρυθμίσεις -> Εμφάνιση Καταγραφών) για περισσότερες λεπτομέρειες.',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Αυτή η ενέργεια θα εισάγει όλες τις φωτογραφίες, φακέλους και υπο-φακέλους οι οποίοι βρίσκονται στον παρακάτω κατάλογο.',
-			'UPLOAD_ABSOLUTE_PATH' => 'Απόλυτη διαδρομή του καταλόγου',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Δεν ήταν δυνατό να ξεκινήσει η διαδικασία εισαγωγής, διότι ο κατάλογος ήταν άδειος!',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Διαγραφή πρωτότυπων',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'Αν είναι εφικτό τα πρωτότυπα αρχεία θα διαγραφούν αφού ολοκληρωθεί η εισαγωγή τους.',

app/Locale/Italian.php

@@ -440,8 +440,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Importa',
 			'UPLOAD_IMPORT_SERVER' => 'Importa da server',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Cartella vuota o nessun file leggibile da elaborare. Per favore controlla il log (Impostazioni -> Visualizza Log) per ulteriori dettagli.',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Questa azione importerà tutte le foto, cartelle e sottocartelle presenti nella seguente directory.',
-			'UPLOAD_ABSOLUTE_PATH' => 'Percorso assoluto alla directory',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'È stato impossibile avviare l\'importazione dato che la cartella era vuota!',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Delete originals',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'I file originali saranno eliminati dopo l\'importazione se possibile.',

app/Locale/NorwegianBokmal.php

@@ -437,8 +437,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Importer',
 			'UPLOAD_IMPORT_SERVER' => 'Importer fra server',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Mappen er tom eller inneholder ingen lesbare filer som kan behandles. Vennligst se loggen (Innstillinger -> Vis Logg) for mer informasjon.',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Denne handlingen vil importere alle bilder, mapper, og undermapper som er plassert i følgende mappe.',
-			'UPLOAD_ABSOLUTE_PATH' => 'Full sti til mappen',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Kunne ikke starte importeringen siden mappen var tom!',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Fjern originalene',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'De opprinnelige filene vil bli fjernet etter importeringen når mulig.',

app/Locale/Polish.php

@@ -437,8 +437,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Import',
 			'UPLOAD_IMPORT_SERVER' => 'Importing from server',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Folder empty or no readable files to process. Please take a look at the log (Settings -> Show Log) for further details.',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'This action will import all photos, folders and sub-folders which are located in the following directory.',
-			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directory',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Could not start import because the folder was empty!',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Delete originals',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'Original files will be deleted after the import when possible.',

app/Locale/Portuguese.php

@@ -438,8 +438,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Importar',
 			'UPLOAD_IMPORT_SERVER' => 'A importar do servidor',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Pasta vazia ou sem ficheiros legíveis para processar. Por favor, dá uma vista de olhos no log (Configurações -> Mostrar Log) para mais detalhes.',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Importar todas as fotografias, pastas e sub-pastas localizadas na pasta com o seguinte caminho absoluto (no servidor):',
-			'UPLOAD_ABSOLUTE_PATH' => 'Caminho absoluto para o diretório',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Não foi conseguido iniciar a importação porque a pasta estava vazia!',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Eliminar originais',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'Ficheiros originais vão ser eliminados depois da importação assim que possível.',

app/Locale/Russian.php

@@ -437,8 +437,8 @@ public function get_locale(): array
 			'UPLOAD_IMPORT' => 'Импорт',
 			'UPLOAD_IMPORT_SERVER' => 'Загрузка с сервера',
 			'UPLOAD_IMPORT_SERVER_FOLD' => 'Каталог пуст или не содержит файлов, которые можно обработать. Пожалуйста, проверьте лог (Settings -> Логи).',
-			'UPLOAD_IMPORT_SERVER_INSTR' => 'Будет выполнен импорт всех изображений из указанного каталога и всех его подкаталогов, после чего <b>исходные файлы будут удалены</b>, если это возможно.',
-			'UPLOAD_ABSOLUTE_PATH' => 'Полный путь к каталогу',
+			'UPLOAD_IMPORT_SERVER_INSTR' => 'Import all photos, folders and sub-folders located in the folders with the following absolute paths (on server). Paths are space separated, use \\ to escape a space in a path.',
+			'UPLOAD_ABSOLUTE_PATH' => 'Absolute path to directories, space separated',
 			'UPLOAD_IMPORT_SERVER_EMPT' => 'Не могу импортировать: указанный каталог пуст!',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS' => 'Delete originals',
 			'UPLOAD_IMPORT_DELETE_ORIGINALS_EXPL' => 'Original files will be deleted after the import when possible.',