Move with mv -vi

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index be0371afdd078a122e5eea6d526edc1210e116cb..5eee6c18b634a5b322d5ec75a49a265267ab1d38 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -176,16 +176,12 @@ function shell_escape(x) {
 function show_commands() {
   var commands = [];
   $.each(files, function(i, f) {
-    if ("name" in picinfo[f] && picinfo[f].name.length > 0) {
-      var escaped_filename = "'" + shell_escape(picinfo[f].name) + "'";
-      if (picinfo[f].deleted == "deleted") {
-        commands.push("shred -u " + escaped_filename);
-        return;
-      }
-      if (picinfo[f].deleted == "extra") {
-        commands.push("mv " + escaped_filename + " \"$EXTRADIR\"");
-        return;
-      }
+    var escaped_filename = "'" + shell_escape(f) + "'";
+    if (picinfo[f].deleted == "deleted") {
+      commands.push("shred -u " + escaped_filename);
+    } else if (picinfo[f].deleted == "extra") {
+      commands.push("mv -vi " + escaped_filename + " \"$EXTRADIR\"");
+    } else if ("name" in picinfo[f] && picinfo[f].name.length > 0) {
       var command = ["pic-mv"];
       if ("exposure" in picinfo[f]) {
         command.push("-e " + picinfo[f].exposure);
@@ -193,8 +189,8 @@ function show_commands() {
       if ("rotate" in picinfo[f]) {
         command.push("-r " + picinfo[f].rotate);
       }
-      command.push("'" + shell_escape(f) + "'");
       command.push(escaped_filename);
+      command.push("'" + shell_escape(picinfo[f].name) + "'");
       commands.push(command.join(" "));
     }
   });