From 5949ad2d02c3f6be8bdcdf649e5257bb9712c054 Mon Sep 17 00:00:00 2001 From: Qiea <1310371422@qq.com> Date: Sun, 22 Dec 2024 13:17:29 +0800 Subject: [PATCH] Update --- Thread.py | 11 ++--------- Tools.py | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Thread.py b/Thread.py index 2f8a227..cc8ed2d 100644 --- a/Thread.py +++ b/Thread.py @@ -22,8 +22,6 @@ class MySQLConnectionPool: ) self.pool.put(conn) - import time - def get_connection(self, max_retries=5, wait_time=1): """获取一个数据库连接,如果连接池为空,继续尝试直到能够获取连接""" retries = 0 @@ -56,13 +54,12 @@ class UploadThread(threading.Thread): self.pool = pool self.conn = pool.get_connection() - def run(self): logging.debug(f'我是上传线程{self.uploadqqnumber}') if download_image(self.uploadqqnumber): Hash(self.conn).tomysql(self.uploadqqnumber) logging.info(f'上传成功: {self.uploadqqnumber}') - remove_image(self.uploadqqnumber) + remove_image(self.uploadqqnumber) self.pool.release_connection(self.conn) @@ -73,7 +70,6 @@ class FindThread(threading.Thread): self.pool = pool self.conn = pool.get_connection() - def run(self): logging.debug(f'我是查询线程{self.TargetImageHash}') res = Hash(self.conn).getqq(self.TargetImageHash) @@ -89,9 +85,7 @@ class ByNetFindThread(threading.Thread): self.TargetImageHash = TargetImageHash self.findqqnumber = findqqnumber - def run(self): - global exit_flag if download_image(self.findqqnumber): FindImage = Image.open(str(f'./img/{self.findqqnumber}.jpg')) if FindImage.mode == 'P' and 'transparency' in FindImage.info: @@ -103,8 +97,7 @@ class ByNetFindThread(threading.Thread): if os.path.exists(f'./img/congratulations_{self.findqqnumber}.jpg'): os.remove(f'./img/congratulations_{self.findqqnumber}.jpg') os.rename(f'./img/{self.findqqnumber}.jpg',f'./img/congratulations_{self.findqqnumber}.jpg') - exit_flag = True clean_image() os._exit(0) logging.info(f'[{self.findqqnumber}]的相似度是:{res}%') - remove_image(self.findqqnumber) + remove_image(self.findqqnumber) diff --git a/Tools.py b/Tools.py index 9c947ba..8d071e0 100644 --- a/Tools.py +++ b/Tools.py @@ -137,7 +137,7 @@ def remove_image(_qqnumber): os.remove(f'./img/{_qqnumber}.jpg') return 1 else: - logging.info(f'没有找到这个QQ号的图片:{_qqnumber}') + logging.debug(f'没有找到这个QQ号的图片:{_qqnumber}') def clean_image():