Support NEF rotation in pic-mv

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 24cc8938e054363048ab1159ca805662c86a70eb..31ae640d9a2c25ace09ec644024c2c65758abbd2 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -41,11 +41,13 @@ function setpic() {
     display_filename = zoom + files[input_index];
   }
   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);
-  $pic.removeClass("rot90 rot180 rot270");
-  if ("rotate" in picinfo[files[input_index]]) {
-    $pic.addClass("rot" + picinfo[files[input_index]].rotate);
-  }
 }
 
 function say(message) {
@@ -143,6 +145,29 @@ function set_name() {
   say("Named " + name);
 }
 
+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) {
+      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(" "));
+    }
+  });
+  $("#shell_out").text(commands.join("\n")).show();
+}
+
 $(function() {
   $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name(); });
   move_to_nondeleted(1);
@@ -162,3 +187,6 @@ Mousetrap.bind('x', mark_deleted);
 Mousetrap.bind('X', mark_not_deleted);
 Mousetrap.bind('r', rotate);
 Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });
+Mousetrap.bind('%', function() { say((100 * input_index / files.length).toFixed(2) + "%"); });
+Mousetrap.bind('!', show_commands);
+Mousetrap.bind('esc', function() { $("#name").hide(); $("#shell_out").hide(); });