Use the correct filename for deleting

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 4f726fb16d6a074b845de5d574f68e5d7b16c4cd..a0899552a2f79c799bf64de13e044a881ebe65a5 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -155,10 +155,12 @@ function rotate() {
 
 
 function set_name(name) {
 
 
 function set_name(name) {

-  picinfo[files[input_index]].name = name;
-  save_picinfo();
-  say("Named " + name);
-  last_name = name;
+  if (name) {
+    picinfo[files[input_index]].name = name;
+    save_picinfo();
+    say("Named " + name);
+    last_name = name;
+  }

 }
 
 function set_name_from_form() {
 }
 
 function set_name_from_form() {


@@ -175,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;


@@ -191,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(" "));
     }
   });