From f284a6c2b60b1ed16d80f62f29334ad77a2e0f8a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 29 Jan 2010 19:26:48 -0700
Subject: [PATCH] Various Danish newspapers by Darko Miletic

---
 resources/images/news/information_dk.png | Bin 0 -> 343 bytes
 resources/images/news/jp_dk.png          | Bin 0 -> 609 bytes
 resources/images/news/politiken_dk.png   | Bin 0 -> 482 bytes
 resources/recipes/information_dk.recipe  |  50 +++++++++++++++++++++
 resources/recipes/jp_dk.recipe           |  50 +++++++++++++++++++++
 resources/recipes/metro_montreal.recipe  |   2 +-
 resources/recipes/nin.recipe             |   3 +-
 resources/recipes/politiken_dk.recipe    |  55 +++++++++++++++++++++++
 8 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 resources/images/news/information_dk.png
 create mode 100644 resources/images/news/jp_dk.png
 create mode 100644 resources/images/news/politiken_dk.png
 create mode 100644 resources/recipes/information_dk.recipe
 create mode 100644 resources/recipes/jp_dk.recipe
 create mode 100644 resources/recipes/politiken_dk.recipe

diff --git a/resources/images/news/information_dk.png b/resources/images/news/information_dk.png
new file mode 100644
index 0000000000000000000000000000000000000000..301e2992c700338d75149db8b43905a3f9e06ffa
GIT binary patch
literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU{owBVrLgRsmeHrs=s#Dk
zeNN8&v1;w#$4`D8JMp!l<y-H>e;+@-l~DmI|Ns9#ki3@T{1!-Y7I;J!18EO1b~~AE
z2NEnRa7+i%V4E0Xj;%cm<b-*;IEHXsPu{`J%JcnR<H2Zw<mKmPW*9U-KQpsg;n-^9
zfMd!Ek2yLfGN(Lglu%Gri1lw^DpNRi*f^c<4YOfG*3N@$`xrSJB>K<0IIqoUzs;I>
zU=AZgU}<Ld-|8<Hfi|d?xJHzuB$lLFB^RXvDF!10Ljzp{LtP`w5JO8VBLgcFb6o>-
uD+7Z!o<A5-H00)|WTsUjYXGV?G`2D{gJ}4*XnPD$1B0ilpUXO@geCw`A$9ct

literal 0
HcmV?d00001

diff --git a/resources/images/news/jp_dk.png b/resources/images/news/jp_dk.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9553659aa48ad01dfc542c290c15077912a12c2
GIT binary patch
literal 609
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#O=eT^vI!PA{FTSS;<x)4KmP%ZnM)e@5`f
z&E)3gy<0!Q>F|LIhYn5Ix<=1C@(=%`MShWI&gq1gq;ET}vaD(E$(U^G%QN>#p3U0w
zd&?yc{o?TFtQB9M+)P-W@LV`$CDYG#gQSi*o&3vp@814>-Pf(v)vwp}{}VUab#3~)
zsNaTHjLXY^$$tC5*QL5ZfmMn71nX<F1nUQ;LHpR>8fH(}&~mcpOsK5ji+#ywd0Q-v
zW+tCKzVIjK6VVs>9HK{b6;9l?o-m0!<;B_^EUOpZPT1ytO8ZRJ2DV+gEkzksO?x7n
zLpq<YTRbi6`uxyMzfQ#_ciGqZZTx*`?_TM9YWG+<BAQFHU(_o+WmiZ#t3Kn5f{sCU
z14Ck)>@|-SL97xpuW7629aQpQOk}*)_|E;a(FyM*d)js!|D|gb>$Fkn^S9N`c2aA2
z>yFIIpWyGv|5A&6M$;65ddC$W$u{kI&9eI#f|u;_lzhYZNUv7t*@IPemtxvgqjqM$
zem=ogf7!>b+Z(n0qbk^rO$_l{{jt8wqS5}fms1I!;#o6b6seZDMwFx^mZVxG7o`Fz
z1|tJQ16>0{T_ej7LrW_o11l4AT?2C~1A{l7KNwLo<mRVjrd6V8FgCR^F@tE3ITGIs
P)WG2B>gTe~DWM4fJwEpK

literal 0
HcmV?d00001

diff --git a/resources/images/news/politiken_dk.png b/resources/images/news/politiken_dk.png
new file mode 100644
index 0000000000000000000000000000000000000000..66f324a8c79a560af7b081f42682e0486c1dcd07
GIT binary patch
literal 482
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#O)dT^vI!POlC2^*iJs^3QES=dp~$);tMu
zwPT^`Z&uz}aPPt0CBphl519&@gm#C`5O%n^QBf?}L~+*ftXXXxVXvm|N%>T_Z_oSF
zHV4mWG%pUi%&>~#gO1BW(>~ktI~)!6@Em5JEqo?shJt^I^;|866&Y(86>m%|`k2@=
zJwHd_>s<v2CV|;16V3kbj4_)VmR-1L3ZrrQN0tJ+Yk^O0-|AU0ef`;vsxvh^I^#2|
z=FQx}zxrUqy+=3v-539ktz16WZ_dn&z$-rPr+%JIS(Nql*Drq|t#!XIDZIM<FkUsr
z{o>uo?Z1Bn`-?Kf9Z#;GtP;NaXnFFK+V{#@e<t2K^Jw><|91|xUVFHZWzieUd`2d=
z+FyJJ4!Q%wNVUW@q9i4;B-JXpC>2OC7#SEE=o%R68d-)IT3Q(ySecmX8kk!d7`*ZP
m!HA+EH$NpatrAUxsi~Eb2}Hxv#@+;=1_n=8KbLh*2~7Z$7`<Qs

literal 0
HcmV?d00001

diff --git a/resources/recipes/information_dk.recipe b/resources/recipes/information_dk.recipe
new file mode 100644
index 0000000000..1db5a7c47e
--- /dev/null
+++ b/resources/recipes/information_dk.recipe
@@ -0,0 +1,50 @@
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+'''
+information.dk
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Information_dk(BasicNewsRecipe):
+    title                 = 'Information - Denmark'
+    __author__            = 'Darko Miletic'
+    description           = 'News from Denmark'
+    publisher             = 'information.dk'
+    category              = 'news, politics, Denmark'
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    remove_empty_feeds    = True
+    use_embedded_content  = False
+    encoding              = 'utf8'
+    language              = 'da'
+
+    conversion_options = {
+                          'comment'  : description
+                        , 'tags'     : category
+                        , 'publisher': publisher
+                        , 'language' : language
+                        }
+
+    feeds              = [
+                            (u'Nyheder fra'               , u'http://www.information.dk/feed')
+                           ,(u'Bedst lige nu'             , u'http://www.information.dk/bedstligenu/feed')
+                           ,(u'Politik og internationalt' , u'http://www.information.dk/politik/feed')
+                           ,(u'Kunst og kultur'           , u'http://www.information.dk/kultur/feed')
+                           ,(u'Moderne Tider'             , u'http://www.information.dk/modernetider/feed')
+                           ,(u'Klima'                     , u'http://www.information.dk/klima/feed')
+                           ,(u'Opinion'                   , u'http://www.information.dk/opinion/feed')
+                           ,(u'Literatur'                 , u'http://www.information.dk/litteratur/feed')
+                           ,(u'Film'                      , u'http://www.information.dk/film/feed')
+                           ,(u'Kunst'                     , u'http://www.information.dk/kunst/feed')
+                          ]
+
+    remove_tags_before = dict(name='h1',attrs={'class':'print-title'})
+    remove_tags_after  = dict(name='div',attrs={'class':'print-footer'})
+    remove_tags        = [dict(name=['object','link'])]
+
+    def print_version(self, url):
+        return url.replace('information.dk/','information.dk/print/')
+
diff --git a/resources/recipes/jp_dk.recipe b/resources/recipes/jp_dk.recipe
new file mode 100644
index 0000000000..cdf10f29da
--- /dev/null
+++ b/resources/recipes/jp_dk.recipe
@@ -0,0 +1,50 @@
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+'''
+jp.dk
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class JP_dk(BasicNewsRecipe):
+    title                 = 'Jyllands-Posten'
+    __author__            = 'Darko Miletic'
+    description           = 'News from Denmark'
+    publisher             = 'jp.dk'
+    category              = 'news, politics, Denmark'
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    encoding              = 'cp1252'
+    language              = 'da'
+
+    extra_css = ' body{font-family: Arial,Verdana,Helvetica,Geneva,sans-serif } h1{font-family: Times,Georgia,Verdana,serif } '
+
+    conversion_options = {
+                          'comment'  : description
+                        , 'tags'     : category
+                        , 'publisher': publisher
+                        , 'language' : language
+                        }
+
+    feeds              = [
+                            (u'Tophistorier', u'http://www.jp.dk/rss/topnyheder.jsp')
+                           ,(u'Seneste nyt' , u'http://jp.dk/index.jsp?service=rssfeed&submode=seneste')
+                           ,(u'Indland'     , u'http://www.jp.dk/rss/indland.jsp')
+                           ,(u'Udland'      , u'http://www.jp.dk/rss/udland.jsp')
+                           ,(u'Ny viden'    , u'http://www.jp.dk/rss/nyviden.jsp')
+                           ,(u'Timeout'     , u'http://www.jp.dk/rss/timeout.jsp')
+                           ,(u'Kultur'      , u'http://www.jp.dk/rss/kultur.jsp')
+                           ,(u'Sport'       , u'http://www.jp.dk/rss/sport.jsp')
+                          ]
+
+    remove_tags        = [
+                            dict(name=['object','link'])
+                           ,dict(name='p',attrs={'class':'artByline'})
+                         ]
+
+    def print_version(self, url):
+        return url + '?service=printversion'
+
diff --git a/resources/recipes/metro_montreal.recipe b/resources/recipes/metro_montreal.recipe
index 9c308a91d8..094f00316f 100644
--- a/resources/recipes/metro_montreal.recipe
+++ b/resources/recipes/metro_montreal.recipe
@@ -4,7 +4,7 @@ class Metro_Montreal(BasicNewsRecipe):
 
     title          = u'M\xe9tro Montr\xe9al'
     __author__     = 'Jerry Clapperton'
-    description    = 'Le quotidien le plus branché sur le monde'
+    description    = u'Le quotidien le plus branch\xe9 sur le monde'
     language = 'fr'
 
     oldest_article = 7
diff --git a/resources/recipes/nin.recipe b/resources/recipes/nin.recipe
index a349f0e11f..0872467d2f 100644
--- a/resources/recipes/nin.recipe
+++ b/resources/recipes/nin.recipe
@@ -72,8 +72,9 @@ class Nin(BasicNewsRecipe):
             section  = self.tag_to_string(item)
             feedlink = self.PREFIX + item['href']
             feedpage = self.index_to_soup(feedlink)
-            self.report_progress(0, _('Fetching feed')+' %s...'%(section))
+            self.report_progress(0, _('Fetching feed')+' %s...'%(section))            
             inarts   = []
+            count2 = 0
             for art in feedpage.findAll('span',attrs={'class':'artTitle'}):
                 alink = art.parent
                 url   = self.PREFIX + alink['href']
diff --git a/resources/recipes/politiken_dk.recipe b/resources/recipes/politiken_dk.recipe
new file mode 100644
index 0000000000..aa117fda8d
--- /dev/null
+++ b/resources/recipes/politiken_dk.recipe
@@ -0,0 +1,55 @@
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+'''
+politiken.dk
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Politiken_dk(BasicNewsRecipe):
+    title                 = 'Politiken.dk'
+    __author__            = 'Darko Miletic'
+    description           = 'News from Denmark'
+    publisher             = 'politiken.dk'
+    category              = 'news, politics, Denmark'
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    remove_empty_feeds    = True
+    use_embedded_content  = False
+    encoding              = 'cp1252'
+    language              = 'da'
+
+    extra_css = ' body{font-family: Arial,Helvetica,sans-serif } h1{font-family: Georgia,"Times New Roman",Times,serif } '
+
+    conversion_options = {
+                          'comment'  : description
+                        , 'tags'     : category
+                        , 'publisher': publisher
+                        , 'language' : language
+                        }
+
+    feeds              = [
+                            (u'Tophistorier'   , u'http://politiken.dk/rss/tophistorier.rss')
+                           ,(u'Seneste nyt'    , u'http://politiken.dk/rss/senestenyt.rss')
+                           ,(u'Mest laeste'    , u'http://politiken.dk/rss/mestlaeste.rss')
+                           ,(u'Danmark'        , u'http://politiken.dk/rss/indland.rss')
+                           ,(u'Politik'        , u'http://politiken.dk/rss/politik.rss')
+                           ,(u'Klima'          , u'http://politiken.dk/rss/klima.rss')
+                           ,(u'Internationalt' , u'http://politiken.dk/rss/udland.rss')
+                           ,(u'Erhverv'        , u'http://politiken.dk/rss/erhverv.rss')
+                           ,(u'Kultur'         , u'http://politiken.dk/rss/kultur.rss')
+                           ,(u'Sport'          , u'http://politiken.dk/rss/sport.rss')
+                           ,(u'Uddannelse'     , u'http://politiken.dk/rss/uddannelse.rss')
+                           ,(u'Videnskab'      , u'http://politiken.dk/rss/videnskab.rss')
+                          ]
+    remove_tags_before = dict(name='h1')
+    remove_tags        = [
+                            dict(name=['object','link'])
+                           ,dict(name='div',attrs={'class':'footer'})
+                         ]
+
+    def print_version(self, url):
+        return url + '?service=print'
+