v1.20.27

邮件中转功能中引入字符串压缩，支持一封邮件内包含更多链接，以便更好的通过发送链接生成电子书。

apps/BaseHandler.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Author:
 # cdhigh <https://github.com/cdhigh>
 #Contributors:

apps/View/Admin.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 

apps/View/Adv.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 import datetime, urllib

apps/View/DbViewer.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 

apps/View/Deliver.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 

apps/View/Home.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 

apps/View/Login.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 
@@ -128,6 +127,8 @@ def POST(self):
 
             raise web.seeother(r'/my')
         else:
+            import time
+            time.sleep(5)
             tips = _("The username not exist or password is wrong!")
             main.session.login = 0
             main.session.username = ''

apps/View/Logs.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 

apps/View/Setting.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 

apps/View/Share.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 

apps/View/Subscribe.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Contributors:
 # rexdf <https://github.com/rexdf>
 

apps/Work/Url2Book.py

@@ -2,13 +2,12 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Author:
 # cdhigh <https://github.com/cdhigh>
 #Contributors:
 # rexdf <https://github.com/rexdf>
 
-import web
+import web, zlib, base64
 import jinja2
 from apps.BaseHandler import BaseHandler
 from apps.dbModels import *
@@ -33,7 +32,10 @@ def GET(self):
         if not all((username,urls,subject,to,language,booktype,tz)):
             return "Some parameter missing!<br />"
 
-        #global log
+        if type(urls) is unicode:
+            urls = urls.encode('utf-8')
+
+        urls = zlib.decompress(base64.urlsafe_b64decode(urls))
 
         if booktype == 'Download': #直接下载电子书并推送
             from lib.filedownload import Download

apps/Work/Worker.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Author:
 # cdhigh <https://github.com/cdhigh>
 #Contributors:
@@ -182,7 +181,9 @@ def MergeCovers(self, bks, opts):
                 book = BookClass(bk.title)
                 if book and book.coverfile:
                     coverfiles.append(book.coverfile)
-
+            elif DEFAULT_COVER:
+                coverfiles.append(DEFAULT_COVER)
+
         num_imgs = len(coverfiles)
         if num_imgs > 9:#大于9个则随机选择9个
             coverfiles = random.sample(coverfiles, 9)

apps/__init__.py

@@ -11,7 +11,7 @@
 import __builtin__, sys
 from google.appengine.ext import vendor
 
-__Version__ = '1.20.26'
+__Version__ = '1.20.27'
 
 __builtin__.__dict__['__Version__'] = __Version__
 

apps/dbModels.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Author:
 # cdhigh <https://github.com/cdhigh>
 #Contributors:

apps/handlemail.py

@@ -5,7 +5,7 @@
 """
 将发到[email protected]的邮件正文转成附件发往管理员的kindle邮箱。
 """
-import re
+import re, logging, zlib, base64
 from email.Header import decode_header
 from email.utils import parseaddr, collapse_rfc2231_value
 from bs4 import BeautifulSoup
@@ -18,6 +18,8 @@
 from apps.utils import local_time
 from config import *
 
+log = logging.getLogger()
+
 def decode_subject(subject):
     if subject[0:2] == '=?' and subject[-2:] == '?=':
         subject = u''.join(unicode(s, c or 'us-ascii') for s, c in decode_header(subject))
@@ -62,7 +64,7 @@ def receive(self, message):
             and not user.whitelist.filter('mail = ', sender.lower()).get()
             and not user.whitelist.filter('mail = ', '@' + mailhost.lower()).get()):
             self.response.out.write("Spam mail!")
-            default_log.warn('Spam mail from : %s' % sender)
+            log.warn('Spam mail from : %s' % sender)
             return
 
         if hasattr(message, 'subject'):
@@ -80,16 +82,16 @@ def receive(self, message):
         try:
             allBodies = [body.decode() for ctype, body in html_bodies]
         except:
-            default_log.warn('Decode html bodies of mail failed.')
+            log.warn('Decode html bodies of mail failed.')
             allBodies = []
 
         #此邮件为纯文本邮件
         if len(allBodies) == 0:
-            default_log.info('no html body, use text body.')
+            log.info('no html body, use text body.')
             try:
                 allBodies = [body.decode() for ctype, body in txt_bodies]
             except:
-                default_log.warn('Decode text bodies of mail failed.')
+                log.warn('Decode text bodies of mail failed.')
                 allBodies = []
             bodies = u''.join(allBodies)
             if not bodies:
@@ -148,7 +150,7 @@ def receive(self, message):
             isbook = link[-4:].lower() in ('.pdf','.txt','.doc','.rtf') if not isbook else isbook
 
             param = {'u':username,
-                     'urls':'|'.join(links),
+                     'urls':base64.urlsafe_b64encode(zlib.compress('|'.join(links), 9)),
                      'type':'Download' if isbook else user.book_type,
                      'to':user.kindle_email,
                      'tz':user.timezone,
@@ -201,12 +203,12 @@ def receive(self, message):
                         img['src'] = img['src'][4:]
 
                 opts = getOpts()
-                oeb = CreateOeb(default_log, None, opts)
+                oeb = CreateOeb(log, None, opts)
 
                 setMetaData(oeb, subject[:SUBJECT_WORDCNT_FOR_APMAIL], 
                     user.ownfeeds.language, local_time(tz=user.timezone), 
                     pubtype='book:book:KindleEar')
-                oeb.container = ServerContainer(default_log)
+                oeb.container = ServerContainer(log)
                 id, href = oeb.manifest.generate(id='page', href='page.html')
                 item = oeb.manifest.add(id, href, 'application/xhtml+xml', data=unicode(soup))
                 oeb.spine.add(item, False)
@@ -226,7 +228,7 @@ def receive(self, message):
 
                 oIO = byteStringIO()
                 o = EPUBOutput() if user.book_type == "epub" else MOBIOutput()
-                o.convert(oeb, oIO, opts, default_log)
+                o.convert(oeb, oIO, opts, log)
                 BaseHandler.SendToKindle(username, user.kindle_email, 
                     subject[:SUBJECT_WORDCNT_FOR_APMAIL], 
                     user.book_type, str(oIO.getvalue()), user.timezone)
@@ -260,7 +262,7 @@ def TrigDeliver(self, subject, username):
                 if trigbook:
                     bkids.append(str(trigbook.key().id()))
                 else:
-                    default_log.warn('book not found : %s' % b.strip())
+                    log.warn('book not found : %s' % b.strip())
             if bkids:
                 taskqueue.add(url='/worker',queue_name="deliverqueue1",method='GET',
                     params={'u':username,'id':','.join(bkids)},target='worker')

apps/module_backend.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Author:
 # cdhigh <https://github.com/cdhigh>
 #Contributors:

apps/module_front.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Author:
 # cdhigh <https://github.com/cdhigh>
 #Contributors:

apps/utils.py

@@ -2,7 +2,6 @@
 # -*- coding:utf-8 -*-
 #A GAE web application to aggregate rss and send it to your kindle.
 #Visit https://github.com/cdhigh/KindleEar for the latest version
-#中文讨论贴：http://www.hi-pda.com/forum/viewthread.php?tid=1213082
 #Author:
 # cdhigh <https://github.com/cdhigh>
 #Contributors:

books/ZhihuDaily.py

@@ -75,14 +75,14 @@ def ParseFeedUrls(self):
                     urls.append((section, item['title'], self.url4forwarder(urlfeed), None))
                     urladded.add(urlfeed)
         else:
-            self.log.warn('fetch rss failed(%d):%s'%(result.status_code, url))
+            self.log.warn('fetch rss failed(%s):%s' % (URLOpener.CodeMap(result.status_code), url))
         return urls
 
     #def fetcharticle(self, url, opener, decoder):
     #    result = opener.open(self.url4forwarder(url))
     #    status_code, content = result.status_code, result.content
     #    if status_code != 200 or not content:
-    #        self.log.warn('fetch article failed(%d):%s.' % (status_code,url))
+    #        self.log.warn('fetch article failed(%s):%s.' % (URLOpener.CodeMap(status_code),url))
     #        return None
     #    
     #    if self.page_encoding:

books/base.py

@@ -303,7 +303,7 @@ def ParseFeedUrls(self):
                     urls.append((section, e.title, urlfeed, desc))
                     urladded.add(urlfeed)
             else:
-                self.log.warn('fetch rss failed(%d):%s'%(result.status_code,url))
+                self.log.warn('fetch rss failed(%s):%s'%(URLOpener.CodeMap(result.status_code), url))
 
         return urls
 
@@ -461,7 +461,7 @@ def fetch(self, url, opener, decoder):
         result = opener.open(url)
         status_code, content = result.status_code, result.content
         if status_code not in (200,206) or not content:
-            self.log.warn('fetch page failed(%d):%s.' % (status_code,url))
+            self.log.warn('fetch page failed(%s):%s.' % (URLOpener.CodeMap(status_code), url))
             return None
 
         #debug_mail(content)
@@ -629,7 +629,7 @@ def readability(self, article, url, opts=None, user=None):
                     else:
                         img.decompose()
                 else:
-                    self.log.warn('fetch img failed(err:%d):%s' % (imgresult.status_code,imgurl))
+                    self.log.warn('fetch img failed(%s):%s' % (URLOpener.CodeMap(imgresult.status_code), imgurl))
                     img.decompose()
 
             #去掉图像上面的链接，以免误触后打开浏览器
@@ -678,7 +678,7 @@ def readability_by_soup(self, article, url, opts=None, user=None):
         try:
             title = soup.html.head.title.string
         except AttributeError:
-            self.log.warn('object soup invalid!(%s)'%url)
+            self.log.warn('object soup invalid!(%s)' % url)
             return
         if not title:
             self.log.warn('article has no title.[%s]' % url)
@@ -784,7 +784,7 @@ def readability_by_soup(self, article, url, opts=None, user=None):
                     else:
                         img.decompose()
                 else:
-                    self.log.warn('fetch img failed(err:%d):%s' % (imgresult.status_code,imgurl))
+                    self.log.warn('fetch img failed(%s):%s' % (URLOpener.CodeMap(imgresult.status_code), imgurl))
                     img.decompose()
 
             #去掉图像上面的链接，以免误触后打开浏览器
@@ -971,7 +971,7 @@ def Items(self, opts=None, user=None):
             result = opener.open(url)
             status_code, content = result.status_code, result.content
             if status_code != 200 or not content:
-                self.log.warn('fetch article failed(%d):%s.' % (status_code,url))
+                self.log.warn('fetch article failed(%s):%s.' % (URLOpener.CodeMap(status_code), url))
                 continue
 
             if self.page_encoding:
@@ -1102,7 +1102,7 @@ def Items(self, opts=None, user=None):
                         else:
                             img.decompose()
                     else:
-                        self.log.warn('fetch img failed(err:%d):%s' % (imgresult.status_code,imgurl))
+                        self.log.warn('fetch img failed(%s):%s' % (URLOpener.CodeMap(imgresult.status_code), imgurl))
                         img.decompose()
 
                 #去掉图像上面的链接

books/weixinbase.py

@@ -79,7 +79,7 @@ def ParseFeedUrls(self):
                 else:
                     content = AutoDecoder(True).decode(result.content,opener.realurl,result.headers)
             else:
-                self.log.warn('fetch rss failed(%d):%s'%(result.status_code,url))
+                self.log.warn('fetch rss failed(%s):%s' % (URLOpener.CodeMap(result.status_code), url))
                 continue
 
             eqs, ekv = process_eqs(content)
@@ -134,6 +134,6 @@ def ParseFeedUrls(self):
                     urls.append((section, e.title, urlfeed, desc))
                     urladded.add(urlfeed)
             else:
-                self.log.warn('fetch rss failed(%d):%s'%(result.status_code,url))
+                self.log.warn('fetch rss failed(%s):%s' % (URLOpener.CodeMap(result.status_code), url))
 
         return urls

changelog.md

@@ -1,5 +1,8 @@
 #Changelog for KindleEar
 
+##1.20.27
+  1. 邮件中转功能中引入字符串压缩，支持一封邮件内包含更多链接，以便更好的通过发送链接生成电子书。
+
 ##1.20.26
   1. 引入html内嵌base64图像技术，减小http请求数量，提升网页加速效率。
 

changelog_en.md

@@ -1,5 +1,8 @@
 #Changelog for KindleEar
 
+##1.20.27
+  1. An single email of appspotmail supports more links.
+
 ##1.20.26
   1. Improve performance of loading webpage via inline base64 image technology.
 

i18n/tr-tr/LC_MESSAGES/lang.po

@@ -205,7 +205,7 @@ msgstr "açık kaynak KindleEar uygulaması"
 
 msgid ""
 ", You can deploy your own server to push news feeds to your kindle dialy or "
-"share with your friends."
+"share the service with your friends."
 msgstr ""
 "ile siz de kendi serverınızı kurup Kindle'ınıza RSS'leri günlük gönderebilir "
 "veya arkadaşlarınızla paylaşabilirsiniz."