This commit is contained in:
Kovid Goyal 2010-11-01 11:18:24 -06:00
parent 0c8684fa21
commit 09c3b4b2d3
2 changed files with 6 additions and 5 deletions

View File

@ -105,7 +105,9 @@ else:
os.makedirs(config_dir, mode=CONFIG_DIR_MODE) os.makedirs(config_dir, mode=CONFIG_DIR_MODE)
except: except:
pass pass
if not os.access(config_dir, os.W_OK) or not os.access(config_dir, os.X_OK): if not os.path.exists(config_dir) or \
not os.access(config_dir, os.W_OK) or not \
os.access(config_dir, os.X_OK):
print 'No write acces to', config_dir, 'using a temporary dir instead' print 'No write acces to', config_dir, 'using a temporary dir instead'
import tempfile, atexit import tempfile, atexit
config_dir = tempfile.mkdtemp(prefix='calibre-config-') config_dir = tempfile.mkdtemp(prefix='calibre-config-')

View File

@ -49,13 +49,12 @@ def get_social_metadata(title, authors, publisher, isbn):
return mi return mi
br = browser() br = browser()
asin = to_asin(br, isbn) asin = to_asin(br, isbn)
if asin: if asin and get_metadata(br, asin, mi):
if get_metadata(br, asin, mi): return mi
return mi
from calibre.ebooks.metadata.xisbn import xisbn from calibre.ebooks.metadata.xisbn import xisbn
for i in xisbn.get_associated_isbns(isbn): for i in xisbn.get_associated_isbns(isbn):
asin = to_asin(br, i) asin = to_asin(br, i)
if get_metadata(br, asin, mi): if asin and get_metadata(br, asin, mi):
return mi return mi
return mi return mi