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

* don't mix AcoustID and ID3 Tags data

This commit is contained in:
Reinhard Pointner 2015-01-11 23:33:31 +00:00
parent b39cc04cee
commit 710bebdc82
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ public class MediaBindingBean {
if (infoObject instanceof Movie) if (infoObject instanceof Movie)
return getMovie().getYear(); return getMovie().getYear();
if (infoObject instanceof AudioTrack) if (infoObject instanceof AudioTrack)
return getReleaseDate() != null ? ((SimpleDate) getReleaseDate()).getYear() : new Scanner(getMediaInfo(StreamKind.General, 0, "Recorded_Date")).useDelimiter("\\D+").nextInt(); return ((SimpleDate) getReleaseDate()).getYear();
return null; return null;
} }
@ -530,9 +530,6 @@ public class MediaBindingBean {
@Define("genres") @Define("genres")
public Object getGenres() { public Object getGenres() {
if (infoObject instanceof AudioTrack)
return asList(getMediaInfo(StreamKind.General, 0, "Genre").split(";"));
return getMetaInfo().getProperty("genres"); return getMetaInfo().getProperty("genres");
} }
@ -723,7 +720,7 @@ public class MediaBindingBean {
@Define("pi") @Define("pi")
public Integer getPart() { public Integer getPart() {
if (infoObject instanceof AudioTrack) if (infoObject instanceof AudioTrack)
return getMusic().getTrack() != null ? getMusic().getTrack() : Integer.parseInt(getMediaInfo(StreamKind.General, 0, "Track/Position")); return getMusic().getTrack();
if (infoObject instanceof MoviePart) if (infoObject instanceof MoviePart)
return ((MoviePart) infoObject).getPartIndex(); return ((MoviePart) infoObject).getPartIndex();
@ -733,7 +730,7 @@ public class MediaBindingBean {
@Define("pn") @Define("pn")
public Integer getPartCount() { public Integer getPartCount() {
if (infoObject instanceof AudioTrack) if (infoObject instanceof AudioTrack)
return getMusic().getTrackCount() != null ? getMusic().getTrackCount() : Integer.parseInt(getMediaInfo(StreamKind.General, 0, "Track/Position_Total")); return getMusic().getTrackCount();
if (infoObject instanceof MoviePart) if (infoObject instanceof MoviePart)
return ((MoviePart) infoObject).getPartCount(); return ((MoviePart) infoObject).getPartCount();