diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index fe64a33c47..bab2a59b1c 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -724,7 +724,7 @@ class BooksModel(QAbstractTableModel): # {{{ elif typ == 'series': val, s_index = parse_series_string(self.db, label, value.toString()) elif typ == 'composite': - tmpl = unicode(value.toString()).strip() + tmpl = unicode(value.toString()).lower().strip() disp = cc['display'] disp['composite_template'] = tmpl self.db.set_custom_column_metadata(cc['colnum'], display = disp) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index fde57e2a2e..22de8df41f 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -584,7 +584,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.title_sort = self.title_sort(idx, index_is_id=index_is_id) mi.formats = self.formats(idx, index_is_id=index_is_id, verify_formats=False) - if len(mi.formats) == 0: + if hasattr(mi.formats, 'split'): + mi.formats = mi.formats.split(',') + else: mi.formats = None tags = self.tags(idx, index_is_id=index_is_id) if tags: @@ -731,7 +733,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): except: return None if not verify_formats: - return formats + return ','.join(formats) ans = [] for format in formats: if self.format_abspath(id, format, index_is_id=True) is not None: