arpakitlib 1.8.80__py3-none-any.whl → 1.8.82__py3-none-any.whl

arpakitlib/ar_file_storage_in_dir_util.py

@@ -7,6 +7,7 @@ import uuid
 from typing import Optional, Union, Iterator
 
 from arpakitlib.ar_datetime_util import now_utc_dt
+from arpakitlib.ar_str_util import none_if_blank
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -57,11 +58,17 @@ class FileStorageInDir:
     ) -> str:
         self.init()
 
+        filename = none_if_blank(filename)
+
         if filename is not None:
+            if add_datetime_in_filename:
+                filename = f"{now_utc_dt().isoformat()}--{filename}"
             if file_extension is not None:
                 filename += f".{file_extension}"
         else:
             filename = str(uuid.uuid4())
+            if add_datetime_in_filename:
+                filename = f"{now_utc_dt().isoformat()}--{filename}"
             if file_extension is not None:
                 filename += f".{file_extension}"
             while filename in os.listdir(self.dirpath):
@@ -72,9 +79,6 @@ class FileStorageInDir:
         if raise_if_exists and filename in os.listdir(self.dirpath):
             raise ValueError(f"file ({filename}) already exists")
 
-        if add_datetime_in_filename:
-            filename = f"{filename}--{now_utc_dt().isoformat()}"
-
         filepath = os.path.join(self.dirpath, filename)
 
         if create is True:

{arpakitlib-1.8.80.dist-info → arpakitlib-1.8.82.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.80
+Version: 1.8.82
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.8.80.dist-info → arpakitlib-1.8.82.dist-info}/RECORD

@@ -345,7 +345,7 @@ arpakitlib/ar_dream_ai_api_client_util.py,sha256=Z1oii_XSsgunYx17SdcHl54S4KPQti7
 arpakitlib/ar_encrypt_decrypt_util.py,sha256=GhWnp7HHkbhwFVVCzO1H07m-5gryr4yjWsXjOaNQm1Y,520
 arpakitlib/ar_enumeration_util.py,sha256=XoFInWtGzbIr6fJq0un5nettaDfOLAyY84ovwj7n_7g,3030
 arpakitlib/ar_exception_util.py,sha256=3hZKsj34TZVdmd4JAQz7w515smWqB8o3gTwAEjuMdnI,408
-arpakitlib/ar_file_storage_in_dir_util.py,sha256=dnSMTr9AX28wo8q4zHOZl89Zm0AFK6dOP-YzN_7Hays,3881
+arpakitlib/ar_file_storage_in_dir_util.py,sha256=Zh922S6-aIy0p_Fen8GTTrGpixpPQ6c-wFLukiSK4Ck,4091
 arpakitlib/ar_file_util.py,sha256=GUdJYm1tUZnYpY-SIPRHAZBHGra8NKy1eYEI0D5AfhY,489
 arpakitlib/ar_func_util.py,sha256=lG0bx_DtxWN4skbUim0liRZ6WUyLVV8Qfk6iZNtCZOs,1042
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -374,8 +374,8 @@ arpakitlib/ar_ssh_runner_util.py,sha256=yvAwza480MkHKvLkDEsR7JNh2bYNs6P9rCVo4NA8
 arpakitlib/ar_str_util.py,sha256=CuIptQwHP0msTLNJbp-OFAdInVeTY4P58p7jFdeGm-4,5591
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
-arpakitlib-1.8.80.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.80.dist-info/METADATA,sha256=3UK0mFRMuGCCrIwOC928Y14_ezqvqSw5sJyh2cEsO6k,3559
-arpakitlib-1.8.80.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-arpakitlib-1.8.80.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.80.dist-info/RECORD,,
+arpakitlib-1.8.82.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.82.dist-info/METADATA,sha256=eCNmzgoxr-DCPPAHL9S0oaccKFbmqq7uM1L8cjt9hNw,3559
+arpakitlib-1.8.82.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+arpakitlib-1.8.82.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.82.dist-info/RECORD,,