chore: remove import functionality from cli

cli/src/commands/upload.ts

@@ -67,25 +67,10 @@ export default class Upload extends BaseCommand {
       });
 
       try {
-        if (options.import) {
-          const importData = {
-            assetPath: asset.path,
-            sidecarPath: asset.sidecarPath,
-            deviceAssetId: asset.deviceAssetId,
-            deviceId: this.deviceId,
-            fileCreatedAt: asset.fileCreatedAt,
-            fileModifiedAt: asset.fileModifiedAt,
-            isFavorite: false,
-            isReadOnly: options.readOnly,
-          };
-
-          if (!this.dryRun) {
-            await this.uploadService.import(importData);
-          }
-        } else {
-          await this.uploadAsset(asset, options.skipHash);
-        }
+        await this.uploadAsset(asset, options.skipHash);
       } catch (error) {
+        // Immediately halt on an upload error
+        // TODO: In the future, we might retry and do exponential backoff for certain errors
         uploadProgress.stop();
         throw error;
       }
@@ -108,31 +93,27 @@ export default class Upload extends BaseCommand {
       messageStart = 'Successfully ';
     }
 
-    if (options.import) {
-      console.log(`${messageStart} imported ${uploadCounter} assets (${byteSize(totalSizeUploaded)})`);
+    if (uploadCounter === 0) {
+      console.log('All assets were already uploaded, nothing to do.');
     } else {
-      if (uploadCounter === 0) {
-        console.log('All assets were already uploaded, nothing to do.');
+      console.log(`${messageStart} uploaded ${uploadCounter} assets (${byteSize(totalSizeUploaded)})`);
+    }
+    if (options.delete) {
+      if (this.dryRun) {
+        console.log(`Would now have deleted assets, but skipped due to dry run`);
       } else {
-        console.log(`${messageStart} uploaded ${uploadCounter} assets (${byteSize(totalSizeUploaded)})`);
-      }
-      if (options.delete) {
-        if (this.dryRun) {
-          console.log(`Would now have deleted assets, but skipped due to dry run`);
-        } else {
-          console.log('Deleting assets that have been uploaded...');
-          const deletionProgress = new cliProgress.SingleBar(cliProgress.Presets.shades_classic);
-          deletionProgress.start(crawledFiles.length, 0);
+        console.log('Deleting assets that have been uploaded...');
+        const deletionProgress = new cliProgress.SingleBar(cliProgress.Presets.shades_classic);
+        deletionProgress.start(crawledFiles.length, 0);
 
-          for (const asset of assetsToUpload) {
-            if (!this.dryRun) {
-              await asset.delete();
-            }
-            deletionProgress.increment();
+        for (const asset of assetsToUpload) {
+          if (!this.dryRun) {
+            await asset.delete();
           }
-          deletionProgress.stop();
-          console.log('Deletion complete');
+          deletionProgress.increment();
         }
+        deletionProgress.stop();
+        console.log('Deletion complete');
       }
     }
   }

cli/src/cores/dto/upload-options-dto.ts

@@ -4,6 +4,5 @@ export class UploadOptionsDto {
   dryRun = false;
   skipHash = false;
   delete = false;
-  import = false;
   readOnly = true;
 }

cli/src/index.ts

@@ -26,25 +26,6 @@ program
     await new Upload().run(paths, options);
   });
 
-program
-  .command('import')
-  .description('Import existing assets (Deprecated in favor of external libraries)')
-  .usage('[options] [paths...]')
-  .addOption(new Option('-r, --recursive', 'Recursive').env('IMMICH_RECURSIVE').default(false))
-  .addOption(
-    new Option('-n, --dry-run', "Don't perform any actions, just show what will be done")
-      .env('IMMICH_DRY_RUN')
-      .default(false),
-  )
-  .addOption(new Option('-i, --ignore [paths...]', 'Paths to ignore').env('IMMICH_IGNORE_PATHS').default(false))
-  .addOption(new Option('--no-read-only', 'Import files without read-only protection, allowing Immich to manage them'))
-  .argument('[paths...]', 'One or more paths to assets to be imported')
-  .action(async (paths, options) => {
-    options.import = true;
-    options.excludePatterns = options.ignore;
-    await new Upload().run(paths, options);
-  });
-
 program
   .command('server-info')
   .description('Display server information')

cli/src/services/upload.service.ts

@@ -5,7 +5,6 @@ import { ApiConfiguration } from '../cores/api-configuration';
 export class UploadService {
   private readonly uploadConfig: AxiosRequestConfig<any>;
   private readonly checkAssetExistenceConfig: AxiosRequestConfig<any>;
-  private readonly importConfig: AxiosRequestConfig<any>;
 
   constructor(apiConfiguration: ApiConfiguration) {
     this.uploadConfig = {
@@ -19,18 +18,6 @@ export class UploadService {
       maxBodyLength: Number.POSITIVE_INFINITY,
     };
 
-    this.importConfig = {
-      method: 'post',
-      maxRedirects: 0,
-      url: `${apiConfiguration.instanceUrl}/asset/import`,
-      headers: {
-        'x-api-key': apiConfiguration.apiKey,
-        'Content-Type': 'application/json',
-      },
-      maxContentLength: Number.POSITIVE_INFINITY,
-      maxBodyLength: Number.POSITIVE_INFINITY,
-    };
-
     this.checkAssetExistenceConfig = {
       method: 'post',
       maxRedirects: 0,
@@ -55,11 +42,4 @@ export class UploadService {
     // TODO: retry on 500 errors?
     return axios(this.uploadConfig);
   }
-
-  public import(data: any) {
-    this.importConfig.data = data;
-
-    // TODO: retry on 500 errors?
-    return axios(this.importConfig);
-  }
 }