From 0fa350cd4b5960c1197e84ae5fda6dc7679633d3 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Mon, 19 Sep 2011 14:21:21 +0000
Subject: [PATCH] * clean-up

---
 .../filebot/format/MediaBindingBean.java      | 28 +++++++++----------
 .../ui/panel/rename/BindingDialog.properties  |  2 +-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/source/net/sourceforge/filebot/format/MediaBindingBean.java b/source/net/sourceforge/filebot/format/MediaBindingBean.java
index e60d263f..9c208feb 100644
--- a/source/net/sourceforge/filebot/format/MediaBindingBean.java
+++ b/source/net/sourceforge/filebot/format/MediaBindingBean.java
@@ -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("|");
 		}
 	};
 	
diff --git a/source/net/sourceforge/filebot/ui/panel/rename/BindingDialog.properties b/source/net/sourceforge/filebot/ui/panel/rename/BindingDialog.properties
index 64f2bc87..a62719a8 100644
--- a/source/net/sourceforge/filebot/ui/panel/rename/BindingDialog.properties
+++ b/source/net/sourceforge/filebot/ui/panel/rename/BindingDialog.properties
@@ -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