X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/31092212d9330f6d19ff2d0cc034459ff892e92a..d92eb78e8d30a01235195c167307e0ad910b76c3:/picsorter.js

diff --git a/picsorter.js b/picsorter.js
index ae4c837..70cd236 100644
--- a/picsorter.js
+++ b/picsorter.js
@@ -7,15 +7,23 @@ $.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;
-move_to_nondeleted(1);
 
 
 function setpic() {
+  if ("exposure" in picinfo[files[input_index]]) {
+    exposure = picinfo[files[input_index]].exposure;
+  } else {
+    picinfo[files[input_index]].exposure = exposure;
+    save_picinfo();
+  }
   $("#pic").attr("src", zoom + exposure + "/" + files[input_index]);
 }
 
@@ -24,11 +32,6 @@ function say(message) {
   setTimeout(function() { $("#message").addClass("fade"); }, 1);
 }
 
-function say_exposure() {
-  var e = (exposure / 4) - 3.5;
-  say((e >= 0 ? "+" : "") + e);
-}
-
 function toggle_zoom() {
   if (zoom) {
     zoom = "";
@@ -42,32 +45,53 @@ 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() {
+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);
 });
 
 Mousetrap.bind('z', toggle_zoom);
 Mousetrap.bind('Z', function() { $("#pic").toggleClass("fit_view"); });
-Mousetrap.bind('n', function() { move_to_nondeleted(1); setpic(); });
-Mousetrap.bind('p', function() { move_to_nondeleted(-1); setpic(); });
+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() { exposure ++; say_exposure(); setpic(); });
-Mousetrap.bind('d', function() { exposure --; say_exposure(); setpic(); });
+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; });