1.26.8

Add a search bar in shared library (trick: you can download all rss by input a keyword "#download" in search bar).

app.yaml

@@ -1,5 +1,5 @@
-application: kindleear
-version: 1
+#application: kindleear
+#version: 1
 runtime: python27
 api_version: 1
 threadsafe: true

apps/__init__.py

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

changelog.md

@@ -1,5 +1,14 @@
 # Changelog for KindleEar
 
+## 1.26.8
+  1. "网友分享" 添加一个搜索栏。（小彩蛋：输入 "#download" 可以下载全部RSS资源）
+  2. 更新README和FAQ关于部署的说明。
+
+## 1.26.7
+  1. 适配 kindle 固件 5.9.x (在书籍下方显示时间而不是作者)。
+  2. gufengmh地址变更。
+  3. readability 库升级为 0.8.1。
+
 ## 1.26.6
   1. 添加漫画 扑飞, 古风 的支持。
   2. 添加更多推送书籍的语种。

changelog_en.md

@@ -1,5 +1,14 @@
 # Changelog for KindleEar
 
+## 1.26.8
+  1. Add a search bar in shared library (trick: you can download all rss by input a keyword "#download" in search bar).
+  2. Update the description of the deployment process in readme and FAQ.
+
+## 1.26.7
+  1. fix bug of kindle firmware 5.9.x (use author as date)
+  2. fix name of site gufengmh.
+  3. update module readability to 0.8.1
+
 ## 1.26.6
   1. Add comic pufei, gufeng.
   2. Add more languages for books.

module-worker.yaml

@@ -1,5 +1,5 @@
-application: kindleear
-version: 1
+#application: kindleear
+#version: 1
 module: worker
 runtime: python27
 api_version: 1

readme.md

@@ -24,7 +24,15 @@ Readme of english version refers to [Readme_EN.md](https://github.com/cdhigh/Kin
 
 3. 安装 [Python 2.7.x](https://www.python.org/downloads/)。  
 
-4. 安装 [GAE SDK](https://cloud.google.com/appengine/downloads)。  
+4. 安装 [GAE SDK](https://storage.cloud.google.com/cloud-sdk-release)，选择273之前的版本，比如下面几个链接。  
+    [google-cloud-sdk-273.0.0-windows-x86_64-bundled-python.zip](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86_64-bundled-python.zip)
+    [google-cloud-sdk-273.0.0-darwin-x86.tar.gz](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-darwin-x86.tar.gz)
+    [google-cloud-sdk-273.0.0-darwin-x86_64.tar.gz](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-darwin-x86_64.tar.gz)
+    [google-cloud-sdk-273.0.0-linux-x86.tar.gz](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-linux-x86.tar.gz)
+    [google-cloud-sdk-273.0.0-linux-x86_64.tar.gz](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-linux-x86_64.tar.gz)
+    [google-cloud-sdk-273.0.0-windows-x86-bundled-python.zip](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86-bundled-python.zip)
+    [google-cloud-sdk-273.0.0-windows-x86.zip](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86.zip)
+    [google-cloud-sdk-273.0.0-windows-x86_64.zip](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86_64.zip)
 
 5. 下载 [KindleEar](https://github.com/cdhigh/KindleEar/archive/master.zip) ，解压到一个特定的目录。
 
@@ -42,18 +50,16 @@ config.py          | DOMAIN      | 你申请的应用的域名        |
 7. 转到GAE SDK安装目录(默认为：*C:\Program Files\Google\google_appengine*) 
 
 8. 部署命令：  
-8.1 使用appcfg.py：  
-	* `c:\python27\python.exe appcfg.py update kindleear目录\app.yaml kindleear目录\module-worker.yaml`  
-	* `c:\python27\python.exe appcfg.py update kindleear目录`  
-
-8.2 使用gcloud：  
     * 删除app.yaml和module-worker.yaml开头的两行：application /  version  
     * `gcloud auth login`  
     * `gcloud config set project 你的ApplicationId`  
-    * `gcloud app deploy --version=1 KindleEar目录\app.yaml KindleEar目录\module-worker.yaml`  
+    * `gcloud app deploy --version=1 app.yaml module-worker.yaml`  
     * `gcloud app deploy --version=1 KindleEar目录`  
-    * [如果服务器没有正常创建数据库索引，可能需要手动执行如下语句]  
-      `gcloud datastore indexes create KindleEar目录\index.yaml`  
+    * [如果服务器没有正常创建数据库索引或定时任务，可能需要手动执行如下语句]  
+      `gcloud datastore indexes create index.yaml`
+      `gcloud app deploy --version=1 app.yaml queue.yaml`
+      `gcloud app deploy --version=1 app.yaml cron.yaml`
+      `gcloud app deploy --version=1 app.yaml dispatch.yaml`  
 
 9. 全部完成后就可以尝试打开域名：  
 *http://appid.appspot.com*  (appid是你申请的application名字)  

readme_EN.md

@@ -19,7 +19,15 @@ KindleEar is a web application to aggregate RSS for generating periodical mobi/e
 
 3. Install [Python 2.7.x](https://www.python.org/downloads/).  
 
-4. Install [GAE SDK](https://cloud.google.com/appengine/downloads).  
+4. Install [GAE SDK](https://storage.cloud.google.com/cloud-sdk-release).  note: choose some version before 273.0.  
+   [google-cloud-sdk-273.0.0-windows-x86_64-bundled-python.zip](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86_64-bundled-python.zip)
+    [google-cloud-sdk-273.0.0-darwin-x86.tar.gz](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-darwin-x86.tar.gz)
+    [google-cloud-sdk-273.0.0-darwin-x86_64.tar.gz](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-darwin-x86_64.tar.gz)
+    [google-cloud-sdk-273.0.0-linux-x86.tar.gz](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-linux-x86.tar.gz)
+    [google-cloud-sdk-273.0.0-linux-x86_64.tar.gz](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-linux-x86_64.tar.gz)
+    [google-cloud-sdk-273.0.0-windows-x86-bundled-python.zip](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86-bundled-python.zip)
+    [google-cloud-sdk-273.0.0-windows-x86.zip](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86.zip)
+    [google-cloud-sdk-273.0.0-windows-x86_64.zip](https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86_64.zip)
 
 5. [Download KindleEar](https://github.com/cdhigh/KindleEar/archive/master.zip) and uncompress it into a directory for example: *c:\kindleear*.  
 
@@ -33,21 +41,19 @@ config.py          | SRC_EMAIL   | Your Gmail Address          |
 config.py          | DOMAIN      | appid@appspot.com        |  
 config.py          | TIMEZONE    | Your timezone         |
 
-> the lines application and version in yaml have to be commented if you will deploy it by using gcloud.
+> the lines 'application' and 'version' in yaml have to be commented if you will deploy it by using gcloud.
 
-7. Choose 7.1 or 7.2 to deploy it.  
-
-7.1 using appcfg.py  
-	* `c:\python27\python.exe appcfg.py update KindleEarFolder\app.yaml KindleEarFolder\module-worker.yaml`  
-	* `c:\python27\python.exe appcfg.py update KindleEarFolder`  
-
-7.2 using gcloud  
+7. Deployment
     * Delete the first two lines of app.yaml and module-worker.yaml [application and version]  
     * `gcloud auth login`  
     * `gcloud config set project YourApplicationId`  
     * `gcloud app deploy --version=1 KindleEarFolder\app.yaml KindleEarFolder\module-worker.yaml`    
     * `gcloud app deploy --version=1 KindleEarFolder`  
-    * [If needed] `gcloud datastore indexes create KindleEarFolder\index.yaml`  
+    * [If some error after deployment.] 
+      `gcloud datastore indexes create index.yaml`
+      `gcloud app deploy --version=1 app.yaml queue.yaml`
+      `gcloud app deploy --version=1 app.yaml cron.yaml`
+      `gcloud app deploy --version=1 app.yaml dispatch.yaml`  
 
 8. After finished, you can open the website *'http://appid.appspot.com'* (appid is the name of your application),  
 For example the author's site: <http://kindleear.appspot.com>  

static/faq.html

@@ -88,31 +88,45 @@ <h2>此应用需要自己的服务器吗？</h2>
 
     <span id="ownserver"></span>
     <h2>如何搭建自己的推送服务器？</h2>
-    <p class="answer"><strong>以下是正规的搭建步骤：</strong>
+    <p class="answer">
         <ol>
         <li>在 <a href="http://www.github.com/cdhigh/kindleear">Github</a> 页面上下载KindleEar的最新版本，在页面的右下角有一个按钮"Download ZIP"，点击即可下载一个包含全部源码的ZIP文档，然后解压到你喜欢的目录，比如C:\KindleEar（下面以这个为例）。</li>
         <li>首先你需要一个google账号，并暂时 <a href="https://www.google.com/settings/security/lesssecureapps">[启用不够安全的应用的访问权限]</a> 以便获得上传程序的权限。然后访问 <a href="https://console.developers.google.com/project">Google Developers Console</a>，新建一个Application。（用来上传KinldeEar用）。</li>
-        <li>安装 <a href="http://www.python.org/getit/">Python 2.7.x</a>，在此页面中选择你的系统平台对应的2.7.x版本下载，然后直接双击安装。注意不要安装成Python 3.x版本，GAE和KindleEar都暂不支持。</li>
-        <li>下载 <a href="https://cloud.google.com/appengine/downloads?hl=zh-CN">GAE SDK</a>，这是用来上传GAE程序用的。在此页面中的区段“Google App Engine SDK for Python”中选择你的系统平台对应的版本点击即可下载，然后安装，一路next无话。</li>
-        <li>打开资源管理器，进入之前下载的KindleEar目录C:\KindleEar，使用任何文本编辑器打开app.yaml和module-worker.yaml文件，将第一行的kindleear字样修改为你之前申请的GAE程序名（比如kindleear123），保存退出。</li>
+        <li>安装 <a href="https://www.python.org/downloads/">Python 2.7.x</a>，在此页面中选择你的系统平台对应的2.7.x版本下载，然后直接双击安装。注意不要安装成Python 3.x版本，KindleEar都暂不支持。</li>
+        <li>下载 <a href="https://storage.cloud.google.com/cloud-sdk-release">GAE SDK</a>，选择273之前的版本，比如下面几个链接。 
+            <ol>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86_64-bundled-python.zip">google-cloud-sdk-273.0.0-windows-x86_64-bundled-python.zip</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-darwin-x86.tar.gz">google-cloud-sdk-273.0.0-darwin-x86.tar.gz</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-darwin-x86_64.tar.gz">google-cloud-sdk-273.0.0-darwin-x86_64.tar.gz</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-linux-x86.tar.gz">google-cloud-sdk-273.0.0-linux-x86.tar.gz</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-linux-x86_64.tar.gz">google-cloud-sdk-273.0.0-linux-x86_64.tar.gz</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86-bundled-python.zip">google-cloud-sdk-273.0.0-windows-x86-bundled-python.zip</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86.zip">google-cloud-sdk-273.0.0-windows-x86.zip</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86_64.zip">google-cloud-sdk-273.0.0-windows-x86_64.zip</a></li>
+            </ol>
+        </li>
         <li>在app.yaml的同一个目录，打开config.py文件，修改SRC_EMAIL为你的gmail账号，DOMAIN为你的应用的域名。其他的选项也可以根据注释有选择性的修改，或者使用默认即可。</li>
-        <li>正式上传KindleEar。不能使用Google App Engine Launcher，因为Launcher默认不支持多module应用（修改配置后可以），这里介绍一下windows下使用命令行的方式。
-            <li>依次点击：开始-运行-输入CMD，打开命令行窗口</li>
-            <li>进入到App Engine SDK安装目录；例如：<br/><code>cd "C:\Program Files\Google\google_appengine"</code></li>
-            <li>输入“上传”命令：<br/><code>c:\python27\python.exe appcfg.py update C:\kindleear\app.yaml c:\kindleear\module-worker.yaml</code></li>
-            <li>依次输入gmail账号及密码（密码输入时屏幕不显示）。</li>
-            <li>再输入“上传”命令：<br/><code>c:\python27\python.exe appcfg.py update C:\kindleear\</code></li>
+        <li>正式上传KindleEar。
+            <ol>
+            <li>依次点击：开始-运行-输入CMD，打开命令行窗口，进入KindleEar目录</li>
+            <li>gcloud auth login</li>
+            <li>gcloud config set project 你的ApplicationId</li>
+            <li>gcloud app deploy --version=1 app.yaml module-worker.yaml</li>
+            <li>gcloud app deploy --version=1 KindleEar目录</li>
+            <li>如果出现错误，可能需要下面几条命令。
+                <ol>
+                    <li>gcloud datastore indexes create index.yaml</li>
+                    <li>gcloud app deploy --version=1 app.yaml queue.yaml</li>
+                    <li>gcloud app deploy --version=1 app.yaml cron.yaml</li>
+                    <li>gcloud app deploy --version=1 app.yaml dispatch.yaml</li>  
+                </ol>
             </li>
+            </ol>
+        </li>
         <li>显示上传成功后使用你的浏览器打开域名：kindleear123.appspot.com （举例而已，kindleear123要改为你申请的GAE程序名称），如果能正常打开，则还有最后一步。</li>
         <li>将你的gmail账号加入kindle推送邮箱的白名单。这一步你应该早就会了吧。</li>
         <li>然后呢？享受你自己的推送服务吧！</li>
         </ol>
-    <p><strong>以下是推荐的简化搭建步骤（使用uploader）：</strong>
-        <ol>
-        <li>下载<a href="http://www.github.com/cdhigh/kindleear">KindleEar</a>和申请GAE账号，并创建一个application。</li>
-        <li>下载<a href="https://drive.google.com/folderview?id=0ByRickMo9V_XNlJITzhYM3JOYW8&usp=sharing">uploader</a>。</li>
-        <li>解压uploader到特定目录，将之前下载并解压的KindleEar目录拷贝到此目录下，改名为kindleear，然后双击执行uploader.bat后根据提示输入appid/email/timezone后会正式启动上传程序，输入email和密码即可上传代码。</li>
-        </ol></p>
     </p>
 
     <span id="notreceived"></span>

static/faq_en.html

@@ -79,21 +79,40 @@ <h2>Dows this application require its own server?</h2>
 
     <span id="ownserver"></span>
     <h2>How to deploy my own delivery server?</h2>
-    <p class="answer"><strong>The formal way:</strong>
+    <p class="answer">
         <ol>
         <li><a href="https://github.com/cdhigh/KindleEar/archive/master.zip">Download</a> the latest version of KindleEar on github and then extract it to somewhere, for example C:\KindleEar (we'll use it in the following steps).</li>
         <li>You need a google account, please visit the <a href="https://console.developers.google.com">Google Developers Console</a> page. Use your gmail account to login, click on "Create an empty Project", follow steps to create a GAE application.</li>
-        <li>Install Python 2.7.x. <a href="https://www.python.org/downloads/">Download</a> the latest 2.7.x source release and then install it.  Do not install a Python 3.x version, because GAE does not support it now.</li>
-        <li>Install GAE SDK, which will be used to upload a GAE program. In section on <a href="https://developers.google.com/appengine/downloads">this page</a>, click "Google App Engine SDK for Python", choose your platform, click to download the corresponding version, then install, all the way "next" without words.</li>
-        <li>Go to the previously downloaded KindleEar directory (e.g. C:\KindleEar), use a text editor to open app.yaml and module-worker.yaml file, modify the word 'kindleear' in the first line to your GAE application name (e.g. kindleear123), then save and exit.</li>
+        <li>Install Python 2.7.x. <a href="https://www.python.org/downloads/">Download</a> the latest 2.7.x source release and then install it.  Do not install a Python 3.x version, because KindleEar does not support it now.</li>
+        <li>Install <a href="https://storage.cloud.google.com/cloud-sdk-release">GAE SDK</a>, choose some version before 273. for example:
+            <ol>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86_64-bundled-python.zip">google-cloud-sdk-273.0.0-windows-x86_64-bundled-python.zip</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-darwin-x86.tar.gz">google-cloud-sdk-273.0.0-darwin-x86.tar.gz</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-darwin-x86_64.tar.gz">google-cloud-sdk-273.0.0-darwin-x86_64.tar.gz</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-linux-x86.tar.gz">google-cloud-sdk-273.0.0-linux-x86.tar.gz</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-linux-x86_64.tar.gz">google-cloud-sdk-273.0.0-linux-x86_64.tar.gz</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86-bundled-python.zip">google-cloud-sdk-273.0.0-windows-x86-bundled-python.zip</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86.zip">google-cloud-sdk-273.0.0-windows-x86.zip</a></li>
+                <li><a href="https://storage.googleapis.com/cloud-sdk-release/google-cloud-sdk-273.0.0-windows-x86_64.zip">google-cloud-sdk-273.0.0-windows-x86_64.zip</a></li>
+            </ol>
+        </li>
         <li>Modify variables 'SRC_EMAIL' and 'DOMAIN' and 'TIMEZONE' in config.py in same directory of app.yaml. You can modify other variables if you want and understand what it means.Using the default values are recommended.</li>
-        <li>Start upload KindleEar now. You can use Google App Engine Launcher GUI or command line. Because Launcher is not stable, we'll use the command line in Windows.
+        <li>Start upload KindleEar now.
           <ul>
             <li>Followed by clicking: Start - Run - type cmd, it will open a command line window</li>
-            <li>Change current directory to App Engine SDK installation directory, example: <br/><code>cd C:\Program Files\Google\google_appengine</code></li>
-            <li>Enter 'upload' command: <br/><code>C:\python27\python.exe appcfg.py update C:\KindleEar\app.yaml C:\KindleEar\module-worker.yaml</code></li>
-            <li>Enter the gmail account and password (password does not display in screen).</li>
-            <li>Enter command: <br/><code>C:\python27\python.exe appcfg.py update C:\KindleEar</code></li>
+            <li>Change current directory to App Engine SDK installation directory, example: <code>cd C:\Program Files\Google\google_appengine</code></li>
+            <li>gcloud auth login</li>
+            <li>gcloud config set project YourAppId</li>
+            <li>gcloud app deploy --version=1 app.yaml module-worker.yaml</li>
+            <li>gcloud app deploy --version=1 KindleEarDirectory</li>
+            <li>If something goes wrong, execute following command lines.
+                <ol>
+                    <li>gcloud datastore indexes create index.yaml</li>
+                    <li>gcloud app deploy --version=1 app.yaml queue.yaml</li>
+                    <li>gcloud app deploy --version=1 app.yaml cron.yaml</li>
+                    <li>gcloud app deploy --version=1 app.yaml dispatch.yaml</li>  
+                </ol>
+            </li>
           </ul>
         </li>
         <li>After successfully uploading KindleEar, use your browser to open the site: http://kindleear123.appspot.com (example only, kindleear123 should be changed to the name of your GAE application). If everything goes fine, then go to the last step.</li>