From 0c7e7b7d8394c38a02edc3a7be0b555bc9b5cf1d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 30 Apr 2010 11:39:08 -0600 Subject: [PATCH] version 0.6.50 --- Changelog.yaml | 91 +++++++++++++++++++++++++++ resources/recipes/ilsole24ore.recipe | 18 +++--- resources/recipes/la_republica.recipe | 37 ++++++----- src/calibre/constants.py | 2 +- 4 files changed, 123 insertions(+), 25 deletions(-) diff --git a/Changelog.yaml b/Changelog.yaml index 36b5459c3a..e32442546a 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -4,6 +4,97 @@ # for important features/bug fixes. # Also, each release can have new and improved recipes. +- version: 0.6.50 + date: 2010-04-30 + + new features: + - title: "Add merge book feature" + type: major + desc: > + "You can now merge multiple books into a single book, by clicking the arrow next to the edit meta information button. + Meta information from the books will be merged as well as individual book files in different formats" + + - title: "Support for the Samsung Galaxy Spica and the Palm Pre" + + - title: "Add a 'Go to' context menu to the ebook viewer" + tickets: [1230] + + - title: "Show an asterisk next to version number when user is using CALIBRE_DEVELOP_FROM" + tickets: [5417] + + - title: "Import ComicBookLover metadata from CBZ files" + tickets: [5402] + + - title: "Add keyboard shortcut for viewing a specific format" + tickets: [5408] + + - title: "EPUB Output: Add option to not use SVG for covers. Useful if you want to generate an EPUB for devices like the iPhone or JetBook Lite that don't support SVG covers" + tickets: [5409] + + - title: "In the book info display area, only show series and tags if there are any. Move comments to the bottom." + tickets: [5391] + + bug fixes: + - title: "E-book viewer: Use the Qt API to set document padding during next page operation, instead of javascript." + tickets: [5343] + + - title: "E-book viewer: Handle self-closing heading tags in XHTML documents correctly." + tickets: [5413] + + - title: "Conversion pipeline: Ignore CSS pseudo selectors" + tickets: [5337] + + - title: "MOBI Input: Ignore form tags" + tickets: [5378] + + - title: "Handle a scheduled custom recipe being deleted gracefully" + tickets: [5366] + + - title: "ebook-convert: Don't rename PNG covers to JPG" + tickets: [5379] + + - title: "Conversion pipeline: Respect width and height attributes in addition to width and height in CSS" + + - title: "Fix regression which broke the use of HTML files in the regexp testing wizard" + tickets: [5341] + + - title: "Fix match highlighting for multi-line regexps in the regexp testing wizard" + tickets: [5414] + + - title: "EPUB Output: Workaround Adobe Digital Editions bug in rendering of lists with a left margin set." + tickets: [5415] + + - title: "PRS 505/600/700/300 driver: Don't give an error message when editing metadata on SD card and cache directory does not exist" + tickets: [5410] + + - title: "When converting EPUB to EPUB multiple times and creating book jacket from metadata, if an existing book jacket is found, + replace it. This will only work with EPUBs created with the current release onwards" + + - title: "Correctly handle HTML in comments" + tickets: [5237] + + - title: "Kindle driver: When transferring files whose names start witha period, replace the period." + tickets: [5367] + + - title: "Conversion pipeline: When decoding XML (but not XHTML) if no encoding is specified, assume utf-8. Make entity conversion more robust. When splitting html handle ids with quotes in them correctly" + + new recipes: + - title: The Old New Thing, Berlingske, ABC, Ultima Hora, China Daily, Dani + author: Darko Miletic + + - title: Observa Digital + author: yrvn + + - title: "Bill O'Reilly and Sean Hannity" + author: Rob Lammert + + improved recipes: + - PC Magazine + - Reuters + - Sueddeutsche Zeitung + - "il Sole 24 Ore" + - La Repubblica + - version: 0.6.49 date: 2010-04-23 diff --git a/resources/recipes/ilsole24ore.recipe b/resources/recipes/ilsole24ore.recipe index 8258bb563d..920c703222 100644 --- a/resources/recipes/ilsole24ore.recipe +++ b/resources/recipes/ilsole24ore.recipe @@ -11,12 +11,13 @@ http://www.ilsole24ore.com/ from calibre.web.feeds.news import BasicNewsRecipe -class ilsole(BasicNewsRecipe): +class ilsole24Ore(BasicNewsRecipe): author = 'Lorenzo Vigentini & Edwin van Maastrigt' description = 'Financial news daily paper' - cover_url = 'http://www.ilsole24ore.com/img2009/header/t_logosole.gif' - title = u'il Sole 24 Ore ' + cover_url = 'http://www.ilsole24ore.com/img2007/print_header.gif' + + title = u'il Sole 24 Ore New' publisher = 'italiaNews' category = 'News, finance, economy, politics' @@ -35,12 +36,14 @@ class ilsole(BasicNewsRecipe): def print_version(self, url): link, sep, params = url.rpartition('?') + if link is None: + return link.replace('_1.php', '_php') return link.replace('.shtml', '_PRN.shtml') keep_only_tags = [ dict(name='div', attrs={'class':'txt'}) ] - remove_tags = [dict(name='br')] +# remove_tags = [dict(name='br')] feeds = [ (u'Prima pagina', u'http://www.ilsole24ore.com/rss/primapagina.xml'), @@ -52,13 +55,14 @@ class ilsole(BasicNewsRecipe): (u'Tecnologia e business', u'http://www.ilsole24ore.com/rss/tecnologia-business.xml'), (u'Cultura e tempo libero', u'http://www.ilsole24ore.com/rss/tempolibero-cultura.xml'), (u'Sport', u'http://www.ilsole24ore.com/rss/sport.xml'), - (u'Professionisti 24', u'http://www.ilsole24ore.com/rss/prof_home.xml') + (u'Professionisti 24', u'http://www.ilsole24ore.com/rss/prof_home.xml'), + (u'Ambiente e Sicurezza',u'http://www.ilsole24ore.com/rss/prof_as.xml') ] extra_css = ''' - html, body, table, tr, td, h1, h2, h3, h4, h5, h6, p, a, span, br, img {margin:0;padding:0;border:0;font-size:12px;font-family:Arial;} + html, body, table, tr, td, h1, h2, h3, h4, h5, h6, p, a, span, br, img {margin:0;padding:0;border:0;font-size:12px;font-family:"Georgia","Times New Roman";} .linkHighlight {color:#0292c6;} - .txt {border-bottom:1px solid #7c7c7c;padding-bottom:20px;text-align:justify;} + .txt {border-bottom:1px solid #7c7c7c;padding-bottom:20px};text-align:justify;font-family:"serif"} .txt p {line-height:18px;} .txt span {line-height:22px;} .title h3 {color:#7b7b7b;} diff --git a/resources/recipes/la_republica.recipe b/resources/recipes/la_republica.recipe index 107232daa6..75374d9834 100644 --- a/resources/recipes/la_republica.recipe +++ b/resources/recipes/la_republica.recipe @@ -10,7 +10,7 @@ http://www.repubblica.it/ from calibre.web.feeds.news import BasicNewsRecipe -class LaRepublica(BasicNewsRecipe): +class LaRepubblica(BasicNewsRecipe): author = 'Lorenzo Vigentini, based on Darko Miletic' description = 'Italian daily newspaper' @@ -54,21 +54,24 @@ class LaRepublica(BasicNewsRecipe): ] feeds = [ - (u'Repubblica Rilievo', u'http://www.repubblica.it/rss/homepage/rss2.0.xml'), - (u'Repubblica Cronaca', u'http://www.repubblica.it/rss/cronaca/rss2.0.xml'), - (u'Repubblica Esteri', u'http://www.repubblica.it/rss/esteri/rss2.0.xml'), - (u'Repubblica Economia', u'http://www.repubblica.it/rss/economia/rss2.0.xml'), - (u'Repubblica Politica', u'http://www.repubblica.it/rss/politica/rss2.0.xml'), - (u'Repubblica Scienze', u'http://www.repubblica.it/rss/scienze/rss2.0.xml'), - (u'Repubblica Tecnologia', u'http://www.repubblica.it/rss/tecnologia/rss2.0.xml'), - (u'Repubblica Scuola e Universita', u'http://www.repubblica.it/rss/scuola_e_universita/rss2.0.xml'), - (u'Repubblica Ambiente', u'http://www.repubblica.it/rss/ambiente/rss2.0.xml'), - (u'Repubblica Cultura', u'http://www.repubblica.it/rss/spettacoli_e_cultura/rss2.0.xml'), - (u'Repubblica Persone', u'http://www.repubblica.it/rss/persone/rss2.0.xml'), - (u'Repubblica Sport', u'http://www.repubblica.it/rss/sport/rss2.0.xml'), - (u'Repubblica Calcio', u'http://www.repubblica.it/rss/sport/calcio/rss2.0.xml'), - (u'Repubblica Motori', u'http://www.repubblica.it/rss/motori/rss2.0.xml'), - (u'Repubblica Roma', u'http://roma.repubblica.it/rss/rss2.0.xml'), - (u'Repubblica Torino', u'http://torino.repubblica.it/rss/rss2.0.xml') + (u'Rilievo', u'http://www.repubblica.it/rss/homepage/rss2.0.xml'), + (u'Cronaca', u'http://www.repubblica.it/rss/cronaca/rss2.0.xml'), + (u'Esteri', u'http://www.repubblica.it/rss/esteri/rss2.0.xml'), + (u'Economia', u'http://www.repubblica.it/rss/economia/rss2.0.xml'), + (u'Politica', u'http://www.repubblica.it/rss/politica/rss2.0.xml'), + (u'Scienze', u'http://www.repubblica.it/rss/scienze/rss2.0.xml'), + (u'Tecnologia', u'http://www.repubblica.it/rss/tecnologia/rss2.0.xml'), + (u'Scuola e Universita', u'http://www.repubblica.it/rss/scuola_e_universita/rss2.0.xml'), + (u'Ambiente', u'http://www.repubblica.it/rss/ambiente/rss2.0.xml'), + (u'Cultura', u'http://www.repubblica.it/rss/spettacoli_e_cultura/rss2.0.xml'), + (u'Persone', u'http://www.repubblica.it/rss/persone/rss2.0.xml'), + (u'Sport', u'http://www.repubblica.it/rss/sport/rss2.0.xml'), + (u'Calcio', u'http://www.repubblica.it/rss/sport/calcio/rss2.0.xml'), + (u'Motori', u'http://www.repubblica.it/rss/motori/rss2.0.xml'), + (u'Edizione Roma', u'http://roma.repubblica.it/rss/rss2.0.xml'), + (u'Edizione Torino', u'http://torino.repubblica.it/rss/rss2.0.xml'), + (u'Edizione Milano', u'feed://milano.repubblica.it/rss/rss2.0.xml'), + (u'Edizione Napoli', u'feed://napoli.repubblica.it/rss/rss2.0.xml'), + (u'Edizione Palermo', u'feed://palermo.repubblica.it/rss/rss2.0.xml') ] diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 7632dec1e1..74d747e2b6 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -2,7 +2,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __appname__ = 'calibre' -__version__ = '0.6.49' +__version__ = '0.6.50' __author__ = "Kovid Goyal " import re