From be6155c1106e116715185b562ff511457c6f48d9 Mon Sep 17 00:00:00 2001 From: prof79 Date: Sat, 17 Feb 2024 16:01:04 +0100 Subject: [PATCH] Removed weird file hierarchy checks. --- README.md | 12 ++---------- ReleaseNotes.md | 4 ++++ fansly_downloader_ng.py | 4 ++-- pathio/pathio.py | 26 -------------------------- 4 files changed, 8 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index ea2141e..dc08a33 100644 --- a/README.md +++ b/README.md @@ -117,17 +117,9 @@ This is a rewrite/refactoring of [Avnsx](https://github.com/Avnsx)'s original [F ⚠️ Due to a [hashing bug](../../issues/13) duplicate videos might be downloaded if a creator re-posts a lot. Downloaded videos will have to be renamed in a future version when video hashing is perfected. -### v0.8.8 2024-02-17 +### v0.8.9 2024-02-17 -Fix corner cases discussed in [#17](../../issues/17), go to 1080p as a last resort and fetch M3U8s recursively. - -### v0.8.7 2024-02-15 - -This should hopefully fix [#18](../../issues/18). - -### v0.8.6 2024-02-15 - -This primarily fixes [video download issue #17](../../issues/17) but I also made sure [#21 workaround](../../issues/21) only applies to Linux as I had a bad experience on my Windows machine with an old ImageMagick including old ffmpeg installed, not working with concat at all. +Removed the weird [file hierarchy checks](../../issues/7). For more details and history see: **[Release Notes](ReleaseNotes.md)** diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 8ff5d10..3ecf658 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -2,6 +2,10 @@ ## 🗒️ Release Notes +### v0.8.9 2024-02-17 + +Removed the weird [file hierarchy checks](../../issues/7). + ### v0.8.8 2024-02-17 Fix corner cases discussed in [#17](../../issues/17), go to 1080p as a last resort and fetch M3U8s recursively. diff --git a/fansly_downloader_ng.py b/fansly_downloader_ng.py index c6897fd..aab4eca 100644 --- a/fansly_downloader_ng.py +++ b/fansly_downloader_ng.py @@ -2,8 +2,8 @@ """Fansly Downloader NG""" -__version__ = '0.8.8' -__date__ = '2024-02-17T15:07:00+01' +__version__ = '0.8.9' +__date__ = '2024-02-17T15:55:00+01' __maintainer__ = 'prof79' __copyright__ = f'Copyright (C) 2023-2024 by {__maintainer__}' __authors__ = [ diff --git a/pathio/pathio.py b/pathio/pathio.py index ac08efe..0cd67d5 100644 --- a/pathio/pathio.py +++ b/pathio/pathio.py @@ -77,32 +77,6 @@ def set_create_directory_for_download(config: FanslyConfig, state: DownloadState # TODO: Maybe for "Single" we should use the post_id as subdirectory? pass - # If current download folder wasn't created with content separation, disable it for this download session too - is_file_hierarchy_correct = True - - if user_base_path.is_dir(): - - for directory in user_base_path.iterdir(): - - if (user_base_path / directory).is_dir(): - - if 'Pictures' in str(directory) and any([config.separate_messages, config.separate_timeline]): - is_file_hierarchy_correct = False - - if 'Videos' in str(directory) and any([config.separate_messages, config.separate_timeline]): - is_file_hierarchy_correct = False - - if not is_file_hierarchy_correct: - print_warning( - f"Due to the presence of 'Pictures' and 'Videos' sub-directories in the current download folder" - f"\n{20*' '}content separation will remain disabled throughout this download session." - ) - - config.separate_messages, config.separate_timeline = False, False - - # utilize recursion to fix BASE_DIR_NAME generation - return set_create_directory_for_download(config, state) - # Save state state.base_path = user_base_path state.download_path = download_directory