From: Scott Worley <scottworley@scottworley.com>
Date: Tue, 23 Dec 2014 05:55:31 +0000 (-0800)
Subject: Use the correct filename for deleting
X-Git-Url: http://git.scottworley.com/picsort/commitdiff_plain/f20ac636998edabdb590f1ba46c02aed3e49cdbf?hp=7b24c22c6a79cff42759f93e091f6e553ffeade6

Use the correct filename for deleting
---

diff --git a/picsorter.js b/picsorter.js
index be0371a..a089955 100644
--- 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 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;
@@ -193,8 +193,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(" "));
     }
   });