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

* support inferred media file for folder types => use first child video file 

* auto-clean path separators / \ from binding results
This commit is contained in:
Reinhard Pointner 2012-07-26 18:25:44 +00:00
parent 493eabb215
commit 7d1fa79855
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/net/sourceforge/filebot/format/MediaBindingBean.java
View File

@ -3,6 +3,7 @@ package net.sourceforge.filebot.format;
import static java.util.Arrays.*; import static java.util.Arrays.*;
import static java.util.Collections.*;
import static net.sourceforge.filebot.MediaTypes.*; import static net.sourceforge.filebot.MediaTypes.*;
import static net.sourceforge.filebot.format.Define.*; import static net.sourceforge.filebot.format.Define.*;
import static net.sourceforge.filebot.hash.VerificationUtilities.*; import static net.sourceforge.filebot.hash.VerificationUtilities.*;
@ -14,13 +15,14 @@ import static net.sourceforge.tuned.StringUtilities.*;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Scanner; import java.util.Scanner;
import java.util.Set; import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import net.sourceforge.filebot.Cache; import net.sourceforge.filebot.Cache;
import net.sourceforge.filebot.WebServices; import net.sourceforge.filebot.WebServices;
@ -272,7 +274,7 @@ public class MediaBindingBean {
String width = getMediaInfo(StreamKind.Video, 0, "Width"); String width = getMediaInfo(StreamKind.Video, 0, "Width");
String height = getMediaInfo(StreamKind.Video, 0, "Height"); String height = getMediaInfo(StreamKind.Video, 0, "Height");
return Arrays.asList(width != null ? Integer.parseInt(width) : null, height != null ? Integer.parseInt(height) : null); return asList(width != null ? Integer.parseInt(width) : null, height != null ? Integer.parseInt(height) : null);
} }
@ -525,6 +527,12 @@ public class MediaBindingBean {
return movieFile; return movieFile;
} }
} }
} else if (mediaFile.isDirectory()) {
// just select the first video file in the folder as media sample
SortedSet<File> videos = new TreeSet<File>(filter(listFiles(singleton(mediaFile), 2, false), VIDEO_FILES));
if (videos.size() > 0) {
return videos.iterator().next();
}
} }
return mediaFile; return mediaFile;
@ -533,7 +541,7 @@ public class MediaBindingBean {
private void checkMediaFile() throws RuntimeException { private void checkMediaFile() throws RuntimeException {
// make sure file is not null, and that it is an existing file // make sure file is not null, and that it is an existing file
if (mediaFile == null || !mediaFile.isFile()) if (mediaFile == null)
throw new RuntimeException("Invalid media file: " + mediaFile); throw new RuntimeException("Invalid media file: " + mediaFile);
} }
@ -576,8 +584,14 @@ public class MediaBindingBean {
public Object getProperty(String name) { public Object getProperty(String name) {
Object value = super.getProperty(name); Object value = super.getProperty(name);
if (value == null) if (value == null) {
throw new BindingException(name, "undefined"); throw new BindingException(name, "undefined");
}
// auto-clean value of path separators
if (value instanceof CharSequence) {
return replacePathSeparators(value.toString()).trim();
}
return value; return value;
} }

6
source/net/sourceforge/filebot/web/TMDbClient.java
View File

@ -120,9 +120,9 @@ public class TMDbClient implements MovieIdentificationService {
} else if (movie.getImdbId() >= 0) { } else if (movie.getImdbId() >= 0) {
return getMovieInfo(String.format("tt%07d", movie.getImdbId()), locale, true); return getMovieInfo(String.format("tt%07d", movie.getImdbId()), locale, true);
} else { } else {
for (Movie it : searchMovie(movie.getName(), locale)) { for (Movie result : searchMovie(movie.getName(), locale)) {
if (movie.getName().equalsIgnoreCase(it.getName()) && movie.getYear() == it.getYear()) { if (movie.getName().equalsIgnoreCase(result.getName()) && movie.getYear() == result.getYear()) {
return getMovieInfo(String.valueOf(movie.getTmdbId()), locale, true); return getMovieInfo(String.valueOf(result.getTmdbId()), locale, true);
} }
} }
} }