From 5e8b74b303c7d31f06ced1f054ecee7b1f7df187 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 28 Mar 2009 15:43:10 -0700
Subject: [PATCH] Implement #2173 (New recipes)

---
 src/calibre/gui2/images/news/krstarica.png    | Bin 0 -> 632 bytes
 src/calibre/gui2/images/news/krstarica_en.png | Bin 0 -> 632 bytes
 src/calibre/gui2/images/news/tanjug.png       | Bin 0 -> 827 bytes
 src/calibre/web/feeds/recipes/__init__.py     |   1 +
 .../web/feeds/recipes/recipe_krstarica.py     |  65 ++++++++++++++++++
 .../web/feeds/recipes/recipe_krstarica_en.py  |  57 +++++++++++++++
 .../web/feeds/recipes/recipe_tanjug.py        |  43 ++++++++++++
 7 files changed, 166 insertions(+)
 create mode 100644 src/calibre/gui2/images/news/krstarica.png
 create mode 100644 src/calibre/gui2/images/news/krstarica_en.png
 create mode 100644 src/calibre/gui2/images/news/tanjug.png
 create mode 100644 src/calibre/web/feeds/recipes/recipe_krstarica.py
 create mode 100644 src/calibre/web/feeds/recipes/recipe_krstarica_en.py
 create mode 100644 src/calibre/web/feeds/recipes/recipe_tanjug.py

diff --git a/src/calibre/gui2/images/news/krstarica.png b/src/calibre/gui2/images/news/krstarica.png
new file mode 100644
index 0000000000000000000000000000000000000000..92eecfc4e0ca760d1759e28ad7625b40d0bd1aa9
GIT binary patch
literal 632
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#J6Nx;TbdoL)NFFhe9zpl$!m?a$6Uz4jte
zxoMIYx8Ncbg@c<Xnk*8#<+@>F$iYKEp`15IGA5dA4BXJ8(6!=51gDhZq8l7u9SdeG
zxbs%^V_v$>y9?H(;wqQ_9^TVm`TxJ%n$1gsb8hdu{Ly~ae~XWqA0Mw5jD61*xI94c
z%)*&X94>+t(T^3lCO%`B#cN@)=hVW9EkDg!-`Q#kx}IB^9LiQ^@?*n>#+&U+^&G_4
zPvmlL*7oTMmt1?ruzBNS({*#=pMB}nir>dJX;&IE!<hz=Yjqlnr;6(N=se_`u7294
z>RS7=SVxuu#%9~yVJmsAcP8&BG=6sOuEf-7{4*QwXCJtC*H`7h-{X5@W@}EKwcuCz
zk(q{G)tmO*e4!nc)-&sB?RUEk8&=3jL_L0VQ<clM&vM3d1{nt#k+^;Do?g1TR)uqp
zO;CExo9gVpHVp4{r!$LG^|1SQ``mq{&SFviOxm6Qy1{$3l9>`spKJ1zuP^WYxt&!Y
z{nt0Otj>UYlP<|iFJ1I;=jGLY2OjMEo5z+Z#qlWP$=l^?9td2yz_9*V+>?LX|F4?g
z!PjRJrkTAB7;~y6t`Q~4MX8A;sk$jZg2BkZz*5)1Sl7rR#K_3X*b<1e4GgRd46c8a
rR)T5B%}>cpt3=aa8Dd~$Wolt%U;)wa;^b7IdIknhS3j3^P6<r_SS<xS

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/images/news/krstarica_en.png b/src/calibre/gui2/images/news/krstarica_en.png
new file mode 100644
index 0000000000000000000000000000000000000000..92eecfc4e0ca760d1759e28ad7625b40d0bd1aa9
GIT binary patch
literal 632
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#J6Nx;TbdoL)NFFhe9zpl$!m?a$6Uz4jte
zxoMIYx8Ncbg@c<Xnk*8#<+@>F$iYKEp`15IGA5dA4BXJ8(6!=51gDhZq8l7u9SdeG
zxbs%^V_v$>y9?H(;wqQ_9^TVm`TxJ%n$1gsb8hdu{Ly~ae~XWqA0Mw5jD61*xI94c
z%)*&X94>+t(T^3lCO%`B#cN@)=hVW9EkDg!-`Q#kx}IB^9LiQ^@?*n>#+&U+^&G_4
zPvmlL*7oTMmt1?ruzBNS({*#=pMB}nir>dJX;&IE!<hz=Yjqlnr;6(N=se_`u7294
z>RS7=SVxuu#%9~yVJmsAcP8&BG=6sOuEf-7{4*QwXCJtC*H`7h-{X5@W@}EKwcuCz
zk(q{G)tmO*e4!nc)-&sB?RUEk8&=3jL_L0VQ<clM&vM3d1{nt#k+^;Do?g1TR)uqp
zO;CExo9gVpHVp4{r!$LG^|1SQ``mq{&SFviOxm6Qy1{$3l9>`spKJ1zuP^WYxt&!Y
z{nt0Otj>UYlP<|iFJ1I;=jGLY2OjMEo5z+Z#qlWP$=l^?9td2yz_9*V+>?LX|F4?g
z!PjRJrkTAB7;~y6t`Q~4MX8A;sk$jZg2BkZz*5)1Sl7rR#K_3X*b<1e4GgRd46c8a
rR)T5B%}>cpt3=aa8Dd~$Wolt%U;)wa;^b7IdIknhS3j3^P6<r_SS<xS

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/images/news/tanjug.png b/src/calibre/gui2/images/news/tanjug.png
new file mode 100644
index 0000000000000000000000000000000000000000..be1128073c1381a036b5732d1b0d539412507d10
GIT binary patch
literal 827
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87?@H#T^vI!PRC9@o$s3{a<u-p_44n#t}o_z
zd0;hXszVE7=ZqCGY8-)`jP))154ud4QQp+JAg;5e<-xLB0sS08{YDdy8BbKWvup47
zIh&^+w9MV87Qg9x-0$e>^xVlRTpR`mau|~J0vuV+)G2KJu!ev0qKvMP1F=nYiKPc)
zYo)&{eT>eW<PkK{TG!u{RXfh9!sYuZ{xk1iJ-P8w^~?OaLw8hH-`u--cI@l<iuFv}
z^rlOi25jO!b3pZ==hrnBOP$@_pLm(9)e2r&<m@?XrP1%M4c1kke?>1$ahN1B;egmj
z?amjm`xumGNxlEsKE>3QH*W9z1vg(T3H$AMewAMU!!#xK2R;`IBlz!aW0{^3xOc|u
zJ$GWo-+2~9zk6$QF5%$Ll{X?f7}lKqm8$Ty@W~+w=f!?YTw4md*Bza9-a95En;~?=
z42d)b$=`f+%VXr)ESyi4W&L)~SU!8h1ffF;Ee+L99I8$`d$xZLb8Ka-+Fn}x@m`om
zebPd|ze%&({q38*960^6_DE+7O?~%Z?MYk7v@+jIIh#t1BO4B@xBa}d%An+%VSfBN
zw$ruKwrm%0XY_2TD7fSz5hG^CFW|LZNmw!FXf6Lc;UgbwH)yTkR9mE>e7Y<4h4#VA
zdoLGxU0=C>27{Gh^A4jH*VHMwM{14jk5`}E<oVO-p8E!m1=lOjtiE!s&*975E7B86
zCTufnWc?sioObUNzhi@4qwABfvW~PEch9f;of#J^KR2GIA0p5`Q{^R_fwIF#$7*&1
zu2(bi5)`}(R9PbrXn1bh_<?mN)4w*C(rcEp&gz}`%^dLV#|f9u3@pEw|KY#ACU^am
z>DT806Q62{YeY$MQEFmIs%{F9U@$T;u+%j$)-|#SF*33;wge(=0|P4qgX<rqm0%ij
l^HVa@D$z7ph8O@fSOAqmG#F17Q~_#W@O1TaS?83{1ORoxTbBR;

literal 0
HcmV?d00001

diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index 0cb80ec192..d407378ce5 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/src/calibre/web/feeds/recipes/__init__.py
@@ -37,6 +37,7 @@ recipe_modules = ['recipe_' + r for r in (
            'new_york_review_of_books_no_sub', 'politico', 'adventuregamers',
            'mondedurable', 'instapaper', 'dnevnik_cro', 'vecernji_list',
            'nacional_cro', '24sata', 'dnevni_avaz', 'glas_srpske', '24sata_rs',
+           'krstarica', 'krstarica_en', 'tanjug',
           )]
 
 import re, imp, inspect, time, os
diff --git a/src/calibre/web/feeds/recipes/recipe_krstarica.py b/src/calibre/web/feeds/recipes/recipe_krstarica.py
new file mode 100644
index 0000000000..fb25ae8d84
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_krstarica.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+vesti.krstarica.com
+'''
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Krstarica(BasicNewsRecipe):
+    title                 = 'Krstarica - Vesti'
+    __author__            = 'Darko Miletic'
+    description           = 'Dnevne vesti iz Srbije i sveta'    
+    publisher             = 'Krstarica'
+    category              = 'news, politics, Serbia'
+    oldest_article        = 1
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    remove_javascript     = True
+    encoding              = 'utf-8'
+    language              = _('Serbian')
+    extra_css             = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'
+    
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+    
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em}"' 
+    
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    
+    feeds          = [
+                        (u'Vesti dana'         , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=aktuelno&lang=0'     )
+                       ,(u'Srbija'             , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=scg&lang=0'          )
+                       ,(u'Svet'               , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=svet&lang=0'         )
+                       ,(u'Politika'           , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=politika&lang=0'     )
+                       ,(u'Ekonomija'          , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=ekonomija&lang=0'    )
+                       ,(u'Drustvo'            , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=drustvo&lang=0'      )
+                       ,(u'Kultura'            , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=kultura&lang=0'      )
+                       ,(u'Nauka i Tehnologija', u'http://vesti.krstarica.com/index.php?rss=1&rubrika=nauka&lang=0'        )
+                       ,(u'Medicina'           , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=medicina&lang=0'     )
+                       ,(u'Sport'              , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=sport&lang=0'        )
+                       ,(u'Zanimljivosti'      , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=zanimljivosti&lang=0')
+                     ]
+
+    def preprocess_html(self, soup):
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>'
+        soup.head.insert(0,mtag)
+        titletag = soup.find('h4')
+        if titletag:
+           realtag = titletag.parent.parent
+           realtag.extract()
+           for item in soup.findAll(['table','center']):
+               item.extract()
+           soup.body.insert(1,realtag)            
+           realtag.name = 'div'
+        for item in soup.findAll(style=True):
+            del item['style']
+        for item in soup.findAll(align=True):
+            del item['align']
+        return soup
diff --git a/src/calibre/web/feeds/recipes/recipe_krstarica_en.py b/src/calibre/web/feeds/recipes/recipe_krstarica_en.py
new file mode 100644
index 0000000000..e426e7d807
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_krstarica_en.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+vesti.krstarica.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Krstarica_en(BasicNewsRecipe):
+    title                 = 'Krstarica - news in english'
+    __author__            = 'Darko Miletic'
+    description           = 'News from Serbia and world'    
+    publisher             = 'Krstarica'
+    category              = 'news, politics, Serbia'
+    oldest_article        = 1
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    remove_javascript     = True
+    encoding              = 'utf-8'
+    language              = _('English')
+    
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+    
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em}"' 
+        
+    feeds          = [
+                        (u'Daily news', u'http://vesti.krstarica.com/index.php?rss=1&rubrika=aktuelno&lang=1'     )
+                       ,(u'Serbia'    , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=scg&lang=1'          )
+                       ,(u'Politics'  , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=politika&lang=1'     )
+                       ,(u'Economy'   , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=ekonomija&lang=1'    )
+                       ,(u'Culture'   , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=kultura&lang=1'      )
+                       ,(u'Sports'    , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=sport&lang=1'        )
+                     ]
+
+    def preprocess_html(self, soup):
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>'
+        soup.head.insert(0,mtag)
+        titletag = soup.find('h4')
+        if titletag:
+           realtag = titletag.parent.parent
+           realtag.extract()
+           for item in soup.findAll(['table','center']):
+               item.extract()
+           soup.body.insert(1,realtag)            
+           realtag.name = 'div'
+        for item in soup.findAll(style=True):
+            del item['style']
+        for item in soup.findAll(align=True):
+            del item['align']
+        return soup
diff --git a/src/calibre/web/feeds/recipes/recipe_tanjug.py b/src/calibre/web/feeds/recipes/recipe_tanjug.py
new file mode 100644
index 0000000000..9a8acfaca7
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_tanjug.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+tanjug.rs
+'''
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Tanjug(BasicNewsRecipe):
+    title                 = 'Tanjug'
+    __author__            = 'Darko Miletic'
+    description           = 'Novinska agencija TANJUG - Dnevne vesti iz Srbije i sveta'
+    publisher             = 'Tanjug'
+    category              = 'news, politics, Serbia'
+    oldest_article        = 1
+    max_articles_per_feed = 100
+    use_embedded_content  = True
+    encoding              = 'utf-8'
+    lang                  = 'sr-Latn-RS'
+    language              = _('Serbian')
+    extra_css             = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'
+    
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+    
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em}"' 
+    
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    
+    feeds          = [(u'Vesti', u'http://www.tanjug.rs/StaticPages/RssTanjug.aspx')]
+
+    def preprocess_html(self, soup):
+        soup.html['xml:lang'] = self.lang
+        soup.html['lang'    ] = self.lang
+        soup.html['dir'     ] = "ltr"
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>'
+        soup.head.insert(0,mtag)
+        return soup