Move startup stuff to start()

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index b07cfc67a500c916fbdd562a05879c7c9c2fc2a8..d10631cc008fef86930967e127d264c8bc28cb9c 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -1,21 +1,12 @@
 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;
 
+function save_picinfo() {
+  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
+}
+
 function endsWith(str, suffix) {
   return str.indexOf(suffix, str.length - suffix.length) !== -1;
 }
@@ -55,7 +46,11 @@ function say(message) {
   setTimeout(function() { $("#message").addClass("fade"); }, 100);
 }
 function announce() {
-  say(input_index + " " + (picinfo[files[input_index]].name || ""));
+  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() {
@@ -180,7 +175,9 @@ function show_commands() {
     if (picinfo[f].deleted == "deleted") {
       commands.push("shred -u " + escaped_filename);
     } else if (picinfo[f].deleted == "extra") {
-      commands.push("mv " + escaped_filename + " \"$EXTRADIR\"");
+      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]) {
@@ -198,37 +195,6 @@ function show_commands() {
   $("#shell_out").text(commands.join("\n")).show();
 }
 
-$(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"); });
-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('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('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) {
@@ -248,3 +214,48 @@ function undelete_all() {
   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; });
+}