eric-tools 1.3.3__tar.gz → 1.3.4__tar.gz

{eric_tools-1.3.3 → eric_tools-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eric_tools
-Version: 1.3.3
+Version: 1.3.4
 Summary: Python Daily Development Tools
 Home-page: https://github.com/Eric-jxl/Tools
 Author: Eric
@@ -16,7 +16,7 @@ License-File: LICENSE
 
 # Tools
 [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![latest 1.3.3](https://img.shields.io/badge/latest-1.3.3-green.svg?style=flat)
+![latest 1.3.4](https://img.shields.io/badge/latest-1.3.4-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)
 
@@ -67,6 +67,7 @@ pip install eric_tools
 > * nginx_log.py            nginx日志解析(默认access.log)
 >
 > * dynamic_settings        一个动态加载配置类(支持toml、yml、conf、csv、ini等)
-> 
+>
+> * delete_duplicate        删除工作区重复文件(包括图片等)
 
 

{eric_tools-1.3.3 → eric_tools-1.3.4}/README.md

@@ -1,6 +1,6 @@
 # Tools
 [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![latest 1.3.3](https://img.shields.io/badge/latest-1.3.3-green.svg?style=flat)
+![latest 1.3.4](https://img.shields.io/badge/latest-1.3.4-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)
 
@@ -51,4 +51,5 @@ pip install eric_tools
 > * nginx_log.py            nginx日志解析(默认access.log)
 >
 > * dynamic_settings        一个动态加载配置类(支持toml、yml、conf、csv、ini等)
-> 
+>
+> * delete_duplicate        删除工作区重复文件(包括图片等)

{eric_tools-1.3.3 → eric_tools-1.3.4}/eric_tools/__init__.py

@@ -4,16 +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.3"
+__version__ = "1.3.4"
 __author__ = 'Eric'
 __doc__ = ["Python Daily Development Tools"]
 __url__ = "https://github.com/Eric-jxl/Tools"

eric_tools-1.3.4/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 → eric_tools-1.3.4}/eric_tools/dynamic_settings.py

@@ -42,9 +42,8 @@ class DynamicConfig(MutableMapping):
 
     def _start_watching(self):
         """Starts a background thread to monitor file changes."""
-        event_handler = ConfigFileHandler(self, self.watch_file)
         observer = Observer()
-        observer.schedule(event_handler, path=os.path.dirname(
+        observer.schedule(ConfigFileHandler(self, self.watch_file), path=os.path.dirname(
             self.watch_file) or ".", recursive=False)
         observer.start()
         self._observer = observer
@@ -146,9 +145,6 @@ class DynamicConfig(MutableMapping):
             self._observer.join()
 
 
-config = DynamicConfig("config.yml", debug=True, mode="production")
-
-
 @app.route("/", methods=["GET"])
 def index():
     return redirect("/config/")
@@ -156,6 +152,7 @@ def index():
 
 @app.route("/config/", methods=["GET"])
 def get_config():
+    config = DynamicConfig("config.yml", debug=True, mode="production")
     config.force_reload()
     return jsonify(config.config)
 
@@ -163,6 +160,7 @@ def get_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:

{eric_tools-1.3.3 → eric_tools-1.3.4}/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.3 → eric_tools-1.3.4}/eric_tools/logMixin.py

@@ -34,8 +34,6 @@ class StrategyMeta(type):
 
         return super().__new__(meta, name, bases, dct)
 
-# 假设SecurityMixin, CacheMixin, CacheControlMixin已定义
-
 
 class MySecureClass(metaclass=StrategyMeta):
     security_required = True

{eric_tools-1.3.3 → eric_tools-1.3.4}/eric_tools/pgsql.py

@@ -25,17 +25,14 @@ class PostgreSQL(object):
         self.__dict__[key] = value
 
     def __getattr__(self, item):
-        print self.__dict__[item]
         return self.__dict__[item]
 
     def __call__(self, *args, **kwargs):
-        print '%s'% PostgreSQL.__dict__
+        print('%s' % PostgreSQL.__dict__)
 
     @property
     def info(self):
-        return psycopg2.__version__,psycopg2.__doc__
-
-
+        return psycopg2.__version__, psycopg2.__doc__
 
     def operate(self, sql, params):
         count = 0
@@ -45,7 +42,7 @@ class PostgreSQL(object):
             self.conn.commit()
             self.close()
         except Exception, e:
-            print e.message
+            print(e.message)
         return count
 
     def connect(self):
@@ -66,7 +63,7 @@ class PostgreSQL(object):
             result = self.cursor.fetchone()
             self.close()
         except Exception, e:
-            print e.message
+            print(e.message)
         return result
 
     def get_all(self, sql, params=()):
@@ -77,7 +74,7 @@ class PostgreSQL(object):
             tup = self.cursor.fetchall()
             self.close()
         except Exception, e:
-            print e.message
+            print(e.message)
         return tup
 
     def insert(self, sql, params=()):
@@ -88,7 +85,3 @@ class PostgreSQL(object):
 
     def delete(self, sql, params=()):
         return self.operate(sql, params)
-
-
-
-

{eric_tools-1.3.3 → eric_tools-1.3.4}/eric_tools/remove.py

@@ -17,7 +17,6 @@ class RemoveFile(object):
 
     @staticmethod
     def fileremove(filename, timedifference):
-        '''remove file'''
 
         date = datetime.datetime.fromtimestamp(os.path.getmtime(filename))
         now = datetime.datetime.now()
@@ -25,17 +24,15 @@ class RemoveFile(object):
         if (now - date).seconds > timedifference:
             if os.path.exists(filename):
                 os.remove(filename)
-                print 'remove file: %s' % filename
+                print('remove file: %s' % filename)
             else:
-                print 'no such file: %s' % filename
+                print('no such file: %s' % filename)
 
 
 FILE_DIR = '/home'
 
 if __name__ == '__main__':
 
-    print 'Script is running...'
-
     while True:
         ITEMS = os.listdir(FILE_DIR)
         NEWLIST = []
@@ -44,7 +41,7 @@ if __name__ == '__main__':
                 NEWLIST.append(FILE_DIR + names)
 
         for names in NEWLIST:
-            print 'current file: %s' % (names)
+            print('current file: %s' % (names))
             RemoveFile.fileremove(names, 10)
 
         time.sleep(2)

{eric_tools-1.3.3 → eric_tools-1.3.4}/eric_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eric-tools
-Version: 1.3.3
+Version: 1.3.4
 Summary: Python Daily Development Tools
 Home-page: https://github.com/Eric-jxl/Tools
 Author: Eric
@@ -16,7 +16,7 @@ License-File: LICENSE
 
 # Tools
 [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![latest 1.3.3](https://img.shields.io/badge/latest-1.3.3-green.svg?style=flat)
+![latest 1.3.4](https://img.shields.io/badge/latest-1.3.4-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)
 
@@ -67,6 +67,7 @@ pip install eric_tools
 > * nginx_log.py            nginx日志解析(默认access.log)
 >
 > * dynamic_settings        一个动态加载配置类(支持toml、yml、conf、csv、ini等)
-> 
+>
+> * delete_duplicate        删除工作区重复文件(包括图片等)
 
 

{eric_tools-1.3.3 → eric_tools-1.3.4}/eric_tools.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ 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
@@ -17,7 +18,6 @@ eric_tools/logMixin.py
 eric_tools/logger.py
 eric_tools/nginx_log.py
 eric_tools/pgsql.py
-eric_tools/readconfig.py
 eric_tools/remove.py
 eric_tools/resize_image.py
 eric_tools/send_email.py

{eric_tools-1.3.3 → eric_tools-1.3.4}/eric_tools.egg-info/requires.txt

@@ -3,3 +3,4 @@ requests
 paramiko
 Pillow
 xlsxwriter
+ImageHash

{eric_tools-1.3.3 → eric_tools-1.3.4}/setup.py

@@ -7,7 +7,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="eric_tools",
-    version="1.3.3",
+    version="1.3.4",
     author="Eric",
     author_email="jxleric95@gmail.com",
     description="Python Daily Development Tools",
@@ -27,6 +27,7 @@ setuptools.setup(
         'requests',
         'paramiko',
         'Pillow',
-        'xlsxwriter'
+        'xlsxwriter',
+        "ImageHash",
     ]
 )

eric_tools-1.3.3/eric_tools/readconfig.py

@@ -1,30 +0,0 @@
-# -*- coding:utf-8 -*-
-'''
-@Author  : Eric
-@Time    : 2021-02-07 14:01
-@IDE     : PyCharm
-'''
-import sys
-
-import configparser
-
-# proDir = os.path.split(os.path.realpath(__file__))[0]
-# configPath = os.path.join(proDir, "config.ini")
-
-
-class ReadConfig(object):
-    def __init__(self, configPath,title, name):
-        self.conf = configparser.ConfigParser()
-        self.title = title
-        self.name = name
-        self.conf.read(configPath, encoding='utf-8')
-        self.conf.get(title, name)
-        print self.conf.get(title, name)
-
-
-    def __repr__(self):
-        if sys.version_info < 3:
-            print '%s' % self.conf.get(self.title, self.name)
-        else:
-            print('%s' % self.conf.get(self.title, self.name))
-