diff --git a/core/utils/config/config.py b/core/utils/config/config.py index ea38ac8..f026b2d 100644 --- a/core/utils/config/config.py +++ b/core/utils/config/config.py @@ -8,16 +8,23 @@ def create_config(): config["General"] = { "debug": True, + "ignore_updates": f"{state.ignore_updates}", + "autoresume": f"{state.autoresume}", + "window_transparency": f"{state.window_transparency}" + } + + config["Network"] = { "api_url": f"{state.api_url}", "download_path": f"{state.download_path}", "download_speed_limit": f"{state.down_speed_limit}", - "upload_speed_limit": f"{state.up_speed_limit}", - "ignore_updates": f"{state.ignore_updates}", - "image_path": f"{state.image_path}", - "autoresume": f"{state.autoresume}", + "upload_speed_limit": f"{state.up_speed_limit}", "max_connections": f"{state.max_connections}", - "max_downloads": f"{state.max_downloads}", - "window_transparency": f"{state.window_transparency}", + "max_downloads": f"{state.max_downloads}" + } + + config["Paths"] = { + "bound_interface": f"{state.bound_interface}", + "image_path": f"{state.image_path}" } if platform.system() == "Windows": @@ -48,17 +55,23 @@ def read_config(): return config.read(config_file) - + + # General state.debug = config.getboolean("General", "debug", fallback=state.debug) - state.api_url = config.get("General", "api_url", fallback=state.api_url) - state.download_path = config.get("General", "download_path", fallback=state.download_path) - state.down_speed_limit = config.getint("General", "download_speed_limit", fallback=state.down_speed_limit) - state.up_speed_limit = config.getint("General", "upload_speed_limit", fallback=state.up_speed_limit) state.ignore_updates = config.getboolean("General", "ignore_updates", fallback=state.ignore_updates) - state.image_path = config.get("General", "image_path", fallback=state.image_path) state.autoresume = config.getboolean("General", "autoresume", fallback=state.autoresume) - state.max_connections = config.getint("General", "max_connections", fallback=state.max_connections) - state.max_downloads = config.getint("General", "max_downloads", fallback=state.max_downloads) state.window_transparency = config.getboolean("General", "window_transparency", fallback=state.window_transparency) + # Network + state.api_url = config.get("Network", "api_url", fallback=state.api_url) + state.download_path = config.get("Network", "download_path", fallback=state.download_path) + state.down_speed_limit = config.getint("Network", "download_speed_limit", fallback=state.down_speed_limit) + state.up_speed_limit = config.getint("Network", "upload_speed_limit", fallback=state.up_speed_limit) + state.max_connections = config.getint("Network", "max_connections", fallback=state.max_connections) + state.max_downloads = config.getint("Network", "max_downloads", fallback=state.max_downloads) + + # Paths + state.bound_interface = config.get("Paths", "bound_interface", fallback=state.bound_interface) + state.image_path = config.get("Paths", "image_path", fallback=state.image_path) + create_config() diff --git a/core/utils/data/tracker.py b/core/utils/data/tracker.py index e5308f9..02d8e2f 100644 --- a/core/utils/data/tracker.py +++ b/core/utils/data/tracker.py @@ -15,12 +15,12 @@ def get_item_url(item, posts, post_titles): # softwarelist currentitem, post lis return item if state.tracker == "rutracker": item_dict = posts[post_index] - _, post_links, _ = format_data([item_dict]) + _, post_links, _, _, _ = format_data([item_dict]) consoleLog(f"Found post URL: {post_links[0]}") return post_links[0] if state.tracker == "m0nkrus": item_dict = posts[post_index] - _, post_links, _ = format_data([item_dict]) + _, post_links, _, _, _,= format_data([item_dict]) consoleLog(f"Found post URL: {post_links[0]}") return post_links[0]