sync.

yccheok · yccheok · commit fd5e90dc465a · 2018-03-06T20:21:02.000+08:00
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,17 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.31 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.32 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Fix on broken URL.
+    Bugfix:  Support new version of Android app, with note feature.
     </p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.31 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.32 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
     
     </body>
 </html>
diff --git a/appengine/jstock-static/war/news_information/index.txt b/appengine/jstock-static/war/news_information/index.txt
@@ -1,3 +1,3 @@
 id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
-news_id=03/03/2018
+news_id=06/03/2018
 news_url=http://jstock-static.appspot.com/news_information/index.html
diff --git a/appengine/jstock-static/war/news_information/zh/index.html b/appengine/jstock-static/war/news_information/zh/index.html
@@ -4,17 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.31 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.32 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Fix on broken URL.
+    Bugfix:  Support new version of Android app, with note feature.
     </p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.31 from <a href="http://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.32 from <a href="http://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
     
     </body>
 </html>
diff --git a/appengine/jstock-static/war/news_information/zh/index.txt b/appengine/jstock-static/war/news_information/zh/index.txt
@@ -1,3 +1,3 @@
 id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
-news_id=03/03/2018
+news_id=06/03/2018
 news_url=http://jstock-static.appspot.com/news_information/zh/index.html
diff --git a/appengine/jstock-static/war/version_information/index.txt b/appengine/jstock-static/war/version_information/index.txt
@@ -1,5 +1,5 @@
-applicationVersionID=1160
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+applicationVersionID=1161
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-32/jstock-1.0.7.32-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-32/jstock-1.0.7.32-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-32/jstock-1.0.7.32-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-32/jstock-1.0.7.32-bin.zip
diff --git a/appengine/jstock-static/war/version_information/zh/index.txt b/appengine/jstock-static/war/version_information/zh/index.txt
@@ -1,5 +1,5 @@
-applicationVersionID=1160
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+applicationVersionID=1161
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-32/jstock-1.0.7.32-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-32/jstock-1.0.7.32-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-32/jstock-1.0.7.32-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-32/jstock-1.0.7.32-bin.zip
diff --git a/appengine/jstock-webapp/app.yaml b/appengine/jstock-webapp/app.yaml
@@ -2,19 +2,30 @@ application: jstock-webapp
 version: 1
 runtime: python27
 api_version: 1
-threadsafe: false
+threadsafe: true
 
+# max_idle_instances: Default: automatic
+# max_concurrent_requests: Default: 8, Maximum: 80
+# min_pending_latency: Default: 30ms
+#automatic_scaling:
+#  max_idle_instances: 1
+#  max_concurrent_requests: 80
+#  min_pending_latency: 3000ms
+  
 handlers:
 - url: /get-time\.py
-  script: get-time.py
+  script: get-time.app
   
 - url: /get-ip\.py
-  script: get-ip.py
+  script: get-ip.app
   
 - url: /missing-stock-code/.*
   script: missing-stock-code.app
   secure: always  
   
 - url: /slow/.*
   script: slow.app
-  secure: always
+  secure: always
+  
+- url: /image-search/.*
+  script: image-search.app  
diff --git a/appengine/jstock-webapp/get-ip.py b/appengine/jstock-webapp/get-ip.py
@@ -1,9 +1,14 @@
+import webapp2
 import time
 import os
 
-ip = os.environ.get("HTTP_X_FORWARDED_FOR") or os.environ.get("REMOTE_ADDR")
-ip = ip.split(',')[0]
-
-print 'Content-Type: text/plain'
-print ''
-print ip 
+class GetIPHandler(webapp2.RequestHandler):
+    def get(self):
+        ip = os.environ.get("HTTP_X_FORWARDED_FOR") or os.environ.get("REMOTE_ADDR")
+        ip = ip.split(',')[0]
+        self.response.headers['Content-Type'] = 'text/plain'
+        self.response.out.write(ip)
+        
+app = webapp2.WSGIApplication([
+    ('/get-ip.py', GetIPHandler)
+], debug=True)
diff --git a/appengine/jstock-webapp/get-time.py b/appengine/jstock-webapp/get-time.py
@@ -1,6 +1,13 @@
+import webapp2
 import time
 
-print 'Content-Type: text/plain'
-print ''
-print 'id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed'
-print 'time=%.0f' % (time.time() * 1000)
+class GetTimeHandler(webapp2.RequestHandler):
+    def get(self):
+        self.response.headers['Content-Type'] = 'text/plain'
+        self.response.out.write('id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed')
+        self.response.out.write('\n')
+        self.response.out.write('time=%.0f' % (time.time() * 1000))
+        
+app = webapp2.WSGIApplication([
+    ('/get-time.py', GetTimeHandler)
+], debug=True)
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,6 +1,9 @@
 ﻿This file summarizes changes in JStock releases.
 Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX)
 
+JStock 1.0.7.32 - 2018-03-06
+  Bugfix:  Support new version of Android app, with note feature.
+  
 JStock 1.0.7.31 - 2018-03-03
   Bugfix:  Fix on broken URL.
   
diff --git a/installer/windows/jstock.nsi b/installer/windows/jstock.nsi
@@ -12,7 +12,7 @@ Name ${PRODUCT_NAME}
 RequestExecutionLevel admin ;Workaround for Vista
 
 ; The file to write
-OutFile "jstock-1.0.7.31-setup.exe"
+OutFile "jstock-1.0.7.32-setup.exe"
 LicenseData "gpl-2.0.txt"
  
 ; The default installation directory
diff --git a/installer/windows/jstock.xml b/installer/windows/jstock.xml
@@ -26,12 +26,12 @@
     <maxHeapSize>512</maxHeapSize>
   </jre>
   <versionInfo>
-    <fileVersion>1.1.6.0</fileVersion>
-    <txtFileVersion>1.1.6.0</txtFileVersion>
+    <fileVersion>1.1.6.1</fileVersion>
+    <txtFileVersion>1.1.6.1</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.6.0</productVersion>
-    <txtProductVersion>1.1.6.0</txtProductVersion>
+    <productVersion>1.1.6.1</productVersion>
+    <txtProductVersion>1.1.6.1</txtProductVersion>
     <productName>JStock - Stock Market Software</productName>
     <companyName>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</companyName>
     <internalName>jstock</internalName>
diff --git a/src/org/yccheok/jstock/gui/SaveToCloudJDialog.java b/src/org/yccheok/jstock/gui/SaveToCloudJDialog.java
@@ -577,6 +577,8 @@ private static List<String> getExtensions(String name) {
         } else if (name.equals("android")) {
             extensions.add(".csv");
             extensions.add(".json");
+        } else if (name.equals("databases")) {
+            extensions.add(".db");
         } else {
             assert(false);
             throw new java.lang.IllegalArgumentException(name);
@@ -636,6 +638,8 @@ public static File getJStockZipFile(final String filename) {
             }
         }
 
+        getFileEx(fileExs, "databases", getExtensions("databases"));
+        
         if (false == promptUserToContinue(countryWithWatchlistFilesBeingIgnored)) {
             return null;
         }
diff --git a/src/org/yccheok/jstock/gui/Utils.java b/src/org/yccheok/jstock/gui/Utils.java
@@ -2778,11 +2778,11 @@ public ApplicationInfo(int applicationVersionID, String windowsDownloadLink, Str
 
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
-    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.31";
+    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.32";
 
-    // 1.0.7.31
+    // 1.0.7.32
     // For About box comparision on latest version purpose.
-    private static final int APPLICATION_VERSION_ID = 1160;
+    private static final int APPLICATION_VERSION_ID = 1161;
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
     
