ezKit 1.7.6__py3-none-any.whl → 1.7.7__py3-none-any.whl

ezKit/token.py

@@ -1,44 +1,78 @@
+"""Token"""
 import json
+from typing import Any
+
+from loguru import logger
 
 from .cipher import AESCipher
 from .utils import datetime_now, datetime_offset, datetime_string_to_datetime, datetime_to_string, v_true
 
 
-def generate_token(key: str = 'Fc0zXCmGKd7tPu6W', timeout: int = 3600, data: any = None) -> None | str:
+def generate_token(key: str = 'Fc0zXCmGKd7tPu6W', timeout: int = 3600, data: Any = None) -> (str | None):
     try:
+        now = datetime_now()
+
+        if now is None:
+            return None
+
+        offset = datetime_offset(now, seconds=+timeout)
+
+        if offset is None:
+            return None
+
         source = json.dumps(
             obj={
-                'datetime': datetime_to_string(datetime_offset(datetime_now(), seconds=+timeout)),
-                'data': data
+                "datetime": datetime_to_string(offset),
+                "data": data
             },
             default=str
         )
+
         cipher = AESCipher(key=key, algorithm='sha256')
+
         return cipher.encrypt(source)
-    except:
+
+    except Exception as e:
+        logger.exception(e)
         return None
 
 
-def parsing_token(token_string: str, key: str = 'Fc0zXCmGKd7tPu6W') -> None | dict:
+def parsing_token(token_string: str, key: str = 'Fc0zXCmGKd7tPu6W') -> (dict | None):
     try:
-        if v_true(token_string, str):
-            cipher = AESCipher(key=key, algorithm='sha256')
-            source: dict = json.loads(cipher.decrypt(token_string))
-            source['datetime'] = datetime_string_to_datetime(source['datetime'])
-            return source
-        else:
+        if v_true(token_string, str) is False:
+            return None
+
+        cipher = AESCipher(key=key, algorithm='sha256')
+
+        target = cipher.decrypt(token_string)
+
+        if target is None:
             return None
-    except:
+
+        source: dict = json.loads(target)
+
+        source['datetime'] = datetime_string_to_datetime(source['datetime'])
+
+        return source
+
+    except Exception as e:
+        logger.exception(e)
         return None
 
 
 def certify_token(token_string: str, key: str = 'Fc0zXCmGKd7tPu6W') -> bool:
     try:
+
         result = parsing_token(token_string, key)
-        if not v_true(result, dict):
+
+        if result is None:
             return False
-        if result.get('datetime') < datetime_now():
+
+        if result.get('datetime') < datetime_now():  # type: ignore
             return False
+
         return True
-    except:
+
+    except Exception as e:
+        logger.exception(e)
         return False

ezKit/utils.py

@@ -984,7 +984,9 @@ def datetime_now(
     """获取当前日期和时间"""
     _utc = kwargs.pop("utc", False)
     try:
-        return datetime.datetime.utcnow() if _utc is True else datetime.datetime.now(**kwargs)
+        if _utc is True:
+            return datetime.datetime.now(datetime.timezone.utc)
+        return datetime.datetime.now(**kwargs)
     except Exception as e:
         if v_true(debug, bool):
             logger.exception(e)
@@ -992,7 +994,7 @@ def datetime_now(
 
 
 def datetime_offset(
-    datetime_instance: datetime.datetime,
+    datetime_instance: datetime.datetime | None = None,
     debug: bool = False,
     **kwargs
 ) -> datetime.datetime | None:
@@ -1005,7 +1007,12 @@ def datetime_offset(
     try:
         if isinstance(datetime_instance, datetime.datetime):
             return datetime_instance + datetime.timedelta(**kwargs)
-        return datetime.datetime.utcnow() + datetime.timedelta(**kwargs) if _utc is True else datetime.datetime.now() + datetime.timedelta(**kwargs)
+
+        if _utc is True:
+            return datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(**kwargs)
+
+        return datetime.datetime.now() + datetime.timedelta(**kwargs)
+
     except Exception as e:
         if v_true(debug, bool):
             logger.exception(e)

ezKit/xftp.py

@@ -1,15 +1,18 @@
-'''
-ftplib: https://docs.python.org/3.10/library/ftplib.html
-'''
+"""
+ftplib: https://docs.python.org/3.11/library/ftplib.html
+"""
 import os
 from ftplib import FTP
 from pathlib import Path
 
+from loguru import logger
+
 
 class XFTP:
+    """XFTP"""
 
-    def __init__(self, host='127.0.0.1', port=21, username='anonymous', password='', encoding='UTF-8', debuglevel=0):
-        ''' Initiation '''
+    def __init__(self, host="127.0.0.1", port=21, username="anonymous", password="", encoding="UTF-8", debuglevel=0):
+        """Initiation"""
         self.ftp = FTP()
         self.ftp.set_debuglevel(debuglevel)
         self.host = host
@@ -19,118 +22,141 @@ class XFTP:
         self.encoding = encoding
         self.retry = 1
 
-    def connect(self):
-        ''' FTP connect '''
+    def connect(self) -> bool:
+        """FTP connect"""
         try:
             self.ftp.connect(host=self.host, port=self.port, timeout=10)
             self.ftp.encoding = self.encoding
             self.ftp.login(user=self.username, passwd=self.password)
-            print('FTP connect success')
-            print('-' * 80)
+            logger.success("FTP connect success")
+            logger.info("-" * 80)
             return True
         except Exception as e:
-            print(f'FTP connect error: {e}, retry...')
-            if self.retry >= 3:
-                print('FTP connect faild')
-                return False
-            self.retry += 1
-            self.connect()
-
-    def close(self, info=None):
-        ''' FTP close '''
-        print(info) if info else None
+            # print(f"FTP connect error: {e}, retry...")
+            # if self.retry >= 3:
+            #     print("FTP connect faild")
+            #     return False
+            # self.retry += 1
+            # self.connect()
+            logger.exception(e)
+            return False
+
+    def close(self, info=None) -> bool:
+        """FTP close"""
+        if info is not None:
+            logger.info(info)
         try:
             self.ftp.quit()
-        except:
+        except Exception as e:
+            logger.exception(e)
             self.ftp.close()
-        print('-' * 80)
-        print('FTP connect closed')
+        logger.info("-" * 80)
+        logger.success("FTP connect closed")
+        return True
 
-    def get_file_list(self, dir='/'):
-        ''' Get file list '''
-        self.chdir_to_remote(dir)
-        return self.ftp.nlst()
+    def get_file_list(self, target='/') -> (list[str] | None):
+        """Get file list"""
+        try:
+            self.chdir_to_remote(target)
+            return self.ftp.nlst()
+        except Exception as e:
+            logger.exception(e)
+            return None
 
-    def get_file_size(self, dir='/', file=None):
-        ''' Get file size '''
-        self.chdir_to_remote(dir)
-        return self.ftp.size(file)
+    def get_file_size(self, file, target="/") -> (int | None):
+        """Get file size"""
+        try:
+            self.chdir_to_remote(target)
+            return self.ftp.size(file)
+        except Exception as e:
+            logger.exception(e)
+            return None
 
-    def mkdir(self, dir_string='/'):
-        ''' 创建目录 (从 / 目录依次递增创建子目录. 如果目录存在, 创建目录时会报错, 所以这里忽略所有错误.) '''
+    def mkdir(self, target="/") -> bool:
+        """创建目录 (从 / 目录依次递增创建子目录. 如果目录存在, 创建目录时会报错, 所以这里忽略所有错误.)"""
         try:
-            dir_list = dir_string.split("/")
+            dir_list = target.split("/")
             for i, _ in enumerate(dir_list):
-                dir = '/'.join(dir_list[:i + 1])
+                dir_path = "/".join(dir_list[:i + 1])
                 try:
-                    self.ftp.mkd(dir)
-                except:
-                    pass
+                    self.ftp.mkd(dir_path)
+                except Exception as e:
+                    logger.exception(e)
             return True
-        except:
+        except Exception as e:
+            logger.exception(e)
             return False
 
-    def chdir_to_remote(self, dir='/'):
-        ''' change to remote directory'''
+    def chdir_to_remote(self, target="/") -> bool:
+        """change to remote directory"""
         try:
-            self.ftp.cwd(dir)
-        except:
-            self.close(f'Remote directory error: {dir}')
+            self.ftp.cwd(target)
+            return True
+        except Exception as e:
+            self.close(f"remote directory error: {target}")
+            logger.exception(e)
+            return False
 
     def x_exit(self, info=None):
-        ''' Exit '''
-        print(info) if info else None
+        """Exit"""
+        if info is not None:
+            logger.info(info)
         # 注意: exit() 并不会退出脚本, 配合 try 使用
         exit()
 
-    def x_exec(self, local_dir='.', local_file='', remote_dir='/', remote_file='', upload=False):
-        ''' Download or Upload '''
+    def x_exec(self, local_dir=".", local_file="", remote_dir="/", remote_file="", upload=False):
+        """Download or Upload"""
 
         bufsize = 1024
-        local_path = local_dir + '/' + local_file
-        remote_path = remote_dir + '/' + remote_file
-        info = 'Upload' if upload else 'Download'
+        local_path = f"{local_dir}/{local_file}"
+        remote_path = f"{remote_dir}/{remote_file}"
+
+        info = 'Download'
+        if upload is True:
+            info = 'Upload'
 
         # 检查参数
-        if upload:
-            if local_file == '':
+        if upload is True:
+            if local_file == "":
                 self.close('Argument Miss: local file')
             # 如果没有设置 远程文件 名称, 则使用 本地文件 名称
-            if remote_file == '':
+            if remote_file == "":
                 remote_file = local_file
-                remote_path = remote_dir + '/' + remote_file
+                remote_path = f"{remote_dir}/{remote_file}"
         else:
-            if remote_file == '':
-                self.close('Argument Miss: remote file')
+            if remote_file == "":
+                self.close("Argument Miss: remote file")
             # 如果没有设置 本地文件 名称, 则使用 远程文件 名称
-            if local_file == '':
+            if local_file == "":
                 local_file = remote_file
-                local_path = local_dir + '/' + local_file
+                local_path = f"{local_dir}/{local_file}"
 
         # 进入本地目录
         try:
-            if upload:
+            if upload is True:
                 # 检查本地目录
                 stat = Path(local_dir)
-                self.close(f'Local directory error: {local_dir}') if stat.exists() == False else None
+                if stat.exists() is False:
+                    self.close(f"Local directory error: {local_dir}")
             else:
                 # 创建本地目录
                 Path(local_dir).mkdir(parents=True, exist_ok=True)
             # 进入本地目录
             os.chdir(local_dir)
-        except:
+        except Exception as e:
+            logger.exception(e)
             # 第一层 try 使用 self.x_exit() 无效, 直接使用 self.close()
-            self.close(f'Local directory error: {local_dir}')
+            self.close(f"Local directory error: {local_dir}")
 
         # 上传或下载
         try:
 
-            if upload:
+            if upload is True:
 
-                ''' 上传 '''
+                # 上传
 
                 # 创建远程目录
-                if remote_dir != '/':
+                if remote_dir != "/":
                     self.mkdir(remote_dir)
 
                 # 进入远程目录
@@ -139,52 +165,54 @@ class XFTP:
                 # 上传文件
                 stat = Path(local_file)
                 if stat.exists() and stat.is_file():
-                    with open(local_file, 'rb') as fid:
+                    with open(local_file, "rb") as fid:
                         self.ftp.storbinary(f'STOR {remote_file}', fid, bufsize)
-                    print('{} success: {} -> {}'.format(info, local_path.replace('//', '/'), remote_path.replace('//', '/')))
+                    logger.success(f"{info} success: {local_path.replace('//', '/')} -> {remote_path.replace('//', '/')}")
                     return True
-                else:
-                    self.x_exit('{} error: {} is not exist'.format(info, local_path.replace('//', '/')))
+
+                self.x_exit(f"{info} error: {local_path.replace('//', '/')} is not exist")
 
             else:
 
-                ''' 下载 '''
+                # 下载
 
                 # 进入远程目录
                 self.chdir_to_remote(remote_dir)
 
                 # 下载文件
                 if remote_file in self.ftp.nlst():
-                    with open(local_file, 'wb') as fid:
+                    with open(local_file, "wb") as fid:
                         self.ftp.retrbinary(f'RETR {remote_file}', fid.write, bufsize)
-                    print('{} success: {} -> {}'.format(info, remote_path.replace('//', '/'), local_path.replace('//', '/')))
+                    logger.success(f"{info} success: {remote_path.replace('//', '/')} -> {local_path.replace('//', '/')}")
                     return True
-                else:
-                    self.x_exit('{} error: {} is not exist'.format(info, remote_path.replace('//', '/')))
+
+                self.x_exit(f"{info} error: {remote_path.replace('//', '/')} is not exist")
 
         except Exception as e:
             # 第一层 try 使用 self.x_exit() 无效, 直接使用 self.close()
             # self.close('{} faild! Please check {} or {}'.format(info, local_path, remote_path))
-            self.close(f'{info} error: {e}')
+            self.close(f"{info} error: {e}")
             return False
 
-    def handle_all(self, local_dir='.', remote_dir='/', upload=False):
-        ''' Handle All '''
-        if upload:
+    def handle_all(self, local_dir=".", remote_dir="/", upload=False):
+        """Handle All"""
+        if upload is True:
             # 检查本地目录
             stat = Path(local_dir)
-            self.close(f'Local directory error: {local_dir}') if stat.exists() == False else None
+            if stat.exists() is False:
+                self.close(f"Local directory error: {local_dir}")
             # 获取文件列表
             local_files = [f for f in os.listdir(local_dir) if os.path.isfile(os.path.join(local_dir, f))]
             for i in local_files:
                 self.x_exec(local_dir=local_dir, remote_dir=remote_dir, local_file=i, upload=True)
         else:
             remote_files = self.get_file_list(remote_dir)
-            for i in remote_files:
-                self.x_exec(local_dir=local_dir, remote_dir=remote_dir, remote_file=i)
+            if remote_files is not None:
+                for i in remote_files:
+                    self.x_exec(local_dir=local_dir, remote_dir=remote_dir, remote_file=i)
 
-    def retrlines(self, remote_dir='/', cmd='LIST'):
-        ''' Retrlines '''
+    def retrlines(self, remote_dir="/", cmd="LIST"):
+        """Retrlines"""
         try:
             self.chdir_to_remote(remote_dir)
             print(self.ftp.retrlines(cmd))

{ezKit-1.7.6.dist-info → ezKit-1.7.7.dist-info}/METADATA

@@ -1,8 +1,9 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.7.6
+Version: 1.7.7
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com
 Requires-Python: >=3.11
 License-File: LICENSE
+Requires-Dist: loguru>=0.7.0

{ezKit-1.7.6.dist-info → ezKit-1.7.7.dist-info}/RECORD

@@ -11,12 +11,12 @@ ezKit/qywx.py,sha256=7eWrlTLrUj6U6cViEGbT6_LQxFGVqkhGAefBSS6T_-0,6531
 ezKit/redis.py,sha256=pY4SPlcgQ7S8IeY2xoDpxy-xCZxzZQrQJNAoWRsC1dI,1773
 ezKit/reports.py,sha256=dBBggggCCLuk5YD6SjdUPuxTr3wiJojP3lA7dQfg6Pk,8898
 ezKit/sendemail.py,sha256=AAdxBvEYN_AJVvBkSAvXzhXC5jkbRsD_8P51h2SdTRw,8413
-ezKit/token.py,sha256=4L6A26KsxvB4WfF8R7SYiBmihJK0PiN5Oh7dgDVJtxU,1382
-ezKit/utils.py,sha256=AardtafYiWHcWcH_50ad54H4eZzDrYcKFK6k3quzWzo,48750
-ezKit/xftp.py,sha256=qbCqFcGe22TDBSisj0Zoz78tnydDWoOfvywWpXdfaGw,6982
+ezKit/token.py,sha256=Q7z2ImQWs6NRxMtpsgNo9mhBeSs8nRCHCaWPf4031qg,1797
+ezKit/utils.py,sha256=UBAeybjLAB0tBLPD2M2QXfpI_smtkmPP4t7dX-Pcsu4,48849
+ezKit/xftp.py,sha256=BlxDctgJaCNeQNsVMwW6BcP3sL21SMVs-nPMjU_6rVg,7774
 ezKit/zabbix.py,sha256=soM5UEeYMfm7NczbPOVLirmHm3G20dECQ0aCBttZfhQ,28350
-ezKit-1.7.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.7.6.dist-info/METADATA,sha256=fD2dT-GgioMROGuNvIbncIiyYTXaSjW4i4viPK7zztw,163
-ezKit-1.7.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.7.6.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.7.6.dist-info/RECORD,,
+ezKit-1.7.7.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.7.7.dist-info/METADATA,sha256=7DiaRRyo1lystQf8VPWxpqkKHUK60DeKXgT2wmGSXbw,192
+ezKit-1.7.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.7.7.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.7.7.dist-info/RECORD,,