From aec0107b79a2c45ca1689ae721b0a8d28c04a1d3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Dec 2008 09:25:48 -0800
Subject: [PATCH] Recipe for Science Daily (thanks to Darko Miletic)

---
 src/calibre/gui2/dialogs/jobs.py              |   6 ++--
 src/calibre/gui2/images/news/sciencedaily.png | Bin 0 -> 763 bytes
 src/calibre/web/feeds/recipes/__init__.py     |   2 +-
 src/calibre/web/feeds/recipes/sciencedaily.py |  32 ++++++++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 src/calibre/gui2/images/news/sciencedaily.png
 create mode 100644 src/calibre/web/feeds/recipes/sciencedaily.py

diff --git a/src/calibre/gui2/dialogs/jobs.py b/src/calibre/gui2/dialogs/jobs.py
index ced7f2ee10..8e22f4c43c 100644
--- a/src/calibre/gui2/dialogs/jobs.py
+++ b/src/calibre/gui2/dialogs/jobs.py
@@ -36,11 +36,11 @@ class JobsDialog(QDialog, Ui_JobsDialog):
         self.model = model
         self.setWindowModality(Qt.NonModal)
         self.setWindowTitle(__appname__ + _(' - Jobs'))
-        QObject.connect(self.jobs_view.model(), SIGNAL('modelReset()'), 
+        QObject.connect(self.jobs_view.model(), SIGNAL('modelReset()'),
                         self.jobs_view.resizeColumnsToContents)
         QObject.connect(self.kill_button, SIGNAL('clicked()'),
                         self.kill_job)
-        QObject.connect(self, SIGNAL('kill_job(int, PyQt_PyObject)'), 
+        QObject.connect(self, SIGNAL('kill_job(int, PyQt_PyObject)'),
                         self.jobs_view.model().kill_job)
         self.pb_delegate = ProgressBarDelegate(self)
         self.jobs_view.setItemDelegateForColumn(2, self.pb_delegate)
@@ -53,7 +53,7 @@ class JobsDialog(QDialog, Ui_JobsDialog):
         model = self.model
         for row, job in enumerate(model.jobs):
             if job.is_running:
-                self.jobs_view.dataChanged(model.index(row, 3), model.index(row, 3))    
+                self.jobs_view.dataChanged(model.index(row, 3), model.index(row, 3))
     
     def kill_job(self):
         for index in self.jobs_view.selectedIndexes():
diff --git a/src/calibre/gui2/images/news/sciencedaily.png b/src/calibre/gui2/images/news/sciencedaily.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab2e1b0483b98b7b467c3e081e0d4be903b268d5
GIT binary patch
literal 763
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%b@U_I1CZGssfk$L9
zkoEv$x0Bg+Ai=T%$8;bK*3S@gZ0%tN1|}6x7sn8b)4h}9JthZA9IKyYY&SvY*XE-h
zfnxI|Rv%Q5`o~#z`GDaEJ+`=BHf5H{Uz}JD>$Q}MdNq{@I}0lEaG6|ieA#+}jrp_;
z>oUo+k<aFD)xUG}cI)lq&lGAO9H^ZCc~1NHIiKeUec+DN=wb{tU6{#!<nin|EU7y?
zPnY(7{8$|lrp4g0ID5xkXBDC9|E3nK-`u;B64IVAK7E?n)2BDd=iTKyHKL0@@=Tt*
z@v(J4sBqfn$X~zWF5myp*5I*(z5n^Kll=@2KE|Y{JhAOOBIoPte_;#Hs;nieU-zxM
zdFz(CNK``QPxro0+&@%>erhQxSzBkmd^2Z)%=^!KCoJ|@&c9@#;*6^)t!kH@XU_Vy
zpgS$yp7V#QM2)tRQr!FEjW^}I6%3*_tdoAycKU0GnOR+The!5n<GUe&?_ST^x%0eL
z_^W~|LY-e8e7(n#Q1wgs?p=Mx6|1cJS4l<2{_R|r`lb3r>X95f_m|(k$-nuQRkM#x
z<S0YK<w*7ezkcawW$B5uu3GfSgkj~C_*0KQ`W|{HI_I3#rI(7aBE9P-`YdCJi24<m
zkgzd^C80dry2fpLbw^`kn3S|G!;vKEFW>epT6%O=uI0q-KZVMwO+SB*zp&-Z!p3E(
zFJ8>h;Obm8i{aD#IR_8!X5iu9ug!NUFk)>Q15@MeA2q!eGFz`)k5`k4OU%jnSiu}>
z%5>pcnfG(2g{-%3AOE^b<-fIj>)EoU3;K@k6V3d`$e=IKdpz<fDDkP5xJHyD7o{ea
zr0S*s2?iqr0}EY4BV8kd5F;ZiBV#L5BV7XvD+2?Dv?f!ShTQy=%(O~O4Te?*CRWB4
W5DiwFa`pi=FnGH9xvX<aXaWFwMnq@;

literal 0
HcmV?d00001

diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index 44981f10db..830a1b635d 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/src/calibre/web/feeds/recipes/__init__.py
@@ -18,7 +18,7 @@ recipe_modules = [
            'nytimes_sub', 'security_watch', 'cyberpresse', 'st_petersburg_times',
            'clarin', 'financial_times', 'heise', 'le_monde', 'harpers', 'science_aas',
            'science_news', 'the_nation', 'lrb', 'harpers_full', 'liberation',
-           'linux_magazine', 'telegraph_uk', 'utne',
+           'linux_magazine', 'telegraph_uk', 'utne', 'sciencedaily'
           ]
 
 import re, imp, inspect, time, os
diff --git a/src/calibre/web/feeds/recipes/sciencedaily.py b/src/calibre/web/feeds/recipes/sciencedaily.py
new file mode 100644
index 0000000000..2b26de79c8
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/sciencedaily.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+sciencedaily.com
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class ScienceDaily(BasicNewsRecipe):
+    title                 = u'ScienceDaily'
+    __author__            = u'Darko Miletic'
+    description           = u"Breaking science news and articles on global warming, extrasolar planets, stem cells, bird flu, autism, nanotechnology, dinosaurs, evolution -- the latest discoveries in astronomy, anthropology, biology, chemistry, climate &amp; environment, computers, engineering, health &amp; medicine, math, physics, psychology, technology, and more -- from the world's leading universities and research organizations."
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    
+    cover_url = 'http://www.sciencedaily.com/images/logo.gif'
+    
+    keep_only_tags = [ 
+                        dict(name='h1', attrs={'class':'story'}) 
+                       ,dict(name='div', attrs={'id':'story'}) 
+                     ]
+                     
+    remove_tags_after = dict(name='div', attrs={'id':'citationbox'})
+    remove_tags = [
+                     dict(name='div', attrs={'id':'seealso'})
+                    ,dict(name='div', attrs={'id':'citationbox'})
+                  ]
+    
+    feeds       = [(u"ScienceDaily", u'http://www.sciencedaily.com/newsfeed.xml')]