Move startup stuff to start()

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 213a553ac488356fc9b15d4784c5e2bace04a51b..d10631cc008fef86930967e127d264c8bc28cb9c 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -1,21 +1,12 @@
 var picinfo = {};
 var picinfo = {};

-if ("picsorter_picinfo" in localStorage) {
-  picinfo = JSON.parse(localStorage.picsorter_picinfo);
-}
-$.each(files, function(i, f) {
-  if (!(f in picinfo)) {
-    picinfo[f] = {};
-  }
-});
-function save_picinfo() {
-  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
-}
-save_picinfo();
-

 var exposure = 20;
 var zoom = "sm/";
 var input_index = -1;
 
 var exposure = 20;
 var zoom = "sm/";
 var input_index = -1;
 

+function save_picinfo() {
+  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
+}
+

 function endsWith(str, suffix) {
   return str.indexOf(suffix, str.length - suffix.length) !== -1;
 }
 function endsWith(str, suffix) {
   return str.indexOf(suffix, str.length - suffix.length) !== -1;
 }


@@ -52,7 +43,14 @@ function setpic() {
 
 function say(message) {
   $("#message").text(message).removeClass("fade");
 
 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() {
 }
 
 function toggle_zoom() {


@@ -83,12 +81,18 @@ function move_by_filter(direction, filter) {
     }
   }
   input_index = new_index;
     }
   }
   input_index = new_index;

-  say(input_index + " " + (picinfo[files[input_index]].name || ""));
+  announce();

   setpic();
 }
 function move(direction) {
   move_by_filter(direction, function() { return true; });
 }
   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]]); });
 function move_to_nondeleted(direction) {
   move_by_filter(direction, function(i) {
     return !("deleted" in picinfo[files[i]]); });


@@ -99,10 +103,10 @@ function move_to_unnamed(direction) {
            !("name" in picinfo[files[i]]); });
 }
 
            !("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();
   save_picinfo();

-  say("Deleted");
+  say(method);

 }
 
 function mark_not_deleted() {
 }
 
 function mark_not_deleted() {


@@ -111,6 +115,15 @@ function mark_not_deleted() {
   say("Undeleted");
 }
 
   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");
 function change_exposure(amount) {
   if (!endsWith(files[input_index], ".NEF")) {
     say("Exposure adjustment not available");


@@ -120,8 +133,7 @@ function change_exposure(amount) {
   picinfo[files[input_index]].exposure = exposure;
   save_picinfo();
   setpic();
   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() {
 }
 
 function rotate() {


@@ -136,13 +148,20 @@ function rotate() {
   setpic(); 
 }
 
   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_input = $("#name").hide().get(0);

-  var name = name_input.value;
+  set_name(name_input.value);

   name_input.value = "";
   name_input.value = "";

-  picinfo[files[input_index]].name = name;
-  save_picinfo();
-  say("Named " + name);

 }
 
 function shell_escape(x) {
 }
 
 function shell_escape(x) {


@@ -152,7 +171,14 @@ function shell_escape(x) {
 function show_commands() {
   var commands = [];
   $.each(files, function(i, f) {
 function show_commands() {
   var commands = [];
   $.each(files, function(i, f) {

-    if ("name" in picinfo[f] && picinfo[f].name.length > 0) {
+    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);
       var command = ["pic-mv"];
       if ("exposure" in picinfo[f]) {
         command.push("-e " + picinfo[f].exposure);


@@ -160,32 +186,76 @@ function show_commands() {
       if ("rotate" in picinfo[f]) {
         command.push("-r " + picinfo[f].rotate);
       }
       if ("rotate" in picinfo[f]) {
         command.push("-r " + picinfo[f].rotate);
       }

-      command.push("'" + shell_escape(f) + "'");
+      command.push(escaped_filename);

       command.push("'" + shell_escape(picinfo[f].name) + "'");
       commands.push(command.join(" "));
     }
   });
       command.push("'" + shell_escape(picinfo[f].name) + "'");
       commands.push(command.join(" "));
     }
   });

+  commands.push("");

   $("#shell_out").text(commands.join("\n")).show();
 }
 
   $("#shell_out").text(commands.join("\n")).show();
 }
 

-$(function() {
-  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name(); });
-  move_to_nondeleted(1);
-});
-
-Mousetrap.bind('z', toggle_zoom);
-Mousetrap.bind('Z', function() { $("#pic").toggleClass("fit_view"); });
-Mousetrap.bind(['n', 'l'], function() { move_to_nondeleted(1); });
-Mousetrap.bind(['p', 'h'], function() { move_to_nondeleted(-1); });
-Mousetrap.bind(['N', 'L'], function() { move_to_unnamed(1); });
-Mousetrap.bind(['P', 'H'], function() { move_to_unnamed(-1); });
-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('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);
+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");
+}
+
+function start() {
+  if ("picsorter_picinfo" in localStorage) {
+    picinfo = JSON.parse(localStorage.picsorter_picinfo);
+  }
+  $.each(files, function(i, f) {
+    if (!(f in picinfo)) {
+      picinfo[f] = {};
+    }
+  });
+  save_picinfo();
+
+  $(function() {
+    $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name_from_form(); });
+    move_to_nondeleted(1);
+  });
+
+  Mousetrap.bind('z', toggle_zoom);
+  Mousetrap.bind('Z', function() { $("#pic").toggleClass("fit_view"); return false; });
+  Mousetrap.bind(['n', 'l'], function() { move_to_nondeleted(1); return false; });
+  Mousetrap.bind(['p', 'h'], function() { move_to_nondeleted(-1); return false; });
+  Mousetrap.bind(['N', 'L'], function() { move_to_unnamed(1); return false; });
+  Mousetrap.bind(['P', 'H'], function() { move_to_unnamed(-1); return false; });
+  Mousetrap.bind(['m n', 'm l'], function() { move(1); return false; });
+  Mousetrap.bind(['m n', 'm h'], function() { move(-1); return false; });
+  Mousetrap.bind(['b', 'k'], function() { change_exposure(1); return false; });
+  Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); return false; });
+  Mousetrap.bind('0', move_to_begenning);
+  Mousetrap.bind('$', move_to_end);
+  Mousetrap.bind('x', function(){ mark_deleted("deleted"); return false; });
+  Mousetrap.bind('X', mark_not_deleted);
+  Mousetrap.bind('e', function(){ mark_deleted("extra"); return false; });
+  Mousetrap.bind('E', mark_not_deleted);
+  Mousetrap.bind('g', function(){ mark_deleted("blurry"); return false; });
+  Mousetrap.bind('G', mark_not_deleted);
+  Mousetrap.bind('r', rotate);
+  Mousetrap.bind('i', announce);
+  Mousetrap.bind('f', function() { say(files[input_index]); return false; });
+  Mousetrap.bind('B', say_exposure);
+  Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });
+  Mousetrap.bind('C', function() { if (last_name) { set_name(last_name); } return false; });
+  Mousetrap.bind('%', function() { say((100 * input_index / files.length).toFixed(2) + "%"); return false; });
+  Mousetrap.bind('!', show_commands);
+  Mousetrap.bind('esc', function() { $("#name").hide(); $("#shell_out").hide(); return false; });
+}