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

* clean-up

This commit is contained in:
Reinhard Pointner 2011-09-19 14:21:21 +00:00
parent 339cbfd49e
commit 0fa350cd4b
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,6 @@ import static java.util.regex.Pattern.*;
import static net.sourceforge.filebot.MediaTypes.*;
import static net.sourceforge.filebot.format.Define.*;
import static net.sourceforge.filebot.hash.VerificationUtilities.*;
import static net.sourceforge.tuned.StringUtilities.*;
import java.io.File;
import java.io.IOException;
@ -111,8 +110,13 @@ public class MediaBindingBean {
@Define("imdb")
public Integer getImdbId() {
return getMovie().getImdbId();
public String getImdbId() {
int imdb = getMovie().getImdbId();
if (imdb < 0)
return null;
return String.format("%07d", imdb);
}
@ -254,7 +258,7 @@ public class MediaBindingBean {
File inferredMediaFile = getInferredMediaFile();
// pattern matching any release group name enclosed in separators
Pattern groups = compile("(?<!\\p{Alnum})(" + join(releaseGroups.get(), "|") + ")(?!\\p{Alnum})", CASE_INSENSITIVE);
Pattern groups = compile("(?<!\\p{Alnum})(" + releaseGroups.get() + ")(?!\\p{Alnum})", CASE_INSENSITIVE);
// look for release group names in media file and it's parent folder
String lastMatch = null;
@ -310,21 +314,15 @@ public class MediaBindingBean {
}
@Define("part")
public MoviePart getMoviePart() {
return (MoviePart) infoObject;
}
@Define("pi")
public Integer getPart() {
return getMoviePart().getPartIndex();
return ((MoviePart) infoObject).getPartIndex();
}
@Define("pn")
public Integer getPartCount() {
return getMoviePart().getPartCount();
return ((MoviePart) infoObject).getPartCount();
}
@ -406,11 +404,11 @@ public class MediaBindingBean {
// fetch release group names online and try to update the data once per day
private final CachedResource<String[]> releaseGroups = new CachedResource<String[]>(getBundle(getClass().getName()).getString("url.release-groups"), 24 * 60 * 60 * 1000) {
private final CachedResource<String> releaseGroups = new CachedResource<String>(getBundle(getClass().getName()).getString("url.release-groups"), 24 * 60 * 60 * 1000) {
@Override
public String[] process(ByteBuffer data) {
return compile("\\s").split(Charset.forName("UTF-8").decode(data));
public String process(ByteBuffer data) {
return compile("\\s").matcher(Charset.forName("UTF-8").decode(data)).replaceAll("|");
}
};

2
source/net/sourceforge/filebot/ui/panel/rename/BindingDialog.properties
View File

@ -2,4 +2,4 @@
parameter.exclude: ^StreamKind|Count$
# preview expressions (keys are tagged so they can be sorted alphabetically)
expressions: n,s,e,t,y,airdate,absolute,special,imdb,episode,movie,vc,ac,cf,vf,af,resolution,source,group,crc32,fn,ext,file,part,pi,pn,media.title,media.durationString,media.overallBitRateString,video.codecID,video.frameRate,video.displayAspectRatioString,video.height,video.scanType,audio.format,audio.bitRateString,audio.language,text.codecInfo,text.language
expressions: n,s,e,t,y,airdate,absolute,special,imdb,episode,movie,vc,ac,cf,vf,af,resolution,source,group,crc32,fn,ext,file,pi,pn,media.title,media.durationString,media.overallBitRateString,video.codecID,video.frameRate,video.displayAspectRatioString,video.height,video.scanType,audio.format,audio.bitRateString,audio.language,text.codecInfo,text.language