Generalize mark_deleted

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 31091fa8de234677a3165d7c4d085bd1bd4508b1..4f04c056f124dce00d34a393c2f205d7ba0b434b 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -108,10 +108,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() {


@@ -209,18 +209,30 @@ 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(['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', function(){ mark_deleted("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_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('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(); });
 
 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;
 function undelete_all() {
   for (f in picinfo) {
        delete picinfo[f].deleted;