Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: v4 import to pydantic config #342

Merged
merged 4 commits into from
Dec 8, 2024
Merged

fix: v4 import to pydantic config #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f76958d
fix: v4 import to pydantic config
NTFSvolume Nov 30, 2024
0b4d480
refactor: unify transfer functions
NTFSvolume Dec 2, 2024
1eb7c7d
fix: Manager future import
NTFSvolume Dec 6, 2024
2d953d6
refactor: use property references instead of dict keys
NTFSvolume Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cyberdrop_dl/config_definitions/custom_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def serialize(self, info: SerializationInfo):
dump_secret = info.mode != "json"
url = self.url.get_secret_value() if dump_secret else self.url
tags = self.tags - set("no_logs")
return f"{','.join(tags)}{'=' if self.tags else ''}{url}"
return f"{','.join(tags)}{'=' if tags else ''}{url}"

@model_validator(mode="before")
@staticmethod
Expand Down
122 changes: 2 additions & 120 deletions cyberdrop_dl/utils/transfer/db_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from cyberdrop_dl.utils import constants, yaml
from cyberdrop_dl.utils.transfer.transfer_hash_db import transfer_from_old_hash_table
from cyberdrop_dl.utils.transfer.transfer_v4_config import transfer_v4_config
from cyberdrop_dl.utils.transfer.transfer_v4_db import transfer_v4_db

if TYPE_CHECKING:
Expand Down Expand Up @@ -67,7 +68,7 @@ def transfer_v4_to_v5(self):

if Path("./config.yaml").is_file():
try:
self.transfer_v4_config(Path("./config.yaml"), "Imported V4")
transfer_v4_config(self.manager, "Imported V4", Path("./config.yaml"))
self.update_default_config(constants.APP_STORAGE / "Cache" / "cache.yaml", "Imported V4")
except OSError:
pass
Expand Down Expand Up @@ -108,122 +109,3 @@ def update_default_config(cache_file: Path, config_name: str) -> None:
cache = {"first_startup_completed": False}
cache["default_config"] = config_name
yaml.save(cache_file, cache)

@staticmethod
def transfer_v4_config(old_config_path: Path, new_config_name: str) -> None:
"""Transfers a V4 config into V5 possession."""
from cyberdrop_dl.config_definitions import AuthSettings, ConfigSettings, GlobalSettings

new_auth_data = AuthSettings().model_dump()
new_user_data = ConfigSettings().model_dump()
new_global_settings_data = GlobalSettings().model_dump()

if Path("./URLs.txt").is_file():
new_user_data["Files"]["input_file"] = Path("./URLs.txt")
else:
new_user_data["Files"]["input_file"] = constants.APP_STORAGE / "Configs" / new_config_name / "URLs.txt"
new_user_data["Files"]["download_folder"] = constants.DOWNLOAD_STORAGE
new_user_data["Logs"]["log_folder"] = constants.APP_STORAGE / "Configs" / new_config_name / "Logs"
new_user_data["Sorting"]["sort_folder"] = constants.DOWNLOAD_STORAGE / "Cyberdrop-DL Sorted Downloads"

old_data = yaml.load(old_config_path)
old_data = old_data["Configuration"]

# Auth data transfer
new_auth_data["Forums"]["nudostar_username"] = old_data["Authentication"]["nudostar_username"]
new_auth_data["Forums"]["nudostar_password"] = old_data["Authentication"]["nudostar_password"]
new_auth_data["Forums"]["simpcity_username"] = old_data["Authentication"]["simpcity_username"]
new_auth_data["Forums"]["simpcity_password"] = old_data["Authentication"]["simpcity_password"]
new_auth_data["Forums"]["socialmediagirls_username"] = old_data["Authentication"]["socialmediagirls_username"]
new_auth_data["Forums"]["socialmediagirls_password"] = old_data["Authentication"]["socialmediagirls_password"]
new_auth_data["Forums"]["xbunker_username"] = old_data["Authentication"]["xbunker_username"]
new_auth_data["Forums"]["xbunker_password"] = old_data["Authentication"]["xbunker_password"]

new_auth_data["JDownloader"]["jdownloader_username"] = old_data["JDownloader"]["jdownloader_username"]
new_auth_data["JDownloader"]["jdownloader_password"] = old_data["JDownloader"]["jdownloader_password"]
new_auth_data["JDownloader"]["jdownloader_device"] = old_data["JDownloader"]["jdownloader_device"]

new_auth_data["Reddit"]["reddit_personal_use_script"] = old_data["Authentication"]["reddit_personal_use_script"]
new_auth_data["Reddit"]["reddit_secret"] = old_data["Authentication"]["reddit_secret"]

new_auth_data["GoFile"]["gofile_api_key"] = old_data["Authentication"]["gofile_api_key"]
new_auth_data["Imgur"]["imgur_client_id"] = old_data["Authentication"]["imgur_client_id"]
new_auth_data["PixelDrain"]["pixeldrain_api_key"] = old_data["Authentication"]["pixeldrain_api_key"]

# User data transfer
new_user_data["Download_Options"]["block_download_sub_folders"] = old_data["Runtime"]["block_sub_folders"]
new_user_data["Download_Options"]["disable_download_attempt_limit"] = old_data["Runtime"][
"disable_attempt_limit"
]
new_user_data["Download_Options"]["include_album_id_in_folder_name"] = old_data["Runtime"]["include_id"]
new_user_data["Download_Options"]["remove_generated_id_from_filenames"] = old_data["Runtime"][
"remove_bunkr_identifier"
]
new_user_data["Download_Options"]["separate_posts"] = old_data["Forum_Options"]["separate_posts"]
new_user_data["Download_Options"]["skip_download_mark_completed"] = False

new_user_data["File_Size_Limits"]["maximum_image_size"] = old_data["Runtime"]["filesize_maximum_images"]
new_user_data["File_Size_Limits"]["maximum_other_size"] = old_data["Runtime"]["filesize_maximum_other"]
new_user_data["File_Size_Limits"]["maximum_video_size"] = old_data["Runtime"]["filesize_maximum_videos"]
new_user_data["File_Size_Limits"]["minimum_image_size"] = old_data["Runtime"]["filesize_minimum_images"]
new_user_data["File_Size_Limits"]["minimum_other_size"] = old_data["Runtime"]["filesize_minimum_other"]
new_user_data["File_Size_Limits"]["minimum_video_size"] = old_data["Runtime"]["filesize_minimum_videos"]

new_user_data["Ignore_Options"]["exclude_videos"] = old_data["Ignore"]["exclude_videos"]
new_user_data["Ignore_Options"]["exclude_images"] = old_data["Ignore"]["exclude_images"]
new_user_data["Ignore_Options"]["exclude_other"] = old_data["Ignore"]["exclude_other"]
new_user_data["Ignore_Options"]["exclude_audio"] = old_data["Ignore"]["exclude_audio"]
new_user_data["Ignore_Options"]["ignore_coomer_ads"] = old_data["Ignore"]["skip_coomer_ads"]
new_user_data["Ignore_Options"]["skip_hosts"] = old_data["Ignore"]["skip_hosts"]
new_user_data["Ignore_Options"]["only_hosts"] = old_data["Ignore"]["only_hosts"]

new_user_data["Runtime_Options"]["ignore_history"] = old_data["Ignore"]["ignore_history"]
new_user_data["Runtime_Options"]["skip_check_for_partial_files"] = old_data["Runtime"][
"skip_check_for_partial_files_and_empty_dirs"
]
new_user_data["Runtime_Options"]["skip_check_for_empty_folders"] = old_data["Runtime"][
"skip_check_for_partial_files_and_empty_dirs"
]
new_user_data["Runtime_Options"]["send_unsupported_to_jdownloader"] = old_data["JDownloader"][
"apply_jdownloader"
]

new_user_data["Sorting"]["sort_downloads"] = old_data["Sorting"]["sort_downloads"]

if Path("./URLs.txt").is_file():
new_user_data["Files"]["input_file"] = "./URLs.txt"

# Global data transfer
new_global_settings_data["General"]["allow_insecure_connections"] = old_data["Runtime"][
"allow_insecure_connections"
]
new_global_settings_data["General"]["user_agent"] = old_data["Runtime"]["user_agent"]
new_global_settings_data["General"]["proxy"] = old_data["Runtime"]["proxy"]
new_global_settings_data["General"]["max_file_name_length"] = old_data["Runtime"]["max_filename_length"]
new_global_settings_data["General"]["max_folder_name_length"] = old_data["Runtime"]["max_folder_name_length"]
new_global_settings_data["General"]["required_free_space"] = old_data["Runtime"]["required_free_space"]

new_global_settings_data["Rate_Limiting_Options"]["connection_timeout"] = old_data["Ratelimiting"][
"connection_timeout"
]
new_global_settings_data["Rate_Limiting_Options"]["download_attempts"] = old_data["Runtime"]["attempts"]
new_global_settings_data["Rate_Limiting_Options"]["download_delay"] = old_data["Ratelimiting"]["throttle"]
new_global_settings_data["Rate_Limiting_Options"]["read_timeout"] = old_data["Ratelimiting"]["read_timeout"]
new_global_settings_data["Rate_Limiting_Options"]["rate_limit"] = old_data["Ratelimiting"]["ratelimit"]
new_global_settings_data["Rate_Limiting_Options"]["max_simultaneous_downloads_per_domain"] = old_data[
"Runtime"
]["max_concurrent_downloads_per_domain"]

new_user_data["Files"]["input_file"] = str(new_user_data["Files"]["input_file"])
new_user_data["Files"]["download_folder"] = str(new_user_data["Files"]["download_folder"])
new_user_data["Logs"]["log_folder"] = str(new_user_data["Logs"]["log_folder"])
new_user_data["Sorting"]["sort_folder"] = str(new_user_data["Sorting"]["sort_folder"])

# Write config
new_config_path = constants.APP_STORAGE / "Configs" / new_config_name / "settings.yaml"
new_auth_path = constants.APP_STORAGE / "Configs" / "authentication.yaml"
new_global_settings_path = constants.APP_STORAGE / "Configs" / "global_settings.yaml"
new_config_path.parent.mkdir(parents=True, exist_ok=True)
yaml.save(new_config_path, new_user_data)
yaml.save(new_auth_path, new_auth_data)
yaml.save(new_global_settings_path, new_global_settings_data)
Loading
Loading