function set_name(name) {
- picinfo[files[input_index]].name = name;
- save_picinfo();
- say("Named " + name);
- last_name = name;
+ if (name) {
+ picinfo[files[input_index]].name = name;
+ save_picinfo();
+ say("Named " + name);
+ last_name = name;
+ }
}
function set_name_from_form() {
var commands = [];
$.each(files, function(i, f) {
if ("name" in picinfo[f] && picinfo[f].name.length > 0) {
- var escaped_filename = "'" + shell_escape(picinfo[f].name) + "'";
+ var escaped_filename = "'" + shell_escape(f) + "'";
if (picinfo[f].deleted == "deleted") {
- commands.push("rm " + escaped_filename);
+ commands.push("shred -u " + escaped_filename);
+ return;
+ }
+ if (picinfo[f].deleted == "extra") {
+ commands.push("mv " + escaped_filename + " \"$EXTRADIR\"");
return;
}
var command = ["pic-mv"];
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(" "));
}
});
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]); });