From 7396e1fe686d2469084ec912ab81560ae4a27802 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 2 Dec 2012 14:16:29 +0000 Subject: [PATCH] * optimize --- source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy | 3 ++- website/data/query-blacklist.txt | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy b/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy index 2cb4f342..effaeb95 100644 --- a/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy +++ b/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy @@ -229,7 +229,8 @@ def similarity(o1, o2) { } List.metaClass.sortBySimilarity = { prime, Closure toStringFunction = { obj -> obj.toString() } -> - return delegate.sort{ a, b -> similarity(toStringFunction(b), prime).compareTo(similarity(toStringFunction(a), prime)) } + def simetric = new NameSimilarityMetric() + return delegate.sort{ a, b -> simetric.getSimilarity(toStringFunction(b), prime).compareTo(simetric.getSimilarity(toStringFunction(a), prime)) } } // call scripts diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt index c7fe8a2e..44a29e28 100644 --- a/website/data/query-blacklist.txt +++ b/website/data/query-blacklist.txt @@ -22,6 +22,8 @@ ^Completed$ ^Cover ^Crime$ +^data$ +^deluge$ ^Documentary$ ^Done$ ^Download$ @@ -40,7 +42,9 @@ ^Movie[s]? ^new$ ^other$ +^private$ ^Romance$ +^rtorrent$ ^Science.Fiction$ ^Scratch$ ^Season.[0-9]+ @@ -50,12 +54,14 @@ ^Staging$ ^Storage$ ^Test$ +^testdata$ ^Torrent[s]? ^Tracker ^Trailer ^user$ ^VCD$ ^VIDEO_TS$ +^watch$ A.Release.Lounge ABC Anime[s]?