Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2025-12-31 20:26:03 +01:00
Code Issues Projects Releases Wiki Activity

DRYer

Browse source
This commit is contained in:
Kovid Goyal 2017-05-14 17:54:59 +05:30
parent ef39992968
commit d79cfbca8f
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/calibre/srv/content.py
View file

@ -244,8 +244,7 @@ def icon(ctx, rd, which):
except EnvironmentError:
raise HTTPNotFound()
with lock:
tdir = os.path.join(rd.tdir, 'icons')
cached = os.path.join(tdir, '%d-%s.png' % (sz, which))
cached = os.path.join(rd.tdir, 'icons', '%d-%s.png' % (sz, which))
try:
return share_open(cached, 'rb')
except EnvironmentError:
@ -260,14 +259,7 @@ def icon(ctx, rd, which):
scaled, width, height = fit_image(img.width(), img.height(), sz, sz)
if scaled:
idata = scale_image(img, width, height, as_png=True)[-1]
try:
ans = share_open(cached, 'w+b')
except EnvironmentError:
try:
os.mkdir(tdir)
except EnvironmentError:
pass
ans = share_open(cached, 'w+b')
ans = open_for_write(cached)
ans.write(idata)
ans.seek(0)
return ans