Leaving the name field empty cancels

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index bbd255419f384ead2252414a22acaa438aee8246..be0371afdd078a122e5eea6d526edc1210e116cb 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() {


@@ -177,7 +179,11 @@ function show_commands() {
     if ("name" in picinfo[f] && picinfo[f].name.length > 0) {
       var escaped_filename = "'" + shell_escape(picinfo[f].name) + "'";
       if (picinfo[f].deleted == "deleted") {
     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);
+        commands.push("shred -u " + escaped_filename);
+        return;
+      }
+      if (picinfo[f].deleted == "extra") {
+        commands.push("mv " + escaped_filename + " \"$EXTRADIR\"");

         return;
       }
       var command = ["pic-mv"];
         return;
       }
       var command = ["pic-mv"];


@@ -215,6 +221,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('$', 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]); });
 Mousetrap.bind('r', rotate);
 Mousetrap.bind('i', announce);
 Mousetrap.bind('f', function() { say(files[input_index]); });