Move to standard module structure
This commit is contained in:
parent
185335e60b
commit
d8a1204d8b
26 changed files with 80 additions and 81 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -3,7 +3,7 @@ build/
|
|||
dist/
|
||||
MANIFEST
|
||||
__pycache__/
|
||||
src/__pycache__/
|
||||
bulkredditdownloader/__pycache__/
|
||||
config.json
|
||||
env/
|
||||
.vscode/
|
|
@ -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,
|
||||
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 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.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())
|
||||
|
|
@ -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:
|
|
@ -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:
|
|
@ -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:
|
|
@ -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
|
||||
|
||||
|
|
@ -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,
|
||||
from bulkredditdownloader.downloaders.Direct import Direct
|
||||
from bulkredditdownloader.downloaders.downloaderUtils import getFile
|
||||
from bulkredditdownloader.errors import (AlbumNotDownloadedCompletely, ExtensionError, FileAlreadyExistsError, ImageNotFound,
|
||||
NotADownloadableLinkError, TypeInSkip)
|
||||
from src.utils import GLOBAL, nameCorrector
|
||||
from src.utils import printToFile as print
|
||||
from bulkredditdownloader.utils import GLOBAL, nameCorrector
|
||||
from bulkredditdownloader.utils import printToFile as print
|
||||
|
||||
|
||||
class Imgur:
|
|
@ -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):
|
|
@ -5,11 +5,11 @@ import urllib
|
|||
import requests
|
||||
import pathlib
|
||||
|
||||
from src.downloaders.downloaderUtils import getFile
|
||||
from src.errors import (AlbumNotDownloadedCompletely, FileAlreadyExistsError, ImageNotFound, NotADownloadableLinkError,
|
||||
from bulkredditdownloader.downloaders.downloaderUtils import getFile
|
||||
from bulkredditdownloader.errors import (AlbumNotDownloadedCompletely, FileAlreadyExistsError, ImageNotFound, NotADownloadableLinkError,
|
||||
TypeInSkip)
|
||||
from src.utils import GLOBAL
|
||||
from src.utils import printToFile as print
|
||||
from bulkredditdownloader.utils import GLOBAL
|
||||
from bulkredditdownloader.utils import printToFile as print
|
||||
|
||||
|
||||
class Gallery:
|
|
@ -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:
|
|
@ -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:
|
|
@ -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
|
||||
|
|
@ -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:
|
|
@ -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
|
||||
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import json
|
||||
import os
|
||||
|
||||
from src.errors import InvalidJSONFile
|
||||
from bulkredditdownloader.errors import InvalidJSONFile
|
||||
|
||||
|
||||
class JsonFile:
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
@ -5,11 +5,11 @@ from urllib.error import HTTPError
|
|||
|
||||
from prawcore.exceptions import Forbidden, NotFound
|
||||
|
||||
from src.errors import (InsufficientPermission, InvalidSortingType, MultiredditNotFound, NoMatchingSubmissionFound,
|
||||
from bulkredditdownloader.errors import (InsufficientPermission, InvalidSortingType, MultiredditNotFound, NoMatchingSubmissionFound,
|
||||
NoPrawSupport)
|
||||
from src.reddit import Reddit
|
||||
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
|
|
@ -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:
|
2
setup.py
2
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": {
|
||||
|
|
Loading…
Reference in a new issue