From 075fbec828365e15bb86a6cdbaf7b0123af6517b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 26 Sep 2012 10:24:13 +0530
Subject: [PATCH] Fix #1056270 (Updated recipe for Monitor online)

---
 recipes/icons/monitor.png | Bin 0 -> 1094 bytes
 recipes/monitor.recipe    | 117 ++++++++++++++------------------------
 2 files changed, 42 insertions(+), 75 deletions(-)
 create mode 100644 recipes/icons/monitor.png

diff --git a/recipes/icons/monitor.png b/recipes/icons/monitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..89aa1fd3991bccbfe9adfcec409618a068b18791
GIT binary patch
literal 1094
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR`=H_0JI!+Mk#IaOch&
zOP6hMb)6$B`s4NMoiQ=LK7YP4drlt%!+a^JRc7WFCQh8f$ha>v>)V?*YaE@<_4Ljb
z5cqWe{+H*^`xzL1fBQCDSa`m&^3{3s?rqw9FfZ@t$B#4l_%6?!HI<R^`<pj21%+0c
zn0$Tyd@2j;Oc9X@3=DIGg_r9atTeay`s&r2Yu9G+@$HO?-r(jwnThF8VbPB_Zx*Yn
z{rd7{mZ0Fr2M;H+vQA@RSz}}K<Nb$;3=GGstDhY|F^!#lPg2rcF|k!v)~_#KoGmE0
zOjq~Qg9m^A{CTir$C-|fnLIp8G&E-N@J?c2cz*oEbawWipFaKk^!d)ZbzKY$C+g~_
zGBNFli@&vU<*k*g{{8v$^~H-n-@nfh5uMDy@b&fUv)$dZ`1$|*`qj<AaDUsjA8+5z
z;N|`C;o}Me!zm05|NsA=FC+8z`t@DWF&o|8H@bWL{q?(tfnm0g(1V>j*V@`nVr1MF
z60$!d^ZV=9vn3=>)YpG~_OzFQ;qktGz*rasgCPV~{D@r3z`)4p>EaktF-LSlrZQ8Y
zMC*OWP3sG1>uBD#p0=@PEziOeVK>_(rW;(EohuOe>*G6H`E%{hFIVyj+;qEHka8+<
zHiw3EMfCNQDc+_NR6mGIuD<PZ&N4gum-erN9}3rOF^Lk3pHY!!$1I~On)802end`h
zUCdd*2G`DI5gBPywN`jMn0H2hnYYB!lc}NN4v8;csb}r8-92O3^d5$)M`@{=_YG#;
z(R^yH%#>pDrI6<@^Yh|&u{O_H)r)E+j_eJ$a=JFXMuIJ0Z(pzC8&&>U$zQgz?sqmh
zt@EcwCR6vwx_i4HB>dTO?a9i&yc_SmS+R<JmE_gd$fWQozwRpMoaFN^|JiWmKl{cn
VPTv^bnr;F`il?ie%Q~loCIC6rR44!d

literal 0
HcmV?d00001

diff --git a/recipes/monitor.recipe b/recipes/monitor.recipe
index 8762e68c16..ca594a3b4e 100644
--- a/recipes/monitor.recipe
+++ b/recipes/monitor.recipe
@@ -1,99 +1,66 @@
-#!/usr/bin/env  python
 
 __license__   = 'GPL v3'
-__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2012, Darko Miletic <darko.miletic at gmail.com>'
 
 '''
-monitorcg.com
+www.monitor.co.me
 '''
 
 import re
 from calibre.web.feeds.news import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import Tag
 
 class MonitorCG(BasicNewsRecipe):
-    title                 = 'Monitor online'
+    title                 = 'MONITOR online'
     __author__            = 'Darko Miletic'
-    description           = 'News from Montenegro'
-    publisher             = 'MONITOR d.o.o. Podgorica'
+    description           = 'Nezavisni nedjeljnik Monitor'
+    publisher             = '"Monitor" D.O.O. Podgorica'
     category              = 'news, politics, Montenegro'
     oldest_article        = 15
     max_articles_per_feed = 150
     no_stylesheets        = True
     encoding              = 'utf-8'
+    auto_cleanup          = False
     use_embedded_content  = False
-    language = 'sr'
-
-    lang                  ='sr-Latn-Me'
-    INDEX                 = 'http://www.monitorcg.com'
-
-    extra_css = ' @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} '
+    language              = 'sr'
+    remove_empty_feeds    = True
+    extra_css             = """
+                                @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)}
+                                @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
+                                h2{font-family: Cambria,"Times New Roman",Times,serif1,serif}
+                                body{font-family: Arial,sans1,sans-serif}
+                                img{display: block}
+                            """
 
     conversion_options = {
-                          'comment'          : description
-                        , 'tags'             : category
-                        , 'publisher'        : publisher
-                        , 'language'         : lang
-                        , 'pretty_print'     : True
+                          'comment'     : description
+                        , 'tags'        : category
+                        , 'publisher'   : publisher
+                        , 'language'    : language
+                        , 'pretty_print': True
                         }
 
     preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    keep_only_tags     = [dict(attrs={'class':['contentheading','article-meta','article-content']})]
+    remove_attributes  = ['width','height','font','border','align']
 
-    keep_only_tags = [dict(name='div', attrs={'id':'ja-current-content'})]
-
-    remove_tags = [ dict(name=['object','link','embed'])
-                  , dict(attrs={'class':['buttonheading','article-section']})]
-
-    remove_attributes = ['style','width','height','font','border','align']
-
-    def adeify_images2(cls, soup):
-        for item in soup.findAll('img'):
-            for attrib in ['height','width','border','align','style']:
-                if item.has_key(attrib):
-                   del item[attrib]
-            oldParent = item.parent
-            if oldParent.name == 'a':
-               oldParent.name == 'p'
-            myIndex = oldParent.contents.index(item)
-            brtag  = Tag(soup,'br')
-            oldParent.insert(myIndex+1,brtag)
-        return soup
-
-    def preprocess_html(self, soup):
-        soup.html['xml:lang'] = self.lang
-        soup.html['lang']     = self.lang
-        mlang = Tag(soup,'meta',[("http-equiv","Content-Language"),("content",self.lang)])
-        soup.html.insert(0,mlang)
-        return self.adeify_images2(soup)
-
-    def parse_index(self):
-        totalfeeds = []
-        soup = self.index_to_soup(self.INDEX)
-        cover_item = soup.find('div',attrs={'class':'ja-catslwi'})
-        if cover_item:
-           dt = cover_item['onclick'].partition("location.href=")[2]
-           curl = self.INDEX + dt.strip("'")
-           lfeeds = [(u'Svi clanci', curl)]
-        for feedobj in lfeeds:
-            feedtitle, feedurl = feedobj
-            self.report_progress(0, _('Fetching feed')+' %s...'%(feedtitle if feedtitle else feedurl))
-            articles = []
-            soup = self.index_to_soup(feedurl)
-            contitem = soup.find('div',attrs={'class':'article-content'})
-            if contitem:
-                img = contitem.find('img')
-                if img:
-                   self.cover_url = self.INDEX + img['src']
-                for item in contitem.findAll('a'):
-                    url         = self.INDEX + item['href']
-                    title       = self.tag_to_string(item)
-                    articles.append({
-                                          'title'      :title
-                                         ,'date'       :''
-                                         ,'url'        :url
-                                         ,'description':''
-                                        })
-                totalfeeds.append((feedtitle, articles))
-        return totalfeeds
-
+    feeds          = [
+                         (u'Danas, Sjutra'      , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=5&Itemid=27&format=feed&type=rss')
+                        ,(u'Duhankesa'          , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=13&Itemid=37&format=feed&type=rss')
+                        ,(u'Znaci prepoznavanja', u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=6&Itemid=358&format=feed&type=rss')
+                        ,(u'Paralele'           , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=8&Itemid=359&format=feed&type=rss')
+                        ,(u'Razbijeno ogledalo' , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=18&Itemid=354&format=feed&type=rss')
+                        ,(u'Tržište'            , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=26&Itemid=371&format=feed&type=rss')
+                        ,(u'Feljton'            , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=29&Itemid=471&format=feed&type=rss')
+                        ,(u'Monitor'            , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=1&Itemid=1852&format=feed&type=rss')
+                        ,(u'Altervizija'        , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=31&Itemid=2623&format=feed&type=rss')
+                        ,(u'Fenomeni'           , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=35&Itemid=3549&format=feed&type=rss')
+                        ,(u'Fokus'              , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=19&Itemid=252&format=feed&type=rss')
+                        ,(u'Monitoring'         , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=19&Itemid=252&format=feed&type=rss')
+                        ,(u'Profil'             , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=21&Itemid=256&format=feed&type=rss')
+                        ,(u'Intervju'           , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=27&Itemid=404&format=feed&type=rss')
+                        ,(u'Društvo'            , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=14&Itemid=2&format=feed&type=rss')
+                        ,(u'Region'             , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=12&Itemid=53&format=feed&type=rss')
+                        ,(u'Svijet'             , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=11&Itemid=360&format=feed&type=rss')
+                        ,(u'Kultura'            , u'http://www.monitor.co.me/index.php?option=com_content&view=section&layout=blog&id=9&Itemid=361&format=feed&type=rss')
+                     ]