reykit 1.1.74__py3-none-any.whl → 1.1.77__py3-none-any.whl

reykit/rnet.py

@@ -31,8 +31,8 @@ from filetype import guess as filetype_guess
 from datetime import datetime
 
 from .rbase import Base, throw, check_response_code
-from .ros import File
-from .rre import search
+from .ros import File, get_md5
+from .rre import search, split
 
 
 __all__ = (
@@ -42,6 +42,7 @@ __all__ = (
     'split_cookie',
     'get_content_type',
     'request',
+    'get_response_file_name',
     'download',
     'compute_stream_time',
     'listen_socket',
@@ -402,6 +403,52 @@ def request(
     return response
 
 
+def get_response_file_name(response: Response, default_name: str | None = None) -> str:
+    """
+    Get file name from response.
+
+    Parameters
+    ----------
+    response : `Response` instance.
+    default_name : Default file name.
+        - `None`: Use MD5 value join automatic judge file type.
+
+    Returns
+    -------
+    File name.
+    """
+
+    # Handle parameter.
+    content = response.content
+
+    # Get.
+    file_name = None
+    Content_disposition = response.headers.get('Content-Disposition', '')
+    if 'filename' in Content_disposition:
+        file_name: str | None = search(
+            'filename=[\'"]?([^\\s\'"]+)',
+            Content_disposition
+        )
+    if file_name is None:
+        pattern = r'[/\\]'
+        url_parts = split(pattern, response.request.url)
+        if (
+            len(url_parts) != 1
+            and '.' in url_parts[-1]
+        ):
+            file_name = url_parts[-1]
+    if file_name is None:
+        if default_name is None:
+            default_name = get_md5(content)
+            file_type_obj = filetype_guess(content)
+            if file_type_obj is not None:
+                default_name += f'.{file_type_obj.EXTENSION}'
+                file_name = f'{default_name}.' + file_type_obj.EXTENSION
+        file_name = default_name
+
+    return file_name
+
+
 def download(url: str, path: str | None = None) -> str:
     """
     Download file from URL.
@@ -410,7 +457,7 @@ def download(url: str, path: str | None = None) -> str:
     ----------
     url : Download URL.
     path : Save path.
-        - `None`: File name is get from response, or is 'download' join automatic judge file type.
+        - `None`: File name use MD5 value join automatic judge file type.
 
     Returns
     -------
@@ -419,28 +466,15 @@ def download(url: str, path: str | None = None) -> str:
 
     # Download.
     response = request(url)
-    content = response.content
 
     # File name.
     if path is None:
-        file_name = None
-        Content_disposition = response.headers.get('Content-Disposition', '')
-        if 'filename' in Content_disposition:
-            file_name: str | None = search(
-                'filename=[\'"]?([^\\s\'"]+)',
-                Content_disposition
-            )
-        if file_name is None:
-            file_type_obj = filetype_guess(content)
-            if file_type_obj is not None:
-                file_name = 'download.' + file_type_obj.EXTENSION
-            else:
-                file_name = 'download'
+        file_name = get_response_file_name(response)
         path = os_abspath(file_name)
 
     # Save.
     file = File(path)
-    file(content)
+    file(response.content)
 
     return path
 

reykit/ros.py

@@ -63,7 +63,7 @@ __all__ = (
     'Folder',
     'TempFile',
     'TempFolder',
-    'FileCache',
+    'FileStore',
     'doc_to_docx',
     'extract_docx_content',
     'extract_pdf_content',
@@ -1922,13 +1922,13 @@ class TempFolder(Base):
     __add__ = __radd__ = join
 
 
-class FileCache(Base):
+class FileStore(Base):
     """
-    File cache type.
+    File Store type.
     """
 
 
-    def __init__(self, path: str = 'cache') -> None:
+    def __init__(self, path: str = 'file') -> None:
         """
         Build instance attributes.
 
@@ -1949,29 +1949,29 @@ class FileCache(Base):
         Make cache directory and subdirectories.
         """
 
-        # Make.
+        # Handle parameter.
         chars = '0123456789abcdef'
-
-        ## Root.
+        subdir_names = [
+            char1 + char2
+            for char1 in chars
+            for char2 in chars
+        ]
         paths = [self.folder.path]
-
-        ## Second layer.
         paths.extend(
             [
-                self.folder + char
-                for char in chars
+                self.folder + name
+                for name in subdir_names
             ]
         )
-
-        ## Third layer.
         paths.extend(
             [
-                self.folder + f'{char}/{char_sub}'
-                for char in chars
-                for char_sub in chars
+                self.folder + f'{name1}/{name2}'
+                for name1 in subdir_names
+                for name2 in subdir_names
             ]
         )
 
+        # Make.
         make_dir(*paths)
 
 
@@ -1995,7 +1995,7 @@ class FileCache(Base):
         name = name or md5
 
         # Not exist md5.
-        md5_relpath = f'{md5[0]}/{md5[1]}/{md5}'
+        md5_relpath = f'{md5[:2]}/{md5[2:4]}/{md5}'
         if md5_relpath not in self.folder:
             return
 
@@ -2051,7 +2051,7 @@ class FileCache(Base):
             return path
 
         # Store.
-        md5_relpath = f'{file_md5[0]}/{file_md5[1]}/{file_md5}'
+        md5_relpath = f'{file_md5[:2]}/{file_md5[2:4]}/{file_md5}'
         md5_path = self.folder + md5_relpath
         folder = Folder(md5_path)
         folder.make()
@@ -2078,7 +2078,7 @@ class FileCache(Base):
         ----------
         url : Download URL.
         name : File name.
-            - `None`: Get from response, or is MD5 value join automatic judge file type.
+            - `None`: Use MD5 value join automatic judge file type.
 
         Returns
         -------
@@ -2086,30 +2086,17 @@ class FileCache(Base):
         """
 
         # Import.
-        from .rnet import request
+        from .rnet import request, get_response_file_name
 
         # 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
+            name = get_response_file_name(response)
 
         # Store.
-        path = self.store(content, name)
+        path = self.store(response.content, name)
 
         return path
 

{reykit-1.1.74.dist-info → reykit-1.1.77.dist-info}/METADATA

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

{reykit-1.1.74.dist-info → reykit-1.1.77.dist-info}/RECORD

@@ -6,9 +6,9 @@ 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=rKCrIlQnU8yAEOIbnVz6NPKBOWb_RR2vFU1ibvNsxZo,16912
+reykit/rnet.py,sha256=ql1L-QCoa_nZ2Vp8cpZrWl4AoxfZq9dhPdistiAdM64,17767
 reykit/rnum.py,sha256=PhG4V_BkVfCJUsbpMDN1umGZly1Hsus80TW8bpyBtyY,3653
-reykit/ros.py,sha256=ej3sQf5PZqUXWNIWFprV3TAiHffAQ51dSWf1DJUgzMw,48220
+reykit/ros.py,sha256=Gs_g8d-RVBfBWxj6V2bLHzhYc0CrLZ5Nj09djmCHOJw,47756
 reykit/rrand.py,sha256=4VwooITgox54_GonELcJfcIpStDi-UJchpnyWKnyeIA,8606
 reykit/rre.py,sha256=1qva7xatKVE9qC2j7IujjXSM59qxHWwTYpiizFFQ8Xo,6024
 reykit/rschedule.py,sha256=HuQRSNF6yd397P9knIX9-z8Ii1tUXFUL_-zxTIkxir0,14804
@@ -22,7 +22,7 @@ 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.74.dist-info/METADATA,sha256=W30yEYJwQcPHNh6AroLAQKtaNwh4Lmhr0V635rJQcuM,1872
-reykit-1.1.74.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.74.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.74.dist-info/RECORD,,
+reykit-1.1.77.dist-info/METADATA,sha256=Db5CuuhZqvh1VfqsCJjyi0cx1P0cQAc0byTkAUTT0FI,1872
+reykit-1.1.77.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.77.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.77.dist-info/RECORD,,