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

* use MetaAttributes for matching only when enabled via system properties

Browse Source
This commit is contained in:
Reinhard Pointner 2012-10-25 16:19:53 +00:00
parent 01f54f8e86
commit bfe4add9ab
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/net/sourceforge/filebot/similarity/CrossPropertyMetric.java
View File

@ -27,15 +27,19 @@ public class CrossPropertyMetric implements SimilarityMetric {
@Override @Override
public float getSimilarity(Object o1, Object o2) { public float getSimilarity(Object o1, Object o2) {
Map<String, Object> m1 = getProperties(o1); Map<String, Object> m1 = getProperties(o1);
Map<String, Object> m2 = getProperties(o2); if (m1.isEmpty())
return 0;
Map<String, Object> m2 = getProperties(o2);
if (m2.isEmpty())
return 0;
// works with commons keys
Set<String> keys = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); Set<String> keys = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
keys.addAll(m1.keySet()); keys.addAll(m1.keySet());
keys.retainAll(m2.keySet()); keys.retainAll(m2.keySet());
if (keys.isEmpty())
if (keys.isEmpty()) {
return 0; return 0;
}
float feedback = 0; float feedback = 0;
for (String k : keys) { for (String k : keys) {

5
source/net/sourceforge/filebot/similarity/EpisodeMetrics.java
View File

@ -5,6 +5,7 @@ package net.sourceforge.filebot.similarity;
import static java.lang.Math.*; import static java.lang.Math.*;
import static java.util.Arrays.*; import static java.util.Arrays.*;
import static java.util.Collections.*; import static java.util.Collections.*;
import static net.sourceforge.filebot.Settings.*;
import static net.sourceforge.filebot.similarity.Normalization.*; import static net.sourceforge.filebot.similarity.Normalization.*;
import static net.sourceforge.tuned.FileUtilities.*; import static net.sourceforge.tuned.FileUtilities.*;
@ -320,8 +321,8 @@ public enum EpisodeMetrics implements SimilarityMetric {
return super.getProperties(object); return super.getProperties(object);
} }
// deserialize MetaAttributes if available // deserialize MetaAttributes if enabled and available
if (object instanceof File) { if (object instanceof File && useExtendedFileAttributes()) {
try { try {
return super.getProperties(new net.sourceforge.filebot.media.MetaAttributes((File) object).getMetaData()); return super.getProperties(new net.sourceforge.filebot.media.MetaAttributes((File) object).getMetaData());
} catch (Throwable e) { } catch (Throwable e) {