Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #825987 (tag browser is blank)

Browse Source
This commit is contained in:
Kovid Goyal 2011-08-19 08:14:06 -06:00
parent 0cab31a35f
commit 5952c3fce3
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/db/cache.py
View File

@ -122,12 +122,17 @@ class Cache(object):
formats = self._field_for('formats', book_id)
mi.format_metadata = {}
if not formats:
formats = None
good_formats = None
else:
good_formats = []
for f in formats:
mi.format_metadata[f] = self._format_metadata(book_id, f)
formats = ','.join(formats)
mi.formats = formats
try:
mi.format_metadata[f] = self._format_metadata(book_id, f)
except:
pass
else:
good_formats.append(f)
mi.formats = good_formats
mi.has_cover = _('Yes') if self._field_for('cover', book_id,
default_value=False) else ''
mi.tags = list(self._field_for('tags', book_id, default_value=()))

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

@ -925,12 +925,18 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
formats = row[fm['formats']]
mi.format_metadata = {}
if not formats:
formats = None
good_formats = None
else:
formats = formats.split(',')
good_formats = []
for f in formats:
mi.format_metadata[f] = self.format_metadata(id, f)
mi.formats = formats
try:
mi.format_metadata[f] = self.format_metadata(id, f)
except:
pass
else:
good_formats.append(f)
mi.formats = good_formats
tags = row[fm['tags']]
if tags:
mi.tags = [i.strip() for i in tags.split(',')]
@ -1213,7 +1219,13 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
except: # If path contains strange characters this throws an exc
candidates = []
if format and candidates and os.path.exists(candidates[0]):
shutil.copyfile(candidates[0], fmt_path)
try:
shutil.copyfile(candidates[0], fmt_path)
except:
# This can happen if candidates[0] or fmt_path is too long,
# which can happen if the user copied the library from a
# non windows machine to a windows machine.
return None
return fmt_path
def copy_format_to(self, index, fmt, dest, index_is_id=False):