diff --git a/src/calibre/devices/bebook/driver.py b/src/calibre/devices/bebook/driver.py index a0130cd7f8..7313c24253 100644 --- a/src/calibre/devices/bebook/driver.py +++ b/src/calibre/devices/bebook/driver.py @@ -8,7 +8,7 @@ from calibre.devices.usbms.driver import USBMS class BEBOOK(USBMS): # Ordered list of supported formats - FORMATS = ['mobi', 'epub', 'pdf', 'mobi', 'txt'] + FORMATS = ['mobi', 'epub', 'pdf', 'txt'] VENDOR_ID = [0x0525] PRODUCT_ID = [0x8803, 0x6803] diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 4247e0cad3..d26686e412 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -193,6 +193,8 @@ class ResultCache(SearchQueryParser): if query and query.strip(): location = location.lower().strip() query = query.lower() + if not isinstance(query, unicode): + query = query.decode('utf-8') if location in ('tag', 'author', 'format'): location += 's' all = ('title', 'authors', 'publisher', 'tags', 'comments', 'series', 'formats') diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py index ae1ae24131..639878b37f 100644 --- a/src/calibre/web/feeds/recipes/__init__.py +++ b/src/calibre/web/feeds/recipes/__init__.py @@ -43,6 +43,7 @@ recipe_modules = ['recipe_' + r for r in ( 'seattle_times', 'scott_hanselman', 'coding_horror', 'twitchfilms', 'stackoverflow', 'telepolis_artikel', 'zaobao', 'usnews', 'straitstimes', 'index_hu', 'pcworld_hu', 'hrt', 'rts', + 'h1', 'h2', 'h3', )] import re, imp, inspect, time, os diff --git a/src/calibre/web/feeds/recipes/recipe_h1.py b/src/calibre/web/feeds/recipes/recipe_h1.py new file mode 100644 index 0000000000..2678e5b2eb --- /dev/null +++ b/src/calibre/web/feeds/recipes/recipe_h1.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from __future__ import with_statement + +__license__ = 'GPL v3' +__copyright__ = '2009, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +from calibre.web.feeds.news import BasicNewsRecipe + +class H168(BasicNewsRecipe): + title = u'168\xf3ra' + oldest_article = 4 + max_articles_per_feed = 50 + language = _('Hungarian') + __author__ = 'Ezmegaz' + + feeds = [(u'Itthon', + u'http://www.168ora.hu/static/rss/cikkek_itthon.xml'), (u'Gl\xf3busz', + u'http://www.168ora.hu/static/rss/cikkek_globusz.xml'), (u'Punch', + u'http://www.168ora.hu/static/rss/cikkek_punch.xml'), (u'Arte', + u'http://www.168ora.hu/static/rss/cikkek_arte.xml'), (u'Buxa', + u'http://www.168ora.hu/static/rss/cikkek_buxa.xml'), (u'Sebess\xe9g', + u'http://www.168ora.hu/static/rss/cikkek_sebesseg.xml'), (u'Tud\xe1s', + u'http://www.168ora.hu/static/rss/cikkek_tudas.xml'), (u'Sport', + u'http://www.168ora.hu/static/rss/cikkek_sport.xml'), (u'V\xe9lem\xe9ny', + u'http://www.168ora.hu/static/rss/cikkek_velemeny.xml'), (u'Dolce Vita', + u'http://www.168ora.hu/static/rss/cikkek_dolcevita.xml'), (u'R\xe1di\xf3', + u'http://www.168ora.hu/static/rss/radio.xml')] + + + diff --git a/src/calibre/web/feeds/recipes/recipe_h2.py b/src/calibre/web/feeds/recipes/recipe_h2.py new file mode 100644 index 0000000000..20c251ded9 --- /dev/null +++ b/src/calibre/web/feeds/recipes/recipe_h2.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from __future__ import with_statement + +__license__ = 'GPL v3' +__copyright__ = '2009, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +from calibre.web.feeds.news import BasicNewsRecipe + +class ATV(BasicNewsRecipe): + title = u'ATV' + oldest_article = 5 + max_articles_per_feed = 50 + language = _('Hungarian') + __author__ = 'Ezmegaz' + + + feeds = [(u'H\xedrek', u'http://atv.hu/rss/1'), (u'Cikkek', + u'http://atv.hu/rss/2')] + diff --git a/src/calibre/web/feeds/recipes/recipe_h3.py b/src/calibre/web/feeds/recipes/recipe_h3.py new file mode 100644 index 0000000000..a4da0c71cd --- /dev/null +++ b/src/calibre/web/feeds/recipes/recipe_h3.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from __future__ import with_statement + +__license__ = 'GPL v3' +__copyright__ = '2009, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +from calibre.web.feeds.news import BasicNewsRecipe + +class H3(BasicNewsRecipe): + title = u'H\xedrszerz\u0151' + oldest_article = 5 + max_articles_per_feed = 50 + language = _('Hungarian') + __author__ = 'Ezmegaz' + + + feeds = [(u'Belf\xf6ld', + u'http://www.hirszerzo.hu/rss.belfold.xml'), (u'K\xfclf\xf6ld', + u'http://www.hirszerzo.hu/rss.kulfold.xml'), (u'Profit', + u'http://www.hirszerzo.hu/rss.profit.xml'), (u'Shake', + u'http://www.hirszerzo.hu/rss.shake.xml'), (u'Publicisztika', + u'http://www.hirszerzo.hu/rss.publicisztika.xml'), (u'Elemz\xe9s', + u'http://www.hirszerzo.hu/rss.elemzes.xml'), (u'Sorok k\xf6z\xf6tt', + u'http://www.hirszerzo.hu/rss.sorok_kozott.xml'), (u'Gal\xe9ria', + u'http://www.hirszerzo.hu/rss.galeria.xml'), (u'Patro', + u'http://www.hirszerzo.hu/rss.patro.xml')] +