X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/d3aedd16f654a3802e848b955251294a02a3b9af..5875d96009f9a00f66d60dc8c01c500147469a22:/picsorter.js

diff --git a/picsorter.js b/picsorter.js
index cfbf5db..e8561b3 100644
--- a/picsorter.js
+++ b/picsorter.js
@@ -55,7 +55,11 @@ function say(message) {
   setTimeout(function() { $("#message").addClass("fade"); }, 100);
 }
 function announce() {
-  say(input_index + " " + (picinfo[files[input_index]].name || ""));
+  var msg = input_index + " " + (picinfo[files[input_index]].name || "");
+  if ("deleted" in picinfo[files[input_index]]) {
+    msg += "(" + picinfo[files[input_index]].deleted+ ")";
+  }
+  say(msg);
 }
 
 function toggle_zoom() {
@@ -108,10 +112,10 @@ function move_to_unnamed(direction) {
            !("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();
-  say("Deleted");
+  say(method);
 }
 
 function mark_not_deleted() {
@@ -155,10 +159,12 @@ function rotate() {
 
 
 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() {
@@ -174,8 +180,14 @@ function shell_escape(x) {
 function show_commands() {
   var commands = [];
   $.each(files, function(i, f) {
-    if ("name" in picinfo[f] && picinfo[f].name.length > 0 &&
-        !("deleted" in picinfo[f])) {
+    var escaped_filename = "'" + shell_escape(f) + "'";
+    if (picinfo[f].deleted == "deleted") {
+      commands.push("shred -u " + escaped_filename);
+    } else if (picinfo[f].deleted == "extra") {
+      commands.push("mv -vi " + escaped_filename + " \"$EXTRADIR\"");
+    } else if (picinfo[f].deleted == "blurry") {
+      commands.push("mv -vi " + escaped_filename + " \"$BLURRYDIR\"");
+    } else if ("name" in picinfo[f] && picinfo[f].name.length > 0) {
       var command = ["pic-mv"];
       if ("exposure" in picinfo[f]) {
         command.push("-e " + picinfo[f].exposure);
@@ -183,7 +195,7 @@ 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(" "));
     }
@@ -209,8 +221,12 @@ 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('x', mark_deleted);
+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('g', function(){ mark_deleted("blurry"); });
+Mousetrap.bind('G', mark_not_deleted);
 Mousetrap.bind('r', rotate);
 Mousetrap.bind('i', announce);
 Mousetrap.bind('f', function() { say(files[input_index]); });