X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2Fargparser%2FArgParser.java;h=6d1251ce97bc1adf581676f7d9f691b992a7a79c;hb=b382fe5af3f138ede6db2ab1efc05ddd0819eea6;hp=7d4f187008a353fc7b08da9702e4c9669d59c27a;hpb=404d5b51a7a7781ad6924df6a7ce63c754370f16;p=jalview.git diff --git a/src/jalview/bin/argparser/ArgParser.java b/src/jalview/bin/argparser/ArgParser.java index 7d4f187..6d1251c 100644 --- a/src/jalview/bin/argparser/ArgParser.java +++ b/src/jalview/bin/argparser/ArgParser.java @@ -26,19 +26,26 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.EnumSet; +import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import jalview.bin.Cache; import jalview.bin.Console; import jalview.bin.Jalview; import jalview.bin.argparser.Arg.Opt; +import jalview.bin.argparser.Arg.Type; import jalview.util.FileUtils; +import jalview.util.HttpUtils; public class ArgParser { + protected static final String SINGLEDASH = "-"; + protected static final String DOUBLEDASH = "--"; protected static final char EQUALS = '='; @@ -48,28 +55,46 @@ public class ArgParser // the default linked id prefix used for no id (not even square braces) protected static final String DEFAULTLINKEDIDPREFIX = "JALVIEW:"; + // the linkedId string used to match all linkedIds seen so far + protected static final String MATCHALLLINKEDIDS = "*"; + + // the linkedId string used to match all of the last --open'ed linkedIds + protected static final String MATCHOPENEDLINKEDIDS = "open*"; + // the counter added to the default linked id prefix private int defaultLinkedIdCounter = 0; - // the linked id prefix used for --opennew files - protected static final String OPENNEWLINKEDIDPREFIX = "OPENNEW:"; + // the substitution string used to use the defaultLinkedIdCounter + private static final String DEFAULTLINKEDIDCOUNTER = "{}"; - // the counter added to the default linked id prefix - private int opennewLinkedIdCounter = 0; + // the counter added to the default linked id prefix. NOW using + // linkedIdAutoCounter + // private int openLinkedIdCounter = 0; + + // the linked id prefix used for --open files. NOW the same as DEFAULT + protected static final String OPENLINKEDIDPREFIX = DEFAULTLINKEDIDPREFIX; + + // the counter used for {n} substitutions + private int linkedIdAutoCounter = 0; // the linked id substitution string used to increment the idCounter (and use // the incremented value) - private static final String INCREMENTAUTOCOUNTERLINKEDID = "{++n}"; + private static final String INCREMENTLINKEDIDAUTOCOUNTER = "{++n}"; // the linked id substitution string used to use the idCounter - private static final String AUTOCOUNTERLINKEDID = "{n}"; + private static final String LINKEDIDAUTOCOUNTER = "{n}"; + + // the linked id substitution string used to use the filename extension of + // --append + // or --open + private static final String LINKEDIDEXTENSION = "{extension}"; - // the linked id substitution string used to use the base filename of --open - // or --opennew + // the linked id substitution string used to use the base filename of --append + // or --open private static final String LINKEDIDBASENAME = "{basename}"; - // the linked id substitution string used to use the dir path of --open - // or --opennew + // the linked id substitution string used to use the dir path of --append + // or --open private static final String LINKEDIDDIRNAME = "{dirname}"; // the current argfile @@ -83,19 +108,34 @@ public class ArgParser // --argfile name private static final String ARGFILEDIRNAME = "{argfiledirname}"; - private int linkedIdAutoCounter = 0; - // flag to say whether {n} subtitutions in output filenames should be made. - // Turn on and off with --subs and --nosubs - private boolean substitutions = false; + // Turn on and off with --substitutions and --nosubstitutions + // Start with it on + private boolean substitutions = true; + + // flag to say whether the default linkedId is the current default linked id + // or ALL linkedIds + private boolean allLinkedIds = false; + + // flag to say whether the default linkedId is the current default linked id + // or OPENED linkedIds + private boolean openedLinkedIds = false; protected static final Map argMap; protected Map linkedArgs = new HashMap<>(); - protected List linkedOrder = null; + protected List linkedOrder = new ArrayList<>(); + + protected List storedLinkedIds = new ArrayList<>(); + + protected List argList = new ArrayList<>(); + + private static final char ARGFILECOMMENT = '#'; - protected List argList; + private int argIndex = 0; + + private BootstrapArgs bootstrapArgs = null; static { @@ -107,7 +147,7 @@ public class ArgParser if (argMap.containsKey(argName)) { Console.warn("Trying to add argument name multiple times: '" - + argName + "'"); // RESTORE THIS WHEN MERGED + + argName + "'"); if (argMap.get(argName) != a) { Console.error( @@ -125,29 +165,32 @@ public class ArgParser public ArgParser(String[] args) { - this(args, false); + this(args, false, null); } - public ArgParser(String[] args, boolean initsubstitutions) + public ArgParser(String[] args, boolean initsubstitutions, + BootstrapArgs bsa) { // Make a mutable new ArrayList so that shell globbing parser works. // (When shell file globbing is used, there are a sequence of non-Arg // arguments (which are the expanded globbed filenames) that need to be - // consumed by the --open/--argfile/etc Arg which is most easily done by + // consumed by the --append/--argfile/etc Arg which is most easily done by // removing these filenames from the list one at a time. This can't be done // with an ArrayList made with only Arrays.asList(String[] args). ) - this(new ArrayList<>(Arrays.asList(args)), initsubstitutions); + this(new ArrayList<>(Arrays.asList(args)), initsubstitutions, false, + bsa); } public ArgParser(List args, boolean initsubstitutions) { - this(args, initsubstitutions, false); + this(args, initsubstitutions, false, null); } public ArgParser(List args, boolean initsubstitutions, - boolean allowPrivate) + boolean allowPrivate, BootstrapArgs bsa) { - // do nothing if there are no "--" args and some "-" args + // do nothing if there are no "--" args and (some "-" args || >0 arg is + // "open") boolean d = false; boolean dd = false; for (String arg : args) @@ -157,7 +200,7 @@ public class ArgParser dd = true; break; } - else if (arg.startsWith("-")) + else if (arg.startsWith("-") || arg.equals("open")) { d = true; } @@ -168,6 +211,10 @@ public class ArgParser parse(new ArrayList(), false, false); return; } + if (bsa != null) + this.bootstrapArgs = bsa; + else + this.bootstrapArgs = BootstrapArgs.getBootstrapArgs(args); parse(args, initsubstitutions, allowPrivate); } @@ -175,34 +222,39 @@ public class ArgParser boolean allowPrivate) { this.substitutions = initsubstitutions; - int argIndex = 0; boolean openEachInitialFilenames = true; for (int i = 0; i < args.size(); i++) { String arg = args.get(i); - // If the first arguments do not start with "--" or "-" or is "open" and - // is a filename that exists it is probably a file/list of files to open - // so we fake an Arg.OPEN argument and when adding files only add the + // If the first arguments do not start with "--" or "-" or is not "open" + // and` is a filename that exists it is probably a file/list of files to + // open so we fake an Arg.OPEN argument and when adding files only add the // single arg[i] and increment the defaultLinkedIdCounter so that each of // these files is opened separately. if (openEachInitialFilenames && !arg.startsWith(DOUBLEDASH) - && !arg.startsWith("-") && new File(arg).exists()) + && !arg.startsWith("-") && !arg.equals("open") + && (new File(arg).exists() + || HttpUtils.startsWithHttpOrHttps(arg))) { - arg = DOUBLEDASH + Arg.OPENNEW.getName(); + arg = Arg.OPEN.argString(); } else { openEachInitialFilenames = false; } - String argName = null; - String val = null; - List globVals = null; // for Opt.GLOB only - SubVals globSubVals = null; // also for use by Opt.GLOB only - String linkedId = null; + // look for double-dash, e.g. --arg if (arg.startsWith(DOUBLEDASH)) { + String argName = null; + String val = null; + List globVals = null; // for Opt.GLOB only + SubVals globSubVals = null; // also for use by Opt.GLOB only + String linkedId = null; + Type type = null; + + // look for equals e.g. --arg=value int equalPos = arg.indexOf(EQUALS); if (equalPos > -1) { @@ -213,17 +265,38 @@ public class ArgParser { argName = arg.substring(DOUBLEDASH.length()); } + + // look for linked ID e.g. --arg[linkedID] int idOpen = argName.indexOf('['); int idClose = argName.indexOf(']'); - if (idOpen > -1 && idClose == argName.length() - 1) { linkedId = argName.substring(idOpen + 1, idClose); argName = argName.substring(0, idOpen); } + // look for type modification e.g. --help-opening + int dashPos = argName.indexOf(SINGLEDASH); + if (dashPos > -1) + { + String potentialArgName = argName.substring(0, dashPos); + Arg potentialArg = argMap.get(potentialArgName); + if (potentialArg != null && potentialArg.hasOption(Opt.HASTYPE)) + { + String typeName = argName.substring(dashPos + 1); + try + { + type = Type.valueOf(typeName); + } catch (IllegalArgumentException e) + { + type = Type.INVALID; + } + argName = argName.substring(0, dashPos); + } + } + Arg a = argMap.get(argName); - // check for boolean prepended by "no" + // check for boolean prepended by "no" e.g. --nowrap boolean negated = false; if (a == null && argName.startsWith(NEGATESTRING) && argMap .containsKey(argName.substring(NEGATESTRING.length()))) @@ -237,13 +310,17 @@ public class ArgParser if (a == null) { // arg not found - Console.error("Argument '" + arg + "' not recognised. Ignoring."); + Console.error("Argument '" + arg + "' not recognised. Exiting."); + Jalview.exit("Invalid argument used." + System.lineSeparator() + + "Use" + System.lineSeparator() + "jalview " + + Arg.HELP.argString() + System.lineSeparator() + + "for a usage statement.", 13); continue; } if (a.hasOption(Opt.PRIVATE) && !allowPrivate) { - Console.error("Argument '" + DOUBLEDASH + argName - + "' is private. Ignoring."); + Console.error( + "Argument '" + a.argString() + "' is private. Ignoring."); continue; } if (!a.hasOption(Opt.BOOLEAN) && negated) @@ -256,7 +333,7 @@ public class ArgParser if (!a.hasOption(Opt.STRING) && equalPos > -1) { // set --argname=value when arg does not accept values - Console.error("Argument '" + DOUBLEDASH + argName + Console.error("Argument '" + a.argString() + "' does not expect a value (given as '" + arg + "'). Ignoring."); continue; @@ -264,7 +341,7 @@ public class ArgParser if (!a.hasOption(Opt.LINKED) && linkedId != null) { // set --argname[linkedId] when arg does not use linkedIds - Console.error("Argument '" + DOUBLEDASH + argName + Console.error("Argument '" + a.argString() + "' does not expect a linked id (given as '" + arg + "'). Ignoring."); continue; @@ -278,7 +355,7 @@ public class ArgParser if (a.hasOption(Opt.GLOB)) { // strip off and save the SubVals to be added individually later - globSubVals = ArgParser.getSubVals(val); + globSubVals = new SubVals(val); // make substitutions before looking for files String fileGlob = makeSubstitutions(globSubVals.getContent(), linkedId); @@ -321,11 +398,7 @@ public class ArgParser // make NOACTION adjustments // default and auto counter increments - if (a == Arg.INCREMENT) - { - defaultLinkedIdCounter++; - } - else if (a == Arg.NPP) + if (a == Arg.NPP) { linkedIdAutoCounter++; } @@ -341,24 +414,67 @@ public class ArgParser { argFile = null; } + else if (a == Arg.ALL) + { + allLinkedIds = !negated; + openedLinkedIds = false; + } + else if (a == Arg.OPENED) + { + openedLinkedIds = !negated; + allLinkedIds = false; + } + + if (a.hasOption(Opt.STORED)) + { + // reset the lastOpenedLinkedIds list + this.storedLinkedIds = new ArrayList<>(); + } + + // this is probably only Arg.NEW and Arg.OPEN + if (a.hasOption(Opt.INCREMENTDEFAULTCOUNTER)) + { + // use the next default prefixed OPENLINKEDID + defaultLinkedId(true); + } String autoCounterString = null; - boolean usingAutoCounterLinkedId = false; - String defaultLinkedId = new StringBuilder(DEFAULTLINKEDIDPREFIX) - .append(Integer.toString(defaultLinkedIdCounter)) - .toString(); + String defaultLinkedId = defaultLinkedId(false); boolean usingDefaultLinkedId = false; if (a.hasOption(Opt.LINKED)) { if (linkedId == null) { - if (a == Arg.OPENNEW) + if (a.hasOption(Opt.OUTPUT) && a.hasOption(Opt.ALLOWALL) + && val.startsWith(MATCHALLLINKEDIDS)) + { + // --output=*.ext is shorthand for --all --output {basename}.ext + // (or --image=*.ext) + allLinkedIds = true; + openedLinkedIds = false; + linkedId = MATCHALLLINKEDIDS; + val = LINKEDIDDIRNAME + File.separator + LINKEDIDBASENAME + + val.substring(MATCHALLLINKEDIDS.length()); + } + else if (a.hasOption(Opt.OUTPUT) && a.hasOption(Opt.ALLOWALL) + && val.startsWith(MATCHOPENEDLINKEDIDS)) + { + // --output=open*.ext is shorthand for --opened --output + // {basename}.ext + // (or --image=open*.ext) + openedLinkedIds = true; + allLinkedIds = false; + linkedId = MATCHOPENEDLINKEDIDS; + val = LINKEDIDDIRNAME + File.separator + LINKEDIDBASENAME + + val.substring(MATCHOPENEDLINKEDIDS.length()); + } + else if (allLinkedIds && a.hasOption(Opt.ALLOWALL)) { - // use the next default prefixed OPENNEWLINKEDID - linkedId = new StringBuilder(OPENNEWLINKEDIDPREFIX) - .append(Integer.toString(opennewLinkedIdCounter)) - .toString(); - opennewLinkedIdCounter++; + linkedId = MATCHALLLINKEDIDS; + } + else if (openedLinkedIds && a.hasOption(Opt.ALLOWALL)) + { + linkedId = MATCHOPENEDLINKEDIDS; } else { @@ -369,57 +485,55 @@ public class ArgParser + arg); } } - else if (linkedId.contains(AUTOCOUNTERLINKEDID)) + else if (linkedId.contains(LINKEDIDAUTOCOUNTER)) { // turn {n} to the autoCounter autoCounterString = Integer.toString(linkedIdAutoCounter); - linkedId = linkedId.replace(AUTOCOUNTERLINKEDID, + linkedId = linkedId.replace(LINKEDIDAUTOCOUNTER, autoCounterString); - usingAutoCounterLinkedId = true; Console.debug( "Changing linkedId to '" + linkedId + "' from " + arg); } - else if (linkedId.contains(INCREMENTAUTOCOUNTERLINKEDID)) + else if (linkedId.contains(INCREMENTLINKEDIDAUTOCOUNTER)) { // turn {++n} to the incremented autoCounter autoCounterString = Integer.toString(++linkedIdAutoCounter); - linkedId = linkedId.replace(INCREMENTAUTOCOUNTERLINKEDID, + linkedId = linkedId.replace(INCREMENTLINKEDIDAUTOCOUNTER, autoCounterString); - usingAutoCounterLinkedId = true; Console.debug( "Changing linkedId to '" + linkedId + "' from " + arg); } } - if (!linkedArgs.containsKey(linkedId)) - linkedArgs.put(linkedId, new ArgValuesMap()); - - // do not continue for NOACTION args + // do not continue in this block for NOACTION args if (a.hasOption(Opt.NOACTION)) continue; - ArgValuesMap avm = linkedArgs.get(linkedId); + ArgValuesMap avm = getOrCreateLinkedArgValuesMap(linkedId); // not dealing with both NODUPLICATEVALUES and GLOB if (a.hasOption(Opt.NODUPLICATEVALUES) && avm.hasValue(a, val)) { - Console.error("Argument '" + DOUBLEDASH + argName + Console.error("Argument '" + a.argString() + "' cannot contain a duplicate value ('" + val + "'). Ignoring this and subsequent occurrences."); continue; } // check for unique id - SubVals idsv = ArgParser.getSubVals(val); + SubVals idsv = new SubVals(val); String id = idsv.get(ArgValues.ID); if (id != null && avm.hasId(a, id)) { - Console.error("Argument '" + DOUBLEDASH + argName + Console.error("Argument '" + a.argString() + "' has a duplicate id ('" + id + "'). Ignoring."); continue; } - boolean argIndexIncremented = false; + /* TODO + * Change all avs.addValue() avs.setBoolean avs.setNegated() avs.incrementCount calls to checkfor linkedId == "*" + * DONE, need to check + */ ArgValues avs = avm.getOrCreateArgValues(a); // store appropriate String value(s) @@ -428,55 +542,93 @@ public class ArgParser if (a.hasOption(Opt.GLOB) && globVals != null && globVals.size() > 0) { - for (String v : globVals) + Enumeration gve = Collections.enumeration(globVals); + while (gve.hasMoreElements()) { - v = makeSubstitutions(v, linkedId); + String v = gve.nextElement(); SubVals vsv = new SubVals(globSubVals, v); - avs.addValue(vsv, v, argIndex++); - argIndexIncremented = true; + addValue(linkedId, type, avs, vsv, v, argIndex++, true); + // if we're using defaultLinkedId and the arg increments the + // counter: + if (gve.hasMoreElements() && usingDefaultLinkedId + && a.hasOption(Opt.INCREMENTDEFAULTCOUNTER)) + { + // increment the default linkedId + linkedId = defaultLinkedId(true); + // get new avm and avs + avm = linkedArgs.get(linkedId); + avs = avm.getOrCreateArgValues(a); + } } } else { - avs.addValue(makeSubstitutions(val, linkedId), argIndex); + addValue(linkedId, type, avs, val, argIndex, true); } } else if (a.hasOption(Opt.BOOLEAN)) { - avs.setBoolean(!negated, argIndex); - avs.setNegated(negated); + setBoolean(linkedId, type, avs, !negated, argIndex); + setNegated(linkedId, avs, negated); } else if (a.hasOption(Opt.UNARY)) { - avs.setBoolean(true, argIndex); + setBoolean(linkedId, type, avs, true, argIndex); } - avs.incrementCount(); - if (!argIndexIncremented) - argIndex++; - // store in appropriate place - if (a.hasOption(Opt.LINKED)) + // remove the '*' or 'open*' linkedId that should be empty if it was + // created + if ((MATCHALLLINKEDIDS.equals(linkedId) + && linkedArgs.containsKey(linkedId)) + || (MATCHOPENEDLINKEDIDS.equals(linkedId) + && linkedArgs.containsKey(linkedId))) { - // store the order of linkedIds - if (linkedOrder == null) - linkedOrder = new ArrayList<>(); - if (!linkedOrder.contains(linkedId)) - linkedOrder.add(linkedId); + linkedArgs.remove(linkedId); } + } + } + } + + private void finaliseStoringArgValue(String linkedId, ArgValues avs) + { + Arg a = avs.arg(); + incrementCount(linkedId, avs); + argIndex++; + + // store in appropriate place + if (a.hasOption(Opt.LINKED)) + { + // store the order of linkedIds + if (!linkedOrder.contains(linkedId)) + linkedOrder.add(linkedId); + } - // store arg in the list of args used - if (argList == null) - argList = new ArrayList<>(); - if (!argList.contains(a)) - argList.add(a); + // store arg in the list of args used + if (!argList.contains(a)) + argList.add(a); + } + private String defaultLinkedId(boolean increment) + { + String defaultLinkedId = new StringBuilder(DEFAULTLINKEDIDPREFIX) + .append(Integer.toString(defaultLinkedIdCounter)).toString(); + if (increment) + { + while (linkedArgs.containsKey(defaultLinkedId)) + { + defaultLinkedIdCounter++; + defaultLinkedId = new StringBuilder(DEFAULTLINKEDIDPREFIX) + .append(Integer.toString(defaultLinkedIdCounter)) + .toString(); } } + getOrCreateLinkedArgValuesMap(defaultLinkedId); + return defaultLinkedId; } - private String makeSubstitutions(String val, String linkedId) + public String makeSubstitutions(String val, String linkedId) { - if (!this.substitutions) + if (!this.substitutions || val == null) return val; String subvals; @@ -494,14 +646,15 @@ public class ArgParser subvals = ""; rest = val; } - if (rest.contains(AUTOCOUNTERLINKEDID)) - rest = rest.replace(AUTOCOUNTERLINKEDID, + if (rest.contains(LINKEDIDAUTOCOUNTER)) + rest = rest.replace(LINKEDIDAUTOCOUNTER, String.valueOf(linkedIdAutoCounter)); - if (rest.contains(INCREMENTAUTOCOUNTERLINKEDID)) - rest = rest.replace(INCREMENTAUTOCOUNTERLINKEDID, + if (rest.contains(INCREMENTLINKEDIDAUTOCOUNTER)) + rest = rest.replace(INCREMENTLINKEDIDAUTOCOUNTER, String.valueOf(++linkedIdAutoCounter)); - if (rest.contains("{}")) - rest = rest.replace("{}", String.valueOf(defaultLinkedIdCounter)); + if (rest.contains(DEFAULTLINKEDIDCOUNTER)) + rest = rest.replace(DEFAULTLINKEDIDCOUNTER, + String.valueOf(defaultLinkedIdCounter)); ArgValuesMap avm = linkedArgs.get(linkedId); if (avm != null) { @@ -509,6 +662,10 @@ public class ArgParser { rest = rest.replace(LINKEDIDBASENAME, avm.getBasename()); } + if (rest.contains(LINKEDIDEXTENSION)) + { + rest = rest.replace(LINKEDIDEXTENSION, avm.getExtension()); + } if (rest.contains(LINKEDIDDIRNAME)) { rest = rest.replace(LINKEDIDDIRNAME, avm.getDirname()); @@ -534,12 +691,11 @@ public class ArgParser /* * A helper method to take a list of String args where we're expecting * {"--previousargs", "--arg", "file1", "file2", "file3", "--otheroptionsornot"} - * and the index of the globbed arg, here 1. It returns a - * List {"file1", "file2", "file3"} - * *and remove these from the original list object* so that processing - * can continue from where it has left off, e.g. args has become - * {"--previousargs", "--arg", "--otheroptionsornot"} - * so the next increment carries on from the next --arg if available. + * and the index of the globbed arg, here 1. It returns a List {"file1", + * "file2", "file3"} *and remove these from the original list object* so that + * processing can continue from where it has left off, e.g. args has become + * {"--previousargs", "--arg", "--otheroptionsornot"} so the next increment + * carries on from the next --arg if available. */ protected static List getShellGlobbedFilenameValues(Arg a, List args, int i) @@ -554,9 +710,24 @@ public class ArgParser return vals; } + public BootstrapArgs getBootstrapArgs() + { + return bootstrapArgs; + } + public boolean isSet(Arg a) { - return a.hasOption(Opt.LINKED) ? isSet("", a) : isSet(null, a); + return a.hasOption(Opt.LINKED) ? isSetAtAll(a) : isSet(null, a); + } + + public boolean isSetAtAll(Arg a) + { + for (String linkedId : linkedOrder) + { + if (isSet(linkedId, a)) + return true; + } + return false; } public boolean isSet(String linkedId, Arg a) @@ -565,7 +736,7 @@ public class ArgParser return avm == null ? false : avm.containsArg(a); } - public boolean getBool(Arg a) + public boolean getBoolean(Arg a) { if (!a.hasOption(Opt.BOOLEAN) && !a.hasOption(Opt.UNARY)) { @@ -584,12 +755,12 @@ public class ArgParser return avs == null ? a.getDefaultBoolValue() : avs.getBoolean(); } - public List linkedIds() + public List getLinkedIds() { return linkedOrder; } - public ArgValuesMap linkedArgs(String id) + public ArgValuesMap getLinkedArgs(String id) { return linkedArgs.get(id); } @@ -600,16 +771,16 @@ public class ArgParser StringBuilder sb = new StringBuilder(); sb.append("UNLINKED\n"); sb.append(argValuesMapToString(linkedArgs.get(null))); - if (linkedIds() != null) + if (getLinkedIds() != null) { sb.append("LINKED\n"); - for (String id : linkedIds()) + for (String id : getLinkedIds()) { // already listed these as UNLINKED args if (id == null) continue; - ArgValuesMap avm = linkedArgs(id); + ArgValuesMap avm = getLinkedArgs(id); sb.append("ID: '").append(id).append("'\n"); sb.append(argValuesMapToString(avm)); } @@ -631,13 +802,8 @@ public class ArgParser return sb.toString(); } - public static SubVals getSubVals(String item) - { - return new SubVals(item); - } - public static ArgParser parseArgFiles(List argFilenameGlobs, - boolean initsubstitutions) + boolean initsubstitutions, BootstrapArgs bsa) { List argFiles = new ArrayList<>(); @@ -647,42 +813,379 @@ public class ArgParser argFiles.addAll(FileUtils.getFilesFromGlob(pattern)); } - return parseArgFileList(argFiles, initsubstitutions); + return parseArgFileList(argFiles, initsubstitutions, bsa); } public static ArgParser parseArgFileList(List argFiles, - boolean initsubstitutions) + boolean initsubstitutions, BootstrapArgs bsa) { List argsList = new ArrayList<>(); for (File argFile : argFiles) { if (!argFile.exists()) { - String message = DOUBLEDASH - + Arg.ARGFILE.name().toLowerCase(Locale.ROOT) + EQUALS - + "\"" + argFile.getPath() + "\": File does not exist."; + String message = Arg.ARGFILE.argString() + EQUALS + "\"" + + argFile.getPath() + "\": File does not exist."; Jalview.exit(message, 2); } try { - String setargfile = new StringBuilder(ArgParser.DOUBLEDASH) - .append(Arg.SETARGFILE.getName()).append(EQUALS) - .append(argFile.getCanonicalPath()).toString(); + String setargfile = new StringBuilder(Arg.SETARGFILE.argString()) + .append(EQUALS).append(argFile.getCanonicalPath()) + .toString(); argsList.add(setargfile); - argsList.addAll(Files.readAllLines(Paths.get(argFile.getPath()))); - argsList.add(new StringBuilder(ArgParser.DOUBLEDASH) - .append(Arg.UNSETARGFILE.getName()).toString()); + argsList.addAll(readArgFile(argFile)); + argsList.add(Arg.UNSETARGFILE.argString()); } catch (IOException e) { - String message = DOUBLEDASH - + Arg.ARGFILE.name().toLowerCase(Locale.ROOT) + "=\"" - + argFile.getPath() + "\": File could not be read."; + String message = Arg.ARGFILE.argString() + "=\"" + argFile.getPath() + + "\": File could not be read."; Jalview.exit(message, 3); } } // Third param "true" uses Opt.PRIVATE args --setargile=argfile and // --unsetargfile - return new ArgParser(argsList, initsubstitutions, true); + return new ArgParser(argsList, initsubstitutions, true, bsa); + } + + protected static List readArgFile(File argFile) + { + List args = new ArrayList<>(); + if (argFile != null && argFile.exists()) + { + try + { + for (String line : Files.readAllLines(Paths.get(argFile.getPath()))) + { + if (line != null && line.length() > 0 + && line.charAt(0) != ARGFILECOMMENT) + args.add(line); + } + } catch (IOException e) + { + String message = Arg.ARGFILE.argString() + "=\"" + argFile.getPath() + + "\": File could not be read."; + Console.debug(message, e); + Jalview.exit(message, 3); + } + } + return args; + } + + public static enum Position + { + FIRST, BEFORE, AFTER + } + + // get from following Arg of type a or subval of same name (lowercase) + public static String getValueFromSubValOrArg(ArgValuesMap avm, + ArgValue av, Arg a, SubVals sv) + { + return getFromSubValArgOrPref(avm, av, a, sv, null, null, null); + } + + // get from following Arg of type a or subval key or preference pref or + // default def + public static String getFromSubValArgOrPref(ArgValuesMap avm, ArgValue av, + Arg a, SubVals sv, String key, String pref, String def) + { + return getFromSubValArgOrPref(avm, a, Position.AFTER, av, sv, key, pref, + def); + } + + // get from following(AFTER), first occurence of (FIRST) or previous (BEFORE) + // Arg of type a or subval key or preference pref or default def + public static String getFromSubValArgOrPref(ArgValuesMap avm, Arg a, + Position pos, ArgValue av, SubVals sv, String key, String pref, + String def) + { + return getFromSubValArgOrPrefWithSubstitutions(null, avm, a, pos, av, + sv, key, pref, def); + } + + public static String getFromSubValArgOrPrefWithSubstitutions(ArgParser ap, + ArgValuesMap avm, Arg a, Position pos, ArgValue av, SubVals sv, + String key, String pref, String def) + { + if (key == null) + key = a.getName(); + String value = null; + if (sv != null && sv.has(key) && sv.get(key) != null) + { + value = ap == null ? sv.get(key) + : sv.getWithSubstitutions(ap, avm.getLinkedId(), key); + } + else if (avm != null && avm.containsArg(a)) + { + if (pos == Position.FIRST && avm.getValue(a) != null) + value = avm.getValue(a); + else if (pos == Position.BEFORE + && avm.getClosestPreviousArgValueOfArg(av, a) != null) + value = avm.getClosestPreviousArgValueOfArg(av, a).getValue(); + else if (pos == Position.AFTER + && avm.getClosestNextArgValueOfArg(av, a) != null) + value = avm.getClosestNextArgValueOfArg(av, a).getValue(); + } + else + { + value = pref != null ? Cache.getDefault(pref, def) : def; + } + return value; + } + + public static boolean getBoolFromSubValOrArg(ArgValuesMap avm, Arg a, + SubVals sv) + { + return getFromSubValArgOrPref(avm, a, sv, null, null, false); + } + + public static boolean getFromSubValArgOrPref(ArgValuesMap avm, Arg a, + SubVals sv, String key, String pref, boolean def) + { + if ((key == null && a == null) || (sv == null && a == null)) + return false; + + boolean usingArgKey = false; + if (key == null) + { + key = a.getName(); + usingArgKey = true; + } + + String nokey = ArgParser.NEGATESTRING + key; + + // look for key or nokey in subvals first (if using Arg check options) + if (sv != null) + { + // check for true boolean + if (sv.has(key) && sv.get(key) != null) + { + if (usingArgKey) + { + if (!(a.hasOption(Opt.BOOLEAN) || a.hasOption(Opt.UNARY))) + { + Console.debug( + "Looking for boolean in subval from non-boolean/non-unary Arg " + + a.getName()); + return false; + } + } + return sv.get(key).toLowerCase(Locale.ROOT).equals("true"); + } + + // check for negative boolean (subval "no..." will be "true") + if (sv.has(nokey) && sv.get(nokey) != null) + { + if (usingArgKey) + { + if (!(a.hasOption(Opt.BOOLEAN))) + { + Console.debug( + "Looking for negative boolean in subval from non-boolean Arg " + + a.getName()); + return false; + } + } + return !sv.get(nokey).toLowerCase(Locale.ROOT).equals("true"); + } + } + + // check argvalues + if (avm != null && avm.containsArg(a)) + return avm.getBoolean(a); + + // return preference or default + return pref != null ? Cache.getDefault(pref, def) : def; + } + + // the following methods look for the "*" linkedId and add the argvalue to all + // linkedId ArgValues if it does. + // This version inserts the subvals sv into all created values + private void addValue(String linkedId, Type type, ArgValues avs, + SubVals sv, String v, int argIndex, boolean doSubs) + { + this.argValueOperation(Op.ADDVALUE, linkedId, type, avs, sv, v, false, + argIndex, doSubs); + } + + private void addValue(String linkedId, Type type, ArgValues avs, String v, + int argIndex, boolean doSubs) + { + this.argValueOperation(Op.ADDVALUE, linkedId, type, avs, null, v, false, + argIndex, doSubs); + } + + private void setBoolean(String linkedId, Type type, ArgValues avs, + boolean b, int argIndex) + { + this.argValueOperation(Op.SETBOOLEAN, linkedId, type, avs, null, null, + b, argIndex, false); + } + + private void setNegated(String linkedId, ArgValues avs, boolean b) + { + this.argValueOperation(Op.SETNEGATED, linkedId, null, avs, null, null, + b, 0, false); + } + + private void incrementCount(String linkedId, ArgValues avs) + { + this.argValueOperation(Op.INCREMENTCOUNT, linkedId, null, avs, null, + null, false, 0, false); + } + + private enum Op + { + ADDVALUE, SETBOOLEAN, SETNEGATED, INCREMENTCOUNT + } + + // The following operations look for the "*" and "open*" linkedIds and add the + // argvalue to all appropriate linkedId ArgValues if it does. + // If subvals are supplied, they are inserted into all new set values. + private void argValueOperation(Op op, String linkedId, Type type, + ArgValues avs, SubVals sv, String v, boolean b, int argIndex, + boolean doSubs) + { + Arg a = avs.arg(); + + List wildcardLinkedIds = null; + if (a.hasOption(Opt.ALLOWALL)) + { + switch (linkedId) + { + case MATCHALLLINKEDIDS: + wildcardLinkedIds = getLinkedIds(); + break; + case MATCHOPENEDLINKEDIDS: + wildcardLinkedIds = this.storedLinkedIds; + break; + } + } + + // if we're not a wildcard linkedId and the arg is marked to be stored, add + // to storedLinkedIds + if (linkedId != null && wildcardLinkedIds == null + && a.hasOption(Opt.STORED) + && !storedLinkedIds.contains(linkedId)) + { + storedLinkedIds.add(linkedId); + } + + // if we are a wildcard linkedId, apply the arg and value to all appropriate + // linkedIds + if (wildcardLinkedIds != null) + { + for (String id : wildcardLinkedIds) + { + // skip incorrectly stored wildcard ids! + if (id == null || MATCHALLLINKEDIDS.equals(id) + || MATCHOPENEDLINKEDIDS.equals(id)) + continue; + ArgValuesMap avm = linkedArgs.get(id); + // don't set an output if there isn't an input + if (a.hasOption(Opt.REQUIREINPUT) + && !avm.hasArgWithOption(Opt.INPUT)) + continue; + + ArgValues tavs = avm.getOrCreateArgValues(a); + switch (op) + { + + case ADDVALUE: + String val = v; + if (sv != null) + { + if (doSubs) + { + val = makeSubstitutions(v, id); + sv = new SubVals(sv, val); + } + tavs.addValue(sv, type, val, argIndex, true); + } + else + { + if (doSubs) + { + val = makeSubstitutions(v, id); + } + tavs.addValue(type, val, argIndex, true); + } + finaliseStoringArgValue(id, tavs); + break; + + case SETBOOLEAN: + tavs.setBoolean(type, b, argIndex, true); + finaliseStoringArgValue(id, tavs); + break; + + case SETNEGATED: + tavs.setNegated(b, true); + break; + + case INCREMENTCOUNT: + tavs.incrementCount(); + break; + + default: + break; + + } + + } + } + else // no wildcard linkedId -- do it simpler + { + switch (op) + { + case ADDVALUE: + String val = v; + if (sv != null) + { + if (doSubs) + { + val = makeSubstitutions(v, linkedId); + sv = new SubVals(sv, val); + } + avs.addValue(sv, type, val, argIndex, false); + } + else + { + if (doSubs) + { + val = makeSubstitutions(v, linkedId); + } + avs.addValue(type, val, argIndex, false); + } + finaliseStoringArgValue(linkedId, avs); + break; + + case SETBOOLEAN: + avs.setBoolean(type, b, argIndex, false); + finaliseStoringArgValue(linkedId, avs); + break; + + case SETNEGATED: + avs.setNegated(b, false); + break; + + case INCREMENTCOUNT: + avs.incrementCount(); + break; + + default: + break; + } + } + } + + private ArgValuesMap getOrCreateLinkedArgValuesMap(String linkedId) + { + if (linkedArgs.containsKey(linkedId) + && linkedArgs.get(linkedId) != null) + return linkedArgs.get(linkedId); + + linkedArgs.put(linkedId, new ArgValuesMap(linkedId)); + return linkedArgs.get(linkedId); } } \ No newline at end of file