This commit is contained in:
Kovid Goyal 2011-03-03 19:34:25 -07:00
parent 448c405ef2
commit 94cc7a0cbd
2 changed files with 15 additions and 4 deletions

View File

@ -264,10 +264,8 @@ class Scheduler(QObject):
ids = list(self.recipe_model.db.tags_older_than(_('News'), ids = list(self.recipe_model.db.tags_older_than(_('News'),
delta)) delta))
except: except:
# Should never happen # Happens if library is being switched
ids = [] ids = []
import traceback
traceback.print_exc()
if ids: if ids:
if ids: if ids:
self.delete_old_news.emit(ids) self.delete_old_news.emit(ids)

View File

@ -1135,7 +1135,7 @@ class TagsModel(QAbstractItemModel): # {{{
collapse_model = 'partition' collapse_model = 'partition'
collapse_template = tweaks['categories_collapsed_popularity_template'] collapse_template = tweaks['categories_collapsed_popularity_template']
def process_one_node(category, state_map): def process_one_node(category, state_map): # {{{
collapse_letter = None collapse_letter = None
category_index = self.createIndex(category.row(), 0, category) category_index = self.createIndex(category.row(), 0, category)
category_node = category_index.internalPointer() category_node = category_index.internalPointer()
@ -1277,6 +1277,7 @@ class TagsModel(QAbstractItemModel): # {{{
# This id_set must not be None # This id_set must not be None
node_parent.id_set |= tag.id_set node_parent.id_set |= tag.id_set
return return
# }}}
for category in self.category_nodes: for category in self.category_nodes:
if len(category.children) > 0: if len(category.children) > 0:
@ -2079,6 +2080,10 @@ class TagBrowserWidget(QWidget): # {{{
_('Add your own categories to the Tag Browser')) _('Add your own categories to the Tag Browser'))
parent.edit_categories.setStatusTip(parent.edit_categories.toolTip()) parent.edit_categories.setStatusTip(parent.edit_categories.toolTip())
# self.leak_test_timer = QTimer(self)
# self.leak_test_timer.timeout.connect(self.test_for_leak)
# self.leak_test_timer.start(5000)
def set_pane_is_visible(self, to_what): def set_pane_is_visible(self, to_what):
self.tags_view.set_pane_is_visible(to_what) self.tags_view.set_pane_is_visible(to_what)
@ -2140,5 +2145,13 @@ class TagBrowserWidget(QWidget): # {{{
def not_found_label_timer_event(self): def not_found_label_timer_event(self):
self.not_found_label.setVisible(False) self.not_found_label.setVisible(False)
def test_for_leak(self):
from calibre.utils.mem import memory
import gc
before = memory()
self.tags_view.recount()
for i in xrange(3): gc.collect()
print 'Used memory:', memory(before)/(1024.), 'KB'
# }}} # }}}