From 3ed574a49f69212a28fa543e4c3d4255a9877586 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Fri, 14 Dec 2018 20:51:34 -0500 Subject: [PATCH] Move vendored packages in `core` to `libs` Remove `core` references from vendored packages in `core` and optimize imports --- core/nzbToMediaUtil.py | 34 ++++++++++--------- core/transmissionrpc/__init__.py | 18 ---------- {core => libs}/linktastic/__init__.py | 0 {core => libs}/linktastic/linktastic.py | 2 +- {core => libs}/qbittorrent/__init__.py | 0 {core => libs}/qbittorrent/client.py | 3 +- {core => libs}/synchronousdeluge/__init__.py | 2 +- {core => libs}/synchronousdeluge/client.py | 2 +- .../synchronousdeluge/exceptions.py | 0 {core => libs}/synchronousdeluge/protocol.py | 0 {core => libs}/synchronousdeluge/rencode.py | 1 + {core => libs}/synchronousdeluge/transfer.py | 6 ++-- libs/transmissionrpc/__init__.py | 18 ++++++++++ {core => libs}/transmissionrpc/client.py | 24 ++++++------- {core => libs}/transmissionrpc/constants.py | 0 {core => libs}/transmissionrpc/error.py | 2 +- {core => libs}/transmissionrpc/httphandler.py | 16 +++++---- {core => libs}/transmissionrpc/session.py | 4 +-- {core => libs}/transmissionrpc/torrent.py | 8 ++--- {core => libs}/transmissionrpc/utils.py | 4 +-- {core => libs}/utorrent/__init__.py | 0 {core => libs}/utorrent/client.py | 7 ++-- {core => libs}/utorrent/upload.py | 0 23 files changed, 79 insertions(+), 72 deletions(-) delete mode 100644 core/transmissionrpc/__init__.py rename {core => libs}/linktastic/__init__.py (100%) rename {core => libs}/linktastic/linktastic.py (100%) rename {core => libs}/qbittorrent/__init__.py (100%) rename {core => libs}/qbittorrent/client.py (99%) rename {core => libs}/synchronousdeluge/__init__.py (88%) rename {core => libs}/synchronousdeluge/client.py (100%) rename {core => libs}/synchronousdeluge/exceptions.py (100%) rename {core => libs}/synchronousdeluge/protocol.py (100%) rename {core => libs}/synchronousdeluge/rencode.py (99%) rename {core => libs}/synchronousdeluge/transfer.py (96%) create mode 100644 libs/transmissionrpc/__init__.py rename {core => libs}/transmissionrpc/client.py (98%) rename {core => libs}/transmissionrpc/constants.py (100%) rename {core => libs}/transmissionrpc/error.py (97%) rename {core => libs}/transmissionrpc/httphandler.py (94%) rename {core => libs}/transmissionrpc/session.py (97%) rename {core => libs}/transmissionrpc/torrent.py (98%) rename {core => libs}/transmissionrpc/utils.py (99%) rename {core => libs}/utorrent/__init__.py (100%) rename {core => libs}/utorrent/client.py (99%) rename {core => libs}/utorrent/upload.py (100%) diff --git a/core/nzbToMediaUtil.py b/core/nzbToMediaUtil.py index 731c0856..8a023dbe 100644 --- a/core/nzbToMediaUtil.py +++ b/core/nzbToMediaUtil.py @@ -1,30 +1,32 @@ # coding=utf-8 from __future__ import print_function, unicode_literals -from six import text_type + +import datetime import os +import platform import re +import shutil import socket import stat import struct -import shutil import time -import datetime -import platform -import guessit -import beets -import requests -import core -from babelfish import Language -import subliminal -from core.extractor import extractor -from core.linktastic import linktastic -from core.synchronousdeluge.client import DelugeClient -from core.utorrent.client import UTorrentClient -from core.transmissionrpc.client import Client as TransmissionClient -from core.qbittorrent.client import Client as qBittorrentClient +import beets +import guessit +import requests +import subliminal +from babelfish import Language +from linktastic import linktastic +from qbittorrent import Client as qBittorrentClient +from six import text_type +from synchronousdeluge.client import DelugeClient +from transmissionrpc.client import Client as TransmissionClient +from utorrent import UTorrentClient + +import core from core import logger, nzbToMediaDB +from core.extractor import extractor requests.packages.urllib3.disable_warnings() diff --git a/core/transmissionrpc/__init__.py b/core/transmissionrpc/__init__.py deleted file mode 100644 index c0ced381..00000000 --- a/core/transmissionrpc/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2008-2013 Erik Svensson -# Licensed under the MIT license. - -from core.transmissionrpc.constants import DEFAULT_PORT, DEFAULT_TIMEOUT, PRIORITY, RATIO_LIMIT, LOGGER -from core.transmissionrpc.error import TransmissionError, HTTPHandlerError -from core.transmissionrpc.httphandler import HTTPHandler, DefaultHTTPHandler -from core.transmissionrpc.torrent import Torrent -from core.transmissionrpc.session import Session -from core.transmissionrpc.client import Client -from core.transmissionrpc.utils import add_stdout_logger, add_file_logger - -__author__ = 'Erik Svensson ' -__version_major__ = 0 -__version_minor__ = 11 -__version__ = '{0}.{1}'.format(__version_major__, __version_minor__) -__copyright__ = 'Copyright (c) 2008-2013 Erik Svensson' -__license__ = 'MIT' diff --git a/core/linktastic/__init__.py b/libs/linktastic/__init__.py similarity index 100% rename from core/linktastic/__init__.py rename to libs/linktastic/__init__.py diff --git a/core/linktastic/linktastic.py b/libs/linktastic/linktastic.py similarity index 100% rename from core/linktastic/linktastic.py rename to libs/linktastic/linktastic.py index 95d2f8c6..65c84f48 100644 --- a/core/linktastic/linktastic.py +++ b/libs/linktastic/linktastic.py @@ -22,9 +22,9 @@ # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +import os import subprocess from subprocess import CalledProcessError -import os if os.name == 'nt': info = subprocess.STARTUPINFO() diff --git a/core/qbittorrent/__init__.py b/libs/qbittorrent/__init__.py similarity index 100% rename from core/qbittorrent/__init__.py rename to libs/qbittorrent/__init__.py diff --git a/core/qbittorrent/client.py b/libs/qbittorrent/client.py similarity index 99% rename from core/qbittorrent/client.py rename to libs/qbittorrent/client.py index 73d8d753..c75ff3cc 100644 --- a/core/qbittorrent/client.py +++ b/libs/qbittorrent/client.py @@ -1,6 +1,7 @@ -import requests import json +import requests + class LoginRequired(Exception): def __str__(self): diff --git a/core/synchronousdeluge/__init__.py b/libs/synchronousdeluge/__init__.py similarity index 88% rename from core/synchronousdeluge/__init__.py rename to libs/synchronousdeluge/__init__.py index 9d4d8c77..fbafe6fe 100644 --- a/core/synchronousdeluge/__init__.py +++ b/libs/synchronousdeluge/__init__.py @@ -15,7 +15,7 @@ Example usage: download_location = client.core.get_config_value("download_location").get() """ -from core.synchronousdeluge.exceptions import DelugeRPCError +from .exceptions import DelugeRPCError __title__ = "synchronous-deluge" diff --git a/core/synchronousdeluge/client.py b/libs/synchronousdeluge/client.py similarity index 100% rename from core/synchronousdeluge/client.py rename to libs/synchronousdeluge/client.py index cecb2a88..065e873d 100644 --- a/core/synchronousdeluge/client.py +++ b/libs/synchronousdeluge/client.py @@ -1,9 +1,9 @@ # coding=utf-8 import os import platform - from collections import defaultdict from itertools import imap + from .exceptions import DelugeRPCError from .protocol import DelugeRPCRequest, DelugeRPCResponse from .transfer import DelugeTransfer diff --git a/core/synchronousdeluge/exceptions.py b/libs/synchronousdeluge/exceptions.py similarity index 100% rename from core/synchronousdeluge/exceptions.py rename to libs/synchronousdeluge/exceptions.py diff --git a/core/synchronousdeluge/protocol.py b/libs/synchronousdeluge/protocol.py similarity index 100% rename from core/synchronousdeluge/protocol.py rename to libs/synchronousdeluge/protocol.py diff --git a/core/synchronousdeluge/rencode.py b/libs/synchronousdeluge/rencode.py similarity index 99% rename from core/synchronousdeluge/rencode.py rename to libs/synchronousdeluge/rencode.py index 8ab01375..85552862 100644 --- a/core/synchronousdeluge/rencode.py +++ b/libs/synchronousdeluge/rencode.py @@ -21,6 +21,7 @@ same rencode version throughout your project. import struct from threading import Lock + from six import PY3 if PY3: diff --git a/core/synchronousdeluge/transfer.py b/libs/synchronousdeluge/transfer.py similarity index 96% rename from core/synchronousdeluge/transfer.py rename to libs/synchronousdeluge/transfer.py index 50054757..0425453f 100644 --- a/core/synchronousdeluge/transfer.py +++ b/libs/synchronousdeluge/transfer.py @@ -1,10 +1,10 @@ # coding=utf-8 -import zlib -import struct import socket import ssl +import struct +import zlib -from core.synchronousdeluge import rencode +from . import rencode __all__ = ["DelugeTransfer"] diff --git a/libs/transmissionrpc/__init__.py b/libs/transmissionrpc/__init__.py new file mode 100644 index 00000000..eb6fe905 --- /dev/null +++ b/libs/transmissionrpc/__init__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2008-2013 Erik Svensson +# Licensed under the MIT license. + +from .client import Client +from .constants import DEFAULT_PORT, DEFAULT_TIMEOUT, LOGGER, PRIORITY, RATIO_LIMIT +from .error import HTTPHandlerError, TransmissionError +from .httphandler import DefaultHTTPHandler, HTTPHandler +from .session import Session +from .torrent import Torrent +from .utils import add_file_logger, add_stdout_logger + +__author__ = 'Erik Svensson ' +__version_major__ = 0 +__version_minor__ = 11 +__version__ = '{0}.{1}'.format(__version_major__, __version_minor__) +__copyright__ = 'Copyright (c) 2008-2013 Erik Svensson' +__license__ = 'MIT' diff --git a/core/transmissionrpc/client.py b/libs/transmissionrpc/client.py similarity index 98% rename from core/transmissionrpc/client.py rename to libs/transmissionrpc/client.py index 6b2bc7f8..c675c59f 100644 --- a/core/transmissionrpc/client.py +++ b/libs/transmissionrpc/client.py @@ -2,24 +2,24 @@ # Copyright (c) 2008-2013 Erik Svensson # Licensed under the MIT license. -import re -import time -import operator -import warnings -import os import base64 import json +import operator +import os +import re +import time +import warnings -from six import PY3, integer_types, string_types, iteritems +from six import PY3, integer_types, iteritems, string_types from six.moves.urllib_parse import urlparse from six.moves.urllib_request import urlopen -from core.transmissionrpc.constants import DEFAULT_PORT, DEFAULT_TIMEOUT -from core.transmissionrpc.error import TransmissionError, HTTPHandlerError -from core.transmissionrpc.utils import LOGGER, get_arguments, make_rpc_name, argument_value_convert, rpc_bool -from core.transmissionrpc.httphandler import DefaultHTTPHandler -from core.transmissionrpc.torrent import Torrent -from core.transmissionrpc.session import Session +from .constants import DEFAULT_PORT, DEFAULT_TIMEOUT +from .error import HTTPHandlerError, TransmissionError +from .httphandler import DefaultHTTPHandler +from .session import Session +from .torrent import Torrent +from .utils import LOGGER, argument_value_convert, get_arguments, make_rpc_name, rpc_bool def debug_httperror(error): diff --git a/core/transmissionrpc/constants.py b/libs/transmissionrpc/constants.py similarity index 100% rename from core/transmissionrpc/constants.py rename to libs/transmissionrpc/constants.py diff --git a/core/transmissionrpc/error.py b/libs/transmissionrpc/error.py similarity index 97% rename from core/transmissionrpc/error.py rename to libs/transmissionrpc/error.py index a7da7307..4ad079be 100644 --- a/core/transmissionrpc/error.py +++ b/libs/transmissionrpc/error.py @@ -2,7 +2,7 @@ # Copyright (c) 2008-2013 Erik Svensson # Licensed under the MIT license. -from six import string_types, integer_types +from six import integer_types, string_types class TransmissionError(Exception): diff --git a/core/transmissionrpc/httphandler.py b/libs/transmissionrpc/httphandler.py similarity index 94% rename from core/transmissionrpc/httphandler.py rename to libs/transmissionrpc/httphandler.py index 02d65fa7..5ec981a3 100644 --- a/core/transmissionrpc/httphandler.py +++ b/libs/transmissionrpc/httphandler.py @@ -4,15 +4,17 @@ import sys -from six.moves.urllib_request import ( - build_opener, install_opener, - HTTPBasicAuthHandler, HTTPDigestAuthHandler, HTTPPasswordMgrWithDefaultRealm, - Request, -) -from six.moves.urllib_error import HTTPError, URLError from six.moves.http_client import BadStatusLine +from six.moves.urllib_error import HTTPError, URLError +from six.moves.urllib_request import ( + HTTPBasicAuthHandler, + HTTPDigestAuthHandler, + HTTPPasswordMgrWithDefaultRealm, + Request, + build_opener, +) -from core.transmissionrpc.error import HTTPHandlerError +from .error import HTTPHandlerError class HTTPHandler(object): diff --git a/core/transmissionrpc/session.py b/libs/transmissionrpc/session.py similarity index 97% rename from core/transmissionrpc/session.py rename to libs/transmissionrpc/session.py index 96c2c359..2e13a06b 100644 --- a/core/transmissionrpc/session.py +++ b/libs/transmissionrpc/session.py @@ -2,9 +2,9 @@ # Copyright (c) 2008-2013 Erik Svensson # Licensed under the MIT license. -from six import iteritems, integer_types +from six import integer_types, iteritems -from core.transmissionrpc.utils import Field +from .utils import Field class Session(object): diff --git a/core/transmissionrpc/torrent.py b/libs/transmissionrpc/torrent.py similarity index 98% rename from core/transmissionrpc/torrent.py rename to libs/transmissionrpc/torrent.py index 124e42c9..56821b05 100644 --- a/core/transmissionrpc/torrent.py +++ b/libs/transmissionrpc/torrent.py @@ -2,13 +2,13 @@ # Copyright (c) 2008-2013 Erik Svensson # Licensed under the MIT license. -import sys import datetime +import sys -from six import integer_types, string_types, text_type, iteritems +from six import integer_types, iteritems, string_types, text_type -from core.transmissionrpc.constants import PRIORITY, RATIO_LIMIT, IDLE_LIMIT -from core.transmissionrpc.utils import Field, format_timedelta +from .constants import IDLE_LIMIT, PRIORITY, RATIO_LIMIT +from .utils import Field, format_timedelta def get_status_old(code): diff --git a/core/transmissionrpc/utils.py b/libs/transmissionrpc/utils.py similarity index 99% rename from core/transmissionrpc/utils.py rename to libs/transmissionrpc/utils.py index 9103d534..e2ad309c 100644 --- a/core/transmissionrpc/utils.py +++ b/libs/transmissionrpc/utils.py @@ -2,7 +2,6 @@ # Copyright (c) 2008-2013 Erik Svensson # Licensed under the MIT license. -import constants import datetime import logging import socket @@ -10,7 +9,8 @@ from collections import namedtuple from six import iteritems, string_types -from constants import LOGGER +from . import constants +from .constants import LOGGER UNITS = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB'] diff --git a/core/utorrent/__init__.py b/libs/utorrent/__init__.py similarity index 100% rename from core/utorrent/__init__.py rename to libs/utorrent/__init__.py diff --git a/core/utorrent/client.py b/libs/utorrent/client.py similarity index 99% rename from core/utorrent/client.py rename to libs/utorrent/client.py index 2d5a5741..78ef2214 100644 --- a/core/utorrent/client.py +++ b/libs/utorrent/client.py @@ -1,10 +1,11 @@ # coding=utf8 +import StringIO +import cookielib +import re import urllib import urllib2 import urlparse -import cookielib -import re -import StringIO + try: import json except ImportError: diff --git a/core/utorrent/upload.py b/libs/utorrent/upload.py similarity index 100% rename from core/utorrent/upload.py rename to libs/utorrent/upload.py