ryry-cli 6.19__tar.gz → 6.22__tar.gz

ryry_cli-6.22/MANIFEST.in

@@ -0,0 +1,2 @@
+include ryry/assets/fonts/OFL.txt
+include ryry/assets/fonts/ryry-report-cjk-bold.otf

{ryry_cli-6.19/ryry_cli.egg-info → ryry_cli-6.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 6.19
+Version: 6.22
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -23,6 +23,7 @@ Requires-Dist: gputil
 Requires-Dist: urlparser
 Requires-Dist: urllib3
 Requires-Dist: portalocker
+Requires-Dist: boto3
 Requires-Dist: PyYAML
 
 ryry Python Tool

ryry_cli-6.22/ryry/assets/fonts/OFL.txt

@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

{ryry_cli-6.19 → ryry_cli-6.22}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="6.19"
-app_bulld_anchor="Noh_2026-07-09 01:20:20.729214"
+app_version="6.22"
+app_bulld_anchor="Noh_2026-07-09 19:12:26.483937"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-6.19 → ryry_cli-6.22}/ryry/store.py

@@ -177,7 +177,7 @@ def extend():
                 _genExtend()
             elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
                 _genExtend()
-            elif read_data["extend"].get("app", "") == "ryry-cli 6.19":
+            elif read_data["extend"].get("app", "") == "ryry-cli 6.20":
                 _genExtend()
             elif any(k not in read_data["extend"] for k in ["device_id", "host_name", "cpu", "memory", "disk", "gpu"]):
                 _genExtend()

{ryry_cli-6.19 → ryry_cli-6.22}/ryry/taskUtils.py

@@ -292,25 +292,89 @@ def _sendCounterMarkdownReport(report_date, stats):
         }
     })
 
-def _reportFont(size, bold=False):
+def _bundledReportFontPath():
+    return os.path.join(os.path.dirname(os.path.abspath(__file__)), "assets", "fonts", "ryry-report-cjk-bold.otf")
+
+def _reportFontCandidates(bold=False):
+    env_font = os.environ.get("RYRY_REPORT_FONT_BOLD" if bold else "RYRY_REPORT_FONT") or os.environ.get("RYRY_REPORT_FONT")
+    font_paths = [
+        env_font,
+        _bundledReportFontPath(),
+        "/System/Library/Fonts/STHeiti Medium.ttc" if bold else "/System/Library/Fonts/STHeiti Light.ttc",
+        "/System/Library/Fonts/PingFang.ttc",
+        "/Library/Fonts/Arial Unicode.ttf",
+        "/usr/share/fonts/opentype/noto/NotoSansCJK-Bold.ttc" if bold else "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
+        "/usr/share/fonts/opentype/noto/NotoSansCJKSC-Bold.otf" if bold else "/usr/share/fonts/opentype/noto/NotoSansCJKSC-Regular.otf",
+        "/usr/share/fonts/truetype/noto/NotoSansCJK-Bold.ttc" if bold else "/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc",
+        "/usr/share/fonts/truetype/noto/NotoSansSC-Bold.otf" if bold else "/usr/share/fonts/truetype/noto/NotoSansSC-Regular.otf",
+        "/usr/share/fonts/noto-cjk/NotoSansCJK-Bold.ttc" if bold else "/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
+        "/usr/share/fonts/google-noto-cjk/NotoSansCJK-Bold.ttc" if bold else "/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
+        "/usr/share/fonts/opentype/adobe-source-han-sans/SourceHanSansSC-Bold.otf" if bold else "/usr/share/fonts/opentype/adobe-source-han-sans/SourceHanSansSC-Regular.otf",
+        "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
+        "/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",
+        "/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf",
+        "/usr/share/fonts/truetype/arphic/uming.ttc",
+        "/usr/share/fonts/truetype/arphic/ukai.ttc",
+        "C:/Windows/Fonts/msyhbd.ttc" if bold else "C:/Windows/Fonts/msyh.ttc",
+        "C:/Windows/Fonts/simhei.ttf",
+    ]
+    font_paths.extend(_fontconfigCjkFonts(bold))
+
+    seen = set()
+    for font_path in font_paths:
+        if not font_path or font_path in seen:
+            continue
+        seen.add(font_path)
+        if os.path.exists(font_path):
+            yield font_path
+
+def _fontconfigCjkFonts(bold=False):
     try:
-        from PIL import ImageFont
-        font_paths = [
-            "/System/Library/Fonts/STHeiti Medium.ttc" if bold else "/System/Library/Fonts/STHeiti Light.ttc",
-            "/System/Library/Fonts/PingFang.ttc",
-            "/Library/Fonts/Arial Unicode.ttf",
-            "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
-            "/usr/share/fonts/opentype/noto/NotoSansCJKSC-Regular.otf",
-            "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
-            "/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf" if bold else "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
-            "C:/Windows/Fonts/msyhbd.ttc" if bold else "C:/Windows/Fonts/msyh.ttc",
-        ]
-        for font_path in font_paths:
-            if font_path and os.path.exists(font_path):
-                return ImageFont.truetype(font_path, size)
-        return ImageFont.load_default()
+        import subprocess
     except:
-        return None
+        return []
+
+    style = "Bold" if bold else "Regular"
+    families = [
+        f"Noto Sans CJK SC:style={style}",
+        f"Noto Sans SC:style={style}",
+        f"Source Han Sans SC:style={style}",
+        "WenQuanYi Micro Hei",
+        "WenQuanYi Zen Hei",
+        "Microsoft YaHei",
+        "SimHei",
+        "Arial Unicode MS",
+    ]
+    cjk_markers = [
+        "notosanscjk", "notosanssc", "noto sans cjk", "noto sans sc",
+        "sourcehan", "source-han", "wenquanyi", "wqy", "droidsansfallback",
+        "uming", "ukai", "msyh", "simhei", "simsun", "arial unicode",
+    ]
+    font_paths = []
+    for family in families:
+        try:
+            font_path = subprocess.check_output(
+                ["fc-match", "-f", "%{file}", family],
+                stderr=subprocess.DEVNULL,
+                text=True,
+                timeout=2,
+            ).strip()
+        except:
+            continue
+        normalized = font_path.lower()
+        if font_path and os.path.exists(font_path) and any(marker in normalized for marker in cjk_markers):
+            font_paths.append(font_path)
+    return font_paths
+
+def _reportFont(size, bold=False):
+    from PIL import ImageFont
+
+    for font_path in _reportFontCandidates(bold):
+        try:
+            return ImageFont.truetype(font_path, size)
+        except:
+            continue
+    raise RuntimeError("No CJK font found for daily report image. Install a CJK font or set RYRY_REPORT_FONT.")
 
 def _text(draw, xy, text, fill, font=None, **kwargs):
     try:
@@ -386,10 +450,10 @@ def _counterReportImageBytes(report_date, stats):
     plot_bottom = chart_bottom - 36
     plot_h = plot_bottom - plot_top
     max_count = max([s + f for s, f in zip(stats["hour_success"], stats["hour_fail"])] + [1])
-    for i in range(0, 5):
-        y = plot_bottom - int(plot_h * i / 4)
+    tick_values = list(range(0, max_count + 1)) if max_count <= 4 else [int(round(max_count * i / 4)) for i in range(0, 5)]
+    for tick in tick_values:
+        y = plot_bottom - int(plot_h * tick / max_count)
         draw.line((chart_left, y, chart_right, y), fill=grid, width=1)
-        tick = int(max_count * i / 4)
         _text(draw, (chart_left - 36, y - 8), str(tick), muted, small_font)
 
     slot = chart_w / 24.0

{ryry_cli-6.19 → ryry_cli-6.22}/ryry/upload.py

@@ -79,7 +79,7 @@ def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, addition
     return ossurl
 
 def uploadByDomain(src, targetDomain,
-                   taskUUID, keepItAlways=False,
+                   taskUUID=None, keepItAlways=False,
                    needTranscode=False, additionalUrl=False):
     import os
     from pathlib import Path
@@ -93,10 +93,16 @@ def uploadByDomain(src, targetDomain,
 
     s3_config = getS3Config(parsed_domain)
     if s3_config:
+        fallback = s3_config.get("fallback")
         if isS3ConfigReady(s3_config):
             new_file_name = ''.join(str(uuid.uuid4()).split('-'))
-            return uploadToS3(src, f"{new_file_name}.{ext}", s3_config, upload_path)
-        return uploadByApiFallback(src, ext, s3_config.get("fallback"),
+            try:
+                return uploadToS3(src, f"{new_file_name}.{ext}", s3_config, upload_path)
+            except Exception as e:
+                if not fallback:
+                    raise
+                print(f"S3 upload failed, fallback to api: {e}")
+        return uploadByApiFallback(src, ext, fallback,
                                    keepItAlways=keepItAlways,
                                    needTranscode=needTranscode,
                                    additionalUrl=additionalUrl)
@@ -117,7 +123,7 @@ def uploadByDomain(src, targetDomain,
                                keepItAlways=keepItAlways,
                                needTranscode=needTranscode,
                                additionalUrl=additionalUrl)
-
+    
 def parseDomainAndPath(targetDomain):
     from urllib.parse import urlparse
     
@@ -830,4 +836,4 @@ def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
             print(f"url {url} not support")
     except Exception as e:
         print(f"downloadDir fail: {e}")
-    return None
+    return None

{ryry_cli-6.19 → ryry_cli-6.22}/ryry/utils.py

@@ -385,8 +385,8 @@ def begin_restart(reason, update_cli=False, simple="https://pypi.python.org/simp
     
 K1 = "TFRBSTV0UkR3NXhocHc1eDlVdkZaUWsy"
 K2 = "TFVuYlRuZFRQMHpxYmU3TjVJSGw0YlVvdlJNQkR6"
-RK11 = "NjM2OTJhNjIyYTc3MWZlY2ZmMDkxYmM5OGUxMzBjNGE="
-RK22 = "MGUxM2E2MGQ0YjBiMDk3Yzc0NzIwOWNiZjdhM2I3ZjgxZWM3ODk1NTQzOGJmMjc1ZWJiY2QwMzM5ZjY0YmFjNw=="
+RK11 = "ZWM2Njg2ZmUxNzA3Zjk5NTA4M2VjMTNmMTk3ODhiMTE=="
+RK22 = "OGNjZTc2OTUzOGIzMGJlODljNWM5ZDVlYzcwYzAxNGMyYTk0N2VkMTIzM2RjNWMzYzA4YTI2OGJmYzk5OWFjMQ=="
 RK23 = "aHR0cHM6Ly8xMTg2NDlkOGY5ZDA0MGFhN2M1NWU4ZGE5NWRlYWE0OS5yMi5jbG91ZGZsYXJlc3RvcmFnZS5jb20="
 def _decode_key(encoded_key):
     import base64
@@ -398,7 +398,6 @@ def _decode_key(encoded_key):
         # 如果UTF-8解码失败，直接返回字节数据的十六进制表示
         decoded_bytes = base64.b64decode(encoded_key.encode('utf-8'))
         return decoded_bytes.hex()
-
 def _encode_key(raw_input):
     import base64
     if isinstance(raw_input, bytes):
@@ -417,7 +416,6 @@ def _encode_key(raw_input):
     else:
         raise TypeError("Input must be str or bytes")
     return encoded.decode('utf-8')
-
 def check_restart():
     restart_file = os.path.join(constant.base_path, "restart")
     if os.path.exists(restart_file) == False:

{ryry_cli-6.19 → ryry_cli-6.22/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 6.19
+Version: 6.22
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -23,6 +23,7 @@ Requires-Dist: gputil
 Requires-Dist: urlparser
 Requires-Dist: urllib3
 Requires-Dist: portalocker
+Requires-Dist: boto3
 Requires-Dist: PyYAML
 
 ryry Python Tool

{ryry_cli-6.19 → ryry_cli-6.22}/ryry_cli.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 LICENSE
+MANIFEST.in
 README.md
 setup.py
 ryry/__init__.py
@@ -18,6 +19,8 @@ ryry/task.py
 ryry/taskUtils.py
 ryry/upload.py
 ryry/utils.py
+ryry/assets/fonts/OFL.txt
+ryry/assets/fonts/ryry-report-cjk-bold.otf
 ryry/script_template/__init__.py
 ryry/script_template/daemon.py
 ryry/script_template/main.py

{ryry_cli-6.19 → ryry_cli-6.22}/ryry_cli.egg-info/requires.txt

@@ -10,4 +10,5 @@ gputil
 urlparser
 urllib3
 portalocker
+boto3
 PyYAML

{ryry_cli-6.19 → ryry_cli-6.22}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "6.19"
+ryry_version = "6.22"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:
@@ -51,6 +51,12 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     url="https://github.com/dalipenMedia",
     packages=setuptools.find_packages(),
+    package_data={
+        'ryry': [
+            'assets/fonts/OFL.txt',
+            'assets/fonts/ryry-report-cjk-bold.otf',
+        ],
+    },
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
@@ -70,6 +76,7 @@ setuptools.setup(
         'urlparser',
         'urllib3',
         'portalocker',
+        'boto3',
         'PyYAML'
     ],
     extras_require={
@@ -84,4 +91,4 @@ setuptools.setup(
     #     'ryry/upload.py'
     # ],
     python_requires='>=3.9',
-)
+)