moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-08-13 17:03:45 -04:00
Code Issues Releases Wiki Activity

Use both "Channel(s)_Original" or "Channel(s)" just use the first one that actually has a valid value.

Browse Source 
https://www.filebot.net/forums/viewtopic.php?f=5&t=10773&p=43876#p43869
This commit is contained in:
Reinhard Pointner 2019-05-07 03:17:17 +07:00
parent bc25174fdc
commit 570e5ecbee
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,10 +387,10 @@ public class MediaBindingBean {
@Define("af")
public String getAudioChannels() {
String channels = getMediaInfo(StreamKind.Audio, 0, "Channel(s)_Original", "Channel(s)");
// e.g. 15 objects / 6 channels
int ch = tokenize(channels, SLASH).map(s -> matchInteger(s)).filter(Objects::nonNull).min(Integer::compare).get();
int ch = getMediaInfo(StreamKind.Audio, "Channel(s)_Original", "Channel(s)").map(channels -> {
// e.g. 15 objects / 6 channels
return tokenize(channels, SLASH).map(s -> matchInteger(s)).filter(Objects::nonNull).min(Integer::compare).orElse(null);
}).filter(Objects::nonNull).findFirst().get();
// get first number, e.g. 6ch
return ch + "ch";
@ -414,7 +414,7 @@ public class MediaBindingBean {
@Define("aco")
public String getAudioChannelObjects() {
return getMediaInfo(StreamKind.Audio, "Codec_Profile", "Format_Profile", "Format_Commercial").filter(Objects::nonNull).map(s -> {
return getMediaInfo(StreamKind.Audio, "Codec_Profile", "Format_Profile", "Format_Commercial").map(s -> {
return SLASH.splitAsStream(s).findFirst().orElse(null);
}).filter(Objects::nonNull).map(String::trim).filter(s -> s.length() > 0).findFirst().orElse(null);
}
@ -1272,7 +1272,7 @@ public class MediaBindingBean {
return stream(keys).map(key -> {
return getMediaInfo().get(streamKind, streamNumber, key);
}).filter(s -> s.length() > 0).findFirst().orElse(null);
});
}).filter(Objects::nonNull);
}
private AssociativeScriptObject createBindingObject(Object info) {