X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/aa798f2c8355594c0a3b01a2595308fbe7dc7694..22c8d6e6bacfa3323049a8a084e10ff0f495a9fc:/picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 4f04c05..6608edf 100644
--- a/picsorter.js
+++ b/picsorter.js
@@ -174,8 +174,16 @@ function shell_escape(x) {
 function show_commands() {
   var commands = [];
   $.each(files, function(i, f) {
-    if ("name" in picinfo[f] && picinfo[f].name.length > 0 &&
-        !("deleted" in picinfo[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("rm " + escaped_filename);
+        return;
+      }
+      if (picinfo[f].deleted == "extra") {
+        commands.push("mv " + escaped_filename + " \"$EXTRADIR\"");
+        return;
+      }
       var command = ["pic-mv"];
       if ("exposure" in picinfo[f]) {
         command.push("-e " + picinfo[f].exposure);
@@ -184,7 +192,7 @@ function show_commands() {
         command.push("-r " + picinfo[f].rotate);
       }
       command.push("'" + shell_escape(f) + "'");
-      command.push("'" + shell_escape(picinfo[f].name) + "'");
+      command.push(escaped_filename);
       commands.push(command.join(" "));
     }
   });
@@ -211,6 +219,8 @@ Mousetrap.bind('0', move_to_begenning);
 Mousetrap.bind('$', move_to_end);
 Mousetrap.bind('x', function(){ mark_deleted("deleted"); });
 Mousetrap.bind('X', mark_not_deleted);
+Mousetrap.bind('e', function(){ mark_deleted("extra"); });
+Mousetrap.bind('E', mark_not_deleted);
 Mousetrap.bind('r', rotate);
 Mousetrap.bind('i', announce);
 Mousetrap.bind('f', function() { say(files[input_index]); });