Use the correct filename for deleting

diff --git a/picsorter.js b/picsorter.js
index be0371afdd078a122e5eea6d526edc1210e116cb..a0899552a2f79c799bf64de13e044a881ebe65a5 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -177,7 +177,7 @@ function show_commands() {
   var commands = [];
   $.each(files, function(i, f) {
     if ("name" in picinfo[f] && picinfo[f].name.length > 0) {
   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) + "'";
+      var escaped_filename = "'" + shell_escape(f) + "'";

       if (picinfo[f].deleted == "deleted") {
         commands.push("shred -u " + escaped_filename);
         return;
       if (picinfo[f].deleted == "deleted") {
         commands.push("shred -u " + escaped_filename);
         return;


@@ -193,8 +193,8 @@ function show_commands() {
       if ("rotate" in picinfo[f]) {
         command.push("-r " + picinfo[f].rotate);
       }
       if ("rotate" in picinfo[f]) {
         command.push("-r " + picinfo[f].rotate);
       }

-      command.push("'" + shell_escape(f) + "'");

       command.push(escaped_filename);
       command.push(escaped_filename);

+      command.push("'" + shell_escape(picinfo[f].name) + "'");

       commands.push(command.join(" "));
     }
   });
       commands.push(command.join(" "));
     }
   });