'+ans%('', '')
-class Amazon(MetadataSource):
+ # }}}
+
+class Amazon(MetadataSource): # {{{
name = 'Amazon'
metadata_type = 'social'
@@ -198,7 +204,9 @@ class Amazon(MetadataSource):
self.exception = e
self.tb = traceback.format_exc()
-class LibraryThing(MetadataSource):
+ # }}}
+
+class LibraryThing(MetadataSource): # {{{
name = 'LibraryThing'
metadata_type = 'social'
@@ -207,7 +215,6 @@ class LibraryThing(MetadataSource):
def fetch(self):
if not self.isbn:
return
- from calibre import browser
from calibre.ebooks.metadata import MetaInformation
import json
br = browser()
@@ -228,6 +235,7 @@ class LibraryThing(MetadataSource):
except Exception, e:
self.exception = e
self.tb = traceback.format_exc()
+ # }}}
def result_index(source, result):
@@ -268,6 +276,31 @@ class MetadataSources(object):
for s in self.sources:
s.join()
+def filter_metadata_results(item):
+ keywords = ["audio", "tape", "cassette", "abridged", "playaway"]
+ for keyword in keywords:
+ if item.publisher and keyword in item.publisher.lower():
+ return False
+ return True
+
+class HeadRequest(urllib2.Request):
+ def get_method(self):
+ return "HEAD"
+
+def do_cover_check(item):
+ opener = browser()
+ item.has_cover = False
+ try:
+ opener.open(HeadRequest(OPENLIBRARY%item.isbn), timeout=5)
+ item.has_cover = True
+ except:
+ pass # Cover not found
+
+def check_for_covers(items):
+ threads = [Thread(target=do_cover_check, args=(item,)) for item in items]
+ for t in threads: t.start()
+ for t in threads: t.join()
+
def search(title=None, author=None, publisher=None, isbn=None, isbndb_key=None,
verbose=0):
assert not(title is None and author is None and publisher is None and \
@@ -285,10 +318,60 @@ def search(title=None, author=None, publisher=None, isbn=None, isbndb_key=None,
for fetcher in fetchers[1:]:
merge_results(results, fetcher.results)
- results = sorted(results, cmp=lambda x, y : cmp(
- (x.comments.strip() if x.comments else ''),
- (y.comments.strip() if y.comments else '')
- ), reverse=True)
+ results = list(filter(filter_metadata_results, results))
+
+ check_for_covers(results)
+
+ words = ("the", "a", "an", "of", "and")
+ prefix_pat = re.compile(r'^(%s)\s+'%("|".join(words)))
+ trailing_paren_pat = re.compile(r'\(.*\)$')
+ whitespace_pat = re.compile(r'\s+')
+
+ def sort_func(x, y):
+
+ def cleanup_title(s):
+ s = s.strip().lower()
+ s = prefix_pat.sub(' ', s)
+ s = trailing_paren_pat.sub('', s)
+ s = whitespace_pat.sub(' ', s)
+ return s.strip()
+
+ t = cleanup_title(title)
+ x_title = cleanup_title(x.title)
+ y_title = cleanup_title(y.title)
+
+ # prefer titles that start with the search title
+ tx = cmp(t, x_title)
+ ty = cmp(t, y_title)
+ result = 0 if abs(tx) == abs(ty) else abs(tx) - abs(ty)
+
+ # then prefer titles that have a cover image
+ if result == 0:
+ result = -cmp(x.has_cover, y.has_cover)
+
+ # then prefer titles with the longest comment, with in 10%
+ if result == 0:
+ cx = len(x.comments.strip() if x.comments else '')
+ cy = len(y.comments.strip() if y.comments else '')
+ t = (cx + cy) / 20
+ result = cy - cx
+ if abs(result) < t:
+ result = 0
+
+ return result
+
+ results = sorted(results, cmp=sort_func)
+
+ # if for some reason there is no comment in the top selection, go looking for one
+ if len(results) > 1:
+ if not results[0].comments or len(results[0].comments) == 0:
+ for r in results[1:]:
+ if title.lower() == r.title[:len(title)].lower() and r.comments and len(r.comments):
+ results[0].comments = r.comments
+ break
+
+ # for r in results:
+ # print "{0:14.14} {1:30.30} {2:20.20} {3:6} {4}".format(r.isbn, r.title, r.publisher, len(r.comments if r.comments else ''), r.has_cover)
return results, [(x.name, x.exception, x.tb) for x in fetchers]
diff --git a/src/calibre/gui2/dialogs/config/add_save.ui b/src/calibre/gui2/dialogs/config/add_save.ui
index a29c0fd2e6..64a8137aa1 100644
--- a/src/calibre/gui2/dialogs/config/add_save.ui
+++ b/src/calibre/gui2/dialogs/config/add_save.ui
@@ -181,14 +181,14 @@ Title match ignores leading indefinite articles ("the", "a",