Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Metadata download: When merging results, if the query to the xisbn service hangs, wait no more than 10 seconds.

Browse Source
This commit is contained in:
Kovid Goyal 2011-07-06 08:51:40 -06:00
parent b074e24acb
commit 34c84014b6
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/calibre/ebooks/metadata/sources/identify.py
View File

@ -57,11 +57,34 @@ def is_worker_alive(workers):
# Merge results from different sources {{{ # Merge results from different sources {{{
class xISBN(Thread):
def __init__(self, isbn):
Thread.__init__(self)
self.isbn = isbn
self.isbns = frozenset()
self.min_year = None
self.daemon = True
self.exception = self.tb = None
def run(self):
time.sleep(20)
try:
self.isbns, self.min_year = xisbn.get_isbn_pool(self.isbn)
except Exception as e:
import traceback
self.exception = e
self.tb = traceback.format_exception()
class ISBNMerge(object): class ISBNMerge(object):
def __init__(self): def __init__(self, log):
self.pools = {} self.pools = {}
self.isbnless_results = [] self.isbnless_results = []
self.log = log
self.use_xisbn = True
def isbn_in_pool(self, isbn): def isbn_in_pool(self, isbn):
if isbn: if isbn:
@ -82,7 +105,20 @@ class ISBNMerge(object):
if isbn: if isbn:
pool = self.isbn_in_pool(isbn) pool = self.isbn_in_pool(isbn)
if pool is None: if pool is None:
isbns, min_year = xisbn.get_isbn_pool(isbn) isbns = min_year = None
if self.use_xisbn:
xw = xISBN(isbn)
xw.start()
xw.join(10)
if xw.is_alive():
self.log.error('Query to xISBN timed out')
self.use_xisbn = False
else:
if xw.exception:
self.log.error('Query to xISBN failed:')
self.log.debug(xw.tb)
else:
isbns, min_year = xw.isbns, xw.min_year
if not isbns: if not isbns:
isbns = frozenset([isbn]) isbns = frozenset([isbn])
if isbns in self.pools: if isbns in self.pools:
@ -293,7 +329,7 @@ class ISBNMerge(object):
def merge_identify_results(result_map, log): def merge_identify_results(result_map, log):
isbn_merge = ISBNMerge() isbn_merge = ISBNMerge(log)
for plugin, results in result_map.iteritems(): for plugin, results in result_map.iteritems():
for result in results: for result in results:
isbn_merge.add_result(result) isbn_merge.add_result(result)