fix qiniu upload on some time error node.

Author: envsh

readme.md

@@ -17,7 +17,15 @@
     cp -v wxagent/secfg.py.example wxagent/secfg.py
     vim wxagent/secfg.py
     python3 -m wxagent.wx2any
-    
+
+
+### TODOs
+
+- [ ] python 3.5 type hint
+- [ ] replace ThreadPoolExecutor with asyncio
+- [ ] drop QThread thread
+- [ ] real multiple protocol IM room
+
 
 ### Documentation
 [Proposal想法](https://github.com/kitech/wxagent/blob/master/doc/proposal.md)

wxagent/filestore.py

@@ -25,6 +25,18 @@ def md5sum(data):
         return h.hexdigest()
 
 
+# need pyocclient-0.3 release
+class OwnCloudFileStor(FileStore):
+    def __init__(self):
+        return
+
+    def uploadData(data):
+        return
+
+    def uploadFile(fname):
+        return
+
+
 class QiniuFileStore(FileStore):
     def __init__(self):
         return
@@ -39,21 +51,24 @@ def uploadData(data):
         secret_key = qiniu_seckey
         bucket_name = qiniu_bucket_name
 
+        print(access_key, secret_key, bucket_name)
         q = qiniu.Auth(access_key, secret_key)
+        # 由于本机时间错误，导致计算了出的token立即失效：
+        # text_body:{"error":"expired token"}
+        token = q.upload_token(bucket_name, expires=3600*24)
         key = 'helloqt.png'
         key = FileStore.md5sum(data)
         # data = 'hello qiniu!'
         # data = load_from_file(PATH)
-        token = q.upload_token(bucket_name)
-        print('uploading file:', key)
+        print('uploading file:', key, token)
         ret, info = qiniu.put_data(token, key, data)
         if ret is not None:
             print('upload file All is OK', ret)
+            url = 'http://7xn2rb.com1.z0.glb.clouddn.com/%s' % key
+            return url
         else:
             print(ret, '=====', info)  # error message in info
-
-        url = 'http://7xn2rb.com1.z0.glb.clouddn.com/%s' % key
-        return url
+        return str(info)
 
     def uploadFile(fname):
         data = b''
@@ -63,6 +78,11 @@ def uploadFile(fname):
         return QiniuFileStore.uploadData(data)
 
 
+def _test_qiniu_upload():
+    u = QiniuFileStore.uploadData('aaaaaaaaaaaaaaaaaaaaaaa'.encode())
+    print(u)
+
+
 class ImgurFileStore(FileStore):
     def __init__(self):
         return
@@ -139,7 +159,7 @@ def __init__(self):
         return
 
     def uploadData(data):
-        # return 'nourl'
+        return 'nourl'
         if type(data) == QByteArray:
             data = data.data()
 
@@ -184,3 +204,4 @@ def uploadFile(fname):
         if not url.startswith('https://'): print('upload error: ', hdrval.getvalue())
 
         return url
+

wxagent/wxagent.py

@@ -79,7 +79,7 @@ def runfun() -> list:
                 # Use body.encode('utf-8') if you want to send it encoded in UTF-8.
                 res = self._sess.send(preq, timeout=35)
                 # self.doreqcb(res if 'res' in locals() else None, req, reqid)
-            except requests.ReadTimeout:
+            except requests.exceptions.ReadTimeout:
                 # TODO
                 pass
             except Exception as ex: