Merge pull request #4 from faroukbmiled/refactored

Fixed major issues

boiiiwd_package/src/library_tab.py

@@ -98,6 +98,9 @@ class LibraryTab(ctk.CTkScrollableFrame):
         with open(items_file, "r") as f:
             items_data = json.load(f)
             for item_info in items_data:
+                if not folder_name and "id" in item_info and item_info["id"] == workshop_id:
+                    return True, False
+
                 if "id" in item_info and "folder_name" in item_info and "json_folder_name" in item_info:
                     if item_info["id"] == workshop_id and item_info["folder_name"] == folder_name:
                         if item_info["folder_name"] in self.added_folders:
@@ -178,11 +181,33 @@ class LibraryTab(ctk.CTkScrollableFrame):
             items_data = json.load(f)
 
         cleaned_items = [item for item in items_data if 'folder_name' in item and 'json_folder_name'
-                         in item and item['folder_name'] not in self.item_block_list and item['folder_name'] in self.added_folders]
+                         in item and item['folder_name'] not in self.item_block_list and item['folder_name']
+                         in self.added_folders and item['id'] in self.ids_added]
 
         with open(file, 'w') as file:
             json.dump(cleaned_items, file, indent=4)
 
+    def is_valid_json_format(self, file):
+        try:
+            with open(file, "r") as file:
+                data = json.load(file)
+            if not isinstance(data, list):
+                return False
+
+            for item in data:
+                if not all(key in item for key in ("id", "text", "date", "folder_name", "json_folder_name")):
+                    return False
+
+            return True
+        except:
+            return False
+
+    def rename_invalid_json_file(self, file_path):
+        timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
+        base_name, ext = os.path.splitext(file_path)
+        new_file_path = f"{base_name}_{timestamp}{ext}"
+        os.rename(file_path, new_file_path)
+
     def filter_items(self, event):
         filter_text = self.filter_entry.get().lower()
         for label, button, button_view_list in zip(self.label_list, self.button_list, self.button_view_list):
@@ -200,8 +225,15 @@ class LibraryTab(ctk.CTkScrollableFrame):
         if self.refresh_next_time and not dont_add:
             self.refresh_next_time = False
             self.refresh_items()
+            return
 
         if dont_add:
+            self.label_list.clear()
+            self.button_list.clear()
+            self.button_view_list.clear()
+            self.added_items.clear()
+            self.added_folders.clear()
+            self.ids_added.clear()
             self.refresh_next_time = True
 
         maps_folder = Path(boiiiFolder) / "mods"
@@ -217,6 +249,9 @@ class LibraryTab(ctk.CTkScrollableFrame):
         folders_to_process = [mods_folder, maps_folder]
 
         items_file = os.path.join(application_path, LIBRARY_FILE)
+        if not self.is_valid_json_format(items_file):
+            try: self.rename_invalid_json_file(items_file)
+            except: pass
 
         for folder_path in folders_to_process:
             for zone_path in folder_path.glob("**/zone"):
@@ -241,13 +276,13 @@ class LibraryTab(ctk.CTkScrollableFrame):
                     creation_timestamp = None
                     for ff_file in zone_path.glob("*.ff"):
                         if ff_file.exists():
-                            creation_timestamp = ff_file.stat().st_ctime
+                            creation_timestamp = ff_file.stat().st_mtime
                             break
 
                     if creation_timestamp is not None:
                         date_added = datetime.fromtimestamp(creation_timestamp).strftime("%d %b, %Y @ %I:%M%p")
                     else:
-                        creation_timestamp = zone_path.stat().st_ctime
+                        creation_timestamp = zone_path.stat().st_mtime
                         date_added = datetime.fromtimestamp(creation_timestamp).strftime("%d %b, %Y @ %I:%M%p")
 
                     map_count += 1 if item_type == "map" else 0
@@ -347,13 +382,13 @@ class LibraryTab(ctk.CTkScrollableFrame):
                         creation_timestamp = None
                         for ff_file in zone_path.glob("*.ff"):
                             if ff_file.exists():
-                                creation_timestamp = ff_file.stat().st_ctime
+                                creation_timestamp = ff_file.stat().st_mtime
                                 break
 
                         if creation_timestamp is not None:
                             date_added = datetime.fromtimestamp(creation_timestamp).strftime("%d %b, %Y @ %I:%M%p")
                         else:
-                            creation_timestamp = zone_path.stat().st_ctime
+                            creation_timestamp = zone_path.stat().st_mtime
                             date_added = datetime.fromtimestamp(creation_timestamp).strftime("%d %b, %Y @ %I:%M%p")
 
                         items_file = os.path.join(application_path, LIBRARY_FILE)
@@ -450,7 +485,8 @@ class LibraryTab(ctk.CTkScrollableFrame):
                     soup = BeautifulSoup(content, "html.parser")
 
                     try:
-                        map_mod_type = soup.find("div", class_="rightDetailsBlock").text.strip()
+                        type_txt = soup.find("div", class_="rightDetailsBlock").text.strip()
+                        map_mod_type = type_txt if "File Size" not in type_txt else "Not specified"
                         map_name = soup.find("div", class_="workshopItemTitle").text.strip()
                         map_size = map_size = get_workshop_file_size(workshop_id, raw=True)
                         details_stats_container = soup.find("div", class_="detailsStatsContainerRight")
@@ -515,10 +551,10 @@ class LibraryTab(ctk.CTkScrollableFrame):
                 creation_timestamp = None
                 for ff_file in json_path.parent.glob("*.ff"):
                     if ff_file.exists():
-                        creation_timestamp = ff_file.stat().st_ctime
+                        creation_timestamp = ff_file.stat().st_mtime
                         break
                 if not creation_timestamp:
-                    creation_timestamp = json_path.parent.stat().st_ctime
+                    creation_timestamp = json_path.parent.stat().st_mtime
 
                 if json_path.exists():
                     workshop_id = extract_json_data(json_path, "PublisherID") or "None"
@@ -540,6 +576,7 @@ class LibraryTab(ctk.CTkScrollableFrame):
                     stars_image_size = stars_image.size
                     ratings_text = "Offline"
                     description = re.sub(r'\^\w+', '', extract_json_data(json_path, "Description")) or "Not available"
+                    description = re.sub(r'\[.*?\]', '', description)
                     url = f"https://steamcommunity.com/sharedfiles/filedetails/?id={workshop_id}"
 
                     self.toplevel_info_window(map_name, map_mod_type, map_size, image, image_size, date_created,

boiiiwd_package/src/main.py

@@ -587,7 +587,8 @@ class BOIIIWD(ctk.CTk):
                 soup = BeautifulSoup(content, "html.parser")
 
                 try:
-                    map_mod_type = soup.find("div", class_="rightDetailsBlock").text.strip()
+                    type_txt = soup.find("div", class_="rightDetailsBlock").text.strip()
+                    map_mod_type = type_txt if "File Size" not in type_txt else "Not specified"
                     map_name = soup.find("div", class_="workshopItemTitle").text.strip()
                     map_size = map_size = get_workshop_file_size(workshop_id, raw=True)
                     details_stats_container = soup.find("div", class_="detailsStatsContainerRight")
@@ -1246,9 +1247,9 @@ class BOIIIWD(ctk.CTk):
                         self.label_speed.configure(text="Installing...")
                         mod_type = extract_json_data(json_file_path, "Type")
                         items_file = os.path.join(application_path, LIBRARY_FILE)
-                        item_exixsts = self.library_tab.item_exists_in_file(items_file, workshop_id)
+                        item_exists,_ = self.library_tab.item_exists_in_file(items_file, workshop_id)
 
-                        if item_exixsts:
+                        if item_exists:
                             get_folder_name = self.library_tab.get_item_by_id(items_file, workshop_id, return_option="folder_name")
                             if get_folder_name:
                                 folder_name = get_folder_name
@@ -1273,7 +1274,7 @@ class BOIIIWD(ctk.CTk):
                             show_message("Error", f"Invalid workshop type in workshop.json, are you sure this is a map or a mod?., skipping {workshop_id}...", icon="cancel")
                             return
 
-                        if not item_exixsts:
+                        if not item_exists:
                             while os.path.exists(os.path.join(path_folder, folder_name)):
                                 folder_name += f"_{workshop_id}"
                                 folder_name_path = os.path.join(path_folder, folder_name, "zone")
@@ -1512,9 +1513,9 @@ class BOIIIWD(ctk.CTk):
                     self.label_speed.configure(text="Installing...")
                     mod_type = extract_json_data(json_file_path, "Type")
                     items_file = os.path.join(application_path, LIBRARY_FILE)
-                    item_exixsts = self.library_tab.item_exists_in_file(items_file, workshop_id)
+                    item_exists,_ = self.library_tab.item_exists_in_file(items_file, workshop_id)
 
-                    if item_exixsts:
+                    if item_exists:
                         get_folder_name = self.library_tab.get_item_by_id(items_file, workshop_id, return_option="folder_name")
                         if get_folder_name:
                             folder_name = get_folder_name
@@ -1540,7 +1541,7 @@ class BOIIIWD(ctk.CTk):
                         self.stop_download()
                         return
 
-                    if not item_exixsts:
+                    if not item_exists:
                         while os.path.exists(os.path.join(path_folder, folder_name)):
                             folder_name += f"_{workshop_id}"
                             folder_name_path = os.path.join(path_folder, folder_name, "zone")

boiiiwd_package/src/settings_tab.py

@@ -1,3 +1,4 @@
+from src import library_tab
 from src.update_window import check_for_updates_func
 from src.imports import *
 from src.helpers import *
@@ -183,29 +184,31 @@ class SettingsTab(ctk.CTkFrame):
             return
 
     def theme_options_func(self, option: str):
-        if option == "Default":
+        theme_mapping = {
-            self.boiiiwd_custom_theme(disable_only=True)
+            "Default": "boiiiwd_theme.json",
-            save_config("theme", "boiiiwd_theme.json")
+            "Blue": "boiiiwd_blue.json",
-        if option == "Blue":
+            "Grey": "boiiiwd_grey.json",
-            self.boiiiwd_custom_theme(disable_only=True)
+            "Ghost": "boiiiwd_ghost.json",
-            save_config("theme", "boiiiwd_blue.json")
+            "Obsidian": "boiiiwd_obsidian.json",
-        if option == "Grey":
+            "NeonBanana": "boiiiwd_neonbanana.json",
-            self.boiiiwd_custom_theme(disable_only=True)
+            "Custom": "boiiiwd_theme.json",
-            save_config("theme", "boiiiwd_grey.json")
+        }
-        if option == "Ghost":
+
-            self.boiiiwd_custom_theme(disable_only=True)
+        theme_file = theme_mapping.get(option)
-            save_config("theme", "boiiiwd_ghost.json")
+
-        if option == "Obsidian":
-            self.boiiiwd_custom_theme(disable_only=True)
-            save_config("theme", "boiiiwd_obsidian.json")
-        if option == "NeonBanana":
-            self.boiiiwd_custom_theme(disable_only=True)
-            save_config("theme", "boiiiwd_neonbanana.json")
         if option == "Custom":
             self.boiiiwd_custom_theme()
             save_config("theme", "boiiiwd_theme.json")
-        if not option == "Custom":
+            return
-            if show_message("Restart to take effect!", f"{option} theme has been set ,please restart to take effect", icon="info", _return=True, option_1="Ok", option_2="Restart"):
+
+        if theme_file:
+            self.boiiiwd_custom_theme(disable_only=True)
+            save_config("theme", theme_file)
+        else:
+            return
+
+        if option != "Custom":
+            if show_message("Restart to take effect!", f"{option} theme has been set, please restart to take effect", icon="info", _return=True, option_1="Ok", option_2="Restart"):
                 try:
                     p = psutil.Process(os.getpid())
                     for handler in p.open_files() + p.connections():
@@ -213,9 +216,7 @@ class SettingsTab(ctk.CTkFrame):
                 except Exception:
                     pass
                 python = sys.executable
-                os.execl(python, python, *sys.argv)
+            os.execl(python, python, *sys.argv)
-            else:
-                pass
 
     def enable_save_button(self, *args):
         try: self.save_button.configure(state='normal')
@@ -360,25 +361,16 @@ class SettingsTab(ctk.CTkFrame):
                 return 0
 
         if setting == "theme":
-            if os.path.exists(os.path.join(application_path, "boiiiwd_theme.json")):
+            theme_config = check_config("theme", "boiiiwd_theme.json")
+            if os.path.exists(os.path.join(application_path, theme_config)):
                 return "Custom"
-            if check_config("theme", "boiiiwd_theme.json") == "boiiiwd_theme.json":
+
-                return "Default"
+            match = re.match(r'boiiiwd_(\w+)\.json', theme_config)
-            if check_config("theme", "boiiiwd_theme.json") == "boiiiwd_grey.json":
+            if match:
-                return "Grey"
+                theme_name = match.group(1).capitalize()
-            if check_config("theme", "boiiiwd_theme.json") == "boiiiwd_blue.json":
+                return theme_name
-                return "Blue"
-            if check_config("theme", "boiiiwd_theme.json") == "boiiiwd_obsidian.json":
-                return "Obsidian"
-            if check_config("theme", "boiiiwd_theme.json") == "boiiiwd_ghost.json":
-                return "Ghost"
-            if check_config("theme", "boiiiwd_theme.json") == "boiiiwd_neonbanana.json":
-                return "NeonBanana"
         else:
-            if check_config(setting, fallback) == "on":
+            return 1 if check_config(setting, fallback) == "on" else 0
-                return 1
-            else:
-                return 0
 
     def boiiiwd_custom_theme(self, disable_only=None):
         file_to_rename = os.path.join(application_path, "boiiiwd_theme.json")
@@ -405,8 +397,21 @@ class SettingsTab(ctk.CTkFrame):
         boiiiFolder = main_app.app.edit_destination_folder.get()
         maps_folder = os.path.join(boiiiFolder, "mods")
         mods_folder = os.path.join(boiiiFolder, "usermaps")
-        folders_to_process = [mods_folder, maps_folder]
+
+        folders_to_process = []
+
+        if os.path.exists(mods_folder):
+            folders_to_process.append(mods_folder)
+
+        if os.path.exists(maps_folder):
+            folders_to_process.append(maps_folder)
+
+        if not os.path.exists(maps_folder) and not os.path.exists(mods_folder):
+            show_message("Warning -> Check boiii path", f"You don't have any items yet ,from now on item's folders will be named as their {option}")
+            return 0
+
         processed_names = set()
+
         for folder_path in folders_to_process:
             for folder_name in os.listdir(folder_path):
                 zone_path = os.path.join(folder_path, folder_name, "zone")
@@ -416,24 +421,35 @@ class SettingsTab(ctk.CTkFrame):
                     continue
 
                 json_path = os.path.join(zone_path, "workshop.json")
+                publisher_id = extract_json_data(json_path, 'PublisherID')
                 new_name = extract_json_data(json_path, option)
                 if folder_name == new_name:
                     continue
 
+                rename_flag = True
+
                 if os.path.exists(json_path):
-                    publisher_id = extract_json_data(json_path, 'PublisherID')
                     folder_to_rename = os.path.join(folder_path, folder_name)
                     new_folder_name = new_name
                     while new_folder_name in processed_names:
                         new_folder_name += f"_{publisher_id}"
+                        if folder_name == new_folder_name:
+                            rename_flag = False
+                            break
                     new_path = os.path.join(folder_path, new_folder_name)
 
                     while os.path.exists(new_path):
                         new_folder_name += f"_{publisher_id}"
+                        if folder_name == new_folder_name:
+                            rename_flag = False
+                            break
                         new_path = os.path.join(folder_path, new_folder_name)
 
-                    os.rename(folder_to_rename, new_path)
+                    if rename_flag:
-                    processed_names.add(new_folder_name)
+                        os.rename(folder_to_rename, new_path)
+                        processed_names.add(new_folder_name)
+
+        return 1
 
     def change_folder_naming(self, option):
         main_app.app.title("BOIII Workshop Downloader - Settings  ➜  Loading... ⏳")
@@ -443,9 +459,13 @@ class SettingsTab(ctk.CTkFrame):
                 if not "No items" in lib:
                     if show_message("Renaming", "Would you like to rename all your exisiting item folders now?", _return=True):
                         main_app.app.title("BOIII Workshop Downloader - Settings  ➜  Renaming... ⏳")
-                        try :self.rename_all_folders(option)
+                        try : ren_return = self.rename_all_folders(option)
                         except Exception as er: show_message("Error!", f"Error occured when renaming\n{er}"); return
-                        show_message("Done!", "All folders have been renamed", icon="info")
+                        if ren_return == 0:
+                            return 0
+                        else:
+                            show_message("Done!", "All folders have been renamed", icon="info")
+                            main_app.app.library_tab.load_items(main_app.app.edit_destination_folder.get(), dont_add=True)
                     else:
                         show_message("Heads up!", "Only newly downloaded items will be affected", icon="info")
                 else:
@@ -602,16 +622,17 @@ class SettingsTab(ctk.CTkFrame):
                                 show_message("No items found", f"No items found in \n{map_folder}")
                                 return
 
-                            for i, workshop_id in enumerate(subfolders, start=1):
+                            for i, dir_name in enumerate(subfolders, start=1):
-                                json_file_path = os.path.join(map_folder, workshop_id, "workshop.json")
+                                json_file_path = os.path.join(map_folder, dir_name, "workshop.json")
                                 copy_button.configure(text=f"Working on -> {i}/{total_folders}")
 
                                 if os.path.exists(json_file_path):
+                                    workshop_id = extract_json_data(json_file_path, "PublisherID")
                                     mod_type = extract_json_data(json_file_path, "Type")
                                     items_file = os.path.join(application_path, LIBRARY_FILE)
-                                    item_exixsts = main_app.app.library_tab.item_exists_in_file(items_file, workshop_id)
+                                    item_exists,_ = main_app.app.library_tab.item_exists_in_file(items_file, workshop_id)
 
-                                    if item_exixsts:
+                                    if item_exists:
                                         get_folder_name = main_app.app.library_tab.get_item_by_id(items_file, workshop_id, return_option="folder_name")
                                         if get_folder_name:
                                             folder_name = get_folder_name
@@ -636,7 +657,7 @@ class SettingsTab(ctk.CTkFrame):
                                         show_message("Error", "Invalid workshop type in workshop.json, are you sure this is a map or a mod?.", icon="cancel")
                                         continue
 
-                                    if not item_exixsts:
+                                    if not item_exists:
                                         while os.path.exists(os.path.join(path_folder, folder_name)):
                                             folder_name += f"_{workshop_id}"
                                             folder_name_path = os.path.join(path_folder, folder_name, "zone")
@@ -644,17 +665,25 @@ class SettingsTab(ctk.CTkFrame):
                                     os.makedirs(folder_name_path, exist_ok=True)
 
                                     try:
-                                        copy_with_progress(os.path.join(map_folder, workshop_id), folder_name_path)
+                                        copy_with_progress(os.path.join(map_folder, dir_name), folder_name_path)
                                     except Exception as E:
                                         show_message("Error", f"Error copying files: {E}", icon="cancel")
                                         continue
 
                                     if cut_var.get():
-                                        remove_tree(os.path.join(map_folder, workshop_id))
+                                        remove_tree(os.path.join(map_folder, dir_name))
 
                                     main_app.app.library_tab.update_item(main_app.app.edit_destination_folder.get(), workshop_id, mod_type, folder_name)
+                                else:
+                                    # if its last folder to check
+                                    if i == total_folders:
+                                        show_message("Error", f"workshop.json not found in {dir_name}", icon="cancel")
+                                        main_app.app.library_tab.load_items(main_app.app.edit_destination_folder.get(), dont_add=True)
+                                        return
+                                    continue
 
                             if subfolders:
+                                main_app.app.library_tab.load_items(main_app.app.edit_destination_folder.get(), dont_add=True)
                                 main_app.app.show_complete_message(message=f"All items were moved\nYou can run the game now!\nPS: You have to restart the game\n(pressing launch will launch/restarts)")
 
                         finally: