Rim/T7x-Workshop-Downloader
Rim/T7x-Workshop-Downloader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

queue fixes

Browse Source
This commit is contained in:
faroukbmiled 2023-09-26 04:00:41 +01:00
parent 9fc28a9b85
commit 0f67df2de6
2 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
boiiiwd_package/src/library_tab.py
View File

@ -25,6 +25,7 @@ class LibraryTab(ctk.CTkScrollableFrame):
self.update_button = ctk.CTkButton(self, image=ctk.CTkImage(Image.open(update_button_image)), command=self.check_for_updates, width=65, height=20,
text="", fg_color="transparent")
self.update_button.grid(row=0, column=1, padx=(0, 20), pady=(10, 20), sticky="en")
self.update_button.configure(state="disabled")
self.update_tooltip = CTkToolTip(self.update_button, message="Check items for updates", topmost=True)
filter_tooltip = CTkToolTip(self.filter_refresh_button, message="Refresh library", topmost=True)
self.label_list = []
@ -362,8 +363,13 @@ class LibraryTab(ctk.CTkScrollableFrame):
else:
self.hide_no_items_message()
if all(item in self.item_block_list for item in self.added_folders):
self.show_no_items_message(only_up=True)
if map_count > 0 or mod_count > 0:
return f"Maps: {map_count} - Mods: {mod_count} - Total size: {convert_bytes_to_readable(total_size)}"
self.show_no_items_message(only_up=True)
return "No items in current selected folder"
def update_item(self, boiiiFolder, id, item_type, foldername):
@ -459,11 +465,16 @@ class LibraryTab(ctk.CTkScrollableFrame):
url = f"https://steamcommunity.com/sharedfiles/filedetails/?id={workshop_id}"
webbrowser.open(url)
def show_no_items_message(self):
def show_no_items_message(self, only_up=False):
self.update_button.configure(state="disabled")
self.update_tooltip.configure(message="Updater Disabled, No items found")
if only_up:
return
self.no_items_label.grid(row=1, column=0, padx=10, pady=(0, 10), sticky="n")
self.no_items_label.configure(text="No items found in the selected folder. \nMake sure you have a mod/map downloaded and or have the right boiii folder selected.")
def hide_no_items_message(self):
self.update_button.configure(state="normal")
self.no_items_label.configure(text="")
self.no_items_label.forget()
@ -705,7 +716,7 @@ class LibraryTab(ctk.CTkScrollableFrame):
# fillers
name_label = ctk.CTkLabel(info_frame, text=f"Name: {map_name}", wraplength=420, justify="left")
name_label.grid(row=0, column=0, columnspan=2, sticky="w", padx=20, pady=5)
name_label.grid(row=0, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
desc_threshold = 30
shortened_description = re.sub(r'[\\/\n\r]', '', description).strip()
@ -713,28 +724,28 @@ class LibraryTab(ctk.CTkScrollableFrame):
shortened_description = f"{shortened_description[:desc_threshold]}... (View)"\
if len(shortened_description) > desc_threshold else shortened_description
description_lab = ctk.CTkLabel(info_frame, text=f"Description: {shortened_description}")
description_lab.grid(row=1, column=0, columnspan=2, sticky="w", padx=20, pady=5)
description_lab.grid(row=1, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
if len(description) > desc_threshold:
description_lab_tooltip = CTkToolTip(description_lab, message="View description", topmost=True)
description_lab.configure(cursor="hand2")
description_lab.bind("<Button-1>", lambda e: show_description(e))
id_label = ctk.CTkLabel(info_frame, text=f"ID: {workshop_id} | Folder: {os.path.basename(folder)}")
id_label.grid(row=2, column=0, columnspan=2, sticky="w", padx=20, pady=5)
id_label.grid(row=2, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
map_mod_type = map_mod_type_txt[:desc_threshold] + "..." if len(map_mod_type_txt) > desc_threshold else map_mod_type_txt
type_label = ctk.CTkLabel(info_frame, text=f"Type: {map_mod_type}", wraplength=350, justify="left")
type_label.grid(row=3, column=0, columnspan=2, sticky="w", padx=20, pady=5)
type_label.grid(row=3, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
if len(map_mod_type) > desc_threshold:
type_label_tooltip = CTkToolTip(type_label, message="View all types", topmost=True)
type_label.configure(cursor="hand2")
type_label.bind("<Button-1>", lambda e: show_full_text(e, type_label, map_mod_type_txt))
size_label = ctk.CTkLabel(info_frame, text=f"Size: {map_size}")
size_label.grid(row=4, column=0, columnspan=2, sticky="w", padx=20, pady=5)
size_label.grid(row=4, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
date_created_label = ctk.CTkLabel(info_frame, text=f"Posted: {date_created}")
date_created_label.grid(row=5, column=0, columnspan=2, sticky="w", padx=20, pady=5)
date_created_label.grid(row=5, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
if date_updated != "Not updated" and date_updated != "Offline":
date_updated_label = ctk.CTkLabel(info_frame, text=f"Updated: {date_updated} 🔗")
@ -744,10 +755,10 @@ class LibraryTab(ctk.CTkScrollableFrame):
webbrowser.open(f"https://steamcommunity.com/sharedfiles/filedetails/changelog/{workshop_id}"))
else:
date_updated_label = ctk.CTkLabel(info_frame, text=f"Updated: {date_updated}")
date_updated_label.grid(row=6, column=0, columnspan=2, sticky="w", padx=20, pady=5)
date_updated_label.grid(row=6, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
date_updated_label = ctk.CTkLabel(info_frame, text=f"Downloaded: {down_date}")
date_updated_label.grid(row=7, column=0, columnspan=2, sticky="w", padx=20, pady=5)
date_updated_label.grid(row=7, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
stars_image_label = ctk.CTkLabel(stars_frame)
stars_width, stars_height = stars_image_size
@ -866,20 +877,24 @@ class LibraryTab(ctk.CTkScrollableFrame):
return
def check_for_update():
lib_data = None
try:
lib_data = None
if not os.path.exists(os.path.join(application_path, LIBRARY_FILE)):
show_message("Error checking for item updates! -> Setting is on", "Please visit library tab at least once with the correct boiii path!, you also need to have at lease 1 item!")
if not os.path.exists(os.path.join(application_path, LIBRARY_FILE)):
show_message("Error checking for item updates! -> Setting is on", "Please visit library tab at least once with the correct boiii path!, you also need to have at lease 1 item!")
return
with open(LIBRARY_FILE, 'r') as file:
lib_data = json.load(file)
for item in lib_data:
item_id = item["id"]
item_date = item["date"]
if_id_needs_update(item_id, item_date, item["text"])
except:
show_message("Error checking for item updates!", "Please visit library tab at least once with the correct boiii path!, you also need to have at lease 1 item!")
return
with open(LIBRARY_FILE, 'r') as file:
lib_data = json.load(file)
for item in lib_data:
item_id = item["id"]
item_date = item["date"]
if_id_needs_update(item_id, item_date, item["text"])
check_for_update()
to_update_len = len(self.to_update)

31
boiiiwd_package/src/main.py
View File

@ -723,7 +723,7 @@ class BOIIIWD(ctk.CTk):
# fillers
name_label = ctk.CTkLabel(info_frame, text=f"Name: {map_name}", wraplength=420, justify="left")
name_label.grid(row=0, column=0, columnspan=2, sticky="w", padx=20, pady=5)
name_label.grid(row=0, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
desc_threshold = 30
shortened_description = re.sub(r'[\\/\n\r]', '', description).strip()
@ -731,7 +731,7 @@ class BOIIIWD(ctk.CTk):
shortened_description = f"{shortened_description[:desc_threshold]}... (View)"\
if len(shortened_description) > desc_threshold else shortened_description
description_lab = ctk.CTkLabel(info_frame, text=f"Description: {shortened_description}")
description_lab.grid(row=1, column=0, columnspan=2, sticky="w", padx=20, pady=5)
description_lab.grid(row=1, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
if len(description) > desc_threshold:
description_lab_tooltip = CTkToolTip(description_lab, message="View description", topmost=True)
description_lab.configure(cursor="hand2")
@ -739,17 +739,17 @@ class BOIIIWD(ctk.CTk):
map_mod_type = map_mod_type_txt[:desc_threshold] + "..." if len(map_mod_type_txt) > desc_threshold else map_mod_type_txt
type_label = ctk.CTkLabel(info_frame, text=f"Type: {map_mod_type}", wraplength=350, justify="left")
type_label.grid(row=2, column=0, columnspan=2, sticky="w", padx=20, pady=5)
type_label.grid(row=2, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
if len(map_mod_type) > desc_threshold:
type_label_tooltip = CTkToolTip(type_label, message="View all types", topmost=True)
type_label.configure(cursor="hand2")
type_label.bind("<Button-1>", lambda e: show_full_text(e, type_label, map_mod_type_txt))
size_label = ctk.CTkLabel(info_frame, text=f"Size (Workshop): {map_size}")
size_label.grid(row=3, column=0, columnspan=2, sticky="w", padx=20, pady=5)
size_label.grid(row=3, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
date_created_label = ctk.CTkLabel(info_frame, text=f"Posted: {date_created}")
date_created_label.grid(row=4, column=0, columnspan=2, sticky="w", padx=20, pady=5)
date_created_label.grid(row=4, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
if date_updated != "Not updated":
date_updated_label = ctk.CTkLabel(info_frame, text=f"Updated: {date_updated} 🔗")
@ -760,7 +760,7 @@ class BOIIIWD(ctk.CTk):
else:
date_updated_label = ctk.CTkLabel(info_frame, text=f"Updated: {date_updated}")
date_updated_label.grid(row=5, column=0, columnspan=2, sticky="w", padx=20, pady=5)
date_updated_label.grid(row=5, column=0, columnspan=2, sticky="w", padx=20, pady=2.5)
stars_image_label = ctk.CTkLabel(stars_frame)
stars_width, stars_height = stars_image_size
@ -1024,6 +1024,8 @@ class BOIIIWD(ctk.CTk):
text = self.queuetextarea.get("1.0", "end")
items = []
items_ws_sizes = {}
if "," in text:
items = [n.strip() for n in text.split(",")]
else:
@ -1071,6 +1073,7 @@ class BOIIIWD(ctk.CTk):
ws_file_size = get_workshop_file_size(workshop_id)
file_size = ws_file_size
items_ws_sizes[workshop_id] = ws_file_size
self.total_queue_size += ws_file_size
if file_size is None:
@ -1085,11 +1088,19 @@ class BOIIIWD(ctk.CTk):
if self.already_installed:
item_ids = ", ".join(self.already_installed)
if self.settings_tab.skip_already_installed:
skipped_items = []
for item in self.already_installed:
if item in items:
items.remove(item)
show_message("Heads up!, map/s skipped => skip is on in settings", f"These item IDs may already be installed and are skipped:\n{item_ids}", icon="info")
if not any(isinstance(item, int) for item in items):
skipped_items.append(item)
self.total_queue_size -= items_ws_sizes[item]
if skipped_items and items:
show_message("Heads up! Maps skipped => Skip is on in settings",
f"These item IDs may already be installed and are skipped:\n{', '.join(skipped_items)}",
icon="info")
if not items:
show_message("Download stopped => Skip is on in settings", "All items have been skipped since they are already installed.",
icon="info")
self.stop_download()
return
else:
@ -1149,8 +1160,8 @@ class BOIIIWD(ctk.CTk):
prev_item_size = sum(os.path.getsize(os.path.join(prev_item_path, f)) for f in os.listdir(prev_item_path))
elif os.path.exists(prev_item_path_2):
prev_item_size = sum(os.path.getsize(os.path.join(prev_item_path_2, f)) for f in os.listdir(prev_item_path_2))
else:
prev_item_size = get_workshop_file_size(previous_item)
if prev_item_size == 0 or not prev_item_size or not os.path.exists(prev_item_path) or not os.path.exists(prev_item_path_2):
prev_item_size = items_ws_sizes[previous_item]
if prev_item_size:
self.total_queue_size -= prev_item_size
self.item_skipped = False