Merge branch 'master' of https://github.com/unkn0w7n/calibre

recipes/deutsche_welle_bs.recipe

@@ -23,13 +23,27 @@ class DeutscheWelle_bs(BasicNewsRecipe):
     keep_only_tags = [
         dict(name='article')
     ]
-    
+
+    recipe_specific_options = {
+        'days': {
+            'short': 'Oldest article to download from this news source. In days ',
+            'long': 'For example, 0.5, gives you articles from the past 12 hours',
+            'default': str(oldest_article)
+        }
+    }
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        d = self.recipe_specific_options.get('days')
+        if d and isinstance(d, str):
+            self.oldest_article = float(d)
+
     remove_tags = [
         dict(name=['footer', 'source']),
         dict(attrs={'data-tracking-name':'sharing-icons-inline'}),
         classes('kicker advertisement vjs-wrapper')
     ]
-    
+
     feeds = [
         (u'Politika', u'http://rss.dw-world.de/rdf/rss-bos-pol'),
         (u'Evropa', u'http://rss.dw-world.de/rdf/rss-bos-eu'),

recipes/deutsche_welle_de.recipe

@@ -21,6 +21,20 @@ class DeutscheWelle(BasicNewsRecipe):
         dict(name='article')
     ]
 
+    recipe_specific_options = {
+        'days': {
+            'short': 'Oldest article to download from this news source. In days ',
+            'long': 'For example, 0.5, gives you articles from the past 12 hours',
+            'default': str(oldest_article)
+        }
+    }
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        d = self.recipe_specific_options.get('days')
+        if d and isinstance(d, str):
+            self.oldest_article = float(d)
+
     remove_tags = [
         dict(name=['footer', 'source']),
         dict(attrs={'data-tracking-name':'sharing-icons-inline'}),

recipes/deutsche_welle_en.recipe

@@ -15,7 +15,21 @@ class DeutscheWelle_en(BasicNewsRecipe):
     remove_empty_feeds = True
     ignore_duplicate_articles = {'title', 'url'}
     remove_attributes = ['height', 'width', 'style']
-    
+ 
+    recipe_specific_options = {
+        'days': {
+            'short': 'Oldest article to download from this news source. In days ',
+            'long': 'For example, 0.5, gives you articles from the past 12 hours',
+            'default': str(oldest_article)
+        }
+    }
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        d = self.recipe_specific_options.get('days')
+        if d and isinstance(d, str):
+            self.oldest_article = float(d)
+   
     keep_only_tags = [
         dict(name='article')
     ]

recipes/deutsche_welle_es.recipe

@@ -17,10 +17,24 @@ class DeutscheWelle_es(BasicNewsRecipe):
 
     remove_attributes = ['height', 'width', 'style']
 
+    recipe_specific_options = {
+        'days': {
+            'short': 'Oldest article to download from this news source. In days ',
+            'long': 'For example, 0.5, gives you articles from the past 12 hours',
+            'default': str(oldest_article)
+        }
+    }
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        d = self.recipe_specific_options.get('days')
+        if d and isinstance(d, str):
+            self.oldest_article = float(d)
+
     keep_only_tags = [
         dict(name='article')
     ]
-    
+
     remove_tags = [
         dict(name=['footer', 'source']),
         dict(attrs={'data-tracking-name':'sharing-icons-inline'}),
@@ -40,7 +54,7 @@ class DeutscheWelle_es(BasicNewsRecipe):
         ('Conozca Alemania', 'http://rss.dw-world.de/rdf/rss-sp-con')
     ]
 
- 
+
     def preprocess_html(self, soup):
         for img in soup.findAll('img', srcset=True):
             img['src'] = img['srcset'].split()[6]

recipes/deutsche_welle_hr.recipe

@@ -16,20 +16,34 @@ class DeutscheWelle_hr(BasicNewsRecipe):
     remove_empty_feeds = True
     masthead_url = 'http://www.dw-world.de/skins/std/channel1/pics/dw_logo1024.gif'
     remove_javascript = True
-    
+
     ignore_duplicate_articles = {'title', 'url'}
     remove_attributes = ['height', 'width', 'style']
 
+    recipe_specific_options = {
+        'days': {
+            'short': 'Oldest article to download from this news source. In days ',
+            'long': 'For example, 0.5, gives you articles from the past 12 hours',
+            'default': str(oldest_article)
+        }
+    }
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        d = self.recipe_specific_options.get('days')
+        if d and isinstance(d, str):
+            self.oldest_article = float(d)
+
     keep_only_tags = [
         dict(name='article')
     ]
-    
+
     remove_tags = [
         dict(name=['footer', 'source']),
         dict(attrs={'data-tracking-name':'sharing-icons-inline'}),
         classes('kicker advertisement vjs-wrapper')
     ]
-    
+
     feeds = [
         (u'Svijet', u'http://rss.dw-world.de/rdf/rss-cro-svijet'),
         (u'Europa', u'http://rss.dw-world.de/rdf/rss-cro-eu'),

recipes/deutsche_welle_pt.recipe

@@ -15,12 +15,25 @@ class DeutscheWelle_pt(BasicNewsRecipe):
     publication_type = 'newsportal'
     remove_empty_feeds = True
     masthead_url = 'http://www.dw-world.de/skins/std/channel1/pics/dw_logo1024.gif'
-    
+
-    
     remove_javascript = True
     ignore_duplicate_articles = {'title', 'url'}
     remove_attributes = ['height', 'width', 'style']
-    
+ 
+    recipe_specific_options = {
+        'days': {
+            'short': 'Oldest article to download from this news source. In days ',
+            'long': 'For example, 0.5, gives you articles from the past 12 hours',
+            'default': str(oldest_article)
+        }
+    }
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        d = self.recipe_specific_options.get('days')
+        if d and isinstance(d, str):
+            self.oldest_article = float(d)
+
     def preprocess_html(self, soup):
         for img in soup.findAll('img', srcset=True):
             img['src'] = img['srcset'].split()[6]
@@ -29,7 +42,7 @@ class DeutscheWelle_pt(BasicNewsRecipe):
     keep_only_tags = [
         dict(name='article')
     ]
-    
+
     remove_tags = [
         dict(name=['footer', 'source']),
         dict(attrs={'data-tracking-name':'sharing-icons-inline'}),

recipes/deutsche_welle_ru.recipe

@@ -16,7 +16,21 @@ class DeutscheWelle(BasicNewsRecipe):
     remove_empty_feeds = True
     ignore_duplicate_articles = {'title', 'url'}
     remove_attributes = ['height', 'width', 'style']
-    
+ 
+    recipe_specific_options = {
+        'days': {
+            'short': 'Oldest article to download from this news source. In days ',
+            'long': 'For example, 0.5, gives you articles from the past 12 hours',
+            'default': str(oldest_article)
+        }
+    }
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        d = self.recipe_specific_options.get('days')
+        if d and isinstance(d, str):
+            self.oldest_article = float(d)
+   
     def preprocess_html(self, soup):
         for img in soup.findAll('img', srcset=True):
             img['src'] = img['srcset'].split()[6]

recipes/deutsche_welle_sr.recipe

@@ -18,7 +18,21 @@ class DeutscheWelle_sr(BasicNewsRecipe):
     remove_javascript = True
     ignore_duplicate_articles = {'title', 'url'}
     remove_attributes = ['height', 'width', 'style']
-    
+
+    recipe_specific_options = {
+        'days': {
+            'short': 'Oldest article to download from this news source. In days ',
+            'long': 'For example, 0.5, gives you articles from the past 12 hours',
+            'default': str(oldest_article)
+        }
+    }
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        d = self.recipe_specific_options.get('days')
+        if d and isinstance(d, str):
+            self.oldest_article = float(d)
+
     def preprocess_html(self, soup):
         for img in soup.findAll('img', srcset=True):
             img['src'] = img['srcset'].split()[6]
@@ -27,13 +41,13 @@ class DeutscheWelle_sr(BasicNewsRecipe):
     keep_only_tags = [
         dict(name='article')
     ]
-    
+
     remove_tags = [
         dict(name=['footer', 'source']),
         dict(attrs={'data-tracking-name':'sharing-icons-inline'}),
         classes('kicker advertisement vjs-wrapper')
     ]
-    
+
     feeds = [
         (u'Politika', u'http://rss.dw-world.de/rdf/rss-ser-pol'),
         (u'Srbija', u'http://rss.dw-world.de/rdf/rss-ser-pol-ser'),