typo: create拼写错误

conf/font/noto/OFL.txt

@@ -11,7 +11,7 @@ SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
 
 PREAMBLE
 The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
+development of collaborative font projects, to support the font createion
 efforts of academic and linguistic communities, and to provide a free and
 open framework in which fonts may be shared and improved in partnership
 with others.

control/admin.py

@@ -10,7 +10,7 @@ from equipment.scan_garbage import write_gid_qr
 from equipment.scan_user import write_uid_qr, write_all_uid_qr
 from event import TkEventMain
 from sql.db import DB, search_from_garbage_checker_user
-from sql.garbage import (creat_new_garbage, search_from_garbage_view,
+from sql.garbage import (create_new_garbage, search_from_garbage_view,
                          del_garbage, del_garbage_not_use, del_garbage_wait_check, del_garbage_has_check,
 
                          del_garbage_where_scan_not_use, del_garbage_where_scan_wait_check,
@@ -20,7 +20,7 @@ from sql.garbage import (creat_new_garbage, search_from_garbage_view,
 
                          del_garbage_not_use_many, del_all_garbage, del_all_garbage_scan)
 
-from sql.user import (creat_new_user, del_user, del_user_from_where, del_user_from_where_scan,
+from sql.user import (create_new_user, del_user, del_user_from_where, del_user_from_where_scan,
                       search_user_by_fields, search_from_user_view)
 from tool.tk import make_font
 from tool.type_ import *
@@ -30,11 +30,11 @@ class AdminStationException(Exception):
     ...
 
 
-class CreatGarbageError(AdminStationException):
+class createGarbageError(AdminStationException):
     ...
 
 
-class CreatUserError(AdminStationException):
+class createUserError(AdminStationException):
     ...
 
 
@@ -47,12 +47,12 @@ class AdminStationBase(TkEventMain, metaclass=abc.ABCMeta):
     def get_db(self):
         return self._db
 
-    def creat_garbage(self, path: Optional[str], num: int = 1) -> List[tuple[str, Optional[GarbageBag]]]:
+    def create_garbage(self, path: Optional[str], num: int = 1) -> List[tuple[str, Optional[GarbageBag]]]:
         re = []
         for _ in range(num):
-            gar = creat_new_garbage(self._db)
+            gar = create_new_garbage(self._db)
             if gar is None:
-                raise CreatGarbageError
+                raise createGarbageError
             if path is not None:
                 res = write_gid_qr(gar.get_gid(), path, self._db)
                 re.append(res)
@@ -60,15 +60,15 @@ class AdminStationBase(TkEventMain, metaclass=abc.ABCMeta):
                 re.append(("", gar))
         return re
 
-    def creat_user(self, name: uname_t, passwd: passwd_t, phone: str, manager: bool) -> Optional[User]:
-        return creat_new_user(name, passwd, phone, manager, self._db)
+    def create_user(self, name: uname_t, passwd: passwd_t, phone: str, manager: bool) -> Optional[User]:
+        return create_new_user(name, passwd, phone, manager, self._db)
 
-    def creat_user_from_list(self, user_list: List[Tuple[uname_t, passwd_t, str]], manager: bool) -> List[User]:
+    def create_user_from_list(self, user_list: List[Tuple[uname_t, passwd_t, str]], manager: bool) -> List[User]:
         re = []
         for i in user_list:
-            user = creat_new_user(i[0], i[1], i[2], manager, self._db)
+            user = create_new_user(i[0], i[1], i[2], manager, self._db)
             if user is None:
-                raise CreatUserError
+                raise createUserError
             re.append(user)
         return re
 

control/admin_event.py

@@ -50,12 +50,12 @@ class TestProgressEvent(AdminEventBase):
         self.thread = TkThreading(self.func, 5)
 
 
-class CreatUserEvent(AdminEventBase):
+class createUserEvent(AdminEventBase):
     def func(self, name, passwd, phone, is_manager):
-        return self.station.creat_user(name, passwd, phone, is_manager)
+        return self.station.create_user(name, passwd, phone, is_manager)
 
     def __init__(self, station):
-        super(CreatUserEvent, self).__init__(station)
+        super(createUserEvent, self).__init__(station)
         self._name = None
 
     def start(self, name, passwd, phone, is_manager):
@@ -66,18 +66,18 @@ class CreatUserEvent(AdminEventBase):
     def done_after_event(self):
         res: Optional[User] = self.thread.wait_event()
         if res is None:
-            self.station.show_msg("CreatUserError", f"Can't not creat user: {self._name}", "Warning")
+            self.station.show_msg("createUserError", f"Can't not create user: {self._name}", "Warning")
         else:
             name = res.get_name()
-            self.station.show_msg("CreatUser", f"Creat user {name} success")
+            self.station.show_msg("createUser", f"create user {name} success")
 
 
-class CreatGarbageEvent(AdminEventBase):
+class createGarbageEvent(AdminEventBase):
     def func(self, path, count):
-        return self.station.creat_garbage(path, count)
+        return self.station.create_garbage(path, count)
 
     def __init__(self, station):
-        super(CreatGarbageEvent, self).__init__(station)
+        super(createGarbageEvent, self).__init__(station)
         self._name = None
 
     def start(self, path, count):
@@ -86,7 +86,7 @@ class CreatGarbageEvent(AdminEventBase):
 
     def done_after_event(self):
         res: list[tuple[str, Optional[GarbageBag]]] = self.thread.wait_event()
-        self.station.show_msg("CreatGarbage", f"Creat {len(res)} garbage finished.")
+        self.station.show_msg("createGarbage", f"create {len(res)} garbage finished.")
 
 
 class DelUserEvent(AdminEventBase):

control/admin_menu.py

@@ -49,18 +49,18 @@ class MainMenu(AdminMenu):
     def __init__(self, station, win, color):
         super().__init__(station, win, color, "Main")
         self.btn: List[tk.Button] = [tk.Button(self.frame) for _ in range(5)]
-        self.btn_name = ["Creat", "Delete", "Search", "Update", "Logout"]
+        self.btn_name = ["create", "Delete", "Search", "Update", "Logout"]
 
     def conf_gui(self, color: str, n: int = 1):
         super().conf_gui(color, n)
-        self.btn[0]['command'] = lambda: self.creat_command()
+        self.btn[0]['command'] = lambda: self.create_command()
         self.btn[1]['command'] = lambda: self.delete_command()
         self.btn[2]['command'] = lambda: self.search_command()
         self.btn[3]['command'] = lambda: self.update_command()
         self.btn[4]['command'] = lambda: self.logout_command()
 
-    def creat_command(self):
-        self.station.to_menu("Creat")
+    def create_command(self):
+        self.station.to_menu("create")
 
     def delete_command(self):
         self.station.to_menu("Delete")
@@ -75,30 +75,30 @@ class MainMenu(AdminMenu):
         self.station.logout()
 
 
-class CreatMenu(AdminMenu):
+class createMenu(AdminMenu):
     def __init__(self, station, win, color):
-        super().__init__(station, win, color, "Creat")
+        super().__init__(station, win, color, "create")
         self.btn: List[tk.Button] = [tk.Button(self.frame) for _ in range(4)]
         self.btn_name = ["NormalUser", "AutoNormalUser", "ManagerUser", "Garbage"]
 
     def conf_gui(self, color: str, n: int = 1):
         super().conf_gui(color, n)
-        self.btn[0]['command'] = lambda: self.creat_normal_user()
-        self.btn[1]['command'] = lambda: self.creat_auto_user()
-        self.btn[2]['command'] = lambda: self.creat_manager_user()
-        self.btn[3]['command'] = lambda: self.creat_garbage()
+        self.btn[0]['command'] = lambda: self.create_normal_user()
+        self.btn[1]['command'] = lambda: self.create_auto_user()
+        self.btn[2]['command'] = lambda: self.create_manager_user()
+        self.btn[3]['command'] = lambda: self.create_garbage()
 
-    def creat_normal_user(self):
-        self.station.to_program("CreatNormalUser")
+    def create_normal_user(self):
+        self.station.to_program("createNormalUser")
 
-    def creat_auto_user(self):
-        self.station.to_program("CreatAutoNormalUser")
+    def create_auto_user(self):
+        self.station.to_program("createAutoNormalUser")
 
-    def creat_manager_user(self):
-        self.station.to_program("CreatManagerUser")
+    def create_manager_user(self):
+        self.station.to_program("createManagerUser")
 
-    def creat_garbage(self):
-        self.station.to_program("CreatGarbage")
+    def create_garbage(self):
+        self.station.to_program("createGarbage")
 
 
 class DeleteMenu(AdminMenu):
@@ -201,4 +201,4 @@ class StatisticsMenu(AdminMenu):
         super().conf_gui(color, n)
 
 
-all_menu = [MainMenu, CreatMenu, DeleteMenu, SearchMenu, UpdateMenu, StatisticsMenu]
+all_menu = [MainMenu, createMenu, DeleteMenu, SearchMenu, UpdateMenu, StatisticsMenu]

control/admin_program.py

@@ -5,7 +5,7 @@ from tkinter.filedialog import askdirectory
 
 from tool.type_ import *
 from tool.tk import make_font, set_tk_disable_from_list
-from tool.login import creat_uid
+from tool.login import create_uid
 
 import conf
 import admin
@@ -88,7 +88,7 @@ class WelcomeProgram(AdminProgram):
         set_tk_disable_from_list(self.btn, flat='normal')
 
 
-class CreatUserProgramBase(AdminProgram):
+class createUserProgramBase(AdminProgram):
     def __init__(self, station, win, color, title: str):
         super().__init__(station, win, color, title)
 
@@ -96,7 +96,7 @@ class CreatUserProgramBase(AdminProgram):
         self.title: List[tk.Label] = [tk.Label(self.enter_frame) for _ in range(3)]
         self.enter: List[tk.Entry] = [tk.Entry(self.enter_frame) for _ in range(3)]
         self.var: List[tk.Variable] = [tk.StringVar() for _ in range(3)]
-        self.btn: List[tk.Button] = [tk.Button(self.frame) for _ in range(2)]  # creat(生成用户) try(计算uid)
+        self.btn: List[tk.Button] = [tk.Button(self.frame) for _ in range(2)]  # create(生成用户) try(计算uid)
 
         self._conf("#FA8072", False)  # 默认颜色
         self.__conf_font()
@@ -136,9 +136,9 @@ class CreatUserProgramBase(AdminProgram):
             height += 0.30
 
         for btn, text, x, func in zip(self.btn,
-                                      ["Creat", "GetUID"],
+                                      ["create", "GetUID"],
                                       [0.2, 0.6],
-                                      [lambda: self.creat_by_name(), lambda: self.get_uid()]):
+                                      [lambda: self.create_by_name(), lambda: self.get_uid()]):
             btn['font'] = btn_font
             btn['text'] = text
             btn['bg'] = conf.tk_btn_bg
@@ -156,12 +156,12 @@ class CreatUserProgramBase(AdminProgram):
 
         return name, passwd, phone
 
-    def creat_by_name(self):
+    def create_by_name(self):
         res = self.__get_info()
         if res is None:
             return
         name, passwd, phone = res
-        event = tk_event.CreatUserEvent(self.station).start(name, passwd, phone, self.is_manager)
+        event = tk_event.createUserEvent(self.station).start(name, passwd, phone, self.is_manager)
         self.station.push_event(event)
 
     def get_uid(self):
@@ -169,7 +169,7 @@ class CreatUserProgramBase(AdminProgram):
         if res is None:
             return
         name, passwd, phone = res
-        uid = creat_uid(name, passwd, phone)
+        uid = create_uid(name, passwd, phone)
         self.station.show_msg("UserID", f"UserName: {name}\nUserID: {uid}")
 
     def set_disable(self):
@@ -181,26 +181,26 @@ class CreatUserProgramBase(AdminProgram):
         set_tk_disable_from_list(self.enter, flat='normal')
 
 
-class CreatNormalUserProgram(CreatUserProgramBase):
+class createNormalUserProgram(createUserProgramBase):
     def __init__(self, station, win, color):
-        super(CreatNormalUserProgram, self).__init__(station, win, color, "CreatNormalUser")
+        super(createNormalUserProgram, self).__init__(station, win, color, "createNormalUser")
 
 
-class CreatManagerUserProgram(CreatUserProgramBase):
+class createManagerUserProgram(createUserProgramBase):
     def __init__(self, station, win, color):
-        super(CreatManagerUserProgram, self).__init__(station, win, color, "CreatManagerUser")
+        super(createManagerUserProgram, self).__init__(station, win, color, "createManagerUser")
         self._conf("#4b5cc4", True)
 
 
-class CreatAutoNormalUserProgram(AdminProgram):
+class createAutoNormalUserProgram(AdminProgram):
     def __init__(self, station, win, color):
-        super().__init__(station, win, color, "CreatAutoNormalUser")
+        super().__init__(station, win, color, "createAutoNormalUser")
 
         self.enter_frame = tk.Frame(self.frame)
         self.title: tk.Label = tk.Label(self.enter_frame)
         self.enter: tk.Entry = tk.Entry(self.enter_frame)
         self.var: tk.Variable = tk.StringVar()
-        self.btn: tk.Button = tk.Button(self.frame)  # creat(生成用户) try(计算uid)
+        self.btn: tk.Button = tk.Button(self.frame)  # create(生成用户) try(计算uid)
 
         self.__conf_font()
 
@@ -231,16 +231,16 @@ class CreatAutoNormalUserProgram(AdminProgram):
         self.enter.place(relx=0.30, rely=0.2, relwidth=0.60, relheight=0.48)
 
         self.btn['font'] = btn_font
-        self.btn['text'] = "Creat"
+        self.btn['text'] = "create"
         self.btn['bg'] = conf.tk_btn_bg
-        self.btn['command'] = lambda: self.creat_user()
+        self.btn['command'] = lambda: self.create_user()
         self.btn.place(relx=0.4, rely=0.7, relwidth=0.2, relheight=0.08)
 
-    def creat_user(self):
+    def create_user(self):
         phone = self.var.get()
         if len(phone) != 11:
             self.station.show_msg("UserInfoError", "Please, enter Phone(11)")
-        event = tk_event.CreatUserEvent(self.station).start(None, None, phone, False)
+        event = tk_event.createUserEvent(self.station).start(None, None, phone, False)
         self.station.push_event(event)
 
     def set_disable(self):
@@ -252,15 +252,15 @@ class CreatAutoNormalUserProgram(AdminProgram):
         self.enter['state'] = 'normal'
 
 
-class CreatGarbageProgram(AdminProgram):
+class createGarbageProgram(AdminProgram):
     def __init__(self, station, win, color):
-        super().__init__(station, win, color, "CreatGarbage")
+        super().__init__(station, win, color, "createGarbage")
 
         self.enter_frame = tk.Frame(self.frame)
         self.title: List[tk.Label] = [tk.Label(self.enter_frame), tk.Label(self.enter_frame)]
         self.enter: List[tk.Entry] = [tk.Entry(self.enter_frame), tk.Entry(self.enter_frame)]
         self.var: List[tk.Variable] = [tk.StringVar(), tk.StringVar()]
-        self.creat_btn: tk.Button = tk.Button(self.frame)
+        self.create_btn: tk.Button = tk.Button(self.frame)
         self.file_btn: tk.Button = tk.Button(self.frame)
 
         self.__conf_font()
@@ -294,10 +294,10 @@ class CreatGarbageProgram(AdminProgram):
             enter.place(relx=0.35, rely=height, relwidth=0.60, relheight=0.35)
             height += 0.43
 
-        for btn, text, x, func in zip([self.creat_btn, self.file_btn],
-                                      ["Creat", "ChoosePath"],
+        for btn, text, x, func in zip([self.create_btn, self.file_btn],
+                                      ["create", "ChoosePath"],
                                       [0.2, 0.6],
-                                      [lambda: self.creat_garbage(), lambda: self.choose_file()]):
+                                      [lambda: self.create_garbage(), lambda: self.choose_file()]):
             btn['font'] = btn_font
             btn['text'] = text
             btn['bg'] = conf.tk_btn_bg
@@ -308,7 +308,7 @@ class CreatGarbageProgram(AdminProgram):
         path = askdirectory(title='path to save qr code')
         self.var[1].set(path)
 
-    def creat_garbage(self):
+    def create_garbage(self):
         try:
             count = int(self.var[0].get())
             if count <= 0:
@@ -319,16 +319,16 @@ class CreatGarbageProgram(AdminProgram):
             path = self.var[1].get()
             if len(path) == 0:
                 path = None
-            event = tk_event.CreatGarbageEvent(self.station).start(path, count)
+            event = tk_event.createGarbageEvent(self.station).start(path, count)
             self.station.push_event(event)
 
     def set_disable(self):
-        self.creat_btn['state'] = 'disable'
+        self.create_btn['state'] = 'disable'
         self.file_btn['state'] = 'disable'
         set_tk_disable_from_list(self.enter)
 
     def reset_disable(self):
-        self.creat_btn['state'] = 'normal'
+        self.create_btn['state'] = 'normal'
         self.file_btn['state'] = 'normal'
         set_tk_disable_from_list(self.enter, flat='normal')
 
@@ -421,7 +421,7 @@ class DeleteUserProgram(AdminProgram):
         if len(name) == 0 or len(passwd) == 0:
             self.station.show_msg("UserName/Password Error", "You should enter UserName and Password", "Error")
             return
-        uid = creat_uid(name, passwd)
+        uid = create_uid(name, passwd)
         event = tk_event.DelUserEvent(self.station).start(uid)
         self.station.push_event(event)
 
@@ -1024,7 +1024,8 @@ class SearchGarbageProgram(SearchBaseProgram):
 class SearchGarbageAdvancedProgram(SearchAdvancedProgramBase):
     def __init__(self, station, win, color):
         super(SearchGarbageAdvancedProgram, self).__init__(station, win, color, "SearchGarbageAdvanced")
-        columns = ["GarbageID", "UserID", "CheckerID", "CreatTime", "UseTime", "Location", "GarbageType", "CheckResult"]
+        columns = ["GarbageID", "UserID", "CheckerID", "createTime", "UseTime", "Location", "GarbageType",
+                   "CheckResult"]
         self._conf(columns, '#d1923f')
 
     def search(self):
@@ -1322,8 +1323,8 @@ class UpdateGarbageCheckResultProgram(AdminProgram):
         self.where_enter['state'] = 'normal'
 
 
-all_program = [WelcomeProgram, CreatNormalUserProgram, CreatManagerUserProgram, CreatAutoNormalUserProgram,
-               CreatGarbageProgram, DeleteUserProgram, DeleteUsersProgram, DeleteGarbageProgram,
+all_program = [WelcomeProgram, createNormalUserProgram, createManagerUserProgram, createAutoNormalUserProgram,
+               createGarbageProgram, DeleteUserProgram, DeleteUsersProgram, DeleteGarbageProgram,
                DeleteGarbageMoreProgram, DeleteAllGarbageProgram, SearchUserProgram, SearchUserAdvancedProgram,
                SearchGarbageProgram, SearchGarbageAdvancedProgram, SearchAdvancedProgram, UpdateUserScoreBase,
                UpdateUserReputationBase, UpdateGarbageTypeProgram, UpdateGarbageCheckResultProgram]

control/ranking.py

@@ -198,12 +198,12 @@ class RankingStation(RankingStationBase):
         self.prev_btn: bool = True
 
         self.__conf_font_size()
-        self.__creat_tk()
+        self.__create_tk()
         self.__conf_tk()
 
         self.show_rank_first()
 
-    def __creat_tk(self):
+    def __create_tk(self):
         self.rank_frame = tk.Frame(self.window)
         self.rank_title = tk.Label(self.rank_frame)
         self.rank_title_var = tk.StringVar()

control/station.py

@@ -468,14 +468,14 @@ class GarbageStation(GarbageStationBase):
         self._disable_all_btn: bool = False  # 禁用所有按钮和操作
 
         self.__conf_font_size()
-        self.__creat_tk()
+        self.__create_tk()
         self.__conf_tk()
 
         self.__conf_after()
         self.__conf_set_after_run()
         self.__switch_to_no_user()
 
-    def __creat_tk(self):
+    def __create_tk(self):
         self._title_label = tk.Label(self._window)
         self._win_ctrl_button: List[tk.Button, tk.Button, tk.Button] = [tk.Button(self._window),
                                                                         tk.Button(self._window),

sql/garbage.py

@@ -15,7 +15,6 @@ def search_from_garbage_view(columns, where: str, db: DB):
         where = f"WHERE {where} "
 
     column = ", ".join(columns)
-    print(f"SELECT {column} FROM garbage_view {where};")
     cur = db.search(f"SELECT {column} FROM garbage_view {where};")
     if cur is None:
         return None
@@ -144,7 +143,7 @@ def update_garbage(garbage: GarbageBag, db: DB) -> bool:
     return True
 
 
-def creat_new_garbage(db: DB) -> Optional[GarbageBag]:
+def create_new_garbage(db: DB) -> Optional[GarbageBag]:
     cur = db.done("INSERT INTO garbage() VALUES ();")
     if cur is None:
         return None
@@ -271,7 +270,7 @@ def del_garbage_not_use_many(gid_from: gid_t, gid_to: gid_t, db: DB) -> int:
 
 if __name__ == '__main__':
     mysql_db = DB()
-    bag = creat_new_garbage(mysql_db)
+    bag = create_new_garbage(mysql_db)
     print(bag)
     bag.config_use(GarbageType.recyclable, HGSTime(), "1e1d30a1f9b78c8fa852d19b4cfaee79", "HuaDu")
     update_garbage(bag, mysql_db)

sql/user.py

@@ -1,6 +1,6 @@
 from db import DB, DBBit
 from tool.type_ import *
-from tool.login import creat_uid, randomPassword
+from tool.login import create_uid, randomPassword
 from core.user import NormalUser, ManagerUser, User
 import conf
 from garbage import count_garbage_by_time
@@ -60,7 +60,7 @@ def find_user_by_id(uid: uid_t, db: DB) -> Optional[User]:
 
 
 def find_user_by_name(name: uname_t, passwd: passwd_t, db: DB) -> Optional[User]:
-    uid = creat_uid(name, passwd)
+    uid = create_uid(name, passwd)
     return find_user_by_id(uid, db)
 
 
@@ -94,15 +94,15 @@ def update_user(user: User, db: DB) -> bool:
     return cur is not None
 
 
-def creat_new_user(name: Optional[uname_t], passwd: Optional[passwd_t], phone: phone_t,
-                   manager: bool, db: DB) -> Optional[User]:
+def create_new_user(name: Optional[uname_t], passwd: Optional[passwd_t], phone: phone_t,
+                    manager: bool, db: DB) -> Optional[User]:
     if name is None:
         name = f'User-{phone[-6:]}'
 
     if passwd is None:
         passwd = randomPassword()
 
-    uid = creat_uid(name, passwd)
+    uid = create_uid(name, passwd)
     if is_user_exists(uid, db):
         return None
     is_manager = '1' if manager else '0'
@@ -158,7 +158,7 @@ if __name__ == '__main__':
     name_ = 'Huan12'
     usr = find_user_by_name(name_, "123", mysql_db)
     if usr is None:
-        usr = creat_new_user(name_, "123", "12345678900", False, mysql_db)
+        usr = create_new_user(name_, "123", "12345678900", False, mysql_db)
     print(usr)
 
     for i in range(9):

tool/login.py

@@ -4,12 +4,12 @@ import conf
 from random import randint
 
 
-def creat_uid(name: uname_t, passwd: passwd_t, salt: str = conf.passwd_salt) -> str:
+def create_uid(name: uname_t, passwd: passwd_t, salt: str = conf.passwd_salt) -> str:
     return hashlib.md5(f"HGSSystem-USER{name}-PASSWORD:{passwd}-{salt}-END".encode('utf-8')).hexdigest()
 
 
 def check_login(uid: uid_t, name: uname_t, passwd: passwd_t, salt: str = conf.passwd_salt) -> bool:
-    return uid == creat_uid(name, passwd, salt)
+    return uid == create_uid(name, passwd, salt)
 
 
 def randomPassword():