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

MTP driver: Ignore errors when getting the driveinfo.calibre file from the device and simply regenerate it

Browse Source
This commit is contained in:
Kovid Goyal 2012-10-10 08:53:19 +05:30
parent d5c26cfa46
commit e606618d04
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/devices/mtp/driver.py
View File

@ -108,10 +108,12 @@ class MTP_DEVICE(BASE):
f = storage.find_path((self.DRIVEINFO,)) f = storage.find_path((self.DRIVEINFO,))
dinfo = {} dinfo = {}
if f is not None: if f is not None:
stream = self.get_mtp_file(f)
try: try:
stream = self.get_mtp_file(f)
dinfo = json.load(stream, object_hook=from_json) dinfo = json.load(stream, object_hook=from_json)
except: except:
prints('Failed to load existing driveinfo.calibre file, with error:')
traceback.print_exc()
dinfo = None dinfo = None
if dinfo.get('device_store_uuid', None) is None: if dinfo.get('device_store_uuid', None) is None:
dinfo['device_store_uuid'] = unicode(uuid.uuid4()) dinfo['device_store_uuid'] = unicode(uuid.uuid4())