The non-vendor-tag entries go last

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index a0899552a2f79c799bf64de13e044a881ebe65a5..e8561b3b07196e726570939f13420747b107885f 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -55,7 +55,11 @@ function say(message) {
   setTimeout(function() { $("#message").addClass("fade"); }, 100);
 }
 function announce() {
   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() {
 }
 
 function toggle_zoom() {


@@ -176,16 +180,14 @@ 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) {
-      var escaped_filename = "'" + shell_escape(f) + "'";
-      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 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);
       var command = ["pic-mv"];
       if ("exposure" in picinfo[f]) {
         command.push("-e " + picinfo[f].exposure);


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