Changed to continue processing on error

fixpoint · Oct 26, 2024 · ce41ab9 · ce41ab9
1 parent 3e85615
commit ce41ab9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/commands/rm.ts b/src/commands/rm.ts
@@ -56,11 +56,13 @@ export default class Rm extends Command {
     if (!options.force) {
       const result = await KeClient.get(this.conf, target)
       if (result === null) {
-	throw new Error(`failed to remove: '${target}' is not found`)
+	this.warn(`failed to remove: '${target}' is not found`)
+	return
       }
 
       if (result.type_object === DIRECTORY_TYPE) {
-	throw new Error(`failed to remove: '${target}' is a directory`)
+	this.warn(`failed to remove: '${target}' is a directory`)
+	return
       }
     }
 

diff --git a/src/commands/rmdir.ts b/src/commands/rmdir.ts
@@ -56,17 +56,20 @@ export default class Rmdir extends Command {
     const result = await KeClient.get(this.conf, targetDir)
 
     if (result === null) {
-      throw new Error(`failed to remove directory: '${targetDir}' is not found`)
+      this.warn(`failed to remove directory: '${targetDir}' is not found`)
+      return
     }
 
     if (result.type_object !== DIRECTORY_TYPE) {
-      throw new Error(`failed to remove directory: '${targetDir}' is not a directory`)      
+      this.warn(`failed to remove directory: '${targetDir}' is not a directory`)
+      return
     }
 
     // ディレクトリが空かどうかチェックする
     const results = await KeClient.getAll(this.conf, `${targetDir}.children`)
     if (results!.count > 0) {
-      throw new Error(`failed to remove directory: '${targetDir}' is not empty`)      
+      this.warn(`failed to remove directory: '${targetDir}' is not empty`)
+      return
     }
 
     await KeClient.del(this.conf, targetDir)