From 6b80d5d0311ffb2f5d20f27aa21b2351efdeae6a Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 20 Jun 2010 11:25:24 +0100 Subject: [PATCH 1/6] Series type: attempt using 1 column with a virtual second column --- .../dialogs/config/create_custom_column.py | 13 ++-- src/calibre/gui2/library/models.py | 26 ++++++-- src/calibre/library/caches.py | 42 +++++++----- src/calibre/library/custom_columns.py | 66 +++++++++++++++---- src/calibre/library/database2.py | 5 ++ src/calibre/library/field_metadata.py | 4 +- 6 files changed, 117 insertions(+), 39 deletions(-) diff --git a/src/calibre/gui2/dialogs/config/create_custom_column.py b/src/calibre/gui2/dialogs/config/create_custom_column.py index a66b7b6642..2aae567b1c 100644 --- a/src/calibre/gui2/dialogs/config/create_custom_column.py +++ b/src/calibre/gui2/dialogs/config/create_custom_column.py @@ -24,16 +24,19 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): 2:{'datatype':'comments', 'text':_('Long text, like comments, not shown in the tag browser'), 'is_multiple':False}, - 3:{'datatype':'datetime', + 3:{'datatype':'series', + 'text':_('Text column for keeping series-like information'), + 'is_multiple':False}, + 4:{'datatype':'datetime', 'text':_('Date'), 'is_multiple':False}, - 4:{'datatype':'float', + 5:{'datatype':'float', 'text':_('Floating point numbers'), 'is_multiple':False}, - 5:{'datatype':'int', + 6:{'datatype':'int', 'text':_('Integers'), 'is_multiple':False}, - 6:{'datatype':'rating', + 7:{'datatype':'rating', 'text':_('Ratings, shown with stars'), 'is_multiple':False}, - 7:{'datatype':'bool', + 8:{'datatype':'bool', 'text':_('Yes/No'), 'is_multiple':False}, } diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index dcc338dbdc..435b5c4c07 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -520,7 +520,7 @@ class BooksModel(QAbstractTableModel): # {{{ return QVariant(', '.join(sorted(tags.split(',')))) return None - def series(r, idx=-1, siix=-1): + def series_type(r, idx=-1, siix=-1): series = self.db.data[r][idx] if series: idx = fmt_sidx(self.db.data[r][siix]) @@ -591,7 +591,7 @@ class BooksModel(QAbstractTableModel): # {{{ idx=self.db.field_metadata['publisher']['rec_index'], mult=False), 'tags' : functools.partial(tags, idx=self.db.field_metadata['tags']['rec_index']), - 'series' : functools.partial(series, + 'series' : functools.partial(series_type, idx=self.db.field_metadata['series']['rec_index'], siix=self.db.field_metadata['series_index']['rec_index']), 'ondevice' : functools.partial(text_type, @@ -620,6 +620,9 @@ class BooksModel(QAbstractTableModel): # {{{ bool_cols_are_tristate=tweaks['bool_custom_columns_are_tristate'] == 'yes') elif datatype == 'rating': self.dc[col] = functools.partial(rating_type, idx=idx) + elif datatype == 'series': + self.dc[col] = functools.partial(series_type, idx=idx, + siix=self.db.field_metadata.cc_series_index_column_for(col)) else: print 'What type is this?', col, datatype # build a index column to data converter map, to remove the string lookup in the data loop @@ -681,6 +684,8 @@ class BooksModel(QAbstractTableModel): # {{{ def set_custom_column_data(self, row, colhead, value): typ = self.custom_columns[colhead]['datatype'] + label=self.db.field_metadata.key_to_label(colhead) + s_index = None if typ in ('text', 'comments'): val = unicode(value.toString()).strip() val = val if val else None @@ -702,9 +707,20 @@ class BooksModel(QAbstractTableModel): # {{{ if not val.isValid(): return False val = qt_to_dt(val, as_utc=False) - self.db.set_custom(self.db.id(row), val, - label=self.db.field_metadata.key_to_label(colhead), - num=None, append=False, notify=True) + elif typ == 'series': + val = unicode(value.toString()).strip() + pat = re.compile(r'\[([.0-9]+)\]') + match = pat.search(val) + if match is not None: + val = pat.sub('', val).strip() + s_index = float(match.group(1)) + elif val: + if tweaks['series_index_auto_increment'] == 'next': + s_index = self.db.get_next_cc_series_num_for(val, label=label) + else: + s_index = 1.0 + self.db.set_custom(self.db.id(row), val, extra=s_index, + label=label, num=None, append=False, notify=True) return True def setData(self, index, value, role): diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 57f9d0baaf..d4afaabcdc 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -401,7 +401,8 @@ class ResultCache(SearchQueryParser): for x in self.field_metadata: if len(self.field_metadata[x]['search_terms']): db_col[x] = self.field_metadata[x]['rec_index'] - if self.field_metadata[x]['datatype'] not in ['text', 'comments']: + if self.field_metadata[x]['datatype'] not in \ + ['text', 'comments', 'series']: exclude_fields.append(db_col[x]) col_datatype[db_col[x]] = self.field_metadata[x]['datatype'] is_multiple_cols[db_col[x]] = self.field_metadata[x]['is_multiple'] @@ -580,16 +581,18 @@ class ResultCache(SearchQueryParser): self.sort(field, ascending) self._map_filtered = list(self._map) - def seriescmp(self, x, y): - sidx = self.FIELD_MAP['series'] + def seriescmp(self, sidx, siidx, x, y, library_order=None): try: - ans = cmp(title_sort(self._data[x][sidx].lower()), - title_sort(self._data[y][sidx].lower())) + if library_order: + ans = cmp(title_sort(self._data[x][sidx].lower()), + title_sort(self._data[y][sidx].lower())) + else: + ans = cmp(self._data[x][sidx].lower(), + self._data[y][sidx].lower()) except AttributeError: # Some entries may be None ans = cmp(self._data[x][sidx], self._data[y][sidx]) if ans != 0: return ans - sidx = self.FIELD_MAP['series_index'] - return cmp(self._data[x][sidx], self._data[y][sidx]) + return cmp(self._data[x][siidx], self._data[y][siidx]) def cmp(self, loc, x, y, asstr=True, subsort=False): try: @@ -618,18 +621,27 @@ class ResultCache(SearchQueryParser): elif field == 'authors': field = 'author_sort' as_string = field not in ('size', 'rating', 'timestamp') if self.field_metadata[field]['is_custom']: - as_string = self.field_metadata[field]['datatype'] in ('comments', 'text') - field = self.field_metadata[field]['colnum'] + if self.field_metadata[field]['datatype'] == 'series': + fcmp = functools.partial(self.seriescmp, + self.field_metadata[field]['rec_index'], + self.field_metadata.cc_series_index_column_for(field), + library_order=tweaks['title_series_sorting'] == 'library_order') + else: + as_string = self.field_metadata[field]['datatype'] in ('comments', 'text') + field = self.field_metadata[field]['colnum'] + fcmp = functools.partial(self.cmp, self.FIELD_MAP[field], + subsort=subsort, asstr=as_string) + elif field == 'series': + fcmp = functools.partial(self.seriescmp, self.FIELD_MAP['series'], + self.FIELD_MAP['series_index'], + library_order=tweaks['title_series_sorting'] == 'library_order') + else: + fcmp = functools.partial(self.cmp, self.FIELD_MAP[field], + subsort=subsort, asstr=as_string) if self.first_sort: subsort = True self.first_sort = False - fcmp = self.seriescmp \ - if field == 'series' and \ - tweaks['title_series_sorting'] == 'library_order' \ - else \ - functools.partial(self.cmp, self.FIELD_MAP[field], - subsort=subsort, asstr=as_string) self._map.sort(cmp=fcmp, reverse=not ascending) self._map_filtered = [id for id in self._map if id in self._map_filtered] diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py index c0ba91e252..a5f9ddb4f0 100644 --- a/src/calibre/library/custom_columns.py +++ b/src/calibre/library/custom_columns.py @@ -8,6 +8,7 @@ __docformat__ = 'restructuredtext en' import json from functools import partial +from math import floor from calibre import prints from calibre.constants import preferred_encoding @@ -16,7 +17,7 @@ from calibre.utils.date import parse_date class CustomColumns(object): CUSTOM_DATA_TYPES = frozenset(['rating', 'text', 'comments', 'datetime', - 'int', 'float', 'bool']) + 'int', 'float', 'bool', 'series']) def custom_table_names(self, num): return 'custom_column_%d'%num, 'books_custom_column_%d_link'%num @@ -137,7 +138,8 @@ class CustomColumns(object): 'bool': adapt_bool, 'comments': lambda x,d: adapt_text(x, {'is_multiple':False}), 'datetime' : adapt_datetime, - 'text':adapt_text + 'text':adapt_text, + 'series':adapt_text } # Create Tag Browser categories for custom columns @@ -220,6 +222,28 @@ class CustomColumns(object): self.conn.commit() # end convenience methods + def get_next_cc_series_num_for(self, series, label=None, num=None): + if label is not None: + data = self.custom_column_label_map[label] + if num is not None: + data = self.custom_column_num_map[num] + if data['datatype'] != 'series': + return None + table, lt = self.custom_table_names(data['num']) + # get the id of the row containing the series string + series_id = self.conn.get('SELECT id from %s WHERE value=?'%table, + (series,), all=False) + if series_id is None: + return 1.0 + # get the label of the associated series number table + series_num = self.conn.get(''' + SELECT MAX({lt}.s_index) FROM {lt} + WHERE {lt}.book IN (SELECT book FROM {lt} where value=?) + '''.format(lt=lt), (series_id,), all=False) + if series_num is None: + return 1.0 + return floor(series_num+1) + def all_custom(self, label=None, num=None): if label is not None: data = self.custom_column_label_map[label] @@ -271,9 +295,8 @@ class CustomColumns(object): self.conn.commit() return changed - - - def set_custom(self, id_, val, label=None, num=None, append=False, notify=True): + def set_custom(self, id_, val, extra=None, label=None, num=None, + append=False, notify=True): if label is not None: data = self.custom_column_label_map[label] if num is not None: @@ -317,10 +340,17 @@ class CustomColumns(object): 'INSERT INTO %s(value) VALUES(?)'%table, (x,)).lastrowid if not self.conn.get( 'SELECT book FROM %s WHERE book=? AND value=?'%lt, - (id_, xid), all=False): - self.conn.execute( - 'INSERT INTO %s(book, value) VALUES (?,?)'%lt, - (id_, xid)) + (id_, xid), all=False): + if data['datatype'] == 'series': + self.conn.execute( + '''INSERT INTO %s(book, value, s_index) + VALUES (?,?,?)'''%lt, (id_, xid, extra)) + self.data.set(id_, self.FIELD_MAP[data['num']]+1, + extra, row_is_id=True) + else: + self.conn.execute( + '''INSERT INTO %s(book, value) + VALUES (?,?)'''%lt, (id_, xid)) self.conn.commit() nval = self.conn.get( 'SELECT custom_%s FROM meta2 WHERE id=?'%data['num'], @@ -370,6 +400,9 @@ class CustomColumns(object): {table} ON(link.value={table}.id) WHERE link.book=books.id) custom_{num} '''.format(query=query%table, lt=lt, table=table, num=data['num']) + if data['datatype'] == 'series': + line += ''',(SELECT s_index FROM {lt} WHERE {lt}.book=books.id) + custom_index_{num}'''.format(lt=lt, num=data['num']) else: line = ''' (SELECT value FROM {table} WHERE book=books.id) custom_{num} @@ -393,7 +426,7 @@ class CustomColumns(object): if datatype in ('rating', 'int'): dt = 'INT' - elif datatype in ('text', 'comments'): + elif datatype in ('text', 'comments', 'series'): dt = 'TEXT' elif datatype in ('float',): dt = 'REAL' @@ -404,6 +437,10 @@ class CustomColumns(object): collate = 'COLLATE NOCASE' if dt == 'TEXT' else '' table, lt = self.custom_table_names(num) if normalized: + if datatype == 'series': + s_index = 's_index REAL,' + else: + s_index = '' lines = [ '''\ CREATE TABLE %s( @@ -419,8 +456,9 @@ class CustomColumns(object): id INTEGER PRIMARY KEY AUTOINCREMENT, book INTEGER NOT NULL, value INTEGER NOT NULL, + %s UNIQUE(book, value) - );'''%lt, + );'''%(lt, s_index), 'CREATE INDEX %s_aidx ON %s (value);'%(lt,lt), 'CREATE INDEX %s_bidx ON %s (book);'%(lt,lt), @@ -467,7 +505,8 @@ class CustomColumns(object): books_ratings_link as bl, ratings as r WHERE {lt}.value={table}.id and bl.book={lt}.book and - r.id = bl.rating and r.rating <> 0) avg_rating + r.id = bl.rating and r.rating <> 0) avg_rating, + value as sort FROM {table}; CREATE VIEW tag_browser_filtered_{table} AS SELECT @@ -481,7 +520,8 @@ class CustomColumns(object): ratings as r WHERE {lt}.value={table}.id AND bl.book={lt}.book AND r.id = bl.rating AND r.rating <> 0 AND - books_list_filter(bl.book)) avg_rating + books_list_filter(bl.book)) avg_rating, + value as sort FROM {table}; '''.format(lt=lt, table=table), diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index fe4aac12b5..7e4a879654 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -237,6 +237,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.custom_column_num_map[col]['label'], base, prefer_custom=True) + if self.custom_column_num_map[col]['datatype'] == 'series': + # account for the series index column. Field_metadata knows that + # the series index is one larger than the series. If you change + # it here, be sure to change it there as well. + self.FIELD_MAP[str(col)+'_s_index'] = base = base+1 self.FIELD_MAP['cover'] = base+1 self.field_metadata.set_field_record_index('cover', base+1, prefer_custom=False) diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py index 8cb5c9bdad..5ccc17d1eb 100644 --- a/src/calibre/library/field_metadata.py +++ b/src/calibre/library/field_metadata.py @@ -81,7 +81,7 @@ class FieldMetadata(dict): 'column':'name', 'link_column':'series', 'category_sort':'(title_sort(name))', - 'datatype':'text', + 'datatype':'series', 'is_multiple':None, 'kind':'field', 'name':_('Series'), @@ -398,6 +398,8 @@ class FieldMetadata(dict): if val['is_category'] and val['kind'] in ('user', 'search'): del self._tb_cats[key] + def cc_series_index_column_for(self, key): + return self._tb_cats[key]['rec_index'] + 1 def add_user_category(self, label, name): if label in self._tb_cats: From 5544a5d2221f6841cc50e796f911aa4b0b4ece9a Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 20 Jun 2010 19:21:53 +0100 Subject: [PATCH 2/6] Series custom columns seem to work --- src/calibre/gui2/custom_column_widgets.py | 206 ++++++++++++++------ src/calibre/gui2/dialogs/metadata_bulk.py | 9 +- src/calibre/gui2/dialogs/metadata_single.py | 28 ++- src/calibre/library/custom_columns.py | 21 +- 4 files changed, 179 insertions(+), 85 deletions(-) diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py index 90ac7dbbaf..6bb481ddec 100644 --- a/src/calibre/gui2/custom_column_widgets.py +++ b/src/calibre/gui2/custom_column_widgets.py @@ -5,7 +5,7 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import sys +import re, sys from functools import partial from PyQt4.Qt import QComboBox, QLabel, QSpinBox, QDoubleSpinBox, QDateEdit, \ @@ -162,7 +162,6 @@ class DateTime(Base): val = qt_to_dt(val) return val - class Comments(Base): def setup_ui(self, parent): @@ -199,11 +198,7 @@ class Text(Base): w = EnComboBox(parent) w.setSizeAdjustPolicy(w.AdjustToMinimumContentsLengthWithIcon) w.setMinimumContentsLength(25) - - - - self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), - w] + self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), w] def initialize(self, book_id): val = self.db.get_custom(book_id, num=self.col_id, index_is_id=True) @@ -222,7 +217,6 @@ class Text(Base): if idx is not None: self.widgets[1].setCurrentIndex(idx) - def setter(self, val): if self.col_metadata['is_multiple']: if not val: @@ -241,6 +235,58 @@ class Text(Base): val = None return val +class Series(Base): + + def setup_ui(self, parent): + values = self.all_values = list(self.db.all_custom(num=self.col_id)) + values.sort(cmp = lambda x,y: cmp(x.lower(), y.lower())) + w = EnComboBox(parent) + w.setSizeAdjustPolicy(w.AdjustToMinimumContentsLengthWithIcon) + w.setMinimumContentsLength(25) + self.name_widget = w + self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), w] + + self.widgets.append(QLabel('&'+self.col_metadata['name']+_(' index:'), parent)) + w = QDoubleSpinBox(parent) + w.setRange(-100., float(sys.maxint)) + w.setDecimals(2) + w.setSpecialValueText(_('Undefined')) + w.setSingleStep(1) + self.idx_widget=w + self.widgets.append(w) + + def initialize(self, book_id): + val = self.db.get_custom(book_id, num=self.col_id, index_is_id=True) + s_index = self.db.get_custom_extra(book_id, num=self.col_id, index_is_id=True) + if s_index is None: + s_index = 0.0 + self.idx_widget.setValue(s_index) + self.initial_index = s_index + self.initial_val = val + val = self.normalize_db_val(val) + idx = None + for i, c in enumerate(self.all_values): + if c == val: + idx = i + self.name_widget.addItem(c) + self.name_widget.setEditText('') + if idx is not None: + self.widgets[1].setCurrentIndex(idx) + + def commit(self, book_id, notify=False): + val = unicode(self.name_widget.currentText()).strip() + val = self.normalize_ui_val(val) + s_index = self.idx_widget.value() + if val != self.initial_val or s_index != self.initial_index: + if s_index == 0.0: + if tweaks['series_index_auto_increment'] == 'next': + s_index = self.db.get_next_cc_series_num_for(val, + num=self.col_id) + else: + s_index = None + self.db.set_custom(book_id, val, extra=s_index, + num=self.col_id, notify=notify) + widgets = { 'bool' : Bool, 'rating' : Rating, @@ -249,6 +295,7 @@ widgets = { 'datetime': DateTime, 'text' : Text, 'comments': Comments, + 'series': Series, } def field_sort(y, z, x=None): @@ -257,35 +304,63 @@ def field_sort(y, z, x=None): n2 = 'zzzzz' if m2['datatype'] == 'comments' else m2['name'] return cmp(n1.lower(), n2.lower()) -def populate_single_metadata_page(left, right, db, book_id, parent=None): +def populate_metadata_page(layout, db, book_id, bulk=False, two_column=False, parent=None): + def widget_factory(type, col): + if bulk: + w = bulk_widgets[type](db, col, parent) + else: + w = widgets[type](db, col, parent) + w.initialize(book_id) + return w x = db.custom_column_num_map cols = list(x) cols.sort(cmp=partial(field_sort, x=x)) + count_non_comment = len([c for c in cols if x[c]['datatype'] != 'comments']) + + layout.setColumnStretch(1, 10) + if two_column: + turnover_point = (count_non_comment+1)/2 + layout.setColumnStretch(3, 10) + else: + # Avoid problems with multi-line widgets + turnover_point = count_non_comment + 1000 ans = [] - for i, col in enumerate(cols): - w = widgets[x[col]['datatype']](db, col, parent) + column = row = 0 + for col in cols: + dt = x[col]['datatype'] + if dt == 'comments': + continue + w = widget_factory(dt, col) ans.append(w) - w.initialize(book_id) - layout = left if i%2 == 0 else right - row = layout.rowCount() - if len(w.widgets) == 1: - layout.addWidget(w.widgets[0], row, 0, 1, -1) - else: - w.widgets[0].setBuddy(w.widgets[1]) - for c, widget in enumerate(w.widgets): - layout.addWidget(widget, row, c) + for c in range(0, len(w.widgets), 2): + w.widgets[c].setBuddy(w.widgets[c+1]) + layout.addWidget(w.widgets[c], row, column) + layout.addWidget(w.widgets[c+1], row, column+1) + row += 1 + if row >= turnover_point: + column += 2 + turnover_point = count_non_comment + 1000 + row = 0 + if not bulk: # Add the comments fields + column = 0 + for col in cols: + dt = x[col]['datatype'] + if dt != 'comments': + continue + w = widget_factory(dt, col) + ans.append(w) + layout.addWidget(w.widgets[0], row, column, 1, 2) + if two_column and column == 0: + column = 2 + continue + column = 0 + row += 1 items = [] if len(ans) > 0: items.append(QSpacerItem(10, 10, QSizePolicy.Minimum, QSizePolicy.Expanding)) - left.addItem(items[-1], left.rowCount(), 0, 1, 1) - left.setRowStretch(left.rowCount()-1, 100) - if len(ans) > 1: - items.append(QSpacerItem(10, 100, QSizePolicy.Minimum, - QSizePolicy.Expanding)) - right.addItem(items[-1], left.rowCount(), 0, 1, 1) - right.setRowStretch(right.rowCount()-1, 100) - + layout.addItem(items[-1], layout.rowCount(), 0, 1, 1) + layout.setRowStretch(layout.rowCount()-1, 100) return ans, items class BulkBase(Base): @@ -342,6 +417,47 @@ class BulkRating(BulkBase, Rating): class BulkDateTime(BulkBase, DateTime): pass +class BulkSeries(BulkBase): + def setup_ui(self, parent): + values = self.all_values = list(self.db.all_custom(num=self.col_id)) + values.sort(cmp = lambda x,y: cmp(x.lower(), y.lower())) + w = EnComboBox(parent) + w.setSizeAdjustPolicy(w.AdjustToMinimumContentsLengthWithIcon) + w.setMinimumContentsLength(25) + self.name_widget = w + self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), w] + + self.widgets.append(QLabel(_('Automatically number books in this series'), parent)) + self.idx_widget=QCheckBox(parent) + self.widgets.append(self.idx_widget) + + def initialize(self, book_id): + self.idx_widget.setChecked(False) + for c in self.all_values: + self.name_widget.addItem(c) + self.name_widget.setEditText('') + + def commit(self, book_ids, notify=False): + val = unicode(self.name_widget.currentText()).strip() + val = self.normalize_ui_val(val) + update_indices = self.idx_widget.checkState() + if val != '': + for book_id in book_ids: + if update_indices: + if tweaks['series_index_auto_increment'] == 'next': + s_index = self.db.get_next_cc_series_num_for\ + (val, num=self.col_id) + else: + s_index = 1.0 + else: + s_index = self.db.get_custom_extra(book_id, num=self.col_id, + index_is_id=True) + self.db.set_custom(book_id, val, extra=s_index, + num=self.col_id, notify=notify) + + def process_each_book(self): + return True + class RemoveTags(QWidget): def __init__(self, parent, values): @@ -431,35 +547,5 @@ bulk_widgets = { 'float': BulkFloat, 'datetime': BulkDateTime, 'text' : BulkText, -} - -def populate_bulk_metadata_page(layout, db, book_ids, parent=None): - x = db.custom_column_num_map - cols = list(x) - cols.sort(cmp=partial(field_sort, x=x)) - ans = [] - for i, col in enumerate(cols): - dt = x[col]['datatype'] - if dt == 'comments': - continue - w = bulk_widgets[dt](db, col, parent) - ans.append(w) - w.initialize(book_ids) - row = layout.rowCount() - if len(w.widgets) == 1: - layout.addWidget(w.widgets[0], row, 0, 1, -1) - else: - for c in range(0, len(w.widgets), 2): - w.widgets[c].setBuddy(w.widgets[c+1]) - layout.addWidget(w.widgets[c], row, 0) - layout.addWidget(w.widgets[c+1], row, 1) - row += 1 - items = [] - if len(ans) > 0: - items.append(QSpacerItem(10, 10, QSizePolicy.Minimum, - QSizePolicy.Expanding)) - layout.addItem(items[-1], layout.rowCount(), 0, 1, 1) - layout.setRowStretch(layout.rowCount()-1, 100) - - return ans, items - + 'series': BulkSeries, +} \ No newline at end of file diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 8b27ff1999..9fcfe13253 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -10,7 +10,7 @@ from calibre.gui2.dialogs.metadata_bulk_ui import Ui_MetadataBulkDialog from calibre.gui2.dialogs.tag_editor import TagEditor from calibre.ebooks.metadata import string_to_authors, \ authors_to_string -from calibre.gui2.custom_column_widgets import populate_bulk_metadata_page +from calibre.gui2.custom_column_widgets import populate_metadata_page class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): @@ -44,15 +44,14 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.central_widget.tabBar().setVisible(False) else: self.create_custom_column_editors() - self.exec_() def create_custom_column_editors(self): w = self.central_widget.widget(1) layout = QGridLayout() - - self.custom_column_widgets, self.__cc_spacers = populate_bulk_metadata_page( - layout, self.db, self.ids, w) + self.custom_column_widgets, self.__cc_spacers = \ + populate_metadata_page(layout, self.db, self.ids, parent=w, + two_column=False, bulk=True) w.setLayout(layout) self.__custom_col_layouts = [layout] ans = self.custom_column_widgets diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py index 96323ac596..84b601776e 100644 --- a/src/calibre/gui2/dialogs/metadata_single.py +++ b/src/calibre/gui2/dialogs/metadata_single.py @@ -32,7 +32,7 @@ from calibre.utils.config import prefs, tweaks from calibre.utils.date import qt_to_dt from calibre.customize.ui import run_plugins_on_import, get_isbndb_key from calibre.gui2.dialogs.config.social import SocialMetadata -from calibre.gui2.custom_column_widgets import populate_single_metadata_page +from calibre.gui2.custom_column_widgets import populate_metadata_page class CoverFetcher(QThread): @@ -420,23 +420,19 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog): def create_custom_column_editors(self): w = self.central_widget.widget(1) - top_layout = QHBoxLayout() - top_layout.setSpacing(20) - left_layout = QGridLayout() - right_layout = QGridLayout() - top_layout.addLayout(left_layout) - - self.custom_column_widgets, self.__cc_spacers = populate_single_metadata_page( - left_layout, right_layout, self.db, self.id, w) - top_layout.addLayout(right_layout) - sip.delete(w.layout()) - w.setLayout(top_layout) - self.__custom_col_layouts = [top_layout, left_layout, right_layout] + layout = w.layout() + self.custom_column_widgets, self.__cc_spacers = \ + populate_metadata_page(layout, self.db, self.id, + parent=w, bulk=False, two_column=True) + self.__custom_col_layouts = [layout] ans = self.custom_column_widgets for i in range(len(ans)-1): - w.setTabOrder(ans[i].widgets[-1], ans[i+1].widgets[-1]) - - + if len(ans[i+1].widgets) == 2: + w.setTabOrder(ans[i].widgets[-1], ans[i+1].widgets[1]) + else: + w.setTabOrder(ans[i].widgets[-1], ans[i+1].widgets[0]) + for c in range(2, len(ans[i].widgets), 2): + w.setTabOrder(ans[i].widgets[c-1], ans[i].widgets[c+1]) def validate_isbn(self, isbn): isbn = unicode(isbn).strip() diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py index 57b355045a..52084fcda1 100644 --- a/src/calibre/library/custom_columns.py +++ b/src/calibre/library/custom_columns.py @@ -173,6 +173,19 @@ class CustomColumns(object): ans.sort(cmp=lambda x,y:cmp(x.lower(), y.lower())) return ans + def get_custom_extra(self, idx, label=None, num=None, index_is_id=False): + if label is not None: + data = self.custom_column_label_map[label] + if num is not None: + data = self.custom_column_num_map[num] + # add future datatypes with an extra column here + if data['datatype'] not in ['series']: + return None + ign,lt = self.custom_table_names(data['num']) + idx = idx if index_is_id else self.id(idx) + return self.conn.get('''SELECT extra FROM %s + WHERE book=?'''%lt, (idx,), all=False) + # convenience methods for tag editing def get_custom_items_with_ids(self, label=None, num=None): if label is not None: @@ -237,7 +250,7 @@ class CustomColumns(object): return 1.0 # get the label of the associated series number table series_num = self.conn.get(''' - SELECT MAX({lt}.s_index) FROM {lt} + SELECT MAX({lt}.extra) FROM {lt} WHERE {lt}.book IN (SELECT book FROM {lt} where value=?) '''.format(lt=lt), (series_id,), all=False) if series_num is None: @@ -343,7 +356,7 @@ class CustomColumns(object): (id_, xid), all=False): if data['datatype'] == 'series': self.conn.execute( - '''INSERT INTO %s(book, value, s_index) + '''INSERT INTO %s(book, value, extra) VALUES (?,?,?)'''%lt, (id_, xid, extra)) self.data.set(id_, self.FIELD_MAP[data['num']]+1, extra, row_is_id=True) @@ -401,7 +414,7 @@ class CustomColumns(object): custom_{num} '''.format(query=query%table, lt=lt, table=table, num=data['num']) if data['datatype'] == 'series': - line += ''',(SELECT s_index FROM {lt} WHERE {lt}.book=books.id) + line += ''',(SELECT extra FROM {lt} WHERE {lt}.book=books.id) custom_index_{num}'''.format(lt=lt, num=data['num']) else: line = ''' @@ -438,7 +451,7 @@ class CustomColumns(object): table, lt = self.custom_table_names(num) if normalized: if datatype == 'series': - s_index = 's_index REAL,' + s_index = 'extra REAL,' else: s_index = '' lines = [ From ee58333dcb6dfa1306adb212a386f43d3cffb5d7 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 20 Jun 2010 19:22:26 +0100 Subject: [PATCH 3/6] Fix samsung android driver --- src/calibre/devices/android/driver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py index 0bbdf0f22c..49c41b4e57 100644 --- a/src/calibre/devices/android/driver.py +++ b/src/calibre/devices/android/driver.py @@ -45,8 +45,8 @@ class ANDROID(USBMS): 'GT-I5700', 'SAMSUNG'] WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE', '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', - 'PROD_GT-I9000'] - WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'PROD_GT-I9000_CARD'] + 'PR OD_GT-I9000'] + WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'PR OD_GT-I9000_CARD'] OSX_MAIN_MEM = 'HTC Android Phone Media' From 2d5daf4a02e6c74387213f9dc00eebc9fdfbb171 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 20 Jun 2010 20:43:43 +0100 Subject: [PATCH 4/6] Enable completion for on-library editing of series columns --- src/calibre/gui2/library/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py index b949306294..8245c2d188 100644 --- a/src/calibre/gui2/library/views.py +++ b/src/calibre/gui2/library/views.py @@ -347,7 +347,7 @@ class BooksView(QTableView): # {{{ self.setItemDelegateForColumn(cm.index(colhead), delegate) elif cc['datatype'] == 'comments': self.setItemDelegateForColumn(cm.index(colhead), self.cc_comments_delegate) - elif cc['datatype'] == 'text': + elif cc['datatype'] in ('text', 'series'): if cc['is_multiple']: self.setItemDelegateForColumn(cm.index(colhead), self.tags_delegate) else: From 0dc63fa59f7531dc655b14b8872ff89f24f7d46f Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 21 Jun 2010 12:17:48 +0100 Subject: [PATCH 5/6] Fix problems with coordination between tags browser and search window. Search from the tag browser, then type in the search box. Tag browser was not cleared. --- src/calibre/gui2/search_box.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py index 35bf7374a0..ef0c6b1455 100644 --- a/src/calibre/gui2/search_box.py +++ b/src/calibre/gui2/search_box.py @@ -56,7 +56,8 @@ class SearchBox2(QComboBox): To use this class: * Call initialize() - * Connect to the search() and cleared() signals from this widget + * Connect to the search() and cleared() signals from this widget. + * Connect to the cleared() signal to know when the box content changes * Call search_done() after every search is complete * Use clear() to clear back to the help message ''' @@ -75,6 +76,7 @@ class SearchBox2(QComboBox): type=Qt.DirectConnection) self.line_edit.mouse_released.connect(self.mouse_released, type=Qt.DirectConnection) + self.activated.connect(self.history_selected) self.setEditable(True) self.help_state = False self.as_you_type = True @@ -139,6 +141,9 @@ class SearchBox2(QComboBox): def key_pressed(self, event): self.normalize_state() + if self._in_a_search: + self.emit(SIGNAL('changed()')) + self._in_a_search = False if event.key() in (Qt.Key_Return, Qt.Key_Enter): self.do_search() self.timer = self.startTimer(self.__class__.INTERVAL) @@ -154,6 +159,10 @@ class SearchBox2(QComboBox): self.timer = None self.do_search() + def history_selected(self, text): + self.emit(SIGNAL('changed()')) + self.do_search() + @property def smart_text(self): text = unicode(self.currentText()).strip() @@ -345,6 +354,7 @@ class SearchBoxMixin(object): self.search.initialize('main_search_history', colorize=True, help_text=_('Search (For Advanced Search click the button to the left)')) self.connect(self.search, SIGNAL('cleared()'), self.search_box_cleared) + self.connect(self.search, SIGNAL('changed()'), self.search_box_changed) self.connect(self.clear_button, SIGNAL('clicked()'), self.search.clear) QObject.connect(self.advanced_search_button, SIGNAL('clicked(bool)'), self.do_advanced_search) @@ -364,6 +374,9 @@ class SearchBoxMixin(object): self.saved_search.clear_to_help() self.set_number_of_books_shown() + def search_box_changed(self): + self.tags_view.clear() + def do_advanced_search(self, *args): d = SearchDialog(self) if d.exec_() == QDialog.Accepted: From eaf9c93e9e7a47f917e4a7c5778626861e3e557b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Jun 2010 08:59:37 +0100 Subject: [PATCH 6/6] Add cancel button to ChooseFormatDialog, and make the send to device menus honor it. --- src/calibre/gui2/device.py | 5 +++-- src/calibre/gui2/dialogs/choose_format.ui | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 33191d1773..850396bc5d 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -10,7 +10,7 @@ from functools import partial from binascii import unhexlify from PyQt4.Qt import QMenu, QAction, QActionGroup, QIcon, SIGNAL, QPixmap, \ - Qt, pyqtSignal, QColor, QPainter + Qt, pyqtSignal, QColor, QPainter, QDialog from PyQt4.QtSvg import QSvgRenderer from calibre.customize.ui import available_input_formats, available_output_formats, \ @@ -814,7 +814,8 @@ class DeviceMixin(object): # {{{ if specific: d = ChooseFormatDialog(self, _('Choose format to send to device'), self.device_manager.device.settings().format_map) - d.exec_() + if d.exec_() != QDialog.Accepted: + return if d.format(): fmt = d.format().lower() dest, sub_dest = dest.split(':') diff --git a/src/calibre/gui2/dialogs/choose_format.ui b/src/calibre/gui2/dialogs/choose_format.ui index 0ae0fa8b94..50dd4b4fc1 100644 --- a/src/calibre/gui2/dialogs/choose_format.ui +++ b/src/calibre/gui2/dialogs/choose_format.ui @@ -39,7 +39,7 @@ Qt::Horizontal - QDialogButtonBox::Ok + QDialogButtonBox::Ok|QDialogButtonBox::Cancel