diff --git a/.gitignore b/.gitignore index 1ab73fc..06bac55 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ build/ dist/ MANIFEST __pycache__/ -src/__pycache__/ +bulkredditdownloader/__pycache__/ config.json env/ .vscode/ \ No newline at end of file diff --git a/src/__init__.py b/bulkredditdownloader/__init__.py similarity index 100% rename from src/__init__.py rename to bulkredditdownloader/__init__.py diff --git a/script.py b/bulkredditdownloader/__main__.py similarity index 87% rename from script.py rename to bulkredditdownloader/__main__.py index 0053b06..bdc053f 100644 --- a/script.py +++ b/bulkredditdownloader/__main__.py @@ -12,28 +12,27 @@ from io import StringIO from pathlib import Path from prawcore.exceptions import InsufficientScope -from src.arguments import Arguments -from src.config import Config -from src.downloaders.Direct import Direct -from src.downloaders.Erome import Erome -from src.downloaders.gallery import Gallery -from src.downloaders.Gfycat import Gfycat -from src.downloaders.gifDeliveryNetwork import GifDeliveryNetwork -from src.downloaders.Imgur import Imgur -from src.downloaders.Gallery import Gallery -from src.downloaders.redgifs import Redgifs -from src.downloaders.selfPost import SelfPost -from src.downloaders.vreddit import VReddit -from src.downloaders.youtube import Youtube -from src.errors import (AlbumNotDownloadedCompletely, DomainInSkip, FailedToDownload, FileAlreadyExistsError, - ImgurLimitError, ImgurLoginError, InvalidJSONFile, NoSuitablePost, NotADownloadableLinkError, - TypeInSkip, full_exc_info) -from src.jsonHelper import JsonFile -from src.programMode import ProgramMode -from src.reddit import Reddit -from src.searcher import getPosts -from src.store import Store -from src.utils import GLOBAL, createLogFile, nameCorrector, printToFile +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.gifDeliveryNetwork import GifDeliveryNetwork +from bulkredditdownloader.downloaders.Imgur import Imgur +from bulkredditdownloader.downloaders.redgifs import Redgifs +from bulkredditdownloader.downloaders.selfPost import SelfPost +from bulkredditdownloader.downloaders.vreddit import VReddit +from bulkredditdownloader.downloaders.youtube import Youtube +from bulkredditdownloader.errors import (AlbumNotDownloadedCompletely, DomainInSkip, FailedToDownload, FileAlreadyExistsError, + ImgurLimitError, ImgurLoginError, InvalidJSONFile, NoSuitablePost, NotADownloadableLinkError, + TypeInSkip, full_exc_info) +from bulkredditdownloader.jsonHelper import JsonFile +from bulkredditdownloader.programMode import ProgramMode +from bulkredditdownloader.reddit import Reddit +from bulkredditdownloader.searcher import getPosts +from bulkredditdownloader.store import Store +from bulkredditdownloader.utils import GLOBAL, createLogFile, nameCorrector, printToFile from time import sleep @@ -330,11 +329,11 @@ if __name__ == "__main__": except KeyboardInterrupt: if GLOBAL.directory is None: - GLOBAL.directory = Path("..\\") + GLOBAL.directory = Path("../..\\") except Exception as exception: if GLOBAL.directory is None: - GLOBAL.directory = Path("..\\") + GLOBAL.directory = Path("../..\\") logging.error(sys.exc_info()[0].__name__, exc_info=full_exc_info(sys.exc_info())) print(GLOBAL.log_stream.getvalue()) diff --git a/src/arguments.py b/bulkredditdownloader/arguments.py similarity index 100% rename from src/arguments.py rename to bulkredditdownloader/arguments.py diff --git a/src/config.py b/bulkredditdownloader/config.py similarity index 96% rename from src/config.py rename to bulkredditdownloader/config.py index 2daaa64..eacfe97 100644 --- a/src/config.py +++ b/bulkredditdownloader/config.py @@ -1,6 +1,6 @@ -from src.reddit import Reddit -from src.jsonHelper import JsonFile -from src.utils import nameCorrector +from bulkredditdownloader.reddit import Reddit +from bulkredditdownloader.jsonHelper import JsonFile +from bulkredditdownloader.utils import nameCorrector class Config: diff --git a/src/downloaders/Direct.py b/bulkredditdownloader/downloaders/Direct.py similarity index 77% rename from src/downloaders/Direct.py rename to bulkredditdownloader/downloaders/Direct.py index 7f89081..20aa09e 100644 --- a/src/downloaders/Direct.py +++ b/bulkredditdownloader/downloaders/Direct.py @@ -1,8 +1,8 @@ import os import pathlib -from src.downloaders.downloaderUtils import getExtension, getFile -from src.utils import GLOBAL +from bulkredditdownloader.downloaders.downloaderUtils import getExtension, getFile +from bulkredditdownloader.utils import GLOBAL class Direct: diff --git a/src/downloaders/Erome.py b/bulkredditdownloader/downloaders/Erome.py similarity index 93% rename from src/downloaders/Erome.py rename to bulkredditdownloader/downloaders/Erome.py index f52bef3..40fc625 100644 --- a/src/downloaders/Erome.py +++ b/bulkredditdownloader/downloaders/Erome.py @@ -4,10 +4,10 @@ import urllib.error import urllib.request from html.parser import HTMLParser -from src.downloaders.downloaderUtils import getExtension, getFile -from src.errors import AlbumNotDownloadedCompletely, FileAlreadyExistsError, NotADownloadableLinkError -from src.utils import GLOBAL -from src.utils import printToFile as print +from bulkredditdownloader.downloaders.downloaderUtils import getExtension, getFile +from bulkredditdownloader.errors import AlbumNotDownloadedCompletely, FileAlreadyExistsError, NotADownloadableLinkError +from bulkredditdownloader.utils import GLOBAL +from bulkredditdownloader.utils import printToFile as print class Erome: diff --git a/src/downloaders/Gfycat.py b/bulkredditdownloader/downloaders/Gfycat.py similarity index 84% rename from src/downloaders/Gfycat.py rename to bulkredditdownloader/downloaders/Gfycat.py index 7e06f51..1e6b09a 100644 --- a/src/downloaders/Gfycat.py +++ b/bulkredditdownloader/downloaders/Gfycat.py @@ -4,10 +4,10 @@ import urllib.request from bs4 import BeautifulSoup -from src.downloaders.downloaderUtils import getExtension, getFile -from src.downloaders.gifDeliveryNetwork import GifDeliveryNetwork -from src.errors import NotADownloadableLinkError -from src.utils import GLOBAL +from bulkredditdownloader.downloaders.downloaderUtils import getExtension, getFile +from bulkredditdownloader.downloaders.gifDeliveryNetwork import GifDeliveryNetwork +from bulkredditdownloader.errors import NotADownloadableLinkError +from bulkredditdownloader.utils import GLOBAL import pathlib diff --git a/src/downloaders/Imgur.py b/bulkredditdownloader/downloaders/Imgur.py similarity index 91% rename from src/downloaders/Imgur.py rename to bulkredditdownloader/downloaders/Imgur.py index 32233c6..f4e6ff4 100644 --- a/src/downloaders/Imgur.py +++ b/bulkredditdownloader/downloaders/Imgur.py @@ -4,12 +4,12 @@ import pathlib import requests -from src.downloaders.Direct import Direct -from src.downloaders.downloaderUtils import getFile -from src.errors import (AlbumNotDownloadedCompletely, ExtensionError, FileAlreadyExistsError, ImageNotFound, - NotADownloadableLinkError, TypeInSkip) -from src.utils import GLOBAL, nameCorrector -from src.utils import printToFile as print +from bulkredditdownloader.downloaders.Direct import Direct +from bulkredditdownloader.downloaders.downloaderUtils import getFile +from bulkredditdownloader.errors import (AlbumNotDownloadedCompletely, ExtensionError, FileAlreadyExistsError, ImageNotFound, + NotADownloadableLinkError, TypeInSkip) +from bulkredditdownloader.utils import GLOBAL, nameCorrector +from bulkredditdownloader.utils import printToFile as print class Imgur: diff --git a/src/downloaders/__init__.py b/bulkredditdownloader/downloaders/__init__.py similarity index 100% rename from src/downloaders/__init__.py rename to bulkredditdownloader/downloaders/__init__.py diff --git a/src/downloaders/downloaderUtils.py b/bulkredditdownloader/downloaders/downloaderUtils.py similarity index 94% rename from src/downloaders/downloaderUtils.py rename to bulkredditdownloader/downloaders/downloaderUtils.py index c94f1d4..e5d1043 100644 --- a/src/downloaders/downloaderUtils.py +++ b/bulkredditdownloader/downloaders/downloaderUtils.py @@ -4,9 +4,9 @@ import sys import urllib.request from pathlib import Path -from src.errors import DomainInSkip, FailedToDownload, FileAlreadyExistsError, TypeInSkip -from src.utils import GLOBAL -from src.utils import printToFile as print +from bulkredditdownloader.errors import DomainInSkip, FailedToDownload, FileAlreadyExistsError, TypeInSkip +from bulkredditdownloader.utils import GLOBAL +from bulkredditdownloader.utils import printToFile as print def dlProgress(count: int, block_size: int, total_size: int): diff --git a/src/downloaders/gallery.py b/bulkredditdownloader/downloaders/gallery.py similarity index 91% rename from src/downloaders/gallery.py rename to bulkredditdownloader/downloaders/gallery.py index 4f9a1c4..18b220d 100644 --- a/src/downloaders/gallery.py +++ b/bulkredditdownloader/downloaders/gallery.py @@ -5,11 +5,11 @@ import urllib import requests import pathlib -from src.downloaders.downloaderUtils import getFile -from src.errors import (AlbumNotDownloadedCompletely, FileAlreadyExistsError, ImageNotFound, NotADownloadableLinkError, - TypeInSkip) -from src.utils import GLOBAL -from src.utils import printToFile as print +from bulkredditdownloader.downloaders.downloaderUtils import getFile +from bulkredditdownloader.errors import (AlbumNotDownloadedCompletely, FileAlreadyExistsError, ImageNotFound, NotADownloadableLinkError, + TypeInSkip) +from bulkredditdownloader.utils import GLOBAL +from bulkredditdownloader.utils import printToFile as print class Gallery: diff --git a/src/downloaders/gifDeliveryNetwork.py b/bulkredditdownloader/downloaders/gifDeliveryNetwork.py similarity index 88% rename from src/downloaders/gifDeliveryNetwork.py rename to bulkredditdownloader/downloaders/gifDeliveryNetwork.py index 666fd9f..86fd4a9 100644 --- a/src/downloaders/gifDeliveryNetwork.py +++ b/bulkredditdownloader/downloaders/gifDeliveryNetwork.py @@ -4,9 +4,9 @@ import urllib.request from bs4 import BeautifulSoup -from src.downloaders.downloaderUtils import getExtension, getFile -from src.errors import NotADownloadableLinkError -from src.utils import GLOBAL +from bulkredditdownloader.downloaders.downloaderUtils import getExtension, getFile +from bulkredditdownloader.errors import NotADownloadableLinkError +from bulkredditdownloader.utils import GLOBAL class GifDeliveryNetwork: diff --git a/src/downloaders/redgifs.py b/bulkredditdownloader/downloaders/redgifs.py similarity index 89% rename from src/downloaders/redgifs.py rename to bulkredditdownloader/downloaders/redgifs.py index a0af7b7..257f25b 100644 --- a/src/downloaders/redgifs.py +++ b/bulkredditdownloader/downloaders/redgifs.py @@ -5,9 +5,9 @@ import urllib.request from bs4 import BeautifulSoup -from src.downloaders.downloaderUtils import getExtension, getFile -from src.errors import NotADownloadableLinkError -from src.utils import GLOBAL +from bulkredditdownloader.downloaders.downloaderUtils import getExtension, getFile +from bulkredditdownloader.errors import NotADownloadableLinkError +from bulkredditdownloader.utils import GLOBAL class Redgifs: diff --git a/src/downloaders/selfPost.py b/bulkredditdownloader/downloaders/selfPost.py similarity index 90% rename from src/downloaders/selfPost.py rename to bulkredditdownloader/downloaders/selfPost.py index 32801c9..fa03e7b 100644 --- a/src/downloaders/selfPost.py +++ b/bulkredditdownloader/downloaders/selfPost.py @@ -4,9 +4,9 @@ import os import pathlib from pathlib import Path -from src.errors import FileAlreadyExistsError, TypeInSkip -from src.utils import GLOBAL -from src.utils import printToFile as print +from bulkredditdownloader.errors import FileAlreadyExistsError, TypeInSkip +from bulkredditdownloader.utils import GLOBAL +from bulkredditdownloader.utils import printToFile as print VanillaPrint = print diff --git a/src/downloaders/vreddit.py b/bulkredditdownloader/downloaders/vreddit.py similarity index 92% rename from src/downloaders/vreddit.py rename to bulkredditdownloader/downloaders/vreddit.py index bf5e98a..967c467 100644 --- a/src/downloaders/vreddit.py +++ b/bulkredditdownloader/downloaders/vreddit.py @@ -2,9 +2,9 @@ import os import pathlib import subprocess -from src.downloaders.downloaderUtils import getFile -from src.utils import GLOBAL -from src.utils import printToFile as print +from bulkredditdownloader.downloaders.downloaderUtils import getFile +from bulkredditdownloader.utils import GLOBAL +from bulkredditdownloader.utils import printToFile as print class VReddit: diff --git a/src/downloaders/youtube.py b/bulkredditdownloader/downloaders/youtube.py similarity index 86% rename from src/downloaders/youtube.py rename to bulkredditdownloader/downloaders/youtube.py index 9df78b1..f482d79 100644 --- a/src/downloaders/youtube.py +++ b/bulkredditdownloader/downloaders/youtube.py @@ -4,10 +4,10 @@ import sys import youtube_dl -from src.downloaders.downloaderUtils import createHash -from src.errors import FileAlreadyExistsError -from src.utils import GLOBAL -from src.utils import printToFile as print +from bulkredditdownloader.downloaders.downloaderUtils import createHash +from bulkredditdownloader.errors import FileAlreadyExistsError +from bulkredditdownloader.utils import GLOBAL +from bulkredditdownloader.utils import printToFile as print diff --git a/src/errors.py b/bulkredditdownloader/errors.py similarity index 100% rename from src/errors.py rename to bulkredditdownloader/errors.py diff --git a/src/jsonHelper.py b/bulkredditdownloader/jsonHelper.py similarity index 96% rename from src/jsonHelper.py rename to bulkredditdownloader/jsonHelper.py index aee4398..5f3f7bb 100644 --- a/src/jsonHelper.py +++ b/bulkredditdownloader/jsonHelper.py @@ -1,7 +1,7 @@ import json import os -from src.errors import InvalidJSONFile +from bulkredditdownloader.errors import InvalidJSONFile class JsonFile: diff --git a/src/parser.py b/bulkredditdownloader/parser.py similarity index 99% rename from src/parser.py rename to bulkredditdownloader/parser.py index f319cb6..e8a38f7 100644 --- a/src/parser.py +++ b/bulkredditdownloader/parser.py @@ -1,7 +1,7 @@ from pprint import pprint try: - from src.errors import InvalidRedditLink + from bulkredditdownloader.errors import InvalidRedditLink except ModuleNotFoundError: from errors import InvalidRedditLink diff --git a/src/programMode.py b/bulkredditdownloader/programMode.py similarity index 98% rename from src/programMode.py rename to bulkredditdownloader/programMode.py index b094458..f2361ac 100644 --- a/src/programMode.py +++ b/bulkredditdownloader/programMode.py @@ -1,8 +1,8 @@ import sys from pathlib import Path -from src.errors import InvalidSortingType, ProgramModeError, RedditorNameError, SearchModeError -from src.parser import LinkDesigner +from bulkredditdownloader.errors import InvalidSortingType, ProgramModeError, RedditorNameError, SearchModeError +from bulkredditdownloader.parser import LinkDesigner import argparse diff --git a/src/reddit.py b/bulkredditdownloader/reddit.py similarity index 95% rename from src/reddit.py rename to bulkredditdownloader/reddit.py index 87a81f0..1bfb261 100644 --- a/src/reddit.py +++ b/bulkredditdownloader/reddit.py @@ -5,9 +5,9 @@ import webbrowser import praw from prawcore.exceptions import ResponseException -from src.errors import RedditLoginFailed -from src.jsonHelper import JsonFile -from src.utils import GLOBAL +from bulkredditdownloader.errors import RedditLoginFailed +from bulkredditdownloader.jsonHelper import JsonFile +from bulkredditdownloader.utils import GLOBAL diff --git a/src/searcher.py b/bulkredditdownloader/searcher.py similarity index 97% rename from src/searcher.py rename to bulkredditdownloader/searcher.py index 2a2c3d0..19bf1d3 100644 --- a/src/searcher.py +++ b/bulkredditdownloader/searcher.py @@ -5,11 +5,11 @@ from urllib.error import HTTPError from prawcore.exceptions import Forbidden, NotFound -from src.errors import (InsufficientPermission, InvalidSortingType, MultiredditNotFound, NoMatchingSubmissionFound, - NoPrawSupport) -from src.reddit import Reddit +from bulkredditdownloader.errors import (InsufficientPermission, InvalidSortingType, MultiredditNotFound, NoMatchingSubmissionFound, + NoPrawSupport) +from bulkredditdownloader.reddit import Reddit from praw.models.listing.generator import ListingGenerator -from src.utils import GLOBAL, createLogFile, printToFile +from bulkredditdownloader.utils import GLOBAL, createLogFile, printToFile from praw.models import Submission print = printToFile diff --git a/src/store.py b/bulkredditdownloader/store.py similarity index 100% rename from src/store.py rename to bulkredditdownloader/store.py diff --git a/src/utils.py b/bulkredditdownloader/utils.py similarity index 97% rename from src/utils.py rename to bulkredditdownloader/utils.py index 731307b..ec39a29 100644 --- a/src/utils.py +++ b/bulkredditdownloader/utils.py @@ -4,7 +4,7 @@ from os import makedirs, path from pathlib import Path from typing import Optional -from src.jsonHelper import JsonFile +from bulkredditdownloader.jsonHelper import JsonFile class GLOBAL: diff --git a/setup.py b/setup.py index cb687bd..ab78f46 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ ## python setup.py build import sys from cx_Freeze import setup, Executable -from script import __version__ +from bulkredditdownloader.__main__ import __version__ options = { "build_exe": {