完善功能

main.py

@@ -1,24 +1,35 @@
-from Thread import pymysql, UploadThread, FindThread, ByNetFindThread , threading
-from tools import imagehash, Image, download_image
+from Thread import UploadThread, FindThread, ByNetFindThread
+from Tools import imagehash, Image, os, config
 
-# download_image(1310371422)
-TargetRange = [1310372220, 1310372400]
-TargetImage = Image.open(str(f'./img/target3.jpg'))
+type = int(config['settings']['type'])
+TargetRange = list(map(int, config['settings']['TargetRange'].split(',')))
+TargetImagePath = config['settings']['TargetImage']
+TargetImage = Image.open(TargetImagePath)
 TargetImageHash = bytes.fromhex(str(imagehash.average_hash(TargetImage)))
 baseArr = TargetRange[0]
+if not os.path.exists('img'):
+    os.makedirs('img')
 
 if __name__ == '__main__':
 
-    Thread = FindThread(TargetImageHash)
-    Thread.start()
+    if type == 1:
+        Thread = FindThread(TargetImageHash)
+        Thread.start()
 
-    # while baseArr<TargetRange[1]:
-    #     Thread = ByNetFindThread(TargetImageHash, baseArr)
-    #     Thread.start()
-    #     baseArr += 1
-
-    # while baseArr<=TargetRange[1]:
-    #     Thread = UploadThread(baseArr)
-    #     Thread.start()
-    #     baseArr += 1
+    elif type == 2:
+        while baseArr < TargetRange[1]:
+            Thread = ByNetFindThread(TargetImageHash, baseArr)
+            Thread.start()
+            baseArr += 1
 
+    elif type == 3:
+        while baseArr <= TargetRange[1]:
+            Thread = UploadThread(baseArr)
+            Thread.start()
+            baseArr += 1
+            Thread = UploadThread(baseArr)
+            Thread.start()
+            baseArr += 1
+            Thread = UploadThread(baseArr)
+            Thread.start()
+            baseArr += 1