ezKit 1.7.6__tar.gz → 1.7.7__tar.gz

{ezkit-1.7.6/ezKit.egg-info → ezkit-1.7.7}/PKG-INFO

@@ -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.7/ezKit/token.py

@@ -0,0 +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) -> (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(offset),
+                "data": data
+            },
+            default=str
+        )
+
+        cipher = AESCipher(key=key, algorithm='sha256')
+
+        return cipher.encrypt(source)
+
+    except Exception as e:
+        logger.exception(e)
+        return None
+
+
+def parsing_token(token_string: str, key: str = 'Fc0zXCmGKd7tPu6W') -> (dict | None):
+    try:
+        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
+
+        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 result is None:
+            return False
+
+        if result.get('datetime') < datetime_now():  # type: ignore
+            return False
+
+        return True
+
+    except Exception as e:
+        logger.exception(e)
+        return False

{ezkit-1.7.6 → ezkit-1.7.7}/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-1.7.7/ezKit/xftp.py

@@ -0,0 +1,222 @@
+"""
+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"""
+        self.ftp = FTP()
+        self.ftp.set_debuglevel(debuglevel)
+        self.host = host
+        self.port = port
+        self.username = username
+        self.password = password
+        self.encoding = encoding
+        self.retry = 1
+
+    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)
+            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()
+            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 Exception as e:
+            logger.exception(e)
+            self.ftp.close()
+        logger.info("-" * 80)
+        logger.success("FTP connect closed")
+        return True
+
+    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, 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, target="/") -> bool:
+        """创建目录 (从 / 目录依次递增创建子目录. 如果目录存在, 创建目录时会报错, 所以这里忽略所有错误.)"""
+        try:
+            dir_list = target.split("/")
+            for i, _ in enumerate(dir_list):
+                dir_path = "/".join(dir_list[:i + 1])
+                try:
+                    self.ftp.mkd(dir_path)
+                except Exception as e:
+                    logger.exception(e)
+            return True
+        except Exception as e:
+            logger.exception(e)
+            return False
+
+    def chdir_to_remote(self, target="/") -> bool:
+        """change to remote directory"""
+        try:
+            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"""
+        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"""
+
+        bufsize = 1024
+        local_path = f"{local_dir}/{local_file}"
+        remote_path = f"{remote_dir}/{remote_file}"
+
+        info = 'Download'
+        if upload is True:
+            info = 'Upload'
+
+        # 检查参数
+        if upload is True:
+            if local_file == "":
+                self.close('Argument Miss: local file')
+            # 如果没有设置 远程文件 名称, 则使用 本地文件 名称
+            if remote_file == "":
+                remote_file = local_file
+                remote_path = f"{remote_dir}/{remote_file}"
+        else:
+            if remote_file == "":
+                self.close("Argument Miss: remote file")
+            # 如果没有设置 本地文件 名称, 则使用 远程文件 名称
+            if local_file == "":
+                local_file = remote_file
+                local_path = f"{local_dir}/{local_file}"
+
+        # 进入本地目录
+        try:
+            if upload is True:
+                # 检查本地目录
+                stat = Path(local_dir)
+                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 Exception as e:
+            logger.exception(e)
+            # 第一层 try 使用 self.x_exit() 无效, 直接使用 self.close()
+            self.close(f"Local directory error: {local_dir}")
+
+        # 上传或下载
+        try:
+
+            if upload is True:
+
+                # 上传
+
+                # 创建远程目录
+                if remote_dir != "/":
+                    self.mkdir(remote_dir)
+
+                # 进入远程目录
+                self.chdir_to_remote(remote_dir)
+
+                # 上传文件
+                stat = Path(local_file)
+                if stat.exists() and stat.is_file():
+                    with open(local_file, "rb") as fid:
+                        self.ftp.storbinary(f'STOR {remote_file}', fid, bufsize)
+                    logger.success(f"{info} success: {local_path.replace('//', '/')} -> {remote_path.replace('//', '/')}")
+                    return True
+
+                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:
+                        self.ftp.retrbinary(f'RETR {remote_file}', fid.write, bufsize)
+                    logger.success(f"{info} success: {remote_path.replace('//', '/')} -> {local_path.replace('//', '/')}")
+                    return True
+
+                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}")
+            return False
+
+    def handle_all(self, local_dir=".", remote_dir="/", upload=False):
+        """Handle All"""
+        if upload is True:
+            # 检查本地目录
+            stat = Path(local_dir)
+            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)
+            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"""
+        try:
+            self.chdir_to_remote(remote_dir)
+            print(self.ftp.retrlines(cmd))
+            self.close()
+        except Exception as e:
+            # 第一层 try 使用 self.x_exit() 无效, 直接使用 self.close()
+            self.close(e)

{ezkit-1.7.6 → ezkit-1.7.7/ezKit.egg-info}/PKG-INFO

@@ -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 → ezkit-1.7.7}/ezKit.egg-info/SOURCES.txt

@@ -22,4 +22,5 @@ ezKit/zabbix.py
 ezKit.egg-info/PKG-INFO
 ezKit.egg-info/SOURCES.txt
 ezKit.egg-info/dependency_links.txt
+ezKit.egg-info/requires.txt
 ezKit.egg-info/top_level.txt

ezkit-1.7.7/ezKit.egg-info/requires.txt

@@ -0,0 +1 @@
+loguru>=0.7.0

{ezkit-1.7.6 → ezkit-1.7.7}/setup.py

@@ -3,15 +3,14 @@ from setuptools import find_packages, setup
 
 setup(
     name='ezKit',
-    version='1.7.6',
+    version='1.7.7',
     author='septvean',
     author_email='septvean@gmail.com',
     description='Easy Kit',
     packages=find_packages(exclude=['documents', 'tests']),
     include_package_data=True,
-    python_requires='>=3.11'
-    # install_requires=[
-    #     'loguru>=0.7.0',
-    #     'tomlkit>=0.12.0'
-    # ]
+    python_requires='>=3.11',
+    install_requires=[
+        "loguru>=0.7.0"
+    ]
 )

ezkit-1.7.6/ezKit/token.py

@@ -1,44 +0,0 @@
-import json
-
-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:
-    try:
-        source = json.dumps(
-            obj={
-                'datetime': datetime_to_string(datetime_offset(datetime_now(), seconds=+timeout)),
-                'data': data
-            },
-            default=str
-        )
-        cipher = AESCipher(key=key, algorithm='sha256')
-        return cipher.encrypt(source)
-    except:
-        return None
-
-
-def parsing_token(token_string: str, key: str = 'Fc0zXCmGKd7tPu6W') -> None | dict:
-    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:
-            return None
-    except:
-        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):
-            return False
-        if result.get('datetime') < datetime_now():
-            return False
-        return True
-    except:
-        return False

ezkit-1.7.6/ezKit/xftp.py

@@ -1,194 +0,0 @@
-'''
-ftplib: https://docs.python.org/3.10/library/ftplib.html
-'''
-import os
-from ftplib import FTP
-from pathlib import Path
-
-
-class XFTP:
-
-    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
-        self.port = port
-        self.username = username
-        self.password = password
-        self.encoding = encoding
-        self.retry = 1
-
-    def connect(self):
-        ''' 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)
-            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
-        try:
-            self.ftp.quit()
-        except:
-            self.ftp.close()
-        print('-' * 80)
-        print('FTP connect closed')
-
-    def get_file_list(self, dir='/'):
-        ''' Get file list '''
-        self.chdir_to_remote(dir)
-        return self.ftp.nlst()
-
-    def get_file_size(self, dir='/', file=None):
-        ''' Get file size '''
-        self.chdir_to_remote(dir)
-        return self.ftp.size(file)
-
-    def mkdir(self, dir_string='/'):
-        ''' 创建目录 (从 / 目录依次递增创建子目录. 如果目录存在, 创建目录时会报错, 所以这里忽略所有错误.) '''
-        try:
-            dir_list = dir_string.split("/")
-            for i, _ in enumerate(dir_list):
-                dir = '/'.join(dir_list[:i + 1])
-                try:
-                    self.ftp.mkd(dir)
-                except:
-                    pass
-            return True
-        except:
-            return False
-
-    def chdir_to_remote(self, dir='/'):
-        ''' change to remote directory'''
-        try:
-            self.ftp.cwd(dir)
-        except:
-            self.close(f'Remote directory error: {dir}')
-
-    def x_exit(self, info=None):
-        ''' Exit '''
-        print(info) if info else None
-        # 注意: exit() 并不会退出脚本, 配合 try 使用
-        exit()
-
-    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'
-
-        # 检查参数
-        if upload:
-            if local_file == '':
-                self.close('Argument Miss: local file')
-            # 如果没有设置 远程文件 名称, 则使用 本地文件 名称
-            if remote_file == '':
-                remote_file = local_file
-                remote_path = remote_dir + '/' + remote_file
-        else:
-            if remote_file == '':
-                self.close('Argument Miss: remote file')
-            # 如果没有设置 本地文件 名称, 则使用 远程文件 名称
-            if local_file == '':
-                local_file = remote_file
-                local_path = local_dir + '/' + local_file
-
-        # 进入本地目录
-        try:
-            if upload:
-                # 检查本地目录
-                stat = Path(local_dir)
-                self.close(f'Local directory error: {local_dir}') if stat.exists() == False else None
-            else:
-                # 创建本地目录
-                Path(local_dir).mkdir(parents=True, exist_ok=True)
-            # 进入本地目录
-            os.chdir(local_dir)
-        except:
-            # 第一层 try 使用 self.x_exit() 无效, 直接使用 self.close()
-            self.close(f'Local directory error: {local_dir}')
-
-        # 上传或下载
-        try:
-
-            if upload:
-
-                ''' 上传 '''
-
-                # 创建远程目录
-                if remote_dir != '/':
-                    self.mkdir(remote_dir)
-
-                # 进入远程目录
-                self.chdir_to_remote(remote_dir)
-
-                # 上传文件
-                stat = Path(local_file)
-                if stat.exists() and stat.is_file():
-                    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('//', '/')))
-                    return True
-                else:
-                    self.x_exit('{} error: {} is not exist'.format(info, local_path.replace('//', '/')))
-
-            else:
-
-                ''' 下载 '''
-
-                # 进入远程目录
-                self.chdir_to_remote(remote_dir)
-
-                # 下载文件
-                if remote_file in self.ftp.nlst():
-                    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('//', '/')))
-                    return True
-                else:
-                    self.x_exit('{} error: {} is not exist'.format(info, remote_path.replace('//', '/')))
-
-        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}')
-            return False
-
-    def handle_all(self, local_dir='.', remote_dir='/', upload=False):
-        ''' Handle All '''
-        if upload:
-            # 检查本地目录
-            stat = Path(local_dir)
-            self.close(f'Local directory error: {local_dir}') if stat.exists() == False else None
-            # 获取文件列表
-            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)
-
-    def retrlines(self, remote_dir='/', cmd='LIST'):
-        ''' Retrlines '''
-        try:
-            self.chdir_to_remote(remote_dir)
-            print(self.ftp.retrlines(cmd))
-            self.close()
-        except Exception as e:
-            # 第一层 try 使用 self.x_exit() 无效, 直接使用 self.close()
-            self.close(e)