fixed

Author: dingyifei

Converter_UI.py

@@ -24,6 +24,7 @@ def main():
     vex_save_folder = StringVar()
     vex_save_name = StringVar()
     replace = BooleanVar()
+    progress = StringVar()
 
     # Column 1
     status_label = Label(mainframe, text="Status: ")
@@ -46,9 +47,8 @@ def main():
 
     def extract_decode():
         if temp_folder.get() != "":
-            dot_vex_convert.DEFAULT_TEMP_FILE_LOCATION = temp_folder.get()
-        dot_vex_convert.extract_dot_vex(vex_open.get(), code_folder.get(), progress_show_label)
-        progress_show_label["text"] = "extract complete"
+            dot_vex_convert.temp_location = temp_folder.get()
+        dot_vex_convert.extract_dot_vex(vex_open.get(), code_folder.get(),temp_folder.get(), progress.set)
 
     extract_decode_button = Button(
         mainframe, text="Extract and Decode", command=extract_decode)
@@ -83,13 +83,14 @@ def extract_decode():
 
     def convert_to_dot_vex():
         if temp_folder.get != "":
-            dot_vex_convert.DEFAULT_TEMP_FILE_LOCATION = temp_folder.get()
+            dot_vex_convert.temp_location = temp_folder.get()
         dot_vex_convert.update_dot_vex(
             vex_open.get(),
             vex_save_folder.get(),
             vex_save_name.get(),
             code_folder.get(),
-            progress_show_label["text"])
+            temp_folder.get(),
+            progress.set)
 
     convert_vex_button = Button(mainframe, text="Convert to .vex File", command=convert_to_dot_vex)
     convert_vex_button.grid(column=2, row=7, sticky=(N, E))
@@ -111,7 +112,7 @@ def replace_command():
                                    text="replace old .vex file", command=replace_command, variable=replace)
     replace_checkbox.grid(column=2, row=8, sticky=(W, N))
 
-    progress_show_label = Label(mainframe, text="")
+    progress_show_label = Label(mainframe, textvariable = progress)
     progress_show_label.grid(column=2, row=9, sticky=(W, N))
 
     # Column 3

dot_vex_convert.py

@@ -7,10 +7,9 @@
 import base64
 import os
 
-DEFAULT_TEMP_FILE_LOCATION = "./temp/"
 
 
-def extract_dot_vex(vex_file_location: str, save_folder_location: str, progress):
+def extract_dot_vex(vex_file_location: str, save_folder_location: str,temp_location, progress):
     """
 
     :param vex_file_location: the .vex file location, should include the .vex file
@@ -20,24 +19,25 @@ def extract_dot_vex(vex_file_location: str, save_folder_location: str, progress)
 
     progress("extracting json from .vex tar file")
     dot_vex_file = tarfile.open(vex_file_location)
-    dot_vex_file.extractall(DEFAULT_TEMP_FILE_LOCATION)
+    dot_vex_file.extractall(temp_location)
     dot_vex_file.close()
     progress("file extracted, loading json")
-    with open(DEFAULT_TEMP_FILE_LOCATION + "___ThIsisATemPoRaRyFiLE___.json") as content:
+    with open(temp_location + "/___ThIsisATemPoRaRyFiLE___.json") as content:
         dot_vex_json: dict = json.load(content)
         if not os.path.isdir(save_folder_location):
             os.mkdir(save_folder_location)
         progress("extracting and decode files from json")
         for x in dot_vex_json["files"]:
             with open(save_folder_location + "/" + x, "wb") as file:
                 file.write(base64.b64decode(dot_vex_json["files"][x]))
-        progress(len(dot_vex_json["files"]), "Files extracted from .vex")
+        progress(str(len(dot_vex_json["files"])) + "Files extracted from .vex")
 
 
 def update_dot_vex(vex_file_location: str,
                    save_folder_location: str,
                    save_file_name: str,
                    vex_decode_folder_location: str,
+                   temp_location,
                    progress=print
                    ):
     """
@@ -51,31 +51,31 @@ def update_dot_vex(vex_file_location: str,
 
     progress("extracting json from .vex tar file")
     dot_vex_file = tarfile.open(vex_file_location)
-    dot_vex_file.extractall(DEFAULT_TEMP_FILE_LOCATION)
+    dot_vex_file.extractall(temp_location)
     dot_vex_file.close()
     if not os.path.isdir(save_folder_location):
         os.mkdir(save_folder_location)
     progress("loading json")
-    with open(DEFAULT_TEMP_FILE_LOCATION + "___ThIsisATemPoRaRyFiLE___.json") as content:
+    with open(temp_location + "/___ThIsisATemPoRaRyFiLE___.json") as content:
         dot_vex_json: dict = json.load(content)
         encode_files: list = os.listdir(vex_decode_folder_location)
         progress("replacing file inside json")
         for x in encode_files:
             with open(vex_decode_folder_location + x, "rb") as file:
                 dot_vex_json["files"][x] = base64.b64encode(file.read()).decode("utf-8")
     progress("replace the json file")
-    os.remove(DEFAULT_TEMP_FILE_LOCATION + "___ThIsisATemPoRaRyFiLE___.json")
-    with open(DEFAULT_TEMP_FILE_LOCATION + "___ThIsisATemPoRaRyFiLE___.json", "w") as content:
+    os.remove(temp_location + "/___ThIsisATemPoRaRyFiLE___.json")
+    with open(temp_location + "/___ThIsisATemPoRaRyFiLE___.json", "w") as content:
         json.dump(dot_vex_json, content)
     try:
         os.remove(save_folder_location + "/" + save_file_name)
     except:
         progress("we don't need to remove the json file")
     dot_vex_save_file = tarfile.open(save_folder_location + "/" + save_file_name, "w")
     dot_vex_save_file.add(
-        DEFAULT_TEMP_FILE_LOCATION +
-        "___ThIsisATemPoRaRyFiLE___.json",
-        "___ThIsisATemPoRaRyFiLE___.json")
+        temp_location +
+        "/___ThIsisATemPoRaRyFiLE___.json",
+        "/___ThIsisATemPoRaRyFiLE___.json")
 
     dot_vex_save_file.close()
     progress("replace/update .vex file complete")