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

diff --git a/picsorter.js b/picsorter.js
index c3af639..db313d9 100644
--- a/picsorter.js
+++ b/picsorter.js
@@ -1,53 +1,86 @@
+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 input_index = 0;
 var zoom = "sm/";
+var input_index = -1;
 
-if (!("picsorter_deleted" in localStorage)) {
-  localStorage.picsorter_deleted = JSON.stringify({});
-}
 
 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]);
 }
 
+function say(message) {
+  $("#message").text(message).removeClass("fade");
+  setTimeout(function() { $("#message").addClass("fade"); }, 1);
+}
+
 function toggle_zoom() {
   if (zoom) {
     zoom = "";
   } else {
     zoom = "sm/";
   }
+  setpic();
 }
 
 function move_to_nondeleted(direction) {
-  var deleted = JSON.parse(localStorage.picsorter_deleted);
   do {
     input_index += direction;
-  } while (files[input_index] in deleted);
+  } while (picinfo[files[input_index]].deleted);
+  say(input_index);
+  setpic();
 }
 
 function mark_deleted() {
-  var deleted = JSON.parse(localStorage.picsorter_deleted);
-  deleted[files[input_index]] = 1;
-  localStorage.picsorter_deleted = JSON.stringify(deleted);
+  picinfo[files[input_index]].deleted = 1;
+  save_picinfo();
+  say("Deleted");
 }
 
 function mark_not_deleted() {
-  var deleted = JSON.parse(localStorage.picsorter_deleted);
-  delete deleted[files[input_index]];
-  localStorage.picsorter_deleted = JSON.stringify(deleted);
+  delete picinfo[files[input_index]].deleted;
+  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() {
+  move_to_nondeleted(1);
 });
 
-Mousetrap.bind('z', function() { toggle_zoom(); setpic(); });
+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() { input_index ++; setpic(); });
-Mousetrap.bind('P', function() { input_index --; setpic(); });
-Mousetrap.bind('b', function() { exposure ++; setpic(); });
-Mousetrap.bind('d', function() { exposure --; setpic(); });
-Mousetrap.bind('x', function() { mark_deleted(); });
-Mousetrap.bind('X', function() { mark_not_deleted(); });
+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('x', mark_deleted);
+Mousetrap.bind('X', mark_not_deleted);