Support .jpeg files mixed in with .NEF files

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 9a1b1c11b678be42e1ba71fb85ec69ec6a9686d0..b1c1bdf5b726220f97adf9af55c47d533f21d6ec 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -1,9 +1,113 @@
+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 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() {
+  var display_filename;
+  if (endsWith(files[input_index], ".NEF")) {
+    if ("exposure" in picinfo[files[input_index]]) {
+      exposure = picinfo[files[input_index]].exposure;
+    } else {
+      picinfo[files[input_index]].exposure = exposure;
+      save_picinfo();
+    }
+    display_filename = zoom + exposure + "/" + stripFromEnd(files[input_index], ".NEF") + ".jpeg";
+  } else {
+    display_filename = zoom + files[input_index];
+  }
+  $("#pic").attr("src", display_filename);
+}
+
+function say(message) {
+  $("#message").text(message).removeClass("fade");
+  setTimeout(function() { $("#message").addClass("fade"); }, 1);
+}

 
 

-function setpic(pic) {
-  $("#pic")[0].src = exposure + "/" + pic;
+function toggle_zoom() {
+  if (zoom) {
+    zoom = "";
+  } else {
+    zoom = "sm/";
+  }
+  setpic();
+}
+
+function move_to_nondeleted(direction) {
+  do {
+    input_index += direction;
+  } while (picinfo[files[input_index]].deleted);
+  say(input_index + " " + (picinfo[files[input_index]].name || ""));
+  setpic();
+}
+
+function mark_deleted() {
+  picinfo[files[input_index]].deleted = 1;
+  save_picinfo();
+  say("Deleted");
+}
+
+function mark_not_deleted() {
+  delete picinfo[files[input_index]].deleted;
+  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() {
 }
 
 $(function() {

-  setpic(files[0]);
+  $("#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', '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; });