I miss ${foo%bar}

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index abed5075f22ccd8aaaf5261df712edbb1a9f6759..2f9df0ce94ee80aa2fa9d0781709df0eb7ddcde0 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -7,19 +7,32 @@ $.each(files, function(i, f) {
     picinfo[f] = {};
   }
 });
-localStorage.picsorter_picinfo = JSON.stringify(picinfo);
+function save_picinfo() {
+  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
+}
+save_picinfo();
 
 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]]) {
     exposure = picinfo[files[input_index]].exposure;
   } else {
     picinfo[files[input_index]].exposure = exposure;
-    localStorage.picsorter_picinfo = JSON.stringify(picinfo);
+    save_picinfo();
   }
   $("#pic").attr("src", zoom + exposure + "/" + files[input_index]);
 }
@@ -42,31 +55,42 @@ 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();
 }
 
 function mark_deleted() {
   picinfo[files[input_index]].deleted = 1;
-  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
+  save_picinfo();
   say("Deleted");
 }
 
 function mark_not_deleted() {
   delete picinfo[files[input_index]].deleted;
-  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
+  save_picinfo();
   say("Undeleted");
 }
 
 function change_exposure(amount) {
   exposure += amount;
   picinfo[files[input_index]].exposure = exposure;
+  save_picinfo();
   setpic();
   var display_exposure = (exposure / 4) - 3.5;
   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);
 });
 
@@ -80,3 +104,4 @@ Mousetrap.bind('b', function() { change_exposure(1); });
 Mousetrap.bind('d', function() { change_exposure(-1); });
 Mousetrap.bind('x', mark_deleted);
 Mousetrap.bind('X', mark_not_deleted);
+Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });