From: Scott Worley Date: Sun, 21 Dec 2014 20:01:48 +0000 (-0800) Subject: Emit 'rm' commands for deleted pictures X-Git-Url: http://git.scottworley.com/picsort/commitdiff_plain/613324490beb9af12d5da99028a2d36eac58d592?hp=aa798f2c8355594c0a3b01a2595308fbe7dc7694 Emit 'rm' commands for deleted pictures --- diff --git a/picsorter.js b/picsorter.js index 4f04c05..bbd2554 100644 --- a/picsorter.js +++ b/picsorter.js @@ -174,8 +174,12 @@ function shell_escape(x) { function show_commands() { var commands = []; $.each(files, function(i, f) { - if ("name" in picinfo[f] && picinfo[f].name.length > 0 && - !("deleted" in picinfo[f])) { + if ("name" in picinfo[f] && picinfo[f].name.length > 0) { + var escaped_filename = "'" + shell_escape(picinfo[f].name) + "'"; + if (picinfo[f].deleted == "deleted") { + commands.push("rm " + escaped_filename); + return; + } var command = ["pic-mv"]; if ("exposure" in picinfo[f]) { command.push("-e " + picinfo[f].exposure); @@ -184,7 +188,7 @@ function show_commands() { command.push("-r " + picinfo[f].rotate); } command.push("'" + shell_escape(f) + "'"); - command.push("'" + shell_escape(picinfo[f].name) + "'"); + command.push(escaped_filename); commands.push(command.join(" ")); } });