Emit 'rm' commands for deleted pictures

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 4f04c056f124dce00d34a393c2f205d7ba0b434b..bbd255419f384ead2252414a22acaa438aee8246 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -174,8 +174,12 @@ function shell_escape(x) {
 function show_commands() {
   var commands = [];
   $.each(files, function(i, f) {
 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;
+      }

       var command = ["pic-mv"];
       if ("exposure" in picinfo[f]) {
         command.push("-e " + picinfo[f].exposure);
       var command = ["pic-mv"];
       if ("exposure" in picinfo[f]) {
         command.push("-e " + picinfo[f].exposure);


@@ -184,7 +188,7 @@ function show_commands() {
         command.push("-r " + picinfo[f].rotate);
       }
       command.push("'" + shell_escape(f) + "'");
         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(" "));
     }
   });
       commands.push(command.join(" "));
     }
   });