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

Fix cover download failing on some non-english windows installs

Browse Source
This commit is contained in:
Kovid Goyal 2012-04-12 15:20:24 +05:30
parent b24bde150d
commit b7d0609ac8
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/metadata/sources/worker.py
View File

@ -48,7 +48,8 @@ def merge_result(oldmi, newmi, ensure_fields=None):
return newmi return newmi
def main(do_identify, covers, metadata, ensure_fields): def main(do_identify, covers, metadata, ensure_fields, tdir):
os.chdir(tdir)
failed_ids = set() failed_ids = set()
failed_covers = set() failed_covers = set()
all_failed = True all_failed = True
@ -103,7 +104,8 @@ def single_identify(title, authors, identifiers):
return [metadata_to_opf(r) for r in results], [r.has_cached_cover_url for return [metadata_to_opf(r) for r in results], [r.has_cached_cover_url for
r in results], dump_caches(), log.dump() r in results], dump_caches(), log.dump()
def single_covers(title, authors, identifiers, caches): def single_covers(title, authors, identifiers, caches, tdir):
os.chdir(tdir)
load_caches(caches) load_caches(caches)
log = GUILog() log = GUILog()
results = Queue() results = Queue()

4
src/calibre/gui2/metadata/bulk_download.py
View File

@ -232,8 +232,8 @@ def download(all_ids, tf, db, do_identify, covers, ensure_fields,
metadata.iteritems()} metadata.iteritems()}
try: try:
ret = fork_job('calibre.ebooks.metadata.sources.worker', 'main', ret = fork_job('calibre.ebooks.metadata.sources.worker', 'main',
(do_identify, covers, metadata, ensure_fields), (do_identify, covers, metadata, ensure_fields, tdir),
cwd=tdir, abort=abort, heartbeat=heartbeat, no_output=True) abort=abort, heartbeat=heartbeat, no_output=True)
except WorkerError as e: except WorkerError as e:
if e.orig_tb: if e.orig_tb:
raise Exception('Failed to download metadata. Original ' raise Exception('Failed to download metadata. Original '

5
src/calibre/gui2/metadata/single_download.py
View File

@ -573,8 +573,9 @@ class CoverWorker(Thread): # {{{
try: try:
res = fork_job('calibre.ebooks.metadata.sources.worker', res = fork_job('calibre.ebooks.metadata.sources.worker',
'single_covers', 'single_covers',
(self.title, self.authors, self.identifiers, self.caches), (self.title, self.authors, self.identifiers, self.caches,
cwd=tdir, no_output=True, abort=self.abort) tdir),
no_output=True, abort=self.abort)
self.log.append_dump(res['result']) self.log.append_dump(res['result'])
finally: finally:
self.keep_going = False self.keep_going = False