From 84c9a3d15062eae4edc805c992c7dd0c7c2b91fd Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 21 Feb 2011 21:35:34 +0000 Subject: [PATCH 01/30] First pass at tag browser subfolders --- src/calibre/ebooks/metadata/book/__init__.py | 4 + src/calibre/ebooks/metadata/opf2.py | 8 +- src/calibre/gui2/tag_view.py | 138 ++++++++++++------- src/calibre/library/caches.py | 12 +- src/calibre/library/database2.py | 15 ++ src/calibre/library/field_metadata.py | 2 +- src/calibre/library/server/browse.py | 5 +- 7 files changed, 124 insertions(+), 60 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index 82de7400d7..033a78d611 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -83,6 +83,10 @@ CALIBRE_METADATA_FIELDS = frozenset([ 'application_id', # An application id, currently set to the db_id. 'db_id', # the calibre primary key of the item. 'formats', # list of formats (extensions) for this book + # a dict of user category names, where the value is a list of item names + # from the book that are in that category + 'user_categories', + ] ) diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index dfb902b5b9..0d8e523c38 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -524,6 +524,8 @@ class OPF(object): # {{{ publication_type = MetadataField('publication_type', is_dc=False) timestamp = MetadataField('timestamp', is_dc=False, formatter=parse_date, renderer=isoformat) + user_categories = MetadataField('user_categories', is_dc=False, + formatter=json.loads, renderer=json.dumps) def __init__(self, stream, basedir=os.getcwdu(), unquote_urls=True, @@ -994,7 +996,7 @@ class OPF(object): # {{{ for attr in ('title', 'authors', 'author_sort', 'title_sort', 'publisher', 'series', 'series_index', 'rating', 'isbn', 'tags', 'category', 'comments', - 'pubdate'): + 'pubdate', 'user_categories'): val = getattr(mi, attr, None) if val is not None and val != [] and val != (None, None): setattr(self, attr, val) @@ -1175,6 +1177,8 @@ class OPFCreator(Metadata): a(CAL_ELEM('calibre:timestamp', self.timestamp.isoformat())) if self.publication_type is not None: a(CAL_ELEM('calibre:publication_type', self.publication_type)) + if self.user_categories is not None: + a(CAL_ELEM('calibre:user_categories', json.dumps(self.user_categories))) manifest = E.manifest() if self.manifest is not None: for ref in self.manifest: @@ -1299,6 +1303,8 @@ def metadata_to_opf(mi, as_string=True): meta('publication_type', mi.publication_type) if mi.title_sort: meta('title_sort', mi.title_sort) + if mi.user_categories: + meta('user_categories', json.dumps(mi.user_categories)) serialize_user_metadata(metadata, mi.get_all_user_metadata(False)) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 3af3271921..1660d9b8c6 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -263,8 +263,9 @@ class TagsView(QTreeView): # {{{ item = item.parent if item.type == TagTreeItem.CATEGORY: - while item.parent != self._model.root_item: - item = item.parent + if not item.category_key.startswith('@'): + while item.parent != self._model.root_item: + item = item.parent category = unicode(item.name.toString()) key = item.category_key # Verify that we are working with a field that we know something about @@ -552,8 +553,7 @@ class TagTreeItem(object): # {{{ res = [] for t in self.children: if t.type == TagTreeItem.CATEGORY: - for c in t.children: - res.append(c) + res.extend(t.child_tags()) else: res.append(t) return res @@ -590,6 +590,10 @@ class TagsModel(QAbstractItemModel): # {{{ data = self.get_node_tree(config['sort_tags_by']) gst = db.prefs.get('grouped_search_terms', {}) self.root_item = TagTreeItem() + self.category_nodes = [] + + last_category_node = None + category_node_map = {} for i, r in enumerate(self.row_map): if self.hidden_categories and self.categories[i] in self.hidden_categories: continue @@ -599,10 +603,31 @@ class TagsModel(QAbstractItemModel): # {{{ tt = '' else: tt = _(u'The lookup/search name is "{0}"').format(r) - TagTreeItem(parent=self.root_item, - data=self.categories[i], - category_icon=self.category_icon_map[r], - tooltip=tt, category_key=r) + if r.startswith('@') and r.find('/') >= 0: + path_parts = [p.strip() for p in r.split('/') if p.strip()] + path = '' + for i,p in enumerate(path_parts): + path += p + if path not in category_node_map: + node = TagTreeItem(parent=last_category_node, + data=p[1:] if i == 0 else p, + category_icon=self.category_icon_map[r], + tooltip=tt if path == r else path, + category_key=path) + last_category_node = node + category_node_map[path] = node + self.category_nodes.append(node) + else: + last_category_node = category_node_map[path] + path += '/' + else: + node = TagTreeItem(parent=self.root_item, + data=self.categories[i], + category_icon=self.category_icon_map[r], + tooltip=tt, category_key=r) + category_node_map[r] = node + last_category_node = node + self.category_nodes.append(node) self.refresh(data=data) def break_cycles(self): @@ -754,10 +779,15 @@ class TagsModel(QAbstractItemModel): # {{{ for user_cat in sorted(self.db.prefs.get('user_categories', {}).keys(), key=sort_key): cat_name = '@' + user_cat # add the '@' to avoid name collision - try: - tb_cats.add_user_category(label=cat_name, name=user_cat) - except ValueError: - traceback.print_exc() + while True: + try: + tb_cats.add_user_category(label=cat_name, name=user_cat) + slash = cat_name.rfind('/') + if slash < 0: + break + cat_name = cat_name[:slash] + except ValueError: + break for cat in sorted(self.db.prefs.get('grouped_search_terms', {}).keys(), key=sort_key): @@ -794,7 +824,7 @@ class TagsModel(QAbstractItemModel): # {{{ data = self.get_node_tree(sort_by) # get category data if data is None: return False - row_index = -1 + collapse = gprefs['tags_browser_collapse_at'] collapse_model = self.collapse_model if collapse == 0: @@ -810,35 +840,22 @@ class TagsModel(QAbstractItemModel): # {{{ collapse_template = tweaks['categories_collapsed_popularity_template'] collapse_letter = collapse_letter_sk = None - for i, r in enumerate(self.row_map): - if self.hidden_categories and self.categories[i] in self.hidden_categories: - continue - row_index += 1 - category = self.root_item.children[row_index] - names = [] - states = [] - children = category.child_tags() - states = [t.tag.state for t in children] - names = [t.tag.name for names in children] - state_map = dict(izip(names, states)) - category_index = self.index(row_index, 0, QModelIndex()) + def process_one_node(category, state_map, collapse_letter, collapse_letter_sk): + category_index = self.createIndex(category.row(), 0, category) category_node = category_index.internalPointer() - if len(category.children) > 0: - self.beginRemoveRows(category_index, 0, - len(category.children)-1) - category.children = [] - self.endRemoveRows() - cat_len = len(data[r]) + key = category_node.category_key + if key not in data: + return ((collapse_letter, collapse_letter_sk)) + cat_len = len(data[key]) if cat_len <= 0: - continue + return ((collapse_letter, collapse_letter_sk)) - self.beginInsertRows(category_index, 0, len(data[r])-1) - clear_rating = True if r not in self.categories_with_ratings and \ - not self.db.field_metadata[r]['is_custom'] and \ - not self.db.field_metadata[r]['kind'] == 'user' \ + clear_rating = True if key not in self.categories_with_ratings and \ + not self.db.field_metadata[key]['is_custom'] and \ + not self.db.field_metadata[key]['kind'] == 'user' \ else False - tt = r if self.db.field_metadata[r]['kind'] == 'user' else None - for idx,tag in enumerate(data[r]): + tt = key if self.db.field_metadata[key]['kind'] == 'user' else None + for idx,tag in enumerate(data[key]): if clear_rating: tag.avg_rating = None tag.state = state_map.get(tag.name, 0) @@ -848,15 +865,18 @@ class TagsModel(QAbstractItemModel): # {{{ if (idx % collapse) == 0: d = {'first': tag} if cat_len > idx + collapse: - d['last'] = data[r][idx+collapse-1] + d['last'] = data[key][idx+collapse-1] else: - d['last'] = data[r][cat_len-1] + d['last'] = data[key][cat_len-1] name = eval_formatter.safe_format(collapse_template, d, 'TAG_VIEW', None) + self.beginInsertRows(category_index, 999999, 1) #len(data[key])-1) sub_cat = TagTreeItem(parent=category, data = name, tooltip = None, category_icon = category_node.icon, category_key=category_node.category_key) + sub_cat_index = self.createIndex(sub_cat.row(), 0, sub_cat) + self.endInsertRows() else: ts = tag.sort if not ts: @@ -877,12 +897,34 @@ class TagsModel(QAbstractItemModel): # {{{ category_icon = category_node.icon, tooltip = None, category_key=category_node.category_key) - t = TagTreeItem(parent=sub_cat, data=tag, tooltip=tt, + sub_cat_index = self.createIndex(sub_cat.row(), 0, sub_cat) + self.beginInsertRows(sub_cat_index, 999999, 1) + TagTreeItem(parent=sub_cat, data=tag, tooltip=tt, icon_map=self.icon_state_map) else: - t = TagTreeItem(parent=category, data=tag, tooltip=tt, + self.beginInsertRows(category_index, 999999, 1) + TagTreeItem(parent=category, data=tag, tooltip=tt, icon_map=self.icon_state_map) - self.endInsertRows() + self.endInsertRows() + return ((collapse_letter, collapse_letter_sk)) + + for category in self.category_nodes: + if len(category.children) > 0: + children = category.children + states = [c.tag.state for c in children if c.type != TagTreeItem.CATEGORY] + names = [c.tag.name for c in children if c.type != TagTreeItem.CATEGORY] + state_map = dict(izip(names, states)) + ctags = [c for c in children if c.type == TagTreeItem.CATEGORY] + start = len(ctags) + self.beginRemoveRows(self.createIndex(category.row(), 0, category), + start, len(children)-1) + category.children = ctags + self.endRemoveRows() + else: + state_map = {} + + collapse_letter, collapse_letter_sk = process_one_node(category, + state_map, collapse_letter, collapse_letter_sk) return True def columnCount(self, parent): @@ -1073,14 +1115,10 @@ class TagsModel(QAbstractItemModel): # {{{ # They will be 'checked' in both places, but we want to put the node # into the search string only once. The nodes_seen set helps us do that nodes_seen = set() - row_index = -1 - for i, key in enumerate(self.row_map): - if self.hidden_categories and self.categories[i] in self.hidden_categories: - continue - row_index += 1 - category_item = self.root_item.children[row_index] - for tag_item in category_item.child_tags(): + for node in self.category_nodes: + key = node.category_key + for tag_item in node.child_tags(): tag = tag_item.tag if tag.state != TAG_SEARCH_STATES['clear']: prefix = ' not ' if tag.state == TAG_SEARCH_STATES['mark_minus'] \ diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 45b96bb69f..da71ce0d4e 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -415,13 +415,13 @@ class ResultCache(SearchQueryParser): # {{{ if self.db_prefs is None: return res user_cats = self.db_prefs.get('user_categories', []) - if location not in user_cats: - return res c = set(candidates) - for (item, category, ign) in user_cats[location]: - s = self.get_matches(category, '=' + item, candidates=c) - c -= s - res |= s + for key in user_cats: + if key == location or key.startswith(location + '/'): + for (item, category, ign) in user_cats[key]: + s = self.get_matches(category, '=' + item, candidates=c) + c -= s + res |= s if query == 'false': return candidates - res return res diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 305d1581d7..385849ae79 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -812,6 +812,21 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): index_is_id=index_is_id), extra=self.get_custom_extra(idx, label=meta['label'], index_is_id=index_is_id)) + + user_cats = self.prefs['user_categories'] + user_cat_vals = {} + for ucat in user_cats: + res = [] + for name,cat,ign in user_cats[ucat]: + v = mi.get(cat, None) + if isinstance(v, list): + if name in v: + res.append([name,cat]) + elif name == v: + res.append([name,cat]) + user_cat_vals[ucat] = res + mi.user_categories = user_cat_vals + if get_cover: mi.cover = self.cover(id, index_is_id=True, as_path=True) return mi diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py index 9b481a89d0..aff2803452 100644 --- a/src/calibre/library/field_metadata.py +++ b/src/calibre/library/field_metadata.py @@ -32,7 +32,7 @@ category_icon_map = { 'news' : 'news.png', 'tags' : 'tags.png', 'custom:' : 'column.png', - 'user:' : 'drawer.png', + 'user:' : 'tb_folder.png', 'search' : 'search.png' } diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py index 5415cfe8bb..a4f55afbc7 100644 --- a/src/calibre/library/server/browse.py +++ b/src/calibre/library/server/browse.py @@ -168,7 +168,7 @@ def get_category_items(category, items, restriction, datatype, prefix): # {{{ q = i.category if not q: q = category - href = '/browse/matches/%s/%s'%(quote(q), quote(id_)) + href = '/browse/matches/%s/%s'%(quote(q.replace('/', '/')), quote(id_)) return templ.format(xml(name), rating, xml(desc), xml(href, True), rstring, prefix) @@ -367,7 +367,7 @@ class BrowseServer(object): u'{0}' u'{0}' u'') - .format(xml(x, True), xml(quote(y)), xml(_('Browse books by')), + .format(xml(x, True), xml(quote(y.replace('/', '/'))), xml(_('Browse books by')), self.opts.url_prefix, src='/browse/icon/'+z) for x, y, z in cats] @@ -387,6 +387,7 @@ class BrowseServer(object): return sort def browse_category(self, category, sort): + category = category.replace('/', '/') categories = self.categories_cache() if category not in categories: raise cherrypy.HTTPError(404, 'category not found') From 40af13276eb2e4badb634d3473a4af7123686cae Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 13:19:35 +0000 Subject: [PATCH 02/30] First pass at hierarchical tags --- src/calibre/gui2/tag_view.py | 109 ++++++++++++++++++++++------------ src/calibre/library/caches.py | 13 +++- 2 files changed, 80 insertions(+), 42 deletions(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 1660d9b8c6..8b353cd2b3 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en' Browsing book collection by tags. ''' -import traceback +import traceback, copy from itertools import izip from functools import partial @@ -551,11 +551,12 @@ class TagTreeItem(object): # {{{ def child_tags(self): res = [] - for t in self.children: - if t.type == TagTreeItem.CATEGORY: - res.extend(t.child_tags()) - else: - res.append(t) + def recurse(nodes, res): + for t in nodes: + if t.type != TagTreeItem.CATEGORY: + res.append(t) + recurse(t.children, res) + recurse(self.children, res) return res # }}} @@ -603,6 +604,7 @@ class TagsModel(QAbstractItemModel): # {{{ tt = '' else: tt = _(u'The lookup/search name is "{0}"').format(r) + if r.startswith('@') and r.find('/') >= 0: path_parts = [p.strip() for p in r.split('/') if p.strip()] path = '' @@ -858,7 +860,7 @@ class TagsModel(QAbstractItemModel): # {{{ for idx,tag in enumerate(data[key]): if clear_rating: tag.avg_rating = None - tag.state = state_map.get(tag.name, 0) + tag.state = state_map.get((tag.name, tag.category), 0) if collapse_model != 'disable' and cat_len > collapse: if collapse_model == 'partition': @@ -875,7 +877,6 @@ class TagsModel(QAbstractItemModel): # {{{ data = name, tooltip = None, category_icon = category_node.icon, category_key=category_node.category_key) - sub_cat_index = self.createIndex(sub_cat.row(), 0, sub_cat) self.endInsertRows() else: ts = tag.sort @@ -897,22 +898,45 @@ class TagsModel(QAbstractItemModel): # {{{ category_icon = category_node.icon, tooltip = None, category_key=category_node.category_key) - sub_cat_index = self.createIndex(sub_cat.row(), 0, sub_cat) - self.beginInsertRows(sub_cat_index, 999999, 1) - TagTreeItem(parent=sub_cat, data=tag, tooltip=tt, - icon_map=self.icon_state_map) + node_parent = sub_cat else: + node_parent = category + + components = [t for t in tag.name.split('.')] + if key in ['authors', 'publisher', 'title'] or len(components) == 1: self.beginInsertRows(category_index, 999999, 1) - TagTreeItem(parent=category, data=tag, tooltip=tt, + TagTreeItem(parent=node_parent, data=tag, tooltip=tt, icon_map=self.icon_state_map) - self.endInsertRows() + self.endInsertRows() + else: + print components + for i,comp in enumerate(components): + children = dict([(t.tag.name, t) for t in node_parent.children + if t.type != TagTreeItem.CATEGORY]) + if comp in children: + node_parent = children[comp] + else: + if i < len(components)-1: + t = copy.copy(tag) + t.original_name = '.'.join(components[:i+1]) + t.use_prefix = True + else: + t = tag + t.original_name = t.name + t.use_prefix = False + t.name = comp + self.beginInsertRows(category_index, 999999, 1) + node_parent = TagTreeItem(parent=node_parent, data=t, + tooltip=tt, icon_map=self.icon_state_map) + self.endInsertRows() + return ((collapse_letter, collapse_letter_sk)) for category in self.category_nodes: if len(category.children) > 0: children = category.children - states = [c.tag.state for c in children if c.type != TagTreeItem.CATEGORY] - names = [c.tag.name for c in children if c.type != TagTreeItem.CATEGORY] + states = [c.tag.state for c in category.child_tags()] + names = [(c.tag.name, c.tag.category) for c in category.child_tags()] state_map = dict(izip(names, states)) ctags = [c for c in children if c.type == TagTreeItem.CATEGORY] start = len(ctags) @@ -1064,27 +1088,31 @@ class TagsModel(QAbstractItemModel): # {{{ def reset_all_states(self, except_=None): update_list = [] - def process_tag(tag_index, tag_item): - tag = tag_item.tag - if tag is except_: - self.dataChanged.emit(tag_index, tag_index) - return - if tag.state != 0 or tag in update_list: - tag.state = 0 - update_list.append(tag) - self.dataChanged.emit(tag_index, tag_index) + def process_tag(tag_item): + if tag_item.type != TagTreeItem.CATEGORY: + tag = tag_item.tag + if tag is except_: + tag_index = self.createIndex(tag_item.row(), 0, tag_item) + self.dataChanged.emit(tag_index, tag_index) + elif tag.state != 0 or tag in update_list: + tag_index = self.createIndex(tag_item.row(), 0, tag_item) + tag.state = 0 + update_list.append(tag) + self.dataChanged.emit(tag_index, tag_index) + for t in tag_item.children: + process_tag(t) - def process_level(category_index): - for j in xrange(self.rowCount(category_index)): - tag_index = self.index(j, 0, category_index) - tag_item = tag_index.internalPointer() - if tag_item.type == TagTreeItem.CATEGORY: - process_level(tag_index) - else: - process_tag(tag_index, tag_item) +# def process_level(category_index): +# for j in xrange(self.rowCount(category_index)): +# tag_index = self.index(j, 0, category_index) +# tag_item = tag_index.internalPointer() +# if tag_item.type == TagTreeItem.CATEGORY: +# process_level(tag_index) +# else: +# process_tag(tag_index, tag_item) - for i in xrange(self.rowCount(QModelIndex())): - process_level(self.index(i, 0, QModelIndex())) + for t in self.root_item.children: + process_tag(t) def clear_state(self): self.reset_all_states() @@ -1127,15 +1155,18 @@ class TagsModel(QAbstractItemModel): # {{{ if tag.name and tag.name[0] == u'\u2605': # char is a star. Assume rating ans.append('%s%s:%s'%(prefix, category, len(tag.name))) else: + name = getattr(tag, 'original_name', tag.name) + use_prefix = getattr(tag, 'use_prefix', False) if category == 'tags': - if tag.name in tags_seen: + if name in tags_seen: continue - tags_seen.add(tag.name) + tags_seen.add(name) if tag in nodes_seen: continue nodes_seen.add(tag) - ans.append('%s%s:"=%s"'%(prefix, category, - tag.name.replace(r'"', r'\"'))) + ans.append('%s%s:"=%s%s"'%(prefix, category, + '.' if use_prefix else '', + name.replace(r'"', r'\"'))) return ans def find_item_node(self, key, txt, start_path): diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index da71ce0d4e..a84a9e0940 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -124,9 +124,16 @@ def _match(query, value, matchkind): for t in value: t = icu_lower(t) try: ### ignore regexp exceptions, required because search-ahead tries before typing is finished - if ((matchkind == EQUALS_MATCH and query == t) or - (matchkind == REGEXP_MATCH and re.search(query, t, re.I)) or ### search unanchored - (matchkind == CONTAINS_MATCH and query in t)): + if (matchkind == EQUALS_MATCH): + if query[0] == '.': + if t.startswith(query[1:]): + ql = len(query) - 1 + print ql, t, query + return (len(t) == ql) or (t[ql:ql+1] == '.') + elif query == t: + return True + elif ((matchkind == REGEXP_MATCH and re.search(query, t, re.I)) or ### search unanchored + (matchkind == CONTAINS_MATCH and query in t)): return True except re.error: pass From 1543ff5ea6fd00b3019377504bd90797b67ff38e Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 13:23:32 +0000 Subject: [PATCH 03/30] Change slash in folder to dots to avoid content server and template problems --- src/calibre/gui2/tag_view.py | 12 ++++++------ src/calibre/library/server/browse.py | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 8b353cd2b3..d90365eceb 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -605,8 +605,8 @@ class TagsModel(QAbstractItemModel): # {{{ else: tt = _(u'The lookup/search name is "{0}"').format(r) - if r.startswith('@') and r.find('/') >= 0: - path_parts = [p.strip() for p in r.split('/') if p.strip()] + if r.startswith('@') and r.find('.') >= 0: + path_parts = [p.strip() for p in r.split('.') if p.strip()] path = '' for i,p in enumerate(path_parts): path += p @@ -621,7 +621,7 @@ class TagsModel(QAbstractItemModel): # {{{ self.category_nodes.append(node) else: last_category_node = category_node_map[path] - path += '/' + path += '.' else: node = TagTreeItem(parent=self.root_item, data=self.categories[i], @@ -784,10 +784,10 @@ class TagsModel(QAbstractItemModel): # {{{ while True: try: tb_cats.add_user_category(label=cat_name, name=user_cat) - slash = cat_name.rfind('/') - if slash < 0: + dot = cat_name.rfind('.') + if dot < 0: break - cat_name = cat_name[:slash] + cat_name = cat_name[:dot] except ValueError: break diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py index a4f55afbc7..5415cfe8bb 100644 --- a/src/calibre/library/server/browse.py +++ b/src/calibre/library/server/browse.py @@ -168,7 +168,7 @@ def get_category_items(category, items, restriction, datatype, prefix): # {{{ q = i.category if not q: q = category - href = '/browse/matches/%s/%s'%(quote(q.replace('/', '/')), quote(id_)) + href = '/browse/matches/%s/%s'%(quote(q), quote(id_)) return templ.format(xml(name), rating, xml(desc), xml(href, True), rstring, prefix) @@ -367,7 +367,7 @@ class BrowseServer(object): u'{0}' u'{0}' u'') - .format(xml(x, True), xml(quote(y.replace('/', '/'))), xml(_('Browse books by')), + .format(xml(x, True), xml(quote(y)), xml(_('Browse books by')), self.opts.url_prefix, src='/browse/icon/'+z) for x, y, z in cats] @@ -387,7 +387,6 @@ class BrowseServer(object): return sort def browse_category(self, category, sort): - category = category.replace('/', '/') categories = self.categories_cache() if category not in categories: raise cherrypy.HTTPError(404, 'category not found') From bfc53cd03172e442112069430e3ffbee6c75a602 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 13:25:03 +0000 Subject: [PATCH 04/30] More slash to dot changes --- src/calibre/library/caches.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index a84a9e0940..c25ce1bcce 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -424,7 +424,7 @@ class ResultCache(SearchQueryParser): # {{{ user_cats = self.db_prefs.get('user_categories', []) c = set(candidates) for key in user_cats: - if key == location or key.startswith(location + '/'): + if key == location or key.startswith(location + '.'): for (item, category, ign) in user_cats[key]: s = self.get_matches(category, '=' + item, candidates=c) c -= s From f946570332761cb562c4363070461fa8d80fcbbf Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 14:22:42 +0000 Subject: [PATCH 05/30] 1) Make hierarchies display as complete tags in user categories. 2) Add a sublist template function for slicing names apart. --- src/calibre/gui2/tag_view.py | 25 ++++++++++++-------- src/calibre/utils/formatter_functions.py | 29 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index d90365eceb..b39c8b0fe3 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -516,7 +516,13 @@ class TagTreeItem(object): # {{{ name = tag.sort tt_author = True else: - name = tag.name + p = self + while p.parent.type != self.ROOT: + p = p.parent + if p.category_key.startswith('@'): + name = getattr(tag, 'original_name', tag.name) + else: + name = tag.name tt_author = False if role == Qt.DisplayRole: if tag.count == 0: @@ -903,18 +909,19 @@ class TagsModel(QAbstractItemModel): # {{{ node_parent = category components = [t for t in tag.name.split('.')] - if key in ['authors', 'publisher', 'title'] or len(components) == 1: + if key in ['authors', 'publisher', 'title'] or len(components) == 1 or \ + self.db.field_metadata[key]['kind'] == 'user': self.beginInsertRows(category_index, 999999, 1) TagTreeItem(parent=node_parent, data=tag, tooltip=tt, icon_map=self.icon_state_map) self.endInsertRows() else: - print components for i,comp in enumerate(components): - children = dict([(t.tag.name, t) for t in node_parent.children + child_map = dict([(t.tag.name, t) for t in node_parent.children if t.type != TagTreeItem.CATEGORY]) - if comp in children: - node_parent = children[comp] + if comp in child_map: + node_parent = child_map[comp] + node_parent.tag.count += tag.count else: if i < len(components)-1: t = copy.copy(tag) @@ -934,14 +941,14 @@ class TagsModel(QAbstractItemModel): # {{{ for category in self.category_nodes: if len(category.children) > 0: - children = category.children + child_map = category.children states = [c.tag.state for c in category.child_tags()] names = [(c.tag.name, c.tag.category) for c in category.child_tags()] state_map = dict(izip(names, states)) - ctags = [c for c in children if c.type == TagTreeItem.CATEGORY] + ctags = [c for c in child_map if c.type == TagTreeItem.CATEGORY] start = len(ctags) self.beginRemoveRows(self.createIndex(category.row(), 0, category), - start, len(children)-1) + start, len(child_map)-1) category.children = ctags self.endRemoveRows() else: diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index 518f2ed140..03491c038a 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -396,6 +396,34 @@ class BuiltinListitem(BuiltinFormatterFunction): except: return '' +class BuiltinSublist(BuiltinFormatterFunction): + name = 'sublist' + arg_count = 4 + doc = _('sublist(val, start_index, end_index, separator) -- interpret the ' + ' value as a list of items separated by `separator`, returning a ' + ' new list made from the `start_index`th to the `end_index`th item. ' + 'The first item is number zero. If an index is negative, then it ' + 'counts from the end of the list. As a special case, an end_index ' + 'of zero is assumed to be the length of the list. Examples using ' + 'basic template mode and assuming a #genre value if A.B.C: ' + '{#genre:sublist(-1,0,.)} returns C
' + '{#genre:sublist(0,1,.)} returns A
' + '{#genre:sublist(0,-1,.)} returns A.B') + + def evaluate(self, formatter, kwargs, mi, locals, val, start_index, end_index, sep): + if not val: + return '' + si = int(start_index) + ei = int(end_index) + val = val.split(sep) + try: + if ei == 0: + return sep.join(val[si:]) + else: + return sep.join(val[si:ei]) + except: + return '' + class BuiltinUppercase(BuiltinFormatterFunction): name = 'uppercase' arg_count = 1 @@ -447,6 +475,7 @@ builtin_re = BuiltinRe() builtin_shorten = BuiltinShorten() builtin_strcat = BuiltinStrcat() builtin_strcmp = BuiltinStrcmp() +builtin_sublist = BuiltinSublist() builtin_substr = BuiltinSubstr() builtin_subtract = BuiltinSubtract() builtin_switch = BuiltinSwitch() From 68af4f7a1bd9537d26a5b67f981889c39d8bdc2c Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 16:53:12 +0000 Subject: [PATCH 06/30] Use case-insensitive matching for user category items --- src/calibre/gui2/dialogs/tag_categories.py | 7 ++++--- src/calibre/library/database2.py | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/dialogs/tag_categories.py b/src/calibre/gui2/dialogs/tag_categories.py index 307baffb5b..b8a7e67c72 100644 --- a/src/calibre/gui2/dialogs/tag_categories.py +++ b/src/calibre/gui2/dialogs/tag_categories.py @@ -73,16 +73,17 @@ class TagCategories(QDialog, Ui_TagCategories): if idx == 0: continue for n in category_values[idx](): - t = Item(name=n, label=label, index=len(self.all_items),icon=category_icons[idx], exists=True) + t = Item(name=n, label=label, index=len(self.all_items), + icon=category_icons[idx], exists=True) self.all_items.append(t) - self.all_items_dict[label+':'+n] = t + self.all_items_dict[icu_lower(label+':'+n)] = t self.categories = dict.copy(db.prefs.get('user_categories', {})) if self.categories is None: self.categories = {} for cat in self.categories: for item,l in enumerate(self.categories[cat]): - key = ':'.join([l[1], l[0]]) + key = icu_lower(':'.join([l[1], l[0]])) t = self.all_items_dict.get(key, None) if l[1] in self.category_labels: if t is None: diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 09c755ab5e..5a0935c2c8 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -1421,7 +1421,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): # temporarily duplicating the categories lists. taglist = {} for c in categories.keys(): - taglist[c] = dict(map(lambda t:(t.name, t), categories[c])) + taglist[c] = dict(map(lambda t:(icu_lower(t.name), t), categories[c])) muc = self.prefs.get('grouped_search_make_user_categories', []) gst = self.prefs.get('grouped_search_terms', {}) @@ -1437,8 +1437,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): for user_cat in sorted(user_categories.keys(), key=sort_key): items = [] for (name,label,ign) in user_categories[user_cat]: - if label in taglist and name in taglist[label]: - items.append(taglist[label][name]) + n = icu_lower(name) + if label in taglist and n in taglist[label]: + items.append(taglist[label][n]) # else: do nothing, to not include nodes w zero counts cat_name = '@' + user_cat # add the '@' to avoid name collision # Not a problem if we accumulate entries in the icon map From 82e23f1bd72448a1d1bdba953a388ddd1702f7f3 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 16:55:27 +0000 Subject: [PATCH 07/30] Change search to match a tag item X when a user category path @A.X is searched, in addition to the items in category A.X --- src/calibre/library/caches.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index c25ce1bcce..4f0e3f8d8b 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -423,12 +423,22 @@ class ResultCache(SearchQueryParser): # {{{ return res user_cats = self.db_prefs.get('user_categories', []) c = set(candidates) + l = location.rfind('.') + if l > 0: + alt_loc = location[0:l] + alt_item = location[l+1:] for key in user_cats: if key == location or key.startswith(location + '.'): for (item, category, ign) in user_cats[key]: s = self.get_matches(category, '=' + item, candidates=c) c -= s res |= s + elif key == alt_loc: + for (item, category, ign) in user_cats[key]: + if item == alt_item: + s = self.get_matches(category, '=' + item, candidates=c) + c -= s + res |= s if query == 'false': return candidates - res return res From 14f9f53bcaa8251ef1bde9547f5b10d55fd61d8a Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 17:45:37 +0000 Subject: [PATCH 08/30] Remove a print statement --- src/calibre/library/caches.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 4f0e3f8d8b..318183eb10 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -128,7 +128,6 @@ def _match(query, value, matchkind): if query[0] == '.': if t.startswith(query[1:]): ql = len(query) - 1 - print ql, t, query return (len(t) == ql) or (t[ql:ql+1] == '.') elif query == t: return True From 166db2e4dea830c431d5d6660161949a602916dd Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 18:12:33 +0000 Subject: [PATCH 09/30] Make sure editing the name of a node doesn't break anything. Prevent renaming of constructed nodes. It isn't quite right because inner-node renaming will create another hierarchy. Will deal with that at some point. --- src/calibre/gui2/tag_view.py | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index b39c8b0fe3..15ff986f2e 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -258,9 +258,13 @@ class TagsView(QTreeView): # {{{ if item.type == TagTreeItem.TAG: tag_item = item - tag_name = item.tag.name - tag_id = item.tag.id - item = item.parent + t = item.tag + tag_name = t.name + tag_id = t.id + can_edit = getattr(t, 'can_edit', True) + print can_edit, getattr(t, 'original_name', t.name), t.name + while item.type != TagTreeItem.CATEGORY: + item = item.parent if item.type == TagTreeItem.CATEGORY: if not item.category_key.startswith('@'): @@ -276,13 +280,14 @@ class TagsView(QTreeView): # {{{ if tag_name: # If the user right-clicked on an editable item, then offer # the possibility of renaming that item. - if key in ['authors', 'tags', 'series', 'publisher', 'search'] or \ + if can_edit and \ + key in ['authors', 'tags', 'series', 'publisher', 'search'] or \ (self.db.field_metadata[key]['is_custom'] and \ self.db.field_metadata[key]['datatype'] != 'rating'): # Add the 'rename' items self.context_menu.addAction(_('Rename %s')%tag_name, - partial(self.context_menu_handler, action='edit_item', - category=tag_item, index=index)) + partial(self.context_menu_handler, action='edit_item', + category=tag_item, index=index)) if key == 'authors': self.context_menu.addAction(_('Edit sort for %s')%tag_name, partial(self.context_menu_handler, @@ -530,7 +535,7 @@ class TagTreeItem(object): # {{{ else: return QVariant('[%d] %s'%(tag.count, name)) if role == Qt.EditRole: - return QVariant(tag.name) + return QVariant(getattr(tag, 'original_name', tag.name)) if role == Qt.DecorationRole: return self.icon_state_map[tag.state] if role == Qt.ToolTipRole: @@ -926,11 +931,12 @@ class TagsModel(QAbstractItemModel): # {{{ if i < len(components)-1: t = copy.copy(tag) t.original_name = '.'.join(components[:i+1]) - t.use_prefix = True + t.can_edit = False else: t = tag t.original_name = t.name - t.use_prefix = False + t.can_edit = True + t.use_prefix = True t.name = comp self.beginInsertRows(category_index, 999999, 1) node_parent = TagTreeItem(parent=node_parent, data=t, @@ -980,7 +986,10 @@ class TagsModel(QAbstractItemModel): # {{{ _('An item cannot be set to nothing. Delete it instead.')).exec_() return False item = index.internalPointer() - key = item.parent.category_key + itm = item.parent + while itm.type != TagTreeItem.CATEGORY: + itm = itm.parent + key = itm.category_key # make certain we know about the item's category if key not in self.db.field_metadata: return False From 4cde033d6600da8f44fe900c5a1b1266a2bceb07 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 18:59:39 +0000 Subject: [PATCH 10/30] Add to preferences/look & feel a list of fields for which items are hierarchical. --- src/calibre/gui2/preferences/look_feel.py | 13 +++++++++- src/calibre/gui2/preferences/look_feel.ui | 29 +++++++++++++++++++++++ src/calibre/gui2/tag_view.py | 3 ++- src/calibre/library/database2.py | 1 + 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py index 196ef16b08..f7d76f2b70 100644 --- a/src/calibre/gui2/preferences/look_feel.py +++ b/src/calibre/gui2/preferences/look_feel.py @@ -7,17 +7,19 @@ __docformat__ = 'restructuredtext en' from PyQt4.Qt import QApplication, QFont, QFontInfo, QFontDialog -from calibre.gui2.preferences import ConfigWidgetBase, test_widget +from calibre.gui2.preferences import ConfigWidgetBase, test_widget, CommaSeparatedList from calibre.gui2.preferences.look_feel_ui import Ui_Form from calibre.gui2 import config, gprefs, qt_app from calibre.utils.localization import available_translations, \ get_language, get_lang from calibre.utils.config import prefs +from calibre.utils.icu import sort_key class ConfigWidget(ConfigWidgetBase, Ui_Form): def genesis(self, gui): self.gui = gui + db = gui.library_view.model().db r = self.register @@ -61,6 +63,15 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): r('tags_browser_partition_method', gprefs, choices=choices) r('tags_browser_collapse_at', gprefs) + choices = set([k for k in db.field_metadata.all_field_keys() + if db.field_metadata[k]['is_category'] and + db.field_metadata[k]['datatype'] in ['text', 'series', 'enumeration']]) + choices -= set(['authors', 'publisher', 'formats', 'news']) + self.opt_categories_using_hierarchy.update_items_cache(choices) + r('categories_using_hierarchy', db.prefs, setting=CommaSeparatedList, + choices=sorted(list(choices), key=sort_key)) + + self.current_font = None self.change_font_button.clicked.connect(self.change_font) diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui index 3f2bb3e145..a1fc5bb490 100644 --- a/src/calibre/gui2/preferences/look_feel.ui +++ b/src/calibre/gui2/preferences/look_feel.ui @@ -190,6 +190,28 @@ up into sub-categories. If the partition method is set to disable, this value is + + + + Categories with hierarchical items: + + + opt_categories_using_hierarchy + + + + + + + A comma-separated list of columns in which items containing +periods are displayed in the tag browser trees. For example, if +this box contains 'tags' then tags of the form 'mystery.English' +and 'mystery.Thriller' will be displayed with English and Thriller +both under the label 'mystery'. If 'tags' is not in this box, +then the tags will be displayed each on their own line. + + + @@ -275,6 +297,13 @@ up into sub-categories. If the partition method is set to disable, this value is + + + MultiCompleteLineEdit + QLineEdit +
calibre/gui2/complete.h
+ + diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 15ff986f2e..04b336d791 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -914,7 +914,8 @@ class TagsModel(QAbstractItemModel): # {{{ node_parent = category components = [t for t in tag.name.split('.')] - if key in ['authors', 'publisher', 'title'] or len(components) == 1 or \ + if key not in self.db.prefs.get('categories_using_hierarchy', []) \ + or len(components) == 1 or \ self.db.field_metadata[key]['kind'] == 'user': self.beginInsertRows(category_index, 999999, 1) TagTreeItem(parent=node_parent, data=tag, tooltip=tt, diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 5a0935c2c8..e515abd709 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -174,6 +174,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.prefs = DBPrefs(self) defs = self.prefs.defaults defs['gui_restriction'] = defs['cs_restriction'] = '' + defs['categories_using_hierarchy'] = '' # Migrate saved search and user categories to db preference scheme def migrate_preference(key, default): From 4080f5c32c62c2d563d0903a84cf19b91585001c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 22 Feb 2011 12:34:22 -0700 Subject: [PATCH 11/30] Fix #9100 (Edit metadata with comments will hang on debian/testing) --- src/calibre/gui2/comments_editor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py index c7f7d8b94a..a594af739e 100644 --- a/src/calibre/gui2/comments_editor.py +++ b/src/calibre/gui2/comments_editor.py @@ -254,7 +254,8 @@ class EditorWidget(QWebView): # {{{ f = QFontInfo(QApplication.font(self)).pixelSize() style = 'font-size: %dpx;' % (f,) - for body in self.page().mainFrame().documentElement().findAll('body'): + # toList() is needed because PyQt on Debian is old/broken + for body in self.page().mainFrame().documentElement().findAll('body').toList(): body.setAttribute('style', style) self.page().setContentEditable(True) From cbaa443e065841705c8288281368c8e1fd52568b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 22 Feb 2011 13:09:59 -0700 Subject: [PATCH 12/30] EPUB Output: Do not set the file-as attribute on title elements in the OPF as the current OPF spec does not support file-as. Instead use a calibre extension to OPF. Fixes #9109 (Calibre Inserts "file-as" for author sort name and title sort name) --- src/calibre/ebooks/oeb/base.py | 2 +- src/calibre/ebooks/oeb/transforms/metadata.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py index 9389964962..ccc452f1f8 100644 --- a/src/calibre/ebooks/oeb/base.py +++ b/src/calibre/ebooks/oeb/base.py @@ -515,7 +515,7 @@ class Metadata(object): 'publisher', 'relation', 'rights', 'source', 'subject', 'title', 'type']) CALIBRE_TERMS = set(['series', 'series_index', 'rating', 'timestamp', - 'publication_type']) + 'publication_type', 'title_sort']) OPF_ATTRS = {'role': OPF('role'), 'file-as': OPF('file-as'), 'scheme': OPF('scheme'), 'event': OPF('event'), 'type': XSI('type'), 'lang': XML('lang'), 'id': 'id'} diff --git a/src/calibre/ebooks/oeb/transforms/metadata.py b/src/calibre/ebooks/oeb/transforms/metadata.py index f1ce31f25b..19c209b74d 100644 --- a/src/calibre/ebooks/oeb/transforms/metadata.py +++ b/src/calibre/ebooks/oeb/transforms/metadata.py @@ -18,7 +18,8 @@ def meta_info_to_oeb_metadata(mi, m, log, override_input_metadata=False): if mi.title_sort: if not m.title: m.add('title', mi.title_sort) - m.title[0].file_as = mi.title_sort + m.clear('title_sort') + m.add('title_sort', mi.title_sort) if not mi.is_null('authors'): m.filter('creator', lambda x : x.role.lower() in ['aut', '']) for a in mi.authors: From a256a21f7eaf8e9338c7a278e3729c9768aa993e Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 22 Feb 2011 21:09:45 +0000 Subject: [PATCH 13/30] More robust serialization for user_categories in OPFs --- src/calibre/ebooks/metadata/opf2.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index 0d8e523c38..d5263a5052 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -470,6 +470,10 @@ def serialize_user_metadata(metadata_elem, all_user_metadata, tail='\n'+(' '*8)) metadata_elem.append(meta) +def dump_user_categories(cats): + from calibre.ebooks.metadata.book.json_codec import object_to_unicode + return json.dumps(object_to_unicode(cats)) + class OPF(object): # {{{ MIMETYPE = 'application/oebps-package+xml' @@ -525,7 +529,8 @@ class OPF(object): # {{{ timestamp = MetadataField('timestamp', is_dc=False, formatter=parse_date, renderer=isoformat) user_categories = MetadataField('user_categories', is_dc=False, - formatter=json.loads, renderer=json.dumps) + formatter=json.loads, + renderer=dump_user_categories) def __init__(self, stream, basedir=os.getcwdu(), unquote_urls=True, @@ -1178,7 +1183,9 @@ class OPFCreator(Metadata): if self.publication_type is not None: a(CAL_ELEM('calibre:publication_type', self.publication_type)) if self.user_categories is not None: - a(CAL_ELEM('calibre:user_categories', json.dumps(self.user_categories))) + from calibre.ebooks.metadata.book.json_codec import object_to_unicode + a(CAL_ELEM('calibre:user_categories', + json.dumps(object_to_unicode(self.user_categories)))) manifest = E.manifest() if self.manifest is not None: for ref in self.manifest: From dee216e6bb3eed740613efea283c6e1b61d77cb1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 22 Feb 2011 15:13:14 -0700 Subject: [PATCH 14/30] Support for the Archos 7 tablet --- src/calibre/devices/android/driver.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py index 6f77a4d96c..99679283a7 100644 --- a/src/calibre/devices/android/driver.py +++ b/src/calibre/devices/android/driver.py @@ -60,7 +60,12 @@ class ANDROID(USBMS): 0x1004 : { 0x61cc : [0x100] }, # Archos - 0x0e79 : { 0x1419: [0x0216], 0x1420 : [0x0216], 0x1422 : [0x0216]}, + 0x0e79 : { + 0x1400 : [0x0222, 0x0216], + 0x1419 : [0x0216], + 0x1420 : [0x0216], + 0x1422 : [0x0216] + }, # Huawei # Disabled as this USB id is used by various USB flash drives @@ -84,10 +89,10 @@ class ANDROID(USBMS): 'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID', 'SCH-I500_CARD', 'SPH-D700_CARD', 'MB810', 'GT-P1000', 'DESIRE', 'SGH-T849', '_MB300', 'A70S', 'S_ANDROID', 'A101IT', 'A70H', - 'IDEOS_TABLET', 'MYTOUCH_4G', 'UMS_COMPOSITE', 'SCH-I800_CARD'] + 'IDEOS_TABLET', 'MYTOUCH_4G', 'UMS_COMPOSITE', 'SCH-I800_CARD', '7'] WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897', 'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD', - 'A70S', 'A101IT'] + 'A70S', 'A101IT', '7'] OSX_MAIN_MEM = 'Android Device Main Memory' From 6460f08b7fbb2365ecd1542bedb6ec55687297c0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 22 Feb 2011 20:17:57 -0700 Subject: [PATCH 15/30] Only start emailer thread on demand --- src/calibre/gui2/email.py | 5 ++++- src/calibre/gui2/ui.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py index 426747e044..c84b3180f7 100644 --- a/src/calibre/gui2/email.py +++ b/src/calibre/gui2/email.py @@ -209,7 +209,6 @@ class EmailMixin(object): # {{{ def __init__(self): self.emailer = Emailer(self.job_manager) - self.emailer.start() def send_by_mail(self, to, fmts, delete_from_library, send_ids=None, do_auto_convert=True, specific_format=None): @@ -255,6 +254,8 @@ class EmailMixin(object): # {{{ to_s = list(repeat(to, len(attachments))) if attachments: + if not self.emailer.is_alive(): + self.emailer.start() self.emailer.send_mails(jobnames, Dispatcher(partial(self.email_sent, remove=remove)), attachments, to_s, subjects, texts, attachment_names) @@ -325,6 +326,8 @@ class EmailMixin(object): # {{{ files, auto = self.library_view.model().\ get_preferred_formats_from_ids([id_], fmts) return files + if not self.emailer.is_alive(): + self.emailer.start() sent_mails = self.emailer.email_news(mi, remove, get_fmts, self.email_sent) if sent_mails: diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 9b9308d253..8844446de6 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -633,7 +633,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ mb.stop() self.hide_windows() - self.emailer.stop() + if self.emailer.is_alive(): + self.emailer.stop() try: try: if self.content_server is not None: From 52c19d7b9bdd15bf74e84744f61a5b22c151fdb0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 22 Feb 2011 20:34:06 -0700 Subject: [PATCH 16/30] caching of google identifiers and logic to get cover url from google identifier --- src/calibre/ebooks/metadata/sources/base.py | 16 ++++- src/calibre/ebooks/metadata/sources/google.py | 66 +++++++++++++------ 2 files changed, 62 insertions(+), 20 deletions(-) diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py index 74e184cc66..54d7d49d6d 100644 --- a/src/calibre/ebooks/metadata/sources/base.py +++ b/src/calibre/ebooks/metadata/sources/base.py @@ -7,7 +7,7 @@ __license__ = 'GPL v3' __copyright__ = '2011, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import re +import re, threading from calibre.customize import Plugin from calibre.utils.logging import ThreadSafeLog, FileStream @@ -30,7 +30,21 @@ class Source(Plugin): touched_fields = frozenset() + def __init__(self, *args, **kwargs): + Plugin.__init__(self, *args, **kwargs) + self._isbn_to_identifier_cache = {} + self.cache_lock = threading.RLock() + # Utility functions {{{ + + def cache_isbn_to_identifier(self, isbn, identifier): + with self.cache_lock: + self._isbn_to_identifier_cache[isbn] = identifier + + def cached_isbn_to_identifier(self, isbn): + with self.cache_lock: + return self._isbn_to_identifier_cache.get(isbn, None) + def get_author_tokens(self, authors, only_first_author=True): ''' Take a list of authors and return a list of tokens useful for an diff --git a/src/calibre/ebooks/metadata/sources/google.py b/src/calibre/ebooks/metadata/sources/google.py index 498c7574ea..0720b21ded 100644 --- a/src/calibre/ebooks/metadata/sources/google.py +++ b/src/calibre/ebooks/metadata/sources/google.py @@ -13,6 +13,7 @@ from functools import partial from lxml import etree +from calibre.ebooks.metadata import check_isbn from calibre.ebooks.metadata.sources.base import Source from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.chardet import xml_to_unicode @@ -69,6 +70,7 @@ def to_metadata(browser, log, entry_, timeout): id_url = entry_id(entry_)[0].text + google_id = id_url.split('/')[-1] title_ = ': '.join([x.text for x in title(entry_)]).strip() authors = [x.text.strip() for x in creator(entry_) if x.text] if not authors: @@ -78,6 +80,7 @@ def to_metadata(browser, log, entry_, timeout): return None mi = Metadata(title_, authors) + mi.identifiers = {'google':google_id} try: raw = get_details(browser, id_url, timeout) feed = etree.fromstring(xml_to_unicode(clean_ascii_chars(raw), @@ -103,9 +106,12 @@ def to_metadata(browser, log, entry_, timeout): t = str(x.text).strip() if t[:5].upper() in ('ISBN:', 'LCCN:', 'OCLC:'): if t[:5].upper() == 'ISBN:': - isbns.append(t[5:]) + t = check_isbn(t[5:]) + if t: + isbns.append(t) if isbns: mi.isbn = sorted(isbns, key=len)[-1] + mi.all_isbns = isbns # Tags try: @@ -133,20 +139,6 @@ def to_metadata(browser, log, entry_, timeout): return mi -def get_all_details(br, log, entries, abort, result_queue, timeout): - for i in entries: - try: - ans = to_metadata(br, log, i, timeout) - if isinstance(ans, Metadata): - result_queue.put(ans) - except: - log.exception( - 'Failed to get metadata for identify entry:', - etree.tostring(i)) - if abort.is_set(): - break - - class GoogleBooks(Source): name = 'Google Books' @@ -185,6 +177,36 @@ class GoogleBooks(Source): 'min-viewability':'none', }) + def cover_url_from_identifiers(self, identifiers): + goog = identifiers.get('google', None) + if goog is None: + isbn = identifiers.get('isbn', None) + goog = self.cached_isbn_to_identifier(isbn) + if goog is not None: + return ('http://books.google.com/books?id=%s&printsec=frontcover&img=1' % + goog) + + def is_cover_image_valid(self, raw): + # When no cover is present, returns a PNG saying image not available + # Try for example google identifier llNqPwAACAAJ + # I have yet to see an actual cover in PNG format + return raw and len(raw) > 17000 and raw[1:4] != 'PNG' + + def get_all_details(self, br, log, entries, abort, result_queue, timeout): + for i in entries: + try: + ans = to_metadata(br, log, i, timeout) + if isinstance(ans, Metadata): + result_queue.put(ans) + for isbn in ans.all_isbns: + self.cache_isbn_to_identifier(isbn, + ans.identifiers['google']) + except: + log.exception( + 'Failed to get metadata for identify entry:', + etree.tostring(i)) + if abort.is_set(): + break def identify(self, log, result_queue, abort, title=None, authors=None, identifiers={}, timeout=5): @@ -207,8 +229,8 @@ class GoogleBooks(Source): return as_unicode(e) # There is no point running these queries in threads as google - # throttles requests returning Forbidden errors - get_all_details(br, log, entries, abort, result_queue, timeout) + # throttles requests returning 403 Forbidden errors + self.get_all_details(br, log, entries, abort, result_queue, timeout) return None @@ -218,8 +240,14 @@ if __name__ == '__main__': title_test) test_identify_plugin(GoogleBooks.name, [ + ( - {'title': 'Great Expectations', 'authors':['Charles Dickens']}, - [title_test('Great Expectations', exact=True)] + {'identifiers':{'isbn': '0743273567'}}, + [title_test('The great gatsby', exact=True)] ), + + #( + # {'title': 'Great Expectations', 'authors':['Charles Dickens']}, + # [title_test('Great Expectations', exact=True)] + #), ]) From 09d0c75755f07d063b20783c1ae54ed8b616db05 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 22 Feb 2011 22:38:00 -0700 Subject: [PATCH 17/30] ... --- src/calibre/gui2/dialogs/drm_error.ui | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/dialogs/drm_error.ui b/src/calibre/gui2/dialogs/drm_error.ui index ff28ef5a48..c4b9a1cfdb 100644 --- a/src/calibre/gui2/dialogs/drm_error.ui +++ b/src/calibre/gui2/dialogs/drm_error.ui @@ -44,7 +44,8 @@ <p>This book is locked by <b>DRM</b>. To learn more about DRM and why you cannot read or convert this book in calibre, -<a href="http://bugs.calibre-ebook.com/wiki/DRM">click here</a>. + <a href="http://drmfree.calibre-ebook.com/about#drm">click here</a>.<p>A large number of recent, DRM free releases are + available at <a href="http://drmfree.calibre-ebook.com">Open Books</a>. true From 6133b873e14377e01af2955abfbb45f054c68eb8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 23 Feb 2011 06:32:24 -0700 Subject: [PATCH 18/30] 20 Minutos by Darko Miletic. Fixes #9115 (New recipe for 20 Minutos spanish diary) --- resources/images/news/20minutos.png | Bin 0 -> 800 bytes resources/recipes/20minutos.recipe | 68 ++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 resources/images/news/20minutos.png create mode 100644 resources/recipes/20minutos.recipe diff --git a/resources/images/news/20minutos.png b/resources/images/news/20minutos.png new file mode 100644 index 0000000000000000000000000000000000000000..3e656913c7390b9a7460c0d5b914f83b240fa6aa GIT binary patch literal 800 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbQ|Pfsr-9C&ZP(W(tEvk3`@c4#z2$ zscXGTw+7X2<#3%N;5)}MbFF6N(sP%e|NsAg>%Mag1}zLGJ) ze}4a7cI}k4`>r_^Ze6Eodl*cnFzECc#xA{g|2c_+xMJu z*S0J=7nRwv_VB&`pWhpXwk+LtZOW>13>GZ{jy+RmEoIQDwoIJjlsYB3Yp z95y|gzAaI;TbC|dyLQ{Lwd=N4w=F$(`FZvvAbYQ(XUpEh=M;UX1QpH+%AI2v+GClz zbkD;3nZR&iO!9Vj;c46)m<;4_7I;J!18EO1b~~AE2UHN`>EaloaenH=$lyZ;BCYzq z;#}cOLJNbY1Wj8eA{ZbjE@EDAnD@*7|00`v`u4p%dHQ5c@uX^@hW#2}i<1Q|Puk?$ zzN9moJN>3)5`$u7NYrUY(@(d=H5$K82~FvF=(aMaVzy{}Mc7@fZk7vgqjWi5Me<1B z$YFK7!1qZ8 zeUv+OWS`d!Eyt6M>eH-~zH(WgIa!fkQ^M0S@5N33W>2eAFU1uuN=k$YKYjD2<`nN_ z?E{^!4+uz$CrZR^+bv*zVVTf`jrW_hzpURW;!x9k^3Cre#%I46Sg(W})@Rt?n5XBc zGdttL)VX=4E8M0%kCf#4$nidEo_f?t_mcPCu91sh6lK}ktn%t!{#;yPbL*?d^}-AC zE8lVlEA891IfhgBey8&s{-@!^AGiL$rfxD<_nMqgYa%e1RZCnWN>UO_QmvAUQh^kM zk%6J1u7Q!Rk#UHDnU%4Dl@X9@Ze?IlbgH}xMMG|WN@iLmiUvz7Lt`sbBZ!7I6S=nn PH86O(`njxgN@xNAIwe#H literal 0 HcmV?d00001 diff --git a/resources/recipes/20minutos.recipe b/resources/recipes/20minutos.recipe new file mode 100644 index 0000000000..d7657f77c7 --- /dev/null +++ b/resources/recipes/20minutos.recipe @@ -0,0 +1,68 @@ +__license__ = 'GPL v3' +__copyright__ = '2011, Darko Miletic ' +''' +www.20minutos.es +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class t20Minutos(BasicNewsRecipe): + title = '20 Minutos' + __author__ = 'Darko Miletic' + description = 'Diario de informacion general y local mas leido de Espania, noticias de ultima hora de Espania, el mundo, local, deportes, noticias curiosas y mas' + publisher = '20 Minutos Online SL' + category = 'news, politics, Spain' + oldest_article = 2 + max_articles_per_feed = 200 + no_stylesheets = True + encoding = 'utf8' + use_embedded_content = True + language = 'es' + remove_empty_feeds = True + publication_type = 'newspaper' + masthead_url = 'http://estaticos.20minutos.es/css4/img/ui/logo-301x54.png' + extra_css = """ + body{font-family: Arial,Helvetica,sans-serif } + img{margin-bottom: 0.4em; display:block} + """ + + conversion_options = { + 'comment' : description + , 'tags' : category + , 'publisher' : publisher + , 'language' : language + } + + remove_tags = [dict(attrs={'class':'mf-viral'})] + remove_attributes=['border'] + + feeds = [ + (u'Principal' , u'http://20minutos.feedsportal.com/c/32489/f/478284/index.rss') + ,(u'Cine' , u'http://20minutos.feedsportal.com/c/32489/f/478285/index.rss') + ,(u'Internacional' , u'http://20minutos.feedsportal.com/c/32489/f/492689/index.rss') + ,(u'Deportes' , u'http://20minutos.feedsportal.com/c/32489/f/478286/index.rss') + ,(u'Nacional' , u'http://20minutos.feedsportal.com/c/32489/f/492688/index.rss') + ,(u'Economia' , u'http://20minutos.feedsportal.com/c/32489/f/492690/index.rss') + ,(u'Tecnologia' , u'http://20minutos.feedsportal.com/c/32489/f/478292/index.rss') + ] + + def preprocess_html(self, soup): + for item in soup.findAll(style=True): + del item['style'] + for item in soup.findAll('a'): + limg = item.find('img') + if item.string is not None: + str = item.string + item.replaceWith(str) + else: + if limg: + item.name = 'div' + item.attrs = [] + else: + str = self.tag_to_string(item) + item.replaceWith(str) + for item in soup.findAll('img'): + if not item.has_key('alt'): + item['alt'] = 'image' + return soup + From 7364e266277ce81958bb205b6f85d092420d5aba Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 23 Feb 2011 07:03:02 -0700 Subject: [PATCH 19/30] Some documentation for the Tag Browser --- src/calibre/manual/gui.rst | 12 ++++++++++++ src/calibre/manual/images/tag_browser.png | Bin 0 -> 42321 bytes 2 files changed, 12 insertions(+) create mode 100644 src/calibre/manual/images/tag_browser.png diff --git a/src/calibre/manual/gui.rst b/src/calibre/manual/gui.rst index 3718f830f3..67d67c6383 100644 --- a/src/calibre/manual/gui.rst +++ b/src/calibre/manual/gui.rst @@ -413,6 +413,18 @@ The Book Details display shows you extra information and the cover for the curre .. _jobs: +.. _tag_browser: + +Tag Browser +------------- +.. image:: images/tag_browser.png + +The Tag Browser allows you to easily browse your collection by Author/Tags/Series/etc. If you click on any Item in the Tag Browser, for example, the Author name, Isaac Asimov, then the list of books to the right is restricted to books by that author. Clicking once again on Isaac Asimov will restrict the list of books to books not by Isaac Asimov. A third click will remove the restriction. If you hold down the Ctrl or Shift keys and click on multiple items, then restrictions based on multiple items are created. For example you could Hold Ctrl and click on the tags History and Europe for find books on European history. The Tag Browser works by constructing search expressions that are automatically entered into the Search bar. It is a good way to learn how to construct basic search expressions. + +There is a search bar at the top of the Tag Browser that allows you to easily find any item in the Tag Browser. In addition, you can right click on any item and choose to hide it or rename it or open a "Manage x" dialog that allows you to manage items of that kind. For example the "Manage Authors" dialog allows you to rename authors and control how their names are sorted. + +For convenience, you can drag and drop books from the book list to items in the Tag Browser and that item will be automatically applied to the dropped books. For example, dragging a book to Isaac Asimov will set the author of that book to Isaac Asimov or dragging it to the tag History will add the tag History to its tags. + Jobs ----- .. image:: images/jobs.png diff --git a/src/calibre/manual/images/tag_browser.png b/src/calibre/manual/images/tag_browser.png new file mode 100644 index 0000000000000000000000000000000000000000..818ca6964d71e0846ddb922fce3b9ef7db01d8b2 GIT binary patch literal 42321 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 P0WT$ab-5Z@^YDKISm>XQ literal 0 HcmV?d00001 From 128bd8aa1b9bf7a3106c3ba1a7b6baf5ef095d39 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 23 Feb 2011 14:05:54 +0000 Subject: [PATCH 20/30] Add right-click rename and create to user categories --- src/calibre/gui2/tag_view.py | 95 +++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 18 deletions(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 1033957656..b8ba785d66 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -73,6 +73,7 @@ class TagsView(QTreeView): # {{{ refresh_required = pyqtSignal() tags_marked = pyqtSignal(object) user_category_edit = pyqtSignal(object) + add_subcategory = pyqtSignal(object) tag_list_edit = pyqtSignal(object, object) saved_search_edit = pyqtSignal(object) author_sort_edit = pyqtSignal(object, object) @@ -218,6 +219,9 @@ class TagsView(QTreeView): # {{{ if action == 'manage_categories': self.user_category_edit.emit(category) return + if action == 'add_subcategory': + self.add_subcategory.emit(category) + return if action == 'search': self._toggle(index, set_to=search_state) return @@ -303,9 +307,21 @@ class TagsView(QTreeView): # {{{ search_state=TAG_SEARCH_STATES['mark_minus'], index=index)) self.context_menu.addSeparator() + elif key.startswith('@'): + if item.can_edit: + self.context_menu.addAction(_('Rename %s')%key[1:], + partial(self.context_menu_handler, action='edit_item', + category=key, index=index)) + self.context_menu.addAction(self.search_icon, + _('Add sub-category to %s')%key[1:], + partial(self.context_menu_handler, + action='add_subcategory', category=key)) + self.context_menu.addSeparator() # Hide/Show/Restore categories - self.context_menu.addAction(_('Hide category %s') % category, - partial(self.context_menu_handler, action='hide', category=category)) + if not key.startswith('@') or key.find('.') < 0: + self.context_menu.addAction(_('Hide category %s') % category, + partial(self.context_menu_handler, action='hide', + category=category)) if self.hidden_categories: m = self.context_menu.addMenu(_('Show category')) for col in sorted(self.hidden_categories, key=sort_key): @@ -615,9 +631,10 @@ class TagsModel(QAbstractItemModel): # {{{ else: tt = _(u'The lookup/search name is "{0}"').format(r) - if r.startswith('@') and r.find('.') >= 0: + if r.startswith('@'): path_parts = [p.strip() for p in r.split('.') if p.strip()] path = '' + last_category_node = self.root_item for i,p in enumerate(path_parts): path += p if path not in category_node_map: @@ -629,6 +646,7 @@ class TagsModel(QAbstractItemModel): # {{{ last_category_node = node category_node_map[path] = node self.category_nodes.append(node) + node.can_edit = i == (len(path_parts) - 1) else: last_category_node = category_node_map[path] path += '.' @@ -986,6 +1004,37 @@ class TagsModel(QAbstractItemModel): # {{{ _('An item cannot be set to nothing. Delete it instead.')).exec_() return False item = index.internalPointer() + if item.type == TagTreeItem.CATEGORY and item.category_key.startswith('@'): + user_cats = self.db.prefs.get('user_categories', {}) + ckey = item.category_key[1:] + dotpos = ckey.rfind('.') + if dotpos < 0: + nkey = val + else: + nkey = ckey[:dotpos+1] + val + for c in user_cats: + if c.startswith(ckey): + if len(c) == len(ckey): + if nkey in user_cats: + error_dialog(self.tags_view, _('Rename user category'), + _('The name %s is already used'%nkey), show=True) + return False + user_cats[nkey] = user_cats[ckey] + del user_cats[ckey] + elif c[len(ckey)] == '.': + rest = c[len(ckey):] + if (nkey + rest) in user_cats: + error_dialog(self.tags_view, _('Rename user category'), + _('The name %s is already used')%(nkey+rest), show=True) + return False + user_cats[nkey + rest] = user_cats[ckey + rest] + del user_cats[ckey + rest] + self.db.prefs.set('user_categories', user_cats) + self.tags_view.set_new_model() + # must not use 'self' below because the model has changed! + p = self.tags_view.model().find_category_node('@' + nkey) + self.tags_view.model().show_item_at_path(p) + return True itm = item.parent while itm.type != TagTreeItem.CATEGORY: itm = itm.parent @@ -1118,15 +1167,6 @@ class TagsModel(QAbstractItemModel): # {{{ for t in tag_item.children: process_tag(t) -# def process_level(category_index): -# for j in xrange(self.rowCount(category_index)): -# tag_index = self.index(j, 0, category_index) -# tag_item = tag_index.internalPointer() -# if tag_item.type == TagTreeItem.CATEGORY: -# process_level(tag_index) -# else: -# process_tag(tag_index, tag_item) - for t in self.root_item.children: process_tag(t) @@ -1239,7 +1279,7 @@ class TagsModel(QAbstractItemModel): # {{{ break return self.path_found - def find_category_node(self, key): + def find_category_node(self, key, parent=QModelIndex()): ''' Search for an category node (a top-level node) in the tags browser list that matches the key (exact case-insensitive match). Returns the path to @@ -1248,11 +1288,17 @@ class TagsModel(QAbstractItemModel): # {{{ if not key: return None - for i in xrange(self.rowCount(QModelIndex())): - idx = self.index(i, 0, QModelIndex()) - ckey = idx.internalPointer().category_key - if strcmp(ckey, key) == 0: - return self.path_for_index(idx) + for i in xrange(self.rowCount(parent)): + idx = self.index(i, 0, parent) + node = idx.internalPointer() + if node.type == TagTreeItem.CATEGORY: + ckey = node.category_key + if strcmp(ckey, key) == 0: + return self.path_for_index(idx) + if len(node.children): + v = self.find_category_node(key, idx) + if v is not None: + return v return None def show_item_at_path(self, path, box=False): @@ -1307,6 +1353,7 @@ class TagBrowserMixin(object): # {{{ self.tags_view.tags_marked.connect(self.search.set_search_string) self.tags_view.tag_list_edit.connect(self.do_tags_list_edit) self.tags_view.user_category_edit.connect(self.do_user_categories_edit) + self.tags_view.add_subcategory.connect(self.do_add_subcategory) self.tags_view.saved_search_edit.connect(self.do_saved_search_edit) self.tags_view.author_sort_edit.connect(self.do_author_sort_edit) self.tags_view.tag_item_renamed.connect(self.do_tag_item_renamed) @@ -1315,6 +1362,18 @@ class TagBrowserMixin(object): # {{{ self.edit_categories.clicked.connect(lambda x: self.do_user_categories_edit()) + def do_add_subcategory(self, on_category=None): + db = self.library_view.model().db + user_cats = db.prefs.get('user_categories', {}) + new_cat = on_category[1:] + '.New Category' + user_cats[new_cat] = [] + db.prefs.set('user_categories', user_cats) + self.tags_view.set_new_model() + m = self.tags_view.model() + idx = m.index_for_path(m.find_category_node('@' + new_cat)) + m.show_item_at_index(idx) + self.tags_view.edit(idx) + def do_user_categories_edit(self, on_category=None): db = self.library_view.model().db d = TagCategories(self, db, on_category) From 06ca716b26d402837d43c7cbda11f2d341eb681b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 23 Feb 2011 14:30:54 +0000 Subject: [PATCH 21/30] More tag browser documentation --- src/calibre/manual/gui.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/calibre/manual/gui.rst b/src/calibre/manual/gui.rst index 67d67c6383..d2de87fa91 100644 --- a/src/calibre/manual/gui.rst +++ b/src/calibre/manual/gui.rst @@ -425,6 +425,13 @@ There is a search bar at the top of the Tag Browser that allows you to easily fi For convenience, you can drag and drop books from the book list to items in the Tag Browser and that item will be automatically applied to the dropped books. For example, dragging a book to Isaac Asimov will set the author of that book to Isaac Asimov or dragging it to the tag History will add the tag History to its tags. +The outer-level items in the tag browser such as Authors and Series are called categories. You can create your own categories, called User Categories, which are useful for organizing items. For example, you can use the user categories editor (push the Manage User Categories button) to create a user category called Favorite Authors, then put the items for your favorites into the category. User categories act like built-in categories; you can click on items to search for them. You can search for all items in a category by right-clicking on the category name and choosing "Search for books in ...". + +User categories can have sub-categories. For example, the user category Favorites.Authors is a sub-category of Favorites. You might also have Favorites.Series, in which case there will be two sub-categories under Favorites. Sub-categories can be created using Manage User Categories by entering names like the Favorites example. They can also be created by right-clicking on a user category, choosing "Add sub-category to ...", and entering the category name. + +It is also possible to create hierarchies inside some of the built-in categories (the text categories). These hierarchies show with the small triangle permitting the sub-items to be hidden. To use hierarchies in a category, you must first go to Preferences / Look & Feel and enter the category name(s) into the "Categories with hierarchical items" box. Once this is done, items in that category that contain periods will be shown using the small triangle. For example, assume you create a custom column called ‘Genre’ and indicate that it contains hierarchical items. Once done, items such as Mystery.Thriller and Mystery.English will display as Mystery with the small triangle next to it. Clicking on the triangle will show Thriller and English as sub-items. + + Jobs ----- .. image:: images/jobs.png From a71599ba7b37f7fda5878d6a36f62ad3e156bf63 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 23 Feb 2011 14:46:37 +0000 Subject: [PATCH 22/30] Two bugs in the new categorization stuff: 1) if a user created a new user category but didn't rename it, the next create would throw an exception 2) it was possible to specify that invalid fields such as author contain hierarchies --- src/calibre/gui2/tag_view.py | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 733662c7ec..6cf1eaa448 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -880,11 +880,12 @@ class TagsModel(QAbstractItemModel): # {{{ if cat_len <= 0: return ((collapse_letter, collapse_letter_sk)) + fm = self.db.field_metadata[key] clear_rating = True if key not in self.categories_with_ratings and \ - not self.db.field_metadata[key]['is_custom'] and \ - not self.db.field_metadata[key]['kind'] == 'user' \ + not fm['is_custom'] and \ + not fm['kind'] == 'user' \ else False - tt = key if self.db.field_metadata[key]['kind'] == 'user' else None + tt = key if fm['kind'] == 'user' else None for idx,tag in enumerate(data[key]): if clear_rating: tag.avg_rating = None @@ -931,9 +932,11 @@ class TagsModel(QAbstractItemModel): # {{{ node_parent = category components = [t for t in tag.name.split('.')] - if key not in self.db.prefs.get('categories_using_hierarchy', []) \ - or len(components) == 1 or \ - self.db.field_metadata[key]['kind'] == 'user': + if key in ['authors', 'publisher', 'news', 'formats'] or \ + key not in self.db.prefs.get('categories_using_hierarchy', []) or\ + len(components) == 1 or \ + fm['kind'] == 'user' or \ + fm['datatype'] not in ['text', 'series', 'enumeration']: self.beginInsertRows(category_index, 999999, 1) TagTreeItem(parent=node_parent, data=tag, tooltip=tt, icon_map=self.icon_state_map) @@ -1365,13 +1368,25 @@ class TagBrowserMixin(object): # {{{ def do_add_subcategory(self, on_category=None): db = self.library_view.model().db user_cats = db.prefs.get('user_categories', {}) - new_cat = on_category[1:] + '.' + _('New Category').replace('.', '') + + # Ensure that the temporary name we will use is not already there + i = 0 + new_name = _('New Category').replace('.', '') + n = new_name + while True: + new_cat = on_category[1:] + '.' + n + if new_cat not in user_cats: + break + i += 1 + n = new_name + unicode(i) + # Add the new category user_cats[new_cat] = [] db.prefs.set('user_categories', user_cats) self.tags_view.set_new_model() m = self.tags_view.model() idx = m.index_for_path(m.find_category_node('@' + new_cat)) m.show_item_at_index(idx) + # Open the editor on the new item to rename it self.tags_view.edit(idx) def do_user_categories_edit(self, on_category=None): From a64f4aeb0dcb50f426c2f9085fd795ca6ba07afc Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 23 Feb 2011 07:49:48 -0700 Subject: [PATCH 23/30] Skeleton for D&D in Tag Browser --- src/calibre/gui2/tag_view.py | 41 ++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 733662c7ec..5f34da9ecf 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en' Browsing book collection by tags. ''' -import traceback, copy +import traceback, copy, cPickle from itertools import izip from functools import partial @@ -16,7 +16,7 @@ from PyQt4.Qt import Qt, QTreeView, QApplication, pyqtSignal, QFont, QSize, \ QIcon, QPoint, QVBoxLayout, QHBoxLayout, QComboBox, QTimer,\ QAbstractItemModel, QVariant, QModelIndex, QMenu, QFrame,\ QPushButton, QWidget, QItemDelegate, QString, QLabel, \ - QShortcut, QKeySequence, SIGNAL + QShortcut, QKeySequence, SIGNAL, QMimeData from calibre.ebooks.metadata import title_sort from calibre.gui2 import config, NONE, gprefs @@ -95,7 +95,8 @@ class TagsView(QTreeView): # {{{ self.setItemDelegate(TagDelegate(self)) self.made_connections = False self.setAcceptDrops(True) - self.setDragDropMode(self.DropOnly) + self.setDragEnabled(True) + self.setDragDropMode(self.DragDrop) self.setDropIndicatorShown(True) self.setAutoExpandDelay(500) self.pane_is_visible = False @@ -406,12 +407,13 @@ class TagsView(QTreeView): # {{{ fm_dest = self.db.metadata_for_field(item.category_key) if fm_dest['kind'] == 'user': md = event.mimeData() - fm_src = self.db.metadata_for_field(md.column_name) - if md.column_name in ['authors', 'publisher', 'series'] or \ - (fm_src['is_custom'] and - fm_src['datatype'] in ['series', 'text'] and - not fm_src['is_multiple']): - self.setDropIndicatorShown(True) + if hasattr(md, 'column_name'): + fm_src = self.db.metadata_for_field(md.column_name) + if md.column_name in ['authors', 'publisher', 'series'] or \ + (fm_src['is_custom'] and + fm_src['datatype'] in ['series', 'text'] and + not fm_src['is_multiple']): + self.setDropIndicatorShown(True) def clear(self): if self.model(): @@ -664,10 +666,26 @@ class TagsModel(QAbstractItemModel): # {{{ self.db = self.root_item = None def mimeTypes(self): - return ["application/calibre+from_library"] + return ["application/calibre+from_library", + 'application/calibre+from_tag_browser'] + + def mimeData(self, indexes): + data = [] + for idx in indexes: + if idx.isValid(): + # get some useful serializable data + name = unicode(self.data(idx, Qt.DisplayRole).toString()) + data.append(name) + else: + data.append(None) + raw = bytearray(cPickle.dumps(data, -1)) + ans = QMimeData() + ans.setData('application/calibre+from_tag_browser', raw) + return ans def dropMimeData(self, md, action, row, column, parent): - if not md.hasFormat("application/calibre+from_library") or \ + fmts = set([unicode(x) for x in md.formats()]) + if not fmts.intersection(set(self.mimeTypes())) or \ action != Qt.CopyAction: return False idx = parent @@ -1081,6 +1099,7 @@ class TagsModel(QAbstractItemModel): # {{{ if index.isValid(): node = self.data(index, Qt.UserRole) if node.type == TagTreeItem.TAG: + ans |= Qt.ItemIsDragEnabled fm = self.db.metadata_for_field(node.tag.category) if node.tag.category in \ ('tags', 'series', 'authors', 'rating', 'publisher') or \ From 7839e164c43b3143c186a34c83292062d8c778d0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 23 Feb 2011 08:25:08 -0700 Subject: [PATCH 24/30] ... --- src/calibre/customize/ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py index e9feacc67e..0f5508a89e 100644 --- a/src/calibre/customize/ui.py +++ b/src/calibre/customize/ui.py @@ -583,7 +583,7 @@ def main(args=sys.argv): if remove_plugin(opts.remove_plugin): print 'Plugin removed' else: - print 'No custom pluginnamed', opts.remove_plugin + print 'No custom plugin named', opts.remove_plugin if opts.customize_plugin is not None: name, custom = opts.customize_plugin.split(',') plugin = find_plugin(name.strip()) From 9fdfe8311b659c3e75e42a4044fee8ee71ccab3e Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 23 Feb 2011 16:57:56 +0000 Subject: [PATCH 25/30] Drag tag browser items & drop on user categories. --- src/calibre/gui2/tag_view.py | 69 +++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 30fa958ecb..378d22d0f6 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -398,14 +398,18 @@ class TagsView(QTreeView): # {{{ index = self.indexAt(event.pos()) if not index.isValid(): return + src_is_tb = event.mimeData().hasFormat('application/calibre+from_tag_browser') item = index.internalPointer() flags = self._model.flags(index) if item.type == TagTreeItem.TAG and flags & Qt.ItemIsDropEnabled: - self.setDropIndicatorShown(True) + self.setDropIndicatorShown(not src_is_tb) else: if item.type == TagTreeItem.CATEGORY: fm_dest = self.db.metadata_for_field(item.category_key) if fm_dest['kind'] == 'user': + if src_is_tb: + self.setDropIndicatorShown(True) + return md = event.mimeData() if hasattr(md, 'column_name'): fm_src = self.db.metadata_for_field(md.column_name) @@ -674,8 +678,17 @@ class TagsModel(QAbstractItemModel): # {{{ for idx in indexes: if idx.isValid(): # get some useful serializable data - name = unicode(self.data(idx, Qt.DisplayRole).toString()) - data.append(name) + node = idx.internalPointer() + if node.type == TagTreeItem.CATEGORY: + d = (node.type, node.py_name, node.category_key) + else: + t = node.tag + p = node + while p.type != TagTreeItem.CATEGORY: + p = p.parent + d = (node.type, p.category_key, + getattr(t, 'original_name', t.name), t.category, t.id) + data.append(d) else: data.append(None) raw = bytearray(cPickle.dumps(data, -1)) @@ -688,6 +701,53 @@ class TagsModel(QAbstractItemModel): # {{{ if not fmts.intersection(set(self.mimeTypes())) or \ action != Qt.CopyAction: return False + if "application/calibre+from_library" in fmts: + return self.do_drop_from_library(md, action, row, column, parent) + elif 'application/calibre+from_tag_browser' in fmts: + return self.do_drop_from_tag_browser(md, action, row, column, parent) + + def do_drop_from_tag_browser(self, md, action, row, column, parent): + if not parent.isValid(): + return False + dest = parent.internalPointer() + if dest.type != TagTreeItem.CATEGORY: + return False + if not md.hasFormat('application/calibre+from_tag_browser'): + return False + data = str(md.data('application/calibre+from_tag_browser')) + src = cPickle.loads(data) + for s in src: + if s[0] != TagTreeItem.TAG: + return False + user_cats = self.db.prefs.get('user_categories', {}) + for s in src: + src_parent, src_name, src_cat = s[1:4] + src_parent = src_parent[1:] + dest_key = dest.category_key[1:] + if dest_key not in user_cats: + continue + new_cat = [] + # delete the item if the source is a user category + if src_parent in user_cats: + for tup in user_cats[src_parent]: + if src_name == tup[0] and src_cat == tup[1]: + continue + new_cat.append(list(tup)) + user_cats[src_parent] = new_cat + # Now add the item to the destination user category + add_it = True + for tup in user_cats[dest_key]: + if src_name == tup[0] and src_cat == tup[1]: + add_it = False + if add_it: + user_cats[dest_key].append([src_name, src_cat, 0]) + self.db.prefs.set('user_categories', user_cats) + path = self.path_for_index(parent) + self.tags_view.set_new_model() + self.tags_view.model().show_item_at_path(path) + return True + + def do_drop_from_library(self, md, action, row, column, parent): idx = parent if idx.isValid(): node = self.data(idx, Qt.UserRole) @@ -1102,7 +1162,8 @@ class TagsModel(QAbstractItemModel): # {{{ if index.isValid(): node = self.data(index, Qt.UserRole) if node.type == TagTreeItem.TAG: - ans |= Qt.ItemIsDragEnabled + if getattr(node.tag, 'can_edit', True): + ans |= Qt.ItemIsDragEnabled fm = self.db.metadata_for_field(node.tag.category) if node.tag.category in \ ('tags', 'series', 'authors', 'rating', 'publisher') or \ From 418d10eace45d228804a3c8b731da2c532180666 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 23 Feb 2011 10:27:16 -0700 Subject: [PATCH 26/30] MOBI Input: Do not speciy text-align for every paragraph. Fixes text-align inheritance issues for newer MOBIs with nested divs. Fixes #9098 (Problem with conversion of align="center") --- src/calibre/ebooks/mobi/reader.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py index 7a566776d7..9c52a18691 100644 --- a/src/calibre/ebooks/mobi/reader.py +++ b/src/calibre/ebooks/mobi/reader.py @@ -242,9 +242,11 @@ class MobiReader(object): self.debug = debug self.embedded_mi = None self.base_css_rules = textwrap.dedent(''' - blockquote { margin: 0em 0em 0em 2em; text-align: justify } + body { text-align: justify } - p { margin: 0em; text-align: justify; text-indent: 1.5em } + blockquote { margin: 0em 0em 0em 2em; } + + p { margin: 0em; text-indent: 1.5em } .bold { font-weight: bold } From 725634062bd492e75d2018016bdcd89e91938f7e Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 23 Feb 2011 20:58:01 +0000 Subject: [PATCH 27/30] 1) Add copy/move to drag onto user category 2) Have manage categories create empty categories for all intermediate nodes in a category tree --- src/calibre/gui2/dialogs/tag_categories.py | 6 +++ src/calibre/gui2/tag_view.py | 53 +++++++++++++--------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/calibre/gui2/dialogs/tag_categories.py b/src/calibre/gui2/dialogs/tag_categories.py index b8a7e67c72..af6632bb02 100644 --- a/src/calibre/gui2/dialogs/tag_categories.py +++ b/src/calibre/gui2/dialogs/tag_categories.py @@ -232,6 +232,12 @@ class TagCategories(QDialog, Ui_TagCategories): def accept(self): self.save_category() + for cat in sorted(self.categories.keys(), key=sort_key): + components = cat.split('.') + for i in range(0,len(components)): + c = '.'.join(components[0:i+1]) + if c not in self.categories: + self.categories[c] = [] QDialog.accept(self) def save_category(self): diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 378d22d0f6..25726369e7 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -403,21 +403,27 @@ class TagsView(QTreeView): # {{{ flags = self._model.flags(index) if item.type == TagTreeItem.TAG and flags & Qt.ItemIsDropEnabled: self.setDropIndicatorShown(not src_is_tb) - else: - if item.type == TagTreeItem.CATEGORY: - fm_dest = self.db.metadata_for_field(item.category_key) - if fm_dest['kind'] == 'user': - if src_is_tb: + return + if item.type == TagTreeItem.CATEGORY: + fm_dest = self.db.metadata_for_field(item.category_key) + if fm_dest['kind'] == 'user': + if src_is_tb: + if event.dropAction() == Qt.MoveAction: + data = str(event.mimeData().data('application/calibre+from_tag_browser')) + src = cPickle.loads(data) + for s in src: + if s[0] == TagTreeItem.TAG and not s[1].startswith('@'): + return + self.setDropIndicatorShown(True) + return + md = event.mimeData() + if hasattr(md, 'column_name'): + fm_src = self.db.metadata_for_field(md.column_name) + if md.column_name in ['authors', 'publisher', 'series'] or \ + (fm_src['is_custom'] and + fm_src['datatype'] in ['series', 'text'] and + not fm_src['is_multiple']): self.setDropIndicatorShown(True) - return - md = event.mimeData() - if hasattr(md, 'column_name'): - fm_src = self.db.metadata_for_field(md.column_name) - if md.column_name in ['authors', 'publisher', 'series'] or \ - (fm_src['is_custom'] and - fm_src['datatype'] in ['series', 'text'] and - not fm_src['is_multiple']): - self.setDropIndicatorShown(True) def clear(self): if self.model(): @@ -698,10 +704,11 @@ class TagsModel(QAbstractItemModel): # {{{ def dropMimeData(self, md, action, row, column, parent): fmts = set([unicode(x) for x in md.formats()]) - if not fmts.intersection(set(self.mimeTypes())) or \ - action != Qt.CopyAction: + if not fmts.intersection(set(self.mimeTypes())): return False if "application/calibre+from_library" in fmts: + if action != Qt.CopyAction: + return False return self.do_drop_from_library(md, action, row, column, parent) elif 'application/calibre+from_tag_browser' in fmts: return self.do_drop_from_tag_browser(md, action, row, column, parent) @@ -727,8 +734,8 @@ class TagsModel(QAbstractItemModel): # {{{ if dest_key not in user_cats: continue new_cat = [] - # delete the item if the source is a user category - if src_parent in user_cats: + # delete the item if the source is a user category and action is move + if src_parent in user_cats and action == Qt.MoveAction: for tup in user_cats[src_parent]: if src_name == tup[0] and src_cat == tup[1]: continue @@ -742,9 +749,13 @@ class TagsModel(QAbstractItemModel): # {{{ if add_it: user_cats[dest_key].append([src_name, src_cat, 0]) self.db.prefs.set('user_categories', user_cats) - path = self.path_for_index(parent) self.tags_view.set_new_model() - self.tags_view.model().show_item_at_path(path) + # Must work with the new model here + m = self.tags_view.model() + path = m.find_category_node('@' + src_parent) + idx = m.index_for_path(path) + self.tags_view.setExpanded(idx, True) + m.show_item_at_index(idx) return True def do_drop_from_library(self, md, action, row, column, parent): @@ -1175,7 +1186,7 @@ class TagsModel(QAbstractItemModel): # {{{ return ans def supportedDropActions(self): - return Qt.CopyAction + return Qt.CopyAction|Qt.MoveAction def path_for_index(self, index): ans = [] From 8b7b831d8081ef06692d46e1349557079584d36f Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 23 Feb 2011 22:05:04 +0000 Subject: [PATCH 28/30] Fix regression in user category search. --- src/calibre/library/caches.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 318183eb10..4f5a034222 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -426,6 +426,8 @@ class ResultCache(SearchQueryParser): # {{{ if l > 0: alt_loc = location[0:l] alt_item = location[l+1:] + else: + alt_loc = None for key in user_cats: if key == location or key.startswith(location + '.'): for (item, category, ign) in user_cats[key]: From b223290b14bd3065b1b8690d7adad702e28dba7e Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 23 Feb 2011 22:14:09 +0000 Subject: [PATCH 29/30] Make manage categories focus on the category when sub-categories are right-clicked. --- src/calibre/gui2/tag_view.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index fb2cbf81f7..d5b62f8efc 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -356,10 +356,11 @@ class TagsView(QTreeView): # {{{ # Always show the user categories editor self.context_menu.addSeparator() - if category in self.db.prefs.get('user_categories', {}).keys(): + if key.startswith('@') and \ + key[1:] in self.db.prefs.get('user_categories', {}).keys(): self.context_menu.addAction(_('Manage User Categories'), partial(self.context_menu_handler, action='manage_categories', - category=category)) + category=key[1:])) else: self.context_menu.addAction(_('Manage User Categories'), partial(self.context_menu_handler, action='manage_categories', From fe064ee18d116676f4c0444fd0398ea66d980b8e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 23 Feb 2011 18:09:47 -0700 Subject: [PATCH 30/30] Fix #9126 (Xperia X10 (android 2.1) phone not detected) --- src/calibre/devices/android/driver.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py index 99679283a7..95633cbe58 100644 --- a/src/calibre/devices/android/driver.py +++ b/src/calibre/devices/android/driver.py @@ -74,6 +74,9 @@ class ANDROID(USBMS): # T-Mobile 0x0408 : { 0x03ba : [0x0109], }, + # Xperia + 0x13d3 : { 0x3304 : [0x0001, 0x0002] }, + } EBOOK_DIR_MAIN = ['eBooks/import', 'wordplayer/calibretransfer', 'Books'] EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of directories to ' @@ -83,7 +86,7 @@ class ANDROID(USBMS): VENDOR_NAME = ['HTC', 'MOTOROLA', 'GOOGLE_', 'ANDROID', 'ACER', 'GT-I5700', 'SAMSUNG', 'DELL', 'LINUX', 'GOOGLE', 'ARCHOS', - 'TELECHIP', 'HUAWEI', 'T-MOBILE', ] + 'TELECHIP', 'HUAWEI', 'T-MOBILE', 'SEMC'] WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE', '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', 'SGH-I897', 'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID',