X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/755cf903798da9f7772c504f01af9e6fdd388052..d6874f6c6a9f60aacee8cd43fd16f3e9b73b22ec:/picsorter.js

diff --git a/picsorter.js b/picsorter.js
index ec63cbc..31a6a56 100644
--- a/picsorter.js
+++ b/picsorter.js
@@ -40,13 +40,23 @@ function setpic() {
   } else {
     display_filename = zoom + files[input_index];
   }
-  $("#pic").attr("src", display_filename);
+  var $pic = $("#pic");
+  $pic.on("load", function() {
+    $pic.removeClass("rot90 rot180 rot270");
+    if ("rotate" in picinfo[files[input_index]]) {
+      $pic.addClass("rot" + picinfo[files[input_index]].rotate);
+    }
+  });
+  $pic.attr("src", display_filename);
 }
 
 function say(message) {
   $("#message").text(message).removeClass("fade");
   setTimeout(function() { $("#message").addClass("fade"); }, 1);
 }
+function announce() {
+  say(input_index + " " + (picinfo[files[input_index]].name || ""));
+}
 
 function toggle_zoom() {
   if (zoom) {
@@ -76,7 +86,7 @@ function move_by_filter(direction, filter) {
     }
   }
   input_index = new_index;
-  say(input_index + " " + (picinfo[files[input_index]].name || ""));
+  announce();
   setpic();
 }
 function move(direction) {
@@ -104,6 +114,15 @@ function mark_not_deleted() {
   say("Undeleted");
 }
 
+function say_exposure() {
+  if (!endsWith(files[input_index], ".NEF")) {
+    say("Exposure adjustment not available");
+    return;
+  }
+  var display_exposure = (exposure / 4) - 3.5;
+  say((display_exposure >= 0 ? "+" : "") + display_exposure);
+}
+
 function change_exposure(amount) {
   if (!endsWith(files[input_index], ".NEF")) {
     say("Exposure adjustment not available");
@@ -113,21 +132,62 @@ function change_exposure(amount) {
   picinfo[files[input_index]].exposure = exposure;
   save_picinfo();
   setpic();
-  var display_exposure = (exposure / 4) - 3.5;
-  say((display_exposure >= 0 ? "+" : "") + display_exposure);
+  say_exposure();
 }
 
-function set_name() {
-  var name_input = $("#name").hide().get(0);
-  var name = name_input.value;
-  name_input.value = "";
+function rotate() {
+  var rotation = picinfo[files[input_index]].rotate || 0;
+  rotation = (rotation + 90) % 360;
+  if (rotation > 1e-5) {
+    picinfo[files[input_index]].rotate = rotation;
+  } else {
+    delete picinfo[files[input_index]].rotate;
+  }
+  save_picinfo();
+  setpic(); 
+}
+
+
+function set_name(name) {
   picinfo[files[input_index]].name = name;
   save_picinfo();
   say("Named " + name);
+  last_name = name;
+}
+
+function set_name_from_form() {
+  var name_input = $("#name").hide().get(0);
+  set_name(name_input.value);
+  name_input.value = "";
+}
+
+function shell_escape(x) {
+  return x.replace(/'/g, "'\\''");
+}
+
+function show_commands() {
+  var commands = [];
+  $.each(files, function(i, f) {
+    if ("name" in picinfo[f] && picinfo[f].name.length > 0 &&
+        !("deleted" in picinfo[f])) {
+      var command = ["pic-mv"];
+      if ("exposure" in picinfo[f]) {
+        command.push("-e " + picinfo[f].exposure);
+      }
+      if ("rotate" in picinfo[f]) {
+        command.push("-r " + picinfo[f].rotate);
+      }
+      command.push("'" + shell_escape(f) + "'");
+      command.push("'" + shell_escape(picinfo[f].name) + "'");
+      commands.push(command.join(" "));
+    }
+  });
+  commands.push("");
+  $("#shell_out").text(commands.join("\n")).show();
 }
 
 $(function() {
-  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name(); });
+  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name_from_form(); });
   move_to_nondeleted(1);
 });
 
@@ -143,4 +203,12 @@ 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('r', rotate);
+Mousetrap.bind('i', announce);
+Mousetrap.bind('f', function() { say(files[input_index]); });
+Mousetrap.bind('e', function() { say_exposure(); });
 Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });
+Mousetrap.bind('C', function() { if (last_name) { set_name(last_name); } });
+Mousetrap.bind('%', function() { say((100 * input_index / files.length).toFixed(2) + "%"); });
+Mousetrap.bind('!', show_commands);
+Mousetrap.bind('esc', function() { $("#name").hide(); $("#shell_out").hide(); });