moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-01-09 04:48:38 -05:00
Code Issues Releases Wiki Activity

// try to place embedded media title first

Browse Source
This commit is contained in:
Reinhard Pointner 2018-12-06 15:35:05 +07:00
parent 49b22e4137
commit 05700c63c6
1 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
source/net/filebot/format/MediaBindingBean.java
View File

@ -535,15 +535,15 @@ public class MediaBindingBean {
} }
@Define("source") @Define("source")
public String getVideoSource() { public String getVideoSource() throws Exception {
// look for video source patterns in media file and it's parent folder (use inferred media file) // look for video source patterns in media file and it's parent folder (use inferred media file)
return releaseInfo.getVideoSource(getMediaTitles()); return releaseInfo.getVideoSource(mediaTitles.get());
} }
@Define("tags") @Define("tags")
public List<String> getVideoTags() { public List<String> getVideoTags() throws Exception {
// look for video source patterns in media file and it's parent folder (use inferred media file) // look for video source patterns in media file and it's parent folder (use inferred media file)
List<String> matches = releaseInfo.getVideoTags(getMediaTitles()); List<String> matches = releaseInfo.getVideoTags(mediaTitles.get());
if (matches.isEmpty()) { if (matches.isEmpty()) {
return null; return null;
} }
@ -555,8 +555,8 @@ public class MediaBindingBean {
} }
@Define("s3d") @Define("s3d")
public String getStereoscopic3D() { public String getStereoscopic3D() throws Exception {
return releaseInfo.getStereoscopic3D(getMediaTitles()); return releaseInfo.getStereoscopic3D(mediaTitles.get());
} }
@Define("group") @Define("group")
@ -565,7 +565,7 @@ public class MediaBindingBean {
Pattern[] nonGroupPattern = { getKeywordExcludePattern(), releaseInfo.getVideoSourcePattern(), releaseInfo.getVideoFormatPattern(true), releaseInfo.getResolutionPattern(), releaseInfo.getStructureRootPattern() }; Pattern[] nonGroupPattern = { getKeywordExcludePattern(), releaseInfo.getVideoSourcePattern(), releaseInfo.getVideoFormatPattern(true), releaseInfo.getResolutionPattern(), releaseInfo.getStructureRootPattern() };
// consider foldername, filename and original filename of inferred media file // consider foldername, filename and original filename of inferred media file
String[] filenames = stream(getMediaTitles()).map(s -> releaseInfo.clean(s, nonGroupPattern)).filter(s -> s.length() > 0).toArray(String[]::new); String[] filenames = stream(mediaTitles.get()).map(s -> releaseInfo.clean(s, nonGroupPattern)).filter(s -> s.length() > 0).toArray(String[]::new);
// look for release group names in media file and it's parent folder // look for release group names in media file and it's parent folder
return releaseInfo.getReleaseGroup(filenames); return releaseInfo.getReleaseGroup(filenames);
@ -1293,50 +1293,33 @@ public class MediaBindingBean {
return getMediaInfo().snapshot().get(kind).stream().map(m -> new AssociativeScriptObject(m, this::undefined)).collect(toList()); return getMediaInfo().snapshot().get(kind).stream().map(m -> new AssociativeScriptObject(m, this::undefined)).collect(toList());
} }
private final Resource<String[]> mediaTitles = Resource.lazy(() -> {
// try to place embedded media title first
try {
String mediaTitle = getMediaInfo().getTitle();
if (mediaTitle.length() > 0) {
return Stream.concat(Stream.of(mediaTitle), stream(getFileNames(getInferredMediaFile()))).toArray(String[]::new);
}
} catch (Exception e) {
debug.warning("Failed to read media title: " + e.getMessage());
}
// default to file name and xattr
return getFileNames(getInferredMediaFile());
});
private String[] getFileNames(File file) { private String[] getFileNames(File file) {
List<String> names = new ArrayList<String>(); List<String> names = new ArrayList<String>();
// current file name
names.add(getNameWithoutExtension(file.getName()));
// original file name via xattr // original file name via xattr
String original = xattr.getOriginalName(file); String original = xattr.getOriginalName(file);
if (original != null) { if (original != null) {
names.add(getNameWithoutExtension(original)); names.add(getNameWithoutExtension(original));
} }
// current folder name
File parent = file.getParentFile();
if (parent != null && parent.getParent() != null) {
names.add(parent.getName());
}
return names.toArray(new String[0]);
}
private String[] getMediaTitles() {
File file = getInferredMediaFile();
List<String> names = new ArrayList<String>();
// current file name // current file name
names.add(getNameWithoutExtension(file.getName())); names.add(getNameWithoutExtension(file.getName()));
// media title via embedded tags
try {
String title = getMediaInfo().get(StreamKind.General, 0, "Title");
if (title.length() > 0) {
names.add(title);
}
} catch (Exception e) {
debug.fine(e::toString);
}
// original file name via xattr
String original = xattr.getOriginalName(file);
if (original != null) {
names.add(getNameWithoutExtension(original));
}
// current folder name // current folder name
File parent = file.getParentFile(); File parent = file.getParentFile();
if (parent != null && parent.getParent() != null) { if (parent != null && parent.getParent() != null) {