diff options
Diffstat (limited to 'module/plugins/accounts')
82 files changed, 173 insertions, 136 deletions
diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py index c830f0c09..7fc11e343 100644 --- a/module/plugins/accounts/AlldebridCom.py +++ b/module/plugins/accounts/AlldebridCom.py @@ -7,7 +7,7 @@ from time import time from BeautifulSoup import BeautifulSoup -from module.plugins.Account import Account +from pyload.plugin.Account import Account class AlldebridCom(Account): diff --git a/module/plugins/accounts/BillionuploadsCom.py b/module/plugins/accounts/BillionuploadsCom.py index 11af36591..a3325c427 100644 --- a/module/plugins/accounts/BillionuploadsCom.py +++ b/module/plugins/accounts/BillionuploadsCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class BillionuploadsCom(XFSAccount): diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py index 412aae534..4774b9062 100644 --- a/module/plugins/accounts/BitshareCom.py +++ b/module/plugins/accounts/BitshareCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account +from pyload.plugin.Account import Account class BitshareCom(Account): @@ -10,7 +10,7 @@ class BitshareCom(Account): __description__ = """Bitshare account plugin""" __license__ = "GPLv3" - __authors__ = [("Paul King", None)] + __authors__ = [("Paul King", "")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/CatShareNet.py b/module/plugins/accounts/CatShareNet.py index ec4d706ae..a604ebff1 100644 --- a/module/plugins/accounts/CatShareNet.py +++ b/module/plugins/accounts/CatShareNet.py @@ -4,7 +4,7 @@ import re from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class CatShareNet(Account): @@ -14,7 +14,7 @@ class CatShareNet(Account): __description__ = """CatShareNet account plugin""" __license__ = "GPLv3" - __authors__ = [("prOq", None)] + __authors__ = [("prOq", "")] PREMIUM_PATTERN = r'<a href="/premium">Konto:[\s\n]*Premium' diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py index a9e2274a2..21503f625 100644 --- a/module/plugins/accounts/CramitIn.py +++ b/module/plugins/accounts/CramitIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class CramitIn(XFSAccount): diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py index 202a88e25..dfe78c21c 100644 --- a/module/plugins/accounts/CzshareCom.py +++ b/module/plugins/accounts/CzshareCom.py @@ -3,7 +3,7 @@ from time import mktime, strptime import re -from module.plugins.Account import Account +from pyload.plugin.Account import Account class CzshareCom(Account): diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py index 50f9aea27..de97f6e64 100644 --- a/module/plugins/accounts/DebridItaliaCom.py +++ b/module/plugins/accounts/DebridItaliaCom.py @@ -4,7 +4,7 @@ import re from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class DebridItaliaCom(Account): @@ -22,14 +22,14 @@ class DebridItaliaCom(Account): def loadAccountInfo(self, user, req): - info = {"premium": False, "validuntil": None, "trafficleft": None} + info = {'premium': False, 'validuntil': None, 'trafficleft': None} html = req.load("http://debriditalia.com/") if 'Account premium not activated' not in html: m = re.search(self.WALID_UNTIL_PATTERN, html) if m: validuntil = mktime(strptime(m.group(1), "%d/%m/%Y %H:%M")) - info = {"premium": True, "validuntil": validuntil, "trafficleft": -1} + info = {'premium': True, 'validuntil': validuntil, 'trafficleft': -1} else: self.logError(_("Unable to retrieve account information")) diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py index dfe430276..b3e896d31 100644 --- a/module/plugins/accounts/DepositfilesCom.py +++ b/module/plugins/accounts/DepositfilesCom.py @@ -4,7 +4,7 @@ import re from time import strptime, mktime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class DepositfilesCom(Account): diff --git a/module/plugins/accounts/DropboxCom.py b/module/plugins/accounts/DropboxCom.py new file mode 100644 index 000000000..bcaa24b8e --- /dev/null +++ b/module/plugins/accounts/DropboxCom.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- + +import re + +from pyload.plugin.internal.SimpleHoster import SimpleHoster, create_getInfo + + +class DropboxCom(SimpleHoster): + __name__ = "DropboxCom" + __type__ = "hoster" + __version__ = "0.04" + + __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+' + + __description__ = """Dropbox.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("zapp-brannigan", "fuerst.reinje@web.de")] + + + NAME_PATTERN = r'<title>Dropbox - (?P<N>.+?)<' + SIZE_PATTERN = r' · (?P<S>[\d.,]+) (?P<U>[\w^_]+)' + + OFFLINE_PATTERN = r'<title>Dropbox - (404|Shared link error)<' + + COOKIES = [("dropbox.com", "lang", "en")] + + + def setup(self): + self.multiDL = True + self.chunkLimit = 1 + self.resumeDownload = True + + + def handleFree(self, pyfile): + self.download(pyfile.url, get={'dl': "1"}) + + +getInfo = create_getInfo(DropboxCom) diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 93d3e2c19..c7d717474 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class EasybytezCom(XFSAccount): diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py index f92a4e821..b37fc68fa 100644 --- a/module/plugins/accounts/EuroshareEu.py +++ b/module/plugins/accounts/EuroshareEu.py @@ -3,7 +3,7 @@ from time import mktime, strptime import re -from module.plugins.Account import Account +from pyload.plugin.Account import Account class EuroshareEu(Account): diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py index 51be3880f..69f78c3d9 100644 --- a/module/plugins/accounts/FastixRu.py +++ b/module/plugins/accounts/FastixRu.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class FastixRu(Account): diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py index d6e94f2e3..8fe98438b 100644 --- a/module/plugins/accounts/FastshareCz.py +++ b/module/plugins/accounts/FastshareCz.py @@ -2,7 +2,8 @@ import re -from module.plugins.Account import Account +from pyload.plugin.Account import Account +from pyload.utils import parseFileSize class FastshareCz(Account): diff --git a/module/plugins/accounts/File4SafeCom.py b/module/plugins/accounts/File4SafeCom.py index 50fe1aac8..c48956d38 100644 --- a/module/plugins/accounts/File4SafeCom.py +++ b/module/plugins/accounts/File4SafeCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class File4SafeCom(XFSAccount): diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py index c12d99d6a..02b923519 100644 --- a/module/plugins/accounts/FileParadoxIn.py +++ b/module/plugins/accounts/FileParadoxIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class FileParadoxIn(XFSAccount): diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py index 8ca55b1bc..6d2dcb92a 100644 --- a/module/plugins/accounts/FilecloudIo.py +++ b/module/plugins/accounts/FilecloudIo.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class FilecloudIo(Account): diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py index 426d572db..3395b3f90 100644 --- a/module/plugins/accounts/FilefactoryCom.py +++ b/module/plugins/accounts/FilefactoryCom.py @@ -5,7 +5,7 @@ from time import mktime, strptime from pycurl import REFERER -from module.plugins.Account import Account +from pyload.plugin.Account import Account class FilefactoryCom(Account): diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py index 9f7474207..2c476bffb 100644 --- a/module/plugins/accounts/FilejungleCom.py +++ b/module/plugins/accounts/FilejungleCom.py @@ -3,7 +3,7 @@ import re from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class FilejungleCom(Account): diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py index 7c743f56a..36a11e411 100644 --- a/module/plugins/accounts/FileomCom.py +++ b/module/plugins/accounts/FileomCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class FileomCom(XFSAccount): diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py index 4067445af..f3cc42367 100644 --- a/module/plugins/accounts/FilerNet.py +++ b/module/plugins/accounts/FilerNet.py @@ -3,7 +3,7 @@ import re import time -from module.plugins.Account import Account +from pyload.plugin.Account import Account class FilerNet(Account): diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py index 4c6755293..1d9f8744b 100644 --- a/module/plugins/accounts/FilerioCom.py +++ b/module/plugins/accounts/FilerioCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class FilerioCom(XFSAccount): diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py index 15926589e..e6afd0168 100644 --- a/module/plugins/accounts/FilesMailRu.py +++ b/module/plugins/accounts/FilesMailRu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account +from pyload.plugin.Account import Account class FilesMailRu(Account): diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 1cf2a3a3c..9aab88d2b 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -2,8 +2,8 @@ from time import mktime, strptime -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class FileserveCom(Account): diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py index 2777a142a..127f9d58a 100644 --- a/module/plugins/accounts/FourSharedCom.py +++ b/module/plugins/accounts/FourSharedCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account +from pyload.plugin.Account import Account +from pyload.utils import json_loads class FourSharedCom(Account): diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 83f4a9a84..9c61ac513 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -4,7 +4,7 @@ import re from time import strptime, mktime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class FreakshareCom(Account): diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index 14b9f1e9a..dcd9d34cf 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class FreeWayMe(Account): diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 66d912958..282a17751 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -4,7 +4,7 @@ import re from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class FshareVn(Account): diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py index f978d2fa0..67cde2cdd 100644 --- a/module/plugins/accounts/Ftp.py +++ b/module/plugins/accounts/Ftp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account +from pyload.plugin.Account import Account class Ftp(Account): @@ -13,5 +13,5 @@ class Ftp(Account): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - info_threshold = 1000000 - login_timeout = 1000000 + login_timeout = -1 #: Unlimited + info_threshold = -1 #: Unlimited diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index e559b28e1..94467b375 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -3,7 +3,7 @@ import re import time -from module.plugins.Account import Account +from pyload.plugin.Account import Account class HellshareCz(Account): diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py index 07e46eb07..2571ef712 100644 --- a/module/plugins/accounts/Http.py +++ b/module/plugins/accounts/Http.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account +from pyload.plugin.Account import Account class Http(Account): @@ -13,5 +13,5 @@ class Http(Account): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - info_threshold = 1000000 - login_timeout = 1000000 + login_timeout = -1 #: Unlimited + info_threshold = -1 #: Unlimited diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py index 5da3bbc37..eb383fb17 100644 --- a/module/plugins/accounts/HugefilesNet.py +++ b/module/plugins/accounts/HugefilesNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class HugefilesNet(XFSAccount): diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py index 319a3feee..72185a4bb 100644 --- a/module/plugins/accounts/HundredEightyUploadCom.py +++ b/module/plugins/accounts/HundredEightyUploadCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class HundredEightyUploadCom(XFSAccount): diff --git a/module/plugins/accounts/JunocloudMe.py b/module/plugins/accounts/JunocloudMe.py index b0fc160f3..0ffa92eb6 100644 --- a/module/plugins/accounts/JunocloudMe.py +++ b/module/plugins/accounts/JunocloudMe.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class JunocloudMe(XFSAccount): diff --git a/module/plugins/accounts/Keep2ShareCc.py b/module/plugins/accounts/Keep2ShareCc.py index 9f28799a2..7ed15dc62 100644 --- a/module/plugins/accounts/Keep2ShareCc.py +++ b/module/plugins/accounts/Keep2ShareCc.py @@ -4,30 +4,29 @@ import re from time import gmtime, mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account -class Keep2ShareCc(Account): - __name__ = "Keep2ShareCc" +class Keep2shareCc(Account): + __name__ = "Keep2shareCc" __type__ = "account" - __version__ = "0.05" + __version__ = "0.02" - __description__ = """Keep2Share.cc account plugin""" + __description__ = """Keep2share.cc account plugin""" __license__ = "GPLv3" - __authors__ = [("aeronaut", "aeronaut@pianoguy.de"), - ("Walter Purcaro", "vuolter@gmail.com")] + __authors__ = [("aeronaut", "aeronaut@pianoguy.de")] - VALID_UNTIL_PATTERN = r'Premium expires:\s*<b>(.+?)<' - TRAFFIC_LEFT_PATTERN = r'Available traffic \(today\):\s*<b><a href="/user/statistic.html">(.+?)<' + VALID_UNTIL_PATTERN = r'Premium expires: <b>(.+?)</b>' + TRAFFIC_LEFT_PATTERN = r'Available traffic \(today\):<b><a href="/user/statistic.html">(.+?)</a>' LOGIN_FAIL_PATTERN = r'Please fix the following input errors' def loadAccountInfo(self, user, req): validuntil = None - trafficleft = -1 - premium = False + trafficleft = None + premium = None html = req.load("http://keep2share.cc/site/profile.html", decode=True) @@ -36,26 +35,26 @@ class Keep2ShareCc(Account): expiredate = m.group(1).strip() self.logDebug("Expire date: " + expiredate) - if expiredate == "LifeTime": - premium = True - validuntil = -1 - else: - try: - validuntil = mktime(strptime(expiredate, "%Y.%m.%d")) + try: + validuntil = mktime(strptime(expiredate, "%Y.%m.%d")) - except Exception, e: - self.logError(e) + except Exception, e: + self.logError(e) + else: + if validuntil > mktime(gmtime()): + premium = True else: - premium = True if validuntil > mktime(gmtime()) else False + premium = False + validuntil = None - m = re.search(self.TRAFFIC_LEFT_PATTERN, html) - if m: - try: - trafficleft = self.parseTraffic(m.group(1)) + m = re.search(self.TRAFFIC_LEFT_PATTERN, html) + if m: + try: + trafficleft = self.parseTraffic(m.group(1)) - except Exception, e: - self.logError(e) + except Exception, e: + self.logError(e) return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} @@ -64,11 +63,7 @@ class Keep2ShareCc(Account): req.cj.setCookie("keep2share.cc", "lang", "en") html = req.load("http://keep2share.cc/login.html", - post={'LoginForm[username]' : user, - 'LoginForm[password]' : data['password'], - 'LoginForm[rememberMe]': 1, - 'yt0' : ""}, - decode=True) + post={'LoginForm[username]': user, 'LoginForm[password]': data['password']}) if re.search(self.LOGIN_FAIL_PATTERN, html): self.wrongPassword() diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py index 7f973d2d3..d0f08d0bb 100644 --- a/module/plugins/accounts/LetitbitNet.py +++ b/module/plugins/accounts/LetitbitNet.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account -# from module.common.json_layer import json_loads, json_dumps +from pyload.plugin.Account import Account +# from pyload.utils import json_loads, json_dumps class LetitbitNet(Account): diff --git a/module/plugins/accounts/LinestorageCom.py b/module/plugins/accounts/LinestorageCom.py index a48d5beb9..7a5d63a47 100644 --- a/module/plugins/accounts/LinestorageCom.py +++ b/module/plugins/accounts/LinestorageCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class LinestorageCom(XFSAccount): diff --git a/module/plugins/accounts/LinksnappyCom.py b/module/plugins/accounts/LinksnappyCom.py index 97e368285..0b1176ee9 100644 --- a/module/plugins/accounts/LinksnappyCom.py +++ b/module/plugins/accounts/LinksnappyCom.py @@ -2,8 +2,8 @@ from hashlib import md5 -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class LinksnappyCom(Account): diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py index a082b97af..c2e64bcc7 100644 --- a/module/plugins/accounts/MegaDebridEu.py +++ b/module/plugins/accounts/MegaDebridEu.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class MegaDebridEu(Account): diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py index b229fe47d..5596fd623 100644 --- a/module/plugins/accounts/MegaRapidCz.py +++ b/module/plugins/accounts/MegaRapidCz.py @@ -3,7 +3,7 @@ import re from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class MegaRapidCz(Account): diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py index 127ebadc8..53b854f65 100644 --- a/module/plugins/accounts/MegasharesCom.py +++ b/module/plugins/accounts/MegasharesCom.py @@ -3,7 +3,7 @@ import re from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class MegasharesCom(Account): diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py index 6128cddc8..4d2855de1 100644 --- a/module/plugins/accounts/MovReelCom.py +++ b/module/plugins/accounts/MovReelCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class MovReelCom(XFSAccount): diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py index 0ac764ee1..9b4f4447b 100644 --- a/module/plugins/accounts/MultishareCz.py +++ b/module/plugins/accounts/MultishareCz.py @@ -2,7 +2,7 @@ import re -from module.plugins.Account import Account +from pyload.plugin.Account import Account class MultishareCz(Account): diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py index 4c75b27f0..838a1eefd 100644 --- a/module/plugins/accounts/MyfastfileCom.py +++ b/module/plugins/accounts/MyfastfileCom.py @@ -2,8 +2,8 @@ from time import time -from module.common.json_layer import json_loads -from module.plugins.Account import Account +from pyload.plugin.Account import Account +from pyload.utils import json_loads class MyfastfileCom(Account): diff --git a/module/plugins/accounts/NetloadIn.py b/module/plugins/accounts/NetloadIn.py index 1abd7fa84..68982e828 100644 --- a/module/plugins/accounts/NetloadIn.py +++ b/module/plugins/accounts/NetloadIn.py @@ -3,7 +3,7 @@ import re from time import time -from module.plugins.Account import Account +from pyload.plugin.Account import Account class NetloadIn(Account): diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py index e523ee2f4..7fc8b49de 100644 --- a/module/plugins/accounts/NosuploadCom.py +++ b/module/plugins/accounts/NosuploadCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class NosuploadCom(XFSAccount): diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py index ab61bf0fc..71a7dc2dc 100644 --- a/module/plugins/accounts/NovafileCom.py +++ b/module/plugins/accounts/NovafileCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class NovafileCom(XFSAccount): diff --git a/module/plugins/accounts/NowVideoSx.py b/module/plugins/accounts/NowVideoSx.py index f44ae3865..8359e0410 100644 --- a/module/plugins/accounts/NowVideoSx.py +++ b/module/plugins/accounts/NowVideoSx.py @@ -4,7 +4,7 @@ import re from time import gmtime, mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class NowVideoSx(Account): diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py index 0acacbb2a..012fb42c3 100644 --- a/module/plugins/accounts/OboomCom.py +++ b/module/plugins/accounts/OboomCom.py @@ -4,8 +4,8 @@ import time from beaker.crypto.pbkdf2 import PBKDF2 -from module.common.json_layer import json_loads -from module.plugins.Account import Account +from pyload.utils import json_loads +from pyload.plugin.Account import Account class OboomCom(Account): diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 1fc8d994d..65ec841c4 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -6,7 +6,7 @@ from time import strptime, mktime from pycurl import REFERER -from module.plugins.Account import Account +from pyload.plugin.Account import Account class OneFichierCom(Account): diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py index d59944e63..d945dd7bd 100644 --- a/module/plugins/accounts/OverLoadMe.py +++ b/module/plugins/accounts/OverLoadMe.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class OverLoadMe(Account): diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py index c8ea2fa26..04bbc10d5 100644 --- a/module/plugins/accounts/PremiumTo.py +++ b/module/plugins/accounts/PremiumTo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account +from pyload.plugin.Account import Account class PremiumTo(Account): @@ -15,6 +15,7 @@ class PremiumTo(Account): ("stickell", "l.stickell@yahoo.it")] + def loadAccountInfo(self, user, req): traffic = req.load("http://premium.to/api/straffic.php", get={'username': self.username, 'password': self.password}) diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py index 7d061ec2d..3cd15ce23 100644 --- a/module/plugins/accounts/PremiumizeMe.py +++ b/module/plugins/accounts/PremiumizeMe.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account +from pyload.plugin.Account import Account -from module.common.json_layer import json_loads +from pyload.utils import json_loads class PremiumizeMe(Account): diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py index 16141d63e..2bcde1c9d 100644 --- a/module/plugins/accounts/QuickshareCz.py +++ b/module/plugins/accounts/QuickshareCz.py @@ -2,7 +2,7 @@ import re -from module.plugins.Account import Account +from pyload.plugin.Account import Account class QuickshareCz(Account): diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py index 829e54a46..e0b35b68c 100644 --- a/module/plugins/accounts/RPNetBiz.py +++ b/module/plugins/accounts/RPNetBiz.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class RPNetBiz(Account): diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py index c0dd7eaee..ec0bf8db4 100644 --- a/module/plugins/accounts/RapidfileshareNet.py +++ b/module/plugins/accounts/RapidfileshareNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class RapidfileshareNet(XFSAccount): diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py index 23d7aff53..7643f07d2 100644 --- a/module/plugins/accounts/RapidgatorNet.py +++ b/module/plugins/accounts/RapidgatorNet.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class RapidgatorNet(Account): diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py index 577a6c8f6..1dc93681c 100644 --- a/module/plugins/accounts/RarefileNet.py +++ b/module/plugins/accounts/RarefileNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class RarefileNet(XFSAccount): diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 41d8a0975..07ff70496 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -2,7 +2,7 @@ import xml.dom.minidom as dom -from module.plugins.Account import Account +from pyload.plugin.Account import Account class RealdebridCom(Account): diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index 04e71c9ad..d62e1918a 100644 --- a/module/plugins/accounts/RehostTo.py +++ b/module/plugins/accounts/RehostTo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account +from pyload.plugin.Account import Account class RehostTo(Account): diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py index 8c56ff20f..466d971f6 100644 --- a/module/plugins/accounts/RyushareCom.py +++ b/module/plugins/accounts/RyushareCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class RyushareCom(XFSAccount): diff --git a/module/plugins/accounts/SafesharingEu.py b/module/plugins/accounts/SafesharingEu.py index 2e58d33b3..f5cbf050e 100644 --- a/module/plugins/accounts/SafesharingEu.py +++ b/module/plugins/accounts/SafesharingEu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class SafesharingEu(XFSAccount): diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py index b335c94da..bb47bcba3 100644 --- a/module/plugins/accounts/SecureUploadEu.py +++ b/module/plugins/accounts/SecureUploadEu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class SecureUploadEu(XFSAccount): diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py index 4fcbe0b7a..d64658de3 100644 --- a/module/plugins/accounts/SendmywayCom.py +++ b/module/plugins/accounts/SendmywayCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class SendmywayCom(XFSAccount): diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 7e05e2e76..28bc3b9bc 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -2,7 +2,7 @@ import re -from module.plugins.Account import Account +from pyload.plugin.Account import Account class ShareonlineBiz(Account): diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py index 8caf600f9..298ad8d59 100644 --- a/module/plugins/accounts/SimplyPremiumCom.py +++ b/module/plugins/accounts/SimplyPremiumCom.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.common.json_layer import json_loads -from module.plugins.Account import Account +from pyload.utils import json_loads +from pyload.plugin.Account import Account class SimplyPremiumCom(Account): diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py index 29be2f73d..a826e44c7 100644 --- a/module/plugins/accounts/SimplydebridCom.py +++ b/module/plugins/accounts/SimplydebridCom.py @@ -2,7 +2,7 @@ from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class SimplydebridCom(Account): diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py index 882dbd2c3..ed8df3b77 100644 --- a/module/plugins/accounts/StahnuTo.py +++ b/module/plugins/accounts/StahnuTo.py @@ -2,7 +2,7 @@ import re -from module.plugins.Account import Account +from pyload.plugin.Account import Account class StahnuTo(Account): diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py index aa1eafcbd..3ac74fbd0 100644 --- a/module/plugins/accounts/StreamcloudEu.py +++ b/module/plugins/accounts/StreamcloudEu.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class StreamcloudEu(XFSAccount): diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index a857649eb..e3c07da2a 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -3,7 +3,7 @@ import re from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class TurbobitNet(Account): diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py index 279dfd00a..84e9ef9c6 100644 --- a/module/plugins/accounts/TusfilesNet.py +++ b/module/plugins/accounts/TusfilesNet.py @@ -4,7 +4,7 @@ import re from time import mktime, strptime, gmtime -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class TusfilesNet(XFSAccount): @@ -12,7 +12,7 @@ class TusfilesNet(XFSAccount): __type__ = "account" __version__ = "0.06" - __description__ = """ Tusfile.net account plugin """ + __description__ = """Tusfile.net account plugin""" __license__ = "GPLv3" __authors__ = [("guidobelix", "guidobelix@hotmail.it")] diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index 7236a4fa8..1570419b0 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -4,7 +4,7 @@ import re from urlparse import urljoin -from module.plugins.Account import Account +from pyload.plugin.Account import Account class UlozTo(Account): @@ -15,7 +15,7 @@ class UlozTo(Account): __description__ = """Uloz.to account plugin""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), - ("pulpe", None)] + ("pulpe", "")] TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a .*?title="[^"]*?GB = ([\d.]+) MB"' diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py index 6a8187234..d8d7789bb 100644 --- a/module/plugins/accounts/UnrestrictLi.py +++ b/module/plugins/accounts/UnrestrictLi.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account -from module.common.json_layer import json_loads +from pyload.plugin.Account import Account +from pyload.utils import json_loads class UnrestrictLi(Account): diff --git a/module/plugins/accounts/UploadcCom.py b/module/plugins/accounts/UploadcCom.py index d1e1a2ead..66863c456 100644 --- a/module/plugins/accounts/UploadcCom.py +++ b/module/plugins/accounts/UploadcCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class UploadcCom(XFSAccount): diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 4e5c8035b..3b0d957a5 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -3,7 +3,7 @@ import re from time import time -from module.plugins.Account import Account +from pyload.plugin.Account import Account class UploadedTo(Account): diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py index 714f5b0a6..c73fc30f5 100644 --- a/module/plugins/accounts/UploadheroCom.py +++ b/module/plugins/accounts/UploadheroCom.py @@ -4,7 +4,7 @@ import re import datetime import time -from module.plugins.Account import Account +from pyload.plugin.Account import Account class UploadheroCom(Account): diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py index c70d2ec11..6d54469e8 100644 --- a/module/plugins/accounts/UploadingCom.py +++ b/module/plugins/accounts/UploadingCom.py @@ -4,8 +4,8 @@ import re from time import time, strptime, mktime -from module.plugins.Account import Account -from module.plugins.internal.SimpleHoster import set_cookies +from pyload.plugin.Account import Account +from pyload.plugin.internal.SimpleHoster import set_cookies class UploadingCom(Account): diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py index c40dbd6e6..f7cb7a82e 100644 --- a/module/plugins/accounts/UptoboxCom.py +++ b/module/plugins/accounts/UptoboxCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class UptoboxCom(XFSAccount): diff --git a/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py index 5bfc24963..390520a00 100644 --- a/module/plugins/accounts/VidPlayNet.py +++ b/module/plugins/accounts/VidPlayNet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class VidPlayNet(XFSAccount): diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index 8dc7f3a30..216af5385 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSAccount import XFSAccount +from pyload.plugin.internal.XFSAccount import XFSAccount class XFileSharingPro(XFSAccount): diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py index 33602a2fe..150b0d931 100644 --- a/module/plugins/accounts/YibaishiwuCom.py +++ b/module/plugins/accounts/YibaishiwuCom.py @@ -2,7 +2,7 @@ import re -from module.plugins.Account import Account +from pyload.plugin.Account import Account class YibaishiwuCom(Account): diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py index d1585111a..db23170f3 100644 --- a/module/plugins/accounts/ZeveraCom.py +++ b/module/plugins/accounts/ZeveraCom.py @@ -2,7 +2,7 @@ from time import mktime, strptime -from module.plugins.Account import Account +from pyload.plugin.Account import Account class ZeveraCom(Account): diff --git a/module/plugins/accounts/__init__.py b/module/plugins/accounts/__init__.py index e69de29bb..40a96afc6 100644 --- a/module/plugins/accounts/__init__.py +++ b/module/plugins/accounts/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- |