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

Fix #3813 (News Feed Searching Bug From attribute:'showing_count')

Browse Source
This commit is contained in:
Kovid Goyal 2009-10-19 11:47:12 -06:00
parent eed5931c85
commit 0df1b1e3b0
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/dialogs/scheduler.py
View File

@ -55,6 +55,10 @@ class SchedulerDialog(QDialog, Ui_Dialog):
self.old_news.setValue(gconf['oldest_news']) self.old_news.setValue(gconf['oldest_news'])
def break_cycles(self): def break_cycles(self):
self.disconnect(self.recipe_model, SIGNAL('searched(PyQt_PyObject)'),
self.search_done)
self.disconnect(self.recipe_model, SIGNAL('searched(PyQt_PyObject)'),
self.search.search_done)
self.recipe_model = None self.recipe_model = None
def search_done(self, *args): def search_done(self, *args):

4
src/calibre/web/feeds/recipes/model.py
View File

@ -164,6 +164,8 @@ class RecipeModel(QAbstractItemModel, SearchQueryParser):
return cls(*args) return cls(*args)
def ok(urn): def ok(urn):
if restrict_to_urns is None:
return False
return not restrict_to_urns or urn in restrict_to_urns return not restrict_to_urns or urn in restrict_to_urns
new_root = factory(NewsTreeItem, None) new_root = factory(NewsTreeItem, None)
@ -230,6 +232,8 @@ class RecipeModel(QAbstractItemModel, SearchQueryParser):
def search(self, query, refinement): def search(self, query, refinement):
try: try:
results = self.parse(unicode(query)) results = self.parse(unicode(query))
if not results:
results = None
except ParseException: except ParseException:
results = [] results = []
self.do_refresh(restrict_to_urns=results) self.do_refresh(restrict_to_urns=results)