ryry-cli 1.0__tar.gz → 1.2__tar.gz

{ryry_cli-1.0/ryry_cli.egg-info → ryry_cli-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 1.0
+Version: 1.2
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -27,6 +27,8 @@ Requires-Dist: urlparser
 Requires-Dist: setuptools
 Requires-Dist: twine
 Requires-Dist: python-crontab
+Requires-Dist: urllib3
+Requires-Dist: requests_toolbelt
 
 ryry Python Tool
 ===============================================

ryry_cli-1.2/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="1.2"
+app_bulld_number=12
+app_bulld_anchor="Noh_2024-05-22 21:46:20.707085"
+app_name="ryry-cli"

{ryry_cli-1.0 → ryry_cli-1.2}/ryry/ryry_widget.py

@@ -129,7 +129,7 @@ def setWidgetData(root, widgetid):
     data = GetWidgetConfig(root)
     data["widget_id"] = widgetid
     data["name"] = "Demo"
-    data["version"] = "1.0"
+    data["version"] = "1.2"
     data["device_keys"] = [
         utils.generate_unique_id()
     ]

{ryry_cli-1.0 → ryry_cli-1.2}/ryry/upload.py

@@ -95,45 +95,8 @@ def upload(src, taskUUID, timeout=300):
     needDeleteSrc, newSrc = transcode(src)
     addtionExif(newSrc, taskUUID)
     file_name = Path(newSrc).name
-    ossurl, content_type = ryry_webapi.GetOssUrl(os.path.splitext(file_name)[-1][1:])
-    if len(ossurl) == 0:
-        raise Exception(f"oss server is not avalid, msg = {content_type}")
-
-    headers = dict()
-    headers['Content-Type'] = content_type
-    requests.adapters.DEFAULT_RETRIES = 3
-    s = requests.session()
-    s.keep_alive = False
-    res = s.put(ossurl, data=open(newSrc, 'rb').read(), headers=headers, timeout=timeout)
-    s.close()
-    if res.status_code == 200:
-        ossurl = additionalUrl(newSrc, ossurl)
-        if needDeleteSrc:
-            os.remove(newSrc)
-        return ossurl
-    else:
-        raise Exception(f"upload file fail! res = {res}")
-
-def uploadWidget(src, widgetid, timeout=300):
-    from ryry import ryry_webapi
-    import requests
-    ossurl, content_type = ryry_webapi.GetWidgetOssUrl(widgetid)
-    if len(ossurl) == 0:
-        raise Exception("oss server is not avalid")
-    
-    headers = dict()
-    headers['Content-Type'] = content_type
-    requests.adapters.DEFAULT_RETRIES = 3
-    s = requests.session()
-    s.keep_alive = False
-    res = s.put(ossurl, data=open(src, 'rb').read(), headers=headers, timeout=timeout)
-    s.close()
-    if res.status_code == 200:
-        ossurl = additionalUrl(src, ossurl)
-        checkid = ryry_webapi.WidgetUploadEnd(ossurl)
-        if checkid > 0:
-            return ossurl, checkid
-        else:
-            raise Exception("check fail!")
-    else:
-        raise Exception(f"upload file fail! res = {res}")
+    ossurl = ryry_webapi.upload(newSrc, os.path.splitext(file_name)[-1][1:])
+    ossurl = additionalUrl(newSrc, ossurl)
+    if needDeleteSrc:
+        os.remove(newSrc)
+    return ossurl

{ryry_cli-1.0 → ryry_cli-1.2/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 1.0
+Version: 1.2
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -27,6 +27,8 @@ Requires-Dist: urlparser
 Requires-Dist: setuptools
 Requires-Dist: twine
 Requires-Dist: python-crontab
+Requires-Dist: urllib3
+Requires-Dist: requests_toolbelt
 
 ryry Python Tool
 ===============================================

{ryry_cli-1.0 → ryry_cli-1.2}/ryry_cli.egg-info/requires.txt

@@ -14,3 +14,5 @@ urlparser
 setuptools
 twine
 python-crontab
+urllib3
+requests_toolbelt

{ryry_cli-1.0 → ryry_cli-1.2}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "1.0"
+ryry_version = "1.2"
 ryry_build_number = int(ryry_version.replace(".",""))
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
@@ -24,7 +24,7 @@ app_name="ryry-cli"
 except:
     with open(constanspy, 'w') as f:
         f.write(f'''#!!!!! do not change this file !!!!!
-app_version="1.0"
+app_version="1.2"
 app_bulld_number=1
 app_bulld_anchor=""
 app_name="ryry-cli"
@@ -65,6 +65,8 @@ setuptools.setup(
         'setuptools',
         'twine',
         'python-crontab',
+        'urllib3',
+        'requests_toolbelt',
     ],
     dependency_links=[],
     entry_points={

ryry_cli-1.0/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="1.0"
-app_bulld_number=10
-app_bulld_anchor="Noh_2024-05-21 19:10:52.776464"
-app_name="ryry-cli"