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

* fix movie/nfo matching

This commit is contained in:
Reinhard Pointner 2012-07-23 16:14:19 +00:00
parent 380aeea966
commit 09ec7c9dfb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,7 +351,7 @@ public class CmdlineOperations implements CmdlineInterface {
// match movie info to movie files that match the nfo file name // match movie info to movie files that match the nfo file name
SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new ParentFilter(nfo.getParentFile()))); SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new ParentFilter(nfo.getParentFile())));
String baseName = stripReleaseInfo(getName(nfo).toLowerCase()); String baseName = stripReleaseInfo(getName(nfo)).toLowerCase();
for (File movieFile : siblingMovieFiles) { for (File movieFile : siblingMovieFiles) {
if (stripReleaseInfo(getName(movieFile)).toLowerCase().startsWith(baseName)) { if (stripReleaseInfo(getName(movieFile)).toLowerCase().startsWith(baseName)) {
@ -378,7 +378,7 @@ public class CmdlineOperations implements CmdlineInterface {
movieMatchFiles.addAll(filter(files, DISK_FOLDERS)); movieMatchFiles.addAll(filter(files, DISK_FOLDERS));
movieMatchFiles.addAll(filter(orphanedFiles, SUBTITLE_FILES)); // run movie detection only on orphaned subtitle files movieMatchFiles.addAll(filter(orphanedFiles, SUBTITLE_FILES)); // run movie detection only on orphaned subtitle files
// map movies to (possibly multiple) files (in natural order) // map movies to (possibly multiple) files (in natural order)
Map<Movie, SortedSet<File>> filesByMovie = new HashMap<Movie, SortedSet<File>>(); Map<Movie, SortedSet<File>> filesByMovie = new HashMap<Movie, SortedSet<File>>();
// map all files by movie // map all files by movie
@ -509,7 +509,7 @@ public class CmdlineOperations implements CmdlineInterface {
CLILogger.info(format("Skipped [%s] because [%s] already exists", source, destination)); CLILogger.info(format("Skipped [%s] because [%s] already exists", source, destination));
} }
// remember successfully renamed matches for history entry and possible revert // remember successfully renamed matches for history entry and possible revert
renameLog.add(new SimpleImmutableEntry<File, File>(source, destination)); renameLog.add(new SimpleImmutableEntry<File, File>(source, destination));
} catch (IOException e) { } catch (IOException e) {
CLILogger.warning(format("[%s] Failed to rename [%s]", renameAction, it.getKey())); CLILogger.warning(format("[%s] Failed to rename [%s]", renameAction, it.getKey()));

4
source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
View File

@ -124,7 +124,7 @@ class MovieHashMatcher implements AutoCompleteMatcher {
// match movie info to movie files that match the nfo file name // match movie info to movie files that match the nfo file name
SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new ParentFilter(nfo.getParentFile()))); SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new ParentFilter(nfo.getParentFile())));
String baseName = stripReleaseInfo(getName(nfo).toLowerCase()); String baseName = stripReleaseInfo(getName(nfo)).toLowerCase();
for (File movieFile : siblingMovieFiles) { for (File movieFile : siblingMovieFiles) {
if (stripReleaseInfo(getName(movieFile)).toLowerCase().startsWith(baseName)) { if (stripReleaseInfo(getName(movieFile)).toLowerCase().startsWith(baseName)) {
@ -181,7 +181,7 @@ class MovieHashMatcher implements AutoCompleteMatcher {
executor.shutdownNow(); executor.shutdownNow();
} }
// map movies to (possibly multiple) files (in natural order) // map movies to (possibly multiple) files (in natural order)
Map<Movie, SortedSet<File>> filesByMovie = new HashMap<Movie, SortedSet<File>>(); Map<Movie, SortedSet<File>> filesByMovie = new HashMap<Movie, SortedSet<File>>();
// collect movie part data // collect movie part data