]> git.scottworley.com Git - picsort/commitdiff
projects / picsort / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5498080)
Output commands for named pictures
authorScott Worley <scottworley@scottworley.com>
Sat, 1 Mar 2014 06:39:54 +0000 (22:39 -0800)
committerScott Worley <scottworley@scottworley.com>
Sat, 1 Mar 2014 06:39:54 +0000 (22:39 -0800)
picsorter.css patch | blob | blame | history
picsorter.html patch | blob | blame | history
picsorter.js patch | blob | blame | history

diff --git a/picsorter.css b/picsorter.css
index dd898ce3cd8c1b358b42444d01eb40952978befa..712494b57479b7347d9db94201b94e55d32ef926 100644 (file)
--- a/picsorter.css
+++ b/picsorter.css
@@ -44,6 +44,7 @@
 .inputcontainer {
   position: fixed;
   width: 100%;
+  height: 100%;
 }
 #name {
   display: block;
@@ -51,6 +52,15 @@
   margin-right: auto;
   font-size: 30pt;
 }
+#shell_out {
+  display: none;
+  width: 80%;
+  height: 80%;
+  margin: 5em;
+  color: white;
+  background-color: black;
+  padding: 1em;
+}
 
 .fade {
   opacity: 0;
diff --git a/picsorter.html b/picsorter.html
index d97b38058f837d0d51475ad3cc80bc8932652d5b..5fdeab16d13a601ce0cde0c22959c9ec8344bfb3 100644 (file)
--- a/picsorter.html
+++ b/picsorter.html
@@ -9,6 +9,7 @@
   <body>
     <div id="message" class="fade">Welcome to picsorter</div>
     <div class="inputcontainer"><input id="name" type="text"></input></div>
+    <div class="inputcontainer"><textarea id="shell_out"></textarea></div>
     <img id="pic"></img>
   </body>
 </html>
diff --git a/picsorter.js b/picsorter.js
index 91febfa4ef73ad0fa655bb59c16573d0488b9128..213a553ac488356fc9b15d4784c5e2bace04a51b 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -145,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);
@@ -165,3 +188,4 @@ 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);
Ad hoc personal picture sorter