X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/01dd04816ae1bec01e224c8cd17e271ec129ad1c..a5ef285705b4a65abe7d6527b2e727eebd111aba:/picsorter.js

diff --git a/picsorter.js b/picsorter.js
index db313d9..db81f05 100644
--- a/picsorter.js
+++ b/picsorter.js
@@ -16,6 +16,16 @@ var exposure = 20;
 var zoom = "sm/";
 var input_index = -1;
 
+function endsWith(str, suffix) {
+  return str.indexOf(suffix, str.length - suffix.length) !== -1;
+}
+
+function stripFromEnd(str, suffix) {
+  if (endsWith(str, suffix)) {
+    return str.substr(0, str.length - suffix.length);
+  }
+  return str;
+}
 
 function setpic() {
   if ("exposure" in picinfo[files[input_index]]) {
@@ -45,7 +55,7 @@ function move_to_nondeleted(direction) {
   do {
     input_index += direction;
   } while (picinfo[files[input_index]].deleted);
-  say(input_index);
+  say(input_index + " " + (picinfo[files[input_index]].name || ""));
   setpic();
 }
 
@@ -70,17 +80,28 @@ function change_exposure(amount) {
   say((display_exposure >= 0 ? "+" : "") + display_exposure);
 }
 
+function set_name() {
+  var name_input = $("#name").hide().get(0);
+  var name = name_input.value;
+  name_input.value = "";
+  picinfo[files[input_index]].name = name;
+  save_picinfo();
+  say("Named " + name);
+}
+
 $(function() {
+  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name(); });
   move_to_nondeleted(1);
 });
 
 Mousetrap.bind('z', toggle_zoom);
 Mousetrap.bind('Z', function() { $("#pic").toggleClass("fit_view"); });
-Mousetrap.bind('n', function() { move_to_nondeleted(1); });
-Mousetrap.bind('p', function() { move_to_nondeleted(-1); });
-Mousetrap.bind('N', function() { input_index ++; say(input_index); setpic(); });
-Mousetrap.bind('P', function() { input_index --; say(input_index); setpic(); });
-Mousetrap.bind('b', function() { change_exposure(1); });
-Mousetrap.bind('d', function() { change_exposure(-1); });
+Mousetrap.bind(['n', 'l'], function() { move_to_nondeleted(1); });
+Mousetrap.bind(['p', 'h'], function() { move_to_nondeleted(-1); });
+Mousetrap.bind(['N', 'L'], function() { input_index ++; say(input_index); setpic(); });
+Mousetrap.bind(['P', 'H'], function() { input_index --; say(input_index); setpic(); });
+Mousetrap.bind(['b', 'k'], function() { change_exposure(1); });
+Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); });
 Mousetrap.bind('x', mark_deleted);
 Mousetrap.bind('X', mark_not_deleted);
+Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });