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

* refactor

Browse Source
This commit is contained in:
Reinhard Pointner 2014-09-03 04:16:50 +00:00
parent 0dc134fd1c
commit ffdc8f43f2
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Objects;
import java.util.Scanner; import java.util.Scanner;
import java.util.Set; import java.util.Set;
import java.util.SortedSet; import java.util.SortedSet;
@ -213,7 +214,7 @@ public class MediaBindingBean {
return asList(getSeriesObject().getAliasNames()); return asList(getSeriesObject().getAliasNames());
} }
return null; return emptyList();
} }
@Define("primaryTitle") @Define("primaryTitle")
@ -457,20 +458,7 @@ public class MediaBindingBean {
String[] filenames = new String[] { inferredMediaFile.getParentFile().getName(), inferredMediaFile.getName(), getOriginalFileName(inferredMediaFile) }; String[] filenames = new String[] { inferredMediaFile.getParentFile().getName(), inferredMediaFile.getName(), getOriginalFileName(inferredMediaFile) };
// reduce false positives by removing the know titles from the name // reduce false positives by removing the know titles from the name
List<String> titles = new ArrayList<String>(); Pattern nonGroupPattern = releaseInfo.getCustomRemovePattern(getKeywords());
titles.add(getName());
titles.add(getYear().toString());
titles.addAll(getAliasNames());
if (infoObject instanceof Episode) {
for (Episode it : getEpisodes()) {
titles.add(it.getTitle());
}
}
for (int i = 0; i < titles.size(); i++) {
titles.set(i, normalizePunctuation(normalizeSpace(titles.get(i), " ")));
}
Pattern nonGroupPattern = releaseInfo.getCustomRemovePattern(titles);
for (int i = 0; i < filenames.length; i++) { for (int i = 0; i < filenames.length; i++) {
if (filenames[i] == null) if (filenames[i] == null)
continue; continue;
@ -981,6 +969,27 @@ public class MediaBindingBean {
return s.toString().trim(); return s.toString().trim();
} }
private List<String> getKeywords() {
List<Object> keys = new ArrayList<Object>();
keys.add(getName());
keys.add(getYear());
keys.addAll(getAliasNames());
if (infoObject instanceof Episode) {
for (Episode it : getEpisodes()) {
keys.add(it.getTitle());
}
}
List<String> words = new ArrayList<String>();
for (Object it : keys) {
String w = normalizePunctuation(normalizeSpace(Objects.toString(it, ""), " "));
if (w != null && w.length() > 0) {
words.add(w);
}
}
return words;
}
@Override @Override
public String toString() { public String toString() {
return String.format("%s ⇔ %s", infoObject, mediaFile == null ? null : mediaFile.getName()); return String.format("%s ⇔ %s", infoObject, mediaFile == null ? null : mediaFile.getName());