diff --git a/Changelog.yaml b/Changelog.yaml
index 443a984b22..a17cb4b82f 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -19,6 +19,103 @@
# new recipes:
# - title:
+- version: 0.9.3
+ date: 2012-10-19
+
+ new features:
+ - title: "Conversion: Add support for CSS 3 selectors by switching to the new cssselect module"
+
+ - title: "Drivers for the WayteQ xBook and the Topwise Android tablet"
+ tickets: [1066083,1067105]
+
+ - title: "Add an output profile for the Kindle PaperWhite"
+
+ - title: "Kobo driver: Improve performance when a large number of shelves are created on the device."
+ tickets: [1066633]
+
+ - title: "Catalogs: Put catalog sections at top level of ToC for EPUB/AZW3 catalogs."
+
+ - title: "Adding books: When duplicates are found, show the list of possible duplicates in calibre with title and author."
+
+ bug fixes:
+ - title: "KF8 Input: Fix conversion/viewing of KF8 files generated with the unreleased? kindlegen 2.7."
+ tickets: [1067310]
+
+ - title: "Kindle driver: Increase the size of the cover thumbnails sent by calibre to the device. This fixes the problem of cover thumbnails not showing up on the PaperWhite"
+
+ - title: "MTP driver: Fix sorting on the title column of the device view."
+ tickets: [1067562]
+
+ - title: "Catalogs: Fix regression that caused authors and titles to be be incorrectly listed under symbols on OSX < 10.8."
+
+ - title: "Catalogs: Fix error when generating catalog in non English locale and the user has specified a prefix rule using a Yes/no column."
+ tickets: [1065452]
+
+ - title: "E-book viewer: Remove the reload entry from the context menu as it is not supported in paged mode."
+ tickets: [1065615]
+
+ improved recipes:
+ - Richmond Times Dispatch
+ - Various Polish news sources
+ - Aksiyon dergisi
+ - Spektrum der Wissenschaft
+ - Zeit Online
+ - Baltimore Sun
+ - LWN Weekly
+ - The Sun
+
+ new recipes:
+ - title: Various Polish news sources
+ author: fenuks
+
+- version: 0.9.2
+ date: 2012-10-11
+
+ new features:
+ - title: "Wireless driver: Speed up deleting of multiple books"
+
+ - title: "E-book viewer: Add options to hide the scrollbar and show reading position in full screen mode."
+ tickets: [1047450]
+
+ - title: "News download: Add a field to allow recipe authors to tell calibre to remove duplicate articles that a re present in more than one section from the download."
+
+ - title: "Metadata download: Turn off the use of the published date for the earliest edition a book as the published date. The earliest edition was identified via worldcat.org, which has rather poor data, leading to the occasional incorrect result. If you want this feature back, you can turn it on again via Preferences->Metadata download."
+
+ bug fixes:
+ - title: "ODT Input: More workarounds for the image positioning markup produced by newer versions of LibreOffice."
+ tickets: [1063207]
+
+ - title: "Metadata download dialog: Fix selected cover being changed when covers are re-sorted after download completes"
+
+ - title: "MTP driver: Ignore errors when getting the driveinfo.calibre file from the device and simply regenerate it"
+
+ - title: "E-book viewer: Use the system locale settings to display the 24/12 hour clock in full screen mode"
+ tickets: [1063209]
+
+ - title: "Content Server: Make OPDS initial page respect the fields to display tweak"
+
+ - title: "Fix regression that caused calibre to not use OPF files when adding books recursively from directories with multiple books per directory"
+
+ - title: "KF8 Output: Fix handling of input documents that have URL unsafe characters in the file names of their images."
+ tickets: [1062477]
+
+ - title: "Fix enumeration type custom column not being merged."
+ tickets: [1061602]
+
+ improved recipes:
+ - Pubblico Giornale
+ - Der Spiegel
+ - Shortlist
+ - FHM UK
+ - Countryfile
+ - Cosmo UK
+ - The Sun UK
+ - NME
+
+ new recipes:
+ - title: PVP Online, Mobile Nations, The Verge and Television Without Pity
+ author: Krittika Goyal
+
- version: 0.9.1
date: 2012-10-05
diff --git a/recipes/adventure_zone_pl.recipe b/recipes/adventure_zone_pl.recipe
index bb311606ac..485a2e0c5b 100644
--- a/recipes/adventure_zone_pl.recipe
+++ b/recipes/adventure_zone_pl.recipe
@@ -3,7 +3,7 @@ import re
class Adventure_zone(BasicNewsRecipe):
title = u'Adventure Zone'
__author__ = 'fenuks'
- description = 'Adventure zone - adventure games from A to Z'
+ description = u'Adventure zone - adventure games from A to Z'
category = 'games'
language = 'pl'
no_stylesheets = True
@@ -11,7 +11,9 @@ class Adventure_zone(BasicNewsRecipe):
max_articles_per_feed = 100
index='http://www.adventure-zone.info/fusion/'
use_embedded_content=False
- preprocess_regexps = [(re.compile(r"
Komentarze | ", re.IGNORECASE), lambda m: '')]
+ preprocess_regexps = [(re.compile(r"Komentarze | ", re.IGNORECASE), lambda m: ''),
+ (re.compile(r'\'), lambda match: ''),
+ (re.compile(r'\'), lambda match: '')]
remove_tags_before= dict(name='td', attrs={'class':'main-bg'})
remove_tags= [dict(name='img', attrs={'alt':'Drukuj'})]
remove_tags_after= dict(id='comments')
@@ -52,6 +54,11 @@ class Adventure_zone(BasicNewsRecipe):
def preprocess_html(self, soup):
footer=soup.find(attrs={'class':'news-footer middle-border'})
+ r = soup.find(name='td', attrs={'class':'capmain'})
+ if r:
+ r.name='h1'
+ for item in soup.findAll(name=['tr', 'td']):
+ item.name='div'
if footer and len(footer('a'))>=2:
footer('a')[1].extract()
for item in soup.findAll(style=True):
diff --git a/recipes/aksiyon_derigisi.recipe b/recipes/aksiyon_derigisi.recipe
index f18ebd84d3..bc15b39095 100644
--- a/recipes/aksiyon_derigisi.recipe
+++ b/recipes/aksiyon_derigisi.recipe
@@ -17,18 +17,13 @@ class Aksiyon (BasicNewsRecipe):
category = 'news, haberler,TR,gazete'
language = 'tr'
publication_type = 'magazine'
- #extra_css = ' body{ font-family: Verdana,Helvetica,Arial,sans-serif } .introduction{font-weight: bold} .story-feature{display: block; padding: 0; border: 1px solid; width: 40%; font-size: small} .story-feature h2{text-align: center; text-transform: uppercase} '
- #keep_only_tags = [dict(name='font', attrs={'class':['newsDetail','agenda2NewsSpot']}),dict(name='span', attrs={'class':['agenda2Title']}),dict(name='div', attrs={'id':['gallery']})]
- remove_tags = [dict(name='img', attrs={'src':[ 'http://medya.aksiyon.com.tr/aksiyon/images/logo/logo.bmp','/aksiyon/images/template/green/baslik0.gif','mobile/home.jpg']}) ]
-
+ auto_cleanup = True
cover_img_url = 'http://www.aksiyon.com.tr/aksiyon/images/aksiyon/top-page/aksiyon_top_r2_c1.jpg'
masthead_url = 'http://aksiyon.com.tr/aksiyon/images/aksiyon/top-page/aksiyon_top_r2_c1.jpg'
remove_empty_feeds= True
- remove_attributes = ['width','height']
-
feeds = [
+ ( u'KAPAK', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=26'),
( u'ANASAYFA', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=0'),
- ( u'KARAKUTU', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=11'),
( u'EKONOMİ', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=35'),
( u'EKOANALİZ', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=284'),
( u'YAZARLAR', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=17'),
@@ -37,17 +32,15 @@ class Aksiyon (BasicNewsRecipe):
( u'ARKA PENCERE', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=27'),
( u'DÜNYA', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=32'),
( u'DOSYALAR', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=34'),
+ ( u'KARAKUTU', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=11'),
( u'KÜLTÜR & SANAT', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=12'),
- ( u'KAPAK', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=26'),
( u'SPOR', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=38'),
( u'BİLİŞİM - TEKNOLOJİ', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=39'),
( u'3. BOYUT', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=172'),
( u'HAYAT BİLGİSİ', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=283'),
( u'İŞ DÜNYASI', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=283'),
-
-
]
- def print_version(self, url):
- return url.replace('http://www.aksiyon.com.tr/aksiyon/newsDetail_getNewsById.action?load=detay&', 'http://www.aksiyon.com.tr/aksiyon/mobile_detailn.action?')
+ #def print_version(self, url):
+ #return url.replace('http://www.aksiyon.com.tr/aksiyon/newsDetail_getNewsById.action?load=detay&', 'http://www.aksiyon.com.tr/aksiyon/mobile_detailn.action?')
diff --git a/recipes/baltimore_sun.recipe b/recipes/baltimore_sun.recipe
index 7c55bfd5fe..006a4c4ae6 100644
--- a/recipes/baltimore_sun.recipe
+++ b/recipes/baltimore_sun.recipe
@@ -11,10 +11,9 @@ class BaltimoreSun(BasicNewsRecipe):
title = 'The Baltimore Sun'
__author__ = 'Josh Hall'
-
description = 'Complete local news and blogs from Baltimore'
language = 'en'
- version = 2
+ version = 2.1
oldest_article = 1
max_articles_per_feed = 100
use_embedded_content = False
@@ -22,6 +21,7 @@ class BaltimoreSun(BasicNewsRecipe):
remove_javascript = True
recursions = 1
+ ignore_duplicate_articles = {'title'}
keep_only_tags = [dict(name='div', attrs={'class':["story","entry-asset asset hentry"]}),
dict(name='div', attrs={'id':["pagebody","story","maincontentcontainer"]}),
]
@@ -201,3 +201,5 @@ class BaltimoreSun(BasicNewsRecipe):
tag.extract()
for tag in soup.findAll('font', dict(attrs={'id':["cr-other-headlines"]})):
tag.extract()
+
+ return soup
diff --git a/recipes/benchmark_pl.recipe b/recipes/benchmark_pl.recipe
index 9544abdfcf..66d4f35e73 100644
--- a/recipes/benchmark_pl.recipe
+++ b/recipes/benchmark_pl.recipe
@@ -12,9 +12,9 @@ class BenchmarkPl(BasicNewsRecipe):
max_articles_per_feed = 100
no_stylesheets=True
preprocess_regexps = [(re.compile(ur'