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

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-08-27 09:53:52 +05:30
parent a14bc99af6
commit 9aa30a8b71
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/devices/mtp/filesystem_cache.py
View File

@ -20,20 +20,16 @@ class FileOrFolder(object):
def __init__(self, entry, fs_cache): def __init__(self, entry, fs_cache):
self.object_id = entry['id'] self.object_id = entry['id']
self.is_folder = entry['is_folder'] self.is_folder = entry['is_folder']
self.storage_id = entry['storage_id']
# self.parent_id is None for storage objects
self.parent_id = entry.get('parent_id', None)
n = entry.get('name', None) n = entry.get('name', None)
if not n: n = '___' if not n: n = '___'
self.name = force_unicode(n, 'utf-8') self.name = force_unicode(n, 'utf-8')
self.storage_id = entry.get('storage_id', None)
self.persistent_id = entry.get('persistent_id', self.object_id) self.persistent_id = entry.get('persistent_id', self.object_id)
self.size = entry.get('size', 0) self.size = entry.get('size', 0)
# self.parent_id is None for storage objects
self.parent_id = entry.get('parent_id', None)
self.all_storage_ids = fs_cache.all_storage_ids self.all_storage_ids = fs_cache.all_storage_ids
if self.parent_id is None and self.storage_id is None:
# A storage object
self.storage_id = self.object_id
if self.storage_id not in self.all_storage_ids: if self.storage_id not in self.all_storage_ids:
raise ValueError('Storage id %s not valid for %s'%(self.storage_id, raise ValueError('Storage id %s not valid for %s'%(self.storage_id,
entry)) entry))
@ -137,6 +133,7 @@ class FilesystemCache(object):
self.all_storage_ids = tuple(x['id'] for x in all_storage) self.all_storage_ids = tuple(x['id'] for x in all_storage)
for storage in all_storage: for storage in all_storage:
storage['storage_id'] = storage['id']
e = FileOrFolder(storage, self) e = FileOrFolder(storage, self)
self.entries.append(e) self.entries.append(e)