Emit 'rm' commands for deleted pictures

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index f1847841dc052819c962b94e0d487093eca951fd..bbd255419f384ead2252414a22acaa438aee8246 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -52,7 +52,10 @@ function setpic() {
 
 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 toggle_zoom() {
@@ -83,12 +86,18 @@ function move_by_filter(direction, filter) {
     }
   }
   input_index = new_index;
-  say(input_index + " " + (picinfo[files[input_index]].name || ""));
+  announce();
   setpic();
 }
 function move(direction) {
   move_by_filter(direction, function() { return true; });
 }
+function move_to_begenning() {
+  move_by_filter(-1, function(i) { return i == 0; });
+}
+function move_to_end() {
+  move_by_filter(1, function(i) { return i == files.length - 1; });
+}
 function move_to_nondeleted(direction) {
   move_by_filter(direction, function(i) {
     return !("deleted" in picinfo[files[i]]); });
@@ -99,10 +108,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() {
@@ -111,6 +120,15 @@ function mark_not_deleted() {
   say("Undeleted");
 }
 
+function say_exposure() {
+  if (!endsWith(files[input_index], ".NEF")) {
+    say("Exposure adjustment not available");
+    return;
+  }
+  var display_exposure = (exposure / 4) - 3.5;
+  say((display_exposure >= 0 ? "+" : "") + display_exposure);
+}
+
 function change_exposure(amount) {
   if (!endsWith(files[input_index], ".NEF")) {
     say("Exposure adjustment not available");
@@ -120,8 +138,7 @@ function change_exposure(amount) {
   picinfo[files[input_index]].exposure = exposure;
   save_picinfo();
   setpic();
-  var display_exposure = (exposure / 4) - 3.5;
-  say((display_exposure >= 0 ? "+" : "") + display_exposure);
+  say_exposure();
 }
 
 function rotate() {
@@ -136,13 +153,18 @@ function rotate() {
   setpic(); 
 }
 
-function set_name() {
-  var name_input = $("#name").hide().get(0);
-  var name = name_input.value;
-  name_input.value = "";
+
+function set_name(name) {
   picinfo[files[input_index]].name = name;
   save_picinfo();
   say("Named " + name);
+  last_name = name;
+}
+
+function set_name_from_form() {
+  var name_input = $("#name").hide().get(0);
+  set_name(name_input.value);
+  name_input.value = "";
 }
 
 function shell_escape(x) {
@@ -152,8 +174,12 @@ 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])) {
+    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);
+        return;
+      }
       var command = ["pic-mv"];
       if ("exposure" in picinfo[f]) {
         command.push("-e " + picinfo[f].exposure);
@@ -162,7 +188,7 @@ function show_commands() {
         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(" "));
     }
   });
@@ -171,7 +197,7 @@ function show_commands() {
 }
 
 $(function() {
-  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name(); });
+  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name_from_form(); });
   move_to_nondeleted(1);
 });
 
@@ -185,10 +211,36 @@ Mousetrap.bind(['m n', 'm l'], function() { move(1); });
 Mousetrap.bind(['m n', 'm h'], function() { move(-1); });
 Mousetrap.bind(['b', 'k'], function() { change_exposure(1); });
 Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); });
-Mousetrap.bind('x', mark_deleted);
+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('r', rotate);
+Mousetrap.bind('i', announce);
+Mousetrap.bind('f', function() { say(files[input_index]); });
+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(); });
+
+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;
+  }
+  save_picinfo();
+  say("Undeleted everything");
+}