From 77fc9f00fe6ac50122cab9a84f3568579a48eae5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 6 Apr 2009 21:32:25 -0700
Subject: [PATCH] New recipe for MSDN Magazine by Darko Miletic

---
 src/calibre/gui2/dialogs/config.py            |   2 +-
 src/calibre/gui2/images/news/msdnmag_en.png   | Bin 0 -> 694 bytes
 src/calibre/web/feeds/recipes/__init__.py     |   2 +-
 .../web/feeds/recipes/recipe_msdnmag_en.py    |  61 ++++++++++++++++++
 4 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 src/calibre/gui2/images/news/msdnmag_en.png
 create mode 100644 src/calibre/web/feeds/recipes/recipe_msdnmag_en.py

diff --git a/src/calibre/gui2/dialogs/config.py b/src/calibre/gui2/dialogs/config.py
index a2c77187b5..1d1b220f60 100644
--- a/src/calibre/gui2/dialogs/config.py
+++ b/src/calibre/gui2/dialogs/config.py
@@ -199,7 +199,7 @@ class EmailAccounts(QAbstractTableModel):
             return (account, self.accounts[account])
         if role == Qt.ToolTipRole:
             return self.tooltips[col]
-        if role == Qt.DisplayRole:
+        if role in [Qt.DisplayRole, Qt.EditRole]:
             if col == 0:
                 return QVariant(account)
             if col ==  1:
diff --git a/src/calibre/gui2/images/news/msdnmag_en.png b/src/calibre/gui2/images/news/msdnmag_en.png
new file mode 100644
index 0000000000000000000000000000000000000000..05308b62c4ebc977fa5230ce11c1851183e33c6f
GIT binary patch
literal 694
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#Qz+x;TbdoW44FZ+1waz|nf+?|EhBg{-WB
z2NkA8b;!5w)zry#wN{MEQkK{tDlD*NV<3z4!D|UKuQW9+sCU?6#5L>9x=Q))d#m3^
ztkE>vW+rEG^^D~lV}lR(onI~Q?rZ*h{kGDblhL!MKAE8E9wfbS%1O?mQ%_PjJdCy8
z-k7{~^KQ0%<&Ps*#p~_8_~?1%w*7am+?lj$l7s?_N1*3g!Dz*;3itd~0~+paWuI;I
ztIT>zrs|CaWxv_ZoGJTwm+uwpa~5^Uv%Kdf|2JZo5gWDkaM?n`H2rnvf>n-l75oI&
zcLZ;-HlBKbSwwsK?uW+<X6|I}-uu@!|0>@ix#v<YtbqcC0tx=C@pk*FG{lZ7mp}P2
z^<BcbNZVsB4y+S9*?u}RzbyHt67YXjamBwy-+o2><TiFF7p+dLm%aG<qHy{Vqp-IL
zmd!U?B+?{90@r)YICI2bJwUK^S)0U05k<ES&LF2f>bvU#`|j+%5~a(PRC%kRi2W8@
zHuDkAt4bX~Q|F$2`25wog5)g%Tyk0K=g&2tyDGuAb1P%Ec86)w#2Z_B_AmdMG-I0o
z+I_LiKeiOSs|&NAG57WTSw<(Go|vp;V!BdiW!qP`ouc!?AOCsu<n{OXa&iCl^(*Y-
zb`|9B*_itO%gj3F-M2p*+W&}J1&nvq64!{5<f7EXl2qLkAi-c{U|^|hV4`ba9%5i(
zWn^h(WUg&sU}a!%yYt3#n1<Z^l+3hBObw=1Miy4a1`rMV6O}4}8W=oX{an^LB{Ts5
DRDB*d

literal 0
HcmV?d00001

diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index e35d1f0ff8..43d25b876f 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/src/calibre/web/feeds/recipes/__init__.py
@@ -38,7 +38,7 @@ recipe_modules = ['recipe_' + r for r in (
            'mondedurable', 'instapaper', 'dnevnik_cro', 'vecernji_list',
            'nacional_cro', '24sata', 'dnevni_avaz', 'glas_srpske', '24sata_rs',
            'krstarica', 'krstarica_en', 'tanjug', 'laprensa_ni', 'azstarnet',
-           'corriere_della_sera_it', 'corriere_della_sera_en',
+           'corriere_della_sera_it', 'corriere_della_sera_en', 'msdnmag_en',
           )]
 
 import re, imp, inspect, time, os
diff --git a/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py b/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py
new file mode 100644
index 0000000000..09813c1a70
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+msdn.microsoft.com/en-us/magazine
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class MSDNMagazine_en(BasicNewsRecipe):
+    title                 = 'MSDN Magazine'
+    __author__            = 'Darko Miletic'
+    description           = 'The Microsoft Journal for Developers'
+    publisher             = 'Microsoft Press'
+    category              = 'news, IT, Microsoft, programming, windows'        
+    oldest_article        = 31
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    encoding              = 'utf-8'
+    remove_javascript     = True
+    current_issue         = 'http://msdn.microsoft.com/en-us/magazine/default.aspx'
+    language              = _('English')
+    
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+    
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"' 
+                            
+    feeds = [(u'Articles', u'http://msdn.microsoft.com/en-us/magazine/rss/default.aspx?z=z&iss=1')]
+
+    keep_only_tags = [dict(name='div', attrs={'class':'topic'})]
+
+    remove_tags = [
+                     dict(name=['object','link','base','table'])
+                    ,dict(name='div', attrs={'class':'MTPS_CollapsibleRegion'})
+                  ]
+    
+    def get_cover_url(self):
+        cover_url = None
+        soup = self.index_to_soup(self.current_issue)
+        link_item = soup.find('span',attrs={'class':'ContentsImageSpacer'})
+        if link_item:
+           imgt = link_item.find('img')
+           if imgt:
+              cover_url = imgt['src']
+        return cover_url
+
+    
+    def preprocess_html(self, soup):
+        for item in soup.findAll('div',attrs={'class':['FeatureSmallHead','ColumnTypeSubTitle']}):
+            item.name="h2"
+        for item in soup.findAll('div',attrs={'class':['FeatureHeadline','ColumnTypeTitle']}):
+            item.name="h1"
+        for item in soup.findAll('div',attrs={'class':'ArticleTypeTitle'}):
+            item.name="h3"
+        return soup
+    
\ No newline at end of file