From 00b8c40c635c3e9d2159e73558e4a2e1544a42c7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Apr 2013 10:20:23 +0530
Subject: [PATCH] Fix #1170798 (Metro NL site changed, updated recipe)

---
 recipes/metro_news_nl.recipe | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/recipes/metro_news_nl.recipe b/recipes/metro_news_nl.recipe
index 81a184b7dc..0995719939 100644
--- a/recipes/metro_news_nl.recipe
+++ b/recipes/metro_news_nl.recipe
@@ -36,6 +36,9 @@
     Changed order of regex to speedup proces
  Version 1.9.3 23-05-2012
     Updated Cover image
+ Version 1.9.4 19-04-2013
+    Added regex filter for mailto
+    Updated for new layout of metro-site
 '''
 
 class AdvancedUserRecipe1306097511(BasicNewsRecipe):
@@ -43,7 +46,7 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe):
     oldest_article = 1.2
     max_articles_per_feed = 25
     __author__  = u'DrMerry'
-    description = u'Metro Nederland'
+    description = u'Metro Nederland v1.9.4 2013-04-19'
     language = u'nl'
     simultaneous_downloads = 5
     masthead_url = 'http://blog.metronieuws.nl/wp-content/themes/metro/images/header.gif'
@@ -68,13 +71,17 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe):
         #(re.compile('(</?)h2', re.DOTALL|re.IGNORECASE),lambda match:'\1em')
         ]
         
-    remove_tags_before= dict(id='date')
-    remove_tags_after = [dict(name='div', attrs={'class':['column-1-3','gallery-text']})]#id='share-and-byline')]
+    remove_tags_before= dict(id='subwrapper')
+    remove_tags_after = dict(name='div', attrs={'class':['body-area','article-main-area']})
+#name='div', attrs={'class':['subwrapper']})]
+#'column-1-3','gallery-text']})]#id='share-and-byline')]
+
+    filter_regexps = [r'mailto:.*']
 
     remove_tags = [
         dict(name=['iframe','script','noscript','style']),
-        dict(name='div', attrs={'class':['column-4-5','column-1-5','ad-msg','col-179 ','col-373 ','clear','ad','navigation',re.compile('share-tools(-top)?'),'tools','metroCommentFormWrap','article-tools-below-title','related-links','padding-top-15',re.compile('^promo.*?$'),'teaser-component',re.compile('fb(-comments|_iframe_widget)'),'promos','header-links','promo-2']}),
-        dict(id=['column-1-5-bottom','column-4-5',re.compile('^ad(\d+|adcomp.*?)?$'),'adadcomp-4','margin-5','sidebar',re.compile('^article-\d'),'comments','gallery-1']),
+        dict(name='div', attrs={'class':['aside clearfix','aside clearfix middle-col-line','comments','share-tools','article-right-column','column-4-5','column-1-5','ad-msg','col-179 ','col-373 ','clear','ad','navigation',re.compile('share-tools(-top)?'),'tools','metroCommentFormWrap','article-tools-below-title','related-links','padding-top-15',re.compile('^promo.*?$'),'teaser-component',re.compile('fb(-comments|_iframe_widget)'),'promos','header-links','promo-2']}),
+        dict(id=['article-2','googleads','column-1-5-bottom','column-4-5',re.compile('^ad(\d+|adcomp.*?)?$'),'adadcomp-4','margin-5','sidebar',re.compile('^article-\d'),'comments','gallery-1','sharez_container','ts-container','topshares','ts-title']),
         dict(name='a', attrs={'name':'comments'}),
         #dict(name='div', attrs={'data-href'}),
         dict(name='img', attrs={'class':'top-line','title':'volledig scherm'}),