X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/76812d8fb224d6fe85d46d74f2657c397b67e53b..e44ce0d94e60decf487cc897cc52cb28bab9e0e7:/picsorter.js diff --git a/picsorter.js b/picsorter.js index 91febfa..e8561b3 100644 --- a/picsorter.js +++ b/picsorter.js @@ -52,7 +52,14 @@ function setpic() { function say(message) { $("#message").text(message).removeClass("fade"); - setTimeout(function() { $("#message").addClass("fade"); }, 1); + setTimeout(function() { $("#message").addClass("fade"); }, 100); +} +function announce() { + var msg = input_index + " " + (picinfo[files[input_index]].name || ""); + if ("deleted" in picinfo[files[input_index]]) { + msg += "(" + picinfo[files[input_index]].deleted+ ")"; + } + say(msg); } function toggle_zoom() { @@ -83,12 +90,18 @@ function move_by_filter(direction, filter) { } } input_index = new_index; - say(input_index + " " + (picinfo[files[input_index]].name || "")); + announce(); setpic(); } function move(direction) { move_by_filter(direction, function() { return true; }); } +function move_to_begenning() { + move_by_filter(-1, function(i) { return i == 0; }); +} +function move_to_end() { + move_by_filter(1, function(i) { return i == files.length - 1; }); +} function move_to_nondeleted(direction) { move_by_filter(direction, function(i) { return !("deleted" in picinfo[files[i]]); }); @@ -99,10 +112,10 @@ function move_to_unnamed(direction) { !("name" in picinfo[files[i]]); }); } -function mark_deleted() { - picinfo[files[input_index]].deleted = 1; +function mark_deleted(method) { + picinfo[files[input_index]].deleted = method; save_picinfo(); - say("Deleted"); + say(method); } function mark_not_deleted() { @@ -111,6 +124,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"); @@ -120,8 +142,7 @@ 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 rotate() { @@ -136,17 +157,55 @@ function rotate() { setpic(); } -function set_name() { + +function set_name(name) { + if (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); - var name = name_input.value; + set_name(name_input.value); name_input.value = ""; - picinfo[files[input_index]].name = name; - save_picinfo(); - say("Named " + name); +} + +function shell_escape(x) { + return x.replace(/'/g, "'\\''"); +} + +function show_commands() { + var commands = []; + $.each(files, function(i, f) { + var escaped_filename = "'" + shell_escape(f) + "'"; + if (picinfo[f].deleted == "deleted") { + commands.push("shred -u " + escaped_filename); + } else if (picinfo[f].deleted == "extra") { + commands.push("mv -vi " + escaped_filename + " \"$EXTRADIR\""); + } else if (picinfo[f].deleted == "blurry") { + commands.push("mv -vi " + escaped_filename + " \"$BLURRYDIR\""); + } else 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(escaped_filename); + 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); }); @@ -160,8 +219,40 @@ Mousetrap.bind(['m n', 'm l'], function() { move(1); }); Mousetrap.bind(['m n', 'm h'], function() { move(-1); }); Mousetrap.bind(['b', 'k'], function() { change_exposure(1); }); Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); }); -Mousetrap.bind('x', mark_deleted); +Mousetrap.bind('0', move_to_begenning); +Mousetrap.bind('$', move_to_end); +Mousetrap.bind('x', function(){ mark_deleted("deleted"); }); Mousetrap.bind('X', mark_not_deleted); +Mousetrap.bind('e', function(){ mark_deleted("extra"); }); +Mousetrap.bind('E', mark_not_deleted); +Mousetrap.bind('g', function(){ mark_deleted("blurry"); }); +Mousetrap.bind('G', mark_not_deleted); Mousetrap.bind('r', rotate); +Mousetrap.bind('i', announce); +Mousetrap.bind('f', function() { say(files[input_index]); }); +Mousetrap.bind('B', 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(); }); + +function clean_picinfo() { + files_index = {}; + $.each(files, function(i, f) { + files_index[f] = true; + }); + for (f in picinfo) { + if (!files_index[f]) { + delete picinfo[f]; + } + } +} + +function undelete_all() { + for (f in picinfo) { + delete picinfo[f].deleted; + } + save_picinfo(); + say("Undeleted everything"); +}