Leaving the name field empty cancels

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index b8b1804bac0099630ca7ad43330b1d9440a1eaba..be0371afdd078a122e5eea6d526edc1210e116cb 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -52,7 +52,7 @@ function setpic() {
 
 function say(message) {
   $("#message").text(message).removeClass("fade");
 
 function say(message) {
   $("#message").text(message).removeClass("fade");

-  setTimeout(function() { $("#message").addClass("fade"); }, 1);
+  setTimeout(function() { $("#message").addClass("fade"); }, 100);

 }
 function announce() {
   say(input_index + " " + (picinfo[files[input_index]].name || ""));
 }
 function announce() {
   say(input_index + " " + (picinfo[files[input_index]].name || ""));


@@ -108,10 +108,10 @@ function move_to_unnamed(direction) {
            !("name" in picinfo[files[i]]); });
 }
 
            !("name" in picinfo[files[i]]); });
 }
 

-function mark_deleted() {
-  picinfo[files[input_index]].deleted = 1;
+function mark_deleted(method) {
+  picinfo[files[input_index]].deleted = method;

   save_picinfo();
   save_picinfo();

-  say("Deleted");
+  say(method);

 }
 
 function mark_not_deleted() {
 }
 
 function mark_not_deleted() {


@@ -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() {


@@ -174,8 +176,16 @@ 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("shred -u " + escaped_filename);
+        return;
+      }
+      if (picinfo[f].deleted == "extra") {
+        commands.push("mv " + escaped_filename + " \"$EXTRADIR\"");
+        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 +194,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(" "));
     }
   });


@@ -209,18 +219,32 @@ Mousetrap.bind(['b', 'k'], function() { change_exposure(1); });
 Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); });
 Mousetrap.bind('0', move_to_begenning);
 Mousetrap.bind('$', move_to_end);
 Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); });
 Mousetrap.bind('0', move_to_begenning);
 Mousetrap.bind('$', move_to_end);

-Mousetrap.bind('x', mark_deleted);
+Mousetrap.bind('x', function(){ mark_deleted("deleted"); });

 Mousetrap.bind('X', mark_not_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]); });

-Mousetrap.bind('e', function() { say_exposure(); });
+Mousetrap.bind('B', function() { say_exposure(); });

 Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });
 Mousetrap.bind('C', function() { if (last_name) { set_name(last_name); } });
 Mousetrap.bind('%', function() { say((100 * input_index / files.length).toFixed(2) + "%"); });
 Mousetrap.bind('!', show_commands);
 Mousetrap.bind('esc', function() { $("#name").hide(); $("#shell_out").hide(); });
 
 Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });
 Mousetrap.bind('C', function() { if (last_name) { set_name(last_name); } });
 Mousetrap.bind('%', function() { say((100 * input_index / files.length).toFixed(2) + "%"); });
 Mousetrap.bind('!', show_commands);
 Mousetrap.bind('esc', function() { $("#name").hide(); $("#shell_out").hide(); });
 

+function clean_picinfo() {
+  files_index = {};
+  $.each(files, function(i, f) {
+    files_index[f] = true;
+  });
+  for (f in picinfo) {
+    if (!files_index[f]) {
+      delete picinfo[f];
+    }
+  }
+}
+

 function undelete_all() {
   for (f in picinfo) {
        delete picinfo[f].deleted;
 function undelete_all() {
   for (f in picinfo) {
        delete picinfo[f].deleted;