reykit 1.1.53__py3-none-any.whl → 1.1.55__py3-none-any.whl

reykit/rbase.py

@@ -359,7 +359,7 @@ def catch_exc(
         - `TracebackType`: Exception traceback instance.
     """
 
-    # Get parameter.
+    # Handle parameter.
     exc_report = format_exc()
     exc_report = exc_report.strip()
     exc_type, exc_instance, exc_traceback = sys_exc_info()

reykit/rdata.py

@@ -53,7 +53,7 @@ def to_json(
     JSON format string.
     """
 
-    # Get parameter.
+    # Handle parameter.
     if compact:
         indent = None
         separators = (',', ':')
@@ -364,8 +364,7 @@ def default_dict(default: T = null, data: dict[KT, VT] | None = None) -> Default
     else:
         default_factory = lambda: default
 
-    if data is None:
-        data = {}
+    data = data or {}
 
     # Instance.
     dict_set = Defaultdict(default_factory, data)

reykit/rdll/__init__.py

@@ -35,7 +35,7 @@ def inject_dll(
     from ctypes import create_string_buffer
     from .rdll_core import InjectDLL
 
-    # Get parameter.
+    # Handle parameter.
     path_bytes = path.encode()
     buffer = create_string_buffer(path_bytes)
 

reykit/remail.py

@@ -16,7 +16,7 @@ from email.mime.application import MIMEApplication
 
 from .rbase import Base, throw
 from .rdata import unique
-from .ros import FileBytes, read_file_bytes
+from .ros import FileSourceBytes, read_file_bytes
 
 
 __all__ = (
@@ -44,7 +44,7 @@ class Email(Base):
         password : Email password.
         """
 
-        # Get parameter.
+        # Handle parameter.
         host, port = self.get_server_address(username)
 
         # Set attribute.
@@ -170,7 +170,7 @@ class Email(Base):
         to: str | list[str],
         title: str | None = None,
         text: str | None = None,
-        attachment: dict[str, FileBytes] = {},
+        attachment: dict[str, FileSourceBytes] = {},
         cc: str | list[str] | None = None,
         show_from: str | None = None,
         show_to: str | list[str] | None = None,

reykit/rimage.py

@@ -234,7 +234,7 @@ def generate_captcha_image(
     Captcha image bytes data.
     """
 
-    # Get parameter.
+    # Handle parameter.
     text = text or 5
     if type(text) == int:
         text = randchar(text, False)

reykit/rlog.py

@@ -115,7 +115,7 @@ class Log(Base):
         Stack parameters.
         """
 
-        # Get parameter.
+        # Handle parameter.
         stack_params = get_stack_param('full', 12)
         stack_param = stack_params[-1]
 
@@ -420,7 +420,7 @@ class Log(Base):
         Handler.
         """
 
-        # Get parameter.
+        # Handle parameter.
         format_ = get_first_notnone(format_, self.default_format)
         filter_ = filter_ or self.get_default_filter_method(format_, 'print')
 
@@ -499,7 +499,7 @@ class Log(Base):
         Handler.
         """
 
-        # Get parameter.
+        # Handle parameter.
         format_ = get_first_notnone(format_, self.default_format)
         path = path or self.name
         filter_ = filter_ or self.get_default_filter_method(format_, 'file')
@@ -767,7 +767,7 @@ class Log(Base):
         params : Record Format parameters.
         """
 
-        # Get parameter.
+        # Handle parameter.
         if (
             level is None
             or catch

reykit/rmonkey.py

@@ -95,8 +95,7 @@ def monkey_sqlalchemy_result_more_fetch():
         """
 
         # Handle parameter.
-        if limit is None:
-            limit = 0
+        limit = limit or 0
 
         # Convert.
         df: DataFrame = self.to_df()

reykit/rnet.py

@@ -388,8 +388,7 @@ def request(
     if response.encoding == 'ISO-8859-1':
         pattern = r'<meta [^>]*charset=([\w-]+)[^>]*>'
         charset = search(pattern, response.text)
-        if charset is None:
-            charset = 'utf-8'
+        charset = charset or 'utf-8'
         response.encoding = charset
 
     # Check code.
@@ -436,8 +435,7 @@ def download(url: str, path: str | None = None) -> str:
             file_type_obj = get_content_type(content)
             if file_type_obj is not None:
                 file_name = 'download.' + file_type_obj.EXTENSION
-        if file_name is None:
-            file_name = 'download'
+        file_name = file_name or 'download'
         path = os_abspath(file_name)
 
     # Save.
@@ -467,7 +465,7 @@ def compute_stream_time(
     File send seconds.
     """
 
-    # Get parameter.
+    # Handle parameter.
     match source:
         case str():
             file = File(source)

reykit/ros.py

@@ -188,7 +188,7 @@ def find_relpath(abspath: str, relpath: str) -> str:
     C:/Folder1/Folder4/File.txt
     """
 
-    # Get parameter.
+    # Handle parameter.
     level = 0
     for char in relpath:
         if char == '.':
@@ -370,7 +370,7 @@ class File(Base):
         IO object.
         """
 
-        # Get parameter.
+        # Handle parameter.
         if (
             (
                 'r' in mode
@@ -535,7 +535,7 @@ class File(Base):
         New file path.
         """
 
-        # Get parameter.
+        # Handle parameter.
         move_path = join_path(self.dir, name)
 
         # Move.
@@ -549,7 +549,7 @@ class File(Base):
         Remove file.
         """
 
-        # Copy.
+        # Remove.
         try:
             os_remove(self.path)
 
@@ -843,7 +843,7 @@ class File(Base):
         Judge result.
         """
 
-        # Get parameter.
+        # Handle parameter.
         match value:
             case str():
                 content = self.str
@@ -1092,7 +1092,7 @@ class Folder(Base):
         New folder path.
         """
 
-        # Get parameter.
+        # Handle parameter.
         move_path = join_path(self.dir, name)
 
         # Move.
@@ -1295,7 +1295,7 @@ class TempFile(Base):
         type\\_ : File data type.
         """
 
-        # Get parameter.
+        # Handle parameter.
         match type_:
             case 'bytes':
                 mode = 'w+b'
@@ -1549,7 +1549,7 @@ class TempFile(Base):
         Judge result.
         """
 
-        # Get parameter.
+        # Handle parameter.
         content = self.read()
 
         # Judge.
@@ -2000,8 +2000,7 @@ class FileCache(Base):
         """
 
         # Handle parameter.
-        if name is None:
-            name = md5
+        name = name or md5
 
         # Not exist md5.
         md5_relpath = f'{md5[0]}/{md5[1]}/{md5}'
@@ -2026,7 +2025,7 @@ class FileCache(Base):
             return file_path
 
 
-    def store(self, source: FileSourceBytes, name: str | None = None) -> str:
+    def store(self, source: FileSourceBytes, name: str | None = None, delete: bool = False) -> str:
         """
         Store file to cache directory.
 
@@ -2035,6 +2034,7 @@ class FileCache(Base):
         source : Source file path or file data.
         name : File name.
             - `None`: Use md5 value.
+        delete : When source is file path, whether delete original file.
 
         Returns
         -------
@@ -2044,12 +2044,18 @@ class FileCache(Base):
         # Handle parameter.
         file_bytes = read_file_bytes(source)
         file_md5 = get_md5(file_bytes)
-        if name is None:
-            name = file_md5
+        name = name or file_md5
+        delete = delete and type(source) == str
 
         # Exist.
         path = self.index(file_md5, name)
         if path is not None:
+
+            ## Delete.
+            if delete:
+                file = File(source)
+                file.remove()
+
             return path
 
         # Store.
@@ -2057,11 +2063,19 @@ class FileCache(Base):
         md5_path = self.folder + md5_relpath
         folder = Folder(md5_path)
         folder.make()
-        file_path = folder + name
-        file = File(file_path)
-        file(file_bytes)
+        path = folder + name
+
+        ## Delete.
+        if delete:
+            file = File(source)
+            file.move(path)
 
-        return file.path
+        ## Make.
+        else:
+            file = File(path)
+            file(file_bytes)
+
+        return path
 
 
 def doc_to_docx(path: str, save_path: str | None = None) -> str:

reykit/rrand.py

@@ -339,7 +339,7 @@ def randchar(
     Random characters.
     """
 
-    # Get parameter.
+    # Handle parameter.
     char_range = string_digits + string_ascii_letters
     if punctuation:
         char_range += string_punctuation

reykit/rre.py

@@ -116,10 +116,8 @@ def sub(
     """
 
     # Handle parameter.
-    if replace is None:
-        replace = ''
-    if count is None:
-        count = 0
+    replace = replace or ''
+    count = count or 0
 
     # Replace.
     result = re_sub(pattern, replace, text, count, RS)
@@ -147,8 +145,7 @@ def split(
     """
 
     # Handle parameter.
-    if count is None:
-        count = 0
+    count = count or 0
 
     # Replace.
     result = re_split(pattern, text, count, RS)

reykit/rschedule.py

@@ -179,8 +179,6 @@ class Schedule(Base):
         """
 
         # Arguments.
-            
-        ## Get parameter.
         params_arg = {}
         if args is not None:
             params_arg['args'] = args
@@ -218,7 +216,7 @@ class Schedule(Base):
         task : Task instance or ID.
         """
 
-        # Get parameter.
+        # Handle parameter.
         if type(task) == Job:
             id_ = task.id
         else:
@@ -240,7 +238,7 @@ class Schedule(Base):
         task : Task instance or ID.
         """
 
-        # Get parameter.
+        # Handle parameter.
         if type(task) == Job:
             id_ = task.id
         else:
@@ -262,7 +260,7 @@ class Schedule(Base):
         task : Task instance or ID.
         """
 
-        # Get parameter.
+        # Handle parameter.
         if type(task) == Job:
             id_ = task.id
         else:

reykit/rstdout.py

@@ -320,7 +320,7 @@ def add_print_position() -> None:
         Preprocessed text.
         """
 
-        # Get parameter.
+        # Handle parameter.
         stack_params = get_stack_param('full', 3)
         stack_floor = stack_params[-1]
 

reykit/rsys.py

@@ -256,7 +256,7 @@ def get_cmd_var(*vars: Any) -> list[Any]:
     10 [20, 21] 3
     """
 
-    # Get parameter.
+    # Handle parameter.
     vars_name: list[str] = get_varname('vars')
     vars_info = tuple(zip(vars_name, vars))
 
@@ -610,7 +610,7 @@ def kill_process(
     List of process instances that match any condition.
     """
 
-    # Get parameter.
+    # Handle parameter.
     self_pid = os_getpid()
 
     # Search.
@@ -648,7 +648,7 @@ def pause_process(
     List of process instances that match any condition.
     """
 
-    # Get parameter.
+    # Handle parameter.
     self_pid = os_getpid()
 
     # Search.
@@ -710,7 +710,7 @@ def get_idle_port(min: int = 49152) -> int:
     Idle port number.
     """
 
-    # Get parameter.
+    # Handle parameter.
     network_table = get_network_table()
     ports = [
         info['local_port']

reykit/rtable.py

@@ -189,7 +189,7 @@ class Table(Base):
         Dictionary.
         """
 
-        # Get parameter.
+        # Handle parameter.
         data = self.to_table()
 
         # Check.
@@ -241,7 +241,7 @@ class Table(Base):
         List.
         """
 
-        # Get parameter.
+        # Handle parameter.
         data = self.to_table()
 
         # Check.
@@ -276,7 +276,7 @@ class Table(Base):
         Formatted text.
         """
 
-        # Get parameter.
+        # Handle parameter.
         data = self.to_table()
 
         # Convert.
@@ -298,7 +298,7 @@ class Table(Base):
         JSON string.
         """
 
-        # Get parameter.
+        # Handle parameter.
         data = self.to_table()
 
         # Convert.
@@ -316,7 +316,7 @@ class Table(Base):
         SQL string.
         """
 
-        # Get parameter.
+        # Handle parameter.
         data = self.to_table()
         data = [
             {
@@ -364,7 +364,7 @@ class Table(Base):
         if type(self.data) == DataFrame:
             return self.data
 
-        # Get parameter.
+        # Handle parameter.
         data = self.to_table()
 
         # Convert.
@@ -382,7 +382,7 @@ class Table(Base):
         HTML string.
         """
 
-        # Get parameter.
+        # Handle parameter.
         data = self.to_df()
 
         # Convert.
@@ -405,7 +405,7 @@ class Table(Base):
         File absolute path.
         """
 
-        # Get parameter.
+        # Handle parameter.
         data = self.to_df()
         file = File(path)
         if file:
@@ -457,7 +457,7 @@ class Table(Base):
         >>> to_excel(data, 'file.xlsx', 'group', sheets_set)
         """
 
-        # Get parameter.
+        # Handle parameter.
         data = self.to_df()
         path = os_abspath(path)
 

reykit/rtime.py

@@ -233,7 +233,7 @@ def text_to_time(
     Object or null.
     """
 
-    # Get parameter.
+    # Handle parameter.
     time_obj = None
     str_len = len(string)
 
@@ -575,7 +575,7 @@ class TimeMark(Base):
         # Import.
         from pandas import DataFrame
 
-        # Get parameter.
+        # Handle parameter.
         record_len = len(self.record)
         data = [
             info.copy()
@@ -643,7 +643,7 @@ class TimeMark(Base):
         if len(self.record) <= 1:
             return 0.0
 
-        # Get parameter.
+        # Handle parameter.
         first_timestamp = self.record[0]['timestamp']
         max_index = max(self.record)
         last_timestamp = self.record[max_index]['timestamp']

reykit/rwrap.py

@@ -412,7 +412,7 @@ def wrap_dos_command(
     Function return.
     """
 
-    # Get parameter.
+    # Handle parameter.
     arg_info = get_arg_info(func)
 
     # Set DOS command.
@@ -607,7 +607,7 @@ def wrap_redirect_stdout(
     Function return.
     """
 
-    # Get parameter.
+    # Handle parameter.
     if isinstance(redirect, IOBase):
         str_io = redirect
     else:

reykit/rzip.py

@@ -40,7 +40,7 @@ def compress(
     overwrite : Whether to overwrite.
     """
 
-    # Get parameter.
+    # Handle parameter.
     build_dir = Folder(build_dir).path
     if overwrite:
         mode = 'w'

{reykit-1.1.53.dist-info → reykit-1.1.55.dist-info}/METADATA

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

reykit-1.1.55.dist-info/RECORD

@@ -0,0 +1,28 @@
+reykit/__init__.py,sha256=V86CHqPAAVkooVx3_QIOKpDIFVneQCTTSwfJ-uWgBno,788
+reykit/rall.py,sha256=7Hip02YOkIDm3_xkoSDjvvYV2LhdBV2r4UKzWWnIfIo,628
+reykit/rbase.py,sha256=GDgB-FodYXCW91sT0KF4HFj1p7m46-JEUKWYlrCztZE,22124
+reykit/rdata.py,sha256=NmOY_h4w2PY5xBbYNmOnb55w7PGsvvCzOBnxPjQ08qw,10293
+reykit/remail.py,sha256=l4HGKXdfHNBxyBT3YxeZyQhfecbElqTqSAGInwWhap8,6723
+reykit/rimage.py,sha256=lNN2iMpvSMqh-nPTpxrA9yHy43EA5WoYdxKYhqPwMgk,6154
+reykit/rlog.py,sha256=oXv0wGjR94seAUXz8kIhq53qSFaYPckJTjoXhd3e_c8,25599
+reykit/rmonkey.py,sha256=Dj2GBzBDFXbo0Z-5f8Zep4dfbaIw1bo1FUmC31xvDuk,7929
+reykit/rnet.py,sha256=6uULgoPk8DTKWg9yNQco7gdw4A59F9ygcZR6rgO4eoY,16897
+reykit/rnum.py,sha256=PhG4V_BkVfCJUsbpMDN1umGZly1Hsus80TW8bpyBtyY,3653
+reykit/ros.py,sha256=J7Jo8rucGhk8UWjxPzm-OLipVPaTLjFjws9athg8H1A,47010
+reykit/rrand.py,sha256=bYYmuKNqn4un1i-SdA9jb9l1iYaeLfS-tWJRzD3gLDs,8941
+reykit/rre.py,sha256=1qva7xatKVE9qC2j7IujjXSM59qxHWwTYpiizFFQ8Xo,6024
+reykit/rschedule.py,sha256=E2gRLrCwrAo2CV1sOHrWoaVP99Wq7QjAqeYv04hWsYo,5767
+reykit/rstdout.py,sha256=yesWo7wIGablpyAu-2J2Gw11Qp3GdQjGICTyIcvLyt4,8200
+reykit/rsys.py,sha256=cafnGGerxR0kg5GHNJojmvsMDNsjgsJ3CtIGH5mAJa8,24953
+reykit/rtable.py,sha256=YuDH2GL9Lwr5LljRDm5hzHrsvaXOs4-X89XVwFD-b0g,12221
+reykit/rtask.py,sha256=d3Fs-_ZB-uHtzz7zyI2aAmiQv3NcIvWrco6x10jFuzc,22842
+reykit/rtext.py,sha256=gkmA849MBHjchvY4apUTQpkFs13vcmyK_hIwucH2A84,12849
+reykit/rtime.py,sha256=Y3XX6zeiTxFdj5yMsVOK7mWT2TTfQOdZc6q4rkIN-fY,16983
+reykit/rwrap.py,sha256=HZ3hTmwvwA33H4G-laF_5p1GsBKZrkeeVCQccKuqPcw,15323
+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.55.dist-info/METADATA,sha256=kBtQZNVEE5abv3D3uL0gjyYmSjCi7yW8r1SmrI1Exzw,1872
+reykit-1.1.55.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.55.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.55.dist-info/RECORD,,

reykit-1.1.53.dist-info/RECORD

@@ -1,28 +0,0 @@
-reykit/__init__.py,sha256=V86CHqPAAVkooVx3_QIOKpDIFVneQCTTSwfJ-uWgBno,788
-reykit/rall.py,sha256=7Hip02YOkIDm3_xkoSDjvvYV2LhdBV2r4UKzWWnIfIo,628
-reykit/rbase.py,sha256=KPSMPMenmzsA50Q84r0DOXv4Ei-hbp06HXnCB46dsP4,22121
-reykit/rdata.py,sha256=DqxoWkbN3WqGZ5FC9VRlhXAwpTGebv1M5VSeOeR2YnQ,10308
-reykit/remail.py,sha256=9r4UEBhd43MzHPtGVQe3QyxLjGO7BINt9WtHvWhSLTs,6708
-reykit/rimage.py,sha256=Dj2ZK0Qprmu0WGLjaMnJgjbT39o1YxqyD8e9pAe3kl0,6151
-reykit/rlog.py,sha256=jgnI8jFSGw0WcD8SSVmUCkomLXY8uoXdwJMUyB2ED4U,25587
-reykit/rmonkey.py,sha256=9-NvBM4phThKTHpqTSPlPGfJWcoDSp4EVl8x3xHJacg,7951
-reykit/rnet.py,sha256=15yrZTMET4cdimbslMk9O8HO9ofMtvfo1dZgLd4Bafw,16938
-reykit/rnum.py,sha256=PhG4V_BkVfCJUsbpMDN1umGZly1Hsus80TW8bpyBtyY,3653
-reykit/ros.py,sha256=Suy_PeGnOISCOgrOC2SiqdIUXMmeRUtqmajrqepsLLw,46634
-reykit/rrand.py,sha256=imysGSoQH4O0yq45EILYYdow_280LDqYioE4Sm-L4_U,8938
-reykit/rre.py,sha256=4DVxy28dl5zn6_II8-cgr7E2nVPH5QJIJVB4o7Vsf1A,6078
-reykit/rschedule.py,sha256=_nrfrXYxlFAKCDbM8ibTTb60zNDlHxyE310cv-A19Kw,5799
-reykit/rstdout.py,sha256=Vgqm66rtjIaYWO-EFEm9PGzgXDzZXZGq-BS1Lg6zD40,8197
-reykit/rsys.py,sha256=28B-QO0DiKjiNv-kbGh3z-BN4YOrhWVYML3b3cGrPHo,24941
-reykit/rtable.py,sha256=RZ4CTyVsPe-38iv_NHsEU_bV8h-ba9wvGXigUxXHxKQ,12194
-reykit/rtask.py,sha256=d3Fs-_ZB-uHtzz7zyI2aAmiQv3NcIvWrco6x10jFuzc,22842
-reykit/rtext.py,sha256=gkmA849MBHjchvY4apUTQpkFs13vcmyK_hIwucH2A84,12849
-reykit/rtime.py,sha256=xBpXItHRSmftec1ZzqVRTkMNb6gmFx0A8TaUd5nmiy8,16974
-reykit/rwrap.py,sha256=x4CzSndSdSv_e8lLbLifvC_v2ogWHD42-tDhwsq_DzQ,15317
-reykit/rzip.py,sha256=cG1PbY5dlMRNEIBzOytxF2crjr1yWLMmswR_klh_4Ek,3453
-reykit/rdll/__init__.py,sha256=WrJ_8jp_hbn2nl1osrR3buZMsmAGRVY6HfQdhDoJpSM,698
-reykit/rdll/rdll_core.py,sha256=o6-rKcTQgxZQe0kD3GnwyNb3KL9IogzgCQNOmYLMm7A,5086
-reykit-1.1.53.dist-info/METADATA,sha256=EC5bu3puTjojHhELxHpPTfYgzGRp2LV4u8-C9KikFYg,1872
-reykit-1.1.53.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.53.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.53.dist-info/RECORD,,