From eaa5e016a41682c1ccd99023bd346e0448fa0ca3 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 28 Feb 2014 22:39:54 -0800 Subject: [PATCH] Output commands for named pictures --- picsorter.css | 10 ++++++++++ picsorter.html | 1 + picsorter.js | 24 ++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/picsorter.css b/picsorter.css index dd898ce..712494b 100644 --- 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 d97b380..5fdeab1 100644 --- a/picsorter.html +++ b/picsorter.html @@ -9,6 +9,7 @@

Welcome to picsorter

diff --git a/picsorter.js b/picsorter.js index 91febfa..213a553 100644 --- 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); -- 2.44.1