A manually-callable cleanup utility

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 92294425889573f80d77e9c550b2477408518dc0..1f6b8f053da082a13c294005022b446c960216c1 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -52,7 +52,7 @@ 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() {
   say(input_index + " " + (picinfo[files[input_index]].name || ""));
 }
 function announce() {
   say(input_index + " " + (picinfo[files[input_index]].name || ""));


@@ -92,6 +92,12 @@ function move_by_filter(direction, filter) {
 function move(direction) {
   move_by_filter(direction, function() { return true; });
 }
 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]]); });


@@ -114,6 +120,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");


@@ -123,8 +138,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() {


@@ -193,13 +207,36 @@ 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(['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', mark_deleted);
 Mousetrap.bind('X', mark_not_deleted);
 Mousetrap.bind('r', rotate);
 Mousetrap.bind('i', announce);
 Mousetrap.bind('f', function() { say(files[input_index]); });
 Mousetrap.bind('x', mark_deleted);
 Mousetrap.bind('X', mark_not_deleted);
 Mousetrap.bind('r', rotate);
 Mousetrap.bind('i', announce);
 Mousetrap.bind('f', function() { say(files[input_index]); });

+Mousetrap.bind('e', 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(); });
 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");
+}