From 32cbc59ec63e2bbf21c8e58d1cec5b9f890999fa Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 20 Feb 2011 13:20:55 +0000 Subject: [PATCH 01/24] Fix #9071: Author listing does not show names with double quotes (assuming I understand the report) --- src/calibre/gui2/tag_view.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index c2b0e4638b..3af3271921 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -1096,7 +1096,8 @@ class TagsModel(QAbstractItemModel): # {{{ if tag in nodes_seen: continue nodes_seen.add(tag) - ans.append('%s%s:"=%s"'%(prefix, category, tag.name)) + ans.append('%s%s:"=%s"'%(prefix, category, + tag.name.replace(r'"', r'\"'))) return ans def find_item_node(self, key, txt, start_path): From e96edfd432aa468676787e3058e4d8ab7b2f5610 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 10:03:49 -0700 Subject: [PATCH 02/24] Fix #9065 (Support for Wink ebook reader) --- src/calibre/customize/builtins.py | 6 ++---- src/calibre/devices/misc.py | 29 ++++++----------------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 6cfe915036..4f3574559e 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -573,8 +573,8 @@ from calibre.devices.edge.driver import EDGE from calibre.devices.teclast.driver import TECLAST_K3, NEWSMY, IPAPYRUS, \ SOVOS, PICO, SUNSTECH_EB700, ARCHOS7O, STASH from calibre.devices.sne.driver import SNE -from calibre.devices.misc import PALMPRE, AVANT, SWEEX, PDNOVEL, KOGAN, \ - GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, Q600, LUMIREAD, ALURATEK_COLOR, \ +from calibre.devices.misc import PALMPRE, AVANT, SWEEX, PDNOVEL, \ + GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, LUMIREAD, ALURATEK_COLOR, \ TREKSTOR, EEEREADER, NEXTBOOK from calibre.devices.folder_device.driver import FOLDER_DEVICE_FOR_CONFIG from calibre.devices.kobo.driver import KOBO @@ -691,8 +691,6 @@ plugins += [ AVANT, MENTOR, SWEEX, - Q600, - KOGAN, PDNOVEL, SPECTRA, GEMEI, diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py index e549a4a9fd..d74f727a0e 100644 --- a/src/calibre/devices/misc.py +++ b/src/calibre/devices/misc.py @@ -54,41 +54,24 @@ class AVANT(USBMS): class SWEEX(USBMS): # Identical to the Promedia name = 'Sweex Device Interface' - gui_name = 'Sweex' - description = _('Communicate with the Sweex MM300') + gui_name = 'Sweex/Kogan/Q600/Wink' + description = _('Communicate with the Sweex/Kogan/Q600/Wink') author = 'Kovid Goyal' supported_platforms = ['windows', 'osx', 'linux'] # Ordered list of supported formats - FORMATS = ['epub', 'prc', 'fb2', 'html', 'rtf', 'chm', 'pdf', 'txt'] + FORMATS = ['epub', 'mobi', 'prc', 'fb2', 'html', 'rtf', 'chm', 'pdf', 'txt'] VENDOR_ID = [0x0525, 0x177f] PRODUCT_ID = [0xa4a5, 0x300] - BCD = [0x0319, 0x110] + BCD = [0x0319, 0x110, 0x325] - VENDOR_NAME = 'SWEEX' - WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EBOOKREADER' + VENDOR_NAME = ['SWEEX', 'LINUX'] + WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['EBOOKREADER', 'FILE-STOR_GADGET'] EBOOK_DIR_MAIN = '' SUPPORTS_SUB_DIRS = True -class Q600(SWEEX): - - name = 'Digma Q600 Device interface' - gui_name = 'Q600' - description = _('Communicate with the Digma Q600') - - BCD = [0x325] - FORMATS = ['epub', 'fb2', 'mobi', 'prc', 'html', 'rtf', 'chm', 'pdf', 'txt'] - -class KOGAN(SWEEX): - - name = 'Kogan Device Interface' - gui_name = 'Kogan' - description = _('Communicate with the Kogan') - VENDOR_NAME = 'LINUX' - WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'FILE-STOR_GADGET' - EBOOK_DIR_MAIN = 'Kogan eBooks' class PDNOVEL(USBMS): name = 'Pandigital Novel device interface' From 15d1e591aec2eed00cf9ba6c9c53befba0d59dba Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 10:34:41 -0700 Subject: [PATCH 03/24] Update Ming Pao --- resources/recipes/ming_pao.recipe | 261 ++++++++++++++---------------- 1 file changed, 125 insertions(+), 136 deletions(-) diff --git a/resources/recipes/ming_pao.recipe b/resources/recipes/ming_pao.recipe index 726181f57b..9febcec0e5 100644 --- a/resources/recipes/ming_pao.recipe +++ b/resources/recipes/ming_pao.recipe @@ -1,7 +1,9 @@ __license__ = 'GPL v3' -__copyright__ = '2010, Eddie Lau' +__copyright__ = '2010-2011, Eddie Lau' ''' Change Log: +2011/02/20: skip duplicated links in finance section, put photos which may extend a whole page to the back of the articles + clean up the indentation 2010/12/07: add entertainment section, use newspaper front page as ebook cover, suppress date display in section list (to avoid wrong date display in case the user generates the ebook in a time zone different from HKT) 2010/11/22: add English section, remove eco-news section which is not updated daily, correct @@ -18,21 +20,19 @@ from calibre.web.feeds.recipes import BasicNewsRecipe from contextlib import nested -from calibre import __appname__ from calibre.ebooks.BeautifulSoup import BeautifulSoup from calibre.ebooks.metadata.opf2 import OPFCreator from calibre.ebooks.metadata.toc import TOC from calibre.ebooks.metadata import MetaInformation class MPHKRecipe(BasicNewsRecipe): - IsKindleUsed = True # to avoid generating periodical in which CJK characters can't be displayed in section/article view - + IsCJKWellSupported = True # Set to False to avoid generating periodical in which CJK characters can't be displayed in section/article view title = 'Ming Pao - Hong Kong' oldest_article = 1 max_articles_per_feed = 100 __author__ = 'Eddie Lau' - description = 'Hong Kong Chinese Newspaper' - publisher = 'news.mingpao.com' + description = 'Hong Kong Chinese Newspaper (http://news.mingpao.com)' + publisher = 'MingPao' category = 'Chinese, News, Hong Kong' remove_javascript = True use_embedded_content = False @@ -46,19 +46,20 @@ class MPHKRecipe(BasicNewsRecipe): masthead_url = 'http://news.mingpao.com/image/portals_top_logo_news.gif' keep_only_tags = [dict(name='h1'), dict(name='font', attrs={'style':['font-size:14pt; line-height:160%;']}), # for entertainment page title - dict(attrs={'class':['photo']}), dict(attrs={'id':['newscontent']}), # entertainment page content - dict(attrs={'id':['newscontent01','newscontent02']})] + dict(attrs={'id':['newscontent01','newscontent02']}), + dict(attrs={'class':['photo']}) + ] remove_tags = [dict(name='style'), dict(attrs={'id':['newscontent135']})] # for the finance page remove_attributes = ['width'] preprocess_regexps = [ - (re.compile(r'
', re.DOTALL|re.IGNORECASE), - lambda match: '

'), - (re.compile(r'

', re.DOTALL|re.IGNORECASE), - lambda match: ''), - (re.compile(r'

', re.DOTALL|re.IGNORECASE), # for entertainment page - lambda match: '') + (re.compile(r'
', re.DOTALL|re.IGNORECASE), + lambda match: '

'), + (re.compile(r'

', re.DOTALL|re.IGNORECASE), + lambda match: ''), + (re.compile(r'

', re.DOTALL|re.IGNORECASE), # for entertainment page + lambda match: '') ] def image_url_processor(cls, baseurl, url): @@ -107,6 +108,9 @@ class MPHKRecipe(BasicNewsRecipe): def get_fetchdate(self): return self.get_dtlocal().strftime("%Y%m%d") + def get_fetchformatteddate(self): + return self.get_dtlocal().strftime("%Y-%m-%d") + def get_fetchday(self): # convert UTC to local hk time - at around HKT 6.00am, all news are available return self.get_dtlocal().strftime("%d") @@ -121,84 +125,66 @@ class MPHKRecipe(BasicNewsRecipe): return cover def parse_index(self): - feeds = [] - dateStr = self.get_fetchdate() - for title, url in [(u'\u8981\u805e Headline', 'http://news.mingpao.com/' + dateStr + '/gaindex.htm'), - (u'\u6559\u80b2 Education', 'http://news.mingpao.com/' + dateStr + '/gfindex.htm'), - (u'\u6e2f\u805e Local', 'http://news.mingpao.com/' + dateStr + '/gbindex.htm'), - (u'\u793e\u8a55\u2027\u7b46\u9663 Editorial', 'http://news.mingpao.com/' + dateStr + '/mrindex.htm'), - (u'\u8ad6\u58c7 Forum', 'http://news.mingpao.com/' + dateStr + '/faindex.htm'), - (u'\u4e2d\u570b China', 'http://news.mingpao.com/' + dateStr + '/caindex.htm'), - (u'\u570b\u969b World', 'http://news.mingpao.com/' + dateStr + '/taindex.htm'), - ('Tech News', 'http://news.mingpao.com/' + dateStr + '/naindex.htm'), - (u'\u9ad4\u80b2 Sport', 'http://news.mingpao.com/' + dateStr + '/spindex.htm'), - (u'\u526f\u520a Supplement', 'http://news.mingpao.com/' + dateStr + '/jaindex.htm'), - (u'\u82f1\u6587 English', 'http://news.mingpao.com/' + dateStr + '/emindex.htm')]: - articles = self.parse_section(url) - if articles: - feeds.append((title, articles)) - # special - finance - fin_articles = self.parse_fin_section('http://www.mpfinance.com/htm/Finance/' + dateStr + '/News/ea,eb,ecindex.htm') - if fin_articles: - feeds.append((u'\u7d93\u6fdf Finance', fin_articles)) - # special - eco-friendly - # eco_articles = self.parse_eco_section('http://tssl.mingpao.com/htm/marketing/eco/cfm/Eco1.cfm') - # if eco_articles: - # feeds.append((u'\u74b0\u4fdd Eco News', eco_articles)) - # special - entertainment - ent_articles = self.parse_ent_section('http://ol.mingpao.com/cfm/star1.cfm') - if ent_articles: - feeds.append((u'\u5f71\u8996 Entertainment', ent_articles)) - return feeds + feeds = [] + dateStr = self.get_fetchdate() + for title, url in [(u'\u8981\u805e Headline', 'http://news.mingpao.com/' + dateStr + '/gaindex.htm'), + (u'\u6e2f\u805e Local', 'http://news.mingpao.com/' + dateStr + '/gbindex.htm'), + (u'\u793e\u8a55/\u7b46\u9663 Editorial', 'http://news.mingpao.com/' + dateStr + '/mrindex.htm'), + (u'\u8ad6\u58c7 Forum', 'http://news.mingpao.com/' + dateStr + '/faindex.htm'), + (u'\u4e2d\u570b China', 'http://news.mingpao.com/' + dateStr + '/caindex.htm'), + (u'\u570b\u969b World', 'http://news.mingpao.com/' + dateStr + '/taindex.htm'), + ('Tech News', 'http://news.mingpao.com/' + dateStr + '/naindex.htm'), + (u'\u6559\u80b2 Education', 'http://news.mingpao.com/' + dateStr + '/gfindex.htm'), + (u'\u9ad4\u80b2 Sport', 'http://news.mingpao.com/' + dateStr + '/spindex.htm'), + (u'\u526f\u520a Supplement', 'http://news.mingpao.com/' + dateStr + '/jaindex.htm'), + (u'\u82f1\u6587 English', 'http://news.mingpao.com/' + dateStr + '/emindex.htm')]: + articles = self.parse_section(url) + if articles: + feeds.append((title, articles)) + # special - finance + fin_articles = self.parse_fin_section('http://www.mpfinance.com/htm/Finance/' + dateStr + '/News/ea,eb,ecindex.htm') + if fin_articles: + feeds.append((u'\u7d93\u6fdf Finance', fin_articles)) + # special - entertainment + ent_articles = self.parse_ent_section('http://ol.mingpao.com/cfm/star1.cfm') + if ent_articles: + feeds.append((u'\u5f71\u8996 Film/TV', ent_articles)) + return feeds def parse_section(self, url): - dateStr = self.get_fetchdate() - soup = self.index_to_soup(url) - divs = soup.findAll(attrs={'class': ['bullet','bullet_grey']}) - current_articles = [] - included_urls = [] - divs.reverse() - for i in divs: - a = i.find('a', href = True) - title = self.tag_to_string(a) - url = a.get('href', False) - url = 'http://news.mingpao.com/' + dateStr + '/' +url - if url not in included_urls and url.rfind('Redirect') == -1: - current_articles.append({'title': title, 'url': url, 'description':'', 'date':''}) - included_urls.append(url) - current_articles.reverse() - return current_articles + dateStr = self.get_fetchdate() + soup = self.index_to_soup(url) + divs = soup.findAll(attrs={'class': ['bullet','bullet_grey']}) + current_articles = [] + included_urls = [] + divs.reverse() + for i in divs: + a = i.find('a', href = True) + title = self.tag_to_string(a) + url = a.get('href', False) + url = 'http://news.mingpao.com/' + dateStr + '/' +url + if url not in included_urls and url.rfind('Redirect') == -1: + current_articles.append({'title': title, 'url': url, 'description':'', 'date':''}) + included_urls.append(url) + current_articles.reverse() + return current_articles def parse_fin_section(self, url): dateStr = self.get_fetchdate() soup = self.index_to_soup(url) a = soup.findAll('a', href= True) current_articles = [] - for i in a: - url = i.get('href', False) - if not url.rfind(dateStr) == -1 and url.rfind('index') == -1: - title = self.tag_to_string(i) - url = 'http://www.mpfinance.com/cfm/' +url - current_articles.append({'title': title, 'url': url, 'description':''}) - return current_articles - - def parse_eco_section(self, url): - dateStr = self.get_fetchdate() - soup = self.index_to_soup(url) - divs = soup.findAll(attrs={'class': ['bullet']}) - current_articles = [] included_urls = [] - for i in divs: - a = i.find('a', href = True) - title = self.tag_to_string(a) - url = a.get('href', False) - url = 'http://tssl.mingpao.com/htm/marketing/eco/cfm/' +url - if url not in included_urls and url.rfind('Redirect') == -1 and not url.rfind('.txt') == -1 and not url.rfind(dateStr) == -1: + for i in a: + url = 'http://www.mpfinance.com/cfm/' + i.get('href', False) + if url not in included_urls and not url.rfind(dateStr) == -1 and url.rfind('index') == -1: + title = self.tag_to_string(i) current_articles.append({'title': title, 'url': url, 'description':''}) included_urls.append(url) return current_articles def parse_ent_section(self, url): + self.get_fetchdate() soup = self.index_to_soup(url) a = soup.findAll('a', href=True) a.reverse() @@ -223,67 +209,71 @@ class MPHKRecipe(BasicNewsRecipe): return soup def create_opf(self, feeds, dir=None): - if self.IsKindleUsed == False: - super(MPHKRecipe,self).create_opf(feeds, dir) - return if dir is None: dir = self.output_dir - title = self.short_title() - title += ' ' + self.get_fetchdate() - #if self.output_profile.periodical_date_in_title: - # title += strftime(self.timefmt) - mi = MetaInformation(title, [__appname__]) - mi.publisher = __appname__ - mi.author_sort = __appname__ - mi.publication_type = self.publication_type+':'+self.short_title() - #mi.timestamp = nowf() - mi.timestamp = self.get_dtlocal() - mi.comments = self.description - if not isinstance(mi.comments, unicode): - mi.comments = mi.comments.decode('utf-8', 'replace') - #mi.pubdate = nowf() - mi.pubdate = self.get_dtlocal() - opf_path = os.path.join(dir, 'index.opf') - ncx_path = os.path.join(dir, 'index.ncx') - opf = OPFCreator(dir, mi) - # Add mastheadImage entry to section - mp = getattr(self, 'masthead_path', None) - if mp is not None and os.access(mp, os.R_OK): - from calibre.ebooks.metadata.opf2 import Guide - ref = Guide.Reference(os.path.basename(self.masthead_path), os.getcwdu()) - ref.type = 'masthead' - ref.title = 'Masthead Image' - opf.guide.append(ref) + if self.IsCJKWellSupported == True: + # use Chinese title + title = u'\u660e\u5831 (\u9999\u6e2f) ' + self.get_fetchformatteddate() + else: + # use English title + title = self.short_title() + ' ' + self.get_fetchformatteddate() + if True: # force date in title + # title += strftime(self.timefmt) + mi = MetaInformation(title, [self.publisher]) + mi.publisher = self.publisher + mi.author_sort = self.publisher + if self.IsCJKWellSupported == True: + mi.publication_type = 'periodical:'+self.publication_type+':'+self.short_title() + else: + mi.publication_type = self.publication_type+':'+self.short_title() + #mi.timestamp = nowf() + mi.timestamp = self.get_dtlocal() + mi.comments = self.description + if not isinstance(mi.comments, unicode): + mi.comments = mi.comments.decode('utf-8', 'replace') + #mi.pubdate = nowf() + mi.pubdate = self.get_dtlocal() + opf_path = os.path.join(dir, 'index.opf') + ncx_path = os.path.join(dir, 'index.ncx') + opf = OPFCreator(dir, mi) + # Add mastheadImage entry to section + mp = getattr(self, 'masthead_path', None) + if mp is not None and os.access(mp, os.R_OK): + from calibre.ebooks.metadata.opf2 import Guide + ref = Guide.Reference(os.path.basename(self.masthead_path), os.getcwdu()) + ref.type = 'masthead' + ref.title = 'Masthead Image' + opf.guide.append(ref) - manifest = [os.path.join(dir, 'feed_%d'%i) for i in range(len(feeds))] - manifest.append(os.path.join(dir, 'index.html')) - manifest.append(os.path.join(dir, 'index.ncx')) + manifest = [os.path.join(dir, 'feed_%d'%i) for i in range(len(feeds))] + manifest.append(os.path.join(dir, 'index.html')) + manifest.append(os.path.join(dir, 'index.ncx')) - # Get cover - cpath = getattr(self, 'cover_path', None) - if cpath is None: - pf = open(os.path.join(dir, 'cover.jpg'), 'wb') - if self.default_cover(pf): - cpath = pf.name - if cpath is not None and os.access(cpath, os.R_OK): - opf.cover = cpath - manifest.append(cpath) + # Get cover + cpath = getattr(self, 'cover_path', None) + if cpath is None: + pf = open(os.path.join(dir, 'cover.jpg'), 'wb') + if self.default_cover(pf): + cpath = pf.name + if cpath is not None and os.access(cpath, os.R_OK): + opf.cover = cpath + manifest.append(cpath) - # Get masthead - mpath = getattr(self, 'masthead_path', None) - if mpath is not None and os.access(mpath, os.R_OK): - manifest.append(mpath) + # Get masthead + mpath = getattr(self, 'masthead_path', None) + if mpath is not None and os.access(mpath, os.R_OK): + manifest.append(mpath) - opf.create_manifest_from_files_in(manifest) - for mani in opf.manifest: - if mani.path.endswith('.ncx'): - mani.id = 'ncx' - if mani.path.endswith('mastheadImage.jpg'): - mani.id = 'masthead-image' - entries = ['index.html'] - toc = TOC(base_path=dir) - self.play_order_counter = 0 - self.play_order_map = {} + opf.create_manifest_from_files_in(manifest) + for mani in opf.manifest: + if mani.path.endswith('.ncx'): + mani.id = 'ncx' + if mani.path.endswith('mastheadImage.jpg'): + mani.id = 'masthead-image' + entries = ['index.html'] + toc = TOC(base_path=dir) + self.play_order_counter = 0 + self.play_order_map = {} def feed_index(num, parent): f = feeds[num] @@ -321,7 +311,7 @@ class MPHKRecipe(BasicNewsRecipe): prefix = '/'.join('..'for i in range(2*len(re.findall(r'link\d+', last)))) templ = self.navbar.generate(True, num, j, len(f), not self.has_single_feed, - a.orig_url, __appname__, prefix=prefix, + a.orig_url, self.publisher, prefix=prefix, center=self.center_navbar) elem = BeautifulSoup(templ.render(doctype='xhtml').decode('utf-8')).find('div') body.insert(len(body.contents), elem) @@ -344,7 +334,7 @@ class MPHKRecipe(BasicNewsRecipe): if not desc: desc = None feed_index(i, toc.add_item('feed_%d/index.html'%i, None, - f.title, play_order=po, description=desc, author=auth)) + f.title, play_order=po, description=desc, author=auth)) else: entries.append('feed_%d/index.html'%0) @@ -357,4 +347,3 @@ class MPHKRecipe(BasicNewsRecipe): with nested(open(opf_path, 'wb'), open(ncx_path, 'wb')) as (opf_file, ncx_file): opf.render(opf_file, ncx_file) - From a42dbbfe2526ebb3e5b100ebbe1e7667a7c2147e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 11:29:17 -0700 Subject: [PATCH 04/24] Disable Kent District Library plugin to download series information. The website could not handle the load calibre's 2 million users put on it --- src/calibre/customize/ui.py | 3 ++- src/calibre/ebooks/metadata/amazon.py | 3 +++ src/calibre/ebooks/metadata/fetch.py | 7 ++++++- src/calibre/ebooks/metadata/kdl.py | 13 ++++++++++--- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py index 5f67e23d92..e9feacc67e 100644 --- a/src/calibre/customize/ui.py +++ b/src/calibre/customize/ui.py @@ -121,7 +121,8 @@ def enable_plugin(plugin_or_name): config['enabled_plugins'] = ep default_disabled_plugins = set([ - 'Douban Books', 'Douban.com covers', 'Nicebooks', 'Nicebooks covers' + 'Douban Books', 'Douban.com covers', 'Nicebooks', 'Nicebooks covers', + 'Kent District Library' ]) def is_disabled(plugin): diff --git a/src/calibre/ebooks/metadata/amazon.py b/src/calibre/ebooks/metadata/amazon.py index 58dd3f1d22..c87249ed39 100644 --- a/src/calibre/ebooks/metadata/amazon.py +++ b/src/calibre/ebooks/metadata/amazon.py @@ -205,7 +205,10 @@ def main(args=sys.argv): open(cpath, 'wb').write(br.open_novisit(curl).read()) print 'Cover for', title, 'saved to', cpath + #import time + #st = time.time() print get_social_metadata(title, None, None, isbn) + #print '\n\n', time.time() - st, '\n\n' return 0 diff --git a/src/calibre/ebooks/metadata/fetch.py b/src/calibre/ebooks/metadata/fetch.py index 4f246b2b9a..667b4f4d7c 100644 --- a/src/calibre/ebooks/metadata/fetch.py +++ b/src/calibre/ebooks/metadata/fetch.py @@ -106,6 +106,9 @@ class MetadataSource(Plugin): # {{{ def join(self): return self.worker.join() + def is_alive(self): + return self.worker.is_alive() + def is_customizable(self): return True @@ -251,7 +254,9 @@ class KentDistrictLibrary(MetadataSource): # {{{ name = 'Kent District Library' metadata_type = 'social' - description = _('Downloads series information from ww2.kdl.org') + description = _('Downloads series information from ww2.kdl.org. ' + 'This website cannot handle large numbers of queries, ' + 'so the plugin is disabled by default.') def fetch(self): if not self.title or not self.book_author: diff --git a/src/calibre/ebooks/metadata/kdl.py b/src/calibre/ebooks/metadata/kdl.py index 4eca49ad45..4d02bef602 100644 --- a/src/calibre/ebooks/metadata/kdl.py +++ b/src/calibre/ebooks/metadata/kdl.py @@ -5,7 +5,9 @@ __license__ = 'GPL v3' __copyright__ = '2011, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import re, urllib, urlparse +import re, urllib, urlparse, socket + +from mechanize import URLError from calibre.ebooks.metadata.book.base import Metadata from calibre import browser @@ -17,7 +19,7 @@ URL = \ _ignore_starts = u'\'"'+u''.join(unichr(x) for x in range(0x2018, 0x201e)+[0x2032, 0x2033]) -def get_series(title, authors): +def get_series(title, authors, timeout=5): mi = Metadata(title, authors) if title and title[0] in _ignore_starts: title = title[1:] @@ -39,7 +41,12 @@ def get_series(title, authors): url = URL.format(author, title) br = browser() - raw = br.open(url).read() + try: + raw = br.open_novisit(url, timeout=timeout).read() + except URLError, e: + if isinstance(e.reason, socket.timeout): + raise Exception('KDL Server busy, try again later') + raise if 'see the full results' not in raw: return mi raw = xml_to_unicode(raw)[0] From fec048389aca229647145bd2abff059b6b4f7695 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 11:30:18 -0700 Subject: [PATCH 05/24] ... --- src/calibre/ebooks/metadata/kdl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/kdl.py b/src/calibre/ebooks/metadata/kdl.py index 4d02bef602..bf84cbac13 100644 --- a/src/calibre/ebooks/metadata/kdl.py +++ b/src/calibre/ebooks/metadata/kdl.py @@ -19,7 +19,7 @@ URL = \ _ignore_starts = u'\'"'+u''.join(unichr(x) for x in range(0x2018, 0x201e)+[0x2032, 0x2033]) -def get_series(title, authors, timeout=5): +def get_series(title, authors, timeout=10): mi = Metadata(title, authors) if title and title[0] in _ignore_starts: title = title[1:] From f9d405ebe0ed6a5ffdd34f420108def3cf943e2f Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 20 Feb 2011 13:56:00 -0500 Subject: [PATCH 06/24] Fix bug #8927: FB2 paragraph spacing issue. --- src/calibre/ebooks/fb2/fb2ml.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/fb2/fb2ml.py b/src/calibre/ebooks/fb2/fb2ml.py index 6af058da7b..43f93807a1 100644 --- a/src/calibre/ebooks/fb2/fb2ml.py +++ b/src/calibre/ebooks/fb2/fb2ml.py @@ -350,6 +350,8 @@ class FB2MLizer(object): # Number of blank lines above tag try: ems = int(round((float(style.marginTop) / style.fontSize) - 1)) + if ems < 0: + ems = 0 except: ems = 0 @@ -397,7 +399,7 @@ class FB2MLizer(object): fb2_out += p_txt tags += p_tag fb2_out.append('' % self.image_hrefs[page.abshref(elem_tree.attrib['src'])]) - if tag in ('br', 'hr') or ems: + if tag in ('br', 'hr') or ems >= 1: if ems < 1: multiplier = 1 else: From a2225ab47f6c08b08200e0e9a4649e87af74cd6f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 12:01:44 -0700 Subject: [PATCH 07/24] ... --- src/calibre/ebooks/metadata/sources/test.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/sources/test.py b/src/calibre/ebooks/metadata/sources/test.py index cd7e7ab6e8..6fdea703aa 100644 --- a/src/calibre/ebooks/metadata/sources/test.py +++ b/src/calibre/ebooks/metadata/sources/test.py @@ -7,7 +7,7 @@ __license__ = 'GPL v3' __copyright__ = '2011, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import os, tempfile +import os, tempfile, time from Queue import Queue, Empty from threading import Event @@ -48,11 +48,15 @@ def test_identify_plugin(name, tests): abort = Event() prints('Log saved to', lf) + times = [] for kwargs, test_funcs in tests: prints('Running test with:', kwargs) rq = Queue() args = (log, rq, abort) + start_time = time.time() err = plugin.identify(*args, **kwargs) + total_time = time.time() - start_time + times.append(total_time) if err is not None: prints('identify returned an error for args', args) prints(err) @@ -87,6 +91,8 @@ def test_identify_plugin(name, tests): prints('Log saved to', lf) raise SystemExit(1) + prints('Average time per query', sum(times)/len(times)) + if os.stat(lf).st_size > 10: prints('There were some errors, see log', lf) From 5fe546c70c49778bcfa84f684faef7d3aa9b0c32 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 12:10:01 -0700 Subject: [PATCH 08/24] ... --- src/calibre/ebooks/metadata/xisbn.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/calibre/ebooks/metadata/xisbn.py b/src/calibre/ebooks/metadata/xisbn.py index 2ee74396c7..aaeb1c6b98 100644 --- a/src/calibre/ebooks/metadata/xisbn.py +++ b/src/calibre/ebooks/metadata/xisbn.py @@ -11,6 +11,12 @@ from calibre import browser class xISBN(object): + ''' + This class is used to find the ISBN numbers of "related" editions of a + book, given its ISBN. Useful when querying services for metadata by ISBN, + in case they do not have the ISBN for the particular edition. + ''' + QUERY = 'http://xisbn.worldcat.org/webservices/xid/isbn/%s?method=getEditions&format=json&fl=form,year,lang,ed' def __init__(self): From 1976ca3663b117ccfb3307ee930fe7e2d8e6db9a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 12:47:31 -0700 Subject: [PATCH 09/24] remove threading from google metadata download plugin as google throttles requests --- src/calibre/ebooks/metadata/sources/base.py | 5 +- src/calibre/ebooks/metadata/sources/google.py | 82 +++++++------------ src/calibre/ebooks/metadata/sources/test.py | 11 +++ 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py index e5490ef56e..74e184cc66 100644 --- a/src/calibre/ebooks/metadata/sources/base.py +++ b/src/calibre/ebooks/metadata/sources/base.py @@ -85,7 +85,8 @@ class Source(Plugin): # Metadata API {{{ - def identify(self, log, result_queue, abort, title=None, authors=None, identifiers={}): + def identify(self, log, result_queue, abort, title=None, authors=None, + identifiers={}, timeout=5): ''' Identify a book by its title/author/isbn/etc. @@ -98,6 +99,8 @@ class Source(Plugin): :param authors: A list of authors of the book, can be None :param identifiers: A dictionary of other identifiers, most commonly {'isbn':'1234...'} + :param timeout: Timeout in seconds, no network request should hang for + longer than timeout. :return: None if no errors occurred, otherwise a unicode representation of the error suitable for showing to the user diff --git a/src/calibre/ebooks/metadata/sources/google.py b/src/calibre/ebooks/metadata/sources/google.py index c59bbe6dc5..498c7574ea 100644 --- a/src/calibre/ebooks/metadata/sources/google.py +++ b/src/calibre/ebooks/metadata/sources/google.py @@ -10,7 +10,6 @@ __docformat__ = 'restructuredtext en' import time from urllib import urlencode from functools import partial -from threading import Thread from lxml import etree @@ -18,6 +17,7 @@ from calibre.ebooks.metadata.sources.base import Source from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.chardet import xml_to_unicode from calibre.utils.date import parse_date, utcnow +from calibre.utils.cleantext import clean_ascii_chars from calibre import browser, as_unicode NAMESPACES = { @@ -41,20 +41,20 @@ subject = XPath('descendant::dc:subject') description = XPath('descendant::dc:description') language = XPath('descendant::dc:language') -def get_details(browser, url): +def get_details(browser, url, timeout): try: - raw = browser.open_novisit(url).read() + raw = browser.open_novisit(url, timeout=timeout).read() except Exception as e: gc = getattr(e, 'getcode', lambda : -1) if gc() != 403: raise # Google is throttling us, wait a little - time.sleep(2) - raw = browser.open_novisit(url).read() + time.sleep(1) + raw = browser.open_novisit(url, timeout=timeout).read() return raw -def to_metadata(browser, log, entry_): +def to_metadata(browser, log, entry_, timeout): def get_text(extra, x): try: @@ -79,8 +79,9 @@ def to_metadata(browser, log, entry_): mi = Metadata(title_, authors) try: - raw = get_details(browser, id_url) - feed = etree.fromstring(xml_to_unicode(raw, strip_encoding_pats=True)[0]) + raw = get_details(browser, id_url, timeout) + feed = etree.fromstring(xml_to_unicode(clean_ascii_chars(raw), + strip_encoding_pats=True)[0]) extra = entry(feed)[0] except: log.exception('Failed to get additional details for', mi.title) @@ -131,26 +132,19 @@ def to_metadata(browser, log, entry_): return mi -class Worker(Thread): - def __init__(self, log, entries, abort, result_queue): - self.browser, self.log, self.entries = browser(), log, entries - self.abort, self.result_queue = abort, result_queue - Thread.__init__(self) - self.daemon = True - - def run(self): - for i in self.entries: - try: - ans = to_metadata(self.browser, self.log, i) - if isinstance(ans, Metadata): - self.result_queue.put(ans) - except: - self.log.exception( - 'Failed to get metadata for identify entry:', - etree.tostring(i)) - if self.abort.is_set(): - break +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): @@ -192,54 +186,40 @@ class GoogleBooks(Source): }) - def identify(self, log, result_queue, abort, title=None, authors=None, identifiers={}): + def identify(self, log, result_queue, abort, title=None, authors=None, + identifiers={}, timeout=5): query = self.create_query(log, title=title, authors=authors, identifiers=identifiers) + br = browser() try: - raw = browser().open_novisit(query).read() + raw = br.open_novisit(query, timeout=timeout).read() except Exception, e: log.exception('Failed to make identify query: %r'%query) return as_unicode(e) try: parser = etree.XMLParser(recover=True, no_network=True) - feed = etree.fromstring(xml_to_unicode(raw, + feed = etree.fromstring(xml_to_unicode(clean_ascii_chars(raw), strip_encoding_pats=True)[0], parser=parser) entries = entry(feed) except Exception, e: log.exception('Failed to parse identify results') return as_unicode(e) - - groups = self.split_jobs(entries, 5) # At most 5 threads - if not groups: - return None - workers = [Worker(log, entries, abort, result_queue) for entries in - groups] - - if abort.is_set(): - return None - - for worker in workers: worker.start() - - has_alive_worker = True - while has_alive_worker and not abort.is_set(): - time.sleep(0.1) - has_alive_worker = False - for worker in workers: - if worker.is_alive(): - has_alive_worker = True + # 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) return None if __name__ == '__main__': # To run these test use: calibre-debug -e src/calibre/ebooks/metadata/sources/google.py from calibre.ebooks.metadata.sources.test import (test_identify_plugin, - isbn_test) + title_test) test_identify_plugin(GoogleBooks.name, [ ( {'title': 'Great Expectations', 'authors':['Charles Dickens']}, - [isbn_test('9781607541592')] + [title_test('Great Expectations', exact=True)] ), ]) diff --git a/src/calibre/ebooks/metadata/sources/test.py b/src/calibre/ebooks/metadata/sources/test.py index 6fdea703aa..3b41e69d40 100644 --- a/src/calibre/ebooks/metadata/sources/test.py +++ b/src/calibre/ebooks/metadata/sources/test.py @@ -26,6 +26,17 @@ def isbn_test(isbn): return test +def title_test(title, exact=False): + + title = title.lower() + + def test(mi): + mt = mi.title.lower() + return (exact and mt == title) or \ + (not exact and title in mt) + + return test + def test_identify_plugin(name, tests): ''' :param name: Plugin name From e76ce9e51ae5d838c466e9eef1a0a7196bab0cc0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 12:50:15 -0700 Subject: [PATCH 10/24] Osnews.pl and SwiatKindle by Mori --- resources/recipes/osnews_pl.recipe | 50 ++++++++++++++++++++++++++++ resources/recipes/swiatkindle.recipe | 24 +++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 resources/recipes/osnews_pl.recipe create mode 100644 resources/recipes/swiatkindle.recipe diff --git a/resources/recipes/osnews_pl.recipe b/resources/recipes/osnews_pl.recipe new file mode 100644 index 0000000000..5d851ab179 --- /dev/null +++ b/resources/recipes/osnews_pl.recipe @@ -0,0 +1,50 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +''' +OSNews.pl +''' + +from calibre.web.feeds.news import BasicNewsRecipe +import re + +class OSNewsRecipe(BasicNewsRecipe): + __author__ = u'Mori & Tomasz D\u0142ugosz' + language = 'pl' + + title = u'OSnews.pl' + publisher = u'OSnews.pl' + description = u'OSnews.pl jest spo\u0142eczno\u015bciowym serwisem informacyjnym po\u015bwi\u0119conym oprogramowaniu, systemom operacyjnym i \u015bwiatowi IT' + + no_stylesheets = True + remove_javascript = True + encoding = 'utf-8' + use_embedded_content = False; + + oldest_article = 7 + max_articles_per_feed = 100 + + extra_css = ''' + .news-heading {font-size:150%} + .newsinformations li {display:inline;} + blockquote {border:2px solid #000; padding:5px;} + ''' + + feeds = [ + (u'OSNews.pl', u'http://feeds.feedburner.com/OSnewspl') + ] + + keep_only_tags = [ + dict(name = 'a', attrs = {'class' : 'news-heading'}), + dict(name = 'div', attrs = {'class' : 'newsinformations'}), + dict(name = 'div', attrs = {'id' : 'news-content'}) + ] + + remove_tags = [ + dict(name = 'div', attrs = {'class' : 'sociable'}), + dict(name = 'div', attrs = {'class' : 'post_prev'}), + dict(name = 'div', attrs = {'class' : 'post_next'}), + dict(name = 'div', attrs = {'class' : 'clr'}) + ] + + preprocess_regexps = [(re.compile(u'Komentarze: \(?[0-9]+\)? ?' +''' +swiatkindle.pl +''' + +import re + +class swiatkindle(BasicNewsRecipe): + title = u'Swiat Kindle' + description = u'Blog o czytniku Amazon Kindle. Wersje, ksi\u0105\u017cki, kupowanie i korzystanie w Polsce' + language = 'pl' + __author__ = u'Tomasz D\u0142ugosz' + oldest_article = 7 + max_articles_per_feed = 100 + + feeds = [(u'\u015awiat Kindle - wpisy', u'http://swiatkindle.pl/feed')] + + remove_tags = [dict(name = 'ul', attrs = {'class' : 'similar-posts'})] + + preprocess_regexps = [(re.compile(u'

Czytaj dalej:

'), lambda match: '')] + From 3229f73b3ef683f5f3d584e7f2f92939c32e0cec Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 12:53:42 -0700 Subject: [PATCH 11/24] ... --- src/calibre/ebooks/metadata/kdl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/kdl.py b/src/calibre/ebooks/metadata/kdl.py index bf84cbac13..b0b961b603 100644 --- a/src/calibre/ebooks/metadata/kdl.py +++ b/src/calibre/ebooks/metadata/kdl.py @@ -19,7 +19,7 @@ URL = \ _ignore_starts = u'\'"'+u''.join(unichr(x) for x in range(0x2018, 0x201e)+[0x2032, 0x2033]) -def get_series(title, authors, timeout=10): +def get_series(title, authors, timeout=60): mi = Metadata(title, authors) if title and title[0] in _ignore_starts: title = title[1:] From 98ea598b9605d4a18df9fe45c5ca0bd7b9bc0593 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 15:34:51 -0700 Subject: [PATCH 12/24] Fix #9073 (Book details not updated after drag/drop of format) --- src/calibre/gui2/actions/add.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py index 49a7a4677a..de2e7aa2f7 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -259,6 +259,13 @@ class AddAction(InterfaceAction): if hasattr(self.gui, 'db_images'): self.gui.db_images.reset() self.gui.tags_view.recount() + # The formats of the current book could have changed if + # automerge is enabled + current_idx = self.gui.library_view.currentIndex() + if current_idx.isValid(): + self.gui.library_view.model().current_changed(current_idx, + current_idx) + if getattr(self._adder, 'merged_books', False): books = u'\n'.join([x if isinstance(x, unicode) else x.decode(preferred_encoding, 'replace') for x in From f1b3ee781b49a9a59a3de1076aaa233355403912 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 15:37:54 -0700 Subject: [PATCH 13/24] oops --- src/calibre/gui2/actions/add.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py index de2e7aa2f7..c563e9870e 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -259,12 +259,6 @@ class AddAction(InterfaceAction): if hasattr(self.gui, 'db_images'): self.gui.db_images.reset() self.gui.tags_view.recount() - # The formats of the current book could have changed if - # automerge is enabled - current_idx = self.gui.library_view.currentIndex() - if current_idx.isValid(): - self.gui.library_view.model().current_changed(current_idx, - current_idx) if getattr(self._adder, 'merged_books', False): books = u'\n'.join([x if isinstance(x, unicode) else @@ -273,6 +267,14 @@ class AddAction(InterfaceAction): info_dialog(self.gui, _('Merged some books'), _('The following duplicate books were found and incoming book formats were ' 'processed and merged into your Calibre database according to your automerge settings:'), det_msg=books, show=True) + # The formats of the current book could have changed if + # automerge is enabled + current_idx = self.gui.library_view.currentIndex() + if current_idx.isValid(): + self.gui.library_view.model().current_changed(current_idx, + current_idx) + + if getattr(self._adder, 'critical', None): det_msg = [] for name, log in self._adder.critical.items(): From b6b942b617265e0b0126f116f07c1efc5ea887da Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Feb 2011 15:38:52 -0700 Subject: [PATCH 14/24] ... --- src/calibre/gui2/actions/add.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py index c563e9870e..f99e48eb2b 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -267,6 +267,9 @@ class AddAction(InterfaceAction): info_dialog(self.gui, _('Merged some books'), _('The following duplicate books were found and incoming book formats were ' 'processed and merged into your Calibre database according to your automerge settings:'), det_msg=books, show=True) + + if getattr(self._adder, 'number_of_books_added', 0) > 0 or \ + getattr(self._adder, 'merged_books', False): # The formats of the current book could have changed if # automerge is enabled current_idx = self.gui.library_view.currentIndex() From a3e6f415190b486c361741b565b8582d0166a395 Mon Sep 17 00:00:00 2001 From: Lee Date: Mon, 21 Feb 2011 14:34:16 +0800 Subject: [PATCH 15/24] added divs to the list of block level elements which sometimes must be swapped with p --- src/calibre/ebooks/mobi/reader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py index 9576ccb637..7a566776d7 100644 --- a/src/calibre/ebooks/mobi/reader.py +++ b/src/calibre/ebooks/mobi/reader.py @@ -485,8 +485,8 @@ class MobiReader(object): # - lxml and beautifulsoup expect/assume a specific order based on xhtml spec self.processed_html = re.sub(r'(?i)(?P(<(h\d+|i|b|u|em|small|big|strong|tt)>\s*){1,})(?P]*>)', '\g'+'\g', self.processed_html) self.processed_html = re.sub(r'(?i)(?P]*>)\s*(?P(\s*){1,})', '\g'+'\g', self.processed_html) - self.processed_html = re.sub(r'(?i)(?P
(]*>\s*){1,})(?P]*>)', '\g'+'\g
', self.processed_html) - self.processed_html = re.sub(r'(?i)(?P]*>)\s*(?P
(]*>\s*){1,})', '\g
'+'\g', self.processed_html) + self.processed_html = re.sub(r'(?i)(?P
(]*>\s*){1,})(?P]*>)', '\g'+'\g
', self.processed_html) + self.processed_html = re.sub(r'(?i)(?P]*>)\s*(?P
(<(blockquote|div)[^>]*>\s*){1,})', '\g
'+'\g', self.processed_html) def remove_random_bytes(self, html): From 7324d989d07fe0b841f5c6f677273da1056443e0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 21 Feb 2011 09:25:52 -0700 Subject: [PATCH 16/24] ... --- resources/recipes/ming_pao.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/recipes/ming_pao.recipe b/resources/recipes/ming_pao.recipe index 9febcec0e5..bbdbbf7ace 100644 --- a/resources/recipes/ming_pao.recipe +++ b/resources/recipes/ming_pao.recipe @@ -31,7 +31,9 @@ class MPHKRecipe(BasicNewsRecipe): oldest_article = 1 max_articles_per_feed = 100 __author__ = 'Eddie Lau' - description = 'Hong Kong Chinese Newspaper (http://news.mingpao.com)' + description = ('Hong Kong Chinese Newspaper (http://news.mingpao.com). If' + 'you are using a Kindle with firmware < 3.1, customize the' + 'recipe') publisher = 'MingPao' category = 'Chinese, News, Hong Kong' remove_javascript = True From 2e9c93e33cba197e207bf3787a8bf5bfafaa1c60 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 21 Feb 2011 17:07:43 +0000 Subject: [PATCH 17/24] Fix #9090: Browsing user categories over OPDS gives 500 Internal server error --- src/calibre/library/server/opds.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py index ead7cf1938..72a802eaa9 100644 --- a/src/calibre/library/server/opds.py +++ b/src/calibre/library/server/opds.py @@ -313,24 +313,10 @@ class CategoryFeed(NavFeed): ignore_count = False if which == 'search': ignore_count = True - uc = None - if which.endswith(':'): - # We have a user category. Translate back to original categories - uc = {} - try: - ucs = db.prefs['user_categories'] - ucs = ucs.get(which[:-1]) - for name, category, index in ucs: - uc[name] = category - except: - import traceback - traceback.print_exc() - uc = None for item in items: - if uc: which = uc.get(item.name, which) - self.root.append(CATALOG_ENTRY(item, which, base_href, version, + self.root.append(CATALOG_ENTRY(item, item.category, base_href, version, updated, ignore_count=ignore_count, - add_kind=uc is not None)) + add_kind=which != item.category)) class CategoryGroupFeed(NavFeed): From bb01af94624a931c666e6ce82cf3a886529b2318 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 21 Feb 2011 13:56:39 -0700 Subject: [PATCH 18/24] ... --- src/calibre/library/database2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 305d1581d7..bd89e12044 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -2356,7 +2356,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): rating = int(rating) self.conn.execute('DELETE FROM books_ratings_link WHERE book=?',(id,)) rat = self.conn.get('SELECT id FROM ratings WHERE rating=?', (rating,), all=False) - rat = rat if rat else self.conn.execute('INSERT INTO ratings(rating) VALUES (?)', (rating,)).lastrowid + rat = rat if rat is not None else self.conn.execute('INSERT INTO ratings(rating) VALUES (?)', (rating,)).lastrowid self.conn.execute('INSERT INTO books_ratings_link(book, rating) VALUES (?,?)', (id, rat)) self.dirtied([id], commit=False) if commit: From 750d63d1820556a13615a0001c45fccae031a773 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 21 Feb 2011 14:31:26 -0700 Subject: [PATCH 19/24] New image for user categories --- resources/images/tb_folder.png | Bin 0 -> 6476 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/images/tb_folder.png diff --git a/resources/images/tb_folder.png b/resources/images/tb_folder.png new file mode 100644 index 0000000000000000000000000000000000000000..014529be3db5e6f7ddeb0ff8b36d2ce74f906509 GIT binary patch literal 6476 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 Date: Mon, 21 Feb 2011 14:42:56 -0700 Subject: [PATCH 20/24] Various Romanian news sources by Silviu Coatara --- resources/images/news/7seri.png | Bin 0 -> 249 bytes resources/images/news/adevarul.png | Bin 0 -> 401 bytes resources/images/news/aventurilapescuit.png | Bin 0 -> 627 bytes resources/images/news/capital.png | Bin 0 -> 617 bytes resources/images/news/catavencu.png | Bin 0 -> 1679 bytes resources/images/news/chipro.png | Bin 0 -> 181 bytes resources/images/news/csid.png | Bin 0 -> 340 bytes resources/images/news/curierulnational.png | Bin 0 -> 1337 bytes resources/images/news/descopera.png | Bin 0 -> 686 bytes resources/images/news/ecuisine.png | Bin 0 -> 501 bytes resources/images/news/egirl.png | Bin 0 -> 507 bytes resources/images/news/fhmro.png | Bin 0 -> 836 bytes resources/images/news/gandul.png | Bin 0 -> 527 bytes resources/images/news/go4it.png | Bin 0 -> 827 bytes resources/images/news/gsp.png | Bin 0 -> 367 bytes resources/images/news/hotcity.png | Bin 0 -> 722 bytes resources/images/news/hotnews.png | Bin 0 -> 722 bytes resources/images/news/intrefete.png | Bin 0 -> 411 bytes resources/images/news/jurnalulnational.png | Bin 0 -> 863 bytes resources/images/news/kudika.png | Bin 0 -> 432 bytes resources/images/news/mediafax.png | Bin 0 -> 657 bytes resources/images/news/moneyro.png | Bin 0 -> 219 bytes resources/images/news/nationalgeoro.png | Bin 0 -> 123 bytes resources/images/news/prosport.png | Bin 0 -> 272 bytes resources/images/news/realitatea.png | Bin 0 -> 4052 bytes resources/images/news/romanialibera.png | Bin 0 -> 222 bytes resources/images/news/sfin.png | Bin 0 -> 229 bytes resources/images/news/standardmoney.png | Bin 0 -> 510 bytes resources/images/news/superbebe.png | Bin 0 -> 307 bytes resources/images/news/tabu.png | Bin 0 -> 441 bytes resources/images/news/unica.png | Bin 0 -> 327 bytes resources/images/news/ziarulfinanciar.png | Bin 0 -> 1919 bytes resources/recipes/7seri.recipe | 51 +++++++++++++++++ resources/recipes/aventurilapescuit.recipe | 51 +++++++++++++++++ resources/recipes/chipro.recipe | 52 +++++++++++++++++ resources/recipes/csid.recipe | 52 +++++++++++++++++ resources/recipes/curierulnational.recipe | 54 ++++++++++++++++++ resources/recipes/descopera.recipe | 57 +++++++++++++++++++ resources/recipes/ecuisine.recipe | 55 ++++++++++++++++++ resources/recipes/egirl.recipe | 43 ++++++++++++++ resources/recipes/fhmro.recipe | 53 ++++++++++++++++++ resources/recipes/go4it.recipe | 48 ++++++++++++++++ resources/recipes/hotcity.recipe | 43 ++++++++++++++ resources/recipes/intrefete.recipe | 52 +++++++++++++++++ resources/recipes/kudika.recipe | 47 ++++++++++++++++ resources/recipes/nationalgeoro.recipe | 48 ++++++++++++++++ resources/recipes/romanialibera.recipe | 59 ++++++++++++++++++++ resources/recipes/sfin.recipe | 55 ++++++++++++++++++ resources/recipes/superbebe.recipe | 51 +++++++++++++++++ resources/recipes/swiatkindle.recipe | 2 + resources/recipes/tabu.recipe | 54 ++++++++++++++++++ resources/recipes/unica.recipe | 56 +++++++++++++++++++ 52 files changed, 983 insertions(+) create mode 100644 resources/images/news/7seri.png create mode 100644 resources/images/news/adevarul.png create mode 100644 resources/images/news/aventurilapescuit.png create mode 100644 resources/images/news/capital.png create mode 100644 resources/images/news/catavencu.png create mode 100644 resources/images/news/chipro.png create mode 100644 resources/images/news/csid.png create mode 100644 resources/images/news/curierulnational.png create mode 100644 resources/images/news/descopera.png create mode 100644 resources/images/news/ecuisine.png create mode 100644 resources/images/news/egirl.png create mode 100644 resources/images/news/fhmro.png create mode 100644 resources/images/news/gandul.png create mode 100644 resources/images/news/go4it.png create mode 100644 resources/images/news/gsp.png create mode 100644 resources/images/news/hotcity.png create mode 100644 resources/images/news/hotnews.png create mode 100644 resources/images/news/intrefete.png create mode 100644 resources/images/news/jurnalulnational.png create mode 100644 resources/images/news/kudika.png create mode 100644 resources/images/news/mediafax.png create mode 100644 resources/images/news/moneyro.png create mode 100644 resources/images/news/nationalgeoro.png create mode 100644 resources/images/news/prosport.png create mode 100644 resources/images/news/realitatea.png create mode 100644 resources/images/news/romanialibera.png create mode 100644 resources/images/news/sfin.png create mode 100644 resources/images/news/standardmoney.png create mode 100644 resources/images/news/superbebe.png create mode 100644 resources/images/news/tabu.png create mode 100644 resources/images/news/unica.png create mode 100644 resources/images/news/ziarulfinanciar.png create mode 100644 resources/recipes/7seri.recipe create mode 100644 resources/recipes/aventurilapescuit.recipe create mode 100644 resources/recipes/chipro.recipe create mode 100644 resources/recipes/csid.recipe create mode 100644 resources/recipes/curierulnational.recipe create mode 100644 resources/recipes/descopera.recipe create mode 100644 resources/recipes/ecuisine.recipe create mode 100644 resources/recipes/egirl.recipe create mode 100644 resources/recipes/fhmro.recipe create mode 100644 resources/recipes/go4it.recipe create mode 100644 resources/recipes/hotcity.recipe create mode 100644 resources/recipes/intrefete.recipe create mode 100644 resources/recipes/kudika.recipe create mode 100644 resources/recipes/nationalgeoro.recipe create mode 100644 resources/recipes/romanialibera.recipe create mode 100644 resources/recipes/sfin.recipe create mode 100644 resources/recipes/superbebe.recipe create mode 100644 resources/recipes/tabu.recipe create mode 100644 resources/recipes/unica.recipe diff --git a/resources/images/news/7seri.png b/resources/images/news/7seri.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb805cbb206af3313d364612fa89e020c07e8d3 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE0F&4?~jU-${!<>kg$+H zX(?xzSWK8$&KQ||`Se9ZOym!cYh>~#C}a*3%b!_uSlC#~rtcR9YGW)3@(X5gcy=QV z$SLu3aSV}|8rl~vbXb9dq0+^tS?XQ=txpn{-RkemZ56aj7MLmdXy-L6Mn12`7du=e z$`t&Rv^KC$3K8w7;?n&#F|L(O)A&p5l0ru@*O^*6{BPM-#4r62dnMq_j(;re8|FWl r?jSz-_GaZBM_Etg^L+W9^SMobuQ8{fo89$1p#2PPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0VYXAK~y+TWB5-Y zV4zU{{~>C?-@kwVfBN+4KZqvT3;+K8`+xrY`Txg{9sB?M`Sbq_SFc*P+ML7KQ$@&|A`YP{(t-S4Xa@w^A{Vy*q{r~#a zYYZ1+1R}^qt5&T1@8jw9UqVFmzm%9b*yh`}Z~y=M?=N8kU@G3ce*GWhqO)ht{NJ#C v{r~&-?*0G#`7`kb5F0flrvr3@2i^bxWO%k=VzksT00000NkvXXu0mjfJKNE# literal 0 HcmV?d00001 diff --git a/resources/images/news/aventurilapescuit.png b/resources/images/news/aventurilapescuit.png new file mode 100644 index 0000000000000000000000000000000000000000..f81dde2446e393338f490fb73aa01ae8cbe06ce6 GIT binary patch literal 627 zcmV-(0*w8MP)S(at( zb~`vLtzE%jFc1g`f*=eG+?}3|#$p`?>U4NHbN?$=DQ50e34+htJYU6I;mFb0+2;W zQ502G3xz`K%O`z=B*W34RUHi}szxtBgRKOF;FABEwTJK6{sEE&E@5uRI$;0+ N002ovPDHLkV1jyyDf$2a literal 0 HcmV?d00001 diff --git a/resources/images/news/capital.png b/resources/images/news/capital.png new file mode 100644 index 0000000000000000000000000000000000000000..e5a4792cdaee223098b660d6cd94426d1862ca19 GIT binary patch literal 617 zcmV-v0+#)WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0scuuK~y+Tl~ciL z6HyeMKS`PjCRP`^(CQDA(n3v}SP*n!G=H5av80AaeQA}lVsj{){24m^bZc?_`Z_K(e}11 zbWcuTKYRd1-1A5TrBX?Fe#Q)V;s>Qrw2_LA&Af9P>Pm#f0erYLiAT%Ja9!6gIA#Dc zW|PlbTX;vpPn70836oTr#kE?^7ymN>lhPl(N-1QsS)|ix6pKaL&|f2BUMC5fb8~P{ zH)dpoXLj1}-*Zg4baz;5^!E19oS!GR_FKG_Xh;?=8H z>+0%GpFZ8(+vuCMPDjW{a$;lZQ7-(;A*J`yxLql)gyt#Mpp2cE0 zdi1EZwY6L>-?wjHMn=Y~SFgs$#}6Jn_~5~VUAuNQH8t(uzrUxaXL@>CEEZ>FWfc|{ zLJ(A6U+>`Hu(-H*^5jVxjh30285tRAZ*RY2#}1Rpl$e+p6BAQfT1uzW*Q{CN=jVsR z;evyM(P;F;hYy89;r#skix)3OM@P49+qQS_UM7=SQc@BhA3r!a*xK5D=&&Aof~?*04sU0q#PR#ts|eMLn@QBhHPz5d#@YdjuL zAP^9V#O>R+Z{4~Tg+dvP#+jL!W5vD3m>W_DoDnu-R-Di}ms2$1`WnjEsz!&1OeOM>3iG^yyO@8=K3QFE1@E zeg6D;=gys^2?VmzP`SzSFgT#^JY>~l8=v%t*z~e6DPiX`&Lj;(9qCu>(;G`iV80; zufvBAZ`iN_0D$G?<^THs4r2-YU(^2||MLWZSq4V1G`>!2sKQWuC8N3=Lv$xDPHWb6 zKvZn1M}wKkwGA!z5436lpgzGbnTIa*(FfQ7lPr>@V}3ankiZl){R>ZQq-6UH)4CV% z_K|@Xe_zxNC%H)s{c(Fsa^|62Uy+tPr?0(9hL_Wd->S&Hl&qd8*(5>DAxnnT#^2gi zpdeueU{QU~>sb3y8nLm(9zl~iSrP~4C!F0ymO%+sYVb#!os?HWy#UD&_LEO|6vDKA zECxLeX^f2cTaoD0 z&4FUdw#on0qkaIDl{hlQRmS2SnksQILdfWZYn`k?u}m5mmQ%DCLuyN1Ho$PULnH;3 zifK$FWK!7x7$H%rQNW@BL1Z*9#bRvWN zJF?*+;Z)gV4F;~Ct@W#*X%N5)c@Wo*!XcwM%$jx-DqIe0;GirpBs`M@{A}a-_pfz$ zHxFSozo>fv=4CHayjgF?m=qiWoe3kBcKu}(vMh^ACt!TGiby!9Gaz?NC^0~~B+Vf7 ztJ4c?98PNy0r?h_!8^Jv7ea+VMXMAmGPCH1-JK$|fMZxs4untcW~QQl(unHU!6P96 z-Stda!!m0CwJSy;6rd@>DAS5nGIA~a#~JTbPMiEk#RBMJRytZ)gz7-LgJKBfWy&Ve Z&?dUkN-Sg>!DP%IUq707(Wwv+{vU=2fjs~K literal 0 HcmV?d00001 diff --git a/resources/images/news/chipro.png b/resources/images/news/chipro.png new file mode 100644 index 0000000000000000000000000000000000000000..1a3091208ff6f9cb602510ed22ac5790ab539315 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=4^1{rSVha^%pFmZp{# zCYGb@4-J8$j3q&S!3+-1ZlnP@fu1goAsjPJdoS`fIB+;eK3v3|agK4y?1l#%Z}xZT zKKNag86}__bH%TyGkt^8GX?9^o%c00WcQz${wYCZO7H8KNc9P?9I{M9UiG0!dR4ZHx1pD*&R2M>v|Nl4Jrddv_=`BQY6{&6%n5@%Wnhn*t~` z14&Z|M{@%AC8=H9-yR3pdI4{}r{rC3R*_Ae_0-=NHh&7DeU0JRY`tJ__gsK%>WTUN z;hE29TMQs+3hSv)H1RUc0RP^DUjVgH8K)Ddl$%u~P0a5-|0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1kOoBK~z{r#h2Mn zRaX?o@1M}dq{bJ=R7Hbjx>QZ95*sbfpcbl#UO|krhNz%8p(xN2M5Umuh>D6RVQ2}| z0a2t*h|(&yQf*_j8e`g|P5Qd(Z#A17?l~vDm>3>*_Bm_(_P5qv=U&gd@q45z04kdA zsjUq_=BXxGdZ4zOwU>9@2NW64&1N$r%6& zPW(>X?ykjY2xOJ<3@ZR&?|AZ3*)Vo1ioR7A3;^S6^!sYB+W`>hV127(oxUuTV*VFr zCB5{#z(DYdLY1v7s*|-})ytB7HClfFK;^G5{uF8+ms6qgb8Wv!#_@|1zP4Ca71t@N z=xJzTI06`wyjKH~@K8gmGSS%nSQm67E5GuiR9}0b&j7)mQ$2h2m&E5*DELiBFUTK% z|08v`9?I11Wm4JFp(QH2)GpE6jtlj71Tb#HVM+bEL7hnSW!+5;)b{9iJqIZkmeZ4YxZrFaQX|>CsyOw01tz zTj0yD(u5oUkob}8WYZ5CCo!*5^^O3bhx#x;pq~UJG7iXip0nq)6JQPhV+}iJMDp05~y8VzbJ-k{b{(cdYTQCM7mZ zI0B&d{tRFUViH`r_nQW%A^jOJO~wHjKqfi66#y*5mLq`4TaRfESQ#(?V1U{01b{nE zGjjE?!^Z#s3_8OA~mYOX1Is6>t* z^8*Gb12)u|-7r9DxWX*vNX_*JI;y*UjG%-m2SS2zcUjPyeWqDTFWgZ*1Iy@1FeoWs z0RV_*#fO8C3`U8^A$X@30Eg|Um4)`NA5q*0L23o&=`$@=db)xVwn

ZV5`vl!(`RaN-W#LzA*3c+pPPMW$p+ zi0{8=bfXsSQXO(+*!GLrD4xDi3#F$kbnY4%zc@p@^VUmLQihCKut6p)-XtISHtRF8 zsN^j&Zeg0r(2Y$@*Y)v|EvmtVB3ST$rJxtdnIad!ogtd~|6+ zm!yPvg^FN&fOwdV<;HuiiD1g1ZB|-OSY1PTVM5r$m(HAp7!?l6;^sK zRcK$3n&05yiH&vq+@_+Wnh-=^x}a@3bBB3&Qd4esFlc`rR&fh6Nk>~{AYXnWXo;4O zcWjS|CUcnX&!oSzfmdi{H&b8c=H(VcT3v8>iI?KWMw_2;xa=(BGDYV zN;XlJdVKn#T*>l4{Q?H|Iow+O78;!HIo5vW4AF5sfhIyik{&8v9uAJlg$!NW4E-o&v zu6eF`wyuGu{tP18k&ZEeKrxq?B1Zvj76xC#_+Upz$H17Pq98^sT?qyTv0}gAU}k3K zVC%3%-B^&*vx}3H{rvorlhcc{jX|C<4k#{ma&jszE><;$`d5O*+sC;eG!?`K0Bq4W Uw*MwodjJ3c07*qoM6N<$g6DxOrT_o{ literal 0 HcmV?d00001 diff --git a/resources/images/news/ecuisine.png b/resources/images/news/ecuisine.png new file mode 100644 index 0000000000000000000000000000000000000000..0f4c5ad190563779770cdcb1eba8a13e943c430e GIT binary patch literal 501 zcmVQsy`$K>Wf+HV_2#|r`{cdJjDaHGu}xqe7z6G%(_eut zV9j#9n(Q}}=24&kq*QQIHDJPWz1{x+zGLqIqpfrI%p#fLM*vicy9DdcWY9;;^(FvB zvpFv}w{`U-&Gp|EO7C8%lZ^Y0{S-j>j@<>U$kiJ?car$;!5;NLRoyzzeaAKhu+W;M zrLY_%amS#IFw;7K02T!BSgnMmpZxk(OwQ>CBRT-Um;eTJmEcvLFgOMvo14S9W$J8q zg)R&6<(0QL<5|r#H~ac^wv+(&u7gy*d`{vfuUylJMbR(pnm5I3)YCqmp}s)00000NkvXXu0mjfE- literal 0 HcmV?d00001 diff --git a/resources/images/news/egirl.png b/resources/images/news/egirl.png new file mode 100644 index 0000000000000000000000000000000000000000..d697e45e1b33f8ea6a71e36fd26fd1884dc43b8b GIT binary patch literal 507 zcmV1vmN4z_)ND_k5Orhw|wQdd-Yqf)wDpnmF+#GdOa8Rr`sI-WRq&hfBbgFSF z)F^HiqXdaRi4`>FPmG$oOE}_jpF^ZJNHNgCcYOKYhwm>SBElM^tR?*a0lx2}{;R0n zZsWQxhGC$po$}AcBDq|SP$;xI;9I>;CX*rmE{|)G6a7fNkNn#uX0A^&abQ0Hft6>>X0uG4J5Nw^=^yqP zjO^j%{6_)|a;Xb0#O=#=2u8@;j;%CL_06fnV1e&cT zilShe=Bg+4?KYL;^LXVZ(X-p}%Fdr1^rEkq7v;my9kCz0U-o+bM6c{%-F<^%1~JD6 xmi?Xq-xFB?f?Gpfe$Rl`lOh1xw#{8#{Q?)U2RpLKZQB3<002ovPDHLkV1l*n@_YaQ literal 0 HcmV?d00001 diff --git a/resources/images/news/fhmro.png b/resources/images/news/fhmro.png new file mode 100644 index 0000000000000000000000000000000000000000..4eaef06dfa8ae2331641f33727d2f9350fcf0b1d GIT binary patch literal 836 zcmV-K1H1f*P)Fo<5X#FtiJPc?do zWfb>8Bvw%gnk+SgsJJaNDJwDCWVx0)Zezyg{Ce?@OVEJ>=XcI`e*E}xJ`e<9)L<}d z@I3#4VVHO*6!HN81^_%XG}IXg1bS3FJw3gjVVF3}vfn9+O7cAaUN=5Ie#C4xXM8^2 z?L;DBU0ht;1=|r0hmS@gkwYq8T3V`2BobCZ5XL$?JMWPsnJ$I@L|t9o!o)#`UGA@^En&<2^l>WrDz; z1z~hG9QJ5?GC|-)QM~iX<(gD+(Zrp-y@4He`==co_a!+naA9M1wmuaMp3|x;sjB*= zjExBeMKKe4eGcdIhN6k<;c&;#YuC|>6z>86nD*^^S#$O3c`ZSOAdCV4lslbobO>bu07@?U{bYGl)2oWs z)@SU9i&3yNYkH8(#m+p}kuFc@+b2M$b?QdG)(`0&$Gi)D@UcpmC&YT`zl?JFRJ zervP8zrSCLMNzyZisCJv=if<^bPOT%yREJ5NgxpDp=tU@Nj{&ylF#Q2U0q#Ldwct% zmX?+m6h*C0PENMkY_^5&?(Q3fLP0+~Jba?8tZXA1jW(uIDLR+S87nI*(*WBag{J8r zEX#fm27_l;R#qqgz+SKSKE@bEMn;aP?`msnzp1s~@4sF&v9GW1k|asT-EQ~ef6uz1 zp&_b0akX|jov(`urlzKvF~)!~hJO`oZf*j@FmV9Du~=-Ux-&mN&;12#Dqn*^g`8vn O0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0i;PpK~z{rwUf+>7SFWZo4n> z(0Et(KlhKn_3m{9AP&>#`|bS&LhBt6M*uu(-Cqts2a$TM~1-@UdZ zp!Qk^m{^}gA7IA-s5^m(jmsIxjK=RS^?*k&oihNtJ{U=`13*$tt7Hp+8&PMOFW8U? zB?ArFRmu^7)ghw00wB3$Tu;*yfJe^=X*#jNI>CbkF!RRyN2MLfx()vO{1?11_7PI$ RqXPf{002ovPDHLkV1mh}-CO_w literal 0 HcmV?d00001 diff --git a/resources/images/news/go4it.png b/resources/images/news/go4it.png new file mode 100644 index 0000000000000000000000000000000000000000..6bf21ddc946d30b227aa8fb85a11f32e7475e409 GIT binary patch literal 827 zcmV-B1H}A^P)i)q?j+U<*s@Texw6D&-SbwO9{fg2$fmhr-fqMM<{+9SyJ zFuR)!RS#bu$IGu^rXM2e3=tipOAFl2@95+j2yoqtaNvG~oS@2l41a!xH+`G3n$irO zCXh4Y@+Q>FgnxVhW=3=8GEJ{zAa4=vd<2tI9L^p_8kJG)e2d5uigblSKSNy}#5H|r zE%W^i*!zl3EK{w%M{>`bnC)$UB=0;l;3S*^#PL3GVUVw zqcuV=L*3rQe*G#zI|U9C#_PyNqqOqKpF9QO0?9OC^2B50S2u_^Kc>xQi1pL>OAnA< z-{iL&-=lq>qYu8sWc6{}rEgHW*+QQ?hktMt_tfk3W;amRzJ%%~ey$07Ct#`1k)>r; zPP`0+R01p@lMGd>6*7MdbN*ezAKvG$>NbZO!IVcaubkz+VPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0R%}zK~y+TrIRrV z0x=LpJ&bq<3kwT-3v2NJ79K#b7O$|ijqSEJV!5TDg`lA2iU@+uO3Yh`&ctLvEQVy+ z$^Uicm#7)YW3G&m-t)5sW7#irMd14#MoLjb6XD)1$j9$ar91$Lix+7%|+pK=Uo zB8nKtzcpo|909js+YI`ZIZ*(T{cW6;jiLEs9t6`lu#Cv28L$vw)I{zV*{Lc z48st0U6(7B$~}xRO;MC5Nz#{OGFcKu@o;Qx>~4*(F3<9=zHHVcFh zuq=xcMe!>D5C9-EGc)_mW|JM3cY1mni^XDfKQ5Qcy`caAR8@U!7{-0SiLxwznwXeq z4L7&hY=&LeMZT@;`W#iS*Q1-8n@{=!7Zw&i+!)O@0mhj2?M|n|P{+r|cWbp8?>jk; z`yG$RYqt@YrWtb_C)n?!8jVJ@)oQW6LlA^YFc@@(le^t6RjpR+qM}+QFh^aw)uSiHO6>g{Gzgp zaXt=&5WpCNs;Y~EARGYz$!4?b#bWVcu~aq450T;sW)*Zp8o2 z-EJ2Q!??e_z5Phjw7Kg}15MM8qA0tmRH`Hhf-&5m|0hg>``+J~$N&HU07*qoM6N<$ Ef_#HPWdHyG literal 0 HcmV?d00001 diff --git a/resources/images/news/hotnews.png b/resources/images/news/hotnews.png new file mode 100644 index 0000000000000000000000000000000000000000..ea00fa094ccc154268b88c497b0cf0a0832ffd06 GIT binary patch literal 722 zcmV;@0xkWCP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0%u7?K~!i%?ODBY z!Y~ZZ%kThw3!bBE?^t*T#tsb344tyEaGe=CGBGiBVCGmmsQC=?<;TR58(-{Ra;Hlm ziSm7tEX#61nIA>w_-P_Awg)E<{5ucaZZ|rg&mF=4+T)q7%jIHK4HrT`SHcJP`#sH< zM8)gIo^f54rMa&;V2H(H(a-~3tJTWt3L|hm5kYWN!0CHuegoik`$5IarYW;!!DK0Qk>&KY@x+-D-a#0OP0#05Dseuge)xS#bvmfXDAX4^$sr zuh;4ja(W<$0DuDI>HQ9x34nx=)Cj=RbupkBtm~X20k$^ICQNc8&+6|jOicc2F^agbBDvBTS`2g z$QZmT_T>ajeN>eIYH8P1P67b0$~x^Z@@Jt=f#(7y{jXCCH3o2BzJGRaYyw;!B7Lf| zk1~X$7WO^otVZnsepH&OfjqVc>=+0EFRMl|c(K^g2r`#*?2Iu6;;#p|jEIy*;}hWZ zZMFm=590V9sL#ZK-;FTqQF)&DsqPfW*c~TOT%2SeJf(K+xQW z^0o+Gb3WqJ6@@@3*pT-o0wGo#@}0>8Ls~OLSN0zG1yknM+d{)tbpQYW07*qoM6N<$ Ef|&I;X8-^I literal 0 HcmV?d00001 diff --git a/resources/images/news/intrefete.png b/resources/images/news/intrefete.png new file mode 100644 index 0000000000000000000000000000000000000000..c0e17c335ad14e7f6eedbab55e90665764109f20 GIT binary patch literal 411 zcmV;M0c8G(P)f}%;ZvpArp1`ocZ-Dl7W;OE;IW9p@d9wb3;CR zO0Gx9#{xoJiqyjd*H3UO4BHpfvTV2v;SoV2RY=FyS2zRlatq_wauF0sO)+T>iv^3p znSpXRG9S-mhwTQCf!}P1vcM(u^APx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0`y5lK~y+TJyJ_g zlTi@;z#s~;aG{ACNm`H%Dv1kB42j0*!stTd0&&5Dl|)P+2~&^~>IiL`7?67E8i zo{iCW<%mQg6z6$+dwT?a=O>Q|Jg~pNkE6pw7+=4^_$38FU)O-xh7a4*a|jqrI5;?< z!cZ`X?Z0}+Is?UoTLuTOegKHdoY=-L`dF+aH`H*^u4cv zJ%On+h;2Qj=&$?^bE1;o92xf!bh#0BdoY)jj&LXhfiudoOlpDBT1fFqf~8qS1aeg) zj4ukXn)!&{eGhW6D>`AkkbYv~Y5V*P6j#G1up|a&YY!P0u55&uUyLv-a$mUvUz`#< zFAHHgpH9NG19dM($5cg}#>!VYU zS;FR~pW5}8)t;@<+R{mHT!0sH@G(xsI58&^98L)>DmA8N=AkdELF+{&IvIu=enND( zu()J~eqjlLzz$~hiv*Xnj)g@tR@a;mycRoD-2>?88N@`%C)BeaR++58P*)#RUH#C_ zFOh&svgk5 zW*0FwIfK!O8H`WOLT@l)(YTC(;V}r`u4ke0W)4OkK1X|M7Bu;V2yA$0c0RM!whDw069N9*oqs+>|z)tYWn6=JbRX zjO@Ya z?9%L{R;t89m9v_o7j4{h%2Mq|ZG19>4gNv4)f^vHT zUR2Hy(Ar1Ut&z_JcN{l-Hf1by%!K_m a-~Ir{dKyazE^Y$=0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0wzgBK~y+TrISlY z)KL`1r>AaQ20`>N7iCciHDaU`1)`B*kOQ@d%A(a&n*xK1G^|mh8W(0-YFdg8l(?!z z1Qi8E2t^@TXhV-}>G%r$^n>;!tgJf zM}}c)D#`8qk%SjBWb@eQ^u7^vG(*ug2<1az9+ZaQQ(uxGJ^;t|LqRT-6u{1{5UqlV z36J2yX;F!5fy~WwWOo~q1U+4_(A)bvAK546qaH!kSv$OTu@nU5&xLTQGU#eo0H`ou4x*;tU@)W#dll&Bj-GLupVDp+8u26l>zzr*)?;U&{gy1Sk7nbJm z<)&=lqw0}qu_ydREI(yn`XcCkX_Y^)$1rClD%|8Gyzhm~rG_0iY1ChZjgnhj zWLezk?vPx)N>I<**=*Q1DGL=#kzOTo-q(rGAHzizE?TMJ7P#MThptpWjSA`f2O^BM zLhU7}RP3!N^u#;`Z(l>J-oNc8G)hffwE}9P{kBYR-z2}T1{$uxJ#}bj6SUlzCJEsF r%x`sELLVrh592<~KPLP?EE)3$?b|qVR_2`_00000NkvXXu0mjfv?U|D literal 0 HcmV?d00001 diff --git a/resources/images/news/moneyro.png b/resources/images/news/moneyro.png new file mode 100644 index 0000000000000000000000000000000000000000..6112dddcb602b23366379aae18b3bcb6403815c7 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBV1cKLV~B-+@(+K-garZr>o+jI>0VlxG=sIz zf6@QN$rEJam_KB)Nw!^QNHTeB(hzYrf>$BTSmTZXkAkal8{?8JH^T;*vl46x-RTh_ z552S>82tGCU*Cze~)@o*5xtbN4uSwk^8B%E0BOu&VoYzyqM&44$rj JF6*2UngHanMN|L) literal 0 HcmV?d00001 diff --git a/resources/images/news/nationalgeoro.png b/resources/images/news/nationalgeoro.png new file mode 100644 index 0000000000000000000000000000000000000000..b268af14e22e3991dadbf7e92601f4bce317939f GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uK$7H%*_91jQ^iu5dCD8 z4islB3GxeOaCmkj4akx8ba4#fn3?2OC7#SEE>KYj7 z8X1NdnphbaSQ!}W8khqaE{SD@C>nC}Q!>*k5gH6ajEt=eOsxz|AR2a_=oAHNVDNPH Kb6Mw<&;$TmbxSb- literal 0 HcmV?d00001 diff --git a/resources/images/news/realitatea.png b/resources/images/news/realitatea.png new file mode 100644 index 0000000000000000000000000000000000000000..032c4d100e3d5d2a140d892abbdae43d38375603 GIT binary patch literal 4052 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 literal 0 HcmV?d00001 diff --git a/resources/images/news/standardmoney.png b/resources/images/news/standardmoney.png new file mode 100644 index 0000000000000000000000000000000000000000..101adcb6bc4b8e2b775697a42c539b8448beb2dd GIT binary patch literal 510 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0h38YK~y+TWB3mQ zU%vnRzijW7|H(aD{`*$1BnpGnF5G$X|EI4%Kt}v$02z`$WhYUZVV2kzF8VJUKIuP$ zQ_FvYwAugPfBycT0pt>5UEy4^1a1Jx5EyP)c<4U^F7HfOd-DI~d#}LG27ymsfBrvs z@!|gi7ajtAunTSo$S{Sd$^RL!xd!A)e4u{8K@@|)F2iQfm+!y8=Dc|K<-ZIxEI^9& zQ)mC*f8oLZ_>N7)83c39!d z{xv62yo=!~n2S8hm;YyVYr`83=WoA&8-~*$WG{iD7@U8Q0ym*^6JZyDl0LE~m_fJ_ zrGM=zOqYYQ2rL7_3}0Kd;BY*qd#$^ZZW07*qoM6N<$fP)t-s0002& zlEm!3-0Uip`~r;Z*5v#il>7>e)JBy228`sE#O$Wj+$xOhQl$I>gw%?()WX#CB8>D7 zjPwG0ytc&T8jR#Roa}D23G^u41m*2Xi>pnJBBaPgtKVB~5*ve&3EV>I+D5295UtSF8X4002ovPDHLk FV1hC9h7SM$ literal 0 HcmV?d00001 diff --git a/resources/images/news/tabu.png b/resources/images/news/tabu.png new file mode 100644 index 0000000000000000000000000000000000000000..cbeeda53c5ebd95ea48811d0989613c39eefc244 GIT binary patch literal 441 zcmV;q0Y?6bP)6pac2(!c;2A z$}$8#y0M8?Dro=<3!tE3n4l%KNv$FU2Lc~Xj*-QsJ_XOuv4_SP_WCB4ov6?tAiKJZ z?jL~fp`}T1oOFm_s{6wKBp+36}o5$buM7K}kZJ_yb)V0#DC zZ2oK^nw-Kk8f5o&$;{3`E(cKrjzgweMd#gN%=%Jrl#D jCBB>%Tqw8${oeWphrpPvWdWP(00000NkvXXu0mjfTwuVS literal 0 HcmV?d00001 diff --git a/resources/images/news/unica.png b/resources/images/news/unica.png new file mode 100644 index 0000000000000000000000000000000000000000..87e2d8d7805d1052d9eb57170f3950f35cecf8fc GIT binary patch literal 327 zcmV-N0l5B&P)h#Sq0}Hhgj z?24@122_Fkj8y;t00DGTPE!Ct=GbNc004tYL_t&-m0gbk4#FS|MaL=*#W)@6iq$Sm zxc?Pp0+Ovs)8ys9Hf>;2O>Aq7h(ict6F3tN46IR333Ly148jpj|Abxu(jg}ZodR~U zfHx&Y7Nz?syi#;ZR7ET3D~M;Wv-Nl^JI3}U_488`Y8TpYGW!rR0OM~L=>2_E8En5@ Z)faZu3)CRek#7J1002ovPDHLkV1il>lb`?q literal 0 HcmV?d00001 diff --git a/resources/images/news/ziarulfinanciar.png b/resources/images/news/ziarulfinanciar.png new file mode 100644 index 0000000000000000000000000000000000000000..514d041a36fb76780eef65f621f0b9757891881e GIT binary patch literal 1919 zcmV-_2Y~pAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf2NX#}K~z{r#g=#hda31%6@o0V%kuvAy?23F7fS!pojLwo?mg#x?)RK~ek*eP79!Jo z-gPmVTNrPc1*2!+^)coa^7QE*0oTQ3ZUtcUoDG9^CX&QWS8R#G6RBc~QZ7;GkRaTz z*iwZL{ccxfR{*K*(_p?O7$={71I5ywdHsK_eDx;e`Y(jh-5-^2Y(@2kFef|pPB>0~ z7~!zZpQGm8U4!dKXN5AS&%Xc%#26e4c??(k$$D!uz7-R%)(uI|y^6i!24s8R?NA_D zjKz0zA5np9wsvI4?MHUh9^`(r7f1K(h55^`P?)H9Nff(wBcg-`>Gwa5>daiH^$Tat zA#CmfLDJBjd%Y?dF$Q%`bG;u4k$IU_S-;GWQ_HNpS&D?iHH(UAtxa?)8_0#pI5l-JD zZhq>9rD~=k`{uh)otBC42cBT#-hwPy0uurBZqt!HF$Bh^U%?j27Nea6v&SqLbb*K$ z9;n{9%PDxPy&Z2(n8~i6sBS?50Scdd#RVXY09gbu5WwIOhzwl-zNV^?R4t7Ml!sRU zX`W2x=8JulD?xaxD`H?^y~YQrIzL#?o_7kK5)p+BJbjLi`xrct00ql0SD+rw093)l zAL*JIN?93S=2id>LdP&Nk~B?zCv5`jRJLZbO5WGkr=FIU7HsgIjs5J63<=J?Ny7rv zxd0608F;z?4Be2zVIfP?T>pzo+}jV3u{#!T^YqznjuSZm#tbUpzy#{+`T?|lJdo^@ zi9FC~Dk^;fm7fC0@Cs3X9BQ)m`#9MOSG?ww+}72J_x$FwqerVA8SqIYK>o7Tj=lW= zwKX-^L6yv6DwBI5C+H#MFL{v)2SD#WQ~Ao=!vdtR_Q~vpi)Ga+Tvu0@dgde~W4%1R z))`p#K;F_-YEO4RLRDoIKHwqJxF)Y@Q$Z;jxfbm?lYf)FH3EQ?M|S>+hhK68?Cn+c z??NB8&0mCQ_Jx@W4OMIaK%Ty82us?~oAzWZjb} z-TCkGl#|_VSI;AQ1Ktv&c&%iE4x_;G)#%~A&Yms>V6(KKs;~$@=H)}G(ap8G@=AQ7 zn+D^50VME^_(SLmDrpA;b$55Gz#q)xIHfXXDs*TVfa8y@R7pCz9pySzUV$}~{!_jw zxAOT%UJ=gs*b(k20fv;o=pBMX>}F|t&Voda&9lZMDu~r;RnPpR$FPp4H?esJ_6~g} za=7FKKMZ?MH`>{#@>5=3&TBXUxneqN?v1QDix9E+DMU~K6K9L`m$}8i0P^0CMeaSz zVCTv0Jh{E210AgWj)hAR!G<#P-j4*3b;pCSb#}no=_px6Svfx9B+TTY4D?GNOf1!v z{;8e;t^j)N3-4VFOf?#qBW)O;03$$_S(CKaTJ9lVaJ7{xSBE=QjvYbmS$ z0-Vn|juWrFk9e(@dKYAeEP;i|o7-9ycu8^bl>;PkOq!1s6H*{6Xt4s!jEl!-{B3xUY8(xH2F-RGnpipsP;fkt-9H+KHNGR3 zZcqU^qbtIq&_>6L4HwbQVNzXLi7iutknSA>^OSpF^r780ANujWC|b8g0T{wRXLH`j zQR|NUmFr<)=^CkCJD>Hx{fg+xb9n;_aVcANL$`o8bbX0MfjJ zk)#=q(#RN;@>fhjegO(j>W7)e{T2-`*z2$jAM|_#!d0?b26D*82FErXFspm4i1bR?ChOaVB5Jj zOgkA#9=?dtOkusfT>NCb?Hc}O)Hw#&K>`dlnOgxQOEONm47aN@( Date: Tue, 22 Feb 2011 10:56:01 +0800 Subject: [PATCH 21/24] handle soft breaks as defined in some mobi files --- src/calibre/ebooks/conversion/utils.py | 39 ++++++++++++++++++-------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/src/calibre/ebooks/conversion/utils.py b/src/calibre/ebooks/conversion/utils.py index 3559f13440..52fc537e3c 100644 --- a/src/calibre/ebooks/conversion/utils.py +++ b/src/calibre/ebooks/conversion/utils.py @@ -33,7 +33,7 @@ class HeuristicProcessor(object): self.any_multi_blank = re.compile(r'(\s*]*>\s*

(\s*]*>\s*\s*)*){2,}', re.IGNORECASE) self.line_open = "<(?Pp|div)[^>]*>\s*(<(?Pfont|span|[ibu])[^>]*>)?\s*(<(?Pfont|span|[ibu])[^>]*>)?\s*(<(?Pfont|span|[ibu])[^>]*>)?\s*" self.line_close = "()?\s*()?\s*()?\s*" - self.single_blank = re.compile(r'(\s*]*>\s*

)', re.IGNORECASE) + self.single_blank = re.compile(r'(\s*<(p|div)[^>]*>\s*)', re.IGNORECASE) self.scene_break_open = '

' self.common_in_text_endings = u'[\"\'—’”,\.!\?\…\)„\w]' self.common_in_text_beginnings = u'[\w\'\"“‘‛]' @@ -451,8 +451,8 @@ class HeuristicProcessor(object): return html def detect_whitespace(self, html): - blanks_around_headings = re.compile(r'(?P(]*>\s*

\s*){1,}\s*)?(?P\d+)[^>]*>.*?)(?P\s*(]*>\s*

\s*){1,})?', re.IGNORECASE) - blanks_n_nopunct = re.compile(r'(?P(]*>\s*

\s*){1,}\s*)?]*>\s*(<(span|[ibu]|em|strong|font)[^>]*>\s*)*.{1,100}?[^\W](\s*)*

(?P\s*(]*>\s*

\s*){1,})?', re.IGNORECASE) + blanks_around_headings = re.compile(r'(?P(<(p|div)[^>]*>\s*\s*){1,}\s*)?(?P\d+)[^>]*>.*?)(?P\s*(<(p|div)[^>]*>\s*\s*){1,})?', re.IGNORECASE|re.DOTALL) + blanks_n_nopunct = re.compile(r'(?P(]*>\s*

\s*){1,}\s*)?]*>\s*(<(span|[ibu]|em|strong|font)[^>]*>\s*)*.{1,100}?[^\W](\s*)*

(?P\s*(]*>\s*

\s*){1,})?', re.IGNORECASE|re.DOTALL) def merge_header_whitespace(match): initblanks = match.group('initparas') @@ -485,6 +485,21 @@ class HeuristicProcessor(object): return html def detect_soft_breaks(self, html): + line = '(?P'+self.line_open+'\s*(?P.*?)'+self.line_close+')' + line_two = '(?P'+re.sub('(ou|in|cha)', 'linetwo_', self.line_open)+'\s*(?P.*?)'+re.sub('(ou|in|cha)', 'linetwo_', self.line_close)+')' + div_break_candidate_pattern = line+'\s*]*>\s*\s*'+line_two + div_break_candidate = re.compile(r'%s' % div_break_candidate_pattern, re.IGNORECASE|re.UNICODE) + + def convert_div_softbreaks(match): + init_is_paragraph = self.check_paragraph(match.group('init_content')) + line_two_is_paragraph = self.check_paragraph(match.group('line_two_content')) + if init_is_paragraph and line_two_is_paragraph: + return match.group('initline')+'\n

\n'+match.group('line_two') + else: + return match.group(0) + + html = div_break_candidate.sub(convert_div_softbreaks, html) + if not self.blanks_deleted and self.blanks_between_paragraphs: html = self.multi_blank.sub('\n

', html) else: @@ -523,6 +538,14 @@ class HeuristicProcessor(object): return scene_break + def check_paragraph(self, content): + content = re.sub('\s*]*>\s*', '', content) + if re.match('.*[\"\'.!?:]$', content): + #print "detected this as a paragraph" + return True + else: + return False + def abbyy_processor(self, html): abbyy_line = re.compile('((?P[^\"]*?);?">)(?P.*?)(?P

)|(?P]*>))', re.IGNORECASE) empty_paragraph = '\n

\n' @@ -530,14 +553,6 @@ class HeuristicProcessor(object): self.previous_was_paragraph = False html = re.sub(']*>', '', html) - def check_paragraph(content): - content = re.sub('\s*]*>\s*', '', content) - if re.match('.*[\"\'.!?:]$', content): - #print "detected this as a paragraph" - return True - else: - return False - def convert_styles(match): #print "raw styles are: "+match.group('styles') content = match.group('content') @@ -565,7 +580,7 @@ class HeuristicProcessor(object): return blockquote_close_loop+'\n'+image+'\n' else: styles = match.group('styles').split(';') - is_paragraph = check_paragraph(content) + is_paragraph = self.check_paragraph(content) #print "styles for this line are: "+str(styles) split_styles = [] for style in styles: From 4080f5c32c62c2d563d0903a84cf19b91585001c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 22 Feb 2011 12:34:22 -0700 Subject: [PATCH 22/24] 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 23/24] 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 dee216e6bb3eed740613efea283c6e1b61d77cb1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 22 Feb 2011 15:13:14 -0700 Subject: [PATCH 24/24] 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'