diff --git a/README.md b/README.md index a5569a4..519bad1 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ This is a tool to download submissions or submission data from Reddit. It can be Some quick reference commands are: - - `python3 -m bulkredditdownloader download --subreddit Python -L 10` - - `python3 -m bulkredditdownloader download --user me --saved --authenticate -L 25 --file-scheme '{POSTID}'` - - `python3 -m bulkredditdownloader download --subreddit 'Python, all, mindustry' -L 10 --make-hard-links` - - `python3 -m bulkredditdownloader archive --subreddit all --format yaml -L 500 --folder-scheme ''` + - `python3 -m bdfr download --subreddit Python -L 10` + - `python3 -m bdfr download --user me --saved --authenticate -L 25 --file-scheme '{POSTID}'` + - `python3 -m bdfr download --subreddit 'Python, all, mindustry' -L 10 --make-hard-links` + - `python3 -m bdfr archive --subreddit all --format yaml -L 500 --folder-scheme ''` ## Usage @@ -189,14 +189,14 @@ It is highly recommended that the file name scheme contain the parameter `{POSTI ## Configuration The configuration files are, by default, stored in the configuration directory for the user. This differs depending on the OS that the BDFR is being run on. For Windows, this will be: - - `C:\Documents and Settings\\Application Data\Local Settings\BDFR\bulkredditdownloader` or - - `C:\Documents and Settings\\Application Data\BDFR\bulkredditdownloader` + - `C:\Documents and Settings\\Application Data\Local Settings\BDFR\bdfr` or + - `C:\Documents and Settings\\Application Data\BDFR\bdfr` On Mac OSX, this will be: - - `~/Library/Application Support/bulkredditdownloader`. + - `~/Library/Application Support/bdfr`. Lastly, on a Linux system, this will be: - - `~/.local/share/bulkredditdownloader` + - `~/.local/share/bdfr` The logging output for each run of the BDFR will be saved to this directory in the file `log_output.txt`. If you need to submit a bug, it is this file that you will need to submit with the report. diff --git a/bulkredditdownloader/__init__.py b/bdfr/__init__.py similarity index 100% rename from bulkredditdownloader/__init__.py rename to bdfr/__init__.py diff --git a/bulkredditdownloader/__main__.py b/bdfr/__main__.py similarity index 95% rename from bulkredditdownloader/__main__.py rename to bdfr/__main__.py index fb0081a..c58f7ca 100644 --- a/bulkredditdownloader/__main__.py +++ b/bdfr/__main__.py @@ -5,9 +5,9 @@ import sys import click -from bulkredditdownloader.archiver import Archiver -from bulkredditdownloader.configuration import Configuration -from bulkredditdownloader.downloader import RedditDownloader +from bdfr.archiver import Archiver +from bdfr.configuration import Configuration +from bdfr.downloader import RedditDownloader logger = logging.getLogger() diff --git a/bulkredditdownloader/archive_entry/__init__.py b/bdfr/archive_entry/__init__.py similarity index 100% rename from bulkredditdownloader/archive_entry/__init__.py rename to bdfr/archive_entry/__init__.py diff --git a/bulkredditdownloader/archive_entry/base_archive_entry.py b/bdfr/archive_entry/base_archive_entry.py similarity index 100% rename from bulkredditdownloader/archive_entry/base_archive_entry.py rename to bdfr/archive_entry/base_archive_entry.py diff --git a/bulkredditdownloader/archive_entry/comment_archive_entry.py b/bdfr/archive_entry/comment_archive_entry.py similarity index 86% rename from bulkredditdownloader/archive_entry/comment_archive_entry.py rename to bdfr/archive_entry/comment_archive_entry.py index 51a0947..1bb5c18 100644 --- a/bulkredditdownloader/archive_entry/comment_archive_entry.py +++ b/bdfr/archive_entry/comment_archive_entry.py @@ -5,7 +5,7 @@ import logging import praw.models -from bulkredditdownloader.archive_entry.base_archive_entry import BaseArchiveEntry +from bdfr.archive_entry.base_archive_entry import BaseArchiveEntry logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/archive_entry/submission_archive_entry.py b/bdfr/archive_entry/submission_archive_entry.py similarity index 94% rename from bulkredditdownloader/archive_entry/submission_archive_entry.py rename to bdfr/archive_entry/submission_archive_entry.py index 90da7bc..aaa423b 100644 --- a/bulkredditdownloader/archive_entry/submission_archive_entry.py +++ b/bdfr/archive_entry/submission_archive_entry.py @@ -5,7 +5,7 @@ import logging import praw.models -from bulkredditdownloader.archive_entry.base_archive_entry import BaseArchiveEntry +from bdfr.archive_entry.base_archive_entry import BaseArchiveEntry logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/archiver.py b/bdfr/archiver.py similarity index 88% rename from bulkredditdownloader/archiver.py rename to bdfr/archiver.py index b44d4de..c6e4299 100644 --- a/bulkredditdownloader/archiver.py +++ b/bdfr/archiver.py @@ -10,13 +10,13 @@ import dict2xml import praw.models import yaml -from bulkredditdownloader.archive_entry.base_archive_entry import BaseArchiveEntry -from bulkredditdownloader.archive_entry.comment_archive_entry import CommentArchiveEntry -from bulkredditdownloader.archive_entry.submission_archive_entry import SubmissionArchiveEntry -from bulkredditdownloader.configuration import Configuration -from bulkredditdownloader.downloader import RedditDownloader -from bulkredditdownloader.exceptions import ArchiverError -from bulkredditdownloader.resource import Resource +from bdfr.archive_entry.base_archive_entry import BaseArchiveEntry +from bdfr.archive_entry.comment_archive_entry import CommentArchiveEntry +from bdfr.archive_entry.submission_archive_entry import SubmissionArchiveEntry +from bdfr.configuration import Configuration +from bdfr.downloader import RedditDownloader +from bdfr.exceptions import ArchiverError +from bdfr.resource import Resource logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/configuration.py b/bdfr/configuration.py similarity index 100% rename from bulkredditdownloader/configuration.py rename to bdfr/configuration.py diff --git a/bulkredditdownloader/default_config.cfg b/bdfr/default_config.cfg similarity index 100% rename from bulkredditdownloader/default_config.cfg rename to bdfr/default_config.cfg diff --git a/bulkredditdownloader/download_filter.py b/bdfr/download_filter.py similarity index 100% rename from bulkredditdownloader/download_filter.py rename to bdfr/download_filter.py diff --git a/bulkredditdownloader/downloader.py b/bdfr/downloader.py similarity index 96% rename from bulkredditdownloader/downloader.py rename to bdfr/downloader.py index 434eb74..4197b04 100644 --- a/bulkredditdownloader/downloader.py +++ b/bdfr/downloader.py @@ -22,13 +22,13 @@ import praw.exceptions import praw.models import prawcore -import bulkredditdownloader.exceptions as errors -from bulkredditdownloader.configuration import Configuration -from bulkredditdownloader.download_filter import DownloadFilter -from bulkredditdownloader.file_name_formatter import FileNameFormatter -from bulkredditdownloader.oauth2 import OAuth2Authenticator, OAuth2TokenManager -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.download_factory import DownloadFactory +import bdfr.exceptions as errors +from bdfr.configuration import Configuration +from bdfr.download_filter import DownloadFilter +from bdfr.file_name_formatter import FileNameFormatter +from bdfr.oauth2 import OAuth2Authenticator, OAuth2TokenManager +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.download_factory import DownloadFactory logger = logging.getLogger(__name__) @@ -59,7 +59,7 @@ class RedditTypes: class RedditDownloader: def __init__(self, args: Configuration): self.args = args - self.config_directories = appdirs.AppDirs('bulkredditdownloader', 'BDFR') + self.config_directories = appdirs.AppDirs('bdfr', 'BDFR') self.run_time = datetime.now().isoformat() self._setup_internal_objects() @@ -178,7 +178,7 @@ class RedditDownloader: logger.debug(f'Loading configuration from {path}') break if not self.config_location: - self.config_location = list(importlib.resources.path('bulkredditdownloader', 'default_config.cfg').gen)[0] + self.config_location = list(importlib.resources.path('bdfr', 'default_config.cfg').gen)[0] shutil.copy(self.config_location, Path(self.config_directory, 'default_config.cfg')) if not self.config_location: raise errors.BulkDownloaderException('Could not find a configuration file to load') diff --git a/bulkredditdownloader/exceptions.py b/bdfr/exceptions.py similarity index 100% rename from bulkredditdownloader/exceptions.py rename to bdfr/exceptions.py diff --git a/bulkredditdownloader/file_name_formatter.py b/bdfr/file_name_formatter.py similarity index 98% rename from bulkredditdownloader/file_name_formatter.py rename to bdfr/file_name_formatter.py index fcd5851..2c083c1 100644 --- a/bulkredditdownloader/file_name_formatter.py +++ b/bdfr/file_name_formatter.py @@ -9,8 +9,8 @@ from typing import Optional from praw.models import Comment, Submission -from bulkredditdownloader.exceptions import BulkDownloaderException -from bulkredditdownloader.resource import Resource +from bdfr.exceptions import BulkDownloaderException +from bdfr.resource import Resource logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/oauth2.py b/bdfr/oauth2.py similarity index 97% rename from bulkredditdownloader/oauth2.py rename to bdfr/oauth2.py index b8ec2c4..505d5bd 100644 --- a/bulkredditdownloader/oauth2.py +++ b/bdfr/oauth2.py @@ -11,7 +11,7 @@ from pathlib import Path import praw import requests -from bulkredditdownloader.exceptions import BulkDownloaderException, RedditAuthenticationError +from bdfr.exceptions import BulkDownloaderException, RedditAuthenticationError logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/resource.py b/bdfr/resource.py similarity index 97% rename from bulkredditdownloader/resource.py rename to bdfr/resource.py index 6577593..6a724d1 100644 --- a/bulkredditdownloader/resource.py +++ b/bdfr/resource.py @@ -11,7 +11,7 @@ import _hashlib import requests from praw.models import Submission -from bulkredditdownloader.exceptions import BulkDownloaderException +from bdfr.exceptions import BulkDownloaderException logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/site_authenticator.py b/bdfr/site_authenticator.py similarity index 100% rename from bulkredditdownloader/site_authenticator.py rename to bdfr/site_authenticator.py diff --git a/bulkredditdownloader/site_downloaders/__init__.py b/bdfr/site_downloaders/__init__.py similarity index 100% rename from bulkredditdownloader/site_downloaders/__init__.py rename to bdfr/site_downloaders/__init__.py diff --git a/bulkredditdownloader/site_downloaders/base_downloader.py b/bdfr/site_downloaders/base_downloader.py similarity index 83% rename from bulkredditdownloader/site_downloaders/base_downloader.py rename to bdfr/site_downloaders/base_downloader.py index 85eee0b..ac45dc3 100644 --- a/bulkredditdownloader/site_downloaders/base_downloader.py +++ b/bdfr/site_downloaders/base_downloader.py @@ -8,9 +8,9 @@ from typing import Optional import requests from praw.models import Submission -from bulkredditdownloader.exceptions import ResourceNotFound -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator +from bdfr.exceptions import ResourceNotFound +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/site_downloaders/direct.py b/bdfr/site_downloaders/direct.py similarity index 63% rename from bulkredditdownloader/site_downloaders/direct.py rename to bdfr/site_downloaders/direct.py index 6ab3d22..106f251 100644 --- a/bulkredditdownloader/site_downloaders/direct.py +++ b/bdfr/site_downloaders/direct.py @@ -4,9 +4,9 @@ from typing import Optional from praw.models import Submission -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.resource import Resource +from bdfr.site_downloaders.base_downloader import BaseDownloader class Direct(BaseDownloader): diff --git a/bulkredditdownloader/site_downloaders/download_factory.py b/bdfr/site_downloaders/download_factory.py similarity index 63% rename from bulkredditdownloader/site_downloaders/download_factory.py rename to bdfr/site_downloaders/download_factory.py index ba5c7e3..8a39413 100644 --- a/bulkredditdownloader/site_downloaders/download_factory.py +++ b/bdfr/site_downloaders/download_factory.py @@ -4,18 +4,18 @@ import re from typing import Type -from bulkredditdownloader.exceptions import NotADownloadableLinkError -from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader -from bulkredditdownloader.site_downloaders.direct import Direct -from bulkredditdownloader.site_downloaders.erome import Erome -from bulkredditdownloader.site_downloaders.gallery import Gallery -from bulkredditdownloader.site_downloaders.gfycat import Gfycat -from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork -from bulkredditdownloader.site_downloaders.imgur import Imgur -from bulkredditdownloader.site_downloaders.redgifs import Redgifs -from bulkredditdownloader.site_downloaders.self_post import SelfPost -from bulkredditdownloader.site_downloaders.vreddit import VReddit -from bulkredditdownloader.site_downloaders.youtube import Youtube +from bdfr.exceptions import NotADownloadableLinkError +from bdfr.site_downloaders.base_downloader import BaseDownloader +from bdfr.site_downloaders.direct import Direct +from bdfr.site_downloaders.erome import Erome +from bdfr.site_downloaders.gallery import Gallery +from bdfr.site_downloaders.gfycat import Gfycat +from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork +from bdfr.site_downloaders.imgur import Imgur +from bdfr.site_downloaders.redgifs import Redgifs +from bdfr.site_downloaders.self_post import SelfPost +from bdfr.site_downloaders.vreddit import VReddit +from bdfr.site_downloaders.youtube import Youtube class DownloadFactory: diff --git a/bulkredditdownloader/site_downloaders/erome.py b/bdfr/site_downloaders/erome.py similarity index 81% rename from bulkredditdownloader/site_downloaders/erome.py rename to bdfr/site_downloaders/erome.py index ae896e2..bd29ea4 100644 --- a/bulkredditdownloader/site_downloaders/erome.py +++ b/bdfr/site_downloaders/erome.py @@ -7,10 +7,10 @@ from typing import Optional import bs4 from praw.models import Submission -from bulkredditdownloader.exceptions import SiteDownloaderError -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader +from bdfr.exceptions import SiteDownloaderError +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.base_downloader import BaseDownloader logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/site_downloaders/gallery.py b/bdfr/site_downloaders/gallery.py similarity index 83% rename from bulkredditdownloader/site_downloaders/gallery.py rename to bdfr/site_downloaders/gallery.py index 829951c..2c59c05 100644 --- a/bulkredditdownloader/site_downloaders/gallery.py +++ b/bdfr/site_downloaders/gallery.py @@ -7,10 +7,10 @@ from typing import Optional import bs4 from praw.models import Submission -from bulkredditdownloader.exceptions import SiteDownloaderError -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader +from bdfr.exceptions import SiteDownloaderError +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.base_downloader import BaseDownloader logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/site_downloaders/gfycat.py b/bdfr/site_downloaders/gfycat.py similarity index 81% rename from bulkredditdownloader/site_downloaders/gfycat.py rename to bdfr/site_downloaders/gfycat.py index 62cee25..f140660 100644 --- a/bulkredditdownloader/site_downloaders/gfycat.py +++ b/bdfr/site_downloaders/gfycat.py @@ -7,10 +7,10 @@ from typing import Optional from bs4 import BeautifulSoup from praw.models import Submission -from bulkredditdownloader.exceptions import SiteDownloaderError -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork +from bdfr.exceptions import SiteDownloaderError +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork class Gfycat(GifDeliveryNetwork): diff --git a/bulkredditdownloader/site_downloaders/gif_delivery_network.py b/bdfr/site_downloaders/gif_delivery_network.py similarity index 75% rename from bulkredditdownloader/site_downloaders/gif_delivery_network.py rename to bdfr/site_downloaders/gif_delivery_network.py index 31d5660..2a7f726 100644 --- a/bulkredditdownloader/site_downloaders/gif_delivery_network.py +++ b/bdfr/site_downloaders/gif_delivery_network.py @@ -5,10 +5,10 @@ from typing import Optional from bs4 import BeautifulSoup from praw.models import Submission -from bulkredditdownloader.exceptions import NotADownloadableLinkError, SiteDownloaderError -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader +from bdfr.exceptions import NotADownloadableLinkError, SiteDownloaderError +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.base_downloader import BaseDownloader class GifDeliveryNetwork(BaseDownloader): diff --git a/bulkredditdownloader/site_downloaders/imgur.py b/bdfr/site_downloaders/imgur.py similarity index 90% rename from bulkredditdownloader/site_downloaders/imgur.py rename to bdfr/site_downloaders/imgur.py index 943d27b..3458a45 100644 --- a/bulkredditdownloader/site_downloaders/imgur.py +++ b/bdfr/site_downloaders/imgur.py @@ -7,10 +7,10 @@ from typing import Optional import bs4 from praw.models import Submission -from bulkredditdownloader.exceptions import NotADownloadableLinkError, SiteDownloaderError -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader +from bdfr.exceptions import NotADownloadableLinkError, SiteDownloaderError +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.base_downloader import BaseDownloader class Imgur(BaseDownloader): diff --git a/bulkredditdownloader/site_downloaders/redgifs.py b/bdfr/site_downloaders/redgifs.py similarity index 84% rename from bulkredditdownloader/site_downloaders/redgifs.py rename to bdfr/site_downloaders/redgifs.py index 536532e..2436d33 100644 --- a/bulkredditdownloader/site_downloaders/redgifs.py +++ b/bdfr/site_downloaders/redgifs.py @@ -7,10 +7,10 @@ from typing import Optional from bs4 import BeautifulSoup from praw.models import Submission -from bulkredditdownloader.exceptions import NotADownloadableLinkError, SiteDownloaderError -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork +from bdfr.exceptions import NotADownloadableLinkError, SiteDownloaderError +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork class Redgifs(GifDeliveryNetwork): diff --git a/bulkredditdownloader/site_downloaders/self_post.py b/bdfr/site_downloaders/self_post.py similarity index 86% rename from bulkredditdownloader/site_downloaders/self_post.py rename to bdfr/site_downloaders/self_post.py index a141fbb..cb922ee 100644 --- a/bulkredditdownloader/site_downloaders/self_post.py +++ b/bdfr/site_downloaders/self_post.py @@ -5,9 +5,9 @@ from typing import Optional from praw.models import Submission -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.base_downloader import BaseDownloader logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/site_downloaders/vreddit.py b/bdfr/site_downloaders/vreddit.py similarity index 68% rename from bulkredditdownloader/site_downloaders/vreddit.py rename to bdfr/site_downloaders/vreddit.py index 4ace7ac..bff96be 100644 --- a/bulkredditdownloader/site_downloaders/vreddit.py +++ b/bdfr/site_downloaders/vreddit.py @@ -5,9 +5,9 @@ from typing import Optional from praw.models import Submission -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.youtube import Youtube +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.youtube import Youtube logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/site_downloaders/youtube.py b/bdfr/site_downloaders/youtube.py similarity index 84% rename from bulkredditdownloader/site_downloaders/youtube.py rename to bdfr/site_downloaders/youtube.py index e8cd696..7b62dc1 100644 --- a/bulkredditdownloader/site_downloaders/youtube.py +++ b/bdfr/site_downloaders/youtube.py @@ -8,10 +8,10 @@ from typing import Optional import youtube_dl from praw.models import Submission -from bulkredditdownloader.exceptions import SiteDownloaderError -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_authenticator import SiteAuthenticator -from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader +from bdfr.exceptions import SiteDownloaderError +from bdfr.resource import Resource +from bdfr.site_authenticator import SiteAuthenticator +from bdfr.site_downloaders.base_downloader import BaseDownloader logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/tests/__init__.py b/bdfr/tests/__init__.py similarity index 100% rename from bulkredditdownloader/tests/__init__.py rename to bdfr/tests/__init__.py diff --git a/bulkredditdownloader/tests/archive_entry/__init__.py b/bdfr/tests/archive_entry/__init__.py similarity index 100% rename from bulkredditdownloader/tests/archive_entry/__init__.py rename to bdfr/tests/archive_entry/__init__.py diff --git a/bulkredditdownloader/tests/archive_entry/test_comment_archive_entry.py b/bdfr/tests/archive_entry/test_comment_archive_entry.py similarity index 92% rename from bulkredditdownloader/tests/archive_entry/test_comment_archive_entry.py rename to bdfr/tests/archive_entry/test_comment_archive_entry.py index 5e9ec69..27dfcb3 100644 --- a/bulkredditdownloader/tests/archive_entry/test_comment_archive_entry.py +++ b/bdfr/tests/archive_entry/test_comment_archive_entry.py @@ -4,7 +4,7 @@ import praw import pytest -from bulkredditdownloader.archive_entry.comment_archive_entry import CommentArchiveEntry +from bdfr.archive_entry.comment_archive_entry import CommentArchiveEntry @pytest.mark.online diff --git a/bulkredditdownloader/tests/archive_entry/test_submission_archive_entry.py b/bdfr/tests/archive_entry/test_submission_archive_entry.py similarity index 92% rename from bulkredditdownloader/tests/archive_entry/test_submission_archive_entry.py rename to bdfr/tests/archive_entry/test_submission_archive_entry.py index 6c72702..2b1bb72 100644 --- a/bulkredditdownloader/tests/archive_entry/test_submission_archive_entry.py +++ b/bdfr/tests/archive_entry/test_submission_archive_entry.py @@ -4,7 +4,7 @@ import praw import pytest -from bulkredditdownloader.archive_entry.submission_archive_entry import SubmissionArchiveEntry +from bdfr.archive_entry.submission_archive_entry import SubmissionArchiveEntry @pytest.mark.online diff --git a/bulkredditdownloader/tests/conftest.py b/bdfr/tests/conftest.py similarity index 95% rename from bulkredditdownloader/tests/conftest.py rename to bdfr/tests/conftest.py index 4197989..ce4b681 100644 --- a/bulkredditdownloader/tests/conftest.py +++ b/bdfr/tests/conftest.py @@ -8,7 +8,7 @@ from pathlib import Path import praw import pytest -from bulkredditdownloader.oauth2 import OAuth2TokenManager +from bdfr.oauth2 import OAuth2TokenManager @pytest.fixture(scope='session') diff --git a/bulkredditdownloader/tests/site_downloaders/__init__.py b/bdfr/tests/site_downloaders/__init__.py similarity index 100% rename from bulkredditdownloader/tests/site_downloaders/__init__.py rename to bdfr/tests/site_downloaders/__init__.py diff --git a/bulkredditdownloader/tests/site_downloaders/test_direct.py b/bdfr/tests/site_downloaders/test_direct.py similarity index 86% rename from bulkredditdownloader/tests/site_downloaders/test_direct.py rename to bdfr/tests/site_downloaders/test_direct.py index 3e891b9..790f4c3 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_direct.py +++ b/bdfr/tests/site_downloaders/test_direct.py @@ -5,8 +5,8 @@ from unittest.mock import Mock import pytest -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_downloaders.direct import Direct +from bdfr.resource import Resource +from bdfr.site_downloaders.direct import Direct @pytest.mark.online diff --git a/bulkredditdownloader/tests/site_downloaders/test_download_factory.py b/bdfr/tests/site_downloaders/test_download_factory.py similarity index 68% rename from bulkredditdownloader/tests/site_downloaders/test_download_factory.py rename to bdfr/tests/site_downloaders/test_download_factory.py index 830eeeb..5d6260e 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_download_factory.py +++ b/bdfr/tests/site_downloaders/test_download_factory.py @@ -4,19 +4,19 @@ import praw import pytest -from bulkredditdownloader.exceptions import NotADownloadableLinkError -from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader -from bulkredditdownloader.site_downloaders.direct import Direct -from bulkredditdownloader.site_downloaders.download_factory import DownloadFactory -from bulkredditdownloader.site_downloaders.erome import Erome -from bulkredditdownloader.site_downloaders.gallery import Gallery -from bulkredditdownloader.site_downloaders.gfycat import Gfycat -from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork -from bulkredditdownloader.site_downloaders.imgur import Imgur -from bulkredditdownloader.site_downloaders.redgifs import Redgifs -from bulkredditdownloader.site_downloaders.self_post import SelfPost -from bulkredditdownloader.site_downloaders.vreddit import VReddit -from bulkredditdownloader.site_downloaders.youtube import Youtube +from bdfr.exceptions import NotADownloadableLinkError +from bdfr.site_downloaders.base_downloader import BaseDownloader +from bdfr.site_downloaders.direct import Direct +from bdfr.site_downloaders.download_factory import DownloadFactory +from bdfr.site_downloaders.erome import Erome +from bdfr.site_downloaders.gallery import Gallery +from bdfr.site_downloaders.gfycat import Gfycat +from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork +from bdfr.site_downloaders.imgur import Imgur +from bdfr.site_downloaders.redgifs import Redgifs +from bdfr.site_downloaders.self_post import SelfPost +from bdfr.site_downloaders.vreddit import VReddit +from bdfr.site_downloaders.youtube import Youtube @pytest.mark.parametrize(('test_submission_url', 'expected_class'), ( diff --git a/bulkredditdownloader/tests/site_downloaders/test_erome.py b/bdfr/tests/site_downloaders/test_erome.py similarity index 97% rename from bulkredditdownloader/tests/site_downloaders/test_erome.py rename to bdfr/tests/site_downloaders/test_erome.py index 8a052a0..1de9afd 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_erome.py +++ b/bdfr/tests/site_downloaders/test_erome.py @@ -5,7 +5,7 @@ from unittest.mock import MagicMock import pytest -from bulkredditdownloader.site_downloaders.erome import Erome +from bdfr.site_downloaders.erome import Erome @pytest.mark.online diff --git a/bulkredditdownloader/tests/site_downloaders/test_gallery.py b/bdfr/tests/site_downloaders/test_gallery.py similarity index 97% rename from bulkredditdownloader/tests/site_downloaders/test_gallery.py rename to bdfr/tests/site_downloaders/test_gallery.py index f61e04f..e903e04 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_gallery.py +++ b/bdfr/tests/site_downloaders/test_gallery.py @@ -4,7 +4,7 @@ import praw import pytest -from bulkredditdownloader.site_downloaders.gallery import Gallery +from bdfr.site_downloaders.gallery import Gallery @pytest.mark.online diff --git a/bulkredditdownloader/tests/site_downloaders/test_gfycat.py b/bdfr/tests/site_downloaders/test_gfycat.py similarity index 91% rename from bulkredditdownloader/tests/site_downloaders/test_gfycat.py rename to bdfr/tests/site_downloaders/test_gfycat.py index 8290914..78c37a3 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_gfycat.py +++ b/bdfr/tests/site_downloaders/test_gfycat.py @@ -5,8 +5,8 @@ from unittest.mock import Mock import pytest -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_downloaders.gfycat import Gfycat +from bdfr.resource import Resource +from bdfr.site_downloaders.gfycat import Gfycat @pytest.mark.online diff --git a/bulkredditdownloader/tests/site_downloaders/test_gif_delivery_network.py b/bdfr/tests/site_downloaders/test_gif_delivery_network.py similarity index 89% rename from bulkredditdownloader/tests/site_downloaders/test_gif_delivery_network.py rename to bdfr/tests/site_downloaders/test_gif_delivery_network.py index 9856536..38819c1 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_gif_delivery_network.py +++ b/bdfr/tests/site_downloaders/test_gif_delivery_network.py @@ -5,8 +5,8 @@ from unittest.mock import Mock import pytest -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork +from bdfr.resource import Resource +from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork @pytest.mark.online diff --git a/bulkredditdownloader/tests/site_downloaders/test_imgur.py b/bdfr/tests/site_downloaders/test_imgur.py similarity index 95% rename from bulkredditdownloader/tests/site_downloaders/test_imgur.py rename to bdfr/tests/site_downloaders/test_imgur.py index 2f22c2b..ee98c42 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_imgur.py +++ b/bdfr/tests/site_downloaders/test_imgur.py @@ -5,9 +5,9 @@ from unittest.mock import Mock import pytest -from bulkredditdownloader.exceptions import SiteDownloaderError -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_downloaders.imgur import Imgur +from bdfr.exceptions import SiteDownloaderError +from bdfr.resource import Resource +from bdfr.site_downloaders.imgur import Imgur @pytest.mark.online diff --git a/bulkredditdownloader/tests/site_downloaders/test_redgifs.py b/bdfr/tests/site_downloaders/test_redgifs.py similarity index 91% rename from bulkredditdownloader/tests/site_downloaders/test_redgifs.py rename to bdfr/tests/site_downloaders/test_redgifs.py index 0d8cb79..a325025 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_redgifs.py +++ b/bdfr/tests/site_downloaders/test_redgifs.py @@ -5,8 +5,8 @@ from unittest.mock import Mock import pytest -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_downloaders.redgifs import Redgifs +from bdfr.resource import Resource +from bdfr.site_downloaders.redgifs import Redgifs @pytest.mark.online diff --git a/bulkredditdownloader/tests/site_downloaders/test_self_post.py b/bdfr/tests/site_downloaders/test_self_post.py similarity index 85% rename from bulkredditdownloader/tests/site_downloaders/test_self_post.py rename to bdfr/tests/site_downloaders/test_self_post.py index 315388f..e3363bb 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_self_post.py +++ b/bdfr/tests/site_downloaders/test_self_post.py @@ -4,8 +4,8 @@ import praw import pytest -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_downloaders.self_post import SelfPost +from bdfr.resource import Resource +from bdfr.site_downloaders.self_post import SelfPost @pytest.mark.online diff --git a/bulkredditdownloader/tests/site_downloaders/test_vreddit.py b/bdfr/tests/site_downloaders/test_vreddit.py similarity index 84% rename from bulkredditdownloader/tests/site_downloaders/test_vreddit.py rename to bdfr/tests/site_downloaders/test_vreddit.py index d7377b6..88b4a02 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_vreddit.py +++ b/bdfr/tests/site_downloaders/test_vreddit.py @@ -4,8 +4,8 @@ import praw import pytest -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_downloaders.vreddit import VReddit +from bdfr.resource import Resource +from bdfr.site_downloaders.vreddit import VReddit @pytest.mark.online diff --git a/bulkredditdownloader/tests/site_downloaders/test_youtube.py b/bdfr/tests/site_downloaders/test_youtube.py similarity index 86% rename from bulkredditdownloader/tests/site_downloaders/test_youtube.py rename to bdfr/tests/site_downloaders/test_youtube.py index 8c7bfca..0b46f49 100644 --- a/bulkredditdownloader/tests/site_downloaders/test_youtube.py +++ b/bdfr/tests/site_downloaders/test_youtube.py @@ -5,8 +5,8 @@ from unittest.mock import MagicMock import pytest -from bulkredditdownloader.resource import Resource -from bulkredditdownloader.site_downloaders.youtube import Youtube +from bdfr.resource import Resource +from bdfr.site_downloaders.youtube import Youtube @pytest.mark.online diff --git a/bulkredditdownloader/tests/test_archiver.py b/bdfr/tests/test_archiver.py similarity index 93% rename from bulkredditdownloader/tests/test_archiver.py rename to bdfr/tests/test_archiver.py index b0a84c6..622c555 100644 --- a/bulkredditdownloader/tests/test_archiver.py +++ b/bdfr/tests/test_archiver.py @@ -7,8 +7,8 @@ from unittest.mock import MagicMock import praw import pytest -from bulkredditdownloader.archive_entry.submission_archive_entry import SubmissionArchiveEntry -from bulkredditdownloader.archiver import Archiver +from bdfr.archive_entry.submission_archive_entry import SubmissionArchiveEntry +from bdfr.archiver import Archiver @pytest.mark.online diff --git a/bulkredditdownloader/tests/test_configuration.py b/bdfr/tests/test_configuration.py similarity index 90% rename from bulkredditdownloader/tests/test_configuration.py rename to bdfr/tests/test_configuration.py index 94697a3..8ad1663 100644 --- a/bulkredditdownloader/tests/test_configuration.py +++ b/bdfr/tests/test_configuration.py @@ -5,7 +5,7 @@ from unittest.mock import MagicMock import pytest -from bulkredditdownloader.configuration import Configuration +from bdfr.configuration import Configuration @pytest.mark.parametrize('arg_dict', ( diff --git a/bulkredditdownloader/tests/test_download_filter.py b/bdfr/tests/test_download_filter.py similarity index 96% rename from bulkredditdownloader/tests/test_download_filter.py rename to bdfr/tests/test_download_filter.py index 04ea169..3c2adba 100644 --- a/bulkredditdownloader/tests/test_download_filter.py +++ b/bdfr/tests/test_download_filter.py @@ -3,7 +3,7 @@ import pytest -from bulkredditdownloader.download_filter import DownloadFilter +from bdfr.download_filter import DownloadFilter @pytest.fixture() diff --git a/bulkredditdownloader/tests/test_downloader.py b/bdfr/tests/test_downloader.py similarity index 97% rename from bulkredditdownloader/tests/test_downloader.py rename to bdfr/tests/test_downloader.py index 11cc759..9a4f051 100644 --- a/bulkredditdownloader/tests/test_downloader.py +++ b/bdfr/tests/test_downloader.py @@ -10,13 +10,13 @@ import praw import praw.models import pytest -from bulkredditdownloader.__main__ import setup_logging -from bulkredditdownloader.configuration import Configuration -from bulkredditdownloader.download_filter import DownloadFilter -from bulkredditdownloader.downloader import RedditDownloader, RedditTypes -from bulkredditdownloader.exceptions import BulkDownloaderException -from bulkredditdownloader.file_name_formatter import FileNameFormatter -from bulkredditdownloader.site_authenticator import SiteAuthenticator +from bdfr.__main__ import setup_logging +from bdfr.configuration import Configuration +from bdfr.download_filter import DownloadFilter +from bdfr.downloader import RedditDownloader, RedditTypes +from bdfr.exceptions import BulkDownloaderException +from bdfr.file_name_formatter import FileNameFormatter +from bdfr.site_authenticator import SiteAuthenticator @pytest.fixture() diff --git a/bulkredditdownloader/tests/test_file_name_formatter.py b/bdfr/tests/test_file_name_formatter.py similarity index 98% rename from bulkredditdownloader/tests/test_file_name_formatter.py rename to bdfr/tests/test_file_name_formatter.py index a3506e2..ab16abe 100644 --- a/bulkredditdownloader/tests/test_file_name_formatter.py +++ b/bdfr/tests/test_file_name_formatter.py @@ -8,8 +8,8 @@ from unittest.mock import MagicMock import praw.models import pytest -from bulkredditdownloader.file_name_formatter import FileNameFormatter -from bulkredditdownloader.resource import Resource +from bdfr.file_name_formatter import FileNameFormatter +from bdfr.resource import Resource @pytest.fixture() diff --git a/bulkredditdownloader/tests/test_integration.py b/bdfr/tests/test_integration.py similarity index 99% rename from bulkredditdownloader/tests/test_integration.py rename to bdfr/tests/test_integration.py index 23cdbd4..9623b24 100644 --- a/bulkredditdownloader/tests/test_integration.py +++ b/bdfr/tests/test_integration.py @@ -7,7 +7,7 @@ from pathlib import Path import pytest from click.testing import CliRunner -from bulkredditdownloader.__main__ import cli +from bdfr.__main__ import cli @pytest.mark.online diff --git a/bulkredditdownloader/tests/test_oauth2.py b/bdfr/tests/test_oauth2.py similarity index 93% rename from bulkredditdownloader/tests/test_oauth2.py rename to bdfr/tests/test_oauth2.py index e8d71a0..6c25d35 100644 --- a/bulkredditdownloader/tests/test_oauth2.py +++ b/bdfr/tests/test_oauth2.py @@ -7,8 +7,8 @@ from unittest.mock import MagicMock import pytest -from bulkredditdownloader.exceptions import BulkDownloaderException -from bulkredditdownloader.oauth2 import OAuth2Authenticator, OAuth2TokenManager +from bdfr.exceptions import BulkDownloaderException +from bdfr.oauth2 import OAuth2Authenticator, OAuth2TokenManager @pytest.fixture() diff --git a/bulkredditdownloader/tests/test_resource.py b/bdfr/tests/test_resource.py similarity index 95% rename from bulkredditdownloader/tests/test_resource.py rename to bdfr/tests/test_resource.py index 0292f06..0a8e145 100644 --- a/bulkredditdownloader/tests/test_resource.py +++ b/bdfr/tests/test_resource.py @@ -4,7 +4,7 @@ import pytest from unittest.mock import MagicMock -from bulkredditdownloader.resource import Resource +from bdfr.resource import Resource @pytest.mark.parametrize(('test_url', 'expected'), ( diff --git a/setup.cfg b/setup.cfg index 4c907fd..76bcca2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,4 +5,4 @@ author-email = parlakciali@gmail.com python_requires = >=3.9 [files] -packages = bulkredditdownloader +packages = bdfr diff --git a/setup.py b/setup.py index b571f29..40c6185 100644 --- a/setup.py +++ b/setup.py @@ -3,4 +3,4 @@ from setuptools import setup -setup(setup_requires=['pbr', 'appdirs'], pbr=True, data_files=[('config', ['bulkredditdownloader/default_config.cfg'])]) +setup(setup_requires=['pbr', 'appdirs'], pbr=True, data_files=[('config', ['bdfr/default_config.cfg'])])