Skip to content

Commit

Permalink
cleanup ExifToolCommands.java
Browse files Browse the repository at this point in the history
  • Loading branch information
@hvdwolf
hvdwolf committed Dec 4, 2020
1 parent 209e1f5 commit dd57bb7
Showing 1 changed file with 1 addition and 107 deletions.
108 changes: 1 addition & 107 deletions src/main/java/org/hvdw/jexiftoolgui/controllers/ExifToolCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public class ExifToolCommands {
private SelectFavorite SelFav = new SelectFavorite();

public void executeCommands(String Commands, JEditorPane Output, JRadioButton UseNonPropFontradioButton, JProgressBar progressBar) {
// public void executeCommands(String Commands, JTextArea Output, JRadioButton UseNonPropFontradioButton, JProgressBar progressBar) {
int[] selectedIndices = MyVariables.getSelectedFilenamesIndices();
File[] files = MyVariables.getLoadedFiles();
String fpath ="";
Expand Down Expand Up @@ -49,118 +48,18 @@ public void executeCommands(String Commands, JEditorPane Output, JRadioButton Us
} else if (Commands.contains("-htmlDump ")) {
logger.debug("htmlDump requested");
htmlDump = true;
//Output.setContentType("text/html");
} else if (Commands.contains("-h ") || Commands.contains("-htmlFormat ")) {
logger.debug("html output requested");
htmlOutput = true;
//Output.setContentType("text/html");
//commandOutput.append("<html><body><font face=\"Helvetica\">");
}

// Build the parameters
//cmdparams.clear();
//newCommands.clear();
//cmdparams.add(exiftool);
/*
// Below splits the commands on the exiftool leading - before the tag EXCEPT the starting one as it mostly does not contain a leading space
// so first check for leading "-"
if (Commands.startsWith("-")) {
Commands = " " + Commands;
}
// We could have something like: "-FileModifyDate<DateTimeOriginal" or '-FileModifyDate<DateTimeOriginal'
Commands = Commands.replace("\"-", "-").replace("'-", "-");
Commands = Commands.replace(" \"", " ").replace(" '", " ");
// And our total command could also start with or end with " or '
if (Commands.startsWith("\"") || Commands.startsWith("'")) {
Commands = Commands.substring(1);
}
if (Commands.endsWith("\"") || Commands.endsWith("'")) {
Commands = Commands.substring(0, (Commands.length()-1));
}
logger.info("modded Commands \"{}\"", Commands);
// Now we continue with the total parsing
if (Commands.contains(" -")) {
List<String> tmpcommands = Arrays.asList(Commands.split("\\s-"));
String tmp;
for (int i = 0; i < tmpcommands.size(); i++) { // First item (i=0) is empty
// we removed (split actually) on the " -", so we need to add the "-" again
// and we trim the command to get rid of leading and trailing spaces
tmp = tmpcommands.get(i).trim();
if (tmp.length() > 0) {
tmp = "-" + tmpcommands.get(i).trim();
}
// We hava a couple of options
// Not a "combined" string like (only) -b (binary, or -h (html output) etcetera
// like date format: -d %Y%m%d_%H%M%%-c_%%f.%%e
// or tag-value: -exif:artist=Peter Parker aka Spiderman
// or even something like: -FileModifyDate<DateTimeOriginal
// first check on "="
if (tmp.contains("=")) {
// nothing to do for the command. We can simply add it, like: -exif:artist=Peter Parker aka Spiderman
// However, it might still contain a single quote or double quote from a previous command like "-FileModifyDate<DateTimeOriginal"
newCommands.add(tmp.replace("\"", "").replace("'", ""));
} else if (tmp.contains("<") || tmp.contains(">")) {
// like -FileModifyDate<DateTimeOriginal
// remove everything around it (double or single quotes by the user) and do our thing to it.
// Most probably the leading quote or double quote is already missing as we split on the leading -
// which could be "- or '-
tmp = tmp.replace("\"", "").replace("'", "");
if (Utils.isOsFromMicrosoft()) {
newCommands.add("\"" + tmp + "\"");
} else {
newCommands.add("\"" + tmp + "\"");
}
} else if (tmp.contains(" ")) {
// We already covered the "=" with a value with lots of spaces
//Nowwe have something like: -d %Y%m%d_%H%M%%-c_%%f.%%e
// As the value can again contain lots of spaces like in a text, we can't
// simply split on space but need the substring to the first space,and then
// use everything behind it
// Again we need to cehck on a leading single or double quote or trailing single or double quote and remove it
if (tmp.startsWith("\"") || tmp.startsWith("'")) {
tmp = tmp.substring(1);
}
if (tmp.endsWith("\"") || tmp.endsWith("'")) {
tmp = tmp.substring(0, (tmp.length()-1));
}
firstIndexOf = tmp.indexOf(" ");
newCommands.add(tmp.substring(0, (firstIndexOf - 1) ));
newCommands.add(tmp.substring( (firstIndexOf + 1)) );
} else {
// Absolutely nothing of the above, so simply something like -iso or -imagewidth or -tab or -h
if (tmp.length() > 0) {
newCommands.add(tmp);
}
}
//logger.info("newCommands {}", newCommands.toString());

}
logger.info("new commands after complete parsing {}", newCommands.toString());
cmdparams.addAll(newCommands);
} else {
// The entire command does not contain exiftool options like -d, -exif:<tag> etcetera
// but it can still contain something like: "-FileModifyDate<DateTimeOriginal" in
// which we now removed all single or double quotes
if (Commands.contains("<") || Commands.contains(">")) {
if (Utils.isOsFromMicrosoft()) {
cmdparams.add("\"" + Commands + "\"");
} else {
cmdparams.add("\"" + Commands + "\"");
}
}
} */


// Try out
cmdparams.clear();
StringBuilder tmpcmpstring = new StringBuilder();
if (Utils.isOsFromMicrosoft()) {
cmdparams.add("cmd");
cmdparams.add("/c");
//cmdparams.add(Utils.platformExiftool());
//tmpcmpstring = new StringBuilder( " start \"\" " + Utils.platformExiftool() + " " + orgCommands + " ");
tmpcmpstring = new StringBuilder( " " + Utils.platformExiftool() + " " + orgCommands + " ");
//cmdparams.add(tmpcmpstring.toString());
} else { //Linux & MacOS
cmdparams.add("/bin/sh");
cmdparams.add("-c");
Expand All @@ -173,7 +72,6 @@ public void executeCommands(String Commands, JEditorPane Output, JRadioButton Us
logger.debug("finalIMG {}", finalIMG);

if (Utils.isOsFromMicrosoft()) {
//cmdparams.add(files[index].getPath().replace("\\", "/"));
tmpcmpstring.append(" ").append("\"" + files[index].getPath().replace("\\", "/") + "\"");
} else {
tmpcmpstring.append(" ").append(files[index].getPath().replace(" ", "\\ "));
Expand All @@ -183,10 +81,7 @@ public void executeCommands(String Commands, JEditorPane Output, JRadioButton Us
}
// for Windows, linux and MacOS
cmdparams.add(tmpcmpstring.toString());
/*if (Utils.isOsFromMicrosoft()) {
} else {
cmdparams.add(tmpcmpstring.toString());
}*/

logger.info("cmdparams {}", cmdparams.toString());

Executor executor = Executors.newSingleThreadExecutor();
Expand Down Expand Up @@ -214,7 +109,6 @@ public void executeCommands(String Commands, JEditorPane Output, JRadioButton Us
commandOutput.append(res);
commandOutput.append("\n\n");
Output.setText(commandOutput.toString());
// progressbar enabled immedately after this void run starts in the InvokeLater, so I disable it here at the end of this void run
progressBar.setVisible(false);
}
} catch (IOException | InterruptedException ex) {
Expand Down

0 comments on commit dd57bb7

Please sign in to comment.