Skip to content

Commit

Permalink
Removed weird file hierarchy checks.
Browse files Browse the repository at this point in the history
  • Loading branch information
prof79 committed Feb 17, 2024
1 parent e4c9bfa commit be6155c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 38 deletions.
12 changes: 2 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)**

Expand Down
4 changes: 4 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions fansly_downloader_ng.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__ = [
Expand Down
26 changes: 0 additions & 26 deletions pathio/pathio.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit be6155c

Please sign in to comment.