diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-11-15 07:26:01 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-11-15 07:26:01 +0100 |
| commit | eb61d1bb0a30fd32f99b93f847346c610fbc91d2 (patch) | |
| tree | f889dd1b19c0496f3f88c478445165abd98f9c7a | |
| parent | [HTTPRequest] Raise Fail if write response fails (diff) | |
| download | pyload-eb61d1bb0a30fd32f99b93f847346c610fbc91d2.tar.xz | |
Update plugins after merging
269 files changed, 358 insertions, 859 deletions
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py deleted file mode 100644 index 38775f519..000000000 --- a/module/plugins/internal/CaptchaService.py +++ /dev/null @@ -1,209 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from random import random - - -class CaptchaService: - __name__ = "CaptchaService" - __version__ = "0.14" - - __description__ = """Base captcha service plugin""" - __license__ = "GPLv3" - __authors__ = [("pyLoad Team", "admin@pyload.org")] - - - KEY_PATTERN = None - - key = None #: last key detected - - - def __init__(self, plugin): - self.plugin = plugin - - - def detect_key(self, html=None): - if not html: - if hasattr(self.plugin, "html") and self.plugin.html: - html = self.plugin.html - else: - errmsg = _("%s html not found") % self.__name__ - self.plugin.fail(errmsg) #@TODO: replace all plugin.fail(errmsg) with plugin.error(errmsg) in 0.4.10 - raise TypeError(errmsg) - - m = re.search(self.KEY_PATTERN, html) - if m: - self.key = m.group("KEY") - self.plugin.logDebug("%s key: %s" % (self.__name__, self.key)) - return self.key - else: - self.plugin.logDebug("%s key not found" % self.__name__) - return None - - - def challenge(self, key=None): - raise NotImplementedError - - - def result(self, server, challenge): - raise NotImplementedError - - -class ReCaptcha(CaptchaService): - __name__ = "ReCaptcha" - __version__ = "0.07" - - __description__ = """ReCaptcha captcha service plugin""" - __license__ = "GPLv3" - __authors__ = [("pyLoad Team", "admin@pyload.org")] - - - KEY_PATTERN = r'recaptcha(/api|\.net)/(challenge|noscript)\?k=(?P<KEY>[\w-]+)' - KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\'](?P<KEY>[\w-]+)' - - - def detect_key(self, html=None): - if not html: - if hasattr(self.plugin, "html") and self.plugin.html: - html = self.plugin.html - else: - errmsg = _("ReCaptcha html not found") - self.plugin.fail(errmsg) - raise TypeError(errmsg) - - m = re.search(self.KEY_PATTERN, html) or re.search(self.KEY_AJAX_PATTERN, html) - if m: - self.key = m.group("KEY") - self.plugin.logDebug("ReCaptcha key: %s" % self.key) - return self.key - else: - self.plugin.logDebug("ReCaptcha key not found") - return None - - - def challenge(self, key=None): - if not key: - if self.detect_key(): - key = self.key - else: - errmsg = _("ReCaptcha key not found") - self.plugin.fail(errmsg) - raise TypeError(errmsg) - - js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={'k': key}) - - try: - challenge = re.search("challenge : '(.+?)',", js).group(1) - server = re.search("server : '(.+?)',", js).group(1) - except: - self.plugin.error("ReCaptcha challenge pattern not found") - - result = self.result(server, challenge) - - return challenge, result - - - def result(self, server, challenge): - return self.plugin.decryptCaptcha("%simage" % server, get={'c': challenge}, - cookies=True, forceUser=True, imgtype="jpg") - - -class AdsCaptcha(CaptchaService): - __name__ = "AdsCaptcha" - __version__ = "0.04" - - __description__ = """AdsCaptcha captcha service plugin""" - __license__ = "GPLv3" - __authors__ = [("pyLoad Team", "admin@pyload.org")] - - - ID_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(?P<ID>\d+)' - KEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*PublicKey=(?P<KEY>[\w-]+)' - - - def detect_key(self, html=None): - if not html: - if hasattr(self.plugin, "html") and self.plugin.html: - html = self.plugin.html - else: - errmsg = _("AdsCaptcha html not found") - self.plugin.fail(errmsg) - raise TypeError(errmsg) - - m = re.search(self.ID_PATTERN, html) - n = re.search(self.KEY_PATTERN, html) - if m and n: - self.key = (m.group("ID"), m.group("KEY")) - self.plugin.logDebug("AdsCaptcha id|key: %s | %s" % self.key) - return self.key - else: - self.plugin.logDebug("AdsCaptcha id or key not found") - return None - - - def challenge(self, key=None): #: key is a tuple(CaptchaId, PublicKey) - if not key: - if self.detect_key(): - key = self.key - else: - errmsg = _("AdsCaptcha key not found") - self.plugin.fail(errmsg) - raise TypeError(errmsg) - - CaptchaId, PublicKey = key - - js = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx", get={'CaptchaId': CaptchaId, 'PublicKey': PublicKey}) - - try: - challenge = re.search("challenge: '(.+?)',", js).group(1) - server = re.search("server: '(.+?)',", js).group(1) - except: - self.plugin.error("AdsCaptcha challenge pattern not found") - - result = self.result(server, challenge) - - return challenge, result - - - def result(self, server, challenge): - return self.plugin.decryptCaptcha("%sChallenge.aspx" % server, get={'cid': challenge, 'dummy': random()}, - cookies=True, imgtype="jpg") - - -class SolveMedia(CaptchaService): - __name__ = "SolveMedia" - __version__ = "0.05" - - __description__ = """SolveMedia captcha service plugin""" - __license__ = "GPLv3" - __authors__ = [("pyLoad Team", "admin@pyload.org")] - - - KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)["\']' - - - def challenge(self, key=None): - if not key: - if self.detect_key(): - key = self.key - else: - errmsg = _("SolveMedia key not found") - self.plugin.fail(errmsg) - raise TypeError(errmsg) - - html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key}) - try: - challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">', - html).group(1) - server = "http://api.solvemedia.com/papi/media" - except: - self.plugin.error("SolveMedia challenge pattern not found") - - result = self.result(server, challenge) - - return challenge, result - - - def result(self, server, challenge): - return self.plugin.decryptCaptcha(server, get={'c': challenge}, imgtype="gif") diff --git a/pyload/plugins/Plugin.py b/pyload/plugins/Plugin.py index c59d64911..a4b4cf74e 100644 --- a/pyload/plugins/Plugin.py +++ b/pyload/plugins/Plugin.py @@ -16,7 +16,7 @@ from itertools import islice from traceback import print_exc from urlparse import urlparse -from module.utils import fs_decode, fs_encode, html_unescape, save_join, save_path +from pyload.utils import fs_decode, fs_encode, html_unescape, safe_join def chunks(iterable, size): it = iter(iterable) @@ -100,7 +100,7 @@ class Base(object): :param value: :return: """ - self.core.config.setPlugin(self.__name__, option, value) + self.core.config.setPlugin(self.__name__, option, value) #: Deprecated method @@ -154,7 +154,7 @@ class Plugin(Base): __type__ = "hoster" __version__ = "0.07" - __pattern__ = None + __pattern__ = r'^unmatchable$' __config__ = [] #: [("name", "type", "desc", "default")] __description__ = """Base plugin""" @@ -541,7 +541,7 @@ class Plugin(Base): from inspect import currentframe frame = currentframe() - framefile = save_join("tmp", self.__name__, "%s_line%s.dump.html" % (frame.f_back.f_code.co_name, frame.f_back.f_lineno)) + framefile = safe_join("tmp", self.__name__, "%s_line%s.dump.html" % (frame.f_back.f_code.co_name, frame.f_back.f_lineno)) try: if not exists(join("tmp", self.__name__)): makedirs(join("tmp", self.__name__)) diff --git a/pyload/plugins/account/AlldebridCom.py b/pyload/plugins/account/AlldebridCom.py index daf844a40..d4770426b 100644 --- a/pyload/plugins/account/AlldebridCom.py +++ b/pyload/plugins/account/AlldebridCom.py @@ -8,7 +8,7 @@ from urllib import urlencode from BeautifulSoup import BeautifulSoup -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class AlldebridCom(Account): diff --git a/pyload/plugins/account/BayfilesCom.py b/pyload/plugins/account/BayfilesCom.py index 85dba44fb..34163d0cc 100644 --- a/pyload/plugins/account/BayfilesCom.py +++ b/pyload/plugins/account/BayfilesCom.py @@ -2,7 +2,7 @@ from time import time -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/BillionuploadsCom.py b/pyload/plugins/account/BillionuploadsCom.py index 11af36591..b1f621ecb 100644 --- a/pyload/plugins/account/BillionuploadsCom.py +++ b/pyload/plugins/account/BillionuploadsCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class BillionuploadsCom(XFSAccount): diff --git a/pyload/plugins/account/BitshareCom.py b/pyload/plugins/account/BitshareCom.py index d35f3ce29..44b2818cf 100644 --- a/pyload/plugins/account/BitshareCom.py +++ b/pyload/plugins/account/BitshareCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class BitshareCom(Account): diff --git a/module/plugins/accounts/CatShareNet.py b/pyload/plugins/account/CatShareNet.py index c33219685..30a2691da 100644 --- a/module/plugins/accounts/CatShareNet.py +++ b/pyload/plugins/account/CatShareNet.py @@ -4,7 +4,7 @@ import re from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugins.internal.Account import Account class CatShareNet(Account): diff --git a/pyload/plugins/account/CramitIn.py b/pyload/plugins/account/CramitIn.py index a9e2274a2..42b7cc7b2 100644 --- a/pyload/plugins/account/CramitIn.py +++ b/pyload/plugins/account/CramitIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class CramitIn(XFSAccount): diff --git a/pyload/plugins/account/CzshareCom.py b/pyload/plugins/account/CzshareCom.py index 54163c425..786832e8d 100644 --- a/pyload/plugins/account/CzshareCom.py +++ b/pyload/plugins/account/CzshareCom.py @@ -3,7 +3,7 @@ from time import mktime, strptime import re -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class CzshareCom(Account): diff --git a/pyload/plugins/account/DebridItaliaCom.py b/pyload/plugins/account/DebridItaliaCom.py index cdeb0a9f1..30ed9fb1c 100644 --- a/pyload/plugins/account/DebridItaliaCom.py +++ b/pyload/plugins/account/DebridItaliaCom.py @@ -3,7 +3,7 @@ import re import time -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class DebridItaliaCom(Account): diff --git a/pyload/plugins/account/DepositfilesCom.py b/pyload/plugins/account/DepositfilesCom.py index 47d720322..df3ebe4f2 100644 --- a/pyload/plugins/account/DepositfilesCom.py +++ b/pyload/plugins/account/DepositfilesCom.py @@ -4,7 +4,7 @@ import re from time import strptime, mktime -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class DepositfilesCom(Account): diff --git a/pyload/plugins/account/EasybytezCom.py b/pyload/plugins/account/EasybytezCom.py index f368840ef..b1fb6a213 100644 --- a/pyload/plugins/account/EasybytezCom.py +++ b/pyload/plugins/account/EasybytezCom.py @@ -4,7 +4,7 @@ import re from time import mktime, strptime, gmtime -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount from pyload.utils import parseFileSize diff --git a/pyload/plugins/account/EuroshareEu.py b/pyload/plugins/account/EuroshareEu.py index e3ed51464..5ec543433 100644 --- a/pyload/plugins/account/EuroshareEu.py +++ b/pyload/plugins/account/EuroshareEu.py @@ -3,7 +3,7 @@ from time import mktime, strptime import re -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class EuroshareEu(Account): diff --git a/pyload/plugins/account/FastixRu.py b/pyload/plugins/account/FastixRu.py index 6dacb8b11..96db443b7 100644 --- a/pyload/plugins/account/FastixRu.py +++ b/pyload/plugins/account/FastixRu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/FastshareCz.py b/pyload/plugins/account/FastshareCz.py index 1a7dff4b1..b61d6b23f 100644 --- a/pyload/plugins/account/FastshareCz.py +++ b/pyload/plugins/account/FastshareCz.py @@ -2,8 +2,8 @@ import re -from pyload.plugins.base.Account import Account -from module.utils import parseFileSize +from pyload.plugins.internal.Account import Account +from pyload.utils import parseFileSize class FastshareCz(Account): diff --git a/pyload/plugins/account/File4safeCom.py b/pyload/plugins/account/File4safeCom.py index 20053d895..42b67e08f 100644 --- a/pyload/plugins/account/File4safeCom.py +++ b/pyload/plugins/account/File4safeCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class File4safeCom(XFSAccount): diff --git a/pyload/plugins/account/FileParadoxIn.py b/pyload/plugins/account/FileParadoxIn.py index c12d99d6a..cee7bec2f 100644 --- a/pyload/plugins/account/FileParadoxIn.py +++ b/pyload/plugins/account/FileParadoxIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class FileParadoxIn(XFSAccount): diff --git a/pyload/plugins/account/FilecloudIo.py b/pyload/plugins/account/FilecloudIo.py index 0d5126fc0..b52521093 100644 --- a/pyload/plugins/account/FilecloudIo.py +++ b/pyload/plugins/account/FilecloudIo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/FilefactoryCom.py b/pyload/plugins/account/FilefactoryCom.py index 7eedb59a1..0d7c1ff0e 100644 --- a/pyload/plugins/account/FilefactoryCom.py +++ b/pyload/plugins/account/FilefactoryCom.py @@ -5,7 +5,7 @@ from time import mktime, strptime from pycurl import REFERER -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class FilefactoryCom(Account): diff --git a/pyload/plugins/account/FilejungleCom.py b/pyload/plugins/account/FilejungleCom.py index c8b7bb655..8abb89788 100644 --- a/pyload/plugins/account/FilejungleCom.py +++ b/pyload/plugins/account/FilejungleCom.py @@ -3,7 +3,7 @@ import re from time import mktime, strptime -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class FilejungleCom(Account): diff --git a/pyload/plugins/account/FileomCom.py b/pyload/plugins/account/FileomCom.py index 7c743f56a..04f503b3b 100644 --- a/pyload/plugins/account/FileomCom.py +++ b/pyload/plugins/account/FileomCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class FileomCom(XFSAccount): diff --git a/pyload/plugins/account/FilerNet.py b/pyload/plugins/account/FilerNet.py index 193dd6eb3..f9b5efdd3 100644 --- a/pyload/plugins/account/FilerNet.py +++ b/pyload/plugins/account/FilerNet.py @@ -3,7 +3,7 @@ import re import time -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class FilerNet(Account): diff --git a/pyload/plugins/account/FilerioCom.py b/pyload/plugins/account/FilerioCom.py index 4c6755293..27d8df13f 100644 --- a/pyload/plugins/account/FilerioCom.py +++ b/pyload/plugins/account/FilerioCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class FilerioCom(XFSAccount): diff --git a/pyload/plugins/account/FilesMailRu.py b/pyload/plugins/account/FilesMailRu.py index c8d8d9270..bfd9d7ffb 100644 --- a/pyload/plugins/account/FilesMailRu.py +++ b/pyload/plugins/account/FilesMailRu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class FilesMailRu(Account): diff --git a/pyload/plugins/account/FileserveCom.py b/pyload/plugins/account/FileserveCom.py index 773fc9117..5a014ab03 100644 --- a/pyload/plugins/account/FileserveCom.py +++ b/pyload/plugins/account/FileserveCom.py @@ -2,7 +2,7 @@ from time import mktime, strptime -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/FourSharedCom.py b/pyload/plugins/account/FourSharedCom.py index 766998ccc..110572faa 100644 --- a/pyload/plugins/account/FourSharedCom.py +++ b/pyload/plugins/account/FourSharedCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/FreakshareCom.py b/pyload/plugins/account/FreakshareCom.py index 742ede902..12c5277a6 100644 --- a/pyload/plugins/account/FreakshareCom.py +++ b/pyload/plugins/account/FreakshareCom.py @@ -4,7 +4,7 @@ import re from time import strptime, mktime -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class FreakshareCom(Account): diff --git a/pyload/plugins/account/FreeWayMe.py b/pyload/plugins/account/FreeWayMe.py index 2c48d54f4..db879c052 100644 --- a/pyload/plugins/account/FreeWayMe.py +++ b/pyload/plugins/account/FreeWayMe.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/FshareVn.py b/pyload/plugins/account/FshareVn.py index b449018bc..ee8aacaf9 100644 --- a/pyload/plugins/account/FshareVn.py +++ b/pyload/plugins/account/FshareVn.py @@ -4,7 +4,7 @@ from time import mktime, strptime from pycurl import REFERER import re -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class FshareVn(Account): diff --git a/pyload/plugins/account/Ftp.py b/pyload/plugins/account/Ftp.py index 90a8a8768..d439512ce 100644 --- a/pyload/plugins/account/Ftp.py +++ b/pyload/plugins/account/Ftp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class Ftp(Account): @@ -13,4 +13,5 @@ class Ftp(Account): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - login_timeout = info_threshold = -1 #: Unlimited + login_timeout = -1 #: Unlimited + info_threshold = -1 #: Unlimited diff --git a/pyload/plugins/account/HellshareCz.py b/pyload/plugins/account/HellshareCz.py index cd02c8462..1b93cf77d 100644 --- a/pyload/plugins/account/HellshareCz.py +++ b/pyload/plugins/account/HellshareCz.py @@ -3,7 +3,7 @@ import re import time -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class HellshareCz(Account): diff --git a/pyload/plugins/account/Http.py b/pyload/plugins/account/Http.py index 3f3d4d66f..8c0aeb2e4 100644 --- a/pyload/plugins/account/Http.py +++ b/pyload/plugins/account/Http.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class Http(Account): @@ -13,4 +13,5 @@ class Http(Account): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - login_timeout = info_threshold = -1 #: Unlimited + login_timeout = -1 #: Unlimited + info_threshold = -1 #: Unlimited diff --git a/pyload/plugins/account/HugefilesNet.py b/pyload/plugins/account/HugefilesNet.py index 5da3bbc37..242ae118c 100644 --- a/pyload/plugins/account/HugefilesNet.py +++ b/pyload/plugins/account/HugefilesNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class HugefilesNet(XFSAccount): diff --git a/pyload/plugins/account/HundredEightyUploadCom.py b/pyload/plugins/account/HundredEightyUploadCom.py index 39f91a8af..89d779e52 100644 --- a/pyload/plugins/account/HundredEightyUploadCom.py +++ b/pyload/plugins/account/HundredEightyUploadCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class HundredEightyUploadCom(XFSAccount): diff --git a/module/plugins/accounts/JunocloudMe.py b/pyload/plugins/account/JunocloudMe.py index b0fc160f3..14fe8ddd7 100644 --- a/module/plugins/accounts/JunocloudMe.py +++ b/pyload/plugins/account/JunocloudMe.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class JunocloudMe(XFSAccount): diff --git a/module/plugins/accounts/Keep2shareCc.py b/pyload/plugins/account/Keep2shareCc.py index de9b9b5d8..af870cfd0 100644 --- a/module/plugins/accounts/Keep2shareCc.py +++ b/pyload/plugins/account/Keep2shareCc.py @@ -4,7 +4,7 @@ import re from time import gmtime, mktime, strptime -from module.plugins.Account import Account +from pyload.plugins.internal.Account import Account class Keep2shareCc(Account): diff --git a/pyload/plugins/account/LetitbitNet.py b/pyload/plugins/account/LetitbitNet.py index 41823418d..5bf6de00c 100644 --- a/pyload/plugins/account/LetitbitNet.py +++ b/pyload/plugins/account/LetitbitNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account # from pyload.utils import json_loads, json_dumps diff --git a/module/plugins/accounts/LinestorageCom.py b/pyload/plugins/account/LinestorageCom.py index cf8dd3f3e..351d66d48 100644 --- a/module/plugins/accounts/LinestorageCom.py +++ b/pyload/plugins/account/LinestorageCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class LinestorageCom(XFSAccount): diff --git a/pyload/plugins/account/LinksnappyCom.py b/pyload/plugins/account/LinksnappyCom.py index 912c2b4cb..028465522 100644 --- a/pyload/plugins/account/LinksnappyCom.py +++ b/pyload/plugins/account/LinksnappyCom.py @@ -2,7 +2,7 @@ from hashlib import md5 -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/LomafileCom.py b/pyload/plugins/account/LomafileCom.py index cfd21679c..937b24fae 100644 --- a/pyload/plugins/account/LomafileCom.py +++ b/pyload/plugins/account/LomafileCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class LomafileCom(XFSAccount): diff --git a/pyload/plugins/account/MegaDebridEu.py b/pyload/plugins/account/MegaDebridEu.py index 50f24b83d..3db0caa35 100644 --- a/pyload/plugins/account/MegaDebridEu.py +++ b/pyload/plugins/account/MegaDebridEu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/module/plugins/accounts/MegaRapidCz.py b/pyload/plugins/account/MegaRapidCz.py index 41da7ac73..a75e313ff 100644 --- a/module/plugins/accounts/MegaRapidCz.py +++ b/pyload/plugins/account/MegaRapidCz.py @@ -3,7 +3,7 @@ import re from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugins.internal.Account import Account class MegaRapidCz(Account): diff --git a/pyload/plugins/account/MegasharesCom.py b/pyload/plugins/account/MegasharesCom.py index 5931e4e7e..b2f439b45 100644 --- a/pyload/plugins/account/MegasharesCom.py +++ b/pyload/plugins/account/MegasharesCom.py @@ -3,7 +3,7 @@ import re from time import mktime, strptime -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class MegasharesCom(Account): diff --git a/pyload/plugins/account/MovReelCom.py b/pyload/plugins/account/MovReelCom.py index 6128cddc8..7a00af5d3 100644 --- a/pyload/plugins/account/MovReelCom.py +++ b/pyload/plugins/account/MovReelCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class MovReelCom(XFSAccount): diff --git a/pyload/plugins/account/MultishareCz.py b/pyload/plugins/account/MultishareCz.py index 9eb0b50b2..9dc5b1ff0 100644 --- a/pyload/plugins/account/MultishareCz.py +++ b/pyload/plugins/account/MultishareCz.py @@ -2,7 +2,7 @@ import re -from module.plugins.Account import Account +from pyload.plugins.internal.Account import Account class MultishareCz(Account): diff --git a/pyload/plugins/account/MyfastfileCom.py b/pyload/plugins/account/MyfastfileCom.py index 33cc3a694..acc09ad8b 100644 --- a/pyload/plugins/account/MyfastfileCom.py +++ b/pyload/plugins/account/MyfastfileCom.py @@ -2,7 +2,7 @@ from time import time -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/NetloadIn.py b/pyload/plugins/account/NetloadIn.py index 2d6ae6eea..6e780225a 100644 --- a/pyload/plugins/account/NetloadIn.py +++ b/pyload/plugins/account/NetloadIn.py @@ -3,7 +3,7 @@ import re from time import time -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class NetloadIn(Account): diff --git a/pyload/plugins/account/NosuploadCom.py b/pyload/plugins/account/NosuploadCom.py index e523ee2f4..9c11699ec 100644 --- a/pyload/plugins/account/NosuploadCom.py +++ b/pyload/plugins/account/NosuploadCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class NosuploadCom(XFSAccount): diff --git a/pyload/plugins/account/NovafileCom.py b/pyload/plugins/account/NovafileCom.py index ab61bf0fc..cb3a639f5 100644 --- a/pyload/plugins/account/NovafileCom.py +++ b/pyload/plugins/account/NovafileCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class NovafileCom(XFSAccount): diff --git a/module/plugins/accounts/NowVideoAt.py b/pyload/plugins/account/NowVideoAt.py index 234984b6b..7af8bc4bc 100644 --- a/module/plugins/accounts/NowVideoAt.py +++ b/pyload/plugins/account/NowVideoAt.py @@ -4,7 +4,7 @@ import re from time import gmtime, mktime, strptime -from module.plugins.Account import Account +from pyload.plugins.internal.Account import Account class NowVideoAt(Account): diff --git a/pyload/plugins/account/OboomCom.py b/pyload/plugins/account/OboomCom.py index 71663bc3f..4f7f476e2 100644 --- a/pyload/plugins/account/OboomCom.py +++ b/pyload/plugins/account/OboomCom.py @@ -5,7 +5,7 @@ import time from beaker.crypto.pbkdf2 import PBKDF2 from pyload.utils import json_loads -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class OboomCom(Account): diff --git a/pyload/plugins/account/OneFichierCom.py b/pyload/plugins/account/OneFichierCom.py index 857fd20b5..7f1140e67 100644 --- a/pyload/plugins/account/OneFichierCom.py +++ b/pyload/plugins/account/OneFichierCom.py @@ -6,7 +6,7 @@ from time import strptime, mktime from pycurl import REFERER -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class OneFichierCom(Account): diff --git a/pyload/plugins/account/OverLoadMe.py b/pyload/plugins/account/OverLoadMe.py index d011cf063..cda4bc82f 100644 --- a/pyload/plugins/account/OverLoadMe.py +++ b/pyload/plugins/account/OverLoadMe.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/PremiumTo.py b/pyload/plugins/account/PremiumTo.py index 2943ba41c..f7a00e194 100644 --- a/pyload/plugins/account/PremiumTo.py +++ b/pyload/plugins/account/PremiumTo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class PremiumTo(Account): diff --git a/pyload/plugins/account/PremiumizeMe.py b/pyload/plugins/account/PremiumizeMe.py index 4071e0ad2..5f972ca8b 100644 --- a/pyload/plugins/account/PremiumizeMe.py +++ b/pyload/plugins/account/PremiumizeMe.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/QuickshareCz.py b/pyload/plugins/account/QuickshareCz.py index 18af5f736..40bf9d06d 100644 --- a/pyload/plugins/account/QuickshareCz.py +++ b/pyload/plugins/account/QuickshareCz.py @@ -2,7 +2,7 @@ import re -from module.plugins.Account import Account +from pyload.plugins.internal.Account import Account class QuickshareCz(Account): diff --git a/pyload/plugins/account/RPNetBiz.py b/pyload/plugins/account/RPNetBiz.py index 442355a8c..417ca14a4 100644 --- a/pyload/plugins/account/RPNetBiz.py +++ b/pyload/plugins/account/RPNetBiz.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/module/plugins/accounts/RapidfileshareNet.py b/pyload/plugins/account/RapidfileshareNet.py index c0dd7eaee..503c731fe 100644 --- a/module/plugins/accounts/RapidfileshareNet.py +++ b/pyload/plugins/account/RapidfileshareNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class RapidfileshareNet(XFSAccount): diff --git a/pyload/plugins/account/RapidgatorNet.py b/pyload/plugins/account/RapidgatorNet.py index ec308e63c..72a46a928 100644 --- a/pyload/plugins/account/RapidgatorNet.py +++ b/pyload/plugins/account/RapidgatorNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/pyload/plugins/account/RapidshareCom.py b/pyload/plugins/account/RapidshareCom.py index 9ebb9a568..778b0c55d 100644 --- a/pyload/plugins/account/RapidshareCom.py +++ b/pyload/plugins/account/RapidshareCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class RapidshareCom(Account): diff --git a/pyload/plugins/account/RarefileNet.py b/pyload/plugins/account/RarefileNet.py index 577a6c8f6..0d5547e57 100644 --- a/pyload/plugins/account/RarefileNet.py +++ b/pyload/plugins/account/RarefileNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class RarefileNet(XFSAccount): diff --git a/pyload/plugins/account/RealdebridCom.py b/pyload/plugins/account/RealdebridCom.py index ef96cca89..b7773d9a0 100644 --- a/pyload/plugins/account/RealdebridCom.py +++ b/pyload/plugins/account/RealdebridCom.py @@ -2,7 +2,7 @@ import xml.dom.minidom as dom -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class RealdebridCom(Account): diff --git a/pyload/plugins/account/RehostTo.py b/pyload/plugins/account/RehostTo.py index 6896555bf..e8ee3ba15 100644 --- a/pyload/plugins/account/RehostTo.py +++ b/pyload/plugins/account/RehostTo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class RehostTo(Account): diff --git a/pyload/plugins/account/RyushareCom.py b/pyload/plugins/account/RyushareCom.py index ca476366b..47ec32c76 100644 --- a/pyload/plugins/account/RyushareCom.py +++ b/pyload/plugins/account/RyushareCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class RyushareCom(XFSAccount): diff --git a/pyload/plugins/account/SecureUploadEu.py b/pyload/plugins/account/SecureUploadEu.py index b335c94da..c98ab2de9 100644 --- a/pyload/plugins/account/SecureUploadEu.py +++ b/pyload/plugins/account/SecureUploadEu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class SecureUploadEu(XFSAccount): diff --git a/pyload/plugins/account/SendmywayCom.py b/pyload/plugins/account/SendmywayCom.py index 4fcbe0b7a..6749e6215 100644 --- a/pyload/plugins/account/SendmywayCom.py +++ b/pyload/plugins/account/SendmywayCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class SendmywayCom(XFSAccount): diff --git a/pyload/plugins/account/ShareonlineBiz.py b/pyload/plugins/account/ShareonlineBiz.py index 31242e563..cc411ad72 100644 --- a/pyload/plugins/account/ShareonlineBiz.py +++ b/pyload/plugins/account/ShareonlineBiz.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class ShareonlineBiz(Account): diff --git a/pyload/plugins/account/SimplyPremiumCom.py b/pyload/plugins/account/SimplyPremiumCom.py index fd626b43c..45b4263ae 100644 --- a/pyload/plugins/account/SimplyPremiumCom.py +++ b/pyload/plugins/account/SimplyPremiumCom.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from pyload.utils import json_loads -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class SimplyPremiumCom(Account): diff --git a/pyload/plugins/account/SimplydebridCom.py b/pyload/plugins/account/SimplydebridCom.py index a92e6ca95..636828146 100644 --- a/pyload/plugins/account/SimplydebridCom.py +++ b/pyload/plugins/account/SimplydebridCom.py @@ -2,7 +2,7 @@ from time import mktime, strptime -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class SimplydebridCom(Account): diff --git a/pyload/plugins/account/StahnuTo.py b/pyload/plugins/account/StahnuTo.py index 44884f835..70ef292e7 100644 --- a/pyload/plugins/account/StahnuTo.py +++ b/pyload/plugins/account/StahnuTo.py @@ -2,7 +2,7 @@ import re -from module.plugins.Account import Account +from pyload.plugins.internal.Account import Account class StahnuTo(Account): diff --git a/pyload/plugins/account/StreamcloudEu.py b/pyload/plugins/account/StreamcloudEu.py index aa1eafcbd..a2a333dd5 100644 --- a/pyload/plugins/account/StreamcloudEu.py +++ b/pyload/plugins/account/StreamcloudEu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class StreamcloudEu(XFSAccount): diff --git a/pyload/plugins/account/TurbobitNet.py b/pyload/plugins/account/TurbobitNet.py index cb8975158..cb6f36613 100644 --- a/pyload/plugins/account/TurbobitNet.py +++ b/pyload/plugins/account/TurbobitNet.py @@ -3,7 +3,7 @@ import re from time import mktime, strptime -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class TurbobitNet(Account): diff --git a/pyload/plugins/account/TusfilesNet.py b/pyload/plugins/account/TusfilesNet.py index 552047a64..9aa8ed543 100644 --- a/pyload/plugins/account/TusfilesNet.py +++ b/pyload/plugins/account/TusfilesNet.py @@ -4,7 +4,7 @@ import re from time import mktime, strptime, gmtime -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class TusfilesNet(XFSAccount): diff --git a/pyload/plugins/account/UlozTo.py b/pyload/plugins/account/UlozTo.py index fefc334e9..4e663efa9 100644 --- a/pyload/plugins/account/UlozTo.py +++ b/pyload/plugins/account/UlozTo.py @@ -4,7 +4,7 @@ import re from urlparse import urljoin -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class UlozTo(Account): diff --git a/pyload/plugins/account/UnrestrictLi.py b/pyload/plugins/account/UnrestrictLi.py index b5ae43d72..88f4841f7 100644 --- a/pyload/plugins/account/UnrestrictLi.py +++ b/pyload/plugins/account/UnrestrictLi.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account from pyload.utils import json_loads diff --git a/module/plugins/accounts/UploadcCom.py b/pyload/plugins/account/UploadcCom.py index d1e1a2ead..8f437eb01 100644 --- a/module/plugins/accounts/UploadcCom.py +++ b/pyload/plugins/account/UploadcCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class UploadcCom(XFSAccount): diff --git a/pyload/plugins/account/UploadedTo.py b/pyload/plugins/account/UploadedTo.py index 0054b60bf..310e23730 100644 --- a/pyload/plugins/account/UploadedTo.py +++ b/pyload/plugins/account/UploadedTo.py @@ -3,7 +3,7 @@ import re from time import time -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class UploadedTo(Account): diff --git a/pyload/plugins/account/UploadheroCom.py b/pyload/plugins/account/UploadheroCom.py index c3a39e5dc..be1d444be 100644 --- a/pyload/plugins/account/UploadheroCom.py +++ b/pyload/plugins/account/UploadheroCom.py @@ -4,7 +4,7 @@ import re import datetime import time -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class UploadheroCom(Account): diff --git a/pyload/plugins/account/UploadingCom.py b/pyload/plugins/account/UploadingCom.py index b5ea91119..dd7ab26cf 100644 --- a/pyload/plugins/account/UploadingCom.py +++ b/pyload/plugins/account/UploadingCom.py @@ -4,8 +4,8 @@ import re from time import time, strptime, mktime -from pyload.plugins.base.Account import Account -from module.plugins.internal.SimpleHoster import set_cookies +from pyload.plugins.internal.Account import Account +from pyload.plugins.internal.SimpleHoster import set_cookies class UploadingCom(Account): diff --git a/pyload/plugins/account/UptoboxCom.py b/pyload/plugins/account/UptoboxCom.py index d3fb4e559..36f541e96 100644 --- a/pyload/plugins/account/UptoboxCom.py +++ b/pyload/plugins/account/UptoboxCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class UptoboxCom(XFSAccount): diff --git a/pyload/plugins/account/VidPlayNet.py b/pyload/plugins/account/VidPlayNet.py index 5bfc24963..4393b3a82 100644 --- a/pyload/plugins/account/VidPlayNet.py +++ b/pyload/plugins/account/VidPlayNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class VidPlayNet(XFSAccount): diff --git a/module/plugins/accounts/XFileSharingPro.py b/pyload/plugins/account/XFileSharingPro.py index fb77ab23f..aa16d5045 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/pyload/plugins/account/XFileSharingPro.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugins.internal.XFSAccount import XFSAccount class XFileSharingPro(XFSAccount): diff --git a/pyload/plugins/account/YibaishiwuCom.py b/pyload/plugins/account/YibaishiwuCom.py index d9a9f37ca..06a606bc4 100644 --- a/pyload/plugins/account/YibaishiwuCom.py +++ b/pyload/plugins/account/YibaishiwuCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class YibaishiwuCom(Account): diff --git a/pyload/plugins/account/ZeveraCom.py b/pyload/plugins/account/ZeveraCom.py index 701198c84..dfd4f29f5 100644 --- a/pyload/plugins/account/ZeveraCom.py +++ b/pyload/plugins/account/ZeveraCom.py @@ -2,7 +2,7 @@ from time import mktime, strptime -from pyload.plugins.base.Account import Account +from pyload.plugins.internal.Account import Account class ZeveraCom(Account): diff --git a/pyload/plugins/addon/Checksum.py b/pyload/plugins/addon/Checksum.py index 00c3d9cfd..4c5bb39ef 100644 --- a/pyload/plugins/addon/Checksum.py +++ b/pyload/plugins/addon/Checksum.py @@ -9,7 +9,7 @@ import zlib from os import remove from os.path import getsize, isfile, splitext -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon from pyload.utils import safe_join, fs_encode diff --git a/pyload/plugins/addon/ClickAndLoad.py b/pyload/plugins/addon/ClickAndLoad.py index c45a1ef2d..63f82ad9b 100644 --- a/pyload/plugins/addon/ClickAndLoad.py +++ b/pyload/plugins/addon/ClickAndLoad.py @@ -3,7 +3,7 @@ import socket import thread -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon def proxy(self, *settings): diff --git a/pyload/plugins/addon/DeleteFinished.py b/pyload/plugins/addon/DeleteFinished.py index 719de143a..c21b0a589 100644 --- a/pyload/plugins/addon/DeleteFinished.py +++ b/pyload/plugins/addon/DeleteFinished.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from pyload.database import style -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon class DeleteFinished(Addon): diff --git a/pyload/plugins/addon/DownloadScheduler.py b/pyload/plugins/addon/DownloadScheduler.py index ef15a859f..9ca4609a6 100644 --- a/pyload/plugins/addon/DownloadScheduler.py +++ b/pyload/plugins/addon/DownloadScheduler.py @@ -4,7 +4,7 @@ import re from time import localtime -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon class DownloadScheduler(Addon): diff --git a/pyload/plugins/addon/ExternalScripts.py b/pyload/plugins/addon/ExternalScripts.py index 122de00c5..5aff0f11f 100644 --- a/pyload/plugins/addon/ExternalScripts.py +++ b/pyload/plugins/addon/ExternalScripts.py @@ -6,7 +6,7 @@ from itertools import chain from os import listdir, access, X_OK, makedirs from os.path import join, exists, basename, abspath -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon from pyload.utils import safe_join diff --git a/pyload/plugins/addon/ExtractArchive.py b/pyload/plugins/addon/ExtractArchive.py index a53d2f951..6946190ed 100644 --- a/pyload/plugins/addon/ExtractArchive.py +++ b/pyload/plugins/addon/ExtractArchive.py @@ -49,7 +49,7 @@ if os.name != "nt": from os import chown from pwd import getpwnam -from pyload.plugins.base.Addon import Addon, threaded, Expose +from pyload.plugins.internal.Addon import Addon, threaded, Expose from pyload.plugins.internal.AbstractExtractor import ArchiveError, CRCError, WrongPassword from pyload.utils import safe_join, fs_encode diff --git a/pyload/plugins/addon/HotFolder.py b/pyload/plugins/addon/HotFolder.py index 0bce193ce..491b9e2da 100644 --- a/pyload/plugins/addon/HotFolder.py +++ b/pyload/plugins/addon/HotFolder.py @@ -6,8 +6,8 @@ from os import listdir, makedirs from os.path import exists, isfile, join from shutil import move -from pyload.plugins.base.Addon import Addon -from module.utils import fs_encode, save_join +from pyload.plugins.internal.Addon import Addon +from pyload.utils import fs_encode, safe_join class HotFolder(Addon): @@ -43,7 +43,7 @@ class HotFolder(Addon): if content: name = "%s_%s.txt" % (self.getConfig("file"), time.strftime("%H-%M-%S_%d%b%Y")) - with open(save_join(folder, "finished", name), "wb") as f: + with open(safe_join(folder, "finished", name), "wb") as f: f.write(content) self.core.api.addPackage(f.name, [f.name], 1) diff --git a/pyload/plugins/addon/IRCInterface.py b/pyload/plugins/addon/IRCInterface.py index 041c8b07b..d06dad07f 100644 --- a/pyload/plugins/addon/IRCInterface.py +++ b/pyload/plugins/addon/IRCInterface.py @@ -13,7 +13,7 @@ from traceback import print_exc from pyload.api import PackageDoesNotExists, FileDoesNotExists from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon from pyload.utils import formatSize diff --git a/pyload/plugins/addon/MergeFiles.py b/pyload/plugins/addon/MergeFiles.py index e67f87f56..2483135f4 100644 --- a/pyload/plugins/addon/MergeFiles.py +++ b/pyload/plugins/addon/MergeFiles.py @@ -5,7 +5,7 @@ import re from traceback import print_exc -from pyload.plugins.base.Addon import Addon, threaded +from pyload.plugins.internal.Addon import Addon, threaded from pyload.utils import safe_join, fs_encode diff --git a/pyload/plugins/addon/MultiHome.py b/pyload/plugins/addon/MultiHome.py index a808802ba..e7ae5168c 100644 --- a/pyload/plugins/addon/MultiHome.py +++ b/pyload/plugins/addon/MultiHome.py @@ -2,7 +2,7 @@ from time import time -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon class MultiHome(Addon): diff --git a/pyload/plugins/addon/RestartFailed.py b/pyload/plugins/addon/RestartFailed.py index 879836bcf..7405e2f75 100644 --- a/pyload/plugins/addon/RestartFailed.py +++ b/pyload/plugins/addon/RestartFailed.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon class RestartFailed(Addon): diff --git a/pyload/plugins/addon/UnSkipOnFail.py b/pyload/plugins/addon/UnSkipOnFail.py index 5122e21eb..1a064562f 100644 --- a/pyload/plugins/addon/UnSkipOnFail.py +++ b/pyload/plugins/addon/UnSkipOnFail.py @@ -3,7 +3,7 @@ from os.path import basename from pyload.datatypes.PyFile import PyFile -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon from pyload.utils import fs_encode diff --git a/pyload/plugins/addon/WindowsPhoneToastNotify.py b/pyload/plugins/addon/WindowsPhoneToastNotify.py index e35f74e84..abcd6c55c 100644 --- a/pyload/plugins/addon/WindowsPhoneToastNotify.py +++ b/pyload/plugins/addon/WindowsPhoneToastNotify.py @@ -3,7 +3,7 @@ import httplib import time -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon class WindowsPhoneToastNotify(Addon): diff --git a/pyload/plugins/base/Hook.py b/pyload/plugins/base/Hook.py deleted file mode 100644 index 5cd528b7e..000000000 --- a/pyload/plugins/base/Hook.py +++ /dev/null @@ -1,166 +0,0 @@ -# -*- coding: utf-8 -*- - -from traceback import print_exc - -from pyload.plugins.Plugin import Base - - -class Expose(object): - """ used for decoration to declare rpc services """ - - def __new__(cls, f, *args, **kwargs): - addonManager.addRPC(f.__module__, f.func_name, f.func_doc) - return f - - -def threaded(f): - - def run(*args,**kwargs): - addonManager.startThread(f, *args, **kwargs) - return run - - -class Hook(Base): - """ - Base class for hook plugins. - """ - __name__ = "Hook" - __type__ = "hook" - __version__ = "0.03" - - __config__ = [] #: [("name", "type", "desc", "default")] - - __description__ = """Interface for hook""" - __license__ = "GPLv3" - __authors__ = [("mkaay", "mkaay@mkaay.de"), - ("RaNaN", "RaNaN@pyload.org")] - - - #: automatically register event listeners for functions, attribute will be deleted dont use it yourself - event_map = None - - # Alternative to event_map - #: List of events the plugin can handle, name the functions exactly like eventname. - event_list = None # dont make duplicate entries in event_map - - #: periodic call interval in secondc - interval = 60 - - - def __init__(self, core, manager): - Base.__init__(self, core) - - #: Provide information in dict here, usable by API `getInfo` - self.info = {} - - #: Callback of periodical job task, used by AddonManager - self.cb = None - - #: `AddonManager` - self.manager = manager - - #register events - if self.event_map: - for event, funcs in self.event_map.iteritems(): - if type(funcs) in (list, tuple): - for f in funcs: - self.manager.addEvent(event, getattr(self,f)) - else: - self.manager.addEvent(event, getattr(self,funcs)) - - #delete for various reasons - self.event_map = None - - if self.event_list: - for f in self.event_list: - self.manager.addEvent(f, getattr(self,f)) - - self.event_list = None - - self.setup() - self.initPeriodical() - - - def initPeriodical(self): - if self.interval >=1: - self.cb = self.core.scheduler.addJob(0, self._periodical, threaded=False) - - - def _periodical(self): - try: - if self.isActivated(): self.periodical() - except Exception, e: - self.logError(_("Error executing hook: %s") % e) - if self.core.debug: - print_exc() - - self.cb = self.core.scheduler.addJob(self.interval, self._periodical, threaded=False) - - - def __repr__(self): - return "<Hook %s>" % self.__name__ - - - def setup(self): - """ more init stuff if needed """ - pass - - - def unload(self): - """ called when hook was deactivated """ - pass - - - def isActivated(self): - """ checks if hook is activated""" - return self.config.getPlugin(self.__name__, "activated") - - - #event methods - overwrite these if needed - def coreReady(self): - pass - - - def coreExiting(self): - pass - - - def downloadPreparing(self, pyfile): - pass - - - def downloadFinished(self, pyfile): - pass - - - def downloadFailed(self, pyfile): - pass - - - def packageFinished(self, pypack): - pass - - - def beforeReconnecting(self, ip): - pass - - - def afterReconnecting(self, ip): - pass - - - def periodical(self): - pass - - - def newCaptchaTask(self, task): - """ new captcha task for the plugin, it MUST set the handler and timeout or will be ignored """ - pass - - - def captchaCorrect(self, task): - pass - - - def captchaInvalid(self, task): - pass diff --git a/pyload/plugins/base/__init__.py b/pyload/plugins/base/__init__.py deleted file mode 100644 index e69de29bb..000000000 --- a/pyload/plugins/base/__init__.py +++ /dev/null diff --git a/pyload/plugins/captcha/AdsCaptcha.py b/pyload/plugins/captcha/AdsCaptcha.py index 8d4e12e28..4eabfbf9b 100644 --- a/pyload/plugins/captcha/AdsCaptcha.py +++ b/pyload/plugins/captcha/AdsCaptcha.py @@ -4,19 +4,21 @@ import re from random import random -from pyload.plugins.base.Captcha import Captcha +from pyload.plugins.internal.Captcha import Captcha class AdsCaptcha(Captcha): - __name__ = "AdsCaptcha" - __version__ = "0.02" + __name__ = "AdsCaptcha" + __type__ = "captcha" + __version__ = "0.04" __description__ = """AdsCaptcha captcha service plugin""" - __authors__ = [("pyLoad Team", "admin@pyload.org")] + __license__ = "GPLv3" + __authors__ = [("pyLoad Team", "admin@pyload.org")] - ID_PATTERN = r'http://api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(?P<ID>\d+)' - KEY_PATTERN = r'http://api\.adscaptcha\.com/Get\.aspx\?[^"\']*PublicKey=(?P<KEY>[\w-]+)' + ID_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(?P<ID>\d+)' + KEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*PublicKey=(?P<KEY>[\w-]+)' def detect_key(self, html=None): @@ -24,7 +26,7 @@ class AdsCaptcha(Captcha): if hasattr(self.plugin, "html") and self.plugin.html: html = self.plugin.html else: - errmsg = "AdsCaptcha html missing" + errmsg = _("AdsCaptcha html not found") self.plugin.fail(errmsg) raise TypeError(errmsg) @@ -39,24 +41,24 @@ class AdsCaptcha(Captcha): return None - def challenge(self, key=None): #: key is tuple(CaptchaId, PublicKey) + def challenge(self, key=None): #: key is a tuple(CaptchaId, PublicKey) if not key: - if self.key: + if self.detect_key(): key = self.key else: - errmsg = "AdsCaptcha key missing" + errmsg = _("AdsCaptcha key not found") self.plugin.fail(errmsg) raise TypeError(errmsg) CaptchaId, PublicKey = key - js = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx", get={'CaptchaId': CaptchaId, 'PublicKey': PublicKey}, cookies=True) + js = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx", get={'CaptchaId': CaptchaId, 'PublicKey': PublicKey}) try: challenge = re.search("challenge: '(.+?)',", js).group(1) server = re.search("server: '(.+?)',", js).group(1) except: - self.plugin.parseError("AdsCaptcha challenge pattern not found") + self.plugin.error("AdsCaptcha challenge pattern not found") result = self.result(server, challenge) diff --git a/pyload/plugins/captcha/ReCaptcha.py b/pyload/plugins/captcha/ReCaptcha.py index 445f6b361..d68584c9d 100644 --- a/pyload/plugins/captcha/ReCaptcha.py +++ b/pyload/plugins/captcha/ReCaptcha.py @@ -2,19 +2,21 @@ import re -from pyload.plugins.base.Captcha import Captcha +from pyload.plugins.internal.Captcha import Captcha class ReCaptcha(Captcha): - __name__ = "ReCaptcha" - __version__ = "0.02" + __name__ = "ReCaptcha" + __type__ = "captcha" + __version__ = "0.07" __description__ = """ReCaptcha captcha service plugin""" - __authors__ = [("pyLoad Team", "admin@pyload.org")] + __license__ = "GPLv3" + __authors__ = [("pyLoad Team", "admin@pyload.org")] - KEY_PATTERN = r"https?://(?:www\.)?google\.com/recaptcha/api/challenge\?k=(?P<KEY>\w+?)" - KEY_AJAX_PATTERN = r"Recaptcha\.create\s*\(\s*[\"'](?P<KEY>\w+)[\"']\s*," + KEY_PATTERN = r'recaptcha(/api|\.net)/(challenge|noscript)\?k=(?P<KEY>[\w-]+)' + KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\'](?P<KEY>[\w-]+)' def detect_key(self, html=None): @@ -22,13 +24,11 @@ class ReCaptcha(Captcha): if hasattr(self.plugin, "html") and self.plugin.html: html = self.plugin.html else: - errmsg = "ReCaptcha html missing" + errmsg = _("ReCaptcha html not found") self.plugin.fail(errmsg) raise TypeError(errmsg) - m = re.search(self.KEY_PATTERN, html) - if m is None: - m = re.search(self.KEY_AJAX_PATTERN, html) + m = re.search(self.KEY_PATTERN, html) or re.search(self.KEY_AJAX_PATTERN, html) if m: self.key = m.group("KEY") self.plugin.logDebug("ReCaptcha key: %s" % self.key) @@ -40,20 +40,20 @@ class ReCaptcha(Captcha): def challenge(self, key=None): if not key: - if self.key: + if self.detect_key(): key = self.key else: - errmsg = "ReCaptcha key missing" + errmsg = _("ReCaptcha key not found") self.plugin.fail(errmsg) raise TypeError(errmsg) - js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={'k': key}, cookies=True) + js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={'k': key}) try: challenge = re.search("challenge : '(.+?)',", js).group(1) server = re.search("server : '(.+?)',", js).group(1) except: - self.plugin.parseError("ReCaptcha challenge pattern not found") + self.plugin.error("ReCaptcha challenge pattern not found") result = self.result(server, challenge) diff --git a/pyload/plugins/captcha/SolveMedia.py b/pyload/plugins/captcha/SolveMedia.py index c8e87bb7a..d1b9eba6a 100644 --- a/pyload/plugins/captcha/SolveMedia.py +++ b/pyload/plugins/captcha/SolveMedia.py @@ -2,36 +2,38 @@ import re -from pyload.plugins.base.Captcha import Captcha +from pyload.plugins.internal.Captcha import Captcha class SolveMedia(Captcha): - __name__ = "SolveMedia" - __version__ = "0.02" + __name__ = "SolveMedia" + __type__ = "captcha" + __version__ = "0.05" __description__ = """SolveMedia captcha service plugin""" - __authors__ = [("pyLoad Team", "admin@pyload.org")] + __license__ = "GPLv3" + __authors__ = [("pyLoad Team", "admin@pyload.org")] - KEY_PATTERN = r'http://api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)"' + KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)["\']' def challenge(self, key=None): if not key: - if self.key: + if self.detect_key(): key = self.key else: - errmsg = "SolveMedia key missing" + errmsg = _("SolveMedia key not found") self.plugin.fail(errmsg) raise TypeError(errmsg) - html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key}, cookies=True) + html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key}) try: challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">', html).group(1) server = "http://api.solvemedia.com/papi/media" except: - self.plugin.parseError("SolveMedia challenge pattern not found") + self.plugin.error("SolveMedia challenge pattern not found") result = self.result(server, challenge) diff --git a/pyload/plugins/container/CCF.py b/pyload/plugins/container/CCF.py index b21339bec..98533cbd8 100644 --- a/pyload/plugins/container/CCF.py +++ b/pyload/plugins/container/CCF.py @@ -8,7 +8,7 @@ from urllib2 import build_opener from MultipartPostHandler import MultipartPostHandler -from pyload.plugins.base.Container import Container +from pyload.plugins.internal.Container import Container from pyload.utils import safe_join diff --git a/pyload/plugins/container/LinkList.py b/pyload/plugins/container/LinkList.py index 621574ab1..b66e44558 100644 --- a/pyload/plugins/container/LinkList.py +++ b/pyload/plugins/container/LinkList.py @@ -2,7 +2,7 @@ import codecs -from pyload.plugins.base.Container import Container +from pyload.plugins.internal.Container import Container from pyload.utils import fs_encode diff --git a/pyload/plugins/container/RSDF.py b/pyload/plugins/container/RSDF.py index 14f355e85..67325f20d 100644 --- a/pyload/plugins/container/RSDF.py +++ b/pyload/plugins/container/RSDF.py @@ -4,8 +4,8 @@ import base64 import binascii import re -from pyload.plugins.base.Container import Container -from module.utils import fs_encode +from pyload.plugins.internal.Container import Container +from pyload.utils import fs_encode class RSDF(Container): diff --git a/pyload/plugins/crypter/ChipDe.py b/pyload/plugins/crypter/ChipDe.py index 97a39f6d2..96892bace 100644 --- a/pyload/plugins/crypter/ChipDe.py +++ b/pyload/plugins/crypter/ChipDe.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class ChipDe(Crypter): diff --git a/pyload/plugins/crypter/CzshareComFolder.py b/pyload/plugins/crypter/CzshareComFolder.py index 23c17e64a..bfca84360 100644 --- a/pyload/plugins/crypter/CzshareComFolder.py +++ b/pyload/plugins/crypter/CzshareComFolder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class CzshareComFolder(Crypter): diff --git a/pyload/plugins/crypter/DDLMusicOrg.py b/pyload/plugins/crypter/DDLMusicOrg.py index ff2faef2c..348c2db51 100644 --- a/pyload/plugins/crypter/DDLMusicOrg.py +++ b/pyload/plugins/crypter/DDLMusicOrg.py @@ -4,7 +4,7 @@ import re from time import sleep -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class DDLMusicOrg(Crypter): diff --git a/pyload/plugins/crypter/DailymotionBatch.py b/pyload/plugins/crypter/DailymotionBatch.py index fd43cd49a..4ea26a830 100644 --- a/pyload/plugins/crypter/DailymotionBatch.py +++ b/pyload/plugins/crypter/DailymotionBatch.py @@ -5,7 +5,7 @@ import re from urlparse import urljoin from pyload.utils import json_loads -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter from pyload.utils import safe_join diff --git a/pyload/plugins/crypter/Dereferer.py b/pyload/plugins/crypter/Dereferer.py index 41da3dc1e..4a647a952 100644 --- a/pyload/plugins/crypter/Dereferer.py +++ b/pyload/plugins/crypter/Dereferer.py @@ -4,7 +4,7 @@ import re from urllib import unquote -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class Dereferer(Crypter): diff --git a/pyload/plugins/crypter/DontKnowMe.py b/pyload/plugins/crypter/DontKnowMe.py index 53a1b3997..0e63233e8 100644 --- a/pyload/plugins/crypter/DontKnowMe.py +++ b/pyload/plugins/crypter/DontKnowMe.py @@ -4,7 +4,7 @@ import re from urllib import unquote -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class DontKnowMe(Crypter): diff --git a/pyload/plugins/crypter/DuckCryptInfo.py b/pyload/plugins/crypter/DuckCryptInfo.py index 6873fd5d3..054783f3c 100644 --- a/pyload/plugins/crypter/DuckCryptInfo.py +++ b/pyload/plugins/crypter/DuckCryptInfo.py @@ -4,7 +4,7 @@ import re from BeautifulSoup import BeautifulSoup -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class DuckCryptInfo(Crypter): diff --git a/pyload/plugins/crypter/DuploadOrgFolder.py b/pyload/plugins/crypter/DuploadOrgFolder.py index af83dffd0..138db9f03 100644 --- a/pyload/plugins/crypter/DuploadOrgFolder.py +++ b/pyload/plugins/crypter/DuploadOrgFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter +from pyload.plugins.internal.DeadCrypter import DeadCrypter class DuploadOrgFolder(DeadCrypter): diff --git a/pyload/plugins/crypter/EasybytezComFolder.py b/pyload/plugins/crypter/EasybytezComFolder.py index fa3e6165c..482ce594b 100644 --- a/pyload/plugins/crypter/EasybytezComFolder.py +++ b/pyload/plugins/crypter/EasybytezComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSCrypter import XFSCrypter +from pyload.plugins.internal.XFSCrypter import XFSCrypter class EasybytezComFolder(XFSCrypter): diff --git a/pyload/plugins/crypter/EmbeduploadCom.py b/pyload/plugins/crypter/EmbeduploadCom.py index 136d99f9e..c6649890f 100644 --- a/pyload/plugins/crypter/EmbeduploadCom.py +++ b/pyload/plugins/crypter/EmbeduploadCom.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter from pyload.network.HTTPRequest import BadHeader diff --git a/pyload/plugins/crypter/FileserveComFolder.py b/pyload/plugins/crypter/FileserveComFolder.py index d601e2365..c08e174ed 100644 --- a/pyload/plugins/crypter/FileserveComFolder.py +++ b/pyload/plugins/crypter/FileserveComFolder.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class FileserveComFolder(Crypter): diff --git a/module/plugins/crypter/FilesonicComFolder.py b/pyload/plugins/crypter/FilesonicComFolder.py index 2d0540d26..992915ab5 100644 --- a/module/plugins/crypter/FilesonicComFolder.py +++ b/pyload/plugins/crypter/FilesonicComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter +from pyload.plugins.internal.DeadCrypter import DeadCrypter class FilesonicComFolder(DeadCrypter): diff --git a/pyload/plugins/crypter/FiredriveComFolder.py b/pyload/plugins/crypter/FiredriveComFolder.py index b6b22a4e1..f6e6b8670 100644 --- a/pyload/plugins/crypter/FiredriveComFolder.py +++ b/pyload/plugins/crypter/FiredriveComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter +from pyload.plugins.internal.DeadCrypter import DeadCrypter class FiredriveComFolder(DeadCrypter): diff --git a/pyload/plugins/crypter/FourChanOrg.py b/pyload/plugins/crypter/FourChanOrg.py index c418d20b0..37d205f73 100644 --- a/pyload/plugins/crypter/FourChanOrg.py +++ b/pyload/plugins/crypter/FourChanOrg.py @@ -4,7 +4,7 @@ import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class FourChanOrg(Crypter): diff --git a/pyload/plugins/crypter/GooGl.py b/pyload/plugins/crypter/GooGl.py index b3e55688e..b5fb40f34 100644 --- a/pyload/plugins/crypter/GooGl.py +++ b/pyload/plugins/crypter/GooGl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter from pyload.utils import json_loads diff --git a/pyload/plugins/crypter/HoerbuchIn.py b/pyload/plugins/crypter/HoerbuchIn.py index f8185275a..fa409a94c 100644 --- a/pyload/plugins/crypter/HoerbuchIn.py +++ b/pyload/plugins/crypter/HoerbuchIn.py @@ -4,7 +4,7 @@ import re from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class HoerbuchIn(Crypter): diff --git a/module/plugins/crypter/HotfileComFolder.py b/pyload/plugins/crypter/HotfileComFolder.py index 3fc8f6f63..1ce901866 100644 --- a/module/plugins/crypter/HotfileComFolder.py +++ b/pyload/plugins/crypter/HotfileComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter +from pyload.plugins.internal.DeadCrypter import DeadCrypter class HotfileComFolder(DeadCrypter): diff --git a/module/plugins/crypter/JunocloudMeFolder.py b/pyload/plugins/crypter/JunocloudMeFolder.py index 509f1f7ec..2e529169f 100644 --- a/module/plugins/crypter/JunocloudMeFolder.py +++ b/pyload/plugins/crypter/JunocloudMeFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSCrypter import XFSCrypter +from pyload.plugins.internal.XFSCrypter import XFSCrypter class JunocloudMeFolder(XFSCrypter): diff --git a/pyload/plugins/crypter/LetitbitNetFolder.py b/pyload/plugins/crypter/LetitbitNetFolder.py index b2e1d7f7b..09e6c398d 100644 --- a/pyload/plugins/crypter/LetitbitNetFolder.py +++ b/pyload/plugins/crypter/LetitbitNetFolder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class LetitbitNetFolder(Crypter): diff --git a/module/plugins/crypter/LinkCryptWs.py b/pyload/plugins/crypter/LinkCryptWs.py index b90e18490..bbcef02fd 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/pyload/plugins/crypter/LinkCryptWs.py @@ -8,8 +8,8 @@ import pycurl from Crypto.Cipher import AES -from module.plugins.Crypter import Crypter -from module.utils import html_unescape +from pyload.plugins.internal.Crypter import Crypter +from pyload.utils import html_unescape class LinkCryptWs(Crypter): diff --git a/pyload/plugins/crypter/LinkSaveIn.py b/pyload/plugins/crypter/LinkSaveIn.py index d6ad6abb7..44a31a1b1 100644 --- a/pyload/plugins/crypter/LinkSaveIn.py +++ b/pyload/plugins/crypter/LinkSaveIn.py @@ -9,7 +9,7 @@ import re from Crypto.Cipher import AES -from module.plugins.internal.SimpleCrypter import SimpleCrypter +from pyload.plugins.internal.SimpleCrypter import SimpleCrypter from pyload.utils import html_unescape diff --git a/pyload/plugins/crypter/LinkdecrypterCom.py b/pyload/plugins/crypter/LinkdecrypterCom.py index 9c0d364e6..57045c9d0 100644 --- a/pyload/plugins/crypter/LinkdecrypterCom.py +++ b/pyload/plugins/crypter/LinkdecrypterCom.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class LinkdecrypterCom(Crypter): diff --git a/pyload/plugins/crypter/LixIn.py b/pyload/plugins/crypter/LixIn.py index 6d0494c57..2394a17b8 100644 --- a/pyload/plugins/crypter/LixIn.py +++ b/pyload/plugins/crypter/LixIn.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class LixIn(Crypter): diff --git a/pyload/plugins/crypter/MediafireComFolder.py b/pyload/plugins/crypter/MediafireComFolder.py index 43f87b821..a1cd84fa0 100644 --- a/pyload/plugins/crypter/MediafireComFolder.py +++ b/pyload/plugins/crypter/MediafireComFolder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter from pyload.plugins.hoster.MediafireCom import checkHTMLHeader from pyload.utils import json_loads diff --git a/module/plugins/crypter/MegaRapidCzFolder.py b/pyload/plugins/crypter/MegaRapidCzFolder.py index d9fb828a8..4a2344051 100644 --- a/module/plugins/crypter/MegaRapidCzFolder.py +++ b/pyload/plugins/crypter/MegaRapidCzFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter +from pyload.plugins.internal.SimpleCrypter import SimpleCrypter class MegaRapidCzFolder(SimpleCrypter): diff --git a/module/plugins/crypter/MegauploadComFolder.py b/pyload/plugins/crypter/MegauploadComFolder.py index 1d487ed61..7e79863d2 100644 --- a/module/plugins/crypter/MegauploadComFolder.py +++ b/pyload/plugins/crypter/MegauploadComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter +from pyload.plugins.internal.DeadCrypter import DeadCrypter class MegauploadComFolder(DeadCrypter): diff --git a/pyload/plugins/crypter/MultiloadCz.py b/pyload/plugins/crypter/MultiloadCz.py index e233dce99..02b60876e 100644 --- a/pyload/plugins/crypter/MultiloadCz.py +++ b/pyload/plugins/crypter/MultiloadCz.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class MultiloadCz(Crypter): diff --git a/pyload/plugins/crypter/NCryptIn.py b/pyload/plugins/crypter/NCryptIn.py index 28eb40a63..edb664d32 100644 --- a/pyload/plugins/crypter/NCryptIn.py +++ b/pyload/plugins/crypter/NCryptIn.py @@ -6,7 +6,7 @@ import re from Crypto.Cipher import AES -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter from pyload.plugins.internal.CaptchaService import ReCaptcha diff --git a/pyload/plugins/crypter/OneKhDe.py b/pyload/plugins/crypter/OneKhDe.py index d980f9bad..ff15b0baa 100644 --- a/pyload/plugins/crypter/OneKhDe.py +++ b/pyload/plugins/crypter/OneKhDe.py @@ -3,7 +3,7 @@ import re from pyload.utils import html_unescape -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class OneKhDe(Crypter): diff --git a/pyload/plugins/crypter/QuickshareCzFolder.py b/pyload/plugins/crypter/QuickshareCzFolder.py index 7a4a7fb03..b3f3f2335 100644 --- a/pyload/plugins/crypter/QuickshareCzFolder.py +++ b/pyload/plugins/crypter/QuickshareCzFolder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class QuickshareCzFolder(Crypter): diff --git a/module/plugins/crypter/RapidfileshareNetFolder.py b/pyload/plugins/crypter/RapidfileshareNetFolder.py index 5531d5a90..daf4c1311 100644 --- a/module/plugins/crypter/RapidfileshareNetFolder.py +++ b/pyload/plugins/crypter/RapidfileshareNetFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSCrypter import XFSCrypter +from pyload.plugins.internal.XFSCrypter import XFSCrypter class RapidfileshareNetFolder(XFSCrypter): diff --git a/pyload/plugins/crypter/RelinkUs.py b/pyload/plugins/crypter/RelinkUs.py index 8a31d2acd..c27d790b8 100644 --- a/pyload/plugins/crypter/RelinkUs.py +++ b/pyload/plugins/crypter/RelinkUs.py @@ -6,7 +6,7 @@ import re import os from Crypto.Cipher import AES -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class RelinkUs(Crypter): diff --git a/pyload/plugins/crypter/SafelinkingNet.py b/pyload/plugins/crypter/SafelinkingNet.py index 1d8ad7cf6..38eb36ea5 100644 --- a/pyload/plugins/crypter/SafelinkingNet.py +++ b/pyload/plugins/crypter/SafelinkingNet.py @@ -7,7 +7,7 @@ from pycurl import FOLLOWLOCATION from BeautifulSoup import BeautifulSoup from pyload.utils import json_loads -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter from pyload.plugins.internal.CaptchaService import SolveMedia diff --git a/module/plugins/crypter/SexuriaCom.py b/pyload/plugins/crypter/SexuriaCom.py index 3c952fd6b..dd9b01bcd 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/pyload/plugins/crypter/SexuriaCom.py @@ -2,7 +2,7 @@ import re -from module.plugins.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class SexuriaCom(Crypter): diff --git a/pyload/plugins/crypter/ShareLinksBiz.py b/pyload/plugins/crypter/ShareLinksBiz.py index 0c646eda8..7aa5dd17b 100644 --- a/pyload/plugins/crypter/ShareLinksBiz.py +++ b/pyload/plugins/crypter/ShareLinksBiz.py @@ -5,7 +5,7 @@ import binascii import re from Crypto.Cipher import AES -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class ShareLinksBiz(Crypter): diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/pyload/plugins/crypter/SharingmatrixComFolder.py index ddc3bdb37..a8ab3226a 100644 --- a/module/plugins/crypter/SharingmatrixComFolder.py +++ b/pyload/plugins/crypter/SharingmatrixComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter +from pyload.plugins.internal.DeadCrypter import DeadCrypter class SharingmatrixComFolder(DeadCrypter): diff --git a/pyload/plugins/crypter/TusfilesNetFolder.py b/pyload/plugins/crypter/TusfilesNetFolder.py index e8da59736..8ca1ada00 100644 --- a/pyload/plugins/crypter/TusfilesNetFolder.py +++ b/pyload/plugins/crypter/TusfilesNetFolder.py @@ -4,7 +4,7 @@ import math import re from urlparse import urljoin -from module.plugins.internal.XFSCrypter import XFSCrypter +from pyload.plugins.internal.XFSCrypter import XFSCrypter class TusfilesNetFolder(XFSCrypter): diff --git a/pyload/plugins/crypter/UlozToFolder.py b/pyload/plugins/crypter/UlozToFolder.py index da1cb61b9..fe64d41bb 100644 --- a/pyload/plugins/crypter/UlozToFolder.py +++ b/pyload/plugins/crypter/UlozToFolder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class UlozToFolder(Crypter): diff --git a/pyload/plugins/crypter/UploadedToFolder.py b/pyload/plugins/crypter/UploadedToFolder.py index 359ba92d0..da1354f02 100644 --- a/pyload/plugins/crypter/UploadedToFolder.py +++ b/pyload/plugins/crypter/UploadedToFolder.py @@ -4,7 +4,7 @@ import re from urlparse import urljoin -from module.plugins.internal.SimpleCrypter import SimpleCrypter +from pyload.plugins.internal.SimpleCrypter import SimpleCrypter class UploadedToFolder(SimpleCrypter): diff --git a/module/plugins/crypter/WuploadComFolder.py b/pyload/plugins/crypter/WuploadComFolder.py index b77bc3e67..2626a0d13 100644 --- a/module/plugins/crypter/WuploadComFolder.py +++ b/pyload/plugins/crypter/WuploadComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter +from pyload.plugins.internal.DeadCrypter import DeadCrypter class WuploadComFolder(DeadCrypter): diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/pyload/plugins/crypter/XFileSharingProFolder.py index dffd8909c..89fac31ac 100644 --- a/module/plugins/crypter/XFileSharingProFolder.py +++ b/pyload/plugins/crypter/XFileSharingProFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.XFSCrypter import XFSCrypter +from pyload.plugins.internal.XFSCrypter import XFSCrypter class XFileSharingProFolder(XFSCrypter): diff --git a/pyload/plugins/crypter/XupPl.py b/pyload/plugins/crypter/XupPl.py index 87c93a305..7be72cf9e 100644 --- a/pyload/plugins/crypter/XupPl.py +++ b/pyload/plugins/crypter/XupPl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter class XupPl(Crypter): diff --git a/pyload/plugins/crypter/YoutubeBatch.py b/pyload/plugins/crypter/YoutubeBatch.py index 7cb0e2f0a..d25f991e8 100644 --- a/pyload/plugins/crypter/YoutubeBatch.py +++ b/pyload/plugins/crypter/YoutubeBatch.py @@ -5,7 +5,7 @@ import re from urlparse import urljoin from pyload.utils import json_loads -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter from pyload.utils import safe_join diff --git a/pyload/plugins/hook/BypassCaptcha.py b/pyload/plugins/hook/BypassCaptcha.py index 8b34777f0..1a640ef87 100644 --- a/pyload/plugins/hook/BypassCaptcha.py +++ b/pyload/plugins/hook/BypassCaptcha.py @@ -5,7 +5,7 @@ from thread import start_new_thread from pyload.network.HTTPRequest import BadHeader from pyload.network.RequestFactory import getURL, getRequest -from pyload.plugins.base.Hook import Hook +from pyload.plugins.internal.Addon import Hook class BypassCaptchaException(Exception): diff --git a/pyload/plugins/hook/Captcha9kw.py b/pyload/plugins/hook/Captcha9kw.py index f131aa21e..ab5b802b0 100644 --- a/pyload/plugins/hook/Captcha9kw.py +++ b/pyload/plugins/hook/Captcha9kw.py @@ -11,7 +11,7 @@ from time import sleep from pyload.network.HTTPRequest import BadHeader from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hook import Hook +from pyload.plugins.internal.Addon import Hook class Captcha9kw(Hook): diff --git a/pyload/plugins/hook/CaptchaBrotherhood.py b/pyload/plugins/hook/CaptchaBrotherhood.py index 03821b8b6..1b7e18c51 100644 --- a/pyload/plugins/hook/CaptchaBrotherhood.py +++ b/pyload/plugins/hook/CaptchaBrotherhood.py @@ -15,7 +15,7 @@ from time import sleep from urllib import urlencode from pyload.network.RequestFactory import getURL, getRequest -from pyload.plugins.base.Hook import Hook +from pyload.plugins.internal.Addon import Hook class CaptchaBrotherhoodException(Exception): diff --git a/pyload/plugins/hook/DeathByCaptcha.py b/pyload/plugins/hook/DeathByCaptcha.py index f3e4bb808..d032c964f 100644 --- a/pyload/plugins/hook/DeathByCaptcha.py +++ b/pyload/plugins/hook/DeathByCaptcha.py @@ -12,7 +12,7 @@ from time import sleep from pyload.utils import json_loads from pyload.network.HTTPRequest import BadHeader from pyload.network.RequestFactory import getRequest -from pyload.plugins.base.Hook import Hook +from pyload.plugins.internal.Addon import Hook class DeathByCaptchaException(Exception): diff --git a/pyload/plugins/hook/ExpertDecoders.py b/pyload/plugins/hook/ExpertDecoders.py index 933355fbe..ed889319a 100644 --- a/pyload/plugins/hook/ExpertDecoders.py +++ b/pyload/plugins/hook/ExpertDecoders.py @@ -9,7 +9,7 @@ from uuid import uuid4 from pyload.network.HTTPRequest import BadHeader from pyload.network.RequestFactory import getURL, getRequest -from pyload.plugins.base.Hook import Hook +from pyload.plugins.internal.Addon import Hook class ExpertDecoders(Hook): diff --git a/pyload/plugins/hook/ImageTyperz.py b/pyload/plugins/hook/ImageTyperz.py index b79fd42ba..ce6527fad 100644 --- a/pyload/plugins/hook/ImageTyperz.py +++ b/pyload/plugins/hook/ImageTyperz.py @@ -9,7 +9,7 @@ from pycurl import FORM_FILE, LOW_SPEED_TIME from thread import start_new_thread from pyload.network.RequestFactory import getURL, getRequest -from pyload.plugins.base.Hook import Hook +from pyload.plugins.internal.Addon import Hook class ImageTyperzException(Exception): diff --git a/pyload/plugins/hook/LinkdecrypterCom.py b/pyload/plugins/hook/LinkdecrypterCom.py index 8455ed904..95145d462 100644 --- a/pyload/plugins/hook/LinkdecrypterCom.py +++ b/pyload/plugins/hook/LinkdecrypterCom.py @@ -3,7 +3,7 @@ import re from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hook import Hook +from pyload.plugins.internal.Addon import Hook from pyload.utils import remove_chars diff --git a/pyload/plugins/hook/XFileSharingPro.py b/pyload/plugins/hook/XFileSharingPro.py index 3f70f88f3..53033d8a4 100644 --- a/pyload/plugins/hook/XFileSharingPro.py +++ b/pyload/plugins/hook/XFileSharingPro.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hook import Hook +from pyload.plugins.internal.Addon import Hook class XFileSharingPro(Hook): diff --git a/pyload/plugins/hoster/AlldebridCom.py b/pyload/plugins/hoster/AlldebridCom.py index 7a7831204..7e5adf8ba 100644 --- a/pyload/plugins/hoster/AlldebridCom.py +++ b/pyload/plugins/hoster/AlldebridCom.py @@ -6,7 +6,7 @@ from random import randrange from urllib import unquote from pyload.utils import json_loads -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import parseFileSize diff --git a/pyload/plugins/hoster/BasePlugin.py b/pyload/plugins/hoster/BasePlugin.py index 761ee720c..dd8540578 100644 --- a/pyload/plugins/hoster/BasePlugin.py +++ b/pyload/plugins/hoster/BasePlugin.py @@ -6,7 +6,7 @@ from urllib import unquote from urlparse import urlparse from pyload.network.HTTPRequest import BadHeader -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import html_unescape, remove_chars diff --git a/pyload/plugins/hoster/BillionuploadsCom.py b/pyload/plugins/hoster/BillionuploadsCom.py index b20ace0f1..d5d8c6c0f 100644 --- a/pyload/plugins/hoster/BillionuploadsCom.py +++ b/pyload/plugins/hoster/BillionuploadsCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class BillionuploadsCom(XFSHoster): diff --git a/pyload/plugins/hoster/CramitIn.py b/pyload/plugins/hoster/CramitIn.py index 4f1ad1ff1..2d2c0cbbc 100644 --- a/pyload/plugins/hoster/CramitIn.py +++ b/pyload/plugins/hoster/CramitIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class CramitIn(XFSHoster): diff --git a/pyload/plugins/hoster/DailymotionCom.py b/pyload/plugins/hoster/DailymotionCom.py index 4fb0b2222..4b3af6e8f 100644 --- a/pyload/plugins/hoster/DailymotionCom.py +++ b/pyload/plugins/hoster/DailymotionCom.py @@ -5,7 +5,7 @@ import re from pyload.datatypes.PyFile import statusMap from pyload.utils import json_loads from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster def getInfo(urls): diff --git a/pyload/plugins/hoster/DebridItaliaCom.py b/pyload/plugins/hoster/DebridItaliaCom.py index 1b6b1b030..81cf0b830 100644 --- a/pyload/plugins/hoster/DebridItaliaCom.py +++ b/pyload/plugins/hoster/DebridItaliaCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class DebridItaliaCom(Hoster): diff --git a/pyload/plugins/hoster/EasybytezCom.py b/pyload/plugins/hoster/EasybytezCom.py index 3103d403f..b233e52ee 100644 --- a/pyload/plugins/hoster/EasybytezCom.py +++ b/pyload/plugins/hoster/EasybytezCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class EasybytezCom(XFSHoster): diff --git a/module/plugins/hoster/EnteruploadCom.py b/pyload/plugins/hoster/EnteruploadCom.py index bbd613f57..c535d6f48 100644 --- a/module/plugins/hoster/EnteruploadCom.py +++ b/pyload/plugins/hoster/EnteruploadCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class EnteruploadCom(DeadHoster): diff --git a/pyload/plugins/hoster/FastixRu.py b/pyload/plugins/hoster/FastixRu.py index 2e01dc216..0e353f362 100644 --- a/pyload/plugins/hoster/FastixRu.py +++ b/pyload/plugins/hoster/FastixRu.py @@ -6,7 +6,7 @@ from random import randrange from urllib import unquote from pyload.utils import json_loads -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class FastixRu(Hoster): diff --git a/pyload/plugins/hoster/FileParadoxIn.py b/pyload/plugins/hoster/FileParadoxIn.py index 7ed0e9b7a..174aa7211 100644 --- a/pyload/plugins/hoster/FileParadoxIn.py +++ b/pyload/plugins/hoster/FileParadoxIn.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class FileParadoxIn(XFSHoster): diff --git a/module/plugins/hoster/FileSharkPl.py b/pyload/plugins/hoster/FileSharkPl.py index 5a9cbb456..99cb4b51b 100644 --- a/module/plugins/hoster/FileSharkPl.py +++ b/pyload/plugins/hoster/FileSharkPl.py @@ -4,7 +4,7 @@ import re from urlparse import urljoin -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileSharkPl(SimpleHoster): diff --git a/pyload/plugins/hoster/FileomCom.py b/pyload/plugins/hoster/FileomCom.py index 2b6fd34db..128039c2e 100644 --- a/pyload/plugins/hoster/FileomCom.py +++ b/pyload/plugins/hoster/FileomCom.py @@ -3,7 +3,7 @@ # Test links: # http://fileom.com/gycaytyzdw3g/random.bin.html -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class FileomCom(XFSHoster): diff --git a/pyload/plugins/hoster/FilerioCom.py b/pyload/plugins/hoster/FilerioCom.py index 52906fc67..f4582b876 100644 --- a/pyload/plugins/hoster/FilerioCom.py +++ b/pyload/plugins/hoster/FilerioCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class FilerioCom(XFSHoster): diff --git a/pyload/plugins/hoster/FilesMailRu.py b/pyload/plugins/hoster/FilesMailRu.py index c92cd0b0c..1c7c8059e 100644 --- a/pyload/plugins/hoster/FilesMailRu.py +++ b/pyload/plugins/hoster/FilesMailRu.py @@ -3,7 +3,7 @@ import re from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.plugins.Plugin import chunks diff --git a/pyload/plugins/hoster/FileserveCom.py b/pyload/plugins/hoster/FileserveCom.py index 88da94c46..f486d9f56 100644 --- a/pyload/plugins/hoster/FileserveCom.py +++ b/pyload/plugins/hoster/FileserveCom.py @@ -4,7 +4,7 @@ import re from pyload.utils import json_loads from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.plugins.Plugin import chunks from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight from pyload.plugins.internal.CaptchaService import ReCaptcha diff --git a/pyload/plugins/hoster/FileshareInUa.py b/pyload/plugins/hoster/FileshareInUa.py index 08e10dccb..8bb1a72c5 100644 --- a/pyload/plugins/hoster/FileshareInUa.py +++ b/pyload/plugins/hoster/FileshareInUa.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FileshareInUa(DeadHoster): diff --git a/module/plugins/hoster/FilesonicCom.py b/pyload/plugins/hoster/FilesonicCom.py index 8bfa0fa2e..323983169 100644 --- a/module/plugins/hoster/FilesonicCom.py +++ b/pyload/plugins/hoster/FilesonicCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FilesonicCom(DeadHoster): diff --git a/pyload/plugins/hoster/FiredriveCom.py b/pyload/plugins/hoster/FiredriveCom.py index 0e3a4e847..3c7ec25f2 100644 --- a/pyload/plugins/hoster/FiredriveCom.py +++ b/pyload/plugins/hoster/FiredriveCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FiredriveCom(DeadHoster): diff --git a/pyload/plugins/hoster/FreakshareCom.py b/pyload/plugins/hoster/FreakshareCom.py index 1759df04a..bd31a5752 100644 --- a/pyload/plugins/hoster/FreakshareCom.py +++ b/pyload/plugins/hoster/FreakshareCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight from pyload.plugins.internal.CaptchaService import ReCaptcha diff --git a/pyload/plugins/hoster/FreeWayMe.py b/pyload/plugins/hoster/FreeWayMe.py index 219333055..128f54958 100644 --- a/pyload/plugins/hoster/FreeWayMe.py +++ b/pyload/plugins/hoster/FreeWayMe.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class FreeWayMe(Hoster): diff --git a/pyload/plugins/hoster/Ftp.py b/pyload/plugins/hoster/Ftp.py index a846d2b5f..2baec064b 100644 --- a/pyload/plugins/hoster/Ftp.py +++ b/pyload/plugins/hoster/Ftp.py @@ -6,7 +6,7 @@ import re from urllib import quote, unquote from urlparse import urlparse -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class Ftp(Hoster): diff --git a/pyload/plugins/hoster/GamefrontCom.py b/pyload/plugins/hoster/GamefrontCom.py index f502d9af4..195c6037e 100644 --- a/pyload/plugins/hoster/GamefrontCom.py +++ b/pyload/plugins/hoster/GamefrontCom.py @@ -3,7 +3,7 @@ import re from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import parseFileSize diff --git a/pyload/plugins/hoster/HugefilesNet.py b/pyload/plugins/hoster/HugefilesNet.py index cbbce119f..e955d53cc 100644 --- a/pyload/plugins/hoster/HugefilesNet.py +++ b/pyload/plugins/hoster/HugefilesNet.py @@ -3,7 +3,7 @@ # Test links: # http://hugefiles.net/prthf9ya4w6s -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class HugefilesNet(XFSHoster): diff --git a/pyload/plugins/hoster/HundredEightyUploadCom.py b/pyload/plugins/hoster/HundredEightyUploadCom.py index 48e0c3d8c..717344efa 100644 --- a/pyload/plugins/hoster/HundredEightyUploadCom.py +++ b/pyload/plugins/hoster/HundredEightyUploadCom.py @@ -3,7 +3,7 @@ # Test links: # http://180upload.com/js9qdm6kjnrs -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class HundredEightyUploadCom(XFSHoster): diff --git a/module/plugins/hoster/JunocloudMe.py b/pyload/plugins/hoster/JunocloudMe.py index 0f839960a..dc5620e0e 100644 --- a/module/plugins/hoster/JunocloudMe.py +++ b/pyload/plugins/hoster/JunocloudMe.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class JunocloudMe(XFSHoster): diff --git a/module/plugins/hoster/Keep2shareCc.py b/pyload/plugins/hoster/Keep2shareCc.py index fd8a5524d..6fc521107 100644 --- a/module/plugins/hoster/Keep2shareCc.py +++ b/pyload/plugins/hoster/Keep2shareCc.py @@ -4,8 +4,8 @@ import re from urlparse import urlparse, urljoin -from module.plugins.internal.CaptchaService import ReCaptcha -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from pyload.plugins.internal.CaptchaService import ReCaptcha +from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class Keep2shareCc(SimpleHoster): diff --git a/module/plugins/hoster/KickloadCom.py b/pyload/plugins/hoster/KickloadCom.py index 1c39db46c..88c84390c 100644 --- a/module/plugins/hoster/KickloadCom.py +++ b/pyload/plugins/hoster/KickloadCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class KickloadCom(DeadHoster): diff --git a/pyload/plugins/hoster/LinksnappyCom.py b/pyload/plugins/hoster/LinksnappyCom.py index c37006ac2..d7991ff3c 100644 --- a/pyload/plugins/hoster/LinksnappyCom.py +++ b/pyload/plugins/hoster/LinksnappyCom.py @@ -5,7 +5,7 @@ import re from urlparse import urlsplit from pyload.utils import json_loads, json_dumps -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class LinksnappyCom(Hoster): diff --git a/pyload/plugins/hoster/LomafileCom.py b/pyload/plugins/hoster/LomafileCom.py index a7ce39d37..2c4bd37a2 100644 --- a/pyload/plugins/hoster/LomafileCom.py +++ b/pyload/plugins/hoster/LomafileCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class LomafileCom(XFSHoster): diff --git a/module/plugins/hoster/MegaCoNz.py b/pyload/plugins/hoster/MegaCoNz.py index 2129fbfc8..f09a5cdd5 100644 --- a/module/plugins/hoster/MegaCoNz.py +++ b/pyload/plugins/hoster/MegaCoNz.py @@ -11,8 +11,8 @@ from Crypto.Cipher import AES from Crypto.Util import Counter from pycurl import SSL_CIPHER_LIST -from module.common.json_layer import json_loads, json_dumps -from module.plugins.Hoster import Hoster +from pyload.utils import json_loads, json_dumps +from pyload.plugins.internal.Hoster import Hoster class MegaCoNz(Hoster): diff --git a/pyload/plugins/hoster/MegaDebridEu.py b/pyload/plugins/hoster/MegaDebridEu.py index aaf5419e6..1354c0e3d 100644 --- a/pyload/plugins/hoster/MegaDebridEu.py +++ b/pyload/plugins/hoster/MegaDebridEu.py @@ -5,7 +5,7 @@ import re from urllib import unquote_plus from pyload.utils import json_loads -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class MegaDebridEu(Hoster): diff --git a/module/plugins/hoster/MegaRapidCz.py b/pyload/plugins/hoster/MegaRapidCz.py index b3100b6d4..f49d0e1ec 100644 --- a/module/plugins/hoster/MegaRapidCz.py +++ b/pyload/plugins/hoster/MegaRapidCz.py @@ -4,8 +4,8 @@ import re from pycurl import HTTPHEADER -from module.network.RequestFactory import getRequest -from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo +from pyload.network.RequestFactory import getRequest +from pyload.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo def getInfo(urls): diff --git a/pyload/plugins/hoster/MegacrypterCom.py b/pyload/plugins/hoster/MegacrypterCom.py index 4633f7d30..1ebd167f3 100644 --- a/pyload/plugins/hoster/MegacrypterCom.py +++ b/pyload/plugins/hoster/MegacrypterCom.py @@ -4,7 +4,7 @@ import re from pyload.utils import json_loads, json_dumps -from module.plugins.hoster.MegaCoNz import MegaCoNz +from pyload.plugins.hoster.MegaCoNz import MegaCoNz class MegacrypterCom(MegaCoNz): diff --git a/module/plugins/hoster/MegauploadCom.py b/pyload/plugins/hoster/MegauploadCom.py index 7f51a8a46..20700a3d0 100644 --- a/module/plugins/hoster/MegauploadCom.py +++ b/pyload/plugins/hoster/MegauploadCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class MegauploadCom(DeadHoster): diff --git a/module/plugins/hoster/MegavideoCom.py b/pyload/plugins/hoster/MegavideoCom.py index 24905ce62..aa458fa2c 100644 --- a/module/plugins/hoster/MegavideoCom.py +++ b/pyload/plugins/hoster/MegavideoCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class MegavideoCom(DeadHoster): diff --git a/pyload/plugins/hoster/MovReelCom.py b/pyload/plugins/hoster/MovReelCom.py index cd1626f6f..39216a295 100644 --- a/pyload/plugins/hoster/MovReelCom.py +++ b/pyload/plugins/hoster/MovReelCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class MovReelCom(XFSHoster): diff --git a/pyload/plugins/hoster/MyfastfileCom.py b/pyload/plugins/hoster/MyfastfileCom.py index 14ed51ea7..cb1148389 100644 --- a/pyload/plugins/hoster/MyfastfileCom.py +++ b/pyload/plugins/hoster/MyfastfileCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import json_loads diff --git a/pyload/plugins/hoster/MyvideoDe.py b/pyload/plugins/hoster/MyvideoDe.py index 886896056..8fbd3a772 100644 --- a/pyload/plugins/hoster/MyvideoDe.py +++ b/pyload/plugins/hoster/MyvideoDe.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import html_unescape diff --git a/module/plugins/hoster/NahrajCz.py b/pyload/plugins/hoster/NahrajCz.py index 6b5699408..188e2b1e4 100644 --- a/module/plugins/hoster/NahrajCz.py +++ b/pyload/plugins/hoster/NahrajCz.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class NahrajCz(DeadHoster): diff --git a/pyload/plugins/hoster/NetloadIn.py b/pyload/plugins/hoster/NetloadIn.py index 5889611bb..b517fe455 100644 --- a/pyload/plugins/hoster/NetloadIn.py +++ b/pyload/plugins/hoster/NetloadIn.py @@ -5,7 +5,7 @@ import re from time import sleep, time from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.plugins.Plugin import chunks diff --git a/pyload/plugins/hoster/NosuploadCom.py b/pyload/plugins/hoster/NosuploadCom.py index b2255ca54..f70d64551 100644 --- a/pyload/plugins/hoster/NosuploadCom.py +++ b/pyload/plugins/hoster/NosuploadCom.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class NosuploadCom(XFSHoster): diff --git a/pyload/plugins/hoster/NovafileCom.py b/pyload/plugins/hoster/NovafileCom.py index 5c4dfddca..8d0677ec8 100644 --- a/pyload/plugins/hoster/NovafileCom.py +++ b/pyload/plugins/hoster/NovafileCom.py @@ -4,7 +4,7 @@ # http://novafile.com/vfun4z6o2cit # http://novafile.com/s6zrr5wemuz4 -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class NovafileCom(XFSHoster): diff --git a/module/plugins/hoster/NowVideoAt.py b/pyload/plugins/hoster/NowVideoAt.py index 53d782d06..e17e2e256 100644 --- a/module/plugins/hoster/NowVideoAt.py +++ b/pyload/plugins/hoster/NowVideoAt.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class NowVideoAt(SimpleHoster): diff --git a/pyload/plugins/hoster/OboomCom.py b/pyload/plugins/hoster/OboomCom.py index fcd73bf05..db2c0597b 100644 --- a/pyload/plugins/hoster/OboomCom.py +++ b/pyload/plugins/hoster/OboomCom.py @@ -6,7 +6,7 @@ import re from pyload.utils import json_loads -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.plugins.internal.CaptchaService import ReCaptcha diff --git a/module/plugins/hoster/OronCom.py b/pyload/plugins/hoster/OronCom.py index 7e8423ec9..22d6e65b3 100644 --- a/module/plugins/hoster/OronCom.py +++ b/pyload/plugins/hoster/OronCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class OronCom(DeadHoster): diff --git a/pyload/plugins/hoster/OverLoadMe.py b/pyload/plugins/hoster/OverLoadMe.py index 1cea276f9..3d07db489 100644 --- a/pyload/plugins/hoster/OverLoadMe.py +++ b/pyload/plugins/hoster/OverLoadMe.py @@ -6,7 +6,7 @@ from random import randrange from urllib import unquote from pyload.utils import json_loads -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import parseFileSize diff --git a/module/plugins/hoster/PandaplaNet.py b/pyload/plugins/hoster/PandaplaNet.py index 78a1ed177..f3124aaae 100644 --- a/module/plugins/hoster/PandaplaNet.py +++ b/pyload/plugins/hoster/PandaplaNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class PandaplaNet(DeadHoster): diff --git a/pyload/plugins/hoster/PornhostCom.py b/pyload/plugins/hoster/PornhostCom.py index d83b61c10..7fd337485 100644 --- a/pyload/plugins/hoster/PornhostCom.py +++ b/pyload/plugins/hoster/PornhostCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class PornhostCom(Hoster): diff --git a/pyload/plugins/hoster/PornhubCom.py b/pyload/plugins/hoster/PornhubCom.py index d6cbdfede..d89d24029 100644 --- a/pyload/plugins/hoster/PornhubCom.py +++ b/pyload/plugins/hoster/PornhubCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class PornhubCom(Hoster): diff --git a/pyload/plugins/hoster/PremiumTo.py b/pyload/plugins/hoster/PremiumTo.py index 680b0b25d..305b6d1d1 100644 --- a/pyload/plugins/hoster/PremiumTo.py +++ b/pyload/plugins/hoster/PremiumTo.py @@ -4,7 +4,7 @@ from os import remove from os.path import exists from urllib import quote -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import fs_encode diff --git a/pyload/plugins/hoster/PremiumizeMe.py b/pyload/plugins/hoster/PremiumizeMe.py index 9eab5888c..177edb1a0 100644 --- a/pyload/plugins/hoster/PremiumizeMe.py +++ b/pyload/plugins/hoster/PremiumizeMe.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from pyload.utils import json_loads -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class PremiumizeMe(Hoster): diff --git a/module/plugins/hoster/PrzeklejPl.py b/pyload/plugins/hoster/PrzeklejPl.py index 3a59a2c9e..5e6056adb 100644 --- a/module/plugins/hoster/PrzeklejPl.py +++ b/pyload/plugins/hoster/PrzeklejPl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class PrzeklejPl(DeadHoster): diff --git a/pyload/plugins/hoster/RPNetBiz.py b/pyload/plugins/hoster/RPNetBiz.py index 30c6773bd..b2a89f48a 100644 --- a/pyload/plugins/hoster/RPNetBiz.py +++ b/pyload/plugins/hoster/RPNetBiz.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import json_loads diff --git a/module/plugins/hoster/RapidfileshareNet.py b/pyload/plugins/hoster/RapidfileshareNet.py index ae53411c3..849ac2b68 100644 --- a/module/plugins/hoster/RapidfileshareNet.py +++ b/pyload/plugins/hoster/RapidfileshareNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class RapidfileshareNet(XFSHoster): diff --git a/pyload/plugins/hoster/RapidshareCom.py b/pyload/plugins/hoster/RapidshareCom.py index 4b8633fef..97823ba96 100644 --- a/pyload/plugins/hoster/RapidshareCom.py +++ b/pyload/plugins/hoster/RapidshareCom.py @@ -3,7 +3,7 @@ import re from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster def getInfo(urls): diff --git a/pyload/plugins/hoster/RarefileNet.py b/pyload/plugins/hoster/RarefileNet.py index cd60ec65e..fb54f6431 100644 --- a/pyload/plugins/hoster/RarefileNet.py +++ b/pyload/plugins/hoster/RarefileNet.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo from pyload.utils import html_unescape diff --git a/pyload/plugins/hoster/RealdebridCom.py b/pyload/plugins/hoster/RealdebridCom.py index f839dc613..2ca9970e0 100644 --- a/pyload/plugins/hoster/RealdebridCom.py +++ b/pyload/plugins/hoster/RealdebridCom.py @@ -7,7 +7,7 @@ from urllib import quote, unquote from time import time from pyload.utils import json_loads -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import parseFileSize diff --git a/pyload/plugins/hoster/RedtubeCom.py b/pyload/plugins/hoster/RedtubeCom.py index 50c6ba9e3..b1272f68d 100644 --- a/pyload/plugins/hoster/RedtubeCom.py +++ b/pyload/plugins/hoster/RedtubeCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import html_unescape diff --git a/pyload/plugins/hoster/RehostTo.py b/pyload/plugins/hoster/RehostTo.py index 08c43ad16..d9855c796 100644 --- a/pyload/plugins/hoster/RehostTo.py +++ b/pyload/plugins/hoster/RehostTo.py @@ -2,7 +2,7 @@ from urllib import quote, unquote -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class RehostTo(Hoster): diff --git a/pyload/plugins/hoster/RyushareCom.py b/pyload/plugins/hoster/RyushareCom.py index f41e4bfbf..ab6bf1017 100644 --- a/pyload/plugins/hoster/RyushareCom.py +++ b/pyload/plugins/hoster/RyushareCom.py @@ -5,7 +5,7 @@ import re -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo from pyload.plugins.internal.CaptchaService import SolveMedia diff --git a/pyload/plugins/hoster/SecureUploadEu.py b/pyload/plugins/hoster/SecureUploadEu.py index 64e6456a9..6939e4f6d 100644 --- a/pyload/plugins/hoster/SecureUploadEu.py +++ b/pyload/plugins/hoster/SecureUploadEu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class SecureUploadEu(XFSHoster): diff --git a/pyload/plugins/hoster/SendmywayCom.py b/pyload/plugins/hoster/SendmywayCom.py index 4254922fc..cb82fb19d 100644 --- a/pyload/plugins/hoster/SendmywayCom.py +++ b/pyload/plugins/hoster/SendmywayCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class SendmywayCom(XFSHoster): diff --git a/pyload/plugins/hoster/ShareonlineBiz.py b/pyload/plugins/hoster/ShareonlineBiz.py index 73d598cb9..0769cfe17 100644 --- a/pyload/plugins/hoster/ShareonlineBiz.py +++ b/pyload/plugins/hoster/ShareonlineBiz.py @@ -5,7 +5,7 @@ import re from time import time from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.plugins.Plugin import chunks from pyload.plugins.internal.CaptchaService import ReCaptcha diff --git a/pyload/plugins/hoster/ShareplaceCom.py b/pyload/plugins/hoster/ShareplaceCom.py index 60d93698a..6e11de05c 100644 --- a/pyload/plugins/hoster/ShareplaceCom.py +++ b/pyload/plugins/hoster/ShareplaceCom.py @@ -4,7 +4,7 @@ import re from urllib import unquote -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class ShareplaceCom(Hoster): diff --git a/module/plugins/hoster/SharingmatrixCom.py b/pyload/plugins/hoster/SharingmatrixCom.py index fa08a4a8f..7459c12b6 100644 --- a/module/plugins/hoster/SharingmatrixCom.py +++ b/pyload/plugins/hoster/SharingmatrixCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class SharingmatrixCom(DeadHoster): diff --git a/pyload/plugins/hoster/SimplyPremiumCom.py b/pyload/plugins/hoster/SimplyPremiumCom.py index 0840bc8a2..bb431a5dd 100644 --- a/pyload/plugins/hoster/SimplyPremiumCom.py +++ b/pyload/plugins/hoster/SimplyPremiumCom.py @@ -4,7 +4,7 @@ import re from datetime import datetime, timedelta -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight diff --git a/pyload/plugins/hoster/SimplydebridCom.py b/pyload/plugins/hoster/SimplydebridCom.py index f34f15ab2..5092be32a 100644 --- a/pyload/plugins/hoster/SimplydebridCom.py +++ b/pyload/plugins/hoster/SimplydebridCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class SimplydebridCom(Hoster): diff --git a/pyload/plugins/hoster/SockshareCom.py b/pyload/plugins/hoster/SockshareCom.py index aabb8dcd1..d28041893 100644 --- a/pyload/plugins/hoster/SockshareCom.py +++ b/pyload/plugins/hoster/SockshareCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class SockshareCom(DeadHoster): diff --git a/pyload/plugins/hoster/SoundcloudCom.py b/pyload/plugins/hoster/SoundcloudCom.py index 601ac774c..284f6ffbf 100644 --- a/pyload/plugins/hoster/SoundcloudCom.py +++ b/pyload/plugins/hoster/SoundcloudCom.py @@ -3,7 +3,7 @@ import pycurl import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class SoundcloudCom(Hoster): diff --git a/module/plugins/hoster/StorageTo.py b/pyload/plugins/hoster/StorageTo.py index bedc2934f..5ba0c145b 100644 --- a/module/plugins/hoster/StorageTo.py +++ b/pyload/plugins/hoster/StorageTo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class StorageTo(DeadHoster): diff --git a/pyload/plugins/hoster/StreamCz.py b/pyload/plugins/hoster/StreamCz.py index 1c1b7f204..c9d00863e 100644 --- a/pyload/plugins/hoster/StreamCz.py +++ b/pyload/plugins/hoster/StreamCz.py @@ -3,7 +3,7 @@ import re from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster def getInfo(urls): diff --git a/pyload/plugins/hoster/StreamcloudEu.py b/pyload/plugins/hoster/StreamcloudEu.py index 4f854a99d..5ae617095 100644 --- a/pyload/plugins/hoster/StreamcloudEu.py +++ b/pyload/plugins/hoster/StreamcloudEu.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class StreamcloudEu(XFSHoster): diff --git a/pyload/plugins/hoster/TusfilesNet.py b/pyload/plugins/hoster/TusfilesNet.py index 8c80455b4..3b4d7f92c 100644 --- a/pyload/plugins/hoster/TusfilesNet.py +++ b/pyload/plugins/hoster/TusfilesNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class TusfilesNet(XFSHoster): diff --git a/pyload/plugins/hoster/UnrestrictLi.py b/pyload/plugins/hoster/UnrestrictLi.py index e807cda98..583a9f4a9 100644 --- a/pyload/plugins/hoster/UnrestrictLi.py +++ b/pyload/plugins/hoster/UnrestrictLi.py @@ -5,7 +5,7 @@ import re from datetime import datetime, timedelta from pyload.utils import json_loads -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster def secondsToMidnight(gmt=0): diff --git a/module/plugins/hoster/UpleaCom.py b/pyload/plugins/hoster/UpleaCom.py index 409d7b4ca..7a7dd4870 100644 --- a/module/plugins/hoster/UpleaCom.py +++ b/pyload/plugins/hoster/UpleaCom.py @@ -4,7 +4,7 @@ import re from urlparse import urljoin -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class UpleaCom(XFSHoster): diff --git a/module/plugins/hoster/UploadboxCom.py b/pyload/plugins/hoster/UploadboxCom.py index 031c5f761..89a525c67 100644 --- a/module/plugins/hoster/UploadboxCom.py +++ b/pyload/plugins/hoster/UploadboxCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class UploadboxCom(DeadHoster): diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py index 17e3a4a0f..c39df66ea 100644 --- a/pyload/plugins/hoster/UploadedTo.py +++ b/pyload/plugins/hoster/UploadedTo.py @@ -9,7 +9,7 @@ import re from time import sleep from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.plugins.Plugin import chunks from pyload.plugins.internal.CaptchaService import ReCaptcha from pyload.utils import html_unescape, parseFileSize diff --git a/module/plugins/hoster/UploadhereCom.py b/pyload/plugins/hoster/UploadhereCom.py index 8da30be46..ba02ea07c 100644 --- a/module/plugins/hoster/UploadhereCom.py +++ b/pyload/plugins/hoster/UploadhereCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class UploadhereCom(DeadHoster): diff --git a/module/plugins/hoster/UploadkingCom.py b/pyload/plugins/hoster/UploadkingCom.py index 743e700eb..e9c536819 100644 --- a/module/plugins/hoster/UploadkingCom.py +++ b/pyload/plugins/hoster/UploadkingCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo +from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo class UploadkingCom(DeadHoster): diff --git a/pyload/plugins/hoster/UptoboxCom.py b/pyload/plugins/hoster/UptoboxCom.py index eeddb96b6..5aaa73286 100644 --- a/pyload/plugins/hoster/UptoboxCom.py +++ b/pyload/plugins/hoster/UptoboxCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class UptoboxCom(XFSHoster): diff --git a/pyload/plugins/hoster/VeehdCom.py b/pyload/plugins/hoster/VeehdCom.py index 440993a67..326d0a18e 100644 --- a/pyload/plugins/hoster/VeehdCom.py +++ b/pyload/plugins/hoster/VeehdCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class VeehdCom(Hoster): diff --git a/pyload/plugins/hoster/VidPlayNet.py b/pyload/plugins/hoster/VidPlayNet.py index 76af05edd..3a5198973 100644 --- a/pyload/plugins/hoster/VidPlayNet.py +++ b/pyload/plugins/hoster/VidPlayNet.py @@ -3,7 +3,7 @@ # Test links: # BigBuckBunny_320x180.mp4 - 61.7 Mb - http://vidplay.net/38lkev0h3jv0 -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo +from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class VidPlayNet(XFSHoster): diff --git a/pyload/plugins/hoster/WebshareCz.py b/pyload/plugins/hoster/WebshareCz.py index fcdfd55bf..bb41fbd26 100644 --- a/pyload/plugins/hoster/WebshareCz.py +++ b/pyload/plugins/hoster/WebshareCz.py @@ -2,7 +2,7 @@ import re -from module.network.RequestFactory import getURL +from pyload.network.RequestFactory import getURL from pyload.plugins.internal.SimpleHoster import SimpleHoster diff --git a/pyload/plugins/hoster/XHamsterCom.py b/pyload/plugins/hoster/XHamsterCom.py index acbcc2192..503022ec9 100644 --- a/pyload/plugins/hoster/XHamsterCom.py +++ b/pyload/plugins/hoster/XHamsterCom.py @@ -5,7 +5,7 @@ import re from urllib import unquote from pyload.utils import json_loads -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster def clean_json(json_expr): diff --git a/pyload/plugins/hoster/XVideosCom.py b/pyload/plugins/hoster/XVideosCom.py index 4fb288e51..9ab9e4484 100644 --- a/pyload/plugins/hoster/XVideosCom.py +++ b/pyload/plugins/hoster/XVideosCom.py @@ -4,7 +4,7 @@ import re from urllib import unquote -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class XVideosCom(Hoster): diff --git a/pyload/plugins/hoster/Xdcc.py b/pyload/plugins/hoster/Xdcc.py index dc0cbc27a..de750ee58 100644 --- a/pyload/plugins/hoster/Xdcc.py +++ b/pyload/plugins/hoster/Xdcc.py @@ -10,7 +10,7 @@ from os import makedirs from os.path import exists, join from select import select -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.utils import safe_join diff --git a/pyload/plugins/hoster/YoupornCom.py b/pyload/plugins/hoster/YoupornCom.py index 46c7ebfcb..6063e6816 100644 --- a/pyload/plugins/hoster/YoupornCom.py +++ b/pyload/plugins/hoster/YoupornCom.py @@ -2,7 +2,7 @@ import re -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class YoupornCom(Hoster): diff --git a/pyload/plugins/hoster/YourfilesTo.py b/pyload/plugins/hoster/YourfilesTo.py index 9e21144b7..7cb94a2df 100644 --- a/pyload/plugins/hoster/YourfilesTo.py +++ b/pyload/plugins/hoster/YourfilesTo.py @@ -4,7 +4,7 @@ import re from urllib import unquote -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class YourfilesTo(Hoster): diff --git a/pyload/plugins/hoster/YoutubeCom.py b/pyload/plugins/hoster/YoutubeCom.py index 0246d0997..7fdf848c1 100644 --- a/pyload/plugins/hoster/YoutubeCom.py +++ b/pyload/plugins/hoster/YoutubeCom.py @@ -6,7 +6,7 @@ import subprocess from urllib import unquote -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster from pyload.plugins.internal.SimpleHoster import replace_patterns from pyload.utils import html_unescape diff --git a/pyload/plugins/hoster/ZDF.py b/pyload/plugins/hoster/ZDF.py index 9d2ad446b..53939ae6c 100644 --- a/pyload/plugins/hoster/ZDF.py +++ b/pyload/plugins/hoster/ZDF.py @@ -4,7 +4,7 @@ import re from xml.etree.ElementTree import fromstring -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster # Based on zdfm by Roland Beermann (http://github.com/enkore/zdfm/) diff --git a/pyload/plugins/hoster/ZeveraCom.py b/pyload/plugins/hoster/ZeveraCom.py index 769602964..c0c10215d 100644 --- a/pyload/plugins/hoster/ZeveraCom.py +++ b/pyload/plugins/hoster/ZeveraCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Hoster import Hoster +from pyload.plugins.internal.Hoster import Hoster class ZeveraCom(Hoster): diff --git a/pyload/plugins/base/Account.py b/pyload/plugins/internal/Account.py index acb5c7d8b..e6895f119 100644 --- a/pyload/plugins/base/Account.py +++ b/pyload/plugins/internal/Account.py @@ -29,7 +29,7 @@ class Account(Base): #: after that time (in minutes) pyload will relogin the account - login_timeout = 10 * 60 + login_timeout = 10 * 60 #: after that time (in minutes) account data will be reloaded info_threshold = 10 * 60 diff --git a/pyload/plugins/base/Addon.py b/pyload/plugins/internal/Addon.py index 2dfeba83c..1aa51c69a 100644 --- a/pyload/plugins/base/Addon.py +++ b/pyload/plugins/internal/Addon.py @@ -24,15 +24,16 @@ class Addon(Base): """ Base class for addon plugins. """ - __name__ = "Addon" - __type__ = "addon" - __version__ = "0.2" + __name__ = "Addon" + __type__ = "addon" + __version__ = "0.03" - __config__ = [("name", "type", "desc", "default")] + __config__ = [] #: [("name", "type", "desc", "default")] __description__ = """Interface for addon""" - __authors__ = [("mkaay", "mkaay@mkaay.de"), - ("RaNaN", "RaNaN@pyload.org")] + __license__ = "GPLv3" + __authors__ = [("mkaay", "mkaay@mkaay.de"), + ("RaNaN", "RaNaN@pyload.org")] #: automatically register event listeners for functions, attribute will be deleted dont use it yourself @@ -50,7 +51,7 @@ class Addon(Base): Base.__init__(self, core) #: Provide information in dict here, usable by API `getInfo` - self.info = None + self.info = {} #: Callback of periodical job task, used by AddonManager self.cb = None @@ -86,7 +87,8 @@ class Addon(Base): def _periodical(self): try: - if self.isActivated(): self.periodical() + if self.isActivated(): + self.periodical() except Exception, e: self.logError(_("Error executing addon: %s") % e) if self.core.debug: @@ -98,14 +100,17 @@ class Addon(Base): def __repr__(self): return "<Addon %s>" % self.__name__ + def setup(self): """ more init stuff if needed """ pass + def unload(self): """ called when addon was deactivated """ pass + def isActivated(self): """ checks if addon is activated""" return self.config.getPlugin(self.__name__, "activated") @@ -115,36 +120,47 @@ class Addon(Base): def coreReady(self): pass + def coreExiting(self): pass + def downloadPreparing(self, pyfile): pass + def downloadFinished(self, pyfile): pass + def downloadFailed(self, pyfile): pass + def packageFinished(self, pypack): pass + def beforeReconnecting(self, ip): pass + def afterReconnecting(self, ip): pass + def periodical(self): pass + def newCaptchaTask(self, task): """ new captcha task for the plugin, it MUST set the handler and timeout or will be ignored """ pass + def captchaCorrect(self, task): pass + def captchaInvalid(self, task): pass diff --git a/pyload/plugins/base/Captcha.py b/pyload/plugins/internal/Captcha.py index 86b073710..b2fd980e2 100644 --- a/pyload/plugins/base/Captcha.py +++ b/pyload/plugins/internal/Captcha.py @@ -6,17 +6,19 @@ from pyload.plugins.Plugin import Plugin class Captcha(Plugin): - __name__ = "Captcha" - __version__ = "0.09" + __name__ = "Captcha" + __type__ = "captcha" + __version__ = "0.14" __description__ = """Base captcha service plugin""" - __authors__ = [("pyLoad Team", "admin@pyload.org")] + __license__ = "GPLv3" + __authors__ = [("pyLoad Team", "admin@pyload.org")] - key = None - KEY_PATTERN = None + key = None #: last key detected + def __init__(self, plugin): self.plugin = plugin @@ -27,8 +29,8 @@ class Captcha(Plugin): if hasattr(self.plugin, "html") and self.plugin.html: html = self.plugin.html else: - errmsg = "%s html missing" % self.__name__ - self.plugin.fail(errmsg) + errmsg = _("%s html not found") % self.__name__ + self.plugin.fail(errmsg) #@TODO: replace all plugin.fail(errmsg) with plugin.error(errmsg) in 0.4.10 raise TypeError(errmsg) m = re.search(self.KEY_PATTERN, html) diff --git a/pyload/plugins/base/Container.py b/pyload/plugins/internal/Container.py index 1bb2e204b..4bd6644f9 100644 --- a/pyload/plugins/base/Container.py +++ b/pyload/plugins/internal/Container.py @@ -5,7 +5,7 @@ import re from os import remove from os.path import basename, exists -from pyload.plugins.base.Crypter import Crypter +from pyload.plugins.internal.Crypter import Crypter from pyload.utils import safe_join @@ -14,7 +14,7 @@ class Container(Crypter): __type__ = "container" __version__ = "0.01" - __pattern__ = None + __pattern__ = r'^unmatchable$' __config__ = [] #: [("name", "type", "desc", "default")] __description__ = """Base container decrypter plugin""" diff --git a/pyload/plugins/base/Crypter.py b/pyload/plugins/internal/Crypter.py index 0a79300dd..ed92357a5 100644 --- a/pyload/plugins/base/Crypter.py +++ b/pyload/plugins/internal/Crypter.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from pyload.plugins.Plugin import Plugin -from module.utils import save_path +from pyload.utils import save_filename class Crypter(Plugin): @@ -9,7 +9,7 @@ class Crypter(Plugin): __type__ = "crypter" __version__ = "0.05" - __pattern__ = None + __pattern__ = r'^unmatchable$' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config['general']['folder_per_package'] ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] @@ -98,7 +98,7 @@ class Crypter(Plugin): if not folder: folder = name.replace("http://", "").replace(":", "").replace("/", "_").replace("\\", "_") - folder = save_path(folder) #@TODO: move to core code + folder = save_filename(folder) #@TODO: move to core code setFolder(folder) self.logDebug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) diff --git a/pyload/plugins/internal/DeadCrypter.py b/pyload/plugins/internal/DeadCrypter.py index 83aed6d43..ad99c6a13 100644 --- a/pyload/plugins/internal/DeadCrypter.py +++ b/pyload/plugins/internal/DeadCrypter.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Crypter import Crypter as _Crypter +from pyload.plugins.internal.Crypter import Crypter as _Crypter class DeadCrypter(_Crypter): diff --git a/pyload/plugins/internal/DeadHoster.py b/pyload/plugins/internal/DeadHoster.py index 76a7b5d80..3c59f1489 100644 --- a/pyload/plugins/internal/DeadHoster.py +++ b/pyload/plugins/internal/DeadHoster.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.Hoster import Hoster as _Hoster +from pyload.plugins.internal.Hoster import Hoster as _Hoster def create_getInfo(plugin): diff --git a/pyload/plugins/base/Hoster.py b/pyload/plugins/internal/Hoster.py index a89727ba7..ea225262e 100644 --- a/pyload/plugins/base/Hoster.py +++ b/pyload/plugins/internal/Hoster.py @@ -13,7 +13,7 @@ class Hoster(Plugin): __type__ = "hoster" __version__ = "0.02" - __pattern__ = None + __pattern__ = r'^unmatchable$' __config__ = [] #: [("name", "type", "desc", "default")] __description__ = """Base hoster plugin""" diff --git a/pyload/plugins/internal/MultiHoster.py b/pyload/plugins/internal/MultiHoster.py index 97cbb4591..88a9c888b 100644 --- a/pyload/plugins/internal/MultiHoster.py +++ b/pyload/plugins/internal/MultiHoster.py @@ -2,14 +2,14 @@ import re -from pyload.plugins.base.Addon import Addon +from pyload.plugins.internal.Addon import Addon from pyload.utils import remove_chars class MultiHoster(Addon): __name__ = "MultiHoster" __type__ = "addon" - __version__ = "0.20" + __version__ = "0.20" __description__ = """Generic MultiHoster plugin""" __license__ = "GPLv3" diff --git a/pyload/plugins/base/OCR.py b/pyload/plugins/internal/OCR.py index c3a47e7ef..b5ee30cb7 100644 --- a/pyload/plugins/base/OCR.py +++ b/pyload/plugins/internal/OCR.py @@ -16,7 +16,7 @@ from os.path import abspath, join class OCR(object): __name__ = "OCR" __type__ = "ocr" - __version__ = "0.1" + __version__ = "0.01" __description__ = """OCR base plugin""" __license__ = "GPLv3" diff --git a/pyload/plugins/internal/SimpleCrypter.py b/pyload/plugins/internal/SimpleCrypter.py index 5f7f89bc2..251acd6b8 100644 --- a/pyload/plugins/internal/SimpleCrypter.py +++ b/pyload/plugins/internal/SimpleCrypter.py @@ -4,9 +4,9 @@ import re from urlparse import urlparse -from pyload.plugins.Crypter import Crypter -from module.plugins.Plugin import Fail -from module.plugins.internal.SimpleHoster import _error, _wait, parseFileInfo, replace_patterns, set_cookies +from pyload.plugins.internal.Crypter import Crypter +from pyload.plugins.Plugin import Fail +from pyload.plugins.internal.SimpleHoster import _error, _wait, parseFileInfo, replace_patterns, set_cookies from pyload.utils import fixup, html_unescape diff --git a/pyload/plugins/internal/SimpleHoster.py b/pyload/plugins/internal/SimpleHoster.py index dd3afdefd..ee8ef712b 100644 --- a/pyload/plugins/internal/SimpleHoster.py +++ b/pyload/plugins/internal/SimpleHoster.py @@ -9,8 +9,8 @@ from pycurl import FOLLOWLOCATION from pyload.network.CookieJar import CookieJar from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Hoster import Hoster -from module.plugins.Plugin import Fail +from pyload.plugins.internal.Hoster import Hoster +from pyload.plugins.Plugin import Fail from pyload.utils import fixup, html_unescape, parseFileSize diff --git a/pyload/plugins/internal/UpdateManager.py b/pyload/plugins/internal/UpdateManager.py index 3f5b34c45..f1312dda5 100644 --- a/pyload/plugins/internal/UpdateManager.py +++ b/pyload/plugins/internal/UpdateManager.py @@ -7,7 +7,7 @@ from operator import itemgetter from os import path, remove, stat from pyload.network.RequestFactory import getURL -from pyload.plugins.base.Addon import Expose, Addon, threaded +from pyload.plugins.internal.Addon import Expose, Addon, threaded from pyload.utils import safe_join diff --git a/module/plugins/internal/XFSAccount.py b/pyload/plugins/internal/XFSAccount.py index ba2c00ec9..0992a8c31 100644 --- a/module/plugins/internal/XFSAccount.py +++ b/pyload/plugins/internal/XFSAccount.py @@ -5,8 +5,8 @@ import re from time import gmtime, mktime, strptime from urlparse import urljoin -from module.plugins.Account import Account -from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies +from pyload.plugins.internal.Account import Account +from pyload.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies class XFSAccount(Account): diff --git a/module/plugins/internal/XFSCrypter.py b/pyload/plugins/internal/XFSCrypter.py index 62fd8c017..2de39f4bc 100644 --- a/module/plugins/internal/XFSCrypter.py +++ b/pyload/plugins/internal/XFSCrypter.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter +from pyload.plugins.internal.SimpleCrypter import SimpleCrypter class XFSCrypter(SimpleCrypter): diff --git a/module/plugins/internal/XFSHoster.py b/pyload/plugins/internal/XFSHoster.py index f54bb5e45..80ddda002 100644 --- a/module/plugins/internal/XFSHoster.py +++ b/pyload/plugins/internal/XFSHoster.py @@ -7,10 +7,10 @@ from time import sleep from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME -from module.plugins.hoster.UnrestrictLi import secondsToMidnight -from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.utils import html_unescape +from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight +from pyload.plugins.internal.CaptchaService import ReCaptcha, SolveMedia +from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from pyload.utils import html_unescape class XFSHoster(SimpleHoster): diff --git a/pyload/plugins/internal/XFSPAccount.py b/pyload/plugins/internal/XFSPAccount.py deleted file mode 100644 index edf6ad3cc..000000000 --- a/pyload/plugins/internal/XFSPAccount.py +++ /dev/null @@ -1,96 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from urlparse import urljoin -from time import mktime, strptime - -from pyload.plugins.base.Account import Account -from pyload.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies -from pyload.utils import parseFileSize - - -class XFSPAccount(Account): - __name__ = "XFSPAccount" - __type__ = "account" - __version__ = "0.09" - - __description__ = """XFileSharingPro base account plugin""" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), - ("Walter Purcaro", "vuolter@gmail.com")] - - - HOSTER_URL = None - - COOKIES = None #: or list of tuples [(domain, name, value)] - - VALID_UNTIL_PATTERN = r'>Premium.[Aa]ccount expire:.*?<b>(.+?)</b>' - TRAFFIC_LEFT_PATTERN = r'>Traffic available today:.*?<b>(?P<S>.+?)</b>' - LOGIN_FAIL_PATTERN = r'>(Incorrect Login or Password|Error<)' - # PREMIUM_PATTERN = r'>Renew premium<' - - - def loadAccountInfo(self, user, req): - html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True) - - validuntil = None - trafficleft = None - premium = None - - if hasattr(self, "PREMIUM_PATTERN"): - premium = True if re.search(self.PREMIUM_PATTERN, html) else False - - m = re.search(self.VALID_UNTIL_PATTERN, html) - if m: - expiredate = m.group(1) - self.logDebug("Expire date: " + expiredate) - - try: - validuntil = mktime(strptime(expiredate, "%d %B %Y")) - except Exception, e: - self.logError(e) - else: - if validuntil > mktime(gmtime()): - premium = True - trafficleft = -1 - else: - if premium is False: #: registered account type (not premium) - validuntil = -1 - premium = False - - try: - traffic = re.search(self.TRAFFIC_LEFT_PATTERN, html).groupdict() - trafficsize = traffic['S'] + traffic['U'] if 'U' in traffic else traffic['S'] - if "Unlimited" in trafficsize: - trafficleft = -1 - if premium is None: - premium = True - else: - trafficleft = parseFileSize(trafficsize) - except: - pass - - if premium is None: - premium = False - - return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} - - - def login(self, user, data, req): - set_cookies(req.cj, self.COOKIES) - - url = urljoin(self.HOSTER_URL, "login.html") - html = req.load(url, decode=True) - - action, inputs = parseHtmlForm('name="FL"', html) - if not inputs: - inputs = {'op': "login", - 'redirect': self.HOSTER_URL} - - inputs.update({'login': user, - 'password': data['password']}) - - html = req.load(self.HOSTER_URL, post=inputs, decode=True) - - if re.search(self.LOGIN_FAIL_PATTERN, html): - self.wrongPassword() diff --git a/pyload/plugins/internal/XFSPHoster.py b/pyload/plugins/internal/XFSPHoster.py deleted file mode 100644 index c3f8b6f41..000000000 --- a/pyload/plugins/internal/XFSPHoster.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo - - -class XFileSharingPro(XFSHoster): - __name__ = "XFileSharingPro" - __type__ = "hoster" - __version__ = "0.42" - - __pattern__ = r'^unmatchable$' - - __description__ = """XFileSharingPro dummy hoster plugin for hook""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - - - def _log(self, type, args): - msg = " | ".join([str(a).strip() for a in args if a]) - logger = getattr(self.log, type) - logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper()))) - - - def init(self): - super(XFileSharingPro, self).init() - - self.__pattern__ = self.core.pluginManager.hosterPlugins[self.__name__]['pattern'] - - self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group(1).lower() - self.HOSTER_NAME = "".join([str.capitalize() for str in self.HOSTER_DOMAIN.split('.')]) - - account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME) - - if account and account.canUse(): - self.account = account - elif self.account: - self.account.HOSTER_DOMAIN = self.HOSTER_DOMAIN - else: - return - - self.user, data = self.account.selectAccount() - self.req = self.account.getAccountRequest(self.user) - self.premium = self.account.isPremium(self.user) - - - def setup(self): - self.chunkLimit = 1 - self.resumeDownload = self.premium - self.multiDL = True - - -getInfo = create_getInfo(XFileSharingPro) diff --git a/pyload/plugins/ocr/GigasizeCom.py b/pyload/plugins/ocr/GigasizeCom.py index 01b50be54..e1f6e8753 100644 --- a/pyload/plugins/ocr/GigasizeCom.py +++ b/pyload/plugins/ocr/GigasizeCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.OCR import OCR +from pyload.plugins.internal.OCR import OCR class GigasizeCom(OCR): diff --git a/pyload/plugins/ocr/LinksaveIn.py b/pyload/plugins/ocr/LinksaveIn.py index 1bde857be..a9171ac7c 100644 --- a/pyload/plugins/ocr/LinksaveIn.py +++ b/pyload/plugins/ocr/LinksaveIn.py @@ -9,7 +9,7 @@ from glob import glob from os import sep from os.path import abspath, dirname -from pyload.plugins.base.OCR import OCR +from pyload.plugins.internal.OCR import OCR class LinksaveIn(OCR): diff --git a/pyload/plugins/ocr/NetloadIn.py b/pyload/plugins/ocr/NetloadIn.py index 86916dd72..79a88c27a 100644 --- a/pyload/plugins/ocr/NetloadIn.py +++ b/pyload/plugins/ocr/NetloadIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.OCR import OCR +from pyload.plugins.internal.OCR import OCR class NetloadIn(OCR): diff --git a/pyload/plugins/ocr/ShareonlineBiz.py b/pyload/plugins/ocr/ShareonlineBiz.py index 04ffeaf26..5263f8316 100644 --- a/pyload/plugins/ocr/ShareonlineBiz.py +++ b/pyload/plugins/ocr/ShareonlineBiz.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.plugins.base.OCR import OCR +from pyload.plugins.internal.OCR import OCR class ShareonlineBiz(OCR): |