From fd2d6bdd3d6f2b904a92237a36532a51c6a2cedc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 26 Aug 2009 08:28:11 -0600
Subject: [PATCH] New recipe Darknet by Oliver Beusner

---
 src/calibre/gui2/images/news/darknet.png      | Bin 0 -> 1874 bytes
 src/calibre/web/feeds/recipes/__init__.py     |   2 +-
 .../web/feeds/recipes/recipe_darknet.py       |  43 ++++++++++++++++++
 .../web/feeds/recipes/recipe_elektrolese.py   |   3 +-
 src/calibre/web/feeds/recipes/recipe_hna.py   |   9 ++++
 .../web/feeds/recipes/recipe_linuxdevices.py  |  37 ++++++---------
 6 files changed, 69 insertions(+), 25 deletions(-)
 create mode 100644 src/calibre/gui2/images/news/darknet.png
 create mode 100644 src/calibre/web/feeds/recipes/recipe_darknet.py

diff --git a/src/calibre/gui2/images/news/darknet.png b/src/calibre/gui2/images/news/darknet.png
new file mode 100644
index 0000000000000000000000000000000000000000..a64867c3e7cba90c695c3bf5d8d010c9f7b46a92
GIT binary patch
literal 1874
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
M07*qoM6N<$f(G?ryZ`_I

literal 0
HcmV?d00001

diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index 2892e88379..3a2b7a4e13 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/src/calibre/web/feeds/recipes/__init__.py
@@ -55,7 +55,7 @@ recipe_modules = ['recipe_' + r for r in (
            'eltiempo_hn', 'slate', 'tnxm', 'bbcvietnamese', 'vnexpress',
            'volksrant', 'theeconomictimes_india', 'ourdailybread',
            'monitor', 'republika', 'beta', 'beta_en', 'glasjavnosti',
-           'esquire', 'livemint', 'thedgesingapore',
+           'esquire', 'livemint', 'thedgesingapore', 'darknet',
           )]
 
 
diff --git a/src/calibre/web/feeds/recipes/recipe_darknet.py b/src/calibre/web/feeds/recipes/recipe_darknet.py
new file mode 100644
index 0000000000..e86be1655a
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_darknet.py
@@ -0,0 +1,43 @@
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
+'''
+Fetch darknet.
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+
+class darknet(BasicNewsRecipe):
+
+    title = 'darknet'
+    description = 'Ethical hacking and security news'
+    __author__ = 'Oliver Niesner'
+    language = _('English')
+    use_embedded_content   = False
+    timefmt = ' [%b %d %Y]'
+    max_articles_per_feed = 40
+    no_stylesheets = True
+    oldest_article = 180
+
+    remove_tags = [dict(id='navi_top'),
+		   dict(id='navi_bottom'),
+		   dict(id='logo'),
+		   dict(id='login_suche'),
+		   dict(id='navi_login'),
+		   dict(id='breadcrumb'),
+		   dict(id='subtitle'),
+		   dict(id='bannerzone'),
+		   dict(name='span', attrs={'class':'rsaquo'}),
+		   dict(name='span', attrs={'class':'next'}),
+		   dict(name='span', attrs={'class':'prev'}),
+		   dict(name='div', attrs={'class':'news_logo'}),
+		   dict(name='div', attrs={'class':'nextprev'}),
+		   dict(name='p', attrs={'class':'news_option'}),
+		   dict(name='p', attrs={'class':'news_foren'})]
+    remove_tags_after = [dict(name='div', attrs={'class':'entrybody'})]
+
+    feeds =  [ ('darknet', 'http://feedproxy.google.com/darknethackers') ]
+
+
+
diff --git a/src/calibre/web/feeds/recipes/recipe_elektrolese.py b/src/calibre/web/feeds/recipes/recipe_elektrolese.py
index 622190a286..07eef95bbc 100644
--- a/src/calibre/web/feeds/recipes/recipe_elektrolese.py
+++ b/src/calibre/web/feeds/recipes/recipe_elektrolese.py
@@ -32,7 +32,6 @@ class elektrolese(BasicNewsRecipe):
 
 
 
-    feeds =  [ (u'electrolese', u'http://elektrolese.blogspot.com/feeds/posts/default?alt=rss') ]
-
+    feeds =  [ (u'elektrolese', u'http://elektrolese.blogspot.com/feeds/posts/default?alt=rss') ]
 
 
diff --git a/src/calibre/web/feeds/recipes/recipe_hna.py b/src/calibre/web/feeds/recipes/recipe_hna.py
index c4faec94ba..928d3f032b 100644
--- a/src/calibre/web/feeds/recipes/recipe_hna.py
+++ b/src/calibre/web/feeds/recipes/recipe_hna.py
@@ -19,16 +19,24 @@ class hnaDe(BasicNewsRecipe):
     timefmt = ' [%d %b %Y]'
     max_articles_per_feed = 40
     no_stylesheets = True
+    remove_javascript = True
     encoding = 'iso-8859-1'
 
     remove_tags = [dict(id='topnav'),
 		   dict(id='nav_main'),
+		   dict(id='teaser'),
 		   dict(id='suchen'),
+		   dict(id='superbanner'),
+		   dict(id='navigation'),
+		   dict(id='skyscraper'),
 		   dict(id=''),
                    dict(name='span'),
 		   dict(name='ul', attrs={'class':'linklist'}),
 		   dict(name='a', attrs={'href':'#'}),
+		   dict(name='div', attrs={'class':'hlist'}),
+		   dict(name='div', attrs={'class':'subc noprint'}),
 		   dict(name='p', attrs={'class':'breadcrumb'}),
+		   dict(name='a', attrs={'style':'cursor:hand'}),
 		   dict(name='p', attrs={'class':'h5'})]
     #remove_tags_after = [dict(name='div', attrs={'class':'rahmenbreaking'})]
     remove_tags_after = [dict(name='a', attrs={'href':'#'})]
@@ -38,3 +46,4 @@ class hnaDe(BasicNewsRecipe):
 
 
 
+
diff --git a/src/calibre/web/feeds/recipes/recipe_linuxdevices.py b/src/calibre/web/feeds/recipes/recipe_linuxdevices.py
index 5f2ef3529b..ab79b4b911 100644
--- a/src/calibre/web/feeds/recipes/recipe_linuxdevices.py
+++ b/src/calibre/web/feeds/recipes/recipe_linuxdevices.py
@@ -6,6 +6,7 @@ Fetch Linuxdevices.
 '''
 import re
 from calibre.web.feeds.news import BasicNewsRecipe
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
 
 
 class Sueddeutsche(BasicNewsRecipe):
@@ -16,22 +17,22 @@ class Sueddeutsche(BasicNewsRecipe):
     use_embedded_content   = False
     timefmt = ' [%a %d %b %Y]'
     max_articles_per_feed = 50
-    language = _('English')
     no_stylesheets = True
-    html2epub_options = 'linearize_tables = True\nbase_font_size2=14'
-    html2lrf_options = ['--ignore-tables']
+    language = _('English')
+    remove_javascript = True
+    conversion_options {' linearize_tables' : True}
     encoding = 'latin1'
 
 
-    remove_tags_after = [dict(id='nointelliTXT')]
+    remove_tags_after = [dict(id='intelliTxt')]
     filter_regexps = [r'ad\.doubleclick\.net']
 
     remove_tags = [dict(name='div', attrs={'class':'bannerSuperBanner'}),
                    dict(name='div', attrs={'class':'bannerSky'}),
+                   dict(name='div', attrs={'border':'0'}),
                    dict(name='div', attrs={'class':'footerLinks'}),
                    dict(name='div', attrs={'class':'seitenanfang'}),
                    dict(name='td', attrs={'class':'mar5'}),
-                   dict(name='td', attrs={'class':'mar5'}),
                    dict(name='table', attrs={'class':'pageAktiv'}),
                    dict(name='table', attrs={'class':'xartable'}),
                    dict(name='table', attrs={'class':'wpnavi'}),
@@ -40,24 +41,26 @@ class Sueddeutsche(BasicNewsRecipe):
                    dict(name='table', attrs={'class':'artikelBox'}),
                    dict(name='table', attrs={'class':'kommentare'}),
                    dict(name='table', attrs={'class':'pageBoxBot'}),
+                   dict(name='table', attrs={'td':'height="3"'}),
+                   dict(name='table', attrs={'class':'contentpaneopen'}),
                    dict(name='td', attrs={'nowrap':'nowrap'}),
-                   dict(name='td', attrs={'valign':'middle'}),
                    dict(name='td', attrs={'align':'left'}),
-                   dict(name='td', attrs={'align':'center'}),
                    dict(name='td', attrs={'height':'5'}),
+                   dict(name='td', attrs={'class':'ArticleWidgetsHeadline'}),
                    dict(name='div', attrs={'class':'artikelBox navigatorBox'}),
                    dict(name='div', attrs={'class':'similar-article-box'}),
                    dict(name='div', attrs={'class':'videoBigHack'}),
                    dict(name='td', attrs={'class':'artikelDruckenRight'}),
                    dict(name='td', attrs={'class':'width="200"'}),
+                   dict(name='span', attrs={'class':'content_rating'}),
+                   dict(name='a', attrs={'href':'http://www.addthis.com/bookmark.php'}),
                    dict(name='a', attrs={'href':'/news'}),
-                   dict(name='a', attrs={'href':'/'}),
-                   dict(name='a', attrs={'href':'/articles'}),
                    dict(name='a', attrs={'href':'/cgi-bin/survey/survey.cgi'}),
                    dict(name='a', attrs={'href':'/cgi-bin/board/UltraBoard.pl'}),
                    dict(name='iframe'),
                    dict(name='form'),
                    dict(name='span', attrs={'class':'hidePrint'}),
+                   dict(id='ArticleWidgets'),
                    dict(id='headerLBox'),
                    dict(id='nointelliTXT'),
                    dict(id='rechteSpalte'),
@@ -69,29 +72,20 @@ class Sueddeutsche(BasicNewsRecipe):
                    dict(id='nnav-headerteaser'),
                    dict(id='nnav-head'),
                    dict(id='nnav-top'),
-                   dict(id='nnav-logodiv'),
-                   dict(id='nnav-logo'),
-                   dict(id='nnav-oly'),
                    dict(id='readcomment')]
 
 
 
-    feeds =  [ (u'Linuxdevices', u'http://www.linuxdevices.com/backend/headlines.rss') ]
+    feeds =  [ (u'Linuxdevices', u'http://www.linuxfordevices.com/rss.xml') ]
 
     def preprocess_html(self, soup):
-        for item in soup.findAll(re.compile('^a')):
-            item.extract()
         match = re.compile(r"^Related")
         for item in soup.findAll('b', text=match):
             item.extract()
-        for item in soup.findAll(re.compile('^li')):
-            item.extract()
         for item in soup.findAll(re.compile('^ul')):
-            item.extract()
-        for item in soup.find(re.compile('^br')):
-            item.extract()
+	    item.extract()
         for item in soup.findAll('br', limit=10):
-            item.extract()
+	    item.extract()
         return soup
 
 
@@ -101,4 +95,3 @@ class Sueddeutsche(BasicNewsRecipe):
         return soup
 
 
-