From f2415b6bd061fd3cbd3cd9f122341439952af356 Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Sun, 7 Feb 2021 17:08:24 +1000 Subject: [PATCH] Rename folder --- bulkredditdownloader/__main__.py | 20 +++++++++---------- .../__init__.py | 0 .../base_downloader.py | 0 .../direct.py | 2 +- .../erome.py | 2 +- .../gallery.py | 2 +- .../gfycat.py | 2 +- .../gif_delivery_network.py | 2 +- .../imgur.py | 4 ++-- .../redgifs.py | 2 +- .../self_post.py | 2 +- .../vreddit.py | 2 +- .../youtube.py | 2 +- .../tests/downloaders/test_base_downloader.py | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) rename bulkredditdownloader/{downloaders => site_downloaders}/__init__.py (100%) rename bulkredditdownloader/{downloaders => site_downloaders}/base_downloader.py (100%) rename bulkredditdownloader/{downloaders => site_downloaders}/direct.py (87%) rename bulkredditdownloader/{downloaders => site_downloaders}/erome.py (98%) rename bulkredditdownloader/{downloaders => site_downloaders}/gallery.py (98%) rename bulkredditdownloader/{downloaders => site_downloaders}/gfycat.py (92%) rename bulkredditdownloader/{downloaders => site_downloaders}/gif_delivery_network.py (95%) rename bulkredditdownloader/{downloaders => site_downloaders}/imgur.py (97%) rename bulkredditdownloader/{downloaders => site_downloaders}/redgifs.py (94%) rename bulkredditdownloader/{downloaders => site_downloaders}/self_post.py (95%) rename bulkredditdownloader/{downloaders => site_downloaders}/vreddit.py (96%) rename bulkredditdownloader/{downloaders => site_downloaders}/youtube.py (95%) diff --git a/bulkredditdownloader/__main__.py b/bulkredditdownloader/__main__.py index 773f719..6fd914b 100644 --- a/bulkredditdownloader/__main__.py +++ b/bulkredditdownloader/__main__.py @@ -14,16 +14,16 @@ from prawcore.exceptions import InsufficientScope from bulkredditdownloader.arguments import Arguments from bulkredditdownloader.config import Config -from bulkredditdownloader.downloaders.direct import Direct -from bulkredditdownloader.downloaders.erome import Erome -from bulkredditdownloader.downloaders.gallery import Gallery -from bulkredditdownloader.downloaders.gfycat import Gfycat -from bulkredditdownloader.downloaders.gif_delivery_network import GifDeliveryNetwork -from bulkredditdownloader.downloaders.imgur import Imgur -from bulkredditdownloader.downloaders.redgifs import Redgifs -from bulkredditdownloader.downloaders.self_post import SelfPost -from bulkredditdownloader.downloaders.vreddit import VReddit -from bulkredditdownloader.downloaders.youtube import Youtube +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 bulkredditdownloader.errors import (AlbumNotDownloadedCompletely, DomainInSkip, FailedToDownload, FileAlreadyExistsError, ImgurLimitError, ImgurLoginError, InvalidJSONFile, NoSuitablePost, NotADownloadableLinkError, TypeInSkip, full_exc_info) diff --git a/bulkredditdownloader/downloaders/__init__.py b/bulkredditdownloader/site_downloaders/__init__.py similarity index 100% rename from bulkredditdownloader/downloaders/__init__.py rename to bulkredditdownloader/site_downloaders/__init__.py diff --git a/bulkredditdownloader/downloaders/base_downloader.py b/bulkredditdownloader/site_downloaders/base_downloader.py similarity index 100% rename from bulkredditdownloader/downloaders/base_downloader.py rename to bulkredditdownloader/site_downloaders/base_downloader.py diff --git a/bulkredditdownloader/downloaders/direct.py b/bulkredditdownloader/site_downloaders/direct.py similarity index 87% rename from bulkredditdownloader/downloaders/direct.py rename to bulkredditdownloader/site_downloaders/direct.py index 5fe97cd..95ac00f 100644 --- a/bulkredditdownloader/downloaders/direct.py +++ b/bulkredditdownloader/site_downloaders/direct.py @@ -2,7 +2,7 @@ import pathlib -from bulkredditdownloader.downloaders.base_downloader import BaseDownloader +from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.utils import GLOBAL diff --git a/bulkredditdownloader/downloaders/erome.py b/bulkredditdownloader/site_downloaders/erome.py similarity index 98% rename from bulkredditdownloader/downloaders/erome.py rename to bulkredditdownloader/site_downloaders/erome.py index 2df5937..540733f 100644 --- a/bulkredditdownloader/downloaders/erome.py +++ b/bulkredditdownloader/site_downloaders/erome.py @@ -7,7 +7,7 @@ import urllib.error import urllib.request from html.parser import HTMLParser -from bulkredditdownloader.downloaders.base_downloader import BaseDownloader +from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.errors import AlbumNotDownloadedCompletely, FileAlreadyExistsError, NotADownloadableLinkError from bulkredditdownloader.utils import GLOBAL diff --git a/bulkredditdownloader/downloaders/gallery.py b/bulkredditdownloader/site_downloaders/gallery.py similarity index 98% rename from bulkredditdownloader/downloaders/gallery.py rename to bulkredditdownloader/site_downloaders/gallery.py index d877e4e..59334be 100644 --- a/bulkredditdownloader/downloaders/gallery.py +++ b/bulkredditdownloader/site_downloaders/gallery.py @@ -7,7 +7,7 @@ import urllib.parse import requests -from bulkredditdownloader.downloaders.base_downloader import BaseDownloader +from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.errors import (AlbumNotDownloadedCompletely, FileAlreadyExistsError, ImageNotFound, NotADownloadableLinkError, TypeInSkip) from bulkredditdownloader.utils import GLOBAL diff --git a/bulkredditdownloader/downloaders/gfycat.py b/bulkredditdownloader/site_downloaders/gfycat.py similarity index 92% rename from bulkredditdownloader/downloaders/gfycat.py rename to bulkredditdownloader/site_downloaders/gfycat.py index 9d2b3bb..bd1d694 100644 --- a/bulkredditdownloader/downloaders/gfycat.py +++ b/bulkredditdownloader/site_downloaders/gfycat.py @@ -7,7 +7,7 @@ import urllib.request from bs4 import BeautifulSoup -from bulkredditdownloader.downloaders.gif_delivery_network import GifDeliveryNetwork +from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork class Gfycat(GifDeliveryNetwork): diff --git a/bulkredditdownloader/downloaders/gif_delivery_network.py b/bulkredditdownloader/site_downloaders/gif_delivery_network.py similarity index 95% rename from bulkredditdownloader/downloaders/gif_delivery_network.py rename to bulkredditdownloader/site_downloaders/gif_delivery_network.py index 52caf4c..85252cb 100644 --- a/bulkredditdownloader/downloaders/gif_delivery_network.py +++ b/bulkredditdownloader/site_downloaders/gif_delivery_network.py @@ -5,7 +5,7 @@ import urllib.request from bs4 import BeautifulSoup -from bulkredditdownloader.downloaders.base_downloader import BaseDownloader +from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.errors import NotADownloadableLinkError from bulkredditdownloader.utils import GLOBAL diff --git a/bulkredditdownloader/downloaders/imgur.py b/bulkredditdownloader/site_downloaders/imgur.py similarity index 97% rename from bulkredditdownloader/downloaders/imgur.py rename to bulkredditdownloader/site_downloaders/imgur.py index 6f05b26..b1c2016 100644 --- a/bulkredditdownloader/downloaders/imgur.py +++ b/bulkredditdownloader/site_downloaders/imgur.py @@ -6,8 +6,8 @@ import logging import requests -from bulkredditdownloader.downloaders.base_downloader import BaseDownloader -from bulkredditdownloader.downloaders.direct import Direct +from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader +from bulkredditdownloader.site_downloaders.direct import Direct from bulkredditdownloader.errors import (AlbumNotDownloadedCompletely, ExtensionError, FileAlreadyExistsError, ImageNotFound, NotADownloadableLinkError, TypeInSkip) from bulkredditdownloader.utils import GLOBAL, nameCorrector diff --git a/bulkredditdownloader/downloaders/redgifs.py b/bulkredditdownloader/site_downloaders/redgifs.py similarity index 94% rename from bulkredditdownloader/downloaders/redgifs.py rename to bulkredditdownloader/site_downloaders/redgifs.py index 98224aa..2f5f520 100644 --- a/bulkredditdownloader/downloaders/redgifs.py +++ b/bulkredditdownloader/site_downloaders/redgifs.py @@ -6,7 +6,7 @@ import urllib.request from bs4 import BeautifulSoup -from bulkredditdownloader.downloaders.gif_delivery_network import GifDeliveryNetwork +from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork from bulkredditdownloader.errors import NotADownloadableLinkError diff --git a/bulkredditdownloader/downloaders/self_post.py b/bulkredditdownloader/site_downloaders/self_post.py similarity index 95% rename from bulkredditdownloader/downloaders/self_post.py rename to bulkredditdownloader/site_downloaders/self_post.py index 2325711..c94df7e 100644 --- a/bulkredditdownloader/downloaders/self_post.py +++ b/bulkredditdownloader/site_downloaders/self_post.py @@ -5,7 +5,7 @@ import logging import pathlib from pathlib import Path -from bulkredditdownloader.downloaders.base_downloader import BaseDownloader +from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.errors import FileAlreadyExistsError, TypeInSkip from bulkredditdownloader.utils import GLOBAL diff --git a/bulkredditdownloader/downloaders/vreddit.py b/bulkredditdownloader/site_downloaders/vreddit.py similarity index 96% rename from bulkredditdownloader/downloaders/vreddit.py rename to bulkredditdownloader/site_downloaders/vreddit.py index 3cce613..2b4ee03 100644 --- a/bulkredditdownloader/downloaders/vreddit.py +++ b/bulkredditdownloader/site_downloaders/vreddit.py @@ -5,7 +5,7 @@ import os import pathlib import subprocess -from bulkredditdownloader.downloaders.base_downloader import BaseDownloader +from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.utils import GLOBAL logger = logging.getLogger(__name__) diff --git a/bulkredditdownloader/downloaders/youtube.py b/bulkredditdownloader/site_downloaders/youtube.py similarity index 95% rename from bulkredditdownloader/downloaders/youtube.py rename to bulkredditdownloader/site_downloaders/youtube.py index abde54a..afabf66 100644 --- a/bulkredditdownloader/downloaders/youtube.py +++ b/bulkredditdownloader/site_downloaders/youtube.py @@ -7,7 +7,7 @@ import sys import youtube_dl -from bulkredditdownloader.downloaders.base_downloader import BaseDownloader +from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.errors import FileAlreadyExistsError from bulkredditdownloader.utils import GLOBAL diff --git a/bulkredditdownloader/tests/downloaders/test_base_downloader.py b/bulkredditdownloader/tests/downloaders/test_base_downloader.py index a87d426..951ef81 100644 --- a/bulkredditdownloader/tests/downloaders/test_base_downloader.py +++ b/bulkredditdownloader/tests/downloaders/test_base_downloader.py @@ -5,7 +5,7 @@ from pathlib import Path import pytest -from bulkredditdownloader.downloaders.base_downloader import BaseDownloader +from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader @pytest.mark.parametrize(('test_bytes', 'expected'), ((b'test', '098f6bcd4621d373cade4e832627b4f6'),