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

changed default image, added limits for name and type in details

Browse Source
This commit is contained in:
faroukbmiled 2023-09-25 23:58:38 +01:00
parent 5d6f7ab03f
commit fd0a9c519a
4 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
boiiiwd_package/resources/default_library_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

8
boiiiwd_package/src/helpers.py
View File

@ -4,10 +4,10 @@ from src.imports import *
# Start helper functions # Start helper functions
#testing app offline #testing app offline
# import socket import socket
# def guard(*args, **kwargs): def guard(*args, **kwargs):
# pass pass
# socket.socket = guard socket.socket = guard
def check_config(name, fallback=None): def check_config(name, fallback=None):
config = configparser.ConfigParser() config = configparser.ConfigParser()

26
boiiiwd_package/src/library_tab.py
View File

@ -581,7 +581,7 @@ class LibraryTab(ctk.CTkScrollableFrame):
if preview_iamge.exists(): if preview_iamge.exists():
image = Image.open(preview_iamge) image = Image.open(preview_iamge)
else: else:
image = Image.open(os.path.join(RESOURCES_DIR, "ryuk.png")) image = Image.open(os.path.join(RESOURCES_DIR, "default_library_img.png"))
image_size = image.size image_size = image.size
offline_date = datetime.fromtimestamp(creation_timestamp).strftime("%d %b, %Y @ %I:%M%p") offline_date = datetime.fromtimestamp(creation_timestamp).strftime("%d %b, %Y @ %I:%M%p")
date_updated = "Offline" date_updated = "Offline"
@ -605,7 +605,7 @@ class LibraryTab(ctk.CTkScrollableFrame):
info_thread = threading.Thread(target=show_map_thread) info_thread = threading.Thread(target=show_map_thread)
info_thread.start() info_thread.start()
def toplevel_info_window(self, map_name, map_mod_type, map_size, image, image_size, def toplevel_info_window(self, map_name, map_mod_type_txt, map_size, image, image_size,
date_created ,date_updated, stars_image, stars_image_size, ratings_text, date_created ,date_updated, stars_image, stars_image_size, ratings_text,
url, workshop_id, invalid_warn, folder, description ,online,offline_date=None): url, workshop_id, invalid_warn, folder, description ,online,offline_date=None):
def main_thread(): def main_thread():
@ -677,6 +677,15 @@ class LibraryTab(ctk.CTkScrollableFrame):
except: except:
show_message("Up to date!", "No updates found!", icon="info") show_message("Up to date!", "No updates found!", icon="info")
def show_full_text(event, widget, full_text):
widget_text = type_label.cget("text")
label_type = widget_text.split(':')[0]
# + 30 which is desc_threshold + 5 is the ... dots and a white space
if len(widget_text) == len(label_type) + 30 + 5:
widget.configure(text=f"{label_type}: {full_text}")
else:
widget.configure(text=f"{label_type}: {full_text[:30]}...")
# frames # frames
stars_frame = ctk.CTkFrame(top) stars_frame = ctk.CTkFrame(top)
stars_frame.grid(row=0, column=0, columnspan=2, padx=20, pady=(20, 0), sticky="nsew") stars_frame.grid(row=0, column=0, columnspan=2, padx=20, pady=(20, 0), sticky="nsew")
@ -693,11 +702,11 @@ class LibraryTab(ctk.CTkScrollableFrame):
buttons_frame.grid(row=3, column=0, columnspan=2, padx=20, pady=(0, 20), sticky="nsew") buttons_frame.grid(row=3, column=0, columnspan=2, padx=20, pady=(0, 20), sticky="nsew")
# fillers # fillers
name_label = ctk.CTkLabel(info_frame, text=f"Name: {map_name}") name_label = ctk.CTkLabel(info_frame, text=f"Name: {map_name}", wraplength=350, 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=5)
desc_threshold = 30 desc_threshold = 30
shortened_description = re.sub(r'\n', '', description).strip() shortened_description = re.sub(r'[\\/\n\r]', '', description).strip()
shortened_description = re.sub(r'([^a-zA-Z0-9\s:().])', '', shortened_description) shortened_description = re.sub(r'([^a-zA-Z0-9\s:().])', '', shortened_description)
shortened_description = f"{shortened_description[:desc_threshold]}... (View)"\ shortened_description = f"{shortened_description[:desc_threshold]}... (View)"\
if len(shortened_description) > desc_threshold else shortened_description if len(shortened_description) > desc_threshold else shortened_description
@ -711,8 +720,13 @@ class LibraryTab(ctk.CTkScrollableFrame):
id_label = ctk.CTkLabel(info_frame, text=f"ID: {workshop_id} | Folder: {os.path.basename(folder)}") 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=5)
type_label = ctk.CTkLabel(info_frame, text=f"Type: {map_mod_type}") 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=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 = 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=5)
@ -730,7 +744,7 @@ class LibraryTab(ctk.CTkScrollableFrame):
date_updated_label = ctk.CTkLabel(info_frame, text=f"Updated: {date_updated}") 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=5)
date_updated_label = ctk.CTkLabel(info_frame, text=f"Downloaded at: {down_date}") 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=5)
stars_image_label = ctk.CTkLabel(stars_frame) stars_image_label = ctk.CTkLabel(stars_frame)

24
boiiiwd_package/src/main.py
View File

@ -650,7 +650,7 @@ class BOIIIWD(ctk.CTk):
info_thread = threading.Thread(target=show_map_thread) info_thread = threading.Thread(target=show_map_thread)
info_thread.start() info_thread.start()
def toplevel_info_window(self, map_name, map_mod_type, map_size, image, image_size, def toplevel_info_window(self, map_name, map_mod_type_txt, map_size, image, image_size,
date_created ,date_updated, stars_image, stars_image_size, date_created ,date_updated, stars_image, stars_image_size,
ratings_text, url, workshop_id, description): ratings_text, url, workshop_id, description):
def main_thread(): def main_thread():
@ -695,6 +695,15 @@ class BOIIIWD(ctk.CTk):
self.after(0, main_thread) self.after(0, main_thread)
def show_full_text(event, widget, full_text):
widget_text = type_label.cget("text")
label_type = widget_text.split(':')[0]
# + 30 which is desc_threshold + 5 is the ... dots and a white space
if len(widget_text) == len(label_type) + 30 + 5:
widget.configure(text=f"{label_type}: {full_text}")
else:
widget.configure(text=f"{label_type}: {full_text[:30]}...")
# frames # frames
stars_frame = ctk.CTkFrame(top) stars_frame = ctk.CTkFrame(top)
stars_frame.grid(row=0, column=0, columnspan=2, padx=20, pady=(20, 0), sticky="nsew") stars_frame.grid(row=0, column=0, columnspan=2, padx=20, pady=(20, 0), sticky="nsew")
@ -711,11 +720,11 @@ class BOIIIWD(ctk.CTk):
buttons_frame.grid(row=3, column=0, columnspan=2, padx=20, pady=(0, 20), sticky="nsew") buttons_frame.grid(row=3, column=0, columnspan=2, padx=20, pady=(0, 20), sticky="nsew")
# fillers # fillers
name_label = ctk.CTkLabel(info_frame, text=f"Name: {map_name}") name_label = ctk.CTkLabel(info_frame, text=f"Name: {map_name}", wraplength=350, 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=5)
desc_threshold = 30 desc_threshold = 30
shortened_description = re.sub(r'\n', '', description).strip() shortened_description = re.sub(r'[\\/\n\r]', '', description).strip()
shortened_description = re.sub(r'([^a-zA-Z0-9\s:().])', '', shortened_description) shortened_description = re.sub(r'([^a-zA-Z0-9\s:().])', '', shortened_description)
shortened_description = f"{shortened_description[:desc_threshold]}... (View)"\ shortened_description = f"{shortened_description[:desc_threshold]}... (View)"\
if len(shortened_description) > desc_threshold else shortened_description if len(shortened_description) > desc_threshold else shortened_description
@ -726,10 +735,15 @@ class BOIIIWD(ctk.CTk):
description_lab.configure(cursor="hand2") description_lab.configure(cursor="hand2")
description_lab.bind("<Button-1>", lambda e: show_description(e)) description_lab.bind("<Button-1>", lambda e: show_description(e))
type_label = ctk.CTkLabel(info_frame, text=f"Type: {map_mod_type}") 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=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 = 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=5)
date_created_label = ctk.CTkLabel(info_frame, text=f"Posted: {date_created}") date_created_label = ctk.CTkLabel(info_frame, text=f"Posted: {date_created}")