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

More IM excision

Browse Source
This commit is contained in:
Kovid Goyal 2016-05-04 17:50:18 +05:30
parent 77d35120be
commit 173be501a7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/library/database2.py
View File

@ -38,7 +38,7 @@ from calibre.utils.config import prefs, tweaks, from_json, to_json
from calibre.utils.icu import sort_key, strcmp, lower from calibre.utils.icu import sort_key, strcmp, lower
from calibre.utils.search_query_parser import saved_searches, set_saved_searches from calibre.utils.search_query_parser import saved_searches, set_saved_searches
from calibre.ebooks import check_ebook_format from calibre.ebooks import check_ebook_format
from calibre.utils.magick.draw import save_cover_data_to from calibre.utils.img import save_cover_data_to
from calibre.utils.recycle_bin import delete_file, delete_tree from calibre.utils.recycle_bin import delete_file, delete_tree
from calibre.utils.formatter_functions import load_user_template_functions from calibre.utils.formatter_functions import load_user_template_functions
from calibre.db import _get_next_series_num_for_list, _get_series_values, get_data_as_dict from calibre.db import _get_next_series_num_for_list, _get_series_values, get_data_as_dict

10
src/calibre/srv/tests/content.py
View File

@ -12,7 +12,7 @@ from io import BytesIO
from calibre.ebooks.metadata.epub import get_metadata from calibre.ebooks.metadata.epub import get_metadata
from calibre.ebooks.metadata.opf2 import OPF from calibre.ebooks.metadata.opf2 import OPF
from calibre.srv.tests.base import LibraryBaseTest from calibre.srv.tests.base import LibraryBaseTest
from calibre.utils.magick.draw import identify_data from calibre.utils.imghdr import identify
from calibre.utils.shared_file import share_open, test as test_share_open from calibre.utils.shared_file import share_open, test as test_share_open
class ContentTest(LibraryBaseTest): class ContentTest(LibraryBaseTest):
@ -49,7 +49,7 @@ class ContentTest(LibraryBaseTest):
if sz is None: if sz is None:
self.ae(data, raw) self.ae(data, raw)
else: else:
self.ae(sz, identify_data(data)[0]) self.ae(sz, identify(data)[1])
test_response(r) test_response(r)
conn.request('GET', url, headers={'If-None-Match':r.getheader('ETag')}) conn.request('GET', url, headers={'If-None-Match':r.getheader('ETag')})
r = conn.getresponse() r = conn.getresponse()
@ -150,14 +150,14 @@ class ContentTest(LibraryBaseTest):
self.ae(r.status, httplib.OK) # Auto generated cover self.ae(r.status, httplib.OK) # Auto generated cover
r, data = get('thumb', 1) r, data = get('thumb', 1)
self.ae(r.status, httplib.OK) self.ae(r.status, httplib.OK)
self.ae(identify_data(data), (60, 60, 'jpeg')) self.ae(identify(data), ('jpeg', 60, 60))
self.ae(r.getheader('Used-Cache'), 'no') self.ae(r.getheader('Used-Cache'), 'no')
r, data = get('thumb', 1) r, data = get('thumb', 1)
self.ae(r.status, httplib.OK) self.ae(r.status, httplib.OK)
self.ae(r.getheader('Used-Cache'), 'yes') self.ae(r.getheader('Used-Cache'), 'yes')
r, data = get('thumb', 1, q='sz=100') r, data = get('thumb', 1, q='sz=100')
self.ae(r.status, httplib.OK) self.ae(r.status, httplib.OK)
self.ae(identify_data(data), (100, 100, 'jpeg')) self.ae(identify(data), ('jpeg', 100, 100))
self.ae(r.getheader('Used-Cache'), 'no') self.ae(r.getheader('Used-Cache'), 'no')
r, data = get('thumb', 1, q='sz=100x100') r, data = get('thumb', 1, q='sz=100x100')
self.ae(r.status, httplib.OK) self.ae(r.status, httplib.OK)
@ -165,7 +165,7 @@ class ContentTest(LibraryBaseTest):
change_cover(1, 1) change_cover(1, 1)
r, data = get('thumb', 1, q='sz=100') r, data = get('thumb', 1, q='sz=100')
self.ae(r.status, httplib.OK) self.ae(r.status, httplib.OK)
self.ae(identify_data(data), (100, 100, 'jpeg')) self.ae(identify(data), ('jpeg', 100, 100))
self.ae(r.getheader('Used-Cache'), 'no') self.ae(r.getheader('Used-Cache'), 'no')
# Test file sharing in cache # Test file sharing in cache