Updated20221227153836

Author: pikachuren

CertRep/cn-all.zip

@@ -29,11 +29,17 @@ def cleanCache(close=True):
     menuSub2 = tkinter.Menu(menuMain)
     menuSub3 = tkinter.Menu(menuMain)
     # 子菜单栏---------------------------------------
-    menuSub1.add_command(label='打开')
-    menuSub1.add_command(label='保存')
-    menuSub2.add_command(label='复制')
-    menuSub2.add_command(label='删除')
+    menuSub1.add_command(label='[阻止证书]更新云端源')
+    menuSub1.add_command(label='[阻止证书]从本地加载')
+    menuSub1.add_command(label='[阻止证书]保存到本地')
+    menuSub1.add_command(label='[提交源]打开证书/EXE')
+    menuSub2.add_command(label='[阻止证书]全选')
+    menuSub2.add_command(label='[阻止证书]反选')
+    menuSub2.add_command(label='[阻止证书]应用')
+    menuSub2.add_command(label='[提交]上传证书')
     menuSub3.add_command(label='关于')
+    menuSub3.add_command(label='更新')
+    menuSub3.add_command(label='退出')
     # 创建顶级菜单栏，并关联子菜单---------------------
     menuMain.add_cascade(label='文件', menu=menuSub1)
     menuMain.add_cascade(label='编辑', menu=menuSub2)

Client.py

@@ -5,9 +5,15 @@
 
 
 # 禁用证书模块 ----------------------------------------------------------------------------------------
-def ban_cert(in_path, in_name, log=None):
+def ban_cert(in_path, in_name, log=None, processbar=None, size=1):
     name_list = os.listdir(in_path)
+    lens = 0
+    size = 1 if size <= 0 else size
     for name_item in name_list:
+        # 进度条操作
+        if processbar is not None:
+            lens = lens + 1
+            processbar['value'] = lens * 100 / size
         if name_item in in_name:
             subs_path = os.path.join(in_path, name_item)
             try:
@@ -17,9 +23,6 @@ def ban_cert(in_path, in_name, log=None):
             for subs_item in subs_name:
                 if subs_item.find("cer") > 0:
                     cert_path = os.path.join(subs_path, subs_item)
-                    result = os.popen("certutil -addstore -user -f \"Disallowed\" " + cert_path).read()
+                    result = os.popen("certutil -addstore -user -f \"Disallowed\" \"" + cert_path + "\"").read()
                     if log is not None:
                         log.log(result.replace("\n", " "))
-
-
-

Modules/__pycache__/ban.cpython-39.pyc

@@ -4,11 +4,13 @@
 import os
 import hashlib
 import requests
+from tqdm import tqdm
 
 
 def get(url, log=None):
     try:
-        html = requests.get(url)
+        html = requests.get(url, stream=True)
+
     except requests.exceptions.MissingSchema as e:
         log.log("无法下载，错误: " + str(e), "GET")
         return None
@@ -41,6 +43,9 @@ def get(url, log=None):
         data_path = os.path.join(data_path, data_hash.hexdigest() + ".zip")
         with open(data_path, "wb+") as file:
             file.write(data_file)
+        # with open(data_path, "wb") as f:
+        #     for data in tqdm(html.iter_content(chunk_size=1024)):
+        #         f.write(data)
         # 文件解压 -------------------------------------------------------
         exec_path = os.path.join(path_text, "cache")
         exec_path = os.path.join(exec_path, data_hash.hexdigest())

Modules/__pycache__/get.cpython-39.pyc

@@ -30,11 +30,14 @@ def cut(obj, sec):
     return data_main
 
 
-def dat(info, mod="MSG", level=0):
+def dat(info, mod="MSG", level=0, date=True):
     time_text = time.strftime("%y%m%d %H:%M:%S", time.localtime())
     temp_text = info.replace(" ", "").replace("\t", "")
     if len(temp_text) > 0:
-        return "[" + time_text + "][" + status[level] + "][" + mod + "]" + temp_text
+        if date:
+            return "[" + time_text + "][" + status[level] + "][" + mod + "]" + temp_text
+        else:
+            return "[" + mod + "]" + temp_text
     else:
         return None
 
@@ -46,16 +49,16 @@ def __init__(self, box=None):
 
     # 调试输出 -------------------------------------------------
     def log(self,
-            info="---------------------",  # 消息内容
+            info="--------------------------------------------",
             # 模块编号 事件等级  分割长度  保留换行符
-            mod="MSG", level=0,  lens=21, line=True,
+            mod="MSG", level=0, lens=48, line=True,
             # 控制台输出 文件输出  文件输出的存储路径
             console=True, file=True, path="%temp%\\ban-cert\\"):
 
         # 窗口内部输出 ---------------------------------------
         data_text = cut(info, lens)
         for item in data_text:
-            main_text = dat(item.replace(" ", ""), mod, level)
+            main_text = dat(item, mod, level, False)
             if self.box is not None and main_text is not None:
                 self.box.configure(state='normal')
                 self.box.insert(INSERT, main_text + "\n")

Modules/__pycache__/log.cpython-39.pyc

@@ -1,14 +1,15 @@
 import tkinter
 from tkinter import *
-from tkinter import scrolledtext
 
-import requests
 from Modules import log
 from Modules import ban
 from Modules import get
 from TKPages import views
-import os
+from tkinter import scrolledtext
 import tkinter.ttk as ttk
+import threading
+import requests
+import os
 
 
 class Block(views.View):
@@ -33,38 +34,48 @@ def __init__(self, tabRoot):
     def action_get(self):
         self.processbar['value'] = 0
         try:
-            self.path = get.get(url=self.text_links.get(), log=self.log)
+            def sub_process():
+                self.path = get.get(url=self.text_links.get(), log=self.log)
+
+            sub_process = threading.Thread(target=sub_process, args=())
+            sub_process.start()
         except requests.exceptions.ConnectionError:
             tkinter.messagebox.showerror(title='出错了！',
                                          message='获取证书源失败，请检查网络或者修改证书源URL')
             return False
         self.processbar['value'] = 50
-        if self.path is not None:
-            self.list_certs.delete(0, END)
-            temp_data = os.listdir(self.path)
-            lens = 0
-            self.processbar['value'] = 0
-            for item in temp_data:
-                lens = lens + 1
-                self.processbar['value'] = 50 + lens * 50 / len(temp_data)
-                temp_path = os.path.join(self.path, item)
-                if not os.path.isdir(temp_path):
+
+        def deal_certs():
+            while sub_process.is_alive():
+                pass
+            if self.path is not None:
+                self.list_certs.delete(0, END)
+                temp_data = os.listdir(self.path)
+                lens = 0
+                self.processbar['value'] = 0
+                for item in temp_data:
+                    lens = lens + 1
+                    self.processbar['value'] = 50 + lens * 50 / len(temp_data)
+                    temp_path = os.path.join(self.path, item)
                     self.list_certs.insert(END, item)  # END表示每插入一个都是在最后一个位置
                     self.log.log(item)
 
+        del_process = threading.Thread(target=deal_certs, args=())
+        del_process.start()
+
     def action_exe(self):
         data_path = []
-        lens = 0
         self.processbar['value'] = 0
         for item in range(0, self.list_certs.size() + 1):
-            lens = lens + 1
-            try:
-                self.processbar['value'] = lens * 100 / self.list_certs.size()
-            except ZeroDivisionError:
-                return False
             if self.list_certs.select_includes(item):
                 data_path.append(self.list_certs.get(item))
-        ban.ban_cert(self.path, data_path, self.log)
+        sub_process = threading.Thread(target=ban.ban_cert,
+                                       args=(self.path,
+                                             data_path,
+                                             self.log,
+                                             self.processbar,
+                                             self.list_certs.size()))
+        sub_process.start()
 
     def action_all(self):
         self.list_certs.select_set(0, END)