From a4fbf1bd2b82ecf2d91e344eab2a83d62a898c99 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Dec 2008 19:01:25 -0800
Subject: [PATCH 1/2] Recipe for Linux Magazine, thanks to Darko Miletic

---
 .../gui2/images/news/linux_magazine.png       | Bin 0 -> 394 bytes
 src/calibre/web/feeds/recipes/__init__.py     |   1 +
 .../web/feeds/recipes/linux_magazine.py       |  36 ++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 src/calibre/gui2/images/news/linux_magazine.png
 create mode 100644 src/calibre/web/feeds/recipes/linux_magazine.py

diff --git a/src/calibre/gui2/images/news/linux_magazine.png b/src/calibre/gui2/images/news/linux_magazine.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef6ed8c3fe912a6936c41aff8d577082505ba114
GIT binary patch
literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmU9kH2}T-38<;Bzpw;
zGBBhpVqnO)$-wYvDFZ{xKL&=}wG0fGuP`te%wu3sJKp@p)exwbv%n*=n1O*?7=#%a
zX3dcR36>Q&rUPlPO$;%|)*c3OIz3$+Lp07`?c2!9tjOa!_l3X<sW8W$!(t_Ijhzwg
zZTDmq1eSO-`_0i?zU1WUf7}0U=Pj6gJf}rqPBDYV(kFA)-|p~macSvDpP6g+d!M)F
z{YPs)%<+ByS3!?!{s;3`!(-?5a!#)_bkjU4!Q2qFdaGH>h7*?0k8!R2`m5=?-O`d9
zm!i52@BRJ59p^0J<S_B-s>eV_sg}4#lq46WCYGe?rT_^BBLf2qT|*;XL-P<r3oBD|
zD^mkq0}CqygZPqTFJT&T^HVa@D$z7pgculDnOIsGK{d=-$UF_Gfx*+&&t;ucLK6TZ
C352Ks

literal 0
HcmV?d00001

diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index 6d4f399d10..ec2a609eee 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/src/calibre/web/feeds/recipes/__init__.py
@@ -18,6 +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',
           ]
 
 import re, imp, inspect, time, os
diff --git a/src/calibre/web/feeds/recipes/linux_magazine.py b/src/calibre/web/feeds/recipes/linux_magazine.py
new file mode 100644
index 0000000000..8b6d6ba81f
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/linux_magazine.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+linux-magazine.com
+'''
+
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class LinuxMagazine(BasicNewsRecipe):
+    title                 = u'Linux Magazine'
+    __author__            = 'Darko Miletic'
+    description           = 'Linux news'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+
+    remove_tags_after = dict(name='div', attrs={'class':'end_intro'})
+    remove_tags = [
+                     dict(name='div' , attrs={'class':'end_intro' })
+                    ,dict(name='table'  , attrs={'width':'100%'})
+                  ]
+
+    feeds          = [(u'Linux Magazine Full Feed', u'http://www.linux-magazine.com/rss/feed/lmi_full')]
+        
+    def print_version(self, url):
+        raw = self.browser.open(url).read()
+        soup = BeautifulSoup(raw.decode('utf8', 'replace'))
+        print_link = soup.find('a', {'title':'Print this page'})
+        if print_link is None:
+            return url
+        return 'http://www.linux-magazine.com'+print_link['href']
+    

From 4dfb9a0d3f80d5230a5be646d8d152f1fcae009c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Dec 2008 19:15:58 -0800
Subject: [PATCH 2/2] Fix #1414 (Stack trace when SD card in reader)

---
 src/calibre/devices/prs505/books.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/prs505/books.py b/src/calibre/devices/prs505/books.py
index f42f1b5513..b63b089fdd 100644
--- a/src/calibre/devices/prs505/books.py
+++ b/src/calibre/devices/prs505/books.py
@@ -60,7 +60,7 @@ class Book(object):
     rpath        = book_metadata_field("path")
     id           = book_metadata_field("id", formatter=int)
     sourceid     = book_metadata_field("sourceid", formatter=int)
-    size         = book_metadata_field("size", formatter=int)
+    size         = book_metadata_field("size", formatter=lambda x : int(float(x)))
     # When setting this attribute you must use an epoch
     datetime     = book_metadata_field("date", formatter=strptime, setter=strftime)