eric-tools 1.3.2__tar.gz → 1.3.3.1__tar.gz

{eric_tools-1.3.2 → eric_tools-1.3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eric_tools
-Version: 1.3.2
+Version: 1.3.3.1
 Summary: Python Daily Development Tools
 Home-page: https://github.com/Eric-jxl/Tools
 Author: Eric
@@ -16,8 +16,9 @@ License-File: LICENSE
 
 # Tools
 [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![latest 1.3.2](https://img.shields.io/badge/latest-1.3.2-green.svg?style=flat)
+![latest 1.3.3.1](https://img.shields.io/badge/latest-1.3.3.1-green.svg?style=flat)
 ![GitHub commits since latest release](https://img.shields.io/github/commits-since/eric-jxl/Tools/latest)
+[![Publish Python Package](https://github.com/eric-jxl/Tools/actions/workflows/publish-pypi.yml/badge.svg)](https://github.com/eric-jxl/Tools/actions/workflows/publish-pypi.yml)
 
 
 [Reids](https://eric-jxl.github.io/bak/index.html)
@@ -57,13 +58,16 @@ pip install eric_tools
 
 >[!TIP]
 >
-> * async_queue.py        异步队列操作
+> * async_queue.py          异步队列操作
 > 
-> * downloader.py         下载器
+> * downloader.py           下载器
 > 
-> * logMixIn.py           日志元类和高级日志装饰器
+> * logMixIn.py             日志元类和高级日志装饰器
 > 
-> * nginx_log.py          nginx日志解析(默认access.log)
+> * nginx_log.py            nginx日志解析(默认access.log)
 >
+> * dynamic_settings        一个动态加载配置类(支持toml、yml、conf、csv、ini等)
+>
+> * delete_duplicate        删除工作区重复文件(包括图片等)
 
 

{eric_tools-1.3.2 → eric_tools-1.3.3.1}/README.md

@@ -1,7 +1,8 @@
 # Tools
 [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![latest 1.3.2](https://img.shields.io/badge/latest-1.3.2-green.svg?style=flat)
+![latest 1.3.3.1](https://img.shields.io/badge/latest-1.3.3.1-green.svg?style=flat)
 ![GitHub commits since latest release](https://img.shields.io/github/commits-since/eric-jxl/Tools/latest)
+[![Publish Python Package](https://github.com/eric-jxl/Tools/actions/workflows/publish-pypi.yml/badge.svg)](https://github.com/eric-jxl/Tools/actions/workflows/publish-pypi.yml)
 
 
 [Reids](https://eric-jxl.github.io/bak/index.html)
@@ -41,11 +42,14 @@ pip install eric_tools
 
 >[!TIP]
 >
-> * async_queue.py        异步队列操作
+> * async_queue.py          异步队列操作
 > 
-> * downloader.py         下载器
+> * downloader.py           下载器
 > 
-> * logMixIn.py           日志元类和高级日志装饰器
+> * logMixIn.py             日志元类和高级日志装饰器
 > 
-> * nginx_log.py          nginx日志解析(默认access.log)
+> * nginx_log.py            nginx日志解析(默认access.log)
 >
+> * dynamic_settings        一个动态加载配置类(支持toml、yml、conf、csv、ini等)
+>
+> * delete_duplicate        删除工作区重复文件(包括图片等)

{eric_tools-1.3.2 → eric_tools-1.3.3.1}/eric_tools/__init__.py

@@ -4,15 +4,14 @@
 @Time    : 2020-11-30 17:31
 @IDE     : PyCharm
 '''
-from . import decorator, Abstract, convert_json, jwt_encrypt, send_email, readconfig, sftp
-from . import ip, logger, resize_image, exception_class, pgsql, encryption_classmethod
-from . import async_queue, downloader, logMixin, nginx_log, excel_generator
+
+from .dynamic_settings import DynamicConfig
 
 
 name = 'Eric-Tools'
 __title__ = 'tools'
 __description__ = 'Python HTTP for Humans.'
-__version__ = "1.3.2"
+__version__ = "1.3.3.1"
 __author__ = 'Eric'
 __doc__ = ["Python Daily Development Tools"]
 __url__ = "https://github.com/Eric-jxl/Tools"

eric_tools-1.3.3.1/eric_tools/delete_duplicate.py

@@ -0,0 +1,61 @@
+import os
+import hashlib
+import imagehash
+from PIL import Image
+
+
+def get_file_hash(file_path, is_image=False):
+    """计算文件的哈希值（图片使用感知哈希，其他文件使用 SHA-256）"""
+    try:
+        if is_image:
+            with Image.open(file_path) as img:
+                return str(imagehash.phash(img))  # 感知哈希（pHash）
+        else:
+            hasher = hashlib.sha256()
+            with open(file_path, "rb") as f:
+                while chunk := f.read(8192):  # 逐块读取，适用于大文件
+                    hasher.update(chunk)
+            return hasher.hexdigest()
+    except Exception as e:
+        print(f"无法处理 {file_path}，错误: {e}")
+        return None
+
+
+def find_duplicates(folder_path):
+    """查找并收集重复文件"""
+    hashes = {}  # 存储 {哈希值: 文件路径}
+    duplicates = []
+
+    for root, _, files in os.walk(folder_path):
+        for file in files:
+            file_path = os.path.join(root, file)
+            ext = file.lower().split('.')[-1]
+
+            # 判断是否为图片
+            is_image = ext in ('png', 'jpg', 'jpeg', 'gif', 'bmp', 'webp')
+
+            file_hash = get_file_hash(file_path, is_image)
+            if file_hash:
+                if file_hash in hashes:
+                    duplicates.append(file_path)  # 记录重复项
+                else:
+                    hashes[file_hash] = file_path
+
+    return duplicates
+
+
+def remove_duplicates(duplicates):
+    """删除重复文件"""
+    for dup in duplicates:
+        print(f"删除重复文件: {dup}")
+        os.remove(dup)
+
+
+if __name__ == "__main__":
+    FOLDER_PATH = "/Users/eric/Downloads/Downloads/哔哩哔哩壁纸"
+    duplicates = find_duplicates(FOLDER_PATH)
+    if duplicates:
+        remove_duplicates(duplicates)
+        print(f"已删除 {len(duplicates)} 个重复文件！")
+    else:
+        print("未发现重复文件！")

eric_tools-1.3.3.1/eric_tools/dynamic_settings.py

@@ -0,0 +1,172 @@
+import os
+import yaml
+import toml
+import csv
+import configparser
+import logging
+from collections.abc import MutableMapping
+from watchdog.observers import Observer
+from watchdog.events import FileSystemEventHandler
+from flask import Flask, jsonify, redirect
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__file__.rsplit("/", 1)[1])
+
+__all__ = ["DynamicConfig"]
+
+# Flask Web Service for testing
+app = Flask(__name__)
+
+
+class ConfigFileHandler(FileSystemEventHandler):
+    """Handles file changes and reloads the configuration."""
+
+    def __init__(self, config, file_path):
+        self.config = config
+        self.file_path = file_path
+
+    def on_modified(self, event):
+        if event.src_path == self.file_path:
+            print(f"Configuration file {self.file_path} changed, reloading...")
+            self.config.force_reload(self.file_path)
+
+
+class DynamicConfig(MutableMapping):
+    def __init__(self, watch_file=None, **kwargs):
+        self.watch_file = watch_file
+        self.config = kwargs  # Support setting variables directly
+
+        if watch_file:
+            self.load(watch_file)
+            self._start_watching()
+
+    def _start_watching(self):
+        """Starts a background thread to monitor file changes."""
+        observer = Observer()
+        observer.schedule(ConfigFileHandler(self, self.watch_file), path=os.path.dirname(
+            self.watch_file) or ".", recursive=False)
+        observer.start()
+        self._observer = observer
+
+    def load(self, file_path=None):
+        """Loads configuration from a file and merges with existing values."""
+        if file_path:
+            self.file_path = file_path
+
+        if not self.file_path or not os.path.exists(self.file_path):
+            logger.error(f"Configuration file '{self.file_path}' not found.")
+            return
+
+        loaders = {
+            ".yml": self._load_yaml, ".yaml": self._load_yaml,
+            ".toml": self._load_toml, ".csv": self._load_csv,
+            ".conf": self._load_conf, ".ini": self._load_conf
+        }
+
+        ext = os.path.splitext(self.file_path)[-1].lower()
+        if ext not in loaders:
+            raise ValueError(f"Unsupported file format: {ext}")
+
+        file_config = loaders[ext](self.file_path, self.config)
+
+        logger.debug("Updated Config:", self.config)  # Debugging
+
+    def force_reload(self):
+        """Manually trigger configuration reload (used in watchdog)."""
+        logger.info("Force reloading configuration...")
+        if self.watch_file:
+            self.load(self.watch_file)
+
+    def _load_yaml(self, file_path, config):
+        with open(file_path, 'r', encoding='utf-8') as f:
+            config.update(yaml.safe_load(f) or {})
+
+    def _load_toml(self, file_path, config):
+        with open(file_path, 'r', encoding='utf-8') as f:
+            config.update(toml.load(f))
+
+    def _load_csv(self, file_path, config):
+        with open(file_path, 'r', encoding='utf-8') as f:
+            reader = csv.reader(f)
+            config.update({row[0]: row[1] for row in reader if len(row) >= 2})
+
+    def _load_conf(self, file_path, config):
+        parser = configparser.ConfigParser()
+        parser.read(file_path, encoding='utf-8')
+        for section in parser.sections():
+            for key, value in parser.items(section):
+                config[f"{section}.{key}"] = value
+
+    def set(self, key, value):
+        """Sets a configuration variable."""
+        self.config[key] = value
+
+    def get(self, key, default=None):
+        """支持多层级 `.` 分隔键访问，如 `config.get("database.host")`"""
+        if key in self.config:
+            return self.config[key]
+        keys = key.split(".")  # 按 `.` 分割多级键
+        value = self.config  # 从 `self.config` 开始查找
+
+        try:
+            for k in keys:
+                if isinstance(value, dict):  # 如果是字典，继续查找键
+                    value = value[k]
+                elif isinstance(value, list) and k.isdigit():  # 如果是列表，并且 k 是索引
+                    value = value[int(k)]
+                else:
+                    return default  # 找不到，返回默认值
+            return value
+        except (KeyError, IndexError, TypeError):
+            return default  # 访问失败，返回默认值
+
+    def __getitem__(self, key):
+        return self.config[key]
+
+    def __setitem__(self, key, value):
+        self.config[key] = value
+
+    def __delitem__(self, key):
+        del self.config[key]
+
+    def __iter__(self):
+        return iter(self.config)
+
+    def __len__(self):
+        return len(self.config)
+
+    def __repr__(self):
+        return f"DynamicConfig({self.config})"
+
+    def stop_watching(self):
+        """Stops the file watcher."""
+        if hasattr(self, "_observer"):
+            self._observer.stop()
+            self._observer.join()
+
+
+@app.route("/", methods=["GET"])
+def index():
+    return redirect("/config/")
+
+
+@app.route("/config/", methods=["GET"])
+def get_config():
+    config = DynamicConfig("config.yml", debug=True, mode="production")
+    config.force_reload()
+    return jsonify(config.config)
+
+
+@app.route("/config/<path:key>", methods=["GET"])  # ✅ 允许 `/` 作为 key 的一部分
+def get_config_key(key):
+    """获取指定配置项的值，并支持自动重新加载"""
+    config = DynamicConfig("config.yml", debug=True, mode="production")
+    config.force_reload()  # ✅ 先重新加载配置
+    value = Config.get(key)  # ✅ 取值
+    if value is None:
+        return jsonify({"error": "Key not found"}), 404  # ✅ 404 + 友好错误信息
+    return jsonify(value)
+
+
+if __name__ == "__main__":
+    app.run(host="0.0.0.0", port=5001, debug=True)

{eric_tools-1.3.2 → eric_tools-1.3.3.1}/eric_tools/jwt_encrypt.py

@@ -8,18 +8,21 @@
 from jose.exceptions import ExpiredSignatureError, JWTError
 from jose import jwt
 import uuid
-from datetime import datetime,timedelta
+from datetime import datetime, timedelta
+
 
 class GenerateAuthenticate(object):
-    def __init__(self,secretKey,cipher_text):
+    def __init__(self, secretKey, cipher_text):
         self.secretKey = secretKey
         self.cipher_text = cipher_text
-        super(GenerateAuthenticate,self).__init__(secret_key=secretKey,cipher_text=cipher_text)
+        super(GenerateAuthenticate, self).__init__(
+            secret_key=secretKey, cipher_text=cipher_text)
 
     @staticmethod
     def generate_access_token(SECRET_KEY, Plaintext):
         expire = datetime.utcnow() + timedelta(minutes=1)
-        to_encode = {"exp": expire, "sub": str(Plaintext), "uid": str(uuid.uuid4())}
+        to_encode = {"exp": expire, "sub": str(
+            Plaintext), "uid": str(uuid.uuid4())}
         token = jwt.encode(to_encode, SECRET_KEY, algorithm="HS256")
         return token
 
@@ -29,7 +32,7 @@ class GenerateAuthenticate(object):
             payload = jwt.decode(Ciphertext, secretKey, algorithms="HS256")
             import sys
             if isinstance(payload, unicode) or sys.version_info[0] < 3:
-                print str(payload).encode('utf-8').replace('u\'', '')
+                print(str(payload).encode('utf-8').replace('u\'', ''))
             else:
                 print(payload)
             return payload
@@ -37,4 +40,4 @@ class GenerateAuthenticate(object):
         except ExpiredSignatureError:
             print(u"token过期")
         except JWTError:
-            print(u"token验证失败")
+            print(u"token验证失败")

{eric_tools-1.3.2 → eric_tools-1.3.3.1}/eric_tools/send_email.py

@@ -10,26 +10,22 @@ __doc__ = ["测试QQ邮箱,pwd为邮箱授权码"]
 import smtplib
 from email.mime.text import MIMEText
 from email.utils import formataddr
-import sys
-reload(sys)
-sys.setdefaultencoding("utf-8")
 
 
-
-
-def mail(send_email,receive_email,send_nickname,receive_nickname,pwd):
+def mail(send_email, receive_email, send_nickname, receive_nickname, pwd):
     try:
         msg = MIMEText('Test QQ Email', 'plain', 'utf-8')
-        msg['From'] = formataddr([send_nickname, send_email])  # 括号里的对应发件人邮箱昵称、发件人邮箱账号
-        msg['To'] = formataddr([receive_nickname, receive_email])  # 括号里的对应收件人邮箱昵称、收件人邮箱账号
-        msg['Subject'] = str("发送邮件测试").decode('utf-8') # 邮件的主题，也可以说是标题
+        # 括号里的对应发件人邮箱昵称、发件人邮箱账号
+        msg['From'] = formataddr([send_nickname, send_email])
+        # 括号里的对应收件人邮箱昵称、收件人邮箱账号
+        msg['To'] = formataddr([receive_nickname, receive_email])
+        msg['Subject'] = "发送邮件测试"  # 邮件的主题，也可以说是标题
 
         server = smtplib.SMTP_SSL("smtp.qq.com", 465)  # 发件人邮箱中的SMTP服务器，端口是25
         server.login(send_email, pwd)
-        server.sendmail(send_email, [receive_email, ], msg.as_string())  # 括号中对应的是发件人邮箱账号、收件人邮箱账号、发送邮件
+        # 括号中对应的是发件人邮箱账号、收件人邮箱账号、发送邮件
+        server.sendmail(send_email, [receive_email, ], msg.as_string())
         server.quit()  # 关闭连接
     except Exception as e:
-        print '发送邮件失败:%s' % e
+        print('发送邮件失败:%s' % e)
         return e
-
-

{eric_tools-1.3.2 → eric_tools-1.3.3.1}/eric_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eric-tools
-Version: 1.3.2
+Version: 1.3.3.1
 Summary: Python Daily Development Tools
 Home-page: https://github.com/Eric-jxl/Tools
 Author: Eric
@@ -16,8 +16,9 @@ License-File: LICENSE
 
 # Tools
 [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![latest 1.3.2](https://img.shields.io/badge/latest-1.3.2-green.svg?style=flat)
+![latest 1.3.3.1](https://img.shields.io/badge/latest-1.3.3.1-green.svg?style=flat)
 ![GitHub commits since latest release](https://img.shields.io/github/commits-since/eric-jxl/Tools/latest)
+[![Publish Python Package](https://github.com/eric-jxl/Tools/actions/workflows/publish-pypi.yml/badge.svg)](https://github.com/eric-jxl/Tools/actions/workflows/publish-pypi.yml)
 
 
 [Reids](https://eric-jxl.github.io/bak/index.html)
@@ -57,13 +58,16 @@ pip install eric_tools
 
 >[!TIP]
 >
-> * async_queue.py        异步队列操作
+> * async_queue.py          异步队列操作
 > 
-> * downloader.py         下载器
+> * downloader.py           下载器
 > 
-> * logMixIn.py           日志元类和高级日志装饰器
+> * logMixIn.py             日志元类和高级日志装饰器
 > 
-> * nginx_log.py          nginx日志解析(默认access.log)
+> * nginx_log.py            nginx日志解析(默认access.log)
 >
+> * dynamic_settings        一个动态加载配置类(支持toml、yml、conf、csv、ini等)
+>
+> * delete_duplicate        删除工作区重复文件(包括图片等)
 
 

{eric_tools-1.3.2 → eric_tools-1.3.3.1}/eric_tools.egg-info/SOURCES.txt

@@ -6,7 +6,9 @@ eric_tools/__init__.py
 eric_tools/async_queue.py
 eric_tools/convert_json.py
 eric_tools/decorator.py
+eric_tools/delete_duplicate.py
 eric_tools/downloader.py
+eric_tools/dynamic_settings.py
 eric_tools/encryption_classmethod.py
 eric_tools/excel_generator.py
 eric_tools/exception_class.py

{eric_tools-1.3.2 → eric_tools-1.3.3.1}/setup.py

@@ -7,7 +7,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="eric_tools",
-    version="1.3.2",
+    version="1.3.3.1",
     author="Eric",
     author_email="jxleric95@gmail.com",
     description="Python Daily Development Tools",