Modified deserialization functions for the future GUI app.

Author: Shararamosh

flatc_funcs.py

@@ -9,13 +9,14 @@
 from i18n import t
 
 
-def deserialize(flatc_path: str, schema_path: str, binary_path: str, output_path: str = "") -> dict:
+def deserialize(flatc_path: str, schema_path: str, binary_path: str, output_path: str = "", return_dict = True) -> dict:
     """
     Десериализация бинарного файла, используя схему Flatbuffers.
     :param flatc_path: Путь к компилятору схемы.
     :param schema_path: Путь к файлу схемы.
     :param binary_path: Путь к бинарному файлу.
     :param output_path: Путь к директории вывода.
+    :param return_dict: Если True, возвращать словарь из прочитанного файла. Иначе - путь к файлу.
     :return: Десериализованный бинарный файл в виде словаря.
     """
     flatc_path = os.path.abspath(flatc_path)
@@ -32,7 +33,7 @@ def deserialize(flatc_path: str, schema_path: str, binary_path: str, output_path
         pass
     args = [flatc_path]
     if output_path == "":
-        output_path = binary_path
+        output_path = os.path.dirname(binary_path)
     output_path += os.sep
     args += ["--raw-binary"]
     args += ["-o", output_path]
@@ -45,19 +46,27 @@ def deserialize(flatc_path: str, schema_path: str, binary_path: str, output_path
         info(t("flatc_funcs.run_error"), " ".join(cpe.cmd), cpe.returncode)
         if cpe.stderr is not None and cpe.stderr != "":
             info(cpe.stderr)
-        return {}
+        if return_dict:
+            return {}
+        return ""
     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):
         info(t("flatc_funcs.json_error"), binary_path)
-        return {}
+        if return_dict:
+            return {}
+        return ""
     try:
         with open(json_path, "rb") as json_file:
             current_json_contents = json_file.read()
     except OSError:
         info(t("main.file_failed_to_open"), json_path)
-        return {}
+        if return_dict:
+            return {}
+        return ""
     if current_json_contents != previous_json_contents:
         info(t("flatc_funcs.json_ok"), binary_path, json_path)
-    return loads(current_json_contents.decode("utf-8"))
+    if return_dict:
+        return loads(current_json_contents.decode("utf-8"))
+    return json_path

main.py

@@ -194,23 +194,35 @@ def get_schema_paths(root_path: str) -> list[str]:
     return schema_paths
 
 
-def get_binary_tuples(binaries_path: str, schema_paths: list[str]) -> list[tuple[str, str]]:
+def get_binary_tuples(binary_paths: list[str], schema_paths: list[str]) -> list[tuple[str, str]]:
     """
     Получение списка кортежей из двух элементов: (путь к бинарному файлу, путь к соответствующему ему файлу схемы)
-    :param binaries_path: Список путей к бинарным файлам.
+    :param binary_paths: Список путей к бинарным файлам или директориям с ними.
     :param schema_paths: Список путей к файлам схем.
     :return: Кортеж из двух строковых элементов.
     """
     binary_tuples = []
-    for subdir, _, files in os.walk(binaries_path):
-        for file in files:
-            file_path = os.path.abspath(os.path.join(subdir, file))
+    for _, binary_path in enumerate(binary_paths):
+        if os.path.isfile(binary_path):
+            file_path = os.path.abspath(binary_path)
             for schema_path in schema_paths:
                 schema_ext = os.path.splitext(os.path.basename(schema_path))[0]
-                file_ext = os.path.splitext(file)[1][1:]
+                file_ext = os.path.splitext(file_path)[1][1:]
                 if schema_ext.casefold() == file_ext.casefold():
                     binary_tuples.append((file_path, schema_path))
                     break
+            continue
+        if not os.path.isdir(binary_path):
+            continue
+        for subdir, _, files in os.walk(binary_path):
+            for file in files:
+                file_path = os.path.abspath(os.path.join(subdir, file))
+                for schema_path in schema_paths:
+                    schema_ext = os.path.splitext(os.path.basename(schema_path))[0]
+                    file_ext = os.path.splitext(file_path)[1][1:]
+                    if schema_ext.casefold() == file_ext.casefold():
+                        binary_tuples.append((file_path, schema_path))
+                        break
     return binary_tuples
 
 
@@ -252,7 +264,7 @@ def execute_deserialize_batch(flatc_path: str, schemas_path: str, binaries_path:
     if len(schema_paths) < 1:
         logging.info(i18n.t("main.no_schema_files_found"), binaries_path)
         return os.EX_OK
-    binary_tuples = get_binary_tuples(binaries_path, schema_paths)
+    binary_tuples = get_binary_tuples([binaries_path], schema_paths)
     with logging_redirect_tqdm():
         pbar = tqdm(total=len(binary_tuples), desc=i18n.t("main.files"))
         with ThreadPoolExecutor() as executor: