Return status from keystroke handlers

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 6608edff15549b05a438f67626a78941d372b332..e0a05ff0022c54e8db57814c418fa9c9403b97ad 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -1,21 +1,12 @@
 var picinfo = {};
-if ("picsorter_picinfo" in localStorage) {
-  picinfo = JSON.parse(localStorage.picsorter_picinfo);
-}
-$.each(files, function(i, f) {
-  if (!(f in picinfo)) {
-    picinfo[f] = {};
-  }
-});
-function save_picinfo() {
-  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
-}
-save_picinfo();
-
 var exposure = 20;
 var zoom = "sm/";
 var input_index = -1;
 
+function save_picinfo() {
+  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
+}
+
 function endsWith(str, suffix) {
   return str.indexOf(suffix, str.length - suffix.length) !== -1;
 }
@@ -55,7 +46,12 @@ 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);
+  return false;
 }
 
 function toggle_zoom() {
@@ -65,6 +61,7 @@ function toggle_zoom() {
     zoom = "sm/";
   }
   setpic();
+  return false;
 }
 
 function move_by_filter(direction, filter) {
@@ -94,9 +91,11 @@ function move(direction) {
 }
 function move_to_begenning() {
   move_by_filter(-1, function(i) { return i == 0; });
+  return false;
 }
 function move_to_end() {
   move_by_filter(1, function(i) { return i == files.length - 1; });
+  return false;
 }
 function move_to_nondeleted(direction) {
   move_by_filter(direction, function(i) {
@@ -118,15 +117,17 @@ function mark_not_deleted() {
   delete picinfo[files[input_index]].deleted;
   save_picinfo();
   say("Undeleted");
+  return false;
 }
 
 function say_exposure() {
   if (!endsWith(files[input_index], ".NEF")) {
     say("Exposure adjustment not available");
-    return;
+    return false;
   }
   var display_exposure = (exposure / 4) - 3.5;
   say((display_exposure >= 0 ? "+" : "") + display_exposure);
+  return false;
 }
 
 function change_exposure(amount) {
@@ -151,14 +152,17 @@ function rotate() {
   }
   save_picinfo();
   setpic(); 
+  return false;
 }
 
 
 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,16 +178,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) {
-      var escaped_filename = "'" + shell_escape(picinfo[f].name) + "'";
-      if (picinfo[f].deleted == "deleted") {
-        commands.push("rm " + 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);
@@ -191,46 +193,16 @@ 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(" "));
     }
   });
   commands.push("");
   $("#shell_out").text(commands.join("\n")).show();
+  return false;
 }
 
-$(function() {
-  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name_from_form(); });
-  move_to_nondeleted(1);
-});
-
-Mousetrap.bind('z', toggle_zoom);
-Mousetrap.bind('Z', function() { $("#pic").toggleClass("fit_view"); });
-Mousetrap.bind(['n', 'l'], function() { move_to_nondeleted(1); });
-Mousetrap.bind(['p', 'h'], function() { move_to_nondeleted(-1); });
-Mousetrap.bind(['N', 'L'], function() { move_to_unnamed(1); });
-Mousetrap.bind(['P', 'H'], function() { move_to_unnamed(-1); });
-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('0', move_to_begenning);
-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('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) {
@@ -250,3 +222,48 @@ function undelete_all() {
   save_picinfo();
   say("Undeleted everything");
 }
+
+function start() {
+  if ("picsorter_picinfo" in localStorage) {
+    picinfo = JSON.parse(localStorage.picsorter_picinfo);
+  }
+  $.each(files, function(i, f) {
+    if (!(f in picinfo)) {
+      picinfo[f] = {};
+    }
+  });
+  save_picinfo();
+
+  $(function() {
+    $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name_from_form(); });
+    move_to_nondeleted(1);
+  });
+
+  Mousetrap.bind('z', toggle_zoom);
+  Mousetrap.bind('Z', function() { $("#pic").toggleClass("fit_view"); return false; });
+  Mousetrap.bind(['n', 'l'], function() { move_to_nondeleted(1); return false; });
+  Mousetrap.bind(['p', 'h'], function() { move_to_nondeleted(-1); return false; });
+  Mousetrap.bind(['N', 'L'], function() { move_to_unnamed(1); return false; });
+  Mousetrap.bind(['P', 'H'], function() { move_to_unnamed(-1); return false; });
+  Mousetrap.bind(['m n', 'm l'], function() { move(1); return false; });
+  Mousetrap.bind(['m n', 'm h'], function() { move(-1); return false; });
+  Mousetrap.bind(['b', 'k'], function() { change_exposure(1); return false; });
+  Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); return false; });
+  Mousetrap.bind('0', move_to_begenning);
+  Mousetrap.bind('$', move_to_end);
+  Mousetrap.bind('x', function(){ mark_deleted("deleted"); return false; });
+  Mousetrap.bind('X', mark_not_deleted);
+  Mousetrap.bind('e', function(){ mark_deleted("extra"); return false; });
+  Mousetrap.bind('E', mark_not_deleted);
+  Mousetrap.bind('g', function(){ mark_deleted("blurry"); return false; });
+  Mousetrap.bind('G', mark_not_deleted);
+  Mousetrap.bind('r', rotate);
+  Mousetrap.bind('i', announce);
+  Mousetrap.bind('f', function() { say(files[input_index]); return false; });
+  Mousetrap.bind('B', say_exposure);
+  Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });
+  Mousetrap.bind('C', function() { if (last_name) { set_name(last_name); } return false; });
+  Mousetrap.bind('%', function() { say((100 * input_index / files.length).toFixed(2) + "%"); return false; });
+  Mousetrap.bind('!', show_commands);
+  Mousetrap.bind('esc', function() { $("#name").hide(); $("#shell_out").hide(); return false; });
+}