From aaba01d534290213b2f37cb28b2a1a48f204a074 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 21 Jul 2012 09:38:12 +0530 Subject: [PATCH 01/48] Book details panel: ALlow right clicking on a format to delete it. --- src/calibre/gui2/actions/delete.py | 15 +++++++++++ src/calibre/gui2/book_details.py | 43 ++++++++++++++++++++++++++++-- src/calibre/gui2/init.py | 2 ++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/actions/delete.py b/src/calibre/gui2/actions/delete.py index 161a4788c2..135591aa10 100644 --- a/src/calibre/gui2/actions/delete.py +++ b/src/calibre/gui2/actions/delete.py @@ -139,6 +139,21 @@ class DeleteAction(InterfaceAction): return set([]) return set(map(self.gui.library_view.model().id, rows)) + def remove_format_by_id(self, book_id, fmt): + title = self.gui.current_db.title(book_id, index_is_id=True) + if not confirm('

'+(_( + 'The %(fmt)s format will be permanently deleted from ' + '%(title)s. Are you sure?')%dict(fmt=fmt, title=title)) + +'

', 'library_delete_specific_format', self.gui): + return + + self.gui.library_view.model().db.remove_format(book_id, fmt, + index_is_id=True, notify=False) + self.gui.library_view.model().refresh_ids([book_id]) + self.gui.library_view.model().current_changed(self.gui.library_view.currentIndex(), + self.gui.library_view.currentIndex()) + self.gui.tags_view.recount() + def delete_selected_formats(self, *args): ids = self._get_selected_ids() if not ids: diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py index a8e5e20a70..acf5a8927f 100644 --- a/src/calibre/gui2/book_details.py +++ b/src/calibre/gui2/book_details.py @@ -5,8 +5,8 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -from PyQt4.Qt import (QPixmap, QSize, QWidget, Qt, pyqtSignal, QUrl, - QPropertyAnimation, QEasingCurve, QApplication, QFontInfo, +from PyQt4.Qt import (QPixmap, QSize, QWidget, Qt, pyqtSignal, QUrl, QIcon, + QPropertyAnimation, QEasingCurve, QApplication, QFontInfo, QAction, QSizePolicy, QPainter, QRect, pyqtProperty, QLayout, QPalette, QMenu) from PyQt4.QtWebKit import QWebView @@ -382,6 +382,7 @@ class CoverView(QWidget): # {{{ class BookInfo(QWebView): link_clicked = pyqtSignal(object) + remove_format = pyqtSignal(int, object) def __init__(self, vertical, parent=None): QWebView.__init__(self, parent) @@ -395,6 +396,16 @@ class BookInfo(QWebView): palette.setBrush(QPalette.Base, Qt.transparent) self.page().setPalette(palette) self.css = P('templates/book_details.css', data=True).decode('utf-8') + self.remove_format_action = QAction(QIcon(I('trash.png')), + '', self) + self.remove_format_action.current_fmt = None + self.remove_format_action.triggered.connect(self.remove_format_triggerred) + + def remove_format_triggerred(self): + f = self.remove_format_action.current_fmt + if f: + book_id, fmt = f + self.remove_format.emit(book_id, fmt) def link_activated(self, link): self._link_clicked = True @@ -420,6 +431,32 @@ class BookInfo(QWebView): else: ev.ignore() + def contextMenuEvent(self, ev): + p = self.page() + mf = p.mainFrame() + r = mf.hitTestContent(ev.pos()) + url = unicode(r.linkUrl().toString()).strip() + menu = p.createStandardContextMenu() + ca = self.pageAction(p.Copy) + for action in list(menu.actions()): + if action is not ca: + menu.removeAction(action) + if not r.isNull() and url.startswith('format:'): + parts = url.split(':') + try: + book_id, fmt = int(parts[1]), parts[2] + except: + import traceback + traceback.print_exc() + else: + self.remove_format_action.current_fmt = (book_id, fmt) + self.remove_format_action.setText(_('Delete the %s format')%parts[ + 2]) + menu.addAction(self.remove_format_action) + if len(menu.actions()) > 0: + menu.exec_(ev.globalPos()) + + # }}} class DetailsLayout(QLayout): # {{{ @@ -513,6 +550,7 @@ class BookDetails(QWidget): # {{{ show_book_info = pyqtSignal() open_containing_folder = pyqtSignal(int) view_specific_format = pyqtSignal(int, object) + remove_specific_format = pyqtSignal(int, object) remote_file_dropped = pyqtSignal(object, object) files_dropped = pyqtSignal(object, object) cover_changed = pyqtSignal(object, object) @@ -579,6 +617,7 @@ class BookDetails(QWidget): # {{{ self.book_info = BookInfo(vertical, self) self._layout.addWidget(self.book_info) self.book_info.link_clicked.connect(self.handle_click) + self.book_info.remove_format.connect(self.remove_specific_format) self.setCursor(Qt.PointingHandCursor) def handle_click(self, link): diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py index d6332d71ac..9b63cd5ed8 100644 --- a/src/calibre/gui2/init.py +++ b/src/calibre/gui2/init.py @@ -265,6 +265,8 @@ class LayoutMixin(object): # {{{ type=Qt.QueuedConnection) self.book_details.open_containing_folder.connect(self.iactions['View'].view_folder_for_id) self.book_details.view_specific_format.connect(self.iactions['View'].view_format_by_id) + self.book_details.remove_specific_format.connect( + self.iactions['Remove Books'].remove_format_by_id) m = self.library_view.model() if m.rowCount(None) > 0: From 7d197152183e56ba1813cb022760741c02b4a933 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 21 Jul 2012 09:55:09 +0530 Subject: [PATCH 02/48] ... --- src/calibre/gui2/dialogs/confirm_delete.ui | 69 +++++++++++++--------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/src/calibre/gui2/dialogs/confirm_delete.ui b/src/calibre/gui2/dialogs/confirm_delete.ui index c45b180483..e5d35410db 100644 --- a/src/calibre/gui2/dialogs/confirm_delete.ui +++ b/src/calibre/gui2/dialogs/confirm_delete.ui @@ -1,7 +1,8 @@ - + + Dialog - - + + 0 0 @@ -9,51 +10,63 @@ 300 - + Are you sure? - - + + :/images/dialog_warning.png:/images/dialog_warning.png - - - + + + - - - :/images/dialog_warning.png + + + :/images/dialog_warning.png - - + + + + 0 + 0 + + + + + 300 + 0 + + + TextLabel - + true - - - + + + &Show this warning again - + true - - - + + + Qt::Horizontal - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -61,7 +74,7 @@ - + @@ -70,11 +83,11 @@ Dialog accept() - + 248 254 - + 157 274 @@ -86,11 +99,11 @@ Dialog reject() - + 316 260 - + 286 274 From 7d1cf168d50ecca00a0b523a6a57f24c38727bd7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 21 Jul 2012 21:28:59 +0530 Subject: [PATCH 03/48] Fix Smashing Magazine --- recipes/smashing.recipe | 68 +++++++++++++---------------------------- 1 file changed, 21 insertions(+), 47 deletions(-) diff --git a/recipes/smashing.recipe b/recipes/smashing.recipe index 04436a05ef..a715ace821 100644 --- a/recipes/smashing.recipe +++ b/recipes/smashing.recipe @@ -1,50 +1,24 @@ -#!/usr/bin/env python - -__license__ = 'GPL v3' -__copyright__ = '2009, Darko Miletic ' -''' -www.smashingmagazine.com -''' - +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from calibre.web.feeds.news import BasicNewsRecipe -class SmashingMagazine(BasicNewsRecipe): - title = 'Smashing Magazine' - __author__ = 'Darko Miletic' - description = 'We smash you with the information that will make your life easier, really' - oldest_article = 20 - language = 'en' - max_articles_per_feed = 100 - no_stylesheets = True - use_embedded_content = False - publisher = 'Smashing Magazine' - category = 'news, web, IT, css, javascript, html' - encoding = 'utf-8' +class SmashingMagazine (BasicNewsRecipe): + __author__ = 'Marc Busqué ' + __url__ = 'http://www.lamarciana.com' + __version__ = '1.0.1' + __license__ = 'GPL v3' + __copyright__ = '2012, Marc Busqué ' + title = u'Smashing Magazine' + description = u'Founded in September 2006, Smashing Magazine delivers useful and innovative information to Web designers and developers. Our aim is to inform our readers about the latest trends and techniques in Web development. We try to persuade you not with the quantity but with the quality of the information we present. Smashing Magazine is and always has been independent.' + language = 'en' + tags = 'web development, software' + oldest_article = 7 + remove_empty_feeds = True + no_stylesheets = True + encoding = 'utf8' + cover_url = u'http://media.smashingmagazine.com/themes/smashingv4/images/logo.png' + remove_attributes = ['border', 'cellspacing', 'align', 'cellpadding', 'colspan', 'valign', 'vspace', 'hspace', 'alt', 'width', 'height', 'style'] + extra_css = u'body div table:first-child {display: none;} img {max-width: 100%; display: block; margin: auto;}' - conversion_options = { - 'comments' : description - ,'tags' : category - ,'publisher' : publisher - } - - keep_only_tags = [dict(name='div', attrs={'id':'leftcolumn'})] - remove_tags_after = dict(name='ul',attrs={'class':'social'}) - remove_tags = [ - dict(name=['link','object']) - ,dict(name='h1',attrs={'class':'logo'}) - ,dict(name='div',attrs={'id':'booklogosec'}) - ,dict(attrs={'src':'http://media2.smashingmagazine.com/wp-content/uploads/images/the-smashing-book/smbook6.gif'}) - ] - - feeds = [(u'Articles', u'http://rss1.smashingmagazine.com/feed/')] - - def preprocess_html(self, soup): - for iter in soup.findAll('div',attrs={'class':'leftframe'}): - it = iter.find('h1') - if it == None: - iter.extract() - for item in soup.findAll('img'): - oldParent = item.parent - if oldParent.name == 'a': - oldParent.name = 'div' - return soup + feeds = [ + (u'Smashing Magazine', u'http://rss1.smashingmagazine.com/feed/'), + ] From ebfce709796ca5406749c26a47b11bd7a61613f4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 21 Jul 2012 21:47:27 +0530 Subject: [PATCH 04/48] A list apart and .net magazine by Marc Busque --- recipes/dot_net.recipe | 32 ++++++++++++++++++++++++++++++++ recipes/list_apart.recipe | 33 +++++++++++++++++++++++++++++++++ recipes/smashing.recipe | 4 ++-- 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 recipes/dot_net.recipe create mode 100644 recipes/list_apart.recipe diff --git a/recipes/dot_net.recipe b/recipes/dot_net.recipe new file mode 100644 index 0000000000..50db71e9be --- /dev/null +++ b/recipes/dot_net.recipe @@ -0,0 +1,32 @@ +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from calibre.web.feeds.news import BasicNewsRecipe +import re + +class NetMagazineRecipe (BasicNewsRecipe): + __author__ = u'Marc Busqué ' + __url__ = 'http://www.lamarciana.com' + __version__ = '1.0' + __license__ = 'GPL v3' + __copyright__ = u'2012, Marc Busqué ' + title = u'.net magazine' + description = u'net is the world’s best-selling magazine for web designers and developers, featuring tutorials from leading agencies, interviews with the web’s biggest names, and agenda-setting features on the hottest issues affecting the internet today.' + language = 'en' + tags = 'web development, software' + oldest_article = 7 + remove_empty_feeds = True + no_stylesheets = True + cover_url = u'http://media.netmagazine.futurecdn.net/sites/all/themes/netmag/logo.png' + keep_only_tags = [ + dict(name='article', attrs={'class': re.compile('^node.*$', re.IGNORECASE)}) + ] + remove_tags = [ + dict(name='span', attrs={'class': 'comment-count'}), + dict(name='div', attrs={'class': 'item-list share-links'}), + dict(name='footer'), + ] + remove_attributes = ['border', 'cellspacing', 'align', 'cellpadding', 'colspan', 'valign', 'vspace', 'hspace', 'alt', 'width', 'height', 'style'] + extra_css = 'img {max-width: 100%; display: block; margin: auto;} .captioned-image div {text-align: center; font-style: italic;}' + + feeds = [ + (u'.net', u'http://feeds.feedburner.com/net/topstories'), + ] diff --git a/recipes/list_apart.recipe b/recipes/list_apart.recipe new file mode 100644 index 0000000000..35cbaad958 --- /dev/null +++ b/recipes/list_apart.recipe @@ -0,0 +1,33 @@ +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from calibre.web.feeds.news import BasicNewsRecipe + +class AListApart (BasicNewsRecipe): + __author__ = u'Marc Busqué ' + __url__ = 'http://www.lamarciana.com' + __version__ = '1.0' + __license__ = 'GPL v3' + __copyright__ = u'2012, Marc Busqué ' + title = u'A List Apart' + description = u'A List Apart Magazine (ISSN: 1534-0295) explores the design, development, and meaning of web content, with a special focus on web standards and best practices.' + language = 'en' + tags = 'web development, software' + oldest_article = 120 + remove_empty_feeds = True + no_stylesheets = True + encoding = 'utf8' + cover_url = u'http://alistapart.com/pix/alalogo.gif' + keep_only_tags = [ + dict(name='div', attrs={'id': 'content'}) + ] + remove_tags = [ + dict(name='ul', attrs={'id': 'metastuff'}), + dict(name='div', attrs={'class': 'discuss'}), + dict(name='div', attrs={'class': 'discuss'}), + dict(name='div', attrs={'id': 'learnmore'}), + ] + remove_attributes = ['border', 'cellspacing', 'align', 'cellpadding', 'colspan', 'valign', 'vspace', 'hspace', 'alt', 'width', 'height'] + extra_css = u'img {max-width: 100%; display: block; margin: auto;} #authorbio img {float: left; margin-right: 2%;}' + + feeds = [ + (u'A List Apart', u'http://www.alistapart.com/site/rss'), + ] diff --git a/recipes/smashing.recipe b/recipes/smashing.recipe index a715ace821..bc24166275 100644 --- a/recipes/smashing.recipe +++ b/recipes/smashing.recipe @@ -2,11 +2,11 @@ from calibre.web.feeds.news import BasicNewsRecipe class SmashingMagazine (BasicNewsRecipe): - __author__ = 'Marc Busqué ' + __author__ = u'Marc Busqué ' __url__ = 'http://www.lamarciana.com' __version__ = '1.0.1' __license__ = 'GPL v3' - __copyright__ = '2012, Marc Busqué ' + __copyright__ = u'2012, Marc Busqué ' title = u'Smashing Magazine' description = u'Founded in September 2006, Smashing Magazine delivers useful and innovative information to Web designers and developers. Our aim is to inform our readers about the latest trends and techniques in Web development. We try to persuade you not with the quantity but with the quality of the information we present. Smashing Magazine is and always has been independent.' language = 'en' From cc61cca75aba84ee7724d67247d8e2da7eb94e38 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 22 Jul 2012 00:12:30 +0530 Subject: [PATCH 05/48] Fix #1027431 (Cannot Connect Samsung Skyrocket S2 (Android 4.04 OS)) --- src/calibre/devices/android/driver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py index f17eba522b..eca5d615ce 100644 --- a/src/calibre/devices/android/driver.py +++ b/src/calibre/devices/android/driver.py @@ -212,7 +212,7 @@ class ANDROID(USBMS): 'KTABLET_PC', 'INGENIC', 'GT-I9001_CARD', 'USB_2.0_DRIVER', 'GT-S5830L_CARD', 'UNIVERSE', 'XT875', 'PRO', '.KOBO_VOX', 'THINKPAD_TABLET', 'SGH-T989', 'YP-G70', 'STORAGE_DEVICE', - 'ADVANCED'] + 'ADVANCED', 'SGH-I727'] WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897', 'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD', 'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD', @@ -221,7 +221,7 @@ class ANDROID(USBMS): 'A1-07___C0541A4F', 'XT912', 'MB855', 'XT910', 'BOOK_A10_CARD', 'USB_2.0_DRIVER', 'I9100T', 'P999DW_SD_CARD', 'KTABLET_PC', 'FILE-CD_GADGET', 'GT-I9001_CARD', 'USB_2.0_DRIVER', 'XT875', - 'UMS_COMPOSITE', 'PRO', '.KOBO_VOX', 'SGH-T989_CARD'] + 'UMS_COMPOSITE', 'PRO', '.KOBO_VOX', 'SGH-T989_CARD', 'SGH-I727'] OSX_MAIN_MEM = 'Android Device Main Memory' From 73a40c78a10ba0b0126abae94e386ef59a68ec26 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 22 Jul 2012 09:59:20 +0530 Subject: [PATCH 06/48] Improve Anadtech --- recipes/anandtech.recipe | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes/anandtech.recipe b/recipes/anandtech.recipe index aa10084070..ff08c828ac 100644 --- a/recipes/anandtech.recipe +++ b/recipes/anandtech.recipe @@ -21,8 +21,12 @@ class anan(BasicNewsRecipe): remove_javascript = True encoding = 'utf-8' - remove_tags=[dict(name='a', attrs={'style':'width:110px; margin-top:0px;text-align:center;'}), - dict(name='a', attrs={'style':'width:110px; margin-top:0px; margin-right:20px;text-align:center;'})] + remove_tags=[ + dict(name='a', attrs={'style':'width:110px; margin-top:0px;text-align:center;'}), + dict(name='a', attrs={'style':'width:110px; margin-top:0px; margin-right:20px;text-align:center;'}), + {'attrs':{'class':['article_links', 'header', 'body_right']}}, + {'id':['crumbs']}, + ] feeds = [ ('Anandtech', 'http://www.anandtech.com/rss/')] From 9015213161485fc417dfd78b22d9eefb971bf2db Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 23 Jul 2012 15:09:43 +0530 Subject: [PATCH 07/48] Fix San Francisco Bay Guardian --- recipes/sfbg.recipe | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/recipes/sfbg.recipe b/recipes/sfbg.recipe index 0735e760c6..5c77c96f74 100644 --- a/recipes/sfbg.recipe +++ b/recipes/sfbg.recipe @@ -1,25 +1,35 @@ from calibre.web.feeds.news import BasicNewsRecipe class SanFranciscoBayGuardian(BasicNewsRecipe): - title = u'San Francisco Bay Guardian' - language = 'en' - __author__ = 'Krittika Goyal' + title = u'San Francisco Bay Guardian' + language = 'en' + __author__ = 'Krittika Goyal' oldest_article = 31 #days max_articles_per_feed = 25 + #encoding = 'latin1' no_stylesheets = True + #remove_tags_before = dict(name='div', attrs={'id':'story_header'}) + #remove_tags_after = dict(name='div', attrs={'id':'shirttail'}) remove_tags = [ - dict(name='iframe'), + dict(name='iframe'), + #dict(name='div', attrs={'class':'related-articles'}), + #dict(name='div', attrs={'id':['story_tools', 'toolbox', 'shirttail', 'comment_widget']}), + #dict(name='ul', attrs={'class':'article-tools'}), + #dict(name='ul', attrs={'id':'story_tabs'}), ] feeds = [ ('sfbg', 'http://www.sfbg.com/rss.xml'), - ('politics', 'http://www.sfbg.com/politics/rss.xml'), - ('blogs', 'http://www.sfbg.com/blog/rss.xml'), - ('pixel_vision', 'http://www.sfbg.com/pixel_vision/rss.xml'), - ('bruce', 'http://www.sfbg.com/bruce/rss.xml'), ] - + #def preprocess_html(self, soup): + #story = soup.find(name='div', attrs={'id':'story_body'}) + #td = heading.findParent(name='td') + #td.extract() + #soup = BeautifulSoup('t') + #body = soup.find(name='body') + #body.insert(0, story) + #return soup From 65103e0ac12ab0e58943f261ba0809204678d22c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 23 Jul 2012 21:31:18 +0530 Subject: [PATCH 08/48] ... --- src/calibre/devices/prst1/driver.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/calibre/devices/prst1/driver.py b/src/calibre/devices/prst1/driver.py index a2b3716c05..92db8c6142 100644 --- a/src/calibre/devices/prst1/driver.py +++ b/src/calibre/devices/prst1/driver.py @@ -280,17 +280,17 @@ class PRST1(USBMS): try: cursor = connection.cursor() - + debug_print("Removing Orphaned Collection Records") - + # Purge any collections references that point into the abyss query = 'DELETE FROM collections WHERE content_id NOT IN (SELECT _id FROM books)' cursor.execute(query) query = 'DELETE FROM collections WHERE collection_id NOT IN (SELECT _id FROM collection)' cursor.execute(query) - + debug_print("Removing Orphaned Book Records") - + # Purge any references to books not in this database # Idea is to prevent any spill-over where these wind up applying to some other book query = 'DELETE FROM %s WHERE content_id NOT IN (SELECT _id FROM books)' @@ -301,7 +301,7 @@ class PRST1(USBMS): cursor.execute(query%'history') cursor.execute(query%'layout_cache') cursor.execute(query%'preference') - + cursor.close() except DatabaseError: import traceback @@ -320,7 +320,7 @@ class PRST1(USBMS): query = 'SELECT last_insert_rowid()' cursor.execute(query) row = cursor.fetchone() - + return long(row[0]) def get_database_min_id(self, source_id): @@ -376,6 +376,8 @@ class PRST1(USBMS): # Record what the max id being used is as well. db_books = {} for i, row in enumerate(cursor): + if row is None: + continue lpath = row[0].replace('\\', '/') db_books[lpath] = row[1] if row[1] < sequence_min: From f0d8a5cf1c3a3b695df53127b199755199ea7ce7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 23 Jul 2012 21:35:12 +0530 Subject: [PATCH 09/48] ... --- src/calibre/devices/prst1/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/devices/prst1/driver.py b/src/calibre/devices/prst1/driver.py index 92db8c6142..d3c92b5eff 100644 --- a/src/calibre/devices/prst1/driver.py +++ b/src/calibre/devices/prst1/driver.py @@ -376,7 +376,7 @@ class PRST1(USBMS): # Record what the max id being used is as well. db_books = {} for i, row in enumerate(cursor): - if row is None: + if row[0] is None: continue lpath = row[0].replace('\\', '/') db_books[lpath] = row[1] From 5a854040e7721b405c82c517c2ee11748666ee03 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 23 Jul 2012 18:55:02 +0200 Subject: [PATCH 10/48] Base changes required to add the smart device driver --- src/calibre/devices/interface.py | 18 +++++++++ .../ebooks/metadata/book/json_codec.py | 36 +++++++++++------- src/calibre/gui2/device.py | 38 ++++++++++++++++--- .../gui2/device_drivers/configwidget.py | 3 ++ .../gui2/device_drivers/configwidget.ui | 13 +++++++ src/calibre/library/server/base.py | 7 +++- src/calibre/utils/Zeroconf.py | 5 +++ src/calibre/utils/mdns.py | 27 +++++++++++++ 8 files changed, 126 insertions(+), 21 deletions(-) diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index 9510dcf3d1..26239b59e7 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -15,6 +15,8 @@ class DevicePlugin(Plugin): #: Ordered list of supported formats FORMATS = ["lrf", "rtf", "pdf", "txt"] + # If True, the config dialog will not show the formats box + HIDE_FORMATS_CONFIG_BOX = False #: VENDOR_ID can be either an integer, a list of integers or a dictionary #: If it is a dictionary, it must be a dictionary of dictionaries, @@ -496,6 +498,22 @@ class DevicePlugin(Plugin): ''' return paths + def startup(self): + ''' + Called when calibre is is starting the device. Do any initialization + required. Note that multiple instances of the class can be instantiated, + and thus __init__ can be called multiple times, but only one instance + will have this method called. + ''' + pass + + def shutdown(self): + ''' + Called when calibre is shutting down, either for good or in preparation + to restart. Do any cleanup required. + ''' + pass + class BookList(list): ''' A list of books. Each Book object must have the fields diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py index 3b52821c1b..8e2dc64383 100644 --- a/src/calibre/ebooks/metadata/book/json_codec.py +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -117,8 +117,8 @@ class JsonCodec(object): def __init__(self): self.field_metadata = FieldMetadata() - def encode_to_file(self, file, booklist): - file.write(json.dumps(self.encode_booklist_metadata(booklist), + def encode_to_file(self, file_, booklist): + file_.write(json.dumps(self.encode_booklist_metadata(booklist), indent=2, encoding='utf-8')) def encode_booklist_metadata(self, booklist): @@ -156,21 +156,29 @@ class JsonCodec(object): else: return object_to_unicode(value) - def decode_from_file(self, file, booklist, book_class, prefix): + def decode_from_file(self, file_, booklist, book_class, prefix): js = [] try: - js = json.load(file, encoding='utf-8') + js = json.load(file_, encoding='utf-8') + self.raw_to_booklist(js, booklist, book_class, prefix) for item in js: - book = book_class(prefix, item.get('lpath', None)) - for key in item.keys(): - meta = self.decode_metadata(key, item[key]) - if key == 'user_metadata': - book.set_all_user_metadata(meta) - else: - if key == 'classifiers': - key = 'identifiers' - setattr(book, key, meta) - booklist.append(book) + booklist.append(self.raw_to_book(item, book_class, prefix)) + except: + print 'exception during JSON decode_from_file' + traceback.print_exc() + + def raw_to_book(self, json_book, book_class, prefix): + try: + book = book_class(prefix, json_book.get('lpath', None)) + for key,val in json_book.iteritems(): + meta = self.decode_metadata(key, val) + if key == 'user_metadata': + book.set_all_user_metadata(meta) + else: + if key == 'classifiers': + key = 'identifiers' + setattr(book, key, meta) + return book except: print 'exception during JSON decoding' traceback.print_exc() diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 1dcadf7b65..da2c45fd9c 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -144,6 +144,7 @@ class DeviceManager(Thread): # {{{ self.open_feedback_msg = open_feedback_msg self._device_information = None self.current_library_uuid = None + self.call_shutdown_on_disconnect = False def report_progress(self, *args): pass @@ -197,6 +198,13 @@ class DeviceManager(Thread): # {{{ self.ejected_devices.remove(self.connected_device) else: self.connected_slot(False, self.connected_device_kind) + if self.call_shutdown_on_disconnect: + # The current device is an instance of a plugin class instantiated + # to handle this connection, probably as a mounted device. We are + # now abandoning the instance that we created, so we tell it that it + # is being shut down. + self.connected_device.shutdown() + self.call_shutdown_on_disconnect = False self.connected_device = None self._device_information = None @@ -265,7 +273,20 @@ class DeviceManager(Thread): # {{{ except Queue.Empty: pass + def run_startup(self, dev): + name = 'unknown' + try: + name = dev.__class__.__name__ + dev.startup() + except: + prints('Startup method for device %s threw exception'%name) + traceback.print_exc() + def run(self): + # Do any device-specific startup processing. + for d in self.devices: + self.run_startup(d) + while self.keep_going: kls = None while True: @@ -277,6 +298,11 @@ class DeviceManager(Thread): # {{{ if kls is not None: try: dev = kls(folder_path) + # We just created a new device instance. Call its startup + # method and set the flag to call the shutdown method when + # it disconnects. + self.run_startup(dev) + self.call_shutdown_on_disconnect = True self.do_connect([[dev, None],], device_kind=device_kind) except: prints('Unable to open %s as device (%s)'%(device_kind, folder_path)) @@ -295,6 +321,13 @@ class DeviceManager(Thread): # {{{ break time.sleep(self.sleep_time) + # We are exiting. Call the shutdown method for each plugin + for p in self.devices: + try: + p.shutdown() + except: + pass + def create_job_step(self, func, done, description, to_job, args=[], kwargs={}): job = DeviceJob(func, done, self.job_manager, args=args, kwargs=kwargs, description=description) @@ -934,11 +967,6 @@ class DeviceMixin(object): # {{{ fmt = None if specific: - if (not self.device_connected or not self.device_manager or - self.device_manager.device is None): - error_dialog(self, _('No device'), - _('No device connected'), show=True) - return formats = [] aval_out_formats = available_output_formats() format_count = {} diff --git a/src/calibre/gui2/device_drivers/configwidget.py b/src/calibre/gui2/device_drivers/configwidget.py index 94843f90e3..b47a80b6ad 100644 --- a/src/calibre/gui2/device_drivers/configwidget.py +++ b/src/calibre/gui2/device_drivers/configwidget.py @@ -43,6 +43,9 @@ class ConfigWidget(QWidget, Ui_ConfigWidget): self.connect(self.column_up, SIGNAL('clicked()'), self.up_column) self.connect(self.column_down, SIGNAL('clicked()'), self.down_column) + if device.HIDE_FORMATS_CONFIG_BOX: + self.groupBox.hide() + if supports_subdirs: self.opt_use_subdirs.setChecked(self.settings.use_subdirs) else: diff --git a/src/calibre/gui2/device_drivers/configwidget.ui b/src/calibre/gui2/device_drivers/configwidget.ui index 92324fd1a7..d8c3c44e22 100644 --- a/src/calibre/gui2/device_drivers/configwidget.ui +++ b/src/calibre/gui2/device_drivers/configwidget.ui @@ -103,6 +103,19 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/src/calibre/library/server/base.py b/src/calibre/library/server/base.py index 0b5fead634..a61d2dcc3e 100644 --- a/src/calibre/library/server/base.py +++ b/src/calibre/library/server/base.py @@ -17,7 +17,7 @@ from calibre.utils.date import fromtimestamp from calibre.library.server import listen_on, log_access_file, log_error_file from calibre.library.server.utils import expose, AuthController from calibre.utils.mdns import publish as publish_zeroconf, \ - stop_server as stop_zeroconf, get_external_ip + unpublish as unpublish_zeroconf, get_external_ip from calibre.library.server.content import ContentServer from calibre.library.server.mobile import MobileServer from calibre.library.server.xml import XMLServer @@ -94,7 +94,10 @@ class BonJour(SimplePlugin): # {{{ def stop(self): try: - stop_zeroconf() + unpublish_zeroconf('Books in calibre', '_stanza._tcp', + self.port, {'path':self.prefix+'/stanza'}) + unpublish_zeroconf('Books in calibre', '_calibre._tcp', + self.port, {'path':self.prefix+'/opds'}) except: import traceback cherrypy.log.error('Failed to stop BonJour:') diff --git a/src/calibre/utils/Zeroconf.py b/src/calibre/utils/Zeroconf.py index 0e55e8f516..b722865101 100755 --- a/src/calibre/utils/Zeroconf.py +++ b/src/calibre/utils/Zeroconf.py @@ -871,6 +871,8 @@ class Engine(threading.Thread): from calibre.constants import DEBUG try: rr, wr, er = select.select(rs, [], [], self.timeout) + if globals()['_GLOBAL_DONE']: + continue for socket in rr: try: self.readers[socket].handle_read() @@ -1419,6 +1421,9 @@ class Zeroconf(object): i += 1 nextTime += _UNREGISTER_TIME + def countRegisteredServices(self): + return len(self.services) + def checkService(self, info): """Checks the network for a unique service name, modifying the ServiceInfo passed in if it is not unique.""" diff --git a/src/calibre/utils/mdns.py b/src/calibre/utils/mdns.py index 2be6bef49b..42e846577e 100644 --- a/src/calibre/utils/mdns.py +++ b/src/calibre/utils/mdns.py @@ -76,6 +76,33 @@ def publish(desc, type, port, properties=None, add_hostname=True): server=hostname+'.local.') server.registerService(service) +def unpublish(desc, type, port, properties=None, add_hostname=True): + ''' + Unpublish a service. + + The parameters must be the same as used in the corresponding call to publish + ''' + port = int(port) + server = start_server() + try: + hostname = socket.gethostname().partition('.')[0] + except: + hostname = 'Unknown' + + if add_hostname: + desc += ' (on %s)'%hostname + local_ip = get_external_ip() + type = type+'.local.' + from calibre.utils.Zeroconf import ServiceInfo + service = ServiceInfo(type, desc+'.'+type, + address=socket.inet_aton(local_ip), + port=port, + properties=properties, + server=hostname+'.local.') + server.unregisterService(service) + if server.countRegisteredServices() == 0: + stop_server() + def stop_server(): global _server if _server is not None: From 091164b307b29ed9e54b28868bb2bfbd872c9bcd Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 24 Jul 2012 11:56:41 +0530 Subject: [PATCH 11/48] Refactor fs code in the viewer --- resources/compiled_coffeescript.zip | Bin 49166 -> 51021 bytes src/calibre/gui2/viewer/documentview.py | 28 +++++------------------- src/calibre/gui2/viewer/javascript.py | 4 +++- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip index 7ec0f242309ec5f872fe9e527e47e71eaa145256..bb2ea7cfd95dcf122d4a96d2769f0e958940ea34 100644 GIT binary patch delta 1258 zcmb7E&ubGw6y7AQEs@|4wyjz#BNjIH$D%z1r3mZAOSH81AWCJKB(urNW_H<`Z4*j~ z7mpUg+?C!fQhE{5M3CailNT={{sr1wFM>14CcE3D0VnLjy!qaj?|u8`Z9h+Z-A<&I zvxy;D66^cg(f$|hO=>UsUfU;2Ifs4FM$aFt9cin#Ge7oDNs@T3O03=-J8gKDrIWmi z5N3b0nIQlvsKadX9*?iK!u5Ca;oaf*t>8?>u#CVRpadahF_{E>86M74)5ah;V!!V` z2vM9yVTDpY{s+XZ#G%?3vp4AuTn#EFI+*Vsy zphtCF*`_wFI!GmO9r@&h{aUyb&k^?cOu9BeL5`?xHTSu&juaPB&&5&U#}sw*9tx%H z#4X>oh&Zn8T1y;vksIS1nl8hNPEm#G8)ku)<^Vg)Oq^SXE+8EdrUBAC3fM3Jm!t#@Pg{{0CyWV5PiD>7nJk>)N?jgaq06-t_gmn?#NZJm#z;-uB*_1XC zzJ@onmCMmPh|xy)+U{tRsaRZ2bjJ&uZBDYkjS2R&DYKuAEAh7}F-(}uw`56XFPh#= mkkC7MT4Tz8eQSu+>5u^R8ClK_^AROU!~92MlJxmN?EV2HMyQ+s delta 118 zcmX@x$K2Pzym>wE5eH_zIZrq8uHoHW?3Yw9neUj! Date: Tue, 24 Jul 2012 15:30:05 +0530 Subject: [PATCH 12/48] E-book viewer full scrren mode: Allow clicking in the left and right page margins to turn pages. Fixes #1024819 ([Enhancement] Clic to advance page in viewer) --- resources/compiled_coffeescript.zip | Bin 51021 -> 52157 bytes .../ebooks/oeb/display/full_screen.coffee | 65 ++++++++++++++++++ src/calibre/ebooks/oeb/display/paged.coffee | 12 ++++ src/calibre/gui2/viewer/documentview.py | 19 ++++- src/calibre/gui2/viewer/main.py | 4 +- 5 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 src/calibre/ebooks/oeb/display/full_screen.coffee diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip index bb2ea7cfd95dcf122d4a96d2769f0e958940ea34..ed0bce537bf784ae6e934ee71cb5ad17fdd46862 100644 GIT binary patch delta 999 zcmb7DO=uHA6ke0k{Lu6e(qd}RiKfkNNmDV$CTS@aL~AX0u!6YRWM`ALaW~Fx5@LI> zUIY(Pd7zg<4<7U)RdQ9@8j^xo5IlHMD4r``1dA7)*{0U5f;cb>Gw<7PzW3huHt#uK zK6Hkr&pA5+99!RR?u^|okD#t`j$``>2Mev9`j&5d6vX6Vxv1u5MMWoKNy=l)^o4eepWs)BesPa0Wr;<=(qRn0&`?~fwHaCY9L9mnKD=28fT zFT3Hb#|7Ic-TylK)+0XY9_G_v;Tl9LILpsuKts-F5%!q!V5= z`r+;?fJh?(KhhpZce)aiEKjfkO{#{8HB9&@m6n^0#cNSa*4qIDNTic~bP03X&P zpfpaUs;VaI)i}Y|^$Px9mil62=@3jedM^I{#y=XDCA3@Eh#`?+Wv^4Ldb?FMC6dP` z3a8+{r!R=+=i61xmQ7RF=zR*Eq@{$_#4!iKkU0|wv~yt2kwsZGN=2y#%cnyLgG%{Z zkhSih-P#_5wWmQxmcaL69u}{7RVFOV^H~ySCP2v);+bwrY%_s?1_rEz7=nT=CkVp6 zWtnej)(8JXNrqFZY1;CgJbXoIgeZF3xfwPX$j1~XX@}ocPw~ywy Qt7{fe*f`pmc+CPo0h1D3VE_OC delta 238 zcmdlxo%w7Z^JZ74oxFT}4WAvF)fkN$9T*rI9VW**Np3WJV?TL?Rg?e# diff --git a/src/calibre/ebooks/oeb/display/full_screen.coffee b/src/calibre/ebooks/oeb/display/full_screen.coffee new file mode 100644 index 0000000000..f4dece210a --- /dev/null +++ b/src/calibre/ebooks/oeb/display/full_screen.coffee @@ -0,0 +1,65 @@ +#!/usr/bin/env coffee +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai + +### + Copyright 2012, Kovid Goyal + Released under the GPLv3 License +### + + +log = window.calibre_utils.log + +class FullScreen + # This class is a namespace to expose functions via the + # window.full_screen object. The most important functions are: + + constructor: () -> + if not this instanceof arguments.callee + throw new Error('FullScreen constructor called as function') + this.in_full_screen = false + this.initial_left_margin = null + this.initial_right_margin = null + + save_margins: () -> + bs = document.body.style + this.initial_left_margin = bs.marginLeft + this.initial_right_margin = bs.marginRight + + on: (max_text_width, in_paged_mode) -> + if in_paged_mode + window.paged_display.max_col_width = max_text_width + else + s = document.body.style + s.maxWidth = max_text_width + 'px' + s.marginLeft = 'auto' + s.marginRight = 'auto' + window.addEventListener('click', this.handle_click, false) + + off: (in_paged_mode) -> + window.removeEventListener('click', this.handle_click, false) + if in_paged_mode + window.paged_display.max_col_width = -1 + else + s = document.body.style + s.maxWidth = 'none' + if this.initial_left_margin != null + s.marginLeft = this.initial_left_margin + if this.initial_right_margin != null + s.marginRight = this.initial_right_margin + + handle_click: (event) -> + if event.target != document.documentElement or event.button != 0 + return + res = null + if window.paged_display.in_paged_mode + res = window.paged_display.click_for_page_turn(event) + else + br = document.body.getBoundingClientRect() + if not (br.left <= event.clientX <= br.right) + res = event.clientX < br.left + if res != null + window.py_bridge.page_turn_requested(res) + +if window? + window.full_screen = new FullScreen() + diff --git a/src/calibre/ebooks/oeb/display/paged.coffee b/src/calibre/ebooks/oeb/display/paged.coffee index 3bb3461927..c2a09b5587 100644 --- a/src/calibre/ebooks/oeb/display/paged.coffee +++ b/src/calibre/ebooks/oeb/display/paged.coffee @@ -395,6 +395,18 @@ class PagedDisplay log('Viewport cfi:', ans) return ans + click_for_page_turn: (event) -> + # Check if the click event event should generate a apge turn. Returns + # null if it should not, true if it is a backwards page turn, false if + # it is a forward apge turn. + left_boundary = this.current_margin_side + right_bondary = this.screen_width - this.current_margin_side + if left_boundary > event.clientX + return true + if right_bondary < event.clientX + return false + return null + if window? window.paged_display = new PagedDisplay() diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py index 1afb284e8f..dac9a05113 100644 --- a/src/calibre/gui2/viewer/documentview.py +++ b/src/calibre/gui2/viewer/documentview.py @@ -11,7 +11,7 @@ from functools import partial from PyQt4.Qt import (QSize, QSizePolicy, QUrl, SIGNAL, Qt, pyqtProperty, QPainter, QPalette, QBrush, QFontDatabase, QDialog, QColor, QPoint, QImage, QRegion, QIcon, pyqtSignature, QAction, QMenu, QString, - pyqtSignal, QSwipeGesture, QApplication) + pyqtSignal, QSwipeGesture, QApplication, pyqtSlot) from PyQt4.QtWebKit import QWebPage, QWebView, QWebSettings from calibre.gui2.viewer.flip import SlideFlip @@ -34,6 +34,8 @@ def load_builtin_fonts(): class Document(QWebPage): # {{{ + page_turn = pyqtSignal(object) + def set_font_settings(self): opts = config().parse() settings = self.settings() @@ -171,6 +173,10 @@ class Document(QWebPage): # {{{ if not isxp and self.hyphenate and getattr(self, 'loaded_lang', ''): self.javascript('do_hyphenation("%s")'%self.loaded_lang) + @pyqtSlot(int) + def page_turn_requested(self, backwards): + self.page_turn.emit(bool(backwards)) + def _pass_json_value_getter(self): val = json.dumps(self.bridge_value) return QString(val) @@ -187,10 +193,10 @@ class Document(QWebPage): # {{{ self.fit_images() self.init_hyphenate() self.javascript('full_screen.save_margins()') - if self.in_paged_mode: - self.switch_to_paged_mode() if self.in_fullscreen_mode: self.switch_to_fullscreen_mode() + if self.in_paged_mode: + self.switch_to_paged_mode() self.read_anchor_positions(use_cache=False) self.first_load = False @@ -445,6 +451,7 @@ class DocumentView(QWebView): # {{{ self.connect(self.document, SIGNAL('selectionChanged()'), self.selection_changed) self.connect(self.document, SIGNAL('animated_scroll_done()'), self.animated_scroll_done, Qt.QueuedConnection) + self.document.page_turn.connect(self.page_turn_requested) copy_action = self.pageAction(self.document.Copy) copy_action.setIcon(QIcon(I('convert.png'))) d = self.document @@ -878,6 +885,12 @@ class DocumentView(QWebView): # {{{ self.manager.scrolled(self.scroll_fraction) #print 'After all:', self.document.ypos + def page_turn_requested(self, backwards): + if backwards: + self.previous_page() + else: + self.next_page() + def scroll_by(self, x=0, y=0, notify=True): old_pos = (self.document.xpos if self.document.in_paged_mode else self.document.ypos) diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py index 65be08343d..c6eb76c735 100644 --- a/src/calibre/gui2/viewer/main.py +++ b/src/calibre/gui2/viewer/main.py @@ -272,9 +272,11 @@ class EbookViewer(MainWindow, Ui_EbookViewer):

%s

%s

%s

+

%s

'''%(_('Full screen mode'), _('Right click to show controls'), + _('Tap in the left or right page margin to turn pages'), _('Press Esc to quit')), self) self.full_screen_label.setVisible(False) @@ -496,7 +498,7 @@ class EbookViewer(MainWindow, Ui_EbookViewer): a.setStartValue(QSize(width, 0)) a.setEndValue(QSize(width, height)) a.start() - QTimer.singleShot(2750, self.full_screen_label.hide) + QTimer.singleShot(3500, self.full_screen_label.hide) self.view.document.switch_to_fullscreen_mode() if self.view.document.fullscreen_clock: self.show_clock() From 76c0892b510f639b6638ac4edce48eca0d458b0c Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 24 Jul 2012 14:18:52 +0200 Subject: [PATCH 13/48] Add an interface to permit starting and stopping of devices without disabling them. Will be used by the smartdevice driver --- src/calibre/devices/interface.py | 48 ++++++++++++++++++++++++ src/calibre/gui2/actions/device.py | 35 ++++++++++++++++- src/calibre/gui2/device.py | 60 ++++++++++++++++++++++++++++++ src/calibre/gui2/ui.py | 9 +++++ src/calibre/utils/Zeroconf.py | 15 +++++--- 5 files changed, 160 insertions(+), 7 deletions(-) diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index 26239b59e7..0f2027065e 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -514,6 +514,54 @@ class DevicePlugin(Plugin): ''' pass + # Dynamic control interface + + def is_dynamically_controllable(self): + ''' + Called by the device manager when starting plugins. If this method returns + a string, then a) it supports the device manager's dynamic control + interface, and b) that name is to be used when talking to the plugin + ''' + return None + + def start_plugin(self): + ''' + This method is called to start the plugin. The plugin should begin + to accept device connections however it does that. If the plugin is + already accepting connections, then do nothing. + ''' + pass + + def stop_plugin(self): + ''' + This method is called to stop the plugin. The plugin should no longer + accept connections, and should cleanup behind itself. It is likely that + this method should call shutdown. If the plugin is already not accepting + connections, then do nothing. + ''' + pass + + def get_option(self, opt_string): + ''' + Return the value of the option indicated by opt_string. This method can + be called when the plugin is not started. Return None if the option does + not exist. + ''' + return None + + def set_option(self, opt_string, opt_value): + ''' + Set the value of the option indicated by opt_string. This method can + be called when the plugin is not started. + ''' + pass + + def is_running(self): + ''' + Return True if the plugin is started, otherwise false + ''' + return False + class BookList(list): ''' A list of books. Each Book object must have the fields diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py index 0ef06d59d5..afbf2584ed 100644 --- a/src/calibre/gui2/actions/device.py +++ b/src/calibre/gui2/actions/device.py @@ -24,6 +24,7 @@ class ShareConnMenu(QMenu): # {{{ config_email = pyqtSignal() toggle_server = pyqtSignal() + toggle_smartdevice = pyqtSignal() dont_add_to = frozenset(['context-menu-device']) def __init__(self, parent=None): @@ -56,6 +57,11 @@ class ShareConnMenu(QMenu): # {{{ _('Start Content Server')) self.toggle_server_action.triggered.connect(lambda x: self.toggle_server.emit()) + self.toggle_smartdevice_action = \ + self.addAction(QIcon(I('devices/galaxy_s3.png')), + _('Start Smart Device Connections')) + self.toggle_smartdevice_action.triggered.connect(lambda x: + self.toggle_smartdevice.emit()) self.addSeparator() self.email_actions = [] @@ -80,6 +86,15 @@ class ShareConnMenu(QMenu): # {{{ text = _('Stop Content Server') + ' [%s]'%get_external_ip() self.toggle_server_action.setText(text) + def smartdevice_state_changed(self, accepting): + if accepting: + self.toggle_smartdevice_action.setText(_('Stop Smart Device Connections')) + else: + self.toggle_smartdevice_action.setText(_('Start Smart Device Connections')) + + def hide_smartdevice_menus(self): + self.toggle_smartdevice_action.setVisible(False) + def build_email_entries(self, sync_menu): from calibre.gui2.device import DeviceAction for ac in self.email_actions: @@ -158,6 +173,7 @@ class ConnectShareAction(InterfaceAction): def genesis(self): self.share_conn_menu = ShareConnMenu(self.gui) self.share_conn_menu.toggle_server.connect(self.toggle_content_server) + self.share_conn_menu.toggle_smartdevice.connect(self.toggle_smartdevice) self.share_conn_menu.config_email.connect(partial( self.gui.iactions['Preferences'].do_config, initial_plugin=('Sharing', 'Email'))) @@ -200,8 +216,23 @@ class ConnectShareAction(InterfaceAction): if not self.stopping_msg.isVisible(): self.stopping_msg.exec_() return - - self.gui.content_server = None self.stopping_msg.accept() + def toggle_smartdevice(self): + info_dialog(self.gui, _('Foobar'), + _('Start server bla bla blah...'), + show_copy_button=False, show=True) + if self.gui.device_manager.is_running('smartdevice'): + self.gui.device_manager.stop_plugin('smartdevice') + else: + self.gui.device_manager.start_plugin('smartdevice') + self.share_conn_menu.smartdevice_state_changed( + self.gui.device_manager.is_running('smartdevice')) + + def smartdevice_state_changed(self, running): + self.share_conn_menu.smartdevice_state_changed(running) + + def check_smartdevice_menus(self): + if not self.gui.device_manager.is_enabled('smartdevice'): + self.share_conn_menu.hide_smartdevice_menus() diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 17f1e47853..14a9093bd4 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -145,6 +145,8 @@ class DeviceManager(Thread): # {{{ self._device_information = None self.current_library_uuid = None self.call_shutdown_on_disconnect = False + self.devices_initialized = Queue.Queue(0) + self.dynamic_plugins = {} def report_progress(self, *args): pass @@ -286,6 +288,10 @@ class DeviceManager(Thread): # {{{ # Do any device-specific startup processing. for d in self.devices: self.run_startup(d) + n = d.is_dynamically_controllable() + if n: + self.dynamic_plugins[n] = d + self.devices_initialized.put(None) while self.keep_going: kls = None @@ -508,6 +514,59 @@ class DeviceManager(Thread): # {{{ if self.connected_device: self.connected_device.set_driveinfo_name(location_code, name) + # dynamic plugin interface + + def start_plugin(self, name): + try: + d = self.dynamic_plugins.get(name, None) + if d: + d.start_plugin() + except: + pass + + def stop_plugin(self, name): + try: + d = self.dynamic_plugins.get(name, None) + if d: + d.stop_plugin() + except: + pass + + def get_option(self, name, opt_string): + try: + d = self.dynamic_plugins.get(name, None) + if d: + return d.get_option(opt_string) + except: + pass + return None + + def set_option(self, name, opt_string, opt_value): + try: + d = self.dynamic_plugins.get(name, None) + if d: + d.set_option(opt_string, opt_value) + except: + pass + + def is_running(self, name): + try: + d = self.dynamic_plugins.get(name, None) + if d: + return d.is_running() + except: + pass + return False + + def is_enabled(self, name): + try: + d = self.dynamic_plugins.get(name, None) + if d: + return True + except: + pass + return False + # }}} class DeviceAction(QAction): # {{{ @@ -708,6 +767,7 @@ class DeviceMixin(object): # {{{ self.job_manager, Dispatcher(self.status_bar.show_message), Dispatcher(self.show_open_feedback)) self.device_manager.start() + self.device_manager.devices_initialized.get() if tweaks['auto_connect_to_folder']: self.connect_to_folder_named(tweaks['auto_connect_to_folder']) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index a597445f43..be86e91c29 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -337,6 +337,15 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ if config['autolaunch_server']: self.start_content_server() + smartdevice_actions = self.iactions['Connect Share'] + smartdevice_actions.check_smartdevice_menus() + if self.device_manager.get_option('smartdevice', 'autostart'): + try: + self.device_manager.start_plugin('smartdevice') + smartdevice_actions.smartdevice_state_changed(True) + except: + pass + self.keyboard_interrupt.connect(self.quit, type=Qt.QueuedConnection) self.read_settings() diff --git a/src/calibre/utils/Zeroconf.py b/src/calibre/utils/Zeroconf.py index b722865101..1287148476 100755 --- a/src/calibre/utils/Zeroconf.py +++ b/src/calibre/utils/Zeroconf.py @@ -955,11 +955,16 @@ class Reaper(threading.Thread): return if globals()['_GLOBAL_DONE']: return - now = currentTimeMillis() - for record in self.zeroconf.cache.entries(): - if record.isExpired(now): - self.zeroconf.updateRecord(now, record) - self.zeroconf.cache.remove(record) + try: + # can get here in a race condition with shutdown. Swallow the + # exception and run around the loop again. + now = currentTimeMillis() + for record in self.zeroconf.cache.entries(): + if record.isExpired(now): + self.zeroconf.updateRecord(now, record) + self.zeroconf.cache.remove(record) + except: + pass class ServiceBrowser(threading.Thread): From b2f1c6294b2b68bd7ae21cf54d9707f8b5a4a74c Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 24 Jul 2012 16:42:59 +0200 Subject: [PATCH 14/48] Implement the smartdevice control dialog. --- src/calibre/gui2/actions/device.py | 10 +- src/calibre/gui2/dialogs/smartdevice.py | 78 ++++++++++++++ src/calibre/gui2/dialogs/smartdevice.ui | 129 ++++++++++++++++++++++++ 3 files changed, 210 insertions(+), 7 deletions(-) create mode 100644 src/calibre/gui2/dialogs/smartdevice.py create mode 100644 src/calibre/gui2/dialogs/smartdevice.ui diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py index afbf2584ed..8faf9f1717 100644 --- a/src/calibre/gui2/actions/device.py +++ b/src/calibre/gui2/actions/device.py @@ -14,6 +14,7 @@ from calibre.utils.smtp import config as email_config from calibre.constants import iswindows, isosx from calibre.customize.ui import is_disabled from calibre.devices.bambook.driver import BAMBOOK +from calibre.gui2.dialogs.smartdevice import SmartdeviceDialog from calibre.gui2 import info_dialog class ShareConnMenu(QMenu): # {{{ @@ -220,13 +221,8 @@ class ConnectShareAction(InterfaceAction): self.stopping_msg.accept() def toggle_smartdevice(self): - info_dialog(self.gui, _('Foobar'), - _('Start server bla bla blah...'), - show_copy_button=False, show=True) - if self.gui.device_manager.is_running('smartdevice'): - self.gui.device_manager.stop_plugin('smartdevice') - else: - self.gui.device_manager.start_plugin('smartdevice') + sd_dialog = SmartdeviceDialog(self.gui) + sd_dialog.exec_() self.share_conn_menu.smartdevice_state_changed( self.gui.device_manager.is_running('smartdevice')) diff --git a/src/calibre/gui2/dialogs/smartdevice.py b/src/calibre/gui2/dialogs/smartdevice.py new file mode 100644 index 0000000000..63c49a5fc7 --- /dev/null +++ b/src/calibre/gui2/dialogs/smartdevice.py @@ -0,0 +1,78 @@ +__license__ = 'GPL v3' +__copyright__ = '2008, Kovid Goyal ' +import re +from PyQt4.QtGui import QDialog, QLineEdit +from PyQt4.QtCore import SIGNAL, Qt + +from calibre.gui2.dialogs.smartdevice_ui import Ui_Dialog +from calibre.gui2 import dynamic + +class SmartdeviceDialog(QDialog, Ui_Dialog): + + def __init__(self, parent): + QDialog.__init__(self, parent) + Ui_Dialog.__init__(self) + self.setupUi(self) + + self.msg.setText( + _('This dialog starts and stops the smart device app interface. ' + 'When you start the interface, you might see some messages from ' + 'your computer\'s firewall or anti-virus manager asking you ' + 'if it is OK for calibre to connect to the network. Please ' + 'answer yes. If you do not, the app will not work. It will ' + 'be unable to connect to calibre.')) + + self.passwd_msg.setText( + _('Use a password if calibre is running on a network that ' + 'is not secure. For example, if you run calibre on a laptop, ' + 'use that laptop in an airport, and want to connect your ' + 'smart device to calibre, you should use a password.')) + + self.auto_start_msg.setText( + _('Check this box if you want calibre to automatically start the ' + 'smart device interface when calibre starts. You should not do ' + 'this if you are using a network that is not secure and you ' + 'are not setting a password.')) + self.connect(self.show_password, SIGNAL('stateChanged(int)'), self.toggle_password) + + self.device_manager = parent.device_manager + if self.device_manager.get_option('smartdevice', 'autostart'): + self.autostart_box.setChecked(True) + pw = self.device_manager.get_option('smartdevice', 'password') + if pw: + self.password_box.setText(pw) + + if self.device_manager.is_running('smartdevice'): + self.start_button.setEnabled(False) + self.stop_button.setEnabled(True) + else: + self.start_button.setEnabled(True) + self.stop_button.setEnabled(False) + self.start_button.clicked.connect(self.start_button_clicked) + self.stop_button.clicked.connect(self.stop_button_clicked) + self.cancel_button.clicked.connect(self.cancel_button_clicked) + self.OK_button.clicked.connect(self.accept) + + def start_button_clicked(self): + self.device_manager.start_plugin('smartdevice') + self.accept() + + def stop_button_clicked(self): + self.device_manager.stop_plugin('smartdevice') + self.accept() + + def cancel_button_clicked(self): + QDialog.reject(self) + + def toggle_password(self, state): + if state == Qt.Unchecked: + self.password_box.setEchoMode(QLineEdit.Password) + else: + self.password_box.setEchoMode(QLineEdit.Normal) + + def accept(self): + self.device_manager.set_option('smartdevice', 'password', + unicode(self.password_box.text())) + self.device_manager.set_option('smartdevice', 'autostart', + self.autostart_box.isChecked()) + QDialog.accept(self) diff --git a/src/calibre/gui2/dialogs/smartdevice.ui b/src/calibre/gui2/dialogs/smartdevice.ui new file mode 100644 index 0000000000..26795249be --- /dev/null +++ b/src/calibre/gui2/dialogs/smartdevice.ui @@ -0,0 +1,129 @@ + + + Dialog + + + + 0 + 0 + 600 + 209 + + + + Smart device control + + + + :/images/mimetypes/unknown.png:/images/mimetypes/unknown.png + + + + + + TextLabel + + + true + + + + + + + &Password: + + + password_box + + + + + + + QLineEdit::Password + + + + + + + TextLabel + + + true + + + + 100 + 0 + + + + + + + + &Show password + + + + + + + &Auto-start + + + + + + + true + + + + + + + All the buttons except Cancel will save the above settings + + + + + + + + + Start interface + + + + + + + Stop interface + + + + + + + OK + + + + + + + Cancel + + + + + + + + + + + From 0f16e4d9c7006c2be08993f5e325f75432c7fea5 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 24 Jul 2012 18:14:22 +0200 Subject: [PATCH 15/48] Improved smartdevice control dialog --- src/calibre/gui2/actions/device.py | 27 ++---- src/calibre/gui2/dialogs/smartdevice.py | 51 +++++------ src/calibre/gui2/dialogs/smartdevice.ui | 110 +++++++++++++----------- src/calibre/gui2/ui.py | 1 - 4 files changed, 93 insertions(+), 96 deletions(-) diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py index 8faf9f1717..8d08f53f0a 100644 --- a/src/calibre/gui2/actions/device.py +++ b/src/calibre/gui2/actions/device.py @@ -25,7 +25,7 @@ class ShareConnMenu(QMenu): # {{{ config_email = pyqtSignal() toggle_server = pyqtSignal() - toggle_smartdevice = pyqtSignal() + control_smartdevice = pyqtSignal() dont_add_to = frozenset(['context-menu-device']) def __init__(self, parent=None): @@ -58,11 +58,11 @@ class ShareConnMenu(QMenu): # {{{ _('Start Content Server')) self.toggle_server_action.triggered.connect(lambda x: self.toggle_server.emit()) - self.toggle_smartdevice_action = \ + self.control_smartdevice_action = \ self.addAction(QIcon(I('devices/galaxy_s3.png')), - _('Start Smart Device Connections')) - self.toggle_smartdevice_action.triggered.connect(lambda x: - self.toggle_smartdevice.emit()) + _('Control Smart Device Connections')) + self.control_smartdevice_action.triggered.connect(lambda x: + self.control_smartdevice.emit()) self.addSeparator() self.email_actions = [] @@ -87,14 +87,8 @@ class ShareConnMenu(QMenu): # {{{ text = _('Stop Content Server') + ' [%s]'%get_external_ip() self.toggle_server_action.setText(text) - def smartdevice_state_changed(self, accepting): - if accepting: - self.toggle_smartdevice_action.setText(_('Stop Smart Device Connections')) - else: - self.toggle_smartdevice_action.setText(_('Start Smart Device Connections')) - def hide_smartdevice_menus(self): - self.toggle_smartdevice_action.setVisible(False) + self.control_smartdevice_action.setVisible(False) def build_email_entries(self, sync_menu): from calibre.gui2.device import DeviceAction @@ -174,7 +168,7 @@ class ConnectShareAction(InterfaceAction): def genesis(self): self.share_conn_menu = ShareConnMenu(self.gui) self.share_conn_menu.toggle_server.connect(self.toggle_content_server) - self.share_conn_menu.toggle_smartdevice.connect(self.toggle_smartdevice) + self.share_conn_menu.control_smartdevice.connect(self.control_smartdevice) self.share_conn_menu.config_email.connect(partial( self.gui.iactions['Preferences'].do_config, initial_plugin=('Sharing', 'Email'))) @@ -220,14 +214,9 @@ class ConnectShareAction(InterfaceAction): self.gui.content_server = None self.stopping_msg.accept() - def toggle_smartdevice(self): + def control_smartdevice(self): sd_dialog = SmartdeviceDialog(self.gui) sd_dialog.exec_() - self.share_conn_menu.smartdevice_state_changed( - self.gui.device_manager.is_running('smartdevice')) - - def smartdevice_state_changed(self, running): - self.share_conn_menu.smartdevice_state_changed(running) def check_smartdevice_menus(self): if not self.gui.device_manager.is_enabled('smartdevice'): diff --git a/src/calibre/gui2/dialogs/smartdevice.py b/src/calibre/gui2/dialogs/smartdevice.py index 63c49a5fc7..15b40d1077 100644 --- a/src/calibre/gui2/dialogs/smartdevice.py +++ b/src/calibre/gui2/dialogs/smartdevice.py @@ -22,47 +22,45 @@ class SmartdeviceDialog(QDialog, Ui_Dialog): 'answer yes. If you do not, the app will not work. It will ' 'be unable to connect to calibre.')) - self.passwd_msg.setText( + self.password_box.setToolTip('

' + _('Use a password if calibre is running on a network that ' 'is not secure. For example, if you run calibre on a laptop, ' 'use that laptop in an airport, and want to connect your ' - 'smart device to calibre, you should use a password.')) + 'smart device to calibre, you should use a password.') + '

') - self.auto_start_msg.setText( + self.run_box.setToolTip('

' + + _('Check this box to allow calibre to accept connections from the ' + 'smart device. Uncheck the box to prevent connections.') + '

') + + self.autostart_box.setToolTip('

' + _('Check this box if you want calibre to automatically start the ' 'smart device interface when calibre starts. You should not do ' 'this if you are using a network that is not secure and you ' - 'are not setting a password.')) + 'are not setting a password.') + '

') self.connect(self.show_password, SIGNAL('stateChanged(int)'), self.toggle_password) + self.autostart_box.stateChanged.connect(self.autostart_changed) self.device_manager = parent.device_manager + if self.device_manager.is_running('smartdevice'): + self.run_box.setChecked(True) + else: + self.run_box.setChecked(False) + if self.device_manager.get_option('smartdevice', 'autostart'): self.autostart_box.setChecked(True) + self.run_box.setChecked(True) + self.run_box.setEnabled(False) + pw = self.device_manager.get_option('smartdevice', 'password') if pw: self.password_box.setText(pw) - if self.device_manager.is_running('smartdevice'): - self.start_button.setEnabled(False) - self.stop_button.setEnabled(True) + def autostart_changed(self): + if self.autostart_box.isChecked(): + self.run_box.setChecked(True) + self.run_box.setEnabled(False) else: - self.start_button.setEnabled(True) - self.stop_button.setEnabled(False) - self.start_button.clicked.connect(self.start_button_clicked) - self.stop_button.clicked.connect(self.stop_button_clicked) - self.cancel_button.clicked.connect(self.cancel_button_clicked) - self.OK_button.clicked.connect(self.accept) - - def start_button_clicked(self): - self.device_manager.start_plugin('smartdevice') - self.accept() - - def stop_button_clicked(self): - self.device_manager.stop_plugin('smartdevice') - self.accept() - - def cancel_button_clicked(self): - QDialog.reject(self) + self.run_box.setEnabled(True) def toggle_password(self, state): if state == Qt.Unchecked: @@ -75,4 +73,9 @@ class SmartdeviceDialog(QDialog, Ui_Dialog): unicode(self.password_box.text())) self.device_manager.set_option('smartdevice', 'autostart', self.autostart_box.isChecked()) + if self.run_box.isChecked(): + self.device_manager.start_plugin('smartdevice') + else: + self.device_manager.stop_plugin('smartdevice') + QDialog.accept(self) diff --git a/src/calibre/gui2/dialogs/smartdevice.ui b/src/calibre/gui2/dialogs/smartdevice.ui index 26795249be..97b4b71c00 100644 --- a/src/calibre/gui2/dialogs/smartdevice.ui +++ b/src/calibre/gui2/dialogs/smartdevice.ui @@ -18,7 +18,7 @@ :/images/mimetypes/unknown.png:/images/mimetypes/unknown.png - + TextLabel @@ -43,16 +43,6 @@ QLineEdit::Password - - - - - - TextLabel - - - true - 100 @@ -69,61 +59,77 @@ + + + &Allow connections + + + + - &Auto-start + &Automatically allow connections at startup - - - - true + + + + + 0 + 100 + - - - - All the buttons except Cancel will save the above settings + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - Start interface - - - - - - - Stop interface - - - - - - - OK - - - - - - - Cancel - - - - - + + + buttonBox + accepted() + Dialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + Dialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index be86e91c29..8a7dfa1153 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -342,7 +342,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ if self.device_manager.get_option('smartdevice', 'autostart'): try: self.device_manager.start_plugin('smartdevice') - smartdevice_actions.smartdevice_state_changed(True) except: pass From 26d010d31580e7397b45005fa171dfa249332dd9 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 24 Jul 2012 19:23:45 +0200 Subject: [PATCH 16/48] Improved thread handling in device_manager dynamic plugin methods. Improved smartdevice dialog box. --- src/calibre/devices/interface.py | 19 ++++++-- src/calibre/gui2/device.py | 78 ++++++++++++++++---------------- 2 files changed, 55 insertions(+), 42 deletions(-) diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index 0f2027065e..1466732169 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -515,12 +515,15 @@ class DevicePlugin(Plugin): pass # Dynamic control interface + # All of these methods are called on the device_manager thread def is_dynamically_controllable(self): ''' Called by the device manager when starting plugins. If this method returns a string, then a) it supports the device manager's dynamic control - interface, and b) that name is to be used when talking to the plugin + interface, and b) that name is to be used when talking to the plugin. + + This method must be called from the device_manager thread. ''' return None @@ -529,6 +532,8 @@ class DevicePlugin(Plugin): This method is called to start the plugin. The plugin should begin to accept device connections however it does that. If the plugin is already accepting connections, then do nothing. + + This method must be called from the device_manager thread. ''' pass @@ -538,27 +543,35 @@ class DevicePlugin(Plugin): accept connections, and should cleanup behind itself. It is likely that this method should call shutdown. If the plugin is already not accepting connections, then do nothing. + + This method must be called from the device_manager thread. ''' pass - def get_option(self, opt_string): + def get_option(self, opt_string, default=None): ''' Return the value of the option indicated by opt_string. This method can be called when the plugin is not started. Return None if the option does not exist. + + This method must be called from the device_manager thread. ''' - return None + return default def set_option(self, opt_string, opt_value): ''' Set the value of the option indicated by opt_string. This method can be called when the plugin is not started. + + This method must be called from the device_manager thread. ''' pass def is_running(self): ''' Return True if the plugin is started, otherwise false + + This method must be called from the device_manager thread. ''' return False diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 14a9093bd4..63d7a03220 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal ' # Imports {{{ import os, traceback, Queue, time, cStringIO, re, sys -from threading import Thread +from threading import Thread, Event from PyQt4.Qt import (QMenu, QAction, QActionGroup, QIcon, SIGNAL, Qt, pyqtSignal, QDialog, QObject, QVBoxLayout, @@ -30,6 +30,7 @@ from calibre.constants import DEBUG from calibre.utils.config import prefs, tweaks from calibre.utils.magick.draw import thumbnail from calibre.library.save_to_disk import find_plugboard +from calibre.gui2 import is_gui_thread # }}} class DeviceJob(BaseJob): # {{{ @@ -145,8 +146,10 @@ class DeviceManager(Thread): # {{{ self._device_information = None self.current_library_uuid = None self.call_shutdown_on_disconnect = False - self.devices_initialized = Queue.Queue(0) + self.devices_initialized = Event() self.dynamic_plugins = {} + self.dynamic_plugin_requests = Queue.Queue(0) + self.dynamic_plugin_responses = Queue.Queue(0) def report_progress(self, *args): pass @@ -291,7 +294,7 @@ class DeviceManager(Thread): # {{{ n = d.is_dynamically_controllable() if n: self.dynamic_plugins[n] = d - self.devices_initialized.put(None) + self.devices_initialized.set() while self.keep_going: kls = None @@ -315,6 +318,7 @@ class DeviceManager(Thread): # {{{ traceback.print_exc() else: self.detect_device() + while True: job = self.next() if job is not None: @@ -325,8 +329,15 @@ class DeviceManager(Thread): # {{{ self.current_job = None else: break - time.sleep(self.sleep_time) - + while True: + dynamic_method = None + try: + (dynamic_method, args, kwargs) = \ + self.dynamic_plugin_requests.get(self.sleep_time) + res = dynamic_method(*args, **kwargs) + self.dynamic_plugin_responses.put(res) + except Queue.Empty: + break # We are exiting. Call the shutdown method for each plugin for p in self.devices: try: @@ -516,47 +527,36 @@ class DeviceManager(Thread): # {{{ # dynamic plugin interface - def start_plugin(self, name): + # This is a helper function that handles queueing with the device manager + def _queue_request(self, name, method, *args, **kwargs): + if not is_gui_thread(): + raise ValueError( + 'The device_manager dynamic plugin methods must be called from the GUI thread') try: d = self.dynamic_plugins.get(name, None) - if d: - d.start_plugin() + self.dynamic_plugin_requests.put((getattr(d, method), args, kwargs)) + return self.dynamic_plugin_responses.get() except: - pass - - def stop_plugin(self, name): - try: - d = self.dynamic_plugins.get(name, None) - if d: - d.stop_plugin() - except: - pass - - def get_option(self, name, opt_string): - try: - d = self.dynamic_plugins.get(name, None) - if d: - return d.get_option(opt_string) - except: - pass + traceback.print_exc() return None + # The dynamic plugin methods below must be called on the GUI thread. They + # will switch to the device thread before calling the plugin. + + def start_plugin(self, name): + self._queue_request(name, 'start_plugin') + + def stop_plugin(self, name): + self._queue_request(name, 'stop_plugin') + + def get_option(self, name, opt_string, default=None): + return self._queue_request(name, 'get_option', opt_string, default=default) + def set_option(self, name, opt_string, opt_value): - try: - d = self.dynamic_plugins.get(name, None) - if d: - d.set_option(opt_string, opt_value) - except: - pass + self._queue_request(name, 'set_option', opt_string, opt_value) def is_running(self, name): - try: - d = self.dynamic_plugins.get(name, None) - if d: - return d.is_running() - except: - pass - return False + return self._queue_request(name, 'is_running') def is_enabled(self, name): try: @@ -767,7 +767,7 @@ class DeviceMixin(object): # {{{ self.job_manager, Dispatcher(self.status_bar.show_message), Dispatcher(self.show_open_feedback)) self.device_manager.start() - self.device_manager.devices_initialized.get() + self.device_manager.devices_initialized.wait() if tweaks['auto_connect_to_folder']: self.connect_to_folder_named(tweaks['auto_connect_to_folder']) From 9d28e7a366e4538b57420dbb7224a518691f0032 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 24 Jul 2012 20:50:58 +0200 Subject: [PATCH 17/48] Make the menu icon for the smartdevice control change according to whether or not it is running. --- resources/images/dot_green.png | Bin 0 -> 1526 bytes resources/images/dot_red.png | Bin 0 -> 1450 bytes src/calibre/gui2/actions/device.py | 10 +++++++++- src/calibre/gui2/ui.py | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 resources/images/dot_green.png create mode 100644 resources/images/dot_red.png diff --git a/resources/images/dot_green.png b/resources/images/dot_green.png new file mode 100644 index 0000000000000000000000000000000000000000..c05376d7a78c5b5b0eb7e8155fac75d829445444 GIT binary patch literal 1526 zcmV*tc)l1%y>hAOt^11;26xB{c;^8L2dN#!<%<8xza2$uHEBN~N$SM@!O4 zB}dH}G_7Pb6eKGV91|7P`~qd=dqv#u_jcdwyhn>L?lV7jrvB(MXV2r@d(ZjZbMCwM z5uzxVPFf!>2>9uEW9UY62d`DVRVM9j#6XHPEClsHo0Bqg<;mhSODh z5TtoM`dZq~m#kM!PyqPwCq~xOVpCyn$#&_V4dMF1Y4QE$flFur&Q%YBU`Mmkz9E1l zSzxHHK#@UEcyTLK8P7_YScE<~^eK;8{SxOHVD-UPfa!6mu;=9V&C#Kw(_(w3fWv73 zUTAqp;0Hleq(7+XP$;>62+9pb+30ft`fOe3LP?Rr zxMQQREDYTZj+O6%TgFT4(Il5+&8rFkD{|G6it$nVmQ0SF40TLN$A~^-XGeDHk2P<6jI=A4gQ2>>mD&sN+vTGvv=Fu$j1-I843mDTBL9p~20|!2VOaz-+(Q8O%N^MFYu@eb*X^Mm0p@MdIA$eG zWLSp5)CAh-1mo7y8l>Q@@a?4(y1ki&Z)K>E$e|AE{7rUJlg8+{DZ z6UK+Ij0!iQ%c}q+L16}X*i&%i_P1|aJ(pm{7e4tZ!{f#V>-Biq@J|#-snMhgYK%rW zRDAO2?su(89s#C(=Cl0y$jHo?zJ2frwtE$Tp;;)sbQ%7*awUE5VyoxZaO$Vp5S@lK z%uY_iBbdW1IK8xb8joZKat`N%*=7&TU1n+fVCeubX`NP5o8yNJOpA^P0~==rZyd!M z#s|tPZ$aUibJEqk;J^yY{oeKfFMlip^w+ZN`P7s|>~(>If4WkrRV=Q7f*pAUxO&?F zG+p@deFcD&44wNivqx~(<&(z@!%rguEo;olN=Vilv~Q$eqev3(d`4b1jr#1LHzB{|Ja85!C!qSpOhFLtu`FwzUwwS~W1b{3vS->wrZ4< zxfdrALZCqK-K2S>sH!DIs+s2einZ48Ul?nb1`O&%;ao14>5(%a0Tit_x9x%2+FF&L zpC655D9i{!(=_RHI%#xDGYmtZCfsu=ijo|m$;IOsL8H+KI7h0H%WO9D?maMiiB3G8 zb^jyx0RVTCKqM`}xNQ{`6+~lWBM})HDchQxo7?&V0s_R~;9wEQh*42dZBB8%{451_ c+u8&C1?524-}?^}>;M1&07*qoM6N<$f}CvUw*UYD literal 0 HcmV?d00001 diff --git a/resources/images/dot_red.png b/resources/images/dot_red.png new file mode 100644 index 0000000000000000000000000000000000000000..88df5ccf1538f96e29aba049ed95279a9a3dcb67 GIT binary patch literal 1450 zcmV;b1y%ZqP)~6Q+UbaDKZ8eme6seSJDuRSSB>D$z6Uv3*%`|ZFjyF% z5v7%~iLY_>>wv3W1r%=sro1|{sZ5T6mW)B_?f|5IzX4iII*IBND82cdH539E*ggxe z>QXFMca*Z)4~fltfUjEvT0#O{3V|jC!BCZ1Co}_;=mt`B0VRl#9O?(D>nv#T=rQ#5 z&V&3f0Jt@0uo?|;ZNcUH?6SI6SIYr(CV>{3%*;@zZwLY?s|b{v2G$?eBXeF!pxu=~*{|WSY zFxP)xfE(Ma+2v8z<2~fs{5zUxSMxo>Zu0C7ZrRSqO>a0H^HtSK$lZZsJgcPashzrvjCrn%j;gYJ^2*geCpBD z{-AQWJP^C{D@Y?lr%?0ChC%?>wpdqC7IwIF)q0>DrTB9SFD>}oplnXiA^`{t^nsR^ zYc^hq|Ctw{XN&bP?{v01pI8fqrsD035+9@BA4Nm>x0{d*hufO2#NW#c(7oAu!Qpnd z*h~O9Rix;1fmjY=2oMPdFK)UTe>N|`)n;L=w8G=%mahauk&6q!u#g(L4S|U%-{!7F zbzXqW&4OHB>9JUBT(p$R{Y+iuQO@i$8dMt)!6n^a%odN>; zfB>IwD!rq-0Kmmf!dP{AnU}!sGqmDnfS^e9O2F9Uw6CSRKnZ?$MmSed>UfT2XwVh4 zr~oATl+ouzAaZ`^&xu`m0nRn?hn=Fey~Hknno1WHfaWYP6HP!^ins0RN#_3UG0%~$;rJ#8WkQN61@XeUFUxTV! zdkX=4^E97bw%Y~E;m0Z+phT0Iax7+;X=m&_{N;~8G?6yz-e&6e{Zatn>kVA)`48O= z;SFz@9h6uSn^J!Cau8)@B<`)2bg#ZV7W#Y(@BgFXl zIJK+q(+^6l%m7}( z@j@Yh4g~1m*G2||L1toN!u&XJ>>IuCu2WCGT8-r>75Pj#%)ZdDKeCUN`N&XMXS3dB z+5=J&#xU(6N;viHvYqX^u1g%pMMp zSs~qPs0|PA_Nb8-mqUOOCkG5o0mssrb17K`Mb%&?oPtm!0h6@j$Ggs&^CRN2I~Y8O zJ|=JuplJ-VpcDl70s#j0FU$Z*k|NGL&U8i0@2Lq7Z*$60Gi7Kcw60c~=TwsRYXlVv zv5xK$SM8;7!83(HRg|=*Y0*c{fC=zY-~Ar&`~8e4iZt3#m=S`eX;M{H8lBP>i-o|M znD2OsG995xQ_x1|d0xjeW{tF1ET&|8;PdsY@nUa*9xws2!vryB6DF%092_L3r>BYf z`udD66bjAnxm+%zs;bIB8>6A2Vcsd8&#cYBSzRu`-&1Jc-`{=mrT_o{07*qoM6N<$ Ef-$PXS^xk5 literal 0 HcmV?d00001 diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py index 8d08f53f0a..92ed77e324 100644 --- a/src/calibre/gui2/actions/device.py +++ b/src/calibre/gui2/actions/device.py @@ -59,7 +59,7 @@ class ShareConnMenu(QMenu): # {{{ self.toggle_server_action.triggered.connect(lambda x: self.toggle_server.emit()) self.control_smartdevice_action = \ - self.addAction(QIcon(I('devices/galaxy_s3.png')), + self.addAction(QIcon(I('dot_green.png')), _('Control Smart Device Connections')) self.control_smartdevice_action.triggered.connect(lambda x: self.control_smartdevice.emit()) @@ -217,7 +217,15 @@ class ConnectShareAction(InterfaceAction): def control_smartdevice(self): sd_dialog = SmartdeviceDialog(self.gui) sd_dialog.exec_() + self.set_smartdevice_icon() def check_smartdevice_menus(self): if not self.gui.device_manager.is_enabled('smartdevice'): self.share_conn_menu.hide_smartdevice_menus() + + def set_smartdevice_icon(self): + running = self.gui.device_manager.is_running('smartdevice') + if running: + self.share_conn_menu.control_smartdevice_action.setIcon(QIcon(I('dot_green.png'))) + else: + self.share_conn_menu.control_smartdevice_action.setIcon(QIcon(I('dot_red.png'))) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 8a7dfa1153..b414ef04dd 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -344,6 +344,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ self.device_manager.start_plugin('smartdevice') except: pass + smartdevice_actions.set_smartdevice_icon() self.keyboard_interrupt.connect(self.quit, type=Qt.QueuedConnection) From 40a273b316db7a719699af594b158975c6cc6834 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 24 Jul 2012 21:12:04 +0200 Subject: [PATCH 18/48] Fix sleep time parameter of dynamic plugin queue.get --- src/calibre/gui2/device.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 63d7a03220..75ec2f9a12 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -333,7 +333,7 @@ class DeviceManager(Thread): # {{{ dynamic_method = None try: (dynamic_method, args, kwargs) = \ - self.dynamic_plugin_requests.get(self.sleep_time) + self.dynamic_plugin_requests.get(timeout=self.sleep_time) res = dynamic_method(*args, **kwargs) self.dynamic_plugin_responses.put(res) except Queue.Empty: From 9180cf7d9a1f78991f584d664dd2b37b2c134879 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 25 Jul 2012 09:15:26 +0530 Subject: [PATCH 19/48] Fix #1028690 (Device not detected - Zeki TB782B) --- src/calibre/devices/android/driver.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py index eca5d615ce..beee1082fb 100644 --- a/src/calibre/devices/android/driver.py +++ b/src/calibre/devices/android/driver.py @@ -194,7 +194,7 @@ class ANDROID(USBMS): 'GENERIC-', 'ZTE', 'MID', 'QUALCOMM', 'PANDIGIT', 'HYSTON', 'VIZIO', 'GOOGLE', 'FREESCAL', 'KOBO_INC', 'LENOVO', 'ROCKCHIP', 'POCKET', 'ONDA_MID', 'ZENITHIN', 'INGENIC', 'PMID701C', 'PD', - 'PMP5097C', 'MASS', 'NOVO7'] + 'PMP5097C', 'MASS', 'NOVO7', 'ZEKI'] 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_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', @@ -212,7 +212,7 @@ class ANDROID(USBMS): 'KTABLET_PC', 'INGENIC', 'GT-I9001_CARD', 'USB_2.0_DRIVER', 'GT-S5830L_CARD', 'UNIVERSE', 'XT875', 'PRO', '.KOBO_VOX', 'THINKPAD_TABLET', 'SGH-T989', 'YP-G70', 'STORAGE_DEVICE', - 'ADVANCED', 'SGH-I727'] + 'ADVANCED', 'SGH-I727', 'USB_FLASH_DRIVER'] WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897', 'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD', 'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD', @@ -221,7 +221,8 @@ class ANDROID(USBMS): 'A1-07___C0541A4F', 'XT912', 'MB855', 'XT910', 'BOOK_A10_CARD', 'USB_2.0_DRIVER', 'I9100T', 'P999DW_SD_CARD', 'KTABLET_PC', 'FILE-CD_GADGET', 'GT-I9001_CARD', 'USB_2.0_DRIVER', 'XT875', - 'UMS_COMPOSITE', 'PRO', '.KOBO_VOX', 'SGH-T989_CARD', 'SGH-I727'] + 'UMS_COMPOSITE', 'PRO', '.KOBO_VOX', 'SGH-T989_CARD', 'SGH-I727', + 'USB_FLASH_DRIVER'] OSX_MAIN_MEM = 'Android Device Main Memory' From 2aa4f7c70bb5749e714dc2d2b3044b1e872b292e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 25 Jul 2012 10:14:40 +0530 Subject: [PATCH 20/48] Conversion: Ignore invalid chapter detection and level n ToC expressions instead of erroring out --- .../ebooks/oeb/transforms/structure.py | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/calibre/ebooks/oeb/transforms/structure.py b/src/calibre/ebooks/oeb/transforms/structure.py index dd3db1415a..b90774bcc7 100644 --- a/src/calibre/ebooks/oeb/transforms/structure.py +++ b/src/calibre/ebooks/oeb/transforms/structure.py @@ -82,10 +82,17 @@ class DetectStructure(object): def detect_chapters(self): self.detected_chapters = [] + + def find_matches(expr, doc): + try: + return XPath(expr)(doc) + except: + self.log.warn('Invalid chapter expression, ignoring: %s'%expr) + return [] + if self.opts.chapter: - chapter_xpath = XPath(self.opts.chapter) for item in self.oeb.spine: - for x in chapter_xpath(item.data): + for x in find_matches(self.opts.chapter, item.data): self.detected_chapters.append((item, x)) chapter_mark = self.opts.chapter_mark @@ -164,11 +171,19 @@ class DetectStructure(object): added = OrderedDict() added2 = OrderedDict() counter = 1 + + def find_matches(expr, doc): + try: + return XPath(expr)(doc) + except: + self.log.warn('Invalid ToC expression, ignoring: %s'%expr) + return [] + for document in self.oeb.spine: previous_level1 = list(added.itervalues())[-1] if added else None previous_level2 = list(added2.itervalues())[-1] if added2 else None - for elem in XPath(self.opts.level1_toc)(document.data): + for elem in find_matches(self.opts.level1_toc, document.data): text, _href = self.elem_to_link(document, elem, counter) counter += 1 if text: @@ -178,7 +193,7 @@ class DetectStructure(object): #node.add(_('Top'), _href) if self.opts.level2_toc is not None and added: - for elem in XPath(self.opts.level2_toc)(document.data): + for elem in find_matches(self.opts.level2_toc, document.data): level1 = None for item in document.data.iterdescendants(): if item in added: @@ -196,7 +211,8 @@ class DetectStructure(object): break if self.opts.level3_toc is not None and added2: - for elem in XPath(self.opts.level3_toc)(document.data): + for elem in find_matches(self.opts.level3_toc, + document.data): level2 = None for item in document.data.iterdescendants(): if item in added2: From 1941541cdf4296fed1c9116f3328036b3939951c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 25 Jul 2012 10:18:37 +0530 Subject: [PATCH 21/48] ... --- src/calibre/ebooks/conversion/plumber.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py index 78821fa595..6a7b5e586b 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -326,7 +326,7 @@ OptionRecommendation(name='page_breaks_before', recommended_value="//*[name()='h1' or name()='h2']", level=OptionRecommendation.LOW, help=_('An XPath expression. Page breaks are inserted ' - 'before the specified elements.') + 'before the specified elements. To disable use the expression: /') ), OptionRecommendation(name='remove_fake_margins', From bd6acc80c6e9769155e84f9cc809006a5809c688 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 25 Jul 2012 07:28:11 +0200 Subject: [PATCH 22/48] Eliminate spurious exception message in dynamic control interface --- src/calibre/gui2/device.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 75ec2f9a12..8364e06f0f 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -534,8 +534,9 @@ class DeviceManager(Thread): # {{{ 'The device_manager dynamic plugin methods must be called from the GUI thread') try: d = self.dynamic_plugins.get(name, None) - self.dynamic_plugin_requests.put((getattr(d, method), args, kwargs)) - return self.dynamic_plugin_responses.get() + if d: + self.dynamic_plugin_requests.put((getattr(d, method), args, kwargs)) + return self.dynamic_plugin_responses.get() except: traceback.print_exc() return None @@ -556,7 +557,9 @@ class DeviceManager(Thread): # {{{ self._queue_request(name, 'set_option', opt_string, opt_value) def is_running(self, name): - return self._queue_request(name, 'is_running') + if self._queue_request(name, 'is_running'): + return True + return False def is_enabled(self, name): try: From f1a0e3ccb1709f792ee219ba6d46d9ec3dd289db Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 25 Jul 2012 08:23:19 +0200 Subject: [PATCH 23/48] Fix searching with localized strings that contain capital letters. --- src/calibre/library/caches.py | 50 ++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index e9bb6286f3..a516681fab 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -352,6 +352,14 @@ class ResultCache(SearchQueryParser): # {{{ '<=':[2, relop_le] } + local_today = ('_today', icu_lower(_('today'))) + local_yesterday = ('_yesterday', icu_lower(_('yesterday'))) + local_thismonth = ('_thismonth', icu_lower(_('thismonth'))) + local_daysago = icu_lower(_('daysago')) + local_daysago_len = len(local_daysago) + untrans_daysago = '_daysago' + untrans_daysago_len = len('_daysago') + def get_dates_matches(self, location, query, candidates): matches = set([]) if len(query) < 2: @@ -390,17 +398,24 @@ class ResultCache(SearchQueryParser): # {{{ if relop is None: (p, relop) = self.date_search_relops['='] - if query == _('today'): + if query in self.local_today: qd = now() field_count = 3 - elif query == _('yesterday'): + elif query in self.local_yesterday: qd = now() - timedelta(1) field_count = 3 - elif query == _('thismonth'): + elif query in self.local_thismonth: qd = now() field_count = 2 - elif query.endswith(_('daysago')): - num = query[0:-len(_('daysago'))] + elif query.endswith(self.local_daysago): + num = query[0:-self.local_daysago_len] + try: + qd = now() - timedelta(int(num)) + except: + raise ParseException(query, len(query), 'Number conversion error', self) + field_count = 3 + elif query.endswith(self.untrans_daysago): + num = query[0:-self.untrans_daysago_len] try: qd = now() - timedelta(int(num)) except: @@ -591,14 +606,23 @@ class ResultCache(SearchQueryParser): # {{{ query = icu_lower(query) return matchkind, query + local_no = icu_lower(_('no')) + local_yes = icu_lower(_('yes')) + local_unchecked = icu_lower(_('unchecked')) + local_checked = icu_lower(_('checked')) + local_empty = icu_lower(_('empty')) + local_blank = icu_lower(_('blank')) + local_bool_values = ( + local_no, local_unchecked, '_no', 'false', + local_yes, local_checked, '_yes', 'true', + local_empty, local_blank, '_empty') + def get_bool_matches(self, location, query, candidates): bools_are_tristate = self.db_prefs.get('bools_are_tristate') loc = self.field_metadata[location]['rec_index'] matches = set() query = icu_lower(query) - if query not in (_('no'), _('unchecked'), '_no', 'false', - _('yes'), _('checked'), '_yes', 'true', - _('empty'), _('blank'), '_empty'): + if query not in self.local_bool_values: raise ParseException(_('Invalid boolean query "{0}"').format(query)) for id_ in candidates: item = self._data[id_] @@ -608,20 +632,20 @@ class ResultCache(SearchQueryParser): # {{{ val = force_to_bool(item[loc]) if not bools_are_tristate: if val is None or not val: # item is None or set to false - if query in [_('no'), _('unchecked'), '_no', 'false']: + if query in (self.local_no, self.local_unchecked, '_no', 'false'): matches.add(item[0]) else: # item is explicitly set to true - if query in [_('yes'), _('checked'), '_yes', 'true']: + if query in (self.local_yes, self.local_checked, '_yes', 'true'): matches.add(item[0]) else: if val is None: - if query in [_('empty'), _('blank'), '_empty', 'false']: + if query in (self.local_empty, self.local_blank, '_empty', 'false'): matches.add(item[0]) elif not val: # is not None and false - if query in [_('no'), _('unchecked'), '_no', 'true']: + if query in (self.local_no, self.local_unchecked, '_no', 'true'): matches.add(item[0]) else: # item is not None and true - if query in [_('yes'), _('checked'), '_yes', 'true']: + if query in (self.local_yes, self.local_checked, '_yes', 'true'): matches.add(item[0]) return matches From daff566a56183296d9d58292e9db471b0721e6ac Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 25 Jul 2012 12:04:52 +0530 Subject: [PATCH 24/48] Fix boolean and date searching in non english calibre installs. --- src/calibre/library/caches.py | 50 ++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index e9bb6286f3..a516681fab 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -352,6 +352,14 @@ class ResultCache(SearchQueryParser): # {{{ '<=':[2, relop_le] } + local_today = ('_today', icu_lower(_('today'))) + local_yesterday = ('_yesterday', icu_lower(_('yesterday'))) + local_thismonth = ('_thismonth', icu_lower(_('thismonth'))) + local_daysago = icu_lower(_('daysago')) + local_daysago_len = len(local_daysago) + untrans_daysago = '_daysago' + untrans_daysago_len = len('_daysago') + def get_dates_matches(self, location, query, candidates): matches = set([]) if len(query) < 2: @@ -390,17 +398,24 @@ class ResultCache(SearchQueryParser): # {{{ if relop is None: (p, relop) = self.date_search_relops['='] - if query == _('today'): + if query in self.local_today: qd = now() field_count = 3 - elif query == _('yesterday'): + elif query in self.local_yesterday: qd = now() - timedelta(1) field_count = 3 - elif query == _('thismonth'): + elif query in self.local_thismonth: qd = now() field_count = 2 - elif query.endswith(_('daysago')): - num = query[0:-len(_('daysago'))] + elif query.endswith(self.local_daysago): + num = query[0:-self.local_daysago_len] + try: + qd = now() - timedelta(int(num)) + except: + raise ParseException(query, len(query), 'Number conversion error', self) + field_count = 3 + elif query.endswith(self.untrans_daysago): + num = query[0:-self.untrans_daysago_len] try: qd = now() - timedelta(int(num)) except: @@ -591,14 +606,23 @@ class ResultCache(SearchQueryParser): # {{{ query = icu_lower(query) return matchkind, query + local_no = icu_lower(_('no')) + local_yes = icu_lower(_('yes')) + local_unchecked = icu_lower(_('unchecked')) + local_checked = icu_lower(_('checked')) + local_empty = icu_lower(_('empty')) + local_blank = icu_lower(_('blank')) + local_bool_values = ( + local_no, local_unchecked, '_no', 'false', + local_yes, local_checked, '_yes', 'true', + local_empty, local_blank, '_empty') + def get_bool_matches(self, location, query, candidates): bools_are_tristate = self.db_prefs.get('bools_are_tristate') loc = self.field_metadata[location]['rec_index'] matches = set() query = icu_lower(query) - if query not in (_('no'), _('unchecked'), '_no', 'false', - _('yes'), _('checked'), '_yes', 'true', - _('empty'), _('blank'), '_empty'): + if query not in self.local_bool_values: raise ParseException(_('Invalid boolean query "{0}"').format(query)) for id_ in candidates: item = self._data[id_] @@ -608,20 +632,20 @@ class ResultCache(SearchQueryParser): # {{{ val = force_to_bool(item[loc]) if not bools_are_tristate: if val is None or not val: # item is None or set to false - if query in [_('no'), _('unchecked'), '_no', 'false']: + if query in (self.local_no, self.local_unchecked, '_no', 'false'): matches.add(item[0]) else: # item is explicitly set to true - if query in [_('yes'), _('checked'), '_yes', 'true']: + if query in (self.local_yes, self.local_checked, '_yes', 'true'): matches.add(item[0]) else: if val is None: - if query in [_('empty'), _('blank'), '_empty', 'false']: + if query in (self.local_empty, self.local_blank, '_empty', 'false'): matches.add(item[0]) elif not val: # is not None and false - if query in [_('no'), _('unchecked'), '_no', 'true']: + if query in (self.local_no, self.local_unchecked, '_no', 'true'): matches.add(item[0]) else: # item is not None and true - if query in [_('yes'), _('checked'), '_yes', 'true']: + if query in (self.local_yes, self.local_checked, '_yes', 'true'): matches.add(item[0]) return matches From abbc24e9c1e987229f591a722bc8e356e00ff755 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 25 Jul 2012 08:58:08 +0200 Subject: [PATCH 25/48] Properly handle the default argument in get_option when the requested plugin does not exist. --- src/calibre/gui2/device.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 8364e06f0f..f08f87bf80 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -539,7 +539,7 @@ class DeviceManager(Thread): # {{{ return self.dynamic_plugin_responses.get() except: traceback.print_exc() - return None + return kwargs.get('default', None) # The dynamic plugin methods below must be called on the GUI thread. They # will switch to the device thread before calling the plugin. From 9c63dab390521999d8afb55c55168d0eba53d41d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 25 Jul 2012 11:29:33 +0200 Subject: [PATCH 26/48] Use a synchronizing decorator for the dynamic control methods. --- src/calibre/devices/interface.py | 25 ++++++++++++++------- src/calibre/gui2/device.py | 38 +++++++++----------------------- 2 files changed, 28 insertions(+), 35 deletions(-) diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index 1466732169..c9e62bcfca 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -514,8 +514,11 @@ class DevicePlugin(Plugin): ''' pass - # Dynamic control interface - # All of these methods are called on the device_manager thread + # Dynamic control interface. + # The following methods are probably called on the GUI thread. Any driver + # that implements these methods must take pains to be thread safe, because + # the device_manager might be using the driver at the same time that one of + # these methods is called. def is_dynamically_controllable(self): ''' @@ -523,7 +526,8 @@ class DevicePlugin(Plugin): a string, then a) it supports the device manager's dynamic control interface, and b) that name is to be used when talking to the plugin. - This method must be called from the device_manager thread. + This method can be called on the GUI thread. A driver that implements + this method must be thread safe. ''' return None @@ -533,7 +537,8 @@ class DevicePlugin(Plugin): to accept device connections however it does that. If the plugin is already accepting connections, then do nothing. - This method must be called from the device_manager thread. + This method can be called on the GUI thread. A driver that implements + this method must be thread safe. ''' pass @@ -544,7 +549,8 @@ class DevicePlugin(Plugin): this method should call shutdown. If the plugin is already not accepting connections, then do nothing. - This method must be called from the device_manager thread. + This method can be called on the GUI thread. A driver that implements + this method must be thread safe. ''' pass @@ -554,7 +560,8 @@ class DevicePlugin(Plugin): be called when the plugin is not started. Return None if the option does not exist. - This method must be called from the device_manager thread. + This method can be called on the GUI thread. A driver that implements + this method must be thread safe. ''' return default @@ -563,7 +570,8 @@ class DevicePlugin(Plugin): Set the value of the option indicated by opt_string. This method can be called when the plugin is not started. - This method must be called from the device_manager thread. + This method can be called on the GUI thread. A driver that implements + this method must be thread safe. ''' pass @@ -571,7 +579,8 @@ class DevicePlugin(Plugin): ''' Return True if the plugin is started, otherwise false - This method must be called from the device_manager thread. + This method can be called on the GUI thread. A driver that implements + this method must be thread safe. ''' return False diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index f08f87bf80..d4b8aa0e9b 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -148,8 +148,6 @@ class DeviceManager(Thread): # {{{ self.call_shutdown_on_disconnect = False self.devices_initialized = Event() self.dynamic_plugins = {} - self.dynamic_plugin_requests = Queue.Queue(0) - self.dynamic_plugin_responses = Queue.Queue(0) def report_progress(self, *args): pass @@ -329,15 +327,8 @@ class DeviceManager(Thread): # {{{ self.current_job = None else: break - while True: - dynamic_method = None - try: - (dynamic_method, args, kwargs) = \ - self.dynamic_plugin_requests.get(timeout=self.sleep_time) - res = dynamic_method(*args, **kwargs) - self.dynamic_plugin_responses.put(res) - except Queue.Empty: - break + time.sleep(self.sleep_time) + # We are exiting. Call the shutdown method for each plugin for p in self.devices: try: @@ -528,36 +519,29 @@ class DeviceManager(Thread): # {{{ # dynamic plugin interface # This is a helper function that handles queueing with the device manager - def _queue_request(self, name, method, *args, **kwargs): - if not is_gui_thread(): - raise ValueError( - 'The device_manager dynamic plugin methods must be called from the GUI thread') - try: - d = self.dynamic_plugins.get(name, None) - if d: - self.dynamic_plugin_requests.put((getattr(d, method), args, kwargs)) - return self.dynamic_plugin_responses.get() - except: - traceback.print_exc() + def _call_request(self, name, method, *args, **kwargs): + d = self.dynamic_plugins.get(name, None) + if d: + return getattr(d, method)(*args, **kwargs) return kwargs.get('default', None) # The dynamic plugin methods below must be called on the GUI thread. They # will switch to the device thread before calling the plugin. def start_plugin(self, name): - self._queue_request(name, 'start_plugin') + self._call_request(name, 'start_plugin') def stop_plugin(self, name): - self._queue_request(name, 'stop_plugin') + self._call_request(name, 'stop_plugin') def get_option(self, name, opt_string, default=None): - return self._queue_request(name, 'get_option', opt_string, default=default) + return self._call_request(name, 'get_option', opt_string, default=default) def set_option(self, name, opt_string, opt_value): - self._queue_request(name, 'set_option', opt_string, opt_value) + self._call_request(name, 'set_option', opt_string, opt_value) def is_running(self, name): - if self._queue_request(name, 'is_running'): + if self._call_request(name, 'is_running'): return True return False From 382248eff11e10670ee59ec3cd03f655e00a5690 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 25 Jul 2012 15:27:07 +0530 Subject: [PATCH 27/48] ... --- src/calibre/devices/android/driver.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py index beee1082fb..e0d8cea8e6 100644 --- a/src/calibre/devices/android/driver.py +++ b/src/calibre/devices/android/driver.py @@ -10,7 +10,7 @@ import cStringIO from calibre.devices.usbms.driver import USBMS -HTC_BCDS = [0x100, 0x0222, 0x0226, 0x227, 0x228, 0x229] +HTC_BCDS = [0x100, 0x0222, 0x0226, 0x227, 0x228, 0x229, 0x9999] class ANDROID(USBMS): @@ -41,9 +41,10 @@ class ANDROID(USBMS): 0xca9 : HTC_BCDS, 0xcac : HTC_BCDS, 0xccf : HTC_BCDS, + 0xcd6 : HTC_BCDS, 0xce5 : HTC_BCDS, 0x2910 : HTC_BCDS, - 0xff9 : HTC_BCDS + [0x9999], + 0xff9 : HTC_BCDS, }, # Eken From cf06ad7e67adcba458cb141f46c850d2b341a70d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 26 Jul 2012 00:20:12 +0530 Subject: [PATCH 28/48] Only write to gui.json once during shutdown --- src/calibre/gui2/ui.py | 7 ++++--- src/calibre/utils/config.py | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index b414ef04dd..7a05810f2d 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -702,9 +702,10 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ self.read_layout_settings() def write_settings(self): - config.set('main_window_geometry', self.saveGeometry()) - dynamic.set('sort_history', self.library_view.model().sort_history) - self.save_layout_state() + with gprefs: # Only write to gprefs once + config.set('main_window_geometry', self.saveGeometry()) + dynamic.set('sort_history', self.library_view.model().sort_history) + self.save_layout_state() def quit(self, checked=True, restart=False, debug_on_restart=False, confirm_quit=True): diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py index 3bd6b2c364..734be6c1a4 100644 --- a/src/calibre/utils/config.py +++ b/src/calibre/utils/config.py @@ -240,6 +240,7 @@ class XMLConfig(dict): def __init__(self, rel_path_to_cf_file): dict.__init__(self) + self.no_commit = False self.defaults = {} self.file_path = os.path.join(config_dir, *(rel_path_to_cf_file.split('/'))) @@ -304,6 +305,7 @@ class XMLConfig(dict): self.commit() def commit(self): + if self.no_commit: return if hasattr(self, 'file_path') and self.file_path: dpath = os.path.dirname(self.file_path) if not os.path.exists(dpath): @@ -314,6 +316,13 @@ class XMLConfig(dict): f.truncate() f.write(raw) + def __enter__(self): + self.no_commit = True + + def __exit__(self, *args): + self.no_commit = False + self.commit() + def to_json(obj): if isinstance(obj, bytearray): return {'__class__': 'bytearray', From 1fac69c87032da2afffa17992b8ae9cbcb9df4db Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 26 Jul 2012 10:06:45 +0530 Subject: [PATCH 29/48] ... --- manual/develop.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manual/develop.rst b/manual/develop.rst index 12bbcefe57..ce8b02a70d 100755 --- a/manual/develop.rst +++ b/manual/develop.rst @@ -150,9 +150,8 @@ the previously checked out |app| code directory, for example:: calibre is the directory that contains the src and resources sub-directories. Ensure you have installed the |app| commandline tools via :guilabel:`Preferences->Advanced->Miscellaneous` in the |app| GUI. The next step is to set the environment variable ``CALIBRE_DEVELOP_FROM`` to the absolute path of the src directory. -So, following the example above, it would be ``/Users/kovid/work/calibre/src``. Apple -`documentation `_ -on how to set environment variables. +So, following the example above, it would be ``/Users/kovid/work/calibre/src``. +`How to set environment variables `_. Once you have set the environment variable, open a new Terminal and check that it was correctly set by using the command:: From fff1892577c90561a92e6d3f27646df3266e6587 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 26 Jul 2012 10:14:12 +0530 Subject: [PATCH 30/48] Updated The Sun --- recipes/the_sun.recipe | 46 ++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/recipes/the_sun.recipe b/recipes/the_sun.recipe index ae7c599328..d93ac2c49b 100644 --- a/recipes/the_sun.recipe +++ b/recipes/the_sun.recipe @@ -1,4 +1,4 @@ -import re, random +import random from calibre import browser from calibre.web.feeds.recipes import BasicNewsRecipe @@ -8,45 +8,43 @@ class AdvancedUserRecipe1325006965(BasicNewsRecipe): title = u'The Sun UK' description = 'Articles from The Sun tabloid UK' __author__ = 'Dave Asbury' - # last updated 15/7/12 + # last updated 25/7/12 language = 'en_GB' oldest_article = 1 - max_articles_per_feed = 15 + max_articles_per_feed = 12 remove_empty_feeds = True no_stylesheets = True masthead_url = 'http://www.thesun.co.uk/sol/img/global/Sun-logo.gif' encoding = 'UTF-8' - - remove_empty_feeds = True remove_javascript = True no_stylesheets = True + + + #preprocess_regexps = [ + # (re.compile(r'
', re.IGNORECASE | re.DOTALL), lambda match: '')] + + extra_css = ''' body{ text-align: justify; font-family:Arial,Helvetica,sans-serif; font-size:11px; font-size-adjust:none; font-stretch:normal; font-style:normal; font-variant:normal; font-weight:normal;} - ''' - - preprocess_regexps = [ - (re.compile(r'
', re.IGNORECASE | re.DOTALL), lambda match: '')] - - - + ''' keep_only_tags = [ - dict(name='h1'),dict(name='h2',attrs={'class' : ['large','large centered','medium centered','medium']}),dict(name='h3'), - dict(name='div',attrs={'class' : 'text-center'}), - dict(name='div',attrs={'id' : 'bodyText'}) - # dict(name='p') - ] - remove_tags=[ - #dict(name='head'), - dict(attrs={'class' : ['mystery-meat-link','ltbx-container','ltbx-var ltbx-hbxpn','ltbx-var ltbx-nav-loop','ltbx-var ltbx-url']}), - dict(name='div',attrs={'class' : 'cf'}), - dict(attrs={'title' : 'download flash'}), - dict(attrs={'style' : 'padding: 5px'}) + dict(name='div',attrs={'class' : 'intro'}), + dict(name='h3'), + dict(name='div',attrs={'id' : 'articlebody'}), + #dict(attrs={'class' : ['right_col_branding','related-stories','mystery-meat-link','ltbx-container','ltbx-var ltbx-hbxpn','ltbx-var ltbx-nav-loop','ltbx-var ltbx-url']}), + # dict(name='div',attrs={'class' : 'cf'}), + # dict(attrs={'title' : 'download flash'}), + # dict(attrs={'style' : 'padding: 5px'}) ] - + remove_tags_after = [dict(id='bodyText')] + remove_tags=[ + dict(name='li'), + dict(attrs={'class' : 'grid-4 right-hand-column'}), + ] feeds = [ (u'News', u'http://www.thesun.co.uk/sol/homepage/news/rss'), From 604bae8a45d3c520bfaa84c91a46cbc62e456bdd Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 26 Jul 2012 11:27:21 +0530 Subject: [PATCH 31/48] Fix layout state being saved incorrectly if calibre is killed without a proper shutdown --- src/calibre/gui2/main.py | 3 ++- src/calibre/gui2/ui.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 9a49b01764..b52bd2cadb 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -135,7 +135,8 @@ class GuiRunner(QObject): main = Main(self.opts, gui_debug=self.gui_debug) if self.splash_screen is not None: self.splash_screen.showMessage(_('Initializing user interface...')) - main.initialize(self.library_path, db, self.listener, self.actions) + with gprefs: # Only write gui.json after initialization is complete + main.initialize(self.library_path, db, self.listener, self.actions) if self.splash_screen is not None: self.splash_screen.finish(main) if DEBUG: diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 7a05810f2d..3490c63215 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -367,6 +367,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ self.keyboard.finalize() self.auto_adder = AutoAdder(gprefs['auto_add_path'], self) + self.save_layout_state() + # Collect cycles now gc.collect() From fb5e5d6acbc797115fc584e5eb18e753ad252345 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 26 Jul 2012 14:57:36 +0200 Subject: [PATCH 32/48] Don't sleep in job manager after having run jobs. This improves latency in some situations. --- src/calibre/gui2/device.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index d4b8aa0e9b..748d917146 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -317,9 +317,11 @@ class DeviceManager(Thread): # {{{ else: self.detect_device() + do_sleep = True while True: job = self.next() if job is not None: + do_sleep = False self.current_job = job if self.device is not None: self.device.set_progress_reporter(job.report_progress) @@ -327,7 +329,8 @@ class DeviceManager(Thread): # {{{ self.current_job = None else: break - time.sleep(self.sleep_time) + if do_sleep: + time.sleep(self.sleep_time) # We are exiting. Call the shutdown method for each plugin for p in self.devices: From 8822ef28f91a2bcc3d4093d79d1f67121209c604 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 01:09:20 +0530 Subject: [PATCH 33/48] ... --- src/calibre/gui2/device.py | 1 - src/calibre/gui2/dialogs/smartdevice.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 748d917146..d3a5df7269 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -30,7 +30,6 @@ from calibre.constants import DEBUG from calibre.utils.config import prefs, tweaks from calibre.utils.magick.draw import thumbnail from calibre.library.save_to_disk import find_plugboard -from calibre.gui2 import is_gui_thread # }}} class DeviceJob(BaseJob): # {{{ diff --git a/src/calibre/gui2/dialogs/smartdevice.py b/src/calibre/gui2/dialogs/smartdevice.py index 15b40d1077..ebdacc7781 100644 --- a/src/calibre/gui2/dialogs/smartdevice.py +++ b/src/calibre/gui2/dialogs/smartdevice.py @@ -1,11 +1,10 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' -import re + from PyQt4.QtGui import QDialog, QLineEdit from PyQt4.QtCore import SIGNAL, Qt from calibre.gui2.dialogs.smartdevice_ui import Ui_Dialog -from calibre.gui2 import dynamic class SmartdeviceDialog(QDialog, Ui_Dialog): From 3afc065c2ad34ee9a2ae211cfc5260673b241fc2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 01:09:49 +0530 Subject: [PATCH 34/48] Various updated Polish recipes --- recipes/benchmark_pl.recipe | 4 ++-- recipes/film_web.recipe | 24 +++++++++++++++--------- recipes/gry_online_pl.recipe | 15 ++++++++------- recipes/natemat_pl.recipe | 4 +++- recipes/wnp.recipe | 4 ++-- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/recipes/benchmark_pl.recipe b/recipes/benchmark_pl.recipe index 00eea1be68..9544abdfcf 100644 --- a/recipes/benchmark_pl.recipe +++ b/recipes/benchmark_pl.recipe @@ -1,6 +1,6 @@ from calibre.web.feeds.news import BasicNewsRecipe import re -class Benchmark_pl(BasicNewsRecipe): +class BenchmarkPl(BasicNewsRecipe): title = u'Benchmark.pl' __author__ = 'fenuks' description = u'benchmark.pl -IT site' @@ -14,7 +14,7 @@ class Benchmark_pl(BasicNewsRecipe): preprocess_regexps = [(re.compile(ur'

 Zobacz poprzednie Opinie dnia:.*', re.DOTALL|re.IGNORECASE), lambda match: ''), (re.compile(ur'Więcej o .*?', re.DOTALL|re.IGNORECASE), lambda match: '')] keep_only_tags=[dict(name='div', attrs={'class':['m_zwykly', 'gallery']})] remove_tags_after=dict(name='div', attrs={'class':'body'}) - remove_tags=[dict(name='div', attrs={'class':['kategoria', 'socialize', 'thumb', 'panelOcenaObserwowane', 'categoryNextToSocializeGallery']}), dict(name='table', attrs={'background':'http://www.benchmark.pl/uploads/backend_img/a/fotki_newsy/opinie_dnia/bg.png'}), dict(name='table', attrs={'width':'210', 'cellspacing':'1', 'cellpadding':'4', 'border':'0', 'align':'right'})] + remove_tags=[dict(name='div', attrs={'class':['kategoria', 'socialize', 'thumb', 'panelOcenaObserwowane', 'categoryNextToSocializeGallery', 'breadcrumb']}), dict(name='table', attrs={'background':'http://www.benchmark.pl/uploads/backend_img/a/fotki_newsy/opinie_dnia/bg.png'}), dict(name='table', attrs={'width':'210', 'cellspacing':'1', 'cellpadding':'4', 'border':'0', 'align':'right'})] INDEX= 'http://www.benchmark.pl' feeds = [(u'Aktualności', u'http://www.benchmark.pl/rss/aktualnosci-pliki.xml'), (u'Testy i recenzje', u'http://www.benchmark.pl/rss/testy-recenzje-minirecenzje.xml')] diff --git a/recipes/film_web.recipe b/recipes/film_web.recipe index 2a6e00d501..ba34c9ff63 100644 --- a/recipes/film_web.recipe +++ b/recipes/film_web.recipe @@ -1,6 +1,7 @@ from calibre.web.feeds.news import BasicNewsRecipe - -class Filmweb_pl(BasicNewsRecipe): +import re +from calibre.ebooks.BeautifulSoup import BeautifulSoup +class FilmWebPl(BasicNewsRecipe): title = u'FilmWeb' __author__ = 'fenuks' description = 'FilmWeb - biggest polish movie site' @@ -12,8 +13,9 @@ class Filmweb_pl(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets= True remove_empty_feeds=True + preprocess_regexps = [(re.compile(u'\(kliknij\,\ aby powiększyć\)', re.IGNORECASE), lambda m: ''), ]#(re.compile(ur' | ', re.IGNORECASE), lambda m: '')] extra_css = '.hdrBig {font-size:22px;} ul {list-style-type:none; padding: 0; margin: 0;}' - remove_tags= [dict(name='div', attrs={'class':['recommendOthers']}), dict(name='ul', attrs={'class':'fontSizeSet'})] + remove_tags= [dict(name='div', attrs={'class':['recommendOthers']}), dict(name='ul', attrs={'class':'fontSizeSet'}), dict(attrs={'class':'userSurname anno'})] keep_only_tags= [dict(name='h1', attrs={'class':['hdrBig', 'hdrEntity']}), dict(name='div', attrs={'class':['newsInfo', 'newsInfoSmall', 'reviewContent description']})] feeds = [(u'Wszystkie newsy', u'http://www.filmweb.pl/feed/news/latest'), (u'News / Filmy w produkcji', 'http://www.filmweb.pl/feed/news/category/filminproduction'), @@ -31,18 +33,22 @@ class Filmweb_pl(BasicNewsRecipe): (u'News / Kino polskie', u'http://www.filmweb.pl/feed/news/category/polish.cinema'), (u'News / Telewizja', u'http://www.filmweb.pl/feed/news/category/tv'), (u'Recenzje redakcji', u'http://www.filmweb.pl/feed/reviews/latest'), - (u'Recenzje użytkowników', u'http://www.filmweb.pl/feed/user-reviews/latest')] + (u'Recenzje użytkowników', u'http://www.filmweb.pl/feed/user-reviews/latest') + ] - def skip_ad_pages(self, soup): + def skip_ad_pages(self, soup): skip_tag = soup.find('a', attrs={'class':'welcomeScreenButton'}) if skip_tag is not None: - self.log.warn('skip_tag') - self.log.warn(skip_tag) return self.index_to_soup(skip_tag['href'], raw=True) - + def preprocess_html(self, soup): for a in soup('a'): if a.has_key('href') and 'http://' not in a['href'] and 'https://' not in a['href']: a['href']=self.index + a['href'] - return soup \ No newline at end of file + for i in soup.findAll('a', attrs={'class':'fn'}): + i.insert(len(i), BeautifulSoup('
')) + for i in soup.findAll('sup'): + if not i.string or i.string.startswith('(kliknij'): + i.extract() + return soup diff --git a/recipes/gry_online_pl.recipe b/recipes/gry_online_pl.recipe index e188e4988c..fce9674081 100644 --- a/recipes/gry_online_pl.recipe +++ b/recipes/gry_online_pl.recipe @@ -1,6 +1,6 @@ from calibre.web.feeds.recipes import BasicNewsRecipe -class Gry_online_pl(BasicNewsRecipe): +class GryOnlinePl(BasicNewsRecipe): title = u'Gry-Online.pl' __author__ = 'fenuks' description = 'Gry-Online.pl - computer games' @@ -21,17 +21,18 @@ class Gry_online_pl(BasicNewsRecipe): tag = appendtag.find('div', attrs={'class':'n5p'}) if tag: nexturls=tag.findAll('a') - for nexturl in nexturls[1:]: - try: - soup2 = self.index_to_soup('http://www.gry-online.pl/S020.asp'+ nexturl['href']) - except: - soup2 = self.index_to_soup('http://www.gry-online.pl/S022.asp'+ nexturl['href']) + url_part = soup.find('link', attrs={'rel':'canonical'})['href'] + url_part = url_part[25:].rpartition('?')[0] + for nexturl in nexturls[1:-1]: + soup2 = self.index_to_soup('http://www.gry-online.pl/' + url_part + nexturl['href']) pagetext = soup2.find(attrs={'class':'gc660'}) for r in pagetext.findAll(name='header'): r.extract() + for r in pagetext.findAll(attrs={'itemprop':'description'}): + r.extract() pos = len(appendtag.contents) appendtag.insert(pos, pagetext) - for r in appendtag.findAll(attrs={'class':['n5p', 'add-info', 'twitter-share-button']}): + for r in appendtag.findAll(attrs={'class':['n5p', 'add-info', 'twitter-share-button', 'lista lista3 lista-gry']}): r.extract() diff --git a/recipes/natemat_pl.recipe b/recipes/natemat_pl.recipe index faa1b341a0..d6db93dad7 100644 --- a/recipes/natemat_pl.recipe +++ b/recipes/natemat_pl.recipe @@ -1,3 +1,4 @@ +import re from calibre.web.feeds.news import BasicNewsRecipe class NaTemat(BasicNewsRecipe): @@ -8,8 +9,9 @@ class NaTemat(BasicNewsRecipe): description = u'informacje, komentarze, opinie' category = 'news' language = 'pl' + preprocess_regexps = [(re.compile(ur'Czytaj też\:.*?', re.IGNORECASE), lambda m: ''), (re.compile(ur'Zobacz też\:.*?', re.IGNORECASE), lambda m: ''), (re.compile(ur'Czytaj więcej\:.*?', re.IGNORECASE), lambda m: ''), (re.compile(ur'Czytaj również\:.*?', re.IGNORECASE), lambda m: '')] cover_url= 'http://blog.plona.pl/wp-content/uploads/2012/05/natemat.png' no_stylesheets = True keep_only_tags= [dict(id='main')] - remove_tags= [dict(attrs={'class':['button', 'block-inside style_default', 'article-related']})] + remove_tags= [dict(attrs={'class':['button', 'block-inside style_default', 'article-related', 'user-header', 'links']}), dict(name='img', attrs={'class':'indent'})] feeds = [(u'Artyku\u0142y', u'http://natemat.pl/rss/wszystkie')] diff --git a/recipes/wnp.recipe b/recipes/wnp.recipe index ee87112437..ec0d012733 100644 --- a/recipes/wnp.recipe +++ b/recipes/wnp.recipe @@ -1,7 +1,7 @@ from calibre.web.feeds.news import BasicNewsRecipe import re -class AdvancedUserRecipe1312886443(BasicNewsRecipe): +class WNP(BasicNewsRecipe): title = u'WNP' cover_url= 'http://k.wnp.pl/images/wnpLogo.gif' __author__ = 'fenuks' @@ -12,7 +12,7 @@ class AdvancedUserRecipe1312886443(BasicNewsRecipe): oldest_article = 8 max_articles_per_feed = 100 no_stylesheets= True - remove_tags=[dict(attrs={'class':'printF'})] + remove_tags=[dict(attrs={'class':['printF', 'border3B2 clearfix', 'articleMenu clearfix']})] feeds = [(u'Wiadomości gospodarcze', u'http://www.wnp.pl/rss/serwis_rss.xml'), (u'Serwis Energetyka - Gaz', u'http://www.wnp.pl/rss/serwis_rss_1.xml'), (u'Serwis Nafta - Chemia', u'http://www.wnp.pl/rss/serwis_rss_2.xml'), From d13e49b401bfc55e2ca6b1f9ad4011d8f2377849 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 01:11:45 +0530 Subject: [PATCH 35/48] Linux Journal and Conowego.pl by fenuks --- recipes/conowego_pl.recipe | 38 ++++++++++++++++++++++++++++++++ recipes/icons/conowego_pl.png | Bin 0 -> 694 bytes recipes/icons/linux_journal.png | Bin 0 -> 443 bytes recipes/linux_journal.recipe | 36 ++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100755 recipes/conowego_pl.recipe create mode 100644 recipes/icons/conowego_pl.png create mode 100644 recipes/icons/linux_journal.png create mode 100755 recipes/linux_journal.recipe diff --git a/recipes/conowego_pl.recipe b/recipes/conowego_pl.recipe new file mode 100755 index 0000000000..8b4288ddcd --- /dev/null +++ b/recipes/conowego_pl.recipe @@ -0,0 +1,38 @@ +from calibre.web.feeds.news import BasicNewsRecipe +from calibre.ebooks.BeautifulSoup import BeautifulSoup +class CoNowegoPl(BasicNewsRecipe): + title = u'conowego.pl' + __author__ = 'fenuks' + description = u'Nowy wortal technologiczny oraz gazeta internetowa. Testy najnowszych produktów, fachowe porady i recenzje. U nas znajdziesz wszystko o elektronice użytkowej !' + cover_url = 'http://www.conowego.pl/fileadmin/templates/main/images/logo_top.png' + category = 'IT, news' + language = 'pl' + oldest_article = 7 + max_articles_per_feed = 100 + no_stylesheets = True + remove_empty_feeds = True + use_embedded_content = False + keep_only_tags = [dict(name='div', attrs={'class':'news_list single_view'})] + remove_tags = [dict(name='div', attrs={'class':['ni_bottom', 'ni_rank', 'ni_date']})] + feeds = [(u'Aktualno\u015bci', u'http://www.conowego.pl/rss/aktualnosci-5/?type=100'), (u'Gaming', u'http://www.conowego.pl/rss/gaming-6/?type=100'), (u'Porady', u'http://www.conowego.pl/rss/porady-3/?type=100'), (u'Testy', u'http://www.conowego.pl/rss/testy-2/?type=100')] + + def preprocess_html(self, soup): + for i in soup.findAll('img'): + i.parent.insert(0, BeautifulSoup('
')) + i.insert(len(i), BeautifulSoup('
')) + self.append_page(soup, soup.body) + return soup + + + def append_page(self, soup, appendtag): + tag = appendtag.find('div', attrs={'class':'pages'}) + if tag: + nexturls=tag.findAll('a') + for nexturl in nexturls[:-1]: + soup2 = self.index_to_soup('http://www.conowego.pl/' + nexturl['href']) + pagetext = soup2.find(attrs={'class':'ni_content'}) + pos = len(appendtag.contents) + appendtag.insert(pos, pagetext) + + for r in appendtag.findAll(attrs={'class':['pages', 'paginationWrap']}): + r.extract() diff --git a/recipes/icons/conowego_pl.png b/recipes/icons/conowego_pl.png new file mode 100644 index 0000000000000000000000000000000000000000..3bc8f2c672860344ca4beeb08690f233c4daacf4 GIT binary patch literal 694 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lsFUM z6XL2=ctD}(h;q?E#iGOVMF$j%_sbU@QUD4TA5fg z7VniW+9zMIU#a-0Y!OgouX53TMW6|VhqD)4I&<&KzyJUL{rh+7&L^efBcYSe{rn5$ z|3ClWgHqu>xx)R+jz7Ej_@iCRNyVara>YkBoP9lg|0B7Qg9=6aHk^C)@BiN!yC1GU z`Rds1cLsGQlILIk|Nrklpo#zgUwZUOxoB_U((7mLe!Thehg{)7#p0ui`G@36_RAIl zowr}1@UVgk>tCS17?Zr+UCa%3>~IHiI14-?i-EKU7`vU!wgWP5c)B=-NL=PU#~Ie_ zz{7CiK*}VK9+9<8P2AU1L*4GYj@thFzNg-Y`|Kwa_$4}Lq%2Nobu#PSZsKyrLPPk8 zNYAOrt$U5PdxbOvu3o{iZMQfVH(NyU;@|AK*X35NbeYjCBRl^~?d|!u9-R@$NvpUQ z8#C*<)3LKDI^yAPw{H5x(8;n#=11C|R36U@GY>Mi?|%2MakBs9sK%ND$G>IP#O-~c z?a8`vo>l()$60?aoZo7l@yzM$EZIb^x>{y0zMu&fLTaZuo&E~HEf3g!WyU7v@END} z%QWj>^n4+ICRn(c_0QVrKtHOMxJHzuB$lLFB^RXvDF!10LnB=Sb6q2|5F-OC6GJNl wQ*8qyD+7c3|L#knXvob^$xN$6(_n01Wo!h|pj@O-2Gqdd>FVdQ&MBb@0Is7WX8-^I literal 0 HcmV?d00001 diff --git a/recipes/icons/linux_journal.png b/recipes/icons/linux_journal.png new file mode 100644 index 0000000000000000000000000000000000000000..ed0092bd1d1f4e057a96281fa34793a7b403b6c4 GIT binary patch literal 443 zcmV;s0Yv_ZP)u=ga~F-(Ftkf`a?)?fmWS`|Iod^YhFK3iHFn&kqpa zU0&d4XY<0t)FmeM&(F&R1<(`~{`mOiet+LzU+kWr%?AkIVPVY$2K(yj%moGIfPv5w z6VD6{^1r~?JUsvX{o-wI^1Z$K>FLxcD9#56`sC#Bva;rdhT29)<8g7y008BGfcog@ z&I=65007GX0RR90%m4t)00A#X_k;id0FX&UK~#9!l+VW!!Y~X3P&=I-dT*h35Q$~` z|33^PdzgV6d(rIEX_@{B(;5L?K_nQQnzkpLCkDi5Hx~3Sf}lVHnVdNYLxQJd4)Xjj zP(t`0C`E{?$95hceGBczdfAl|sKnDZ+~lxUE%z^VPkNx3hSp)zN%zscx43eoEffvv l40em6n2XA;{mx5(0RVufFKfllNM!&3002ovPDHLkV1jnE%Z&g4 literal 0 HcmV?d00001 diff --git a/recipes/linux_journal.recipe b/recipes/linux_journal.recipe new file mode 100755 index 0000000000..99b1a570dc --- /dev/null +++ b/recipes/linux_journal.recipe @@ -0,0 +1,36 @@ +from calibre.web.feeds.news import BasicNewsRecipe + +class LinuxJournal(BasicNewsRecipe): + title = u'Linux Journal' + __author__ = 'fenuks' + description = u'The monthly magazine of the Linux community, promoting the use of Linux worldwide.' + cover_url = 'http://www.linuxjournal.com/files/linuxjournal.com/ufiles/logo-lj.jpg' + category = 'IT, Linux' + language = 'en' + oldest_article = 7 + max_articles_per_feed = 100 + no_stylesheets = True + use_embedded_content = False + remove_empty_feeds = True + keep_only_tags=[dict(id='content-inner')] + remove_tags_after= dict(attrs={'class':'user-signature clear-block'}) + remove_tags=[dict(attrs={'class':['user-signature clear-block', 'breadcrumb', 'terms terms-inline']})] + feeds = [(u'Front Page', u'http://feeds.feedburner.com/linuxjournalcom'), (u'News', u'http://feeds.feedburner.com/LinuxJournal-BreakingNews'), (u'Blogs', u'http://www.linuxjournal.com/blog/feed'), (u'Audio/Video', u'http://www.linuxjournal.com/taxonomy/term/28/0/feed'), (u'Community', u'http://www.linuxjournal.com/taxonomy/term/18/0/feed'), (u'Education', u'http://www.linuxjournal.com/taxonomy/term/25/0/feed'), (u'Embedded', u'http://www.linuxjournal.com/taxonomy/term/27/0/feed'), (u'Hardware', u'http://www.linuxjournal.com/taxonomy/term/23/0/feed'), (u'HOWTOs', u'http://www.linuxjournal.com/taxonomy/term/19/0/feed'), (u'International', u'http://www.linuxjournal.com/taxonomy/term/30/0/feed'), (u'Security', u'http://www.linuxjournal.com/taxonomy/term/31/0/feed'), (u'Software', u'http://www.linuxjournal.com/taxonomy/term/17/0/feed'), (u'Sysadmin', u'http://www.linuxjournal.com/taxonomy/term/21/0/feed'), (u'Webmaster', u'http://www.linuxjournal.com/taxonomy/term/24/0/feed')] + + def append_page(self, soup, appendtag): + next = appendtag.find('li', attrs={'class':'pager-next'}) + while next: + nexturl = next.a['href'] + appendtag.find('div', attrs={'class':'links'}).extract() + soup2 = self.index_to_soup('http://www.linuxjournal.com'+ nexturl) + pagetext = soup2.find(attrs={'class':'node-inner'}).find(attrs={'class':'content'}) + next = appendtag.find('li', attrs={'class':'pager-next'}) + pos = len(appendtag.contents) + appendtag.insert(pos, pagetext) + tag = appendtag.find('div', attrs={'class':'links'}) + if tag: + tag.extract() + + def preprocess_html(self, soup): + self.append_page(soup, soup.body) + return soup \ No newline at end of file From 9d90cfd7567b15cf3e286619ad95f8a9057fb2c4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 01:26:49 +0530 Subject: [PATCH 36/48] Update Psychology Today, The SMithsonian and The New Republic --- recipes/psych.recipe | 109 +++++++++++++++++++----------- recipes/smith.recipe | 114 +++++++++++++++++--------------- recipes/the_new_republic.recipe | 95 +++++++++++++++----------- 3 files changed, 189 insertions(+), 129 deletions(-) diff --git a/recipes/psych.recipe b/recipes/psych.recipe index 3fc940b4a2..a21acefe30 100644 --- a/recipes/psych.recipe +++ b/recipes/psych.recipe @@ -1,44 +1,79 @@ +import re +from calibre.web.feeds.recipes import BasicNewsRecipe -from calibre.ptempfile import PersistentTemporaryFile -from calibre.web.feeds.news import BasicNewsRecipe -class AdvancedUserRecipe1275708473(BasicNewsRecipe): - title = u'Psychology Today' - _author__ = 'rty' - publisher = u'www.psychologytoday.com' - category = u'Psychology' - max_articles_per_feed = 100 - remove_javascript = True - use_embedded_content = False - no_stylesheets = True +class PsychologyToday(BasicNewsRecipe): + + title = 'Psychology Today' + __author__ = 'Rick Shang' + + description = 'This magazine takes information from the latest research in the field of psychology and makes it useful to people in their everyday lives. Its coverage encompasses self-improvement, relationships, the mind-body connection, health, family, the workplace and culture.' language = 'en' - temp_files = [] - articles_are_obfuscated = True - remove_tags = [ - dict(name='div', attrs={'class':['print-source_url','field-items','print-footer']}), - dict(name='span', attrs={'class':'print-footnote'}), - ] - remove_tags_before = dict(name='h1', attrs={'class':'print-title'}) - remove_tags_after = dict(name='div', attrs={'class':['field-items','print-footer']}) + category = 'news' + encoding = 'UTF-8' + keep_only_tags = [dict(attrs={'class':['print-title', 'print-submitted', 'print-content', 'print-footer', 'print-source_url', 'print-links']})] + no_javascript = True + no_stylesheets = True - feeds = [(u'Contents', u'http://www.psychologytoday.com/articles/index.rss')] - def get_article_url(self, article): - return article.get('link', None) + def parse_index(self): + articles = [] + soup = self.index_to_soup('http://www.psychologytoday.com/magazine') + + + #Go to the main body + div = soup.find('div',attrs={'id':'content-content'}) + #Find cover & date + cover_item = div.find('div', attrs={'class':'collections-header-image'}) + cover = cover_item.find('img',src=True) + self.cover_url = cover['src'] + date = self.tag_to_string(cover['title']) + self.timefmt = u' [%s]'%date + + articles = [] + for post in div.findAll('div', attrs={'class':'collections-node-feature-info'}): + title = self.tag_to_string(post.find('h2')) + author_item=post.find('div', attrs={'class':'collection-node-byline'}) + author = re.sub(r'.*by\s',"",self.tag_to_string(author_item).strip()) + title = title + u' (%s)'%author + article_page= self.index_to_soup('http://www.psychologytoday.com'+post.find('a', href=True)['href']) + print_page=article_page.find('li', attrs={'class':'print_html first'}) + url='http://www.psychologytoday.com'+print_page.find('a',href=True)['href'] + desc = self.tag_to_string(post.find('div', attrs={'class':'collection-node-description'})).strip() + self.log('Found article:', title) + self.log('\t', url) + self.log('\t', desc) + articles.append({'title':title, 'url':url, 'date':'','description':desc}) + + for post in div.findAll('div', attrs={'class':'collections-node-thumbnail-info'}): + title = self.tag_to_string(post.find('h2')) + author_item=post.find('div', attrs={'class':'collection-node-byline'}) + article_page= self.index_to_soup('http://www.psychologytoday.com'+post.find('a', href=True)['href']) + print_page=article_page.find('li', attrs={'class':'print_html first'}) + description = post.find('div', attrs={'class':'collection-node-description'}) + author = re.sub(r'.*by\s',"",self.tag_to_string(description.nextSibling).strip()) + desc = self.tag_to_string(description).strip() + url='http://www.psychologytoday.com'+print_page.find('a',href=True)['href'] + title = title + u' (%s)'%author + self.log('Found article:', title) + self.log('\t', url) + self.log('\t', desc) + articles.append({'title':title, 'url':url, 'date':'','description':desc}) + + for post in div.findAll('li', attrs={'class':['collection-item-list-odd','collection-item-list-even']}): + title = self.tag_to_string(post.find('h2')) + author_item=post.find('div', attrs={'class':'collection-node-byline'}) + author = re.sub(r'.*by\s',"",self.tag_to_string(author_item).strip()) + title = title + u' (%s)'%author + article_page= self.index_to_soup('http://www.psychologytoday.com'+post.find('a', href=True)['href']) + print_page=article_page.find('li', attrs={'class':'print_html first'}) + url='http://www.psychologytoday.com'+print_page.find('a',href=True)['href'] + desc = self.tag_to_string(post.find('div', attrs={'class':'collection-node-description'})).strip() + self.log('Found article:', title) + self.log('\t', url) + self.log('\t', desc) + articles.append({'title':title, 'url':url, 'date':'','description':desc}) + + return [('Current Issue', articles)] - def get_obfuscated_article(self, url): - br = self.get_browser() - br.open(url) - response = br.follow_link(url_regex = r'/print/[0-9]+', nr = 0) - html = response.read() - self.temp_files.append(PersistentTemporaryFile('_fa.html')) - self.temp_files[-1].write(html) - self.temp_files[-1].close() - return self.temp_files[-1].name - def get_cover_url(self): - index = 'http://www.psychologytoday.com/magazine/' - soup = self.index_to_soup(index) - for image in soup.findAll('img',{ "class" : "imagefield imagefield-field_magazine_cover" }): - return image['src'] + '.jpg' - return None diff --git a/recipes/smith.recipe b/recipes/smith.recipe index 8bf60a227a..3d6a95c494 100644 --- a/recipes/smith.recipe +++ b/recipes/smith.recipe @@ -1,61 +1,67 @@ import re -from calibre.web.feeds.news import BasicNewsRecipe -from calibre.ebooks.BeautifulSoup import BeautifulSoup +from calibre.web.feeds.recipes import BasicNewsRecipe +from collections import OrderedDict -class SmithsonianMagazine(BasicNewsRecipe): - title = u'Smithsonian Magazine' - language = 'en' - __author__ = 'Krittika Goyal and TerminalVeracity' - oldest_article = 31#days - max_articles_per_feed = 50 - use_embedded_content = False - recursions = 1 - cover_url = 'http://sphotos.xx.fbcdn.net/hphotos-snc7/431147_10150602715983253_764313347_n.jpg' - match_regexps = ['&page=[2-9]$'] - preprocess_regexps = [ - (re.compile(r'for more of Smithsonian\'s coverage on history, science and nature.', re.DOTALL), lambda m: '') - ] - extra_css = """ - h1{font-size: large; margin: .2em 0} - h2{font-size: medium; margin: .2em 0} - h3{font-size: medium; margin: .2em 0} - #byLine{margin: .2em 0} - .articleImageCaptionwide{font-style: italic} - .wp-caption-text{font-style: italic} - img{display: block} - """ +class Smithsonian(BasicNewsRecipe): + title = 'Smithsonian Magazine' + __author__ = 'Rick Shang' - remove_stylesheets = True - remove_tags_after = dict(name='div', attrs={'class':['post','articlePaginationWrapper']}) - remove_tags = [ - dict(name='iframe'), - dict(name='div', attrs={'class':['article_sidebar_border','viewMorePhotos','addtoany_share_save_container','meta','social','OUTBRAIN','related-articles-inpage']}), - dict(name='div', attrs={'id':['article_sidebar_border', 'most-popular_large', 'most-popular-body_large','comment_section','article-related']}), - dict(name='ul', attrs={'class':'cat-breadcrumb col three last'}), - dict(name='h4', attrs={'id':'related-topics'}), - dict(name='table'), - dict(name='a', attrs={'href':['/subArticleBottomWeb','/subArticleTopWeb','/subArticleTopMag','/subArticleBottomMag']}), - dict(name='a', attrs={'name':'comments_shaded'}), - ] + description = 'This magazine chronicles the arts, environment, sciences and popular culture of the times. It is edited for modern, well-rounded individuals with diverse, general interests. With your order, you become a National Associate Member of the Smithsonian. Membership benefits include your subscription to Smithsonian magazine, a personalized membership card, discounts from the Smithsonian catalog, and more.' + language = 'en' + category = 'news' + encoding = 'UTF-8' + keep_only_tags = [dict(attrs={'id':['articleTitle', 'subHead', 'byLine', 'articleImage', 'article-text']})] + remove_tags = [dict(attrs={'class':['related-articles-inpage', 'viewMorePhotos']})] + no_javascript = True + no_stylesheets = True + def parse_index(self): + #Go to the issue + soup0 = self.index_to_soup('http://www.smithsonianmag.com/issue/archive/') + div = soup0.find('div',attrs={'id':'archives'}) + issue = div.find('ul',attrs={'class':'clear-both'}) + current_issue_url = issue.find('a', href=True)['href'] + soup = self.index_to_soup(current_issue_url) - feeds = [ -('History and Archeology', - 'http://feeds.feedburner.com/smithsonianmag/history-archaeology'), -('People and Places', - 'http://feeds.feedburner.com/smithsonianmag/people-places'), -('Science and Nature', - 'http://feeds.feedburner.com/smithsonianmag/science-nature'), -('Arts and Culture', - 'http://feeds.feedburner.com/smithsonianmag/arts-culture'), -('Travel', - 'http://feeds.feedburner.com/smithsonianmag/travel'), -] + #Go to the main body + div = soup.find ('div', attrs={'id':'content-inset'}) + + #Find date + date = re.sub('.*\:\W*', "", self.tag_to_string(div.find('h2')).strip()) + self.timefmt = u' [%s]'%date + + #Find cover + self.cover_url = div.find('img',src=True)['src'] + + feeds = OrderedDict() + section_title = '' + subsection_title = '' + for post in div.findAll('div', attrs={'class':['plainModule', 'departments plainModule']}): + articles = [] + prefix = '' + h3=post.find('h3') + if h3 is not None: + section_title = self.tag_to_string(h3) + else: + subsection=post.find('p',attrs={'class':'article-cat'}) + link=post.find('a',href=True) + url=link['href']+'?c=y&story=fullstory' + if subsection is not None: + subsection_title = self.tag_to_string(subsection) + prefix = (subsection_title+': ') + description=self.tag_to_string(post('p', limit=2)[1]).strip() + else: + description=self.tag_to_string(post.find('p')).strip() + desc=re.sub('\sBy\s.*', '', description, re.DOTALL) + author=re.sub('.*By\s', '', description, re.DOTALL) + title=prefix + self.tag_to_string(link).strip()+ u' (%s)'%author + articles.append({'title':title, 'url':url, 'description':desc, 'date':''}) + + if articles: + if section_title not in feeds: + feeds[section_title] = [] + feeds[section_title] += articles + ans = [(key, val) for key, val in feeds.iteritems()] + return ans - def preprocess_html(self, soup): - story = soup.find(name='div', attrs={'id':'article-body'}) - soup = BeautifulSoup('t') - body = soup.find(name='body') - body.insert(0, story) - return soup diff --git a/recipes/the_new_republic.recipe b/recipes/the_new_republic.recipe index 59ccef3607..649a8c46f3 100644 --- a/recipes/the_new_republic.recipe +++ b/recipes/the_new_republic.recipe @@ -1,45 +1,64 @@ -from calibre.web.feeds.news import BasicNewsRecipe +import re +from calibre.web.feeds.recipes import BasicNewsRecipe +from collections import OrderedDict -class The_New_Republic(BasicNewsRecipe): - title = 'The New Republic' - __author__ = 'cix3' +class TNR(BasicNewsRecipe): + + title = 'The New Republic' + __author__ = 'Rick Shang' + + description = 'The New Republic is a journal of opinion with an emphasis on politics and domestic and international affairs. It carries feature articles by staff and contributing editors. The second half of each issue is devoted to book and the arts, theater, motion pictures, music and art.' language = 'en' - description = 'Intelligent, stimulating and rigorous examination of American politics, foreign policy and culture' - timefmt = ' [%b %d, %Y]' - - oldest_article = 7 - max_articles_per_feed = 100 + category = 'news' + encoding = 'UTF-8' + remove_tags = [dict(attrs={'class':['print-logo','print-site_name','print-hr']})] + no_javascript = True no_stylesheets = True - remove_tags = [ - dict(name='div', attrs={'class':['print-logo', 'print-site_name', 'img-left', 'print-source_url']}), - dict(name='hr', attrs={'class':'print-hr'}), dict(name='img') - ] - feeds = [ - ('Politics', 'http://www.tnr.com/rss/articles/Politics'), - ('Books and Arts', 'http://www.tnr.com/rss/articles/Books-and-Arts'), - ('Economy', 'http://www.tnr.com/rss/articles/Economy'), - ('Environment and Energy', 'http://www.tnr.com/rss/articles/Environment-%2526-Energy'), - ('Health Care', 'http://www.tnr.com/rss/articles/Health-Care'), - ('Metro Policy', 'http://www.tnr.com/rss/articles/Metro-Policy'), - ('World', 'http://www.tnr.com/rss/articles/World'), - ('Film', 'http://www.tnr.com/rss/articles/Film'), - ('Books', 'http://www.tnr.com/rss/articles/books'), - ('The Book', 'http://www.tnr.com/rss/book'), - ('Jonathan Chait', 'http://www.tnr.com/rss/blogs/Jonathan-Chait'), - ('The Plank', 'http://www.tnr.com/rss/blogs/The-Plank'), - ('The Treatment', 'http://www.tnr.com/rss/blogs/The-Treatment'), - ('The Spine', 'http://www.tnr.com/rss/blogs/The-Spine'), - ('The Vine', 'http://www.tnr.com/rss/blogs/The-Vine'), - ('The Avenue', 'http://www.tnr.com/rss/blogs/The-Avenue'), - ('William Galston', 'http://www.tnr.com/rss/blogs/William-Galston'), - ('Simon Johnson', 'http://www.tnr.com/rss/blogs/Simon-Johnson'), - ('Ed Kilgore', 'http://www.tnr.com/rss/blogs/Ed-Kilgore'), - ('Damon Linker', 'http://www.tnr.com/rss/blogs/Damon-Linker'), - ('John McWhorter', 'http://www.tnr.com/rss/blogs/John-McWhorter') - ] + def parse_index(self): - def print_version(self, url): - return url.replace('http://www.tnr.com/', 'http://www.tnr.com/print/') + #Go to the issue + soup0 = self.index_to_soup('http://www.tnr.com/magazine-issues') + issue = soup0.find('div',attrs={'id':'current_issue'}) + #Find date + date = self.tag_to_string(issue.find('div',attrs={'class':'date'})).strip() + self.timefmt = u' [%s]'%date + + #Go to the main body + current_issue_url = 'http://www.tnr.com' + issue.find('a', href=True)['href'] + soup = self.index_to_soup(current_issue_url) + div = soup.find ('div', attrs={'class':'article_detail_body'}) + + + + #Find cover + self.cover_url = div.find('img',src=True)['src'] + + feeds = OrderedDict() + section_title = '' + subsection_title = '' + for post in div.findAll('p'): + articles = [] + em=post.find('em') + b=post.find('b') + a=post.find('a',href=True) + if em is not None: + section_title = self.tag_to_string(em).strip() + subsection_title = '' + elif b is not None: + subsection_title=self.tag_to_string(b).strip() + elif a is not None: + prefix = (subsection_title+': ') if subsection_title else '' + url=re.sub('www.tnr.com','www.tnr.com/print', a['href']) + author=re.sub('.*by\s', '', self.tag_to_string(post), re.DOTALL) + title=prefix + self.tag_to_string(a).strip()+ u' (%s)'%author + articles.append({'title':title, 'url':url, 'description':'', 'date':''}) + + if articles: + if section_title not in feeds: + feeds[section_title] = [] + feeds[section_title] += articles + ans = [(key, val) for key, val in feeds.iteritems()] + return ans From ffdbd911e06f9c840d55f4f289a66f912729507b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 09:20:30 +0530 Subject: [PATCH 37/48] When presenting the calibre must be restarted warning after installing a new plugin, add a restart now button so that the user can conveniently restart calibre --- src/calibre/gui2/actions/preferences.py | 2 ++ src/calibre/gui2/dialogs/plugin_updater.py | 19 +++++++++++++++++-- src/calibre/gui2/preferences/__init__.py | 1 + src/calibre/gui2/preferences/main.py | 10 ++++++++++ src/calibre/gui2/preferences/plugins.py | 2 ++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/actions/preferences.py b/src/calibre/gui2/actions/preferences.py index cd9de36fce..bbb86b573e 100644 --- a/src/calibre/gui2/actions/preferences.py +++ b/src/calibre/gui2/actions/preferences.py @@ -45,6 +45,8 @@ class PreferencesAction(InterfaceAction): d = PluginUpdaterDialog(self.gui, initial_filter=FILTER_NOT_INSTALLED) d.exec_() + if d.do_restart: + self.gui.quit(restart=True) def do_config(self, checked=False, initial_plugin=None, close_after_initial=False): diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py index 2a90f63995..4e56db9016 100644 --- a/src/calibre/gui2/dialogs/plugin_updater.py +++ b/src/calibre/gui2/dialogs/plugin_updater.py @@ -456,6 +456,7 @@ class PluginUpdaterDialog(SizePersistedDialog): self.gui = gui self.forum_link = None self.model = None + self.do_restart = False self._initialize_controls() self._create_context_menu() @@ -720,6 +721,7 @@ class PluginUpdaterDialog(SizePersistedDialog): prints('Installing plugin: ', zip_path) self.gui.status_bar.showMessage(_('Installing plugin: %s') % zip_path) + do_restart = False try: try: plugin = add_plugin(zip_path) @@ -731,11 +733,21 @@ class PluginUpdaterDialog(SizePersistedDialog): widget.gui = self.gui widget.check_for_add_to_toolbars(plugin) self.gui.status_bar.showMessage(_('Plugin installed: %s') % display_plugin.name) - info_dialog(self.gui, _('Success'), + d = info_dialog(self.gui, _('Success'), _('Plugin {0} successfully installed under ' ' {1} plugins. You may have to restart calibre ' 'for the plugin to take effect.').format(plugin.name, plugin.type), - show=True, show_copy_button=False) + show_copy_button=False) + b = d.bb.addButton(_('Restart calibre now'), d.bb.AcceptRole) + b.setIcon(QIcon(I('lt.png'))) + d.do_restart = False + def rf(): + d.do_restart = True + b.clicked.connect(rf) + d.set_details('') + d.exec_() + b.clicked.disconnect() + do_restart = d.do_restart display_plugin.plugin = plugin # We cannot read the 'actual' version information as the plugin will not be loaded yet @@ -762,6 +774,9 @@ class PluginUpdaterDialog(SizePersistedDialog): else: self.model.refresh_plugin(display_plugin) self._select_and_focus_view(change_selection=False) + if do_restart: + self.do_restart = True + self.accept() def _history_clicked(self): display_plugin = self._selected_display_plugin() diff --git a/src/calibre/gui2/preferences/__init__.py b/src/calibre/gui2/preferences/__init__.py index d724e49b46..733d5b2255 100644 --- a/src/calibre/gui2/preferences/__init__.py +++ b/src/calibre/gui2/preferences/__init__.py @@ -236,6 +236,7 @@ class ConfigWidgetBase(QWidget, ConfigWidgetInterface): ''' changed_signal = pyqtSignal() + restart_now = pyqtSignal() supports_restoring_to_defaults = True restart_critical = False diff --git a/src/calibre/gui2/preferences/main.py b/src/calibre/gui2/preferences/main.py index 98b5f168b3..4c879c7883 100644 --- a/src/calibre/gui2/preferences/main.py +++ b/src/calibre/gui2/preferences/main.py @@ -290,6 +290,7 @@ class Preferences(QMainWindow): self.apply_action.setEnabled(False) self.showing_widget.changed_signal.connect(lambda : self.apply_action.setEnabled(True)) + self.showing_widget.restart_now.connect(self.restart_now) self.restore_action.setEnabled(self.showing_widget.supports_restoring_to_defaults) tt = self.showing_widget.restore_defaults_desc if not self.restore_action.isEnabled(): @@ -319,6 +320,15 @@ class Preferences(QMainWindow): elif self.stack.currentIndex() == 0: self.close() + def restart_now(self): + try: + self.showing_widget.commit() + except AbortCommit: + return + self.hide_plugin() + self.close() + self.gui.quit(restart=True) + def commit(self, *args): try: must_restart = self.showing_widget.commit() diff --git a/src/calibre/gui2/preferences/plugins.py b/src/calibre/gui2/preferences/plugins.py index 2d89b187bf..1a6e58d6bd 100644 --- a/src/calibre/gui2/preferences/plugins.py +++ b/src/calibre/gui2/preferences/plugins.py @@ -384,6 +384,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self._plugin_model.populate() self._plugin_model.reset() self.changed_signal.emit() + if d.do_restart: + self.restart_now.emit() def reload_store_plugins(self): self.gui.load_store_plugins() From bd11311242715cdd42da60660cc4e852d4ec99de Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 10:18:05 +0530 Subject: [PATCH 38/48] When errors occur in lots of background jobs, add an option to the error message to temporarily suppress subsequent error messages. Fixes #886904 ("Error:" boxes during conversion) --- src/calibre/gui2/dialogs/message_box.py | 50 ++++++++++++++++++++++--- src/calibre/gui2/ui.py | 7 ++-- 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/src/calibre/gui2/dialogs/message_box.py b/src/calibre/gui2/dialogs/message_box.py index a107bf985b..b9e11c9745 100644 --- a/src/calibre/gui2/dialogs/message_box.py +++ b/src/calibre/gui2/dialogs/message_box.py @@ -9,7 +9,7 @@ import sys from PyQt4.Qt import (QDialog, QIcon, QApplication, QSize, QKeySequence, QAction, Qt, QTextBrowser, QDialogButtonBox, QVBoxLayout, QGridLayout, - QLabel, QPlainTextEdit, QTextDocument) + QLabel, QPlainTextEdit, QTextDocument, QCheckBox, pyqtSignal) from calibre.constants import __version__, isfrozen from calibre.gui2.dialogs.message_box_ui import Ui_Dialog @@ -270,12 +270,14 @@ class ErrorNotification(MessageBox): # {{{ class JobError(QDialog): # {{{ WIDTH = 600 + do_pop = pyqtSignal() def __init__(self, gui): QDialog.__init__(self, gui) self.setAttribute(Qt.WA_DeleteOnClose, False) self.gui = gui self.queue = [] + self.do_pop.connect(self.pop, type=Qt.QueuedConnection) self._layout = l = QGridLayout() self.setLayout(l) @@ -285,6 +287,7 @@ class JobError(QDialog): # {{{ self.icon_label.setPixmap(self.icon.pixmap(128, 128)) self.icon_label.setMaximumSize(QSize(128, 128)) self.msg_label = QLabel('

 ') + self.msg_label.setStyleSheet('QLabel { margin-top: 1ex; }') self.msg_label.setWordWrap(True) self.msg_label.setTextFormat(Qt.RichText) self.det_msg = QPlainTextEdit(self) @@ -302,17 +305,25 @@ class JobError(QDialog): # {{{ self.det_msg_toggle.clicked.connect(self.toggle_det_msg) self.det_msg_toggle.setToolTip( _('Show detailed information about this error')) + self.suppress = QCheckBox(self) + self.suppress.setVisible(False) l.addWidget(self.icon_label, 0, 0, 1, 1) - l.addWidget(self.msg_label, 0, 1, 1, 1, Qt.AlignLeft|Qt.AlignTop) - l.addWidget(self.det_msg, 1, 0, 1, 2) - - l.addWidget(self.bb, 2, 0, 1, 2, Qt.AlignRight|Qt.AlignBottom) + l.addWidget(self.msg_label, 0, 1, 1, 1, Qt.AlignTop) + l.addWidget(self.det_msg, 1, 0, 1, 2) + l.addWidget(self.suppress, 2, 0, 1, 2, Qt.AlignLeft|Qt.AlignBottom) + l.addWidget(self.bb, 3, 0, 1, 2, Qt.AlignRight|Qt.AlignBottom) + l.setColumnStretch(1, 100) self.setModal(False) self.base_height = max(200, self.sizeHint().height() + 20) self.do_resize() + def update_suppress_state(self): + self.suppress.setText(_( + 'Hide the remaining %d error messages'%len(self.queue))) + self.suppress.setVisible(len(self.queue) > 3) + def copy_to_clipboard(self, *args): d = QTextDocument() d.setHtml(self.msg_label.text()) @@ -342,6 +353,33 @@ class JobError(QDialog): # {{{ self.bb.button(self.bb.Close).setFocus(Qt.OtherFocusReason) return ret + def show_error(self, title, msg, det_msg=u''): + self.queue.append((title, msg, det_msg)) + self.update_suppress_state() + self.pop() + + def pop(self): + if not self.queue or self.isVisible(): return + title, msg, det_msg = self.queue.pop(0) + self.setWindowTitle(title) + self.msg_label.setText(msg) + self.det_msg.setPlainText(det_msg) + self.det_msg.setVisible(False) + self.det_msg_toggle.setText(self.show_det_msg) + self.det_msg_toggle.setVisible(True) + self.suppress.setChecked(False) + self.update_suppress_state() + if not det_msg: + self.det_msg_toggle.setVisible(False) + self.do_resize() + self.show() + + def done(self, r): + if self.suppress.isChecked(): + self.queue = [] + self.do_pop.emit() + return QDialog.done(self, r) + # }}} if __name__ == '__main__': @@ -349,7 +387,7 @@ if __name__ == '__main__': from calibre.gui2.preferences import init_gui gui = init_gui() d = JobError(gui) - d.show() + d.show_error('test title', 'some long meaningless test message') app.exec_() gui.shutdown() diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 3490c63215..f07fb0d211 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -44,6 +44,7 @@ from calibre.gui2.keyboard import Manager from calibre.gui2.auto_add import AutoAdder from calibre.library.sqlite import sqlite, DatabaseException from calibre.gui2.proceed import ProceedQuestion +from calibre.gui2.dialogs.message_box import JobError class Listener(Thread): # {{{ @@ -111,6 +112,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ self.proceed_requested.connect(self.do_proceed, type=Qt.QueuedConnection) self.proceed_question = ProceedQuestion(self) + self.job_error_dialog = JobError(self) self.keyboard = Manager(self) _gui = self self.opts = opts @@ -690,12 +692,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ except: pass if not minz: - d = error_dialog(self, dialog_title, + self.job_error_dialog.show_error(dialog_title, _('Failed')+': '+unicode(job.description), det_msg=job.details) - d.setModal(False) - d.show() - self._modeless_dialogs.append(d) def read_settings(self): geometry = config['main_window_geometry'] From 62b135a6c3559fb3ddc55e5778d8e9aab2aa2cb0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 11:15:20 +0530 Subject: [PATCH 39/48] ... --- src/calibre/gui2/dialogs/message_box.py | 42 +++++++++++++++---------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/src/calibre/gui2/dialogs/message_box.py b/src/calibre/gui2/dialogs/message_box.py index b9e11c9745..9979350a42 100644 --- a/src/calibre/gui2/dialogs/message_box.py +++ b/src/calibre/gui2/dialogs/message_box.py @@ -272,10 +272,9 @@ class JobError(QDialog): # {{{ WIDTH = 600 do_pop = pyqtSignal() - def __init__(self, gui): - QDialog.__init__(self, gui) + def __init__(self, parent): + QDialog.__init__(self, parent) self.setAttribute(Qt.WA_DeleteOnClose, False) - self.gui = gui self.queue = [] self.do_pop.connect(self.pop, type=Qt.QueuedConnection) @@ -284,8 +283,8 @@ class JobError(QDialog): # {{{ self.icon = QIcon(I('dialog_error.png')) self.setWindowIcon(self.icon) self.icon_label = QLabel() - self.icon_label.setPixmap(self.icon.pixmap(128, 128)) - self.icon_label.setMaximumSize(QSize(128, 128)) + self.icon_label.setPixmap(self.icon.pixmap(68, 68)) + self.icon_label.setMaximumSize(QSize(68, 68)) self.msg_label = QLabel('

 ') self.msg_label.setStyleSheet('QLabel { margin-top: 1ex; }') self.msg_label.setWordWrap(True) @@ -306,23 +305,23 @@ class JobError(QDialog): # {{{ self.det_msg_toggle.setToolTip( _('Show detailed information about this error')) self.suppress = QCheckBox(self) - self.suppress.setVisible(False) l.addWidget(self.icon_label, 0, 0, 1, 1) - l.addWidget(self.msg_label, 0, 1, 1, 1, Qt.AlignTop) + l.addWidget(self.msg_label, 0, 1, 1, 1) l.addWidget(self.det_msg, 1, 0, 1, 2) l.addWidget(self.suppress, 2, 0, 1, 2, Qt.AlignLeft|Qt.AlignBottom) l.addWidget(self.bb, 3, 0, 1, 2, Qt.AlignRight|Qt.AlignBottom) l.setColumnStretch(1, 100) self.setModal(False) - self.base_height = max(200, self.sizeHint().height() + 20) + self.suppress.setVisible(False) self.do_resize() def update_suppress_state(self): self.suppress.setText(_( 'Hide the remaining %d error messages'%len(self.queue))) self.suppress.setVisible(len(self.queue) > 3) + self.do_resize() def copy_to_clipboard(self, *args): d = QTextDocument() @@ -343,9 +342,11 @@ class JobError(QDialog): # {{{ self.do_resize() def do_resize(self): - h = self.base_height - if self.det_msg.isVisible(): - h += 250 + h = self.sizeHint().height() + self.setMinimumHeight(0) # Needed as this gets set if det_msg is shown + # Needed otherwise re-showing the box after showing det_msg causes the box + # to not reduce in height + self.setMaximumHeight(h) self.resize(QSize(self.WIDTH, h)) def showEvent(self, ev): @@ -377,19 +378,26 @@ class JobError(QDialog): # {{{ def done(self, r): if self.suppress.isChecked(): self.queue = [] + QDialog.done(self, r) self.do_pop.emit() - return QDialog.done(self, r) # }}} if __name__ == '__main__': app = QApplication([]) - from calibre.gui2.preferences import init_gui - gui = init_gui() - d = JobError(gui) - d.show_error('test title', 'some long meaningless test message') + d = JobError(None) + d.show_error('test title', 'some long meaningless test message', 'det msg') + d.show_error('test title', 'some long meaningless test message', 'det msg') + d.show_error('test title', 'some long meaningless test message', 'det msg') + d.show_error('test title', 'some long meaningless test message', 'det msg') + d.show_error('test title', 'some long meaningless test message', 'det msg') + d.show_error('test title', 'some long meaningless test message', 'det msg') + app.setQuitOnLastWindowClosed(False) + def checkd(): + if not d.queue: + app.quit() + app.lastWindowClosed.connect(checkd) app.exec_() - gui.shutdown() # if __name__ == '__main__': # app = QApplication([]) From 79f60d00f304cbdb3eb9a13907adcdc9c7a56995 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 11:25:22 +0530 Subject: [PATCH 40/48] Advanced search dialog: When starting on the title/author/etc. tab, restore the previously used search kind as well. Fixes #1029745 (Advanced search default to Contains even for existing alternative) --- src/calibre/gui2/dialogs/search.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/calibre/gui2/dialogs/search.py b/src/calibre/gui2/dialogs/search.py index cf63d150e6..86d18e6145 100644 --- a/src/calibre/gui2/dialogs/search.py +++ b/src/calibre/gui2/dialogs/search.py @@ -12,6 +12,7 @@ from calibre.utils.icu import sort_key from calibre.utils.config import tweaks box_values = {} +last_matchkind = CONTAINS_MATCH class SearchDialog(QDialog, Ui_Dialog): @@ -57,6 +58,9 @@ class SearchDialog(QDialog, Ui_Dialog): current_tab = gprefs.get('advanced search dialog current tab', 0) self.tabWidget.setCurrentIndex(current_tab) + if current_tab == 1: + self.matchkind.setCurrentIndex(last_matchkind) + self.tabWidget.currentChanged[int].connect(self.tab_changed) self.tab_changed(current_tab) @@ -173,7 +177,9 @@ class SearchDialog(QDialog, Ui_Dialog): general_index = unicode(self.general_combo.currentText()) self.box_last_values['general_index'] = general_index global box_values + global last_matchkind box_values = copy.deepcopy(self.box_last_values) + last_matchkind = mk if general: ans.append(unicode(self.general_combo.currentText()) + ':"' + self.mc + general + '"') From fd5f169e8adba2fa9d0a3622666e19c879387d9f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 11:36:45 +0530 Subject: [PATCH 41/48] version 0.8.62 --- Changelog.yaml | 44 ++++++++++++++++++++++++++++++++++++++++ src/calibre/constants.py | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/Changelog.yaml b/Changelog.yaml index c986b51486..d74eb9a163 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -19,6 +19,50 @@ # new recipes: # - title: +- version: 0.8.62 + date: 2012-07-27 + + new features: + - title: "Book details panel: ALlow right clicking on a format to delete it." + + - title: "When errors occur in lots of background jobs, add an option to the error message to temporarily suppress subsequent error messages." + tickets: [886904] + + - title: "E-book viewer full screen mode: Allow clicking in the left and right page margins to turn pages." + tickets: [1024819] + + - title: "Drivers for various Android devices" + tickets: [1028690,1027431] + + - title: "Advanced search dialog: When starting on the title/author/etc. tab, restore the previously used search kind as well." + tickets: [1029745] + + - title: "When presenting the calibre must be restarted warning after installing a new plugin, add a restart now button so that the user can conveniently restart calibre" + + bug fixes: + - title: "Fix main window layout state being saved incorrectly if calibre is killed without a proper shutdown" + + - title: "Fix boolean and date searching in non english calibre installs." + + - title: "Conversion: Ignore invalid chapter detection and level n ToC expressions instead of erroring out" + + improved recipes: + - Psychology Today + - The Smithsonian + - The New Republic + - Various updated Polish news sources + - The Sun + - San Francisco Bay Guardian + - AnandTech + - Smashing Magazine + + new recipes: + - title: Linux Journal and Conowego.pl + author: fenuks + + - title: A list apart and .net magazine + author: Marc Busque + - version: 0.8.61 date: 2012-07-20 diff --git a/src/calibre/constants.py b/src/calibre/constants.py index ecad6b5cc2..33feddefee 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -4,7 +4,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __appname__ = u'calibre' -numeric_version = (0, 8, 61) +numeric_version = (0, 8, 62) __version__ = u'.'.join(map(unicode, numeric_version)) __author__ = u"Kovid Goyal " From 422d2acb55fb9a05724c1d4eaf8179da68d22e45 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 12:03:04 +0530 Subject: [PATCH 42/48] IGN:Tag release --- Changelog.yaml | 2 +- resources/compiled_coffeescript.zip | Bin 52157 -> 52157 bytes src/calibre/translations/calibre.pot | 666 ++++++++++++++------------- 3 files changed, 358 insertions(+), 310 deletions(-) diff --git a/Changelog.yaml b/Changelog.yaml index d74eb9a163..62fa0a5b9d 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -23,7 +23,7 @@ date: 2012-07-27 new features: - - title: "Book details panel: ALlow right clicking on a format to delete it." + - title: "Book details panel: Allow right clicking on a format to delete it." - title: "When errors occur in lots of background jobs, add an option to the error message to temporarily suppress subsequent error messages." tickets: [886904] diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip index ed0bce537bf784ae6e934ee71cb5ad17fdd46862..2cfe5cfebf8a9ab77ae1a64078e28cff5c7b62bd 100644 GIT binary patch delta 33 lcmdlxoq6wcX5IjAW)=|!5Lg%Udn2#WDP|zO+38d@BLJ=J3v>Vg delta 33 lcmdlxoq6wcX5IjAW)=|!5cpp8Vpermanently deleted from %(title)s. Are you sure?" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:162 msgid "Choose formats to be deleted" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:180 msgid "Choose formats not to be deleted.

Note that this will never remove all formats from a book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:192 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:207 msgid "All formats for the selected books will be deleted from your library.
The book metadata will be kept. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:212 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:227 msgid "Cannot delete books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:213 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:228 msgid "No device is connected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:238 msgid "Main memory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:224 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:527 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:536 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:239 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:608 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617 msgid "Storage Card A" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:225 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:538 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:240 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:610 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:619 msgid "Storage Card B" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:230 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:245 msgid "No books to delete" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:231 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:246 msgid "None of the selected books are on the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:248 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:341 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:263 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:356 msgid "Deleting books from device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:311 msgid "Some of the selected books are on the attached device. Where do you want the selected files deleted from?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:308 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:323 msgid "The selected books will be permanently deleted and the files removed from your calibre library. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:333 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:348 msgid "The selected books will be permanently deleted from your device. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:31 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:33 msgid "Connect to folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:36 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:38 msgid "Connect to iTunes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:44 msgid "Connect to Bambook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:56 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:78 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:85 msgid "Start Content Server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:73 -msgid "Start/stop content server" +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:63 +msgid "Control Smart Device Connections" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:80 +msgid "Start/stop content server" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:87 msgid "Stop Content Server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:91 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:120 msgid "Email to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105 msgid "Email to and delete from library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:114 msgid "(delete from library)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:129 msgid "Setup email based sharing of books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:147 msgid "D" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:147 msgid "Send to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:155 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:165 msgid "Connect/share" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:192 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:203 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85 msgid "Stopping" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:193 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:204 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:86 msgid "Stopping server, this could take upto a minute, please wait..." msgstr "" @@ -4866,11 +4875,11 @@ msgstr "" msgid "Restart in debug mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:55 msgid "Cannot configure while there are running jobs." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:60 msgid "Cannot configure before calibre is restarted." msgstr "" @@ -5291,7 +5300,7 @@ msgid "The specified directory could not be processed." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:931 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013 msgid "No books" msgstr "" @@ -5421,8 +5430,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:194 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:162 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:57 -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79 -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:86 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/device_category_editor_ui.py:80 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/device_category_editor_ui.py:82 @@ -5544,6 +5553,11 @@ msgstr "" msgid "Cover size: %(width)d x %(height)d" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:453 +#, python-format +msgid "Delete the %s format" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:16 msgid "BibTeX Options" msgstr "" @@ -5623,7 +5637,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:87 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:54 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72 -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:122 @@ -7304,10 +7318,11 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:55 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:46 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:60 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:62 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:54 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice_ui.py:76 msgid "TextLabel" msgstr "" @@ -7490,226 +7505,226 @@ msgstr "" msgid "No details available." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:189 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:192 msgid "Device no longer connected." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:332 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:375 msgid "Get device information" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:347 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:390 msgid "Get list of books on device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:357 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400 msgid "Get annotations from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:369 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412 msgid "Send metadata to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:374 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417 msgid "Send collections to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467 #, python-format msgid "Upload %d books to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:440 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483 msgid "Delete books from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:458 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:501 msgid "Download books from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:512 msgid "View book on device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:591 msgid "Set default send to device action" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:597 msgid "Send to main memory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:518 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599 msgid "Send to storage card A" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:601 msgid "Send to storage card B" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:525 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:534 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:615 msgid "Main Memory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:546 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:627 msgid "Send specific format to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:547 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628 msgid "Send and delete from library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:590 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:671 msgid "Eject device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:671 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:752 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:71 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:332 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:58 msgid "Error" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:672 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753 msgid "Error communicating with device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:691 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1260 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:773 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1342 #: /home/kovid/work/calibre/src/calibre/gui2/email.py:260 msgid "No suitable formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:707 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:789 msgid "Select folder to open as device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:725 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:807 msgid "Running jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:726 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:808 msgid "Cannot configure the device while there are running device jobs." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:731 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:813 #, python-format msgid "Configure %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:824 msgid "Disconnect device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:825 #, python-format msgid "Disconnect and re-connect the %s for your changes to be applied." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:783 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865 msgid "Error talking to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:784 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866 msgid "There was a temporary error talking to the device. Please unplug and reconnect the device or reboot." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909 msgid "Device: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:829 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911 msgid " detected." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:932 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014 msgid "selected to send" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:939 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:969 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1051 msgid "No device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:940 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1022 msgid "No device connected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:956 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1038 #, python-format msgid "%(num)i of %(total)i Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:960 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1042 #, python-format msgid "0 of %i Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1043 msgid "Choose format to send to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:970 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1052 msgid "Cannot send: No device is connected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:973 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:977 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1059 msgid "No card" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:974 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:978 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1056 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1060 msgid "Cannot send: Device has no storage card" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1039 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1122 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1254 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1121 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1204 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1336 msgid "Auto convert the following books before uploading to the device?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1068 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150 msgid "Sending catalogs to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1249 msgid "Sending news to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1221 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1303 msgid "Sending books to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1261 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1343 msgid "Could not upload the following books to the device, as no suitable formats were found. Convert the book(s) to a format supported by your device first." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1334 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1416 msgid "No space on device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1335 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1417 msgid "

Cannot upload books to device there is no more free space available " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:140 msgid "Unknown formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:141 msgid "You have enabled the {0} formats for your {1}. The {1} may not support them. If you send these formats to your {1} they may not work. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:150 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:153 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:449 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:279 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:70 msgid "Invalid template" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:151 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:154 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:450 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:280 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:71 @@ -7717,23 +7732,23 @@ msgstr "" msgid "The template %s is invalid:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80 msgid "Select available formats and their order for this device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84 msgid "If checked, books are placed into sub directories based on their metadata on the device. If unchecked, books are all put into the top level directory." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85 msgid "Use sub directories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:86 msgid "Use author sort for author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:87 msgid "Save &template:" msgstr "" @@ -8140,7 +8155,7 @@ msgstr "" msgid "Library and Device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:61 msgid "&Show this warning again" msgstr "" @@ -8259,7 +8274,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:122 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:523 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:668 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:670 msgid "No matches found" msgstr "" @@ -8404,31 +8419,31 @@ msgid "&Hide all jobs" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:52 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:298 #: /home/kovid/work/calibre/src/calibre/gui2/proceed.py:51 msgid "&Copy to clipboard" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:56 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:299 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:301 #: /home/kovid/work/calibre/src/calibre/gui2/proceed.py:54 msgid "Show &details" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:57 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:300 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:302 #: /home/kovid/work/calibre/src/calibre/gui2/proceed.py:55 msgid "Hide &details" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:61 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:304 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:306 #: /home/kovid/work/calibre/src/calibre/gui2/proceed.py:59 msgid "Show detailed information about this error" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:103 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:325 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:335 #: /home/kovid/work/calibre/src/calibre/gui2/proceed.py:79 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:596 msgid "Copied" @@ -8449,6 +8464,11 @@ msgstr "" msgid "View log" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:322 +#, python-format +msgid "Hide the remaining %d error messages" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:60 msgid "Title/Author" msgstr "" @@ -8923,6 +8943,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:64 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice_ui.py:77 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:139 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:135 msgid "&Password:" @@ -8930,6 +8951,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:65 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice_ui.py:78 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:148 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:81 msgid "&Show password" @@ -9057,183 +9079,188 @@ msgstr "" msgid "This plugin is installed and up-to-date" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:475 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:476 msgid "Update Check Failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:476 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:477 msgid "Unable to reach the MobileRead plugins forum index page." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:483 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:484 msgid "User plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:488 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:489 msgid "User Plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:496 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:497 msgid "Filter list of plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:514 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:515 msgid "Description" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:526 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:538 -msgid "&Install" -msgstr "" - #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:527 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:539 +msgid "&Install" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:528 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:540 msgid "Install the selected plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:530 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:531 msgid "&Customize plugin " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:531 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:583 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:532 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:584 msgid "Customize the options for this plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:543 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:544 msgid "Version &History" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:544 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:545 msgid "Show history of changes to this plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:548 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:549 msgid "Plugin &Forum Thread" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:557 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:558 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:114 msgid "Enable/&Disable plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:558 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:559 msgid "Enable or disable this plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:562 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:563 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:116 msgid "&Remove plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:563 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:564 msgid "Uninstall the selected plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:572 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:573 msgid "Donate to developer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:573 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:574 msgid "Donate to the developer of this plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:582 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:583 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:115 msgid "&Customize plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:676 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:677 #, python-format msgid "Are you sure you want to uninstall the %s plugin?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:688 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:689 #, python-format msgid "Install %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:689 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:690 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:299 msgid "Installing plugins is a security risk. Plugins can contain a virus/malware. Only install it if you got it from a trusted source. Are you sure you want to proceed?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:706 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:707 #, python-format msgid "Locating zip file for %(name)s: %(link)s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:710 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:747 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:711 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:759 msgid "Install Plugin Failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:711 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:712 #, python-format msgid "Unable to locate a plugin zip file for %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:716 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:717 #, python-format msgid "Downloading plugin zip attachment: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:721 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:722 #, python-format msgid "Installing plugin: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:733 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:735 #, python-format msgid "Plugin installed: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:735 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:737 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:315 msgid "Plugin {0} successfully installed under {1} plugins. You may have to restart calibre for the plugin to take effect." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:748 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:741 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:352 +msgid "Restart calibre now" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:760 msgid "A problem occurred while installing this plugin. This plugin will now be uninstalled. Please post the error message in details below into the forum thread for this plugin and restart Calibre." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:773 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:788 msgid "Version history missing" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:774 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:789 #, python-format msgid "Unable to find the version history for %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:781 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:796 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:350 msgid "Plugin not customizable" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:782 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:797 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:351 #, python-format msgid "Plugin: %s does not need customization" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:786 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:801 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:357 msgid "Must restart" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:787 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:802 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:358 #, python-format msgid "You must restart calibre before you can configure the %s plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:795 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:810 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:339 msgid "Plugin cannot be disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:796 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/plugin_updater.py:811 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:340 #, python-format msgid "The plugin: %s cannot be disabled" @@ -9769,6 +9796,38 @@ msgstr "" msgid "Choose formats" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice.py:17 +msgid "This dialog starts and stops the smart device app interface. When you start the interface, you might see some messages from your computer's firewall or anti-virus manager asking you if it is OK for calibre to connect to the network. Please answer yes. If you do not, the app will not work. It will be unable to connect to calibre." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice.py:25 +msgid "Use a password if calibre is running on a network that is not secure. For example, if you run calibre on a laptop, use that laptop in an airport, and want to connect your smart device to calibre, you should use a password." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice.py:31 +msgid "Check this box to allow calibre to accept connections from the smart device. Uncheck the box to prevent connections." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice.py:35 +msgid "Check this box if you want calibre to automatically start the smart device interface when calibre starts. You should not do this if you are using a network that is not secure and you are not setting a password." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice_ui.py:72 +msgid "Smart device control" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice_ui.py:73 +msgid "&Automatically allow connections at startup" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice_ui.py:74 +msgid "Optional password for security" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/smartdevice_ui.py:75 +msgid "&Allow connections" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:164 msgid "Publishers" @@ -10837,12 +10896,12 @@ msgid "LRF Viewer toolbar" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:504 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:493 msgid "Next Page" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:505 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:494 msgid "Previous Page" msgstr "" @@ -10910,7 +10969,7 @@ msgid "Failed to create calibre library at: %r." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/main.py:109 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:171 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172 msgid "Choose a location for your new calibre e-book library" msgstr "" @@ -10918,87 +10977,87 @@ msgstr "" msgid "Initializing user interface..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:166 msgid "Repairing failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:166 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167 msgid "The database repair failed. Starting with a new empty library." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206 msgid "Bad database location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:182 #, python-format msgid "Bad database location %r. calibre will now quit." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:193 -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:530 msgid "Corrupted database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195 #, python-format msgid "The library database at %s appears to be corrupted. Do you want calibre to try and rebuild it automatically? The rebuild may not be completely successful. If you say No, a new empty calibre library will be created." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207 #, python-format msgid "Bad database location %r. Will start with a new, empty calibre library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217 #, python-format msgid "Starting %s: Loading books..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:297 msgid "If you are sure it is not running" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:299 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:300 msgid "may be running in the system tray, in the" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:302 msgid "upper right region of the screen." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:304 msgid "lower right region of the screen." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:306 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:307 msgid "try rebooting your computer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:308 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:325 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:309 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:326 msgid "try deleting the file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:311 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:312 msgid "Cannot Start " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:312 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:313 #, python-format msgid "%s is already running." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:333 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:334 msgid "No running calibre found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:337 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:338 msgid "Shutdown command sent, waiting for shutdown..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:342 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:343 msgid "Failed to shutdown running calibre instance" msgstr "" @@ -11500,7 +11559,7 @@ msgstr "" msgid "Restore settings to default values. You have to click Apply to actually save the default settings." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/__init__.py:339 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/__init__.py:340 msgid "Configure " msgstr "" @@ -12652,27 +12711,23 @@ msgstr "" msgid "Cancel and return to overview" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:297 msgid "Restoring to defaults not supported for" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:332 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:342 msgid "Some of the changes you made require a restart. Please restart calibre as soon as possible." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:335 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:345 msgid "The changes you have made require calibre be restarted immediately. You will not be allowed to set any more preferences, until you restart." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:340 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:350 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:134 msgid "Restart needed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:342 -msgid "Restart calibre now" -msgstr "" - #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:48 msgid "Source" msgstr "" @@ -13289,7 +13344,7 @@ msgid "Here you can control how calibre will save your books when you click the msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:74 -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:454 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:467 msgid "Failed to start content server" msgstr "" @@ -14476,40 +14531,40 @@ msgstr "" msgid "The following books have already been converted to %s format. Do you wish to reconvert them?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:207 msgid "&Donate to support calibre" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:241 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:243 msgid "&Restore" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:246 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:248 msgid "&Eject connected device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:250 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:252 msgid "Quit calibre" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:263 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:265 msgid "Clear the current search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:365 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:378 msgid "Debug mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:366 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:379 #, python-format msgid "You have started calibre in debug mode. After you quit calibre, the debug log will be available in the file: %s

The log will be displayed automatically." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:386 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:399 msgid "Failed to start Content Server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:387 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:400 #, python-format msgid "" "Could not start the content server. Error:\n" @@ -14517,21 +14572,21 @@ msgid "" "%s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:518 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:531 #, python-format msgid "The library database at %s appears to be corrupted. Do you want calibre to try and rebuild it automatically? The rebuild may not be completely successful." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:602 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:615 msgid "Conversion Error" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:623 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:636 #, python-format msgid "

Failed to convert: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:624 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:637 msgid "" "\n" " Many older ebook reader devices are incapable of displaying\n" @@ -14548,34 +14603,34 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:638 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:651 msgid "Conversion Failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:663 msgid "Recipe Disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:683 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:696 msgid "Failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:717 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:728 msgid "There are active jobs. Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:720 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:731 msgid "" " is communicating with the device!
\n" " Quitting may cause corruption on the device.
\n" " Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:724 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:735 msgid "Active jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:794 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:805 msgid "will keep running in the system tray. To close it, choose Quit in the context menu of the system tray." msgstr "" @@ -14681,7 +14736,7 @@ msgid "Options to customize the ebook viewer" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config.py:28 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1044 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1046 msgid "Remember last used window size" msgstr "" @@ -14950,40 +15005,40 @@ msgstr "" msgid "No results found for:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:462 msgid "&Lookup in dictionary" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:478 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467 msgid "&Search for next occurrence" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:483 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:472 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:138 msgid "Go to..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:495 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:484 msgid "Next Section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:496 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:485 msgid "Previous Section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:498 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:487 msgid "Document Start" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:499 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:488 msgid "Document End" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:501 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:490 msgid "Section Start" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:502 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:491 msgid "Section End" msgstr "" @@ -15068,126 +15123,130 @@ msgstr "" msgid "Toggle full screen (%s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:276 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:277 msgid "Full screen mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:277 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:278 msgid "Right click to show controls" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:278 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:279 +msgid "Tap in the left or right page margin to turn pages" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:280 msgid "Press Esc to quit" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:292 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:294 msgid "Show/hide controls" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:321 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:323 msgid "Print Preview" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:331 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:333 msgid "Clear list of recently opened books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:442 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:444 #, python-format msgid "Connecting to dict.org to lookup: %s…" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578 msgid "No such location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579 msgid "The location pointed to by this item does not exist." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:628 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:630 msgid "Choose ebook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:629 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:631 msgid "Ebooks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:649 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:651 #, python-format msgid "" "Make font size %(which)s\n" "Current magnification: %(mag).1f" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:651 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:653 msgid "larger" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:653 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:655 msgid "smaller" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:669 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:671 #, python-format msgid "No matches found for: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:718 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:720 msgid "Loading flow..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:796 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:798 #, python-format msgid "Laying out %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:848 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:850 #, python-format msgid "Bookmark #%d" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:852 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:854 msgid "Add bookmark" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:853 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:855 msgid "Enter title for bookmark:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:864 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:866 msgid "Manage Bookmarks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:906 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:908 msgid "Loading ebook..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:918 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:920 msgid "Could not open ebook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1031 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1033 msgid "Options to control the ebook viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1038 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1040 msgid "If specified, viewer window will try to come to the front when started." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1041 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1043 msgid "If specified, viewer window will try to open full screen when started." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1046 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1048 msgid "Print javascript alert and console messages to the console" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1048 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1050 msgid "The position at which to open the specified book. The position is a location as displayed in the top left corner of the viewer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1055 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1057 msgid "" "%prog [options] file\n" "\n" @@ -15607,63 +15666,52 @@ msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/library/caches.py:177 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:600 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:614 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:624 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:612 msgid "checked" msgstr "" #: /home/kovid/work/calibre/src/calibre/library/caches.py:177 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:600 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:614 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:624 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:610 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:223 msgid "yes" msgstr "" #: /home/kovid/work/calibre/src/calibre/library/caches.py:179 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:599 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:611 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:621 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:609 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:223 msgid "no" msgstr "" #: /home/kovid/work/calibre/src/calibre/library/caches.py:179 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:599 #: /home/kovid/work/calibre/src/calibre/library/caches.py:611 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:621 msgid "unchecked" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:393 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:355 msgid "today" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:396 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:356 msgid "yesterday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:399 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:357 msgid "thismonth" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:402 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:403 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:358 msgid "daysago" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:601 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:618 -msgid "blank" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/library/caches.py:601 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:618 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:613 msgid "empty" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:602 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:614 +msgid "blank" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/library/caches.py:626 msgid "Invalid boolean query \"{0}\"" msgstr "" From 46a379116eda299eaf240805322d3d506dbf46e8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 15:24:43 +0530 Subject: [PATCH 43/48] Paged display: Resize images that are longer than the page to fit onto a single page --- resources/compiled_coffeescript.zip | Bin 52157 -> 53566 bytes src/calibre/ebooks/oeb/display/paged.coffee | 26 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip index 2cfe5cfebf8a9ab77ae1a64078e28cff5c7b62bd..1b8af62d52c2a54dcd62436c6808c019b3cb580e 100644 GIT binary patch delta 939 zcmdlxoq69PW{CiAW)=|!5YVpr?NA=*+1u;Rz|iYHIo3&XqhTwPOmb;aQEFaEd_iJ* zYJ5g&W_m`6f~`VcX-)AlR}ss}cX>HB?-!oW$(&e{ zI5}EYl{q)DVsfpl8edsvF3{j&9fk7Dl#-0e*~~_h&&w(pLxq7hMaNomDS!b`O9oH? zmsOLW%RXdD0h!++r@)_?o30DusOx~;I(e_0DMx0Sf(BT@0cO#91qBcjXkIncc!(wH zIjLzS>Q)L#MS38X4yt4k$omjkFcVE05HCc7yJu|bqh_EMCe%qqe!l~k0Pn5~>&a^rv?kA#;Ae+AaPnFS)yZ*kY?4rZbbK~EH9+DI6xRZ1ajiMoLs1cA zvjm3QbIKDdi`792R3|?W=QIK*DQyMyf(nFt6ck|T1X~b-JS~Xuw0crbesZ=t*uQ;> zTF_|NyjQVl1s__5@;w#Fbj*EnqLb|8qo=f(N<$}qJmtl7AQdPgI=LW$ZF0nEEvEZN T!QB1>e3O@-7GT?Q9+WcyxP&T2 delta 208 zcmdnDh}5|Od!qz;+)hx2x&MuLC$FMS-G2&pU7)XzGbVm*;;Wr<7EBA z+>;wsB_^L`<)1u7W%XnMb&bi9s-m0y)QeW|q1k%wd?b^r)8vVvqLb||7%_eE2Qn2V iPr9JRWS;;Qy?nudDeeH6DR7K$vc^RLHsezu=K}yHaYx$# diff --git a/src/calibre/ebooks/oeb/display/paged.coffee b/src/calibre/ebooks/oeb/display/paged.coffee index c2a09b5587..3b9682b590 100644 --- a/src/calibre/ebooks/oeb/display/paged.coffee +++ b/src/calibre/ebooks/oeb/display/paged.coffee @@ -26,6 +26,7 @@ class PagedDisplay this.current_margin_side = 0 this.is_full_screen_layout = false this.max_col_width = -1 + this.current_page_height = null this.document_margins = null this.use_document_margins = false @@ -116,6 +117,7 @@ class PagedDisplay col_width = Math.max(100, ((ww - adjust)/n) - 2*sm) this.page_width = col_width + 2*sm this.screen_width = this.page_width * this.cols_per_screen + this.current_page_height = window.innerHeight - this.margin_top - this.margin_bottom fgcolor = body_style.getPropertyValue('color') @@ -167,9 +169,15 @@ class PagedDisplay # that this method use getBoundingClientRect() which means it will # force a relayout if the render tree is dirty. images = [] + vimages = [] + maxh = this.current_page_height for img in document.getElementsByTagName('img') previously_limited = calibre_utils.retrieve(img, 'width-limited', false) + data = calibre_utils.retrieve(img, 'img-data', null) br = img.getBoundingClientRect() + if data == null + data = {'left':br.left, 'right':br.right, 'height':br.height, 'display': img.style.display} + calibre_utils.store(img, 'img-data', data) left = calibre_utils.viewport_to_document(br.left, 0, doc=img.ownerDocument)[0] col = this.column_at(left) * this.page_width rleft = left - col - this.current_margin_side @@ -178,11 +186,29 @@ class PagedDisplay col_width = this.page_width - 2*this.current_margin_side if previously_limited or rright > col_width images.push([img, col_width - rleft]) + previously_limited = calibre_utils.retrieve(img, 'height-limited', false) + if previously_limited or br.height > maxh + vimages.push(img) + if previously_limited + img.style.setProperty('-webkit-column-break-before', 'auto') + img.style.setProperty('display', data.display) + img.style.setProperty('-webkit-column-break-inside', 'avoid') for [img, max_width] in images img.style.setProperty('max-width', max_width+'px') calibre_utils.store(img, 'width-limited', true) + for img in vimages + data = calibre_utils.retrieve(img, 'img-data', null) + img.style.setProperty('-webkit-column-break-before', 'always') + img.style.setProperty('max-height', maxh+'px') + if data.height > maxh + # This is needed to force the image onto a new page, without + # it, the webkit algorithm may still decide to split the image + # by keeping it part of its parent block + img.style.setProperty('display', 'block') + calibre_utils.store(img, 'height-limited', true) + check_top_margin: () -> # This is needed to handle the case when a descendant of body specifies # a top margin as a percentage, which messes up the top margin From 5b5bb8caaaa2040dedfc32af37d38866d5e6528f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 15:42:01 +0530 Subject: [PATCH 44/48] EPUB Input: Handle files that have duplicate entries in the spine --- src/calibre/ebooks/conversion/plugins/epub_input.py | 4 +++- src/calibre/ebooks/metadata/opf2.py | 4 +++- src/calibre/ebooks/pdf/writer.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/conversion/plugins/epub_input.py b/src/calibre/ebooks/conversion/plugins/epub_input.py index 27263a2690..f0af2d28c5 100644 --- a/src/calibre/ebooks/conversion/plugins/epub_input.py +++ b/src/calibre/ebooks/conversion/plugins/epub_input.py @@ -198,11 +198,13 @@ class EPUBInput(InputFormatPlugin): ('application/vnd.adobe-page-template+xml','application/text'): not_for_spine.add(id_) + seen = set() for x in list(opf.iterspine()): ref = x.get('idref', None) - if ref is None or ref in not_for_spine: + if not ref or ref in not_for_spine or ref in seen: x.getparent().remove(x) continue + seen.add(ref) if len(list(opf.iterspine())) == 0: raise ValueError('No valid entries in the spine of this EPUB') diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index debd69b281..d132fe15d0 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -286,15 +286,17 @@ class Spine(ResourceCollection): # {{{ @staticmethod def from_opf_spine_element(itemrefs, manifest): s = Spine(manifest) + seen = set() for itemref in itemrefs: idref = itemref.get('idref', None) if idref is not None: path = s.manifest.path_for_id(idref) - if path: + if path and path not in seen: r = Spine.Item(lambda x:idref, path, is_path=True) r.is_linear = itemref.get('linear', 'yes') == 'yes' r.idref = idref s.append(r) + seen.add(path) return s @staticmethod diff --git a/src/calibre/ebooks/pdf/writer.py b/src/calibre/ebooks/pdf/writer.py index 2b3cfd7a4a..db0276b8ee 100644 --- a/src/calibre/ebooks/pdf/writer.py +++ b/src/calibre/ebooks/pdf/writer.py @@ -221,7 +221,7 @@ class PDFWriter(QObject): # {{{ self.tmp_path = PersistentTemporaryDirectory('_pdf_output_parts') def insert_cover(self): - if self.cover_data is None: + if not isinstance(self.cover_data, bytes): return item_path = os.path.join(self.tmp_path, 'cover.pdf') printer = get_pdf_printer(self.opts, output_file_name=item_path, From 85ad3e9d657fed531f0b705c79fc7b5361bb102b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 15:51:41 +0530 Subject: [PATCH 45/48] MOBI Output: Normalize unicode strings before writing to file, to workaround lack of support for non-normal unicode in Amazon's MOBI renderer. Fixes #1029825 (loose accentuated voyels when converting to .mobi on Kindle) --- src/calibre/ebooks/mobi/writer2/serializer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/mobi/writer2/serializer.py b/src/calibre/ebooks/mobi/writer2/serializer.py index 2dda657a93..5251bf934f 100644 --- a/src/calibre/ebooks/mobi/writer2/serializer.py +++ b/src/calibre/ebooks/mobi/writer2/serializer.py @@ -12,7 +12,7 @@ import re from calibre.ebooks.oeb.base import (OEB_DOCS, XHTML, XHTML_NS, XML_NS, namespace, prefixname, urlnormalize) from calibre.ebooks.mobi.mobiml import MBP_NS -from calibre.ebooks.mobi.utils import is_guide_ref_start +from calibre.ebooks.mobi.utils import is_guide_ref_start, utf8_text from collections import defaultdict from urlparse import urldefrag @@ -355,7 +355,7 @@ class Serializer(object): text = text.replace(u'\u00AD', '') # Soft-hyphen if quot: text = text.replace('"', '"') - self.buf.write(text.encode('utf-8')) + self.buf.write(utf8_text(text)) def fixup_links(self): ''' From 42cbbc82843a817e41cc898f6462b702c8778eac Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 16:08:32 +0530 Subject: [PATCH 46/48] Paged display: Much more efficient handling of the body margin collapse problem --- src/calibre/ebooks/oeb/display/paged.coffee | 34 +++++---------------- src/calibre/ebooks/pdf/writer.py | 1 - src/calibre/gui2/viewer/documentview.py | 1 - src/calibre/gui2/viewer/printing.py | 1 - 4 files changed, 7 insertions(+), 30 deletions(-) diff --git a/src/calibre/ebooks/oeb/display/paged.coffee b/src/calibre/ebooks/oeb/display/paged.coffee index 3b9682b590..de6645ce88 100644 --- a/src/calibre/ebooks/oeb/display/paged.coffee +++ b/src/calibre/ebooks/oeb/display/paged.coffee @@ -75,25 +75,12 @@ class PagedDisplay # start_time = new Date().getTime() body_style = window.getComputedStyle(document.body) bs = document.body.style - # When laying body out in columns, webkit bleeds the top margin of the - # first block element out above the columns, leading to an extra top - # margin for the page. We compensate for that here. Computing the - # boundingrect of body is very expensive with column layout, so we do - # it before the column layout is applied. first_layout = false if not this.in_paged_mode - bs.setProperty('margin-top', '0px') - extra_margin = document.body.getBoundingClientRect().top - if extra_margin <= this.margin_top - extra_margin = 0 - margin_top = (this.margin_top - extra_margin) + 'px' # Check if the current document is a full screen layout like # cover, if so we treat it specially. single_screen = (document.body.scrollWidth < window.innerWidth + 25 and document.body.scrollHeight < window.innerHeight + 25) first_layout = true - else - # resize event - margin_top = body_style.marginTop ww = window.innerWidth @@ -124,10 +111,16 @@ class PagedDisplay bs.setProperty('-webkit-column-gap', (2*sm)+'px') bs.setProperty('-webkit-column-width', col_width+'px') bs.setProperty('-webkit-column-rule-color', fgcolor) + + # Without this, webkit bleeds the margin of the first block(s) of body + # above the columns, which causes them to effectively be added to the + # page margins (the margin collapse algorithm) + bs.setProperty('-webkit-margin-collapse', 'separate') + bs.setProperty('overflow', 'visible') bs.setProperty('height', (window.innerHeight - this.margin_top - this.margin_bottom) + 'px') bs.setProperty('width', (window.innerWidth - 2*sm)+'px') - bs.setProperty('margin-top', margin_top) + bs.setProperty('margin-top', this.margin_top + 'px') bs.setProperty('margin-bottom', this.margin_bottom+'px') bs.setProperty('margin-left', sm+'px') bs.setProperty('margin-right', sm+'px') @@ -209,19 +202,6 @@ class PagedDisplay img.style.setProperty('display', 'block') calibre_utils.store(img, 'height-limited', true) - check_top_margin: () -> - # This is needed to handle the case when a descendant of body specifies - # a top margin as a percentage, which messes up the top margin - # calculations above - tm = document.body.getBoundingClientRect().top - if tm != this.margin_top - document.body.style.setProperty('margin-top', '0px') - tm = document.body.getBoundingClientRect().top - if tm <= this.margin_top - tm = 0 - m = this.margin_top - tm - document.body.style.setProperty('margin-top', m+'px') - scroll_to_pos: (frac) -> # Scroll to the position represented by frac (number between 0 and 1) xpos = Math.floor(document.body.scrollWidth * frac) diff --git a/src/calibre/ebooks/pdf/writer.py b/src/calibre/ebooks/pdf/writer.py index db0276b8ee..7e179cef48 100644 --- a/src/calibre/ebooks/pdf/writer.py +++ b/src/calibre/ebooks/pdf/writer.py @@ -202,7 +202,6 @@ class PDFWriter(QObject): # {{{ paged_display.set_geometry(1, 0, 0, 0); paged_display.layout(); paged_display.fit_images(); - paged_display.check_top_margin(); ''') mf = self.view.page().mainFrame() while True: diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py index dac9a05113..2b494d4ecd 100644 --- a/src/calibre/gui2/viewer/documentview.py +++ b/src/calibre/gui2/viewer/documentview.py @@ -243,7 +243,6 @@ class Document(QWebPage): # {{{ sz.setWidth(scroll_width+side_margin) self.setPreferredContentsSize(sz) self.javascript('window.paged_display.fit_images()') - self.javascript('window.paged_display.check_top_margin()') @property def column_boundaries(self): diff --git a/src/calibre/gui2/viewer/printing.py b/src/calibre/gui2/viewer/printing.py index 476cd949f5..f860edb12c 100644 --- a/src/calibre/gui2/viewer/printing.py +++ b/src/calibre/gui2/viewer/printing.py @@ -71,7 +71,6 @@ class Printing(QObject): paged_display.set_geometry(1, 0, 0, 0); paged_display.layout(); paged_display.fit_images(); - paged_display.check_top_margin(); ''') while True: From afacc1be2939cc2ca767893453dcd8516fc1af99 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 16:19:13 +0530 Subject: [PATCH 47/48] Oops forgot to implement the restart button for plugin updates and the plugin update action --- src/calibre/gui2/actions/plugin_updates.py | 2 ++ src/calibre/gui2/update.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/calibre/gui2/actions/plugin_updates.py b/src/calibre/gui2/actions/plugin_updates.py index d5da12df71..6973e80d8a 100644 --- a/src/calibre/gui2/actions/plugin_updates.py +++ b/src/calibre/gui2/actions/plugin_updates.py @@ -31,3 +31,5 @@ class PluginUpdaterAction(InterfaceAction): d = PluginUpdaterDialog(self.gui, initial_filter=initial_filter) d.exec_() + if d.do_restart: + self.gui.quit(restart=True) diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py index 3ff977f554..42d41e6d72 100644 --- a/src/calibre/gui2/update.py +++ b/src/calibre/gui2/update.py @@ -175,6 +175,8 @@ class UpdateMixin(object): d = PluginUpdaterDialog(self, initial_filter=FILTER_UPDATE_AVAILABLE) d.exec_() + if d.do_restart: + self.quit(restart=True) def plugin_update_found(self, number_of_updates): # Change the plugin icon to indicate there are updates available From aeddc2f95856591306db10a431a2e3332d910ff7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Jul 2012 16:20:14 +0530 Subject: [PATCH 48/48] ... --- Changelog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.yaml b/Changelog.yaml index 62fa0a5b9d..f71bdd5907 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -37,7 +37,7 @@ - title: "Advanced search dialog: When starting on the title/author/etc. tab, restore the previously used search kind as well." tickets: [1029745] - - title: "When presenting the calibre must be restarted warning after installing a new plugin, add a restart now button so that the user can conveniently restart calibre" + - title: "When presenting the calibre must be restarted warning after installing a new plugin, add a restart now button so that the user can conveniently restart calibre. Currently only works when going vie Preferences->Plugins->Get new plugins" bug fixes: - title: "Fix main window layout state being saved incorrectly if calibre is killed without a proper shutdown"