Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source 
Wireless device driver: Cache metadata on a per device basis. Allows for
using different cover thumbnail sizes on different devices. Will force
device to resend all metadata the first time it is connected after this
upgrade.
This commit is contained in:
Kovid Goyal 2013-11-27 16:33:45 +05:30
commit 9cac372530
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/calibre/devices/smart_device_app/driver.py
View File

@ -688,9 +688,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
if lastmod == 'None': if lastmod == 'None':
return None return None
lastmod = parse_date(lastmod) lastmod = parse_date(lastmod)
if key in self.known_uuids and self.known_uuids[key]['book'].last_modified == lastmod: if key in self.device_book_cache and self.device_book_cache[key]['book'].last_modified == lastmod:
self.known_uuids[key]['last_used'] = now() self.device_book_cache[key]['last_used'] = now()
return self.known_uuids[key]['book'].deepcopy(lambda : SDBook('', '')) return self.device_book_cache[key]['book'].deepcopy(lambda : SDBook('', ''))
except: except:
traceback.print_exc() traceback.print_exc()
return None return None
@ -715,17 +715,18 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
def _uuid_in_cache(self, uuid, ext): def _uuid_in_cache(self, uuid, ext):
try: try:
for b in self.known_uuids: for b in self.device_book_cache.itervalues():
metadata = b['book'] metadata = b['book']
if metadata.get('uuid', '') != uuid: if metadata.get('uuid', '') != uuid:
continue continue
if metadata.get('lpath', '').endswith(ext): if metadata.get('lpath', '').endswith(ext):
return metadata return metadata
except: except:
pass traceback.print_exc()
return None return None
def _read_metadata_cache(self): def _read_metadata_cache(self):
self._debug('device uuid', self.device_uuid)
from calibre.utils.config import from_json from calibre.utils.config import from_json
try: try:
old_cache_file_name = os.path.join(cache_dir(), old_cache_file_name = os.path.join(cache_dir(),
@ -736,12 +737,22 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
except: except:
pass pass
cache_file_name = os.path.join(cache_dir(), try:
old_cache_file_name = os.path.join(cache_dir(),
'device_drivers_' + self.__class__.__name__ + 'device_drivers_' + self.__class__.__name__ +
'_metadata_cache.json') '_metadata_cache.json')
self.known_uuids = defaultdict(dict) if os.path.exists(old_cache_file_name):
os.remove(old_cache_file_name)
except:
pass
cache_file_name = os.path.join(cache_dir(),
'wireless_device_' + self.device_uuid +
'_metadata_cache.json')
self.device_book_cache = defaultdict(dict)
self.known_metadata = {} self.known_metadata = {}
try: try:
count = 0
if os.path.exists(cache_file_name): if os.path.exists(cache_file_name):
with open(cache_file_name, mode='rb') as fd: with open(cache_file_name, mode='rb') as fd:
while True: while True:
@ -754,13 +765,15 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
metadata = self.json_codec.raw_to_book(book[key]['book'], metadata = self.json_codec.raw_to_book(book[key]['book'],
SDBook, self.PREFIX) SDBook, self.PREFIX)
book[key]['book'] = metadata book[key]['book'] = metadata
self.known_uuids.update(book) self.device_book_cache.update(book)
lpath = metadata.get('lpath') lpath = metadata.get('lpath')
self.known_metadata[lpath] = metadata self.known_metadata[lpath] = metadata
count += 1
self._debug('loaded', count, 'cache items')
except: except:
traceback.print_exc() traceback.print_exc()
self.known_uuids = defaultdict(dict) self.device_book_cache = defaultdict(dict)
self.known_metadata = {} self.known_metadata = {}
try: try:
if os.path.exists(cache_file_name): if os.path.exists(cache_file_name):
@ -769,15 +782,17 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
traceback.print_exc() traceback.print_exc()
def _write_metadata_cache(self): def _write_metadata_cache(self):
self._debug()
from calibre.utils.date import now from calibre.utils.date import now
from calibre.utils.config import to_json from calibre.utils.config import to_json
cache_file_name = os.path.join(cache_dir(), cache_file_name = os.path.join(cache_dir(),
'device_drivers_' + self.__class__.__name__ + 'wireless_device_' + self.device_uuid +
'_metadata_cache.json') '_metadata_cache.json')
try: try:
purged = 0 purged = 0
count = 0
with open(cache_file_name, mode='wb') as fd: with open(cache_file_name, mode='wb') as fd:
for key,book in self.known_uuids.iteritems(): for key,book in self.device_book_cache.iteritems():
if (now() - book['last_used']).days > self.PURGE_CACHE_ENTRIES_DAYS: if (now() - book['last_used']).days > self.PURGE_CACHE_ENTRIES_DAYS:
purged += 1 purged += 1
continue continue
@ -788,7 +803,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
fd.write("%0.7d\n"%(len(result)+1)) fd.write("%0.7d\n"%(len(result)+1))
fd.write(result) fd.write(result)
fd.write('\n') fd.write('\n')
self._debug('purged', purged, 'cache entries') count += 1
self._debug('wrote', count, 'entries, purged', purged, 'entries')
except: except:
traceback.print_exc() traceback.print_exc()
try: try:
@ -816,20 +832,20 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
if remove: if remove:
self.known_metadata.pop(lpath, None) self.known_metadata.pop(lpath, None)
if key: if key:
self.known_uuids.pop(key, None) self.device_book_cache.pop(key, None)
else: else:
# Check if we have another UUID with the same lpath. If so, remove it # Check if we have another UUID with the same lpath. If so, remove it
# Must try both the extension and the lpath because of the cache change # Must try both the extension and the lpath because of the cache change
existing_uuid = self.known_metadata.get(lpath, {}).get('uuid', None) existing_uuid = self.known_metadata.get(lpath, {}).get('uuid', None)
if existing_uuid and existing_uuid != uuid: if existing_uuid and existing_uuid != uuid:
self.known_uuids.pop(self._make_metadata_cache_key(existing_uuid, ext), None) self.device_book_cache.pop(self._make_metadata_cache_key(existing_uuid, ext), None)
self.known_uuids.pop(self._make_metadata_cache_key(existing_uuid, lpath), None) self.device_book_cache.pop(self._make_metadata_cache_key(existing_uuid, lpath), None)
new_book = book.deepcopy() new_book = book.deepcopy()
self.known_metadata[lpath] = new_book self.known_metadata[lpath] = new_book
if key: if key:
self.known_uuids[key]['book'] = new_book self.device_book_cache[key]['book'] = new_book
self.known_uuids[key]['last_used'] = now() self.device_book_cache[key]['last_used'] = now()
def _close_device_socket(self): def _close_device_socket(self):
if self.device_socket is not None: if self.device_socket is not None:
@ -941,6 +957,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
raise ControlError(desc='Attempt to open a closed device') raise ControlError(desc='Attempt to open a closed device')
self.current_library_uuid = library_uuid self.current_library_uuid = library_uuid
self.current_library_name = current_library_name() self.current_library_name = current_library_name()
self.device_uuid = ''
try: try:
password = self.settings().extra_customization[self.OPT_PASSWORD] password = self.settings().extra_customization[self.OPT_PASSWORD]
if password: if password:
@ -1115,7 +1132,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
if opcode == 'OK': if opcode == 'OK':
self.driveinfo = result['device_info'] self.driveinfo = result['device_info']
self._update_driveinfo_record(self.driveinfo, self.PREFIX, 'main') self._update_driveinfo_record(self.driveinfo, self.PREFIX, 'main')
self.device_uuid = self.driveinfo['device_store_uuid']
self._call_client('SET_CALIBRE_DEVICE_INFO', self.driveinfo) self._call_client('SET_CALIBRE_DEVICE_INFO', self.driveinfo)
self._read_metadata_cache()
return (self.get_gui_name(), result['device_version'], return (self.get_gui_name(), result['device_version'],
result['version'], '', {'main':self.driveinfo}) result['version'], '', {'main':self.driveinfo})
return (self.get_gui_name(), '', '', '') return (self.get_gui_name(), '', '', '')
@ -1433,7 +1452,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
self.device_socket = None self.device_socket = None
self.json_codec = JsonCodec() self.json_codec = JsonCodec()
self.known_metadata = {} self.known_metadata = {}
self.known_uuids = defaultdict(dict) self.device_book_cache = defaultdict(dict)
self.debug_time = time.time() self.debug_time = time.time()
self.debug_start_time = time.time() self.debug_start_time = time.time()
self.max_book_packet_len = 0 self.max_book_packet_len = 0
@ -1541,7 +1560,6 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
self.connection_listener = ConnectionListener(self) self.connection_listener = ConnectionListener(self)
self.connection_listener.start() self.connection_listener.start()
self._read_metadata_cache()
return message return message
@synchronous('sync_lock') @synchronous('sync_lock')