moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-11-02 08:25:02 -04:00
Code Issues Releases Wiki Activity

filebot -revert /path command

Browse Source
This commit is contained in:
Reinhard Pointner 2016-03-10 19:23:12 +00:00
parent 94517baa98
commit 8f258542ea
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/net/filebot/cli/ArgumentBean.java
View File

@ -27,7 +27,7 @@ public class ArgumentBean {
@Option(name = "--mode", usage = "Open GUI in single panel mode", metaVar = "[Rename, Subtitles, SFV]") @Option(name = "--mode", usage = "Open GUI in single panel mode", metaVar = "[Rename, Subtitles, SFV]")
public String mode = null; public String mode = null;
@Option(name = "-rename", usage = "Rename media files", metaVar = "fileset") @Option(name = "-rename", usage = "Rename media files")
public boolean rename = false; public boolean rename = false;
@Option(name = "--db", usage = "Database", metaVar = "[TheTVDB, AniDB] or [TheMovieDB] or [AcoustID, ID3 Tags] or [xattr]") @Option(name = "--db", usage = "Database", metaVar = "[TheTVDB, AniDB] or [TheMovieDB] or [AcoustID, ID3 Tags] or [xattr]")
@ -36,7 +36,7 @@ public class ArgumentBean {
@Option(name = "--order", usage = "Episode order", metaVar = "[Airdate, Absolute, DVD]") @Option(name = "--order", usage = "Episode order", metaVar = "[Airdate, Absolute, DVD]")
public String order = "Airdate"; public String order = "Airdate";
@Option(name = "--action", usage = "Rename action", metaVar = "[Move, Copy, Keeplink, Symlink, Hardlink, Test]") @Option(name = "--action", usage = "Rename action", metaVar = "[move, copy, keeplink, symlink, hardlink, test]")
public String action = "move"; public String action = "move";
@Option(name = "--conflict", usage = "Conflict resolution", metaVar = "[skip, override, auto, index, fail]") @Option(name = "--conflict", usage = "Conflict resolution", metaVar = "[skip, override, auto, index, fail]")
@ -48,22 +48,22 @@ public class ArgumentBean {
@Option(name = "--format", usage = "Format expression", metaVar = "expression") @Option(name = "--format", usage = "Format expression", metaVar = "expression")
public String format; public String format;
@Option(name = "-non-strict", usage = "Enable advanced matching and more aggressive guess work") @Option(name = "-non-strict", usage = "Enable advanced matching and more aggressive guessing")
public boolean nonStrict = false; public boolean nonStrict = false;
@Option(name = "-get-subtitles", usage = "Fetch subtitles", metaVar = "fileset") @Option(name = "-get-subtitles", usage = "Fetch subtitles")
public boolean getSubtitles; public boolean getSubtitles;
@Option(name = "--q", usage = "Force lookup query", metaVar = "series/movie title") @Option(name = "--q", usage = "Force lookup query", metaVar = "series/movie title")
public String query; public String query;
@Option(name = "--lang", usage = "Language", metaVar = "2-letter language code") @Option(name = "--lang", usage = "Language", metaVar = "3-letter language code")
public String lang = "en"; public String lang = "en";
@Option(name = "-check", usage = "Create/Check verification files", metaVar = "fileset") @Option(name = "-check", usage = "Create/Check verification files")
public boolean check; public boolean check;
@Option(name = "--output", usage = "Output path", metaVar = "folder") @Option(name = "--output", usage = "Output path", metaVar = "/path")
public String output; public String output;
@Option(name = "--encoding", usage = "Output character encoding", metaVar = "[UTF-8, Windows-1252]") @Option(name = "--encoding", usage = "Output character encoding", metaVar = "[UTF-8, Windows-1252]")
@ -81,13 +81,13 @@ public class ArgumentBean {
@Option(name = "-extract", usage = "Extract archives") @Option(name = "-extract", usage = "Extract archives")
public boolean extract = false; public boolean extract = false;
@Option(name = "-script", usage = "Run Groovy script", metaVar = "path/to/script.groovy") @Option(name = "-script", usage = "Run Groovy script", metaVar = "[fn:name] or [dev:name] or [/path/to/script.groovy]")
public String script = null; public String script = null;
@Option(name = "--log", usage = "Log level", metaVar = "[all, fine, info, warning, off]") @Option(name = "--log", usage = "Log level", metaVar = "[all, fine, info, warning, off]")
public String log = "all"; public String log = "all";
@Option(name = "--log-file", usage = "Log file", metaVar = "path/to/log.txt") @Option(name = "--log-file", usage = "Log file", metaVar = "/path/to/log.txt")
public String logFile = null; public String logFile = null;
@Option(name = "--log-lock", usage = "Lock log file", metaVar = "[yes, no]", handler = ExplicitBooleanOptionHandler.class) @Option(name = "--log-lock", usage = "Lock log file", metaVar = "[yes, no]", handler = ExplicitBooleanOptionHandler.class)

7
source/net/filebot/cli/CmdlineOperations.java
View File

@ -1086,14 +1086,17 @@ public class CmdlineOperations implements CmdlineInterface {
@Override @Override
public List<File> revert(Collection<File> files, String filter, boolean test) throws Exception { public List<File> revert(Collection<File> files, String filter, boolean test) throws Exception {
FileFilter fileFilter = filter == null || filter.isEmpty() ? f -> true : new ExpressionFileFilter(new ExpressionFilter(filter), false); if (files.isEmpty()) {
throw new CmdlineException("Expecting at least one input path");
}
FileFilter fileFilter = filter == null || filter.isEmpty() ? f -> true : new ExpressionFileFilter(new ExpressionFilter(filter), false);
Set<File> whitelist = new HashSet<File>(files); Set<File> whitelist = new HashSet<File>(files);
Map<File, File> history = HistorySpooler.getInstance().getCompleteHistory().getRenameMap(); Map<File, File> history = HistorySpooler.getInstance().getCompleteHistory().getRenameMap();
return history.entrySet().stream().filter(it -> { return history.entrySet().stream().filter(it -> {
File current = it.getValue(); File current = it.getValue();
return current.exists() && listPath(current).stream().anyMatch(whitelist::contains) && fileFilter.accept(current); return listPath(current).stream().anyMatch(whitelist::contains) && current.exists() && fileFilter.accept(current);
}).map(it -> { }).map(it -> {
File original = it.getKey(); File original = it.getKey();
File current = it.getValue(); File current = it.getValue();