reykit 1.1.69__py3-none-any.whl → 1.1.72__py3-none-any.whl

reykit/rnet.py

@@ -410,7 +410,7 @@ def download(url: str, path: str | None = None) -> str:
     ----------
     url : Download URL.
     path : Save path.
-        - `None`, File name is `download`: and automatic judge file type.
+        - `None`: File name is get from response, or is 'download' join automatic judge file type.
 
     Returns
     -------
@@ -421,20 +421,21 @@ def download(url: str, path: str | None = None) -> str:
     response = request(url)
     content = response.content
 
-    # Judge file type and path.
+    # File name.
     if path is None:
+        file_name = None
         Content_disposition = response.headers.get('Content-Disposition', '')
         if 'filename' in Content_disposition:
-            file_name = search(
+            file_name: str | None = search(
                 'filename=[\'"]?([^\\s\'"]+)',
                 Content_disposition
             )
-        else:
-            file_name = None
         if file_name is None:
             file_type_obj = filetype_guess(content)
-            file_name = 'download.' + file_type_obj.EXTENSION
-        file_name = file_name or 'download'
+            if file_type_obj is not None:
+                file_name = 'download.' + file_type_obj.EXTENSION
+            else:
+                file_name = 'download'
         path = os_abspath(file_name)
 
     # Save.

reykit/ros.py

@@ -22,6 +22,7 @@ from os import (
     remove as os_remove
 )
 from os.path import (
+    abspath as os_abspath,
     join as os_join,
     isfile as os_isfile,
     isdir as os_isdir,
@@ -38,13 +39,15 @@ from os.path import (
 )
 from shutil import copy as shutil_copy
 from pathlib import Path
-from json import JSONDecodeError
-from tomllib import loads as tomllib_loads
 from hashlib import md5 as hashlib_md5
+from tomllib import loads as tomllib_loads
+from json import JSONDecodeError
+from filetype import guess as filetype_guess
 from tempfile import TemporaryFile, TemporaryDirectory
 
 from .rbase import Base, throw
 from .rdata import to_json
+from .rnet import request
 from .rre import search, sub
 from .rsys import run_cmd
 
@@ -1980,10 +1983,10 @@ class FileCache(Base):
 
         Parameters
         ----------
-        md5 : File md5 value.
+        md5 : File MD5 value.
         name : File name.
-            - `None`: Use md5 value.
-        copy : Do you want to copy file when exist md5 value file and not exist file name.
+            - `None`: Use MD5 value.
+        copy : Do you want to copy file when exist MD5 value file and not exist file name.
 
         Returns
         -------
@@ -2024,7 +2027,7 @@ class FileCache(Base):
         ----------
         source : Source file path or file data.
         name : File name.
-            - `None`: Use md5 value.
+            - `None`: Use MD5 value.
         delete : When source is file path, whether delete original file.
 
         Returns
@@ -2069,6 +2072,47 @@ class FileCache(Base):
         return path
 
 
+    def download(self, url: str, name: str | None = None) -> str:
+        """
+        Download file from URL.
+
+        Parameters
+        ----------
+        url : Download URL.
+        name : File name.
+            - `None`: Get from response, or is MD5 value join automatic judge file type.
+
+        Returns
+        -------
+        File absolute path.
+        """
+
+        # Download.
+        response = request(url)
+        content = response.content
+
+        # File name.
+        if name is None:
+            Content_disposition = response.headers.get('Content-Disposition', '')
+            if 'filename' in Content_disposition:
+                name: str | None = search(
+                    'filename=[\'"]?([^\\s\'"]+)',
+                    Content_disposition
+                )
+            if name is None:
+                file_md5 = get_md5(content)
+                file_type_obj = filetype_guess(content)
+                if file_type_obj is not None:
+                    name = f'{file_md5}.{file_type_obj.EXTENSION}'
+                else:
+                    name = file_md5
+
+        # Store.
+        path = self.store(content, name)
+
+        return path
+
+
 def doc_to_docx(path: str, save_path: str | None = None) -> str:
     """
     Convert `DOC` file to `DOCX` file.

reykit/rschedule.py

@@ -89,8 +89,6 @@ class Schedule(Base):
             'base.stats_schedule': 'stats_schedule'
         }
 
-        self.notes: dict[str, str] = {}
-
 
     def pause(self) -> None:
         """
@@ -259,9 +257,6 @@ class Schedule(Base):
             **trigger_args
         )
 
-        # Note.
-        self.notes[job.id] = note
-
         return job
 
 

reykit/rtime.py

@@ -58,7 +58,7 @@ def now(format_: Literal['time']) -> Time: ...
 def now(format_: Literal['datetime_str', 'date_str', 'time_str']) -> str: ...
 
 @overload
-def now(format_: Literal['timestamp']) -> int: ...
+def now(format_: Literal['timestamp', 'timestamp_s']) -> int: ...
 
 def now(
     format_: Literal[
@@ -68,7 +68,8 @@ def now(
         'datetime_str',
         'date_str',
         'time_str',
-        'timestamp'
+        'timestamp',
+        'timestamp_s'
     ] = 'datetime'
 ) -> Datetime | Date | Time | str | int:
     """
@@ -84,6 +85,7 @@ def now(
         - `Literal['date_str']`: Return string in format `'%Y-%m-%d'`.
         - `Literal['time_str']`: Return string in foramt `'%H:%M:%S'`.
         - `Literal['timestamp']`: Return time stamp in milliseconds.
+        - `Literal['timestamp_s']`: Return time stamp in seconds.
 
     Returns
     -------
@@ -106,6 +108,8 @@ def now(
             return Datetime.now().strftime('%H:%M:%S')
         case 'timestamp':
             return int(time_time() * 1000)
+        case 'timestamp_s':
+            return int(time_time())
         case _:
             throw(ValueError, format_)
 

{reykit-1.1.69.dist-info → reykit-1.1.72.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reykit
-Version: 1.1.69
+Version: 1.1.72
 Summary: Kit method set.
 Project-URL: homepage, https://github.com/reyxbo/reykit/
 Author-email: Rey <reyxbo@163.com>

{reykit-1.1.69.dist-info → reykit-1.1.72.dist-info}/RECORD

@@ -6,23 +6,23 @@ reykit/remail.py,sha256=l4HGKXdfHNBxyBT3YxeZyQhfecbElqTqSAGInwWhap8,6723
 reykit/rimage.py,sha256=lNN2iMpvSMqh-nPTpxrA9yHy43EA5WoYdxKYhqPwMgk,6154
 reykit/rlog.py,sha256=TRAWaVG9KTgzeNjN-FXkcvBmvq1IhICgawllQEGoUdg,25745
 reykit/rmonkey.py,sha256=Dj2GBzBDFXbo0Z-5f8Zep4dfbaIw1bo1FUmC31xvDuk,7929
-reykit/rnet.py,sha256=AfMUcAW26zNauW6PeS3GYkLJcJu_82g1tkZGnc--Qto,16848
+reykit/rnet.py,sha256=rKCrIlQnU8yAEOIbnVz6NPKBOWb_RR2vFU1ibvNsxZo,16912
 reykit/rnum.py,sha256=PhG4V_BkVfCJUsbpMDN1umGZly1Hsus80TW8bpyBtyY,3653
-reykit/ros.py,sha256=Yi_mfYzVHwjjUZke0BNX7PKFLZpoT5NRyj5aDOSNQRU,46911
+reykit/ros.py,sha256=TMP5vZvVqskeLv1oGoed5SJSIHbNUraaAgBbrWK4vYE,48219
 reykit/rrand.py,sha256=4VwooITgox54_GonELcJfcIpStDi-UJchpnyWKnyeIA,8606
 reykit/rre.py,sha256=1qva7xatKVE9qC2j7IujjXSM59qxHWwTYpiizFFQ8Xo,6024
-reykit/rschedule.py,sha256=FC_8mfF9mj7EmmcDDgtVPEt9X1DST_iwNK15SctFSws,14901
+reykit/rschedule.py,sha256=HuQRSNF6yd397P9knIX9-z8Ii1tUXFUL_-zxTIkxir0,14804
 reykit/rstdout.py,sha256=yesWo7wIGablpyAu-2J2Gw11Qp3GdQjGICTyIcvLyt4,8200
 reykit/rsys.py,sha256=AP62KyN40flCeQJBclfJq8shachSAFT0LkVjiKsXkrw,24946
 reykit/rtable.py,sha256=UQ-JlwjssMR3gY1iY-VGQEKQ5_BZabpJy6TL7Fx19c4,12200
 reykit/rtask.py,sha256=NUTngUUDUZy3TqEHiuiKy17FcE0F1zS118KnKTsBjng,22838
 reykit/rtext.py,sha256=cWHy19lDcJvpX7LU95kmRVsDimpAUaz5TbKC1h83gB4,13254
-reykit/rtime.py,sha256=8QJ6YNiC0JUDiW1xc1tkzQUMPYOFT7d7dKCYRuYt9co,17635
+reykit/rtime.py,sha256=lsSKaYFmYXlDN18yj2fLVTKSruzgygl8icW6_Fl42Xk,17807
 reykit/rwrap.py,sha256=FEmeK_fboJ-OyXeJf8bilc7U2ph8xIbZGNHb6fLCy2c,15063
 reykit/rzip.py,sha256=BGEONswuBZxQ-zcgd_xp2fcvYesC9AmKaaXWvnT3bTI,3456
 reykit/rdll/__init__.py,sha256=nLSb8onBm2ilyoxzpDzUeGfSCKwkLEesIhzK3LiJ8mk,701
 reykit/rdll/rdll_core.py,sha256=o6-rKcTQgxZQe0kD3GnwyNb3KL9IogzgCQNOmYLMm7A,5086
-reykit-1.1.69.dist-info/METADATA,sha256=j_h9WMxqDklZbv-Ch2SGAm7qWqW-nlLfqD_SUVVlWf4,1872
-reykit-1.1.69.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.69.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.69.dist-info/RECORD,,
+reykit-1.1.72.dist-info/METADATA,sha256=nV_IYvPaBAOCJsP3qwHda5Panl8B0YlqxQIcNkxUNzU,1872
+reykit-1.1.72.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.72.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.72.dist-info/RECORD,,