From dafb1779b6b4066e950d28dfe204ad7f657fee30 Mon Sep 17 00:00:00 2001 From: gitea Date: Wed, 26 Feb 2025 15:12:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=93=E6=96=87=E4=BB=B6=202.=20=E4=BF=AE=E6=94=B9clibs.py?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=A5=E9=80=82=E5=BA=94=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E6=9E=84=E5=BB=BA=203.=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=96=87=E4=BB=B6=E5=B9=B6=E5=9C=A8aio.py?= =?UTF-8?q?=E4=B8=AD=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/files/version/requirements.txt | 1 + assets/files/version/{vers => version} | 0 code/aio.py | 2 +- code/common/clibs.py | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) rename assets/files/version/{vers => version} (100%) diff --git a/assets/files/version/requirements.txt b/assets/files/version/requirements.txt index 617ee82..8660c7f 100644 --- a/assets/files/version/requirements.txt +++ b/assets/files/version/requirements.txt @@ -8,3 +8,4 @@ paramiko==3.5.0 pdfplumber==0.11.5 Pillow==11.1.0 pymodbus==3.8.3 +pyinstaller==6.12.0 diff --git a/assets/files/version/vers b/assets/files/version/version similarity index 100% rename from assets/files/version/vers rename to assets/files/version/version diff --git a/code/aio.py b/code/aio.py index e744736..e50b59d 100644 --- a/code/aio.py +++ b/code/aio.py @@ -133,7 +133,7 @@ class App: self.popupmenu_output.add_command(label="剪切", accelerator="Ctrl+X", font=self.f_treeview, command=lambda: self.__cut(self.text_output)) self.popupmenu_output.add_command(label="粘贴", accelerator="Ctrl+V", font=self.f_treeview, command=lambda: self.__paste(self.text_output)) # ======================================================================== - with open(f"{clibs.PREFIX}/files/version/vers", mode="r", encoding="utf-8") as f: + with open(f"{clibs.PREFIX}/files/version/version", mode="r", encoding="utf-8") as f: local_vers = f.read().strip() _version, _update = local_vers.split("@") _text = f" v{_version} Update@{_update}" diff --git a/code/common/clibs.py b/code/common/clibs.py index 99d2715..73b7772 100644 --- a/code/common/clibs.py +++ b/code/common/clibs.py @@ -66,8 +66,8 @@ def insert_logdb(_level, _module, _content): cursor.execute("insert into logs (level, module, content) values (?, ?, ?)", data) -# PREFIX = 'assets' # for pyinstaller packaging -PREFIX = '../assets' # for source code testing and debug +PREFIX = "assets" # for pyinstaller packaging +# PREFIX = "../assets" # for source code testing and debug log_path = f"{PREFIX}/logs" levels = ["DEBUG", "INFO", "WARNING", "ERROR"] db_state = "readwrite"