Merged 2 destination files buttons into one called "Rename selected", added building GUI executable action.

Shararamosh · Shararamosh · commit 0755a4bf3a59 · 2025-03-06T20:53:43.000+03:00
diff --git a/.github/workflows/build_executable.yml b/.github/workflows/build_executable.yml
@@ -25,11 +25,20 @@ jobs:
           pyinstaller --onefile --name="flatc_deserializer" --console --icon=images\flatbuffers-logo-clean.png --add-data="images:images" --add-data="localization:localization" flatc_deserializer.py
           pyinstaller --onefile --name="flatc_downloader" --console --icon=images\flatbuffers-downloader-logo-clean.png --add-data="images:images" --add-data="localization:localization" flatc_downloader.py
           pyinstaller --onefile --name="flatc_deserializer_batch" --console --icon=images\flatbuffers-batch-logo-clean.png --add-data="images:images" --add-data="localization:localization" flatc_deserializer_batch.py
-      - name: Move Deserializer and Downloader Executables from dist to root directory and delete dist directory
+      - name: Install additional GUI requirements
+        run: |
+          pip install -r requirements_frontend.txt
+          pip install pywinstyles
+      - name: Run PyInstaller for GUI
+        run: |
+          set PYTHONOPTIMIZE=2
+          pyinstaller --onefile --noconsole --name="flatc_deserializer_frontend" --console --hiddenimport pywinstyles --icon=images\flatbuffers-logo-clean.png --add-data="images:images" --add-data="localization:localization" flatc_deserializer_frontend.py
+      - name: Move Executables from dist to root directory and delete dist directory
         run: |
           move dist\flatc_deserializer.exe .
           move dist\flatc_downloader.exe .
           move dist\flatc_deserializer_batch.exe .
+          move dist\flatc_deserializer_frontend.exe .
           rd /s /q dist
         shell: cmd
       - name: Create Automatic Windows Release
@@ -42,4 +51,5 @@ jobs:
           files: |
             flatc_deserializer.exe
             flatc_downloader.exe
-            flatc_deserializer_batch.exe
+            flatc_deserializer_batch.exe
+            flatc_deserializer_frontend.exe
diff --git a/.github/workflows/build_executable_nuitka.yml b/.github/workflows/build_executable_nuitka.yml
@@ -52,11 +52,29 @@ jobs:
             localization=localization
             images=images
           windows-icon-from-ico: images/flatbuffers-batch-logo-clean.png
+      - name: Install additional GUI requirements
+        run: |
+          pip install -r requirements_frontend.txt
+          pip install pywinstyles
+      - name: Run Nuitka for GUI
+        uses: Nuitka/Nuitka-Action@main
+        with:
+          nuitka-version: main
+          script-name: flatc_deserializer_frontend.py
+          mode: app
+          windows-console-mode: disable
+          enable-plugins: tk-inter
+          include-package: pywinstyles
+          include-data-dir: |
+            localization=localization
+            images=images
+          windows-icon-from-ico: images/flatbuffers-logo-clean.png
       - name: Move Executables from build to root directory
         run: |
           move build\flatc_deserializer.exe .
           move build\flatc_deserializer_batch.exe .
           move build\flatc_downloader.exe .
+          move build\flatc_deserializer_frontend.exe .
           rd /s /q build
         shell: cmd
       - name: Create Automatic Windows Release
@@ -69,4 +87,5 @@ jobs:
           files: |
             flatc_deserializer.exe
             flatc_deserializer_batch.exe
-            flatc_downloader.exe
+            flatc_downloader.exe
+            flatc_deserializer_frontend.exe
diff --git a/README.MD b/README.MD
@@ -1,10 +1,17 @@
 # Flatbuffers Deserializer
-Set of console tools for batch deserialization of Flatbuffers binary files using pre-defined schemas and downloading latest version of Flatbuffers schema compiler written in Python.
+Set of console tools and single combined GUI for the following:
+1. Downloading latest version of Flatbuffers schema compiler.
+2. Batch deserializing binary Flatbuffers files using imported schemas.
+
 ## Requirements:
 - [Python 3.11+](https://www.python.org/)
 - [Pillow](https://pypi.org/project/pillow/)
 - [tqdm](https://pypi.org/project/tqdm/)
 - [i18nice[YAML]](https://pypi.org/project/i18nice/)
+### GUI only:
+- [customtkinter](https://pypi.org/project/customtkinter/)
+- [CTkMenuBar](https://pypi.org/project/CTkMenuBar/)
+- [CTkMessagebox](https://pypi.org/project/CTkMessagebox/)
 ## Latest Windows releases:
 - [PyInstaller](https://github.com/Shararamosh/flatc_deserializer/releases/tag/latest)
 - [Nuitka](https://github.com/Shararamosh/flatc_deserializer/releases/tag/latest-nuitka)
diff --git a/flatc_deserializer_frontend.py b/flatc_deserializer_frontend.py
@@ -127,7 +127,7 @@ def _create_src_binaries_frame(self, src_files_frame: ttk.LabelFrame) -> ttk.Lab
         src_binaries_frame.grid(row=0, column=0, padx=10, pady=10, sticky=NSEW)
         self.src_binaries_table = ttk.Treeview(src_binaries_frame, columns=("file", "file_size"),
                                                show="headings")
-        self.src_binaries_table.heading("file", text=t("frontend.source_file_loc"))
+        self.src_binaries_table.heading("file", text=t("frontend.file_loc"))
         self.src_binaries_table.heading("file_size", text=t("frontend.file_size"))
         src_binaries_frame.grid_rowconfigure(0, weight=1)
         src_binaries_frame.grid_rowconfigure(1, weight=1)
@@ -206,24 +206,20 @@ def _create_dest_binaries_frame(self, dest_files_frame: ttk.LabelFrame) -> ttk.L
         self.dest_binaries_table = ttk.Treeview(dest_binaries_frame,
                                                 columns=("file", "result", "file_size"),
                                                 show="headings", selectmode="browse")
-        self.dest_binaries_table.heading("file", text=t("frontend.destination_file_loc"))
+        self.dest_binaries_table.heading("file", text=t("frontend.file_loc"))
         self.dest_binaries_table.heading("result", text=t("frontend.result"))
         self.dest_binaries_table.heading("file_size", text=t("frontend.file_size"))
         dest_binaries_frame.grid_rowconfigure(0, weight=1)
         dest_binaries_frame.grid_rowconfigure(1, weight=1)
         dest_binaries_frame.grid_columnconfigure(0, weight=1)
-        dest_binaries_frame.grid_columnconfigure(1, weight=1)
         dest_binaries_frame.grid_propagate(False)
         self.dest_binaries_table.grid(row=0, column=0, columnspan=2, padx=10, pady=10,
                                       sticky=NSEW)
         attempt_apply_dnd(self.dest_binaries_table.winfo_id(), self.on_binary_dropped)
-        dest_binaries_change_dest_btn = CTkButton(dest_binaries_frame,
-                                                  text=t("frontend.button_change_dest"))
-        dest_binaries_change_dest_btn.grid(row=1, column=0, padx=10, pady=10, sticky=EW)
-        dest_binaries_change_dest_btn.configure(command=self.on_change_dest_click)
-        dest_binaries_rename_btn = CTkButton(dest_binaries_frame,
-                                             text=t("frontend.button_rename_file"))
-        dest_binaries_rename_btn.grid(row=1, column=1, padx=10, pady=10, sticky=EW)
+        dest_binaries_change_btn = CTkButton(dest_binaries_frame,
+                                             text=t("frontend.button_change_dest"))
+        dest_binaries_change_btn.grid(row=1, column=0, padx=10, pady=10, sticky=EW)
+        dest_binaries_change_btn.configure(command=self.on_change_dest_click)
         return dest_binaries_frame
 
     @staticmethod
@@ -323,10 +319,13 @@ def on_change_dest_click(self):
         for selected_item in selected_items:
             file_path = self.dest_binaries_table.set(selected_item, 0)
             file_dir, file_name = os.path.split(file_path)
-            dest_dir = tkinter.filedialog.askdirectory(title=t("main.tkinter_output_select"),
-                                                       initialdir=file_dir)
-            if os.path.isdir(dest_dir):
-                new_file_path = os.path.abspath(os.path.join(dest_dir, file_name))
+            new_file_path = tkinter.filedialog.asksaveasfilename(
+                title=t("main.tkinter_output_select"),
+                defaultextension=".json",
+                initialdir=file_dir, initialfile=file_name,
+                filetypes=[(t("main.json_filetype"), "*.json")])
+            if new_file_path != "":
+                new_file_path = os.path.abspath(os.path.splitext(new_file_path)[0] + ".json")
                 self.dest_binaries_table.set(selected_item, 0, new_file_path)
                 if os.path.isfile(new_file_path):
                     self.dest_binaries_table.set(selected_item, 1,
@@ -336,6 +335,7 @@ def on_change_dest_click(self):
                                                          os.path.getsize(new_file_path) / 1024))
                 else:
                     self.dest_binaries_table.set(selected_item, 1, "")
+                    self.dest_binaries_table.set(selected_item, 2, "")
                 self.dest_binaries_table.update()
 
     def on_binary_dropped(self, paths: list[str]):
diff --git a/flatc_funcs.py b/flatc_funcs.py
@@ -1,7 +1,9 @@
 """
     Модуль, включающий в себя функции для работы с Flatbuffers (flatc.exe).
 """
+# pylint: disable=too-many-branches
 import os
+import shutil
 from json import loads
 from logging import info
 from subprocess import run, CalledProcessError
@@ -16,7 +18,7 @@ def deserialize(flatc_path: str, schema_path: str, binary_path: str, output_path
     :param flatc_path: Путь к компилятору схемы.
     :param schema_path: Путь к файлу схемы.
     :param binary_path: Путь к бинарному файлу.
-    :param output_path: Путь к директории вывода.
+    :param output_path: Путь к директории или файлу вывода.
     :param return_dict: Если True, возвращать словарь из прочитанного файла. Иначе - путь к файлу.
     :return: Десериализованный бинарный файл в виде словаря.
     """
@@ -28,22 +30,28 @@ def deserialize(flatc_path: str, schema_path: str, binary_path: str, output_path
     binary_path = os.path.abspath(binary_path)
     binary_name = os.path.splitext(os.path.basename(binary_path))[0]
     output_path = os.path.abspath(output_path)
-    json_path = os.path.abspath(os.path.join(output_path, binary_name + ".json"))
-    previous_json_contents = None
-    try:
-        with open(json_path, "rb") as json_file:
-            previous_json_contents = json_file.read()
-    except OSError:
-        pass
-    args = [flatc_path]
     if output_path == "":
         output_path = os.path.dirname(binary_path)
+        json_path = os.path.join(output_path, binary_name + ".json")
+    elif os.path.splitext(output_path)[1].lower() == ".json":
+        output_path = os.path.dirname(output_path)
+        json_path = output_path
+    elif os.path.isfile(output_path):
+        return {} if return_dict else ""
+    else:
+        json_path = os.path.join(output_path, binary_name + ".json")
     output_path += os.sep
+    args = [flatc_path]
     args += ["--raw-binary"]
     args += ["-o", output_path]
     args += ["--strict-json"]
     args += ["-t", schema_path]
     args += ["--", binary_path]
+    output_json_path = os.path.join(output_path, binary_name + ".json")
+    previous_json_contents = None
+    if os.path.isfile(output_json_path):
+        with open(output_json_path, "rb") as file:
+            previous_json_contents = file.read()
     try:
         proc = run(args, shell=False, capture_output=True, text=True, check=True)
     except CalledProcessError as cpe:
@@ -54,9 +62,13 @@ def deserialize(flatc_path: str, schema_path: str, binary_path: str, output_path
     if proc.stdout is not None and proc.stdout != "":
         info(t("flatc_funcs.run_ok"), " ".join(args))
         info(proc.stdout)
-    if not os.path.isfile(json_path):
+    if not os.path.isfile(output_json_path):
         info(t("flatc_funcs.json_error"), binary_path)
         return {} if return_dict else ""
+    if previous_json_contents is not None and not os.path.samefile(output_json_path, json_path):
+        shutil.copy(output_json_path, json_path)
+        with open(output_json_path, "wb") as file:
+            file.write(previous_json_contents)
     try:
         with open(json_path, "rb") as json_file:
             current_json_contents = json_file.read()
diff --git a/localization/en_US/frontend.yml b/localization/en_US/frontend.yml
@@ -3,15 +3,14 @@ source_files: Source files
 source_binaries: Source binary files
 source_schemas: Source schemas
 destination_files: Destination files
-destination_binaries: Destination binary files
+destination_binaries: Destination JSON files
 deserialize: Deserialize
 destination_options: Destination file options
 button_add: Add...
 button_remove_selected: Remove selected
 button_remove_all: Remove all
 file_size: File size
-source_file_loc: Source file location
-destination_file_loc: Destination file location
+file_loc: File location
 result: Result
 size_kb: "%0.2f KBs"
 file_already_exists: File already exists
@@ -21,5 +20,4 @@ result_done: Done
 result_error: Error
 result_binary_not_found: Source file not found
 schema_not_found: Schema not found
-button_change_dest: Change destination directory
-button_rename_file: Rename selected file
+button_change_dest: Rename selected
diff --git a/localization/en_US/main.yml b/localization/en_US/main.yml
@@ -2,6 +2,7 @@ tkinter_flatc_select: Select schema compiler
 exe_filetype: Windows Executable
 tkinter_fbs_select: Select schema file
 tkinter_fbs_multiple_select: Select schema files
+json_filetype: JSON
 fbs_filetype: Flatbuffers schema
 tkinter_binaries_select: Select binary files
 flatc_binary_filetype: Binary Flatbuffers file
diff --git a/localization/ru_RU/frontend.yml b/localization/ru_RU/frontend.yml
@@ -3,15 +3,14 @@ source_files: Исходные файлы
 source_binaries: Исходные бинарные файлы
 source_schemas: Исходные схемы
 destination_files: Файлы назначения
-destination_binaries: Бинарные файлы назначения
+destination_binaries: JSON-файлы назначения
 deserialize: Десериализовать
 destination_options: Опции файлов назначения
 button_add: Добавить...
 button_remove_selected: Удалить выбранные
 button_remove_all: Удалить все
 file_size: Размер файла
-source_file_loc: Расположение исходного файла
-destination_file_loc: Расположение файла назначения
+file_loc: Расположение файла
 result: Результат
 size_kb: "%0.2f КБ"
 file_already_exists: Файл уже существует
@@ -21,5 +20,4 @@ result_done: Завершено
 result_error: Ошибка
 result_binary_not_found: Исходный файл не найден
 schema_not_found: Схема не найдена
-button_change_dest: Изменить директорию назначения
-button_rename_file: Переименовать выбранный файл
+button_change_dest: Переименовать выбранный
diff --git a/localization/ru_RU/main.yml b/localization/ru_RU/main.yml
@@ -2,6 +2,7 @@ tkinter_flatc_select: Выбор компилятора схемы
 exe_filetype: Приложение Windows
 tkinter_fbs_select: Выбор файла схемы
 tkinter_fbs_multiple_select: Выбор файлов схем
+json_filetype: JSON
 fbs_filetype: Схема Flatbuffers
 tkinter_binaries_select: Выбор бинарных файлов
 flatc_binary_filetype: Бинарный файл Flatbuffers
diff --git a/requirements.txt b/requirements.txt
@@ -2,8 +2,4 @@ pillow
 tqdm
 i18nice[YAML]
 future
-argparse
-customtkinter
-CTkMenuBar
-pywinstyles
-CTkMessagebox
+argparse
diff --git a/requirements_frontend.txt b/requirements_frontend.txt
@@ -0,0 +1,3 @@
+customtkinter
+CTkMenuBar
+CTkMessagebox

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+customtkinter`
	`2`	`+CTkMenuBar`
	`3`	`+CTkMessagebox`