From 806b1d0a6bf5c5c299b24300fef9cba7fe7f4f1c Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 13 Jan 2011 03:54:13 -0700 Subject: [PATCH 1/3] GwR fix for #8295, series title sorting failure (Kindle) --- src/calibre/library/catalog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py index 5cda9baa8c..0be2d7fc05 100644 --- a/src/calibre/library/catalog.py +++ b/src/calibre/library/catalog.py @@ -3250,7 +3250,7 @@ class EPUB_MOBI(CatalogPlugin): # Loop over the series titles, find start of each letter, add description_preview_count books # Special switch for using different title list title_list = self.booksBySeries - current_letter = self.letter_or_symbol(title_list[0]['series'][0]) + current_letter = self.letter_or_symbol(self.generateSortTitle(title_list[0]['series'])[0]) title_letters = [current_letter] current_series_list = [] current_series = "" From 8bbc4ef1dee1ce93627f949c07036d97df7271b8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 13 Jan 2011 08:53:27 -0700 Subject: [PATCH 2/3] Pressthink by DM. Fixes #8299 (New recipe for blog PressThink) --- resources/images/news/pressthink.png | Bin 0 -> 533 bytes resources/recipes/pressthink.recipe | 61 +++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 resources/images/news/pressthink.png create mode 100644 resources/recipes/pressthink.recipe diff --git a/resources/images/news/pressthink.png b/resources/images/news/pressthink.png new file mode 100644 index 0000000000000000000000000000000000000000..2a70cd5ca55e8c1b3d8e2dd16ac77d41d1af9532 GIT binary patch literal 533 zcmeAS@N?(olHy`uVBq!ia0vp^0w65F0wkYiy)rh#XMp-J+BE$MA_UNeQhotLbc`)Tub=jUrpBeK8RzW%$fyfRGt z_A~h)8Gg~o>)L0YKltjT@Ilcb@PLV;NYg=vTe&y#68BEqonHAaIzVK{-38a1bHt)_ zSA;0cZTl=~CA%Z$p2dgXi8gGp?Rny#Dm#uRTD7_`wK;ECS|_}%|m=e{-jtYh Date: Thu, 13 Jan 2011 09:45:49 -0700 Subject: [PATCH 3/3] Another fix for badly behaved plugins --- src/calibre/gui2/ui.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 01d3180778..b2d6d329f5 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -269,7 +269,13 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ self.set_window_title() for ac in self.iactions.values(): - ac.initialization_complete() + try: + ac.initialization_complete() + except: + import traceback + traceback.print_exc() + if ac.plugin_path is None: + raise if show_gui and self.gui_debug is not None: info_dialog(self, _('Debug mode'), '

' +