mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* ignore sample/trailer files also automatically in simple -rename calls as well

This commit is contained in:
Reinhard Pointner 2013-11-28 17:36:27 +00:00
parent 6ede531e7f
commit b40647ddf2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,10 @@ public class CmdlineOperations implements CmdlineInterface {
public List<File> renameSeries(Collection<File> files, RenameAction renameAction, ConflictAction conflictAction, File outputDir, ExpressionFormat format, EpisodeListProvider db, String query, SortOrder sortOrder, ExpressionFilter filter, Locale locale, boolean strict) throws Exception { public List<File> renameSeries(Collection<File> files, RenameAction renameAction, ConflictAction conflictAction, File outputDir, ExpressionFormat format, EpisodeListProvider db, String query, SortOrder sortOrder, ExpressionFilter filter, Locale locale, boolean strict) throws Exception {
CLILogger.config(format("Rename episodes using [%s]", db.getName())); CLILogger.config(format("Rename episodes using [%s]", db.getName()));
List<File> mediaFiles = filter(files, VIDEO_FILES, SUBTITLE_FILES); // ignore sample files
List<File> fileset = filter(files, not(getClutterFileFilter()));
List<File> mediaFiles = filter(fileset, VIDEO_FILES, SUBTITLE_FILES);
if (mediaFiles.isEmpty()) { if (mediaFiles.isEmpty()) {
throw new Exception("No media files: " + files); throw new Exception("No media files: " + files);
} }
@ -201,7 +204,7 @@ public class CmdlineOperations implements CmdlineInterface {
// handle derived files // handle derived files
List<Match<File, ?>> derivateMatches = new ArrayList<Match<File, ?>>(); List<Match<File, ?>> derivateMatches = new ArrayList<Match<File, ?>>();
SortedSet<File> derivateFiles = new TreeSet<File>(files); SortedSet<File> derivateFiles = new TreeSet<File>(fileset);
derivateFiles.removeAll(mediaFiles); derivateFiles.removeAll(mediaFiles);
for (File file : derivateFiles) { for (File file : derivateFiles) {