From 5a0cd07a791f28db8433de775d12adaed3ee9548 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 6 Oct 2014 13:24:26 +0200 Subject: [LomafileCom] Premium support + updated patterns --- module/plugins/accounts/LomafileCom.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 module/plugins/accounts/LomafileCom.py (limited to 'module/plugins/accounts') diff --git a/module/plugins/accounts/LomafileCom.py b/module/plugins/accounts/LomafileCom.py new file mode 100644 index 000000000..feefdbf47 --- /dev/null +++ b/module/plugins/accounts/LomafileCom.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class LomafileCom(XFSPAccount): + __name__ = "LomafileCom" + __type__ = "account" + __version__ = "0.01" + + __description__ = """Lomafile.com account plugin""" + __author_name__ = "guidobelix" + __author_mail__ = "guidobelix@hotmail.it" + + + HOSTER_URL = "http://www.lomafile.com/" + + VALID_UNTIL_PATTERN = r'Premium account expire:([^<]+)' + TRAFFIC_LEFT_PATTERN = r'Traffic available today:(?P[^<]+)' -- cgit v1.2.3 From 7dee5afc46e69b38e1ad660b46db8427b64e961f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 13:15:05 +0200 Subject: [TusfilesNet] Now XFSPAccount plugin based --- module/plugins/accounts/TusfilesNet.py | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'module/plugins/accounts') diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py index d7cdbaebb..3de98564c 100644 --- a/module/plugins/accounts/TusfilesNet.py +++ b/module/plugins/accounts/TusfilesNet.py @@ -4,26 +4,28 @@ import re from time import mktime, strptime, gmtime -from module.plugins.Account import Account -from module.plugins.internal.SimpleHoster import parseHtmlForm +from module.plugins.internal.XFSPAccount import XFSPAccount from module.utils import parseFileSize -class TusfilesNet(Account): +class TusfilesNet(XFSPAccount): __name__ = "TusfilesNet" __type__ = "account" - __version__ = "0.01" + __version__ = "0.02" __description__ = """ Tusfile.net account plugin """ __author_name__ = "guidobelix" __author_mail__ = "guidobelix@hotmail.it" + + HOSTER_URL = "http://www.tusfiles.net/" + VALID_UNTIL_PATTERN = r'([^<]+)' TRAFFIC_LEFT_PATTERN = r'\n (?P[^<]+)' def loadAccountInfo(self, user, req): - html = req.load("http://www.tusfiles.net/?op=my_account", decode=True) + html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True) validuntil = None trafficleft = None @@ -54,16 +56,3 @@ class TusfilesNet(Account): trafficleft = parseFileSize(trafficleft) * 1024 return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} - - - def login(self, user, data, req): - html = req.load("http://www.tusfiles.net/login.html", decode=True) - action, inputs = parseHtmlForm('name="FL"', html) - inputs.update({'login': user, - 'password': data['password'], - 'redirect': "http://www.tusfiles.net/"}) - - html = req.load("http://www.tusfiles.net/", post=inputs, decode=True) - - if 'Incorrect Login or Password' in html or '>Error<' in html: - self.wrongPassword() -- cgit v1.2.3 From d4fd843a596cb822c89b9241fb2627330157e962 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 13:15:27 +0200 Subject: [EasybytezCom] Now XFSPAccount plugin based --- module/plugins/accounts/EasybytezCom.py | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'module/plugins/accounts') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 564549521..969c8b393 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -1,28 +1,28 @@ # -*- coding: utf-8 -*- import re + from time import mktime, strptime, gmtime -from module.plugins.Account import Account -from module.plugins.internal.SimpleHoster import parseHtmlForm +from module.plugins.internal.XFSPAccount import XFSPAccount from module.utils import parseFileSize -class EasybytezCom(Account): +class EasybytezCom(XFSPAccount): __name__ = "EasybytezCom" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __description__ = """EasyBytez.com account plugin""" __author_name__ = ("zoidberg", "guidobelix") __author_mail__ = ("zoidberg@mujmail.cz", "guidobelix@hotmail.it") - VALID_UNTIL_PATTERN = r'Premium account expire:([^<]+)' - TRAFFIC_LEFT_PATTERN = r'Traffic available today:(?P[^<]+)' + + HOSTER_URL = "http://www.easybytez.com/" def loadAccountInfo(self, user, req): - html = req.load("http://www.easybytez.com/?op=my_account", decode=True) + html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True) validuntil = None trafficleft = None @@ -54,16 +54,3 @@ class EasybytezCom(Account): trafficleft = parseFileSize(trafficleft) / 1024 return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} - - - def login(self, user, data, req): - html = req.load('http://www.easybytez.com/login.html', decode=True) - action, inputs = parseHtmlForm('name="FL"', html) - inputs.update({"login": user, - "password": data['password'], - "redirect": "http://www.easybytez.com/"}) - - html = req.load(action, post=inputs, decode=True) - - if 'Incorrect Login or Password' in html or '>Error<' in html: - self.wrongPassword() -- cgit v1.2.3 From e2103e995ccdb18bc961354566b9cb704553b18b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 13:17:14 +0200 Subject: Code cosmetics on some account plugins --- module/plugins/accounts/CramitIn.py | 3 ++- module/plugins/accounts/File4safeCom.py | 3 ++- module/plugins/accounts/FilerioCom.py | 3 ++- module/plugins/accounts/LomafileCom.py | 3 --- module/plugins/accounts/MovReelCom.py | 6 ++---- module/plugins/accounts/RarefileNet.py | 3 ++- module/plugins/accounts/RyushareCom.py | 3 ++- module/plugins/accounts/UptoboxCom.py | 3 ++- 8 files changed, 14 insertions(+), 13 deletions(-) (limited to 'module/plugins/accounts') diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py index f0cf2c6c7..da69bf926 100644 --- a/module/plugins/accounts/CramitIn.py +++ b/module/plugins/accounts/CramitIn.py @@ -12,4 +12,5 @@ class CramitIn(XFSPAccount): __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" - HOSTER_URL = "http://cramit.in/" + + HOSTER_URL = "http://www.cramit.in/" diff --git a/module/plugins/accounts/File4safeCom.py b/module/plugins/accounts/File4safeCom.py index 17a94195a..e8574b51e 100644 --- a/module/plugins/accounts/File4safeCom.py +++ b/module/plugins/accounts/File4safeCom.py @@ -12,7 +12,8 @@ class File4safeCom(XFSPAccount): __author_name__ = "stickell" __author_mail__ = "l.stickell@yahoo.it" - HOSTER_URL = "http://file4safe.com/" + + HOSTER_URL = "http://www.file4safe.com/" LOGIN_FAIL_PATTERN = r'input_login' PREMIUM_PATTERN = r'Extend Premium' diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py index 8b5c41fee..91521fd5f 100644 --- a/module/plugins/accounts/FilerioCom.py +++ b/module/plugins/accounts/FilerioCom.py @@ -12,4 +12,5 @@ class FilerioCom(XFSPAccount): __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" - HOSTER_URL = "http://filerio.in/" + + HOSTER_URL = "http://www.filerio.in/" diff --git a/module/plugins/accounts/LomafileCom.py b/module/plugins/accounts/LomafileCom.py index feefdbf47..379e567d5 100644 --- a/module/plugins/accounts/LomafileCom.py +++ b/module/plugins/accounts/LomafileCom.py @@ -14,6 +14,3 @@ class LomafileCom(XFSPAccount): HOSTER_URL = "http://www.lomafile.com/" - - VALID_UNTIL_PATTERN = r'Premium account expire:([^<]+)' - TRAFFIC_LEFT_PATTERN = r'Traffic available today:(?P[^<]+)' diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py index 1c2f3bbd4..f25ae7b4e 100644 --- a/module/plugins/accounts/MovReelCom.py +++ b/module/plugins/accounts/MovReelCom.py @@ -12,10 +12,8 @@ class MovReelCom(XFSPAccount): __author_name__ = "t4skforce" __author_mail__ = "t4skforce1337[AT]gmail[DOT]com" + login_timeout = 60 info_threshold = 30 - HOSTER_URL = "http://movreel.com/" - - TRAFFIC_LEFT_PATTERN = r'Traffic.*?([^<]+)' - LOGIN_FAIL_PATTERN = r']*>Incorrect Login or Password
' + HOSTER_URL = "http://www.movreel.com/" diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py index e1fa7878a..91125e507 100644 --- a/module/plugins/accounts/RarefileNet.py +++ b/module/plugins/accounts/RarefileNet.py @@ -12,4 +12,5 @@ class RarefileNet(XFSPAccount): __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" - HOSTER_URL = "http://rarefile.net/" + + HOSTER_URL = "http://www.rarefile.net/" diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py index e6f9d486d..2782fc0fd 100644 --- a/module/plugins/accounts/RyushareCom.py +++ b/module/plugins/accounts/RyushareCom.py @@ -12,7 +12,8 @@ class RyushareCom(XFSPAccount): __author_name__ = ("zoidberg", "trance4us") __author_mail__ = ("zoidberg@mujmail.cz", "") - HOSTER_URL = "http://ryushare.com/" + + HOSTER_URL = "http://www.ryushare.com/" def login(self, user, data, req): diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py index 2c5f79ea1..a50b7689e 100644 --- a/module/plugins/accounts/UptoboxCom.py +++ b/module/plugins/accounts/UptoboxCom.py @@ -12,6 +12,7 @@ class UptoboxCom(XFSPAccount): __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" - HOSTER_URL = "http://uptobox.com/" + + HOSTER_URL = "http://www.uptobox.com/" VALID_UNTIL_PATTERN = r'>Premium.[Aa]ccount expire: ([^<]+)' -- cgit v1.2.3 From b9445297f5ce02f4ecbec775c5eb1710493ab823 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 13:32:40 +0200 Subject: Bunch of account plugins XFSPAccount based --- module/plugins/accounts/BillionuploadsCom.py | 16 ++++++++++++++++ module/plugins/accounts/FileParadoxIn.py | 16 ++++++++++++++++ module/plugins/accounts/FileomCom.py | 16 ++++++++++++++++ module/plugins/accounts/HugefilesNet.py | 16 ++++++++++++++++ module/plugins/accounts/HundredEightyUploadCom.py | 16 ++++++++++++++++ module/plugins/accounts/NosuploadCom.py | 16 ++++++++++++++++ module/plugins/accounts/NovafileCom.py | 16 ++++++++++++++++ module/plugins/accounts/SecureUploadEu.py | 16 ++++++++++++++++ module/plugins/accounts/SendmywayCom.py | 16 ++++++++++++++++ module/plugins/accounts/StreamcloudEu.py | 16 ++++++++++++++++ module/plugins/accounts/VidPlayNet.py | 16 ++++++++++++++++ 11 files changed, 176 insertions(+) create mode 100644 module/plugins/accounts/BillionuploadsCom.py create mode 100644 module/plugins/accounts/FileParadoxIn.py create mode 100644 module/plugins/accounts/FileomCom.py create mode 100644 module/plugins/accounts/HugefilesNet.py create mode 100644 module/plugins/accounts/HundredEightyUploadCom.py create mode 100644 module/plugins/accounts/NosuploadCom.py create mode 100644 module/plugins/accounts/NovafileCom.py create mode 100644 module/plugins/accounts/SecureUploadEu.py create mode 100644 module/plugins/accounts/SendmywayCom.py create mode 100644 module/plugins/accounts/StreamcloudEu.py create mode 100644 module/plugins/accounts/VidPlayNet.py (limited to 'module/plugins/accounts') diff --git a/module/plugins/accounts/BillionuploadsCom.py b/module/plugins/accounts/BillionuploadsCom.py new file mode 100644 index 000000000..7a96a6525 --- /dev/null +++ b/module/plugins/accounts/BillionuploadsCom.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class BillionuploadsCom(XFSPAccount): + __name__ = "BillionuploadsCom" + __type__ = "account" + __version__ = "0.01" + + __description__ = """Billionuploads.com account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.billionuploads.com/" diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py new file mode 100644 index 000000000..a5544da68 --- /dev/null +++ b/module/plugins/accounts/FileParadoxIn.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class FileParadoxIn(XFSPAccount): + __name__ = "FileParadoxIn" + __type__ = "account" + __version__ = "0.01" + + __description__ = """FileParadox.in account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.fileparadox.in/" diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py new file mode 100644 index 000000000..3f4029a9f --- /dev/null +++ b/module/plugins/accounts/FileomCom.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class FileomCom(XFSPAccount): + __name__ = "FileomCom" + __type__ = "account" + __version__ = "0.01" + + __description__ = """Fileom.com account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.fileom.com/" diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py new file mode 100644 index 000000000..f9207683a --- /dev/null +++ b/module/plugins/accounts/HugefilesNet.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class HugefilesNet(XFSPAccount): + __name__ = "HugefilesNet" + __type__ = "account" + __version__ = "0.01" + + __description__ = """Hugefiles.net account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.hugefiles.net/" diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py new file mode 100644 index 000000000..536d8c9be --- /dev/null +++ b/module/plugins/accounts/HundredEightyUploadCom.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class HundredEightyUploadCom(XFSPAccount): + __name__ = "HundredEightyUploadCom" + __type__ = "account" + __version__ = "0.01" + + __description__ = """180upload.com account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.180upload.com/" diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py new file mode 100644 index 000000000..564bf5599 --- /dev/null +++ b/module/plugins/accounts/NosuploadCom.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class NosuploadCom(XFSPAccount): + __name__ = "NosuploadCom" + __type__ = "account" + __version__ = "0.01" + + __description__ = """Nosupload.com account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.nosupload.com/" diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py new file mode 100644 index 000000000..2dc1be607 --- /dev/null +++ b/module/plugins/accounts/NovafileCom.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class NovafileCom(XFSPAccount): + __name__ = "NovafileCom" + __type__ = "account" + __version__ = "0.01" + + __description__ = """Novafile.com account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.novafile.com/" diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py new file mode 100644 index 000000000..fe5af23ec --- /dev/null +++ b/module/plugins/accounts/SecureUploadEu.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class SecureUploadEu(XFSPAccount): + __name__ = "SecureUploadEu" + __type__ = "account" + __version__ = "0.01" + + __description__ = """SecureUpload.eu account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.secureupload.eu/" diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py new file mode 100644 index 000000000..3b46101d0 --- /dev/null +++ b/module/plugins/accounts/SendmywayCom.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class SendmywayCom(XFSPAccount): + __name__ = "SendmywayCom" + __type__ = "account" + __version__ = "0.01" + + __description__ = """Sendmyway.com account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.sendmyway.com/" diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py new file mode 100644 index 000000000..b50669afe --- /dev/null +++ b/module/plugins/accounts/StreamcloudEu.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class StreamcloudEu(XFSPAccount): + __name__ = "StreamcloudEu" + __type__ = "account" + __version__ = "0.01" + + __description__ = """Streamcloud.eu account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.streamcloud.eu/" diff --git a/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py new file mode 100644 index 000000000..044f4ac69 --- /dev/null +++ b/module/plugins/accounts/VidPlayNet.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class VidPlayNet(XFSPAccount): + __name__ = "VidPlayNet" + __type__ = "account" + __version__ = "0.01" + + __description__ = """VidPlay.net account plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + + HOSTER_URL = "http://www.vidplay.net/" -- cgit v1.2.3 From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 18:57:59 +0200 Subject: New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup --- module/plugins/accounts/AlldebridCom.py | 3 +-- module/plugins/accounts/BayfilesCom.py | 3 +-- module/plugins/accounts/BillionuploadsCom.py | 3 +-- module/plugins/accounts/BitshareCom.py | 3 +-- module/plugins/accounts/CramitIn.py | 3 +-- module/plugins/accounts/CzshareCom.py | 5 +++-- module/plugins/accounts/DebridItaliaCom.py | 4 ++-- module/plugins/accounts/DepositfilesCom.py | 5 +++-- module/plugins/accounts/EasybytezCom.py | 4 ++-- module/plugins/accounts/EuroshareEu.py | 3 +-- module/plugins/accounts/FastixRu.py | 3 +-- module/plugins/accounts/FastshareCz.py | 5 +++-- module/plugins/accounts/File4safeCom.py | 3 +-- module/plugins/accounts/FileParadoxIn.py | 3 +-- module/plugins/accounts/FilecloudIo.py | 4 ++-- module/plugins/accounts/FilefactoryCom.py | 5 +++-- module/plugins/accounts/FilejungleCom.py | 4 ++-- module/plugins/accounts/FileomCom.py | 3 +-- module/plugins/accounts/FilerNet.py | 4 ++-- module/plugins/accounts/FilerioCom.py | 3 +-- module/plugins/accounts/FilesMailRu.py | 3 +-- module/plugins/accounts/FileserveCom.py | 3 +-- module/plugins/accounts/FourSharedCom.py | 5 +++-- module/plugins/accounts/FreakshareCom.py | 3 +-- module/plugins/accounts/FreeWayMe.py | 3 +-- module/plugins/accounts/FshareVn.py | 5 +++-- module/plugins/accounts/Ftp.py | 3 +-- module/plugins/accounts/HellshareCz.py | 4 ++-- module/plugins/accounts/Http.py | 3 +-- module/plugins/accounts/HugefilesNet.py | 3 +-- module/plugins/accounts/HundredEightyUploadCom.py | 3 +-- module/plugins/accounts/LetitbitNet.py | 3 +-- module/plugins/accounts/LinksnappyCom.py | 3 +-- module/plugins/accounts/LomafileCom.py | 3 +-- module/plugins/accounts/MegaDebridEu.py | 4 ++-- module/plugins/accounts/MegasharesCom.py | 4 ++-- module/plugins/accounts/MovReelCom.py | 3 +-- module/plugins/accounts/MultishareCz.py | 4 ++-- module/plugins/accounts/MyfastfileCom.py | 4 ++-- module/plugins/accounts/NetloadIn.py | 4 ++-- module/plugins/accounts/NosuploadCom.py | 3 +-- module/plugins/accounts/NovafileCom.py | 3 +-- module/plugins/accounts/OboomCom.py | 3 +-- module/plugins/accounts/OneFichierCom.py | 4 ++-- module/plugins/accounts/OverLoadMe.py | 3 +-- module/plugins/accounts/PremiumTo.py | 7 +++++-- module/plugins/accounts/PremiumizeMe.py | 3 +-- module/plugins/accounts/QuickshareCz.py | 3 +-- module/plugins/accounts/RPNetBiz.py | 3 +-- module/plugins/accounts/RapidgatorNet.py | 4 ++-- module/plugins/accounts/RapidshareCom.py | 3 +-- module/plugins/accounts/RarefileNet.py | 3 +-- module/plugins/accounts/RealdebridCom.py | 3 +-- module/plugins/accounts/RehostTo.py | 3 +-- module/plugins/accounts/RyushareCom.py | 4 ++-- module/plugins/accounts/SecureUploadEu.py | 3 +-- module/plugins/accounts/SendmywayCom.py | 3 +-- module/plugins/accounts/ShareRapidCom.py | 5 +++-- module/plugins/accounts/ShareonlineBiz.py | 4 ++-- module/plugins/accounts/SimplyPremiumCom.py | 3 +-- module/plugins/accounts/SimplydebridCom.py | 3 +-- module/plugins/accounts/StahnuTo.py | 3 +-- module/plugins/accounts/StreamcloudEu.py | 3 +-- module/plugins/accounts/TurbobitNet.py | 3 +-- module/plugins/accounts/TusfilesNet.py | 3 +-- module/plugins/accounts/UlozTo.py | 5 +++-- module/plugins/accounts/UnrestrictLi.py | 3 +-- module/plugins/accounts/UploadedTo.py | 3 +-- module/plugins/accounts/UploadheroCom.py | 3 +-- module/plugins/accounts/UploadingCom.py | 3 +-- module/plugins/accounts/UptoboxCom.py | 3 +-- module/plugins/accounts/VidPlayNet.py | 3 +-- module/plugins/accounts/YibaishiwuCom.py | 4 ++-- module/plugins/accounts/ZeveraCom.py | 3 +-- 74 files changed, 110 insertions(+), 148 deletions(-) (limited to 'module/plugins/accounts') diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py index dbf4ad800..06469847e 100644 --- a/module/plugins/accounts/AlldebridCom.py +++ b/module/plugins/accounts/AlldebridCom.py @@ -17,8 +17,7 @@ class AlldebridCom(Account): __version__ = "0.22" __description__ = """AllDebrid.com account plugin""" - __author_name__ = "Andy Voigt" - __author_mail__ = "spamsales@online.de" + __authors__ = [("Andy Voigt", "spamsales@online.de")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/BayfilesCom.py b/module/plugins/accounts/BayfilesCom.py index 7c4708f7d..a678a3523 100644 --- a/module/plugins/accounts/BayfilesCom.py +++ b/module/plugins/accounts/BayfilesCom.py @@ -12,8 +12,7 @@ class BayfilesCom(Account): __version__ = "0.03" __description__ = """Bayfiles.com account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/BillionuploadsCom.py b/module/plugins/accounts/BillionuploadsCom.py index 7a96a6525..440c7889a 100644 --- a/module/plugins/accounts/BillionuploadsCom.py +++ b/module/plugins/accounts/BillionuploadsCom.py @@ -9,8 +9,7 @@ class BillionuploadsCom(XFSPAccount): __version__ = "0.01" __description__ = """Billionuploads.com account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.billionuploads.com/" diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py index 272bbeb6e..e5aef16b8 100644 --- a/module/plugins/accounts/BitshareCom.py +++ b/module/plugins/accounts/BitshareCom.py @@ -9,8 +9,7 @@ class BitshareCom(Account): __version__ = "0.12" __description__ = """Bitshare account plugin""" - __author_name__ = "Paul King" - __author_mail__ = None + __authors__ = [("Paul King", None)] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py index da69bf926..b84e7f8cc 100644 --- a/module/plugins/accounts/CramitIn.py +++ b/module/plugins/accounts/CramitIn.py @@ -9,8 +9,7 @@ class CramitIn(XFSPAccount): __version__ = "0.02" __description__ = """Cramit.in account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] HOSTER_URL = "http://www.cramit.in/" diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py index 6f2ee641e..ffe1c8285 100644 --- a/module/plugins/accounts/CzshareCom.py +++ b/module/plugins/accounts/CzshareCom.py @@ -12,8 +12,9 @@ class CzshareCom(Account): __version__ = "0.14" __description__ = """Czshare.com account plugin, now Sdilej.cz""" - __author_name__ = ("zoidberg", "stickell") - __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("stickell", "l.stickell@yahoo.it")] + CREDIT_LEFT_PATTERN = r'\s*([0-9 ,]+) (KiB|MiB|GiB)\s*([^<]*)\s*' diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py index bc0de31dc..c91a69945 100644 --- a/module/plugins/accounts/DebridItaliaCom.py +++ b/module/plugins/accounts/DebridItaliaCom.py @@ -12,8 +12,8 @@ class DebridItaliaCom(Account): __version__ = "0.1" __description__ = """Debriditalia.com account plugin""" - __author_name__ = "stickell" - __author_mail__ = "l.stickell@yahoo.it" + __authors__ = [("stickell", "l.stickell@yahoo.it")] + WALID_UNTIL_PATTERN = r"Premium valid till: (?P[^|]+) \|" diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py index 01f1906f4..50499c1b2 100644 --- a/module/plugins/accounts/DepositfilesCom.py +++ b/module/plugins/accounts/DepositfilesCom.py @@ -13,8 +13,9 @@ class DepositfilesCom(Account): __version__ = "0.3" __description__ = """Depositfiles.com account plugin""" - __author_name__ = ("mkaay", "stickell", "Walter Purcaro") - __author_mail__ = ("mkaay@mkaay.de", "l.stickell@yahoo.it", "vuolter@gmail.com") + __authors__ = [("mkaay", "mkaay@mkaay.de"), + ("stickell", "l.stickell@yahoo.it"), + ("Walter Purcaro", "vuolter@gmail.com")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 969c8b393..1656b4387 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -14,8 +14,8 @@ class EasybytezCom(XFSPAccount): __version__ = "0.07" __description__ = """EasyBytez.com account plugin""" - __author_name__ = ("zoidberg", "guidobelix") - __author_mail__ = ("zoidberg@mujmail.cz", "guidobelix@hotmail.it") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("guidobelix", "guidobelix@hotmail.it")] HOSTER_URL = "http://www.easybytez.com/" diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py index f37693206..dc64c9d43 100644 --- a/module/plugins/accounts/EuroshareEu.py +++ b/module/plugins/accounts/EuroshareEu.py @@ -12,8 +12,7 @@ class EuroshareEu(Account): __version__ = "0.01" __description__ = """Euroshare.eu account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py index 7e46ccd05..c69f73735 100644 --- a/module/plugins/accounts/FastixRu.py +++ b/module/plugins/accounts/FastixRu.py @@ -10,8 +10,7 @@ class FastixRu(Account): __version__ = "0.02" __description__ = """Fastix account plugin""" - __author_name__ = "Massimo Rosamilia" - __author_mail__ = "max@spiritix.eu" + __authors__ = [("Massimo Rosamilia", "max@spiritix.eu")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py index a968be19e..ed68cf500 100644 --- a/module/plugins/accounts/FastshareCz.py +++ b/module/plugins/accounts/FastshareCz.py @@ -11,8 +11,9 @@ class FastshareCz(Account): __version__ = "0.03" __description__ = """Fastshare.cz account plugin""" - __author_name__ = ("zoidberg", "stickell") - __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("stickell", "l.stickell@yahoo.it")] + CREDIT_PATTERN = r'(?:Kredit|Credit)\s*\s*]*>([\d. \w]+) ' diff --git a/module/plugins/accounts/File4safeCom.py b/module/plugins/accounts/File4safeCom.py index e8574b51e..bcf48772f 100644 --- a/module/plugins/accounts/File4safeCom.py +++ b/module/plugins/accounts/File4safeCom.py @@ -9,8 +9,7 @@ class File4safeCom(XFSPAccount): __version__ = "0.02" __description__ = """File4safe.com account plugin""" - __author_name__ = "stickell" - __author_mail__ = "l.stickell@yahoo.it" + __authors__ = [("stickell", "l.stickell@yahoo.it")] HOSTER_URL = "http://www.file4safe.com/" diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py index a5544da68..24c745e6a 100644 --- a/module/plugins/accounts/FileParadoxIn.py +++ b/module/plugins/accounts/FileParadoxIn.py @@ -9,8 +9,7 @@ class FileParadoxIn(XFSPAccount): __version__ = "0.01" __description__ = """FileParadox.in account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.fileparadox.in/" diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py index ec98cf9b2..ffc427bcd 100644 --- a/module/plugins/accounts/FilecloudIo.py +++ b/module/plugins/accounts/FilecloudIo.py @@ -10,8 +10,8 @@ class FilecloudIo(Account): __version__ = "0.02" __description__ = """FilecloudIo account plugin""" - __author_name__ = ("zoidberg", "stickell") - __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("stickell", "l.stickell@yahoo.it")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py index 84d80cab7..a116eb7c5 100644 --- a/module/plugins/accounts/FilefactoryCom.py +++ b/module/plugins/accounts/FilefactoryCom.py @@ -14,8 +14,9 @@ class FilefactoryCom(Account): __version__ = "0.14" __description__ = """Filefactory.com account plugin""" - __author_name__ = ("zoidberg", "stickell") - __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("stickell", "l.stickell@yahoo.it")] + VALID_UNTIL_PATTERN = r'Premium valid until: (?P\d{1,2})\w{1,2} (?P\w{3}), (?P\d{4})' diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py index 72e275d4f..e5f7e4235 100644 --- a/module/plugins/accounts/FilejungleCom.py +++ b/module/plugins/accounts/FilejungleCom.py @@ -12,8 +12,8 @@ class FilejungleCom(Account): __version__ = "0.11" __description__ = """Filejungle.com account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + login_timeout = 60 diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py index 3f4029a9f..536d40812 100644 --- a/module/plugins/accounts/FileomCom.py +++ b/module/plugins/accounts/FileomCom.py @@ -9,8 +9,7 @@ class FileomCom(XFSPAccount): __version__ = "0.01" __description__ = """Fileom.com account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.fileom.com/" diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py index cc00411d6..a26a45690 100644 --- a/module/plugins/accounts/FilerNet.py +++ b/module/plugins/accounts/FilerNet.py @@ -13,8 +13,8 @@ class FilerNet(Account): __version__ = "0.01" __description__ = """Filer.net account plugin""" - __author_name__ = "stickell" - __author_mail__ = "l.stickell@yahoo.it" + __authors__ = [("stickell", "l.stickell@yahoo.it")] + TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />' WALID_UNTIL_PATTERN = r"Der Premium-Zugang ist gültig bis (.+)\.\s*" diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py index 91521fd5f..4a77a66a0 100644 --- a/module/plugins/accounts/FilerioCom.py +++ b/module/plugins/accounts/FilerioCom.py @@ -9,8 +9,7 @@ class FilerioCom(XFSPAccount): __version__ = "0.02" __description__ = """FileRio.in account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] HOSTER_URL = "http://www.filerio.in/" diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py index 5ece67140..917fd3c48 100644 --- a/module/plugins/accounts/FilesMailRu.py +++ b/module/plugins/accounts/FilesMailRu.py @@ -9,8 +9,7 @@ class FilesMailRu(Account): __version__ = "0.1" __description__ = """Filesmail.ru account plugin""" - __author_name__ = "RaNaN" - __author_mail__ = "RaNaN@pyload.org" + __authors__ = [("RaNaN", "RaNaN@pyload.org")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 5be5e8d04..4f9d03e3e 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -12,8 +12,7 @@ class FileserveCom(Account): __version__ = "0.2" __description__ = """Fileserve.com account plugin""" - __author_name__ = "mkaay" - __author_mail__ = "mkaay@mkaay.de" + __authors__ = [("mkaay", "mkaay@mkaay.de")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py index 5e37e54f3..303185c6d 100644 --- a/module/plugins/accounts/FourSharedCom.py +++ b/module/plugins/accounts/FourSharedCom.py @@ -9,8 +9,9 @@ class FourSharedCom(Account): __type__ = "account" __version__ = "0.03" __description__ = """FourShared.com account plugin""" - __author_name__ = ("zoidberg", "stickell") - __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("stickell", "l.stickell@yahoo.it")] + def loadAccountInfo(self, user, req): # Free mode only for now diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index dfa5f4541..2b093167e 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -12,8 +12,7 @@ class FreakshareCom(Account): __version__ = "0.1" __description__ = """Freakshare.com account plugin""" - __author_name__ = "RaNaN" - __author_mail__ = "RaNaN@pyload.org" + __authors__ = [("RaNaN", "RaNaN@pyload.org")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index 0132eb921..3f09f8706 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -10,8 +10,7 @@ class FreeWayMe(Account): __version__ = "0.11" __description__ = """FreeWayMe account plugin""" - __author_name__ = "Nicolas Giese" - __author_mail__ = "james@free-way.me" + __authors__ = [("Nicolas Giese", "james@free-way.me")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 78714f238..9e3521a5f 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -13,8 +13,9 @@ class FshareVn(Account): __version__ = "0.07" __description__ = """Fshare.vn account plugin""" - __author_name__ = ("zoidberg", "stickell") - __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("stickell", "l.stickell@yahoo.it")] + VALID_UNTIL_PATTERN = ur'
Thời hạn dùng:
\s*
([^<]+)
' LIFETIME_PATTERN = ur'
Lần đăng nhập trước:
\s*
[^<]+
' diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py index 2e60874a9..d2e040768 100644 --- a/module/plugins/accounts/Ftp.py +++ b/module/plugins/accounts/Ftp.py @@ -9,8 +9,7 @@ class Ftp(Account): __version__ = "0.01" __description__ = """Ftp dummy account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] login_timeout = info_threshold = 1000000 diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index ac78bda8f..fc32bf188 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -12,8 +12,8 @@ class HellshareCz(Account): __version__ = "0.14" __description__ = """Hellshare.cz account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + CREDIT_LEFT_PATTERN = r'
\s*\s*\s*' diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py index 3b64fe8da..09c607c98 100644 --- a/module/plugins/accounts/Http.py +++ b/module/plugins/accounts/Http.py @@ -9,8 +9,7 @@ class Http(Account): __version__ = "0.01" __description__ = """Http dummy account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] login_timeout = info_threshold = 1000000 diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py index f9207683a..296780b7c 100644 --- a/module/plugins/accounts/HugefilesNet.py +++ b/module/plugins/accounts/HugefilesNet.py @@ -9,8 +9,7 @@ class HugefilesNet(XFSPAccount): __version__ = "0.01" __description__ = """Hugefiles.net account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.hugefiles.net/" diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py index 536d8c9be..76e757222 100644 --- a/module/plugins/accounts/HundredEightyUploadCom.py +++ b/module/plugins/accounts/HundredEightyUploadCom.py @@ -9,8 +9,7 @@ class HundredEightyUploadCom(XFSPAccount): __version__ = "0.01" __description__ = """180upload.com account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.180upload.com/" diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py index b3f9fb532..c0441460b 100644 --- a/module/plugins/accounts/LetitbitNet.py +++ b/module/plugins/accounts/LetitbitNet.py @@ -10,8 +10,7 @@ class LetitbitNet(Account): __version__ = "0.01" __description__ = """Letitbit.net account plugin""" - __author_name__ = "stickell" - __author_mail__ = "l.stickell@yahoo.it" + __authors__ = [("stickell", "l.stickell@yahoo.it")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/LinksnappyCom.py b/module/plugins/accounts/LinksnappyCom.py index a03357e25..86bd203a4 100644 --- a/module/plugins/accounts/LinksnappyCom.py +++ b/module/plugins/accounts/LinksnappyCom.py @@ -12,8 +12,7 @@ class LinksnappyCom(Account): __version__ = "0.02" __description__ = """Linksnappy.com account plugin""" - __author_name__ = "stickell" - __author_mail__ = "l.stickell@yahoo.it" + __authors__ = [("stickell", "l.stickell@yahoo.it")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/LomafileCom.py b/module/plugins/accounts/LomafileCom.py index 379e567d5..bddccdadc 100644 --- a/module/plugins/accounts/LomafileCom.py +++ b/module/plugins/accounts/LomafileCom.py @@ -9,8 +9,7 @@ class LomafileCom(XFSPAccount): __version__ = "0.01" __description__ = """Lomafile.com account plugin""" - __author_name__ = "guidobelix" - __author_mail__ = "guidobelix@hotmail.it" + __authors__ = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_URL = "http://www.lomafile.com/" diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py index 9c5603989..59d5be580 100644 --- a/module/plugins/accounts/MegaDebridEu.py +++ b/module/plugins/accounts/MegaDebridEu.py @@ -10,8 +10,8 @@ class MegaDebridEu(Account): __version__ = "0.2" __description__ = """mega-debrid.eu account plugin""" - __author_name__ = "D.Ducatel" - __author_mail__ = "dducatel@je-geek.fr" + __authors__ = [("D.Ducatel", "dducatel@je-geek.fr")] + # Define the base URL of MegaDebrid api API_URL = "https://www.mega-debrid.eu/api.php" diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py index 7c4777706..019dbc5b4 100644 --- a/module/plugins/accounts/MegasharesCom.py +++ b/module/plugins/accounts/MegasharesCom.py @@ -12,8 +12,8 @@ class MegasharesCom(Account): __version__ = "0.02" __description__ = """Megashares.com account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + VALID_UNTIL_PATTERN = r'

Period Ends: (\w{3} \d{1,2}, \d{4})

' diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py index f25ae7b4e..09e096922 100644 --- a/module/plugins/accounts/MovReelCom.py +++ b/module/plugins/accounts/MovReelCom.py @@ -9,8 +9,7 @@ class MovReelCom(XFSPAccount): __version__ = "0.02" __description__ = """Movreel.com account plugin""" - __author_name__ = "t4skforce" - __author_mail__ = "t4skforce1337[AT]gmail[DOT]com" + __authors__ = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] login_timeout = 60 diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py index fc13bac69..12d4c301b 100644 --- a/module/plugins/accounts/MultishareCz.py +++ b/module/plugins/accounts/MultishareCz.py @@ -13,8 +13,8 @@ class MultishareCz(Account): __version__ = "0.02" __description__ = """Multishare.cz account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + TRAFFIC_LEFT_PATTERN = r'Kredit:\s*(?P[0-9,]+) (?P\w+)' ACCOUNT_INFO_PATTERN = r'' diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py index bd566330e..ed17ac4f2 100644 --- a/module/plugins/accounts/MyfastfileCom.py +++ b/module/plugins/accounts/MyfastfileCom.py @@ -11,8 +11,8 @@ class MyfastfileCom(Account): __type__ = "account" __version__ = "0.02" __description__ = """Myfastfile.com account plugin""" - __author_name__ = "stickell" - __author_mail__ = "l.stickell@yahoo.it" + __authors__ = [("stickell", "l.stickell@yahoo.it")] + def loadAccountInfo(self, user, req): if 'days_left' in self.json_data: diff --git a/module/plugins/accounts/NetloadIn.py b/module/plugins/accounts/NetloadIn.py index 12c5556fb..1edcd3f2b 100755 --- a/module/plugins/accounts/NetloadIn.py +++ b/module/plugins/accounts/NetloadIn.py @@ -12,8 +12,8 @@ class NetloadIn(Account): __version__ = "0.22" __description__ = """Netload.in account plugin""" - __author_name__ = ("RaNaN", "CryNickSystems") - __author_mail__ = ("RaNaN@pyload.org", "webmaster@pcProfil.de") + __authors__ = [("RaNaN", "RaNaN@pyload.org"), + ("CryNickSystems", "webmaster@pcProfil.de")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py index 564bf5599..a75ca289f 100644 --- a/module/plugins/accounts/NosuploadCom.py +++ b/module/plugins/accounts/NosuploadCom.py @@ -9,8 +9,7 @@ class NosuploadCom(XFSPAccount): __version__ = "0.01" __description__ = """Nosupload.com account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.nosupload.com/" diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py index 2dc1be607..34d3e25b5 100644 --- a/module/plugins/accounts/NovafileCom.py +++ b/module/plugins/accounts/NovafileCom.py @@ -9,8 +9,7 @@ class NovafileCom(XFSPAccount): __version__ = "0.01" __description__ = """Novafile.com account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.novafile.com/" diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py index 84e0791e4..ac2079f59 100644 --- a/module/plugins/accounts/OboomCom.py +++ b/module/plugins/accounts/OboomCom.py @@ -14,8 +14,7 @@ class OboomCom(Account): __version__ = "0.2" __description__ = """Oboom.com account plugin""" - __author_name__ = "stanley" - __author_mail__ = "stanley.foerster@gmail.com" + __authors__ = [("stanley", "stanley.foerster@gmail.com")] def loadAccountData(self, user, req): diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 43dd1c2b6..347aa0297 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -13,8 +13,8 @@ class OneFichierCom(Account): __version__ = "0.1" __description__ = """1fichier.com account plugin""" - __author_name__ = "Elrick69" - __author_mail__ = "elrick69[AT]rocketmail[DOT]com" + __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")] + VALID_UNTIL_PATTERN = r'You are a premium user until (?P\d{2})/(?P\d{2})/(?P\d{4})' diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py index 34f684cb1..e45f0127b 100644 --- a/module/plugins/accounts/OverLoadMe.py +++ b/module/plugins/accounts/OverLoadMe.py @@ -10,8 +10,7 @@ class OverLoadMe(Account): __version__ = "0.01" __description__ = """Over-Load.me account plugin""" - __author_name__ = "marley" - __author_mail__ = "marley@over-load.me" + __authors__ = [("marley", "marley@over-load.me")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py index 5678f8210..51dff2cc3 100644 --- a/module/plugins/accounts/PremiumTo.py +++ b/module/plugins/accounts/PremiumTo.py @@ -7,9 +7,12 @@ class PremiumTo(Account): __name__ = "PremiumTo" __type__ = "account" __version__ = "0.04" + __description__ = """Premium.to account plugin""" - __author_name__ = ("RaNaN", "zoidberg", "stickell") - __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") + __authors__ = [("RaNaN", "RaNaN@pyload.org"), + ("zoidberg", "zoidberg@mujmail.cz"), + ("stickell", "l.stickell@yahoo.it")] + def loadAccountInfo(self, user, req): api_r = req.load("http://premium.to/api/straffic.php", diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py index dcf8b8f20..abc4dd464 100644 --- a/module/plugins/accounts/PremiumizeMe.py +++ b/module/plugins/accounts/PremiumizeMe.py @@ -11,8 +11,7 @@ class PremiumizeMe(Account): __version__ = "0.11" __description__ = """Premiumize.me account plugin""" - __author_name__ = "Florian Franzen" - __author_mail__ = "FlorianFranzen@gmail.com" + __authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py index fcaf14e92..4c8050014 100644 --- a/module/plugins/accounts/QuickshareCz.py +++ b/module/plugins/accounts/QuickshareCz.py @@ -11,8 +11,7 @@ class QuickshareCz(Account): __version__ = "0.01" __description__ = """Quickshare.cz account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py index 358f6ffca..83ef72bef 100644 --- a/module/plugins/accounts/RPNetBiz.py +++ b/module/plugins/accounts/RPNetBiz.py @@ -10,8 +10,7 @@ class RPNetBiz(Account): __version__ = "0.1" __description__ = """RPNet.biz account plugin""" - __author_name__ = "Dman" - __author_mail__ = "dmanugm@gmail.com" + __authors__ = [("Dman", "dmanugm@gmail.com")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py index 849933a87..ba7b2e676 100644 --- a/module/plugins/accounts/RapidgatorNet.py +++ b/module/plugins/accounts/RapidgatorNet.py @@ -10,8 +10,8 @@ class RapidgatorNet(Account): __version__ = "0.04" __description__ = """Rapidgator.net account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + API_URL = 'http://rapidgator.net/api/user' diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py index dc4f09ee1..ce1470c09 100644 --- a/module/plugins/accounts/RapidshareCom.py +++ b/module/plugins/accounts/RapidshareCom.py @@ -9,8 +9,7 @@ class RapidshareCom(Account): __version__ = "0.22" __description__ = """Rapidshare.com account plugin""" - __author_name__ = "mkaay" - __author_mail__ = "mkaay@mkaay.de" + __authors__ = [("mkaay", "mkaay@mkaay.de")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py index 91125e507..55f95f72d 100644 --- a/module/plugins/accounts/RarefileNet.py +++ b/module/plugins/accounts/RarefileNet.py @@ -9,8 +9,7 @@ class RarefileNet(XFSPAccount): __version__ = "0.03" __description__ = """RareFile.net account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] HOSTER_URL = "http://www.rarefile.net/" diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 4305c47c6..b4724999b 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -11,8 +11,7 @@ class RealdebridCom(Account): __version__ = "0.43" __description__ = """Real-Debrid.com account plugin""" - __author_name__ = "Devirex Hazzard" - __author_mail__ = "naibaf_11@yahoo.de" + __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index f15230f83..ed8147190 100644 --- a/module/plugins/accounts/RehostTo.py +++ b/module/plugins/accounts/RehostTo.py @@ -9,8 +9,7 @@ class RehostTo(Account): __version__ = "0.1" __description__ = """Rehost.to account plugin""" - __author_name__ = "RaNaN" - __author_mail__ = "RaNaN@pyload.org" + __authors__ = [("RaNaN", "RaNaN@pyload.org")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py index 2782fc0fd..d6f2b2563 100644 --- a/module/plugins/accounts/RyushareCom.py +++ b/module/plugins/accounts/RyushareCom.py @@ -9,8 +9,8 @@ class RyushareCom(XFSPAccount): __version__ = "0.04" __description__ = """Ryushare.com account plugin""" - __author_name__ = ("zoidberg", "trance4us") - __author_mail__ = ("zoidberg@mujmail.cz", "") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("trance4us", None)] HOSTER_URL = "http://www.ryushare.com/" diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py index fe5af23ec..a8cf38df2 100644 --- a/module/plugins/accounts/SecureUploadEu.py +++ b/module/plugins/accounts/SecureUploadEu.py @@ -9,8 +9,7 @@ class SecureUploadEu(XFSPAccount): __version__ = "0.01" __description__ = """SecureUpload.eu account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.secureupload.eu/" diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py index 3b46101d0..9f6021774 100644 --- a/module/plugins/accounts/SendmywayCom.py +++ b/module/plugins/accounts/SendmywayCom.py @@ -9,8 +9,7 @@ class SendmywayCom(XFSPAccount): __version__ = "0.01" __description__ = """Sendmyway.com account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.sendmyway.com/" diff --git a/module/plugins/accounts/ShareRapidCom.py b/module/plugins/accounts/ShareRapidCom.py index 50077b1fb..306e7a236 100644 --- a/module/plugins/accounts/ShareRapidCom.py +++ b/module/plugins/accounts/ShareRapidCom.py @@ -12,8 +12,9 @@ class ShareRapidCom(Account): __version__ = "0.34" __description__ = """MegaRapid.cz account plugin""" - __author_name__ = ("MikyWoW", "zoidberg") - __author_mail__ = ("mikywow@seznam.cz", "zoidberg@mujmail.cz") + __authors__ = [("MikyWoW", "mikywow@seznam.cz"), + ("zoidberg", "zoidberg@mujmail.cz")] + login_timeout = 60 diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index b9ff0096c..54e23013b 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -9,8 +9,8 @@ class ShareonlineBiz(Account): __version__ = "0.24" __description__ = """Share-online.biz account plugin""" - __author_name__ = ("mkaay", "zoidberg") - __author_mail__ = ("mkaay@mkaay.de", "zoidberg@mujmail.cz") + __authors__ = [("mkaay", "mkaay@mkaay.de"), + ("zoidberg", "zoidberg@mujmail.cz")] def getUserAPI(self, user, req): diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py index b0a62f83b..fd825a616 100644 --- a/module/plugins/accounts/SimplyPremiumCom.py +++ b/module/plugins/accounts/SimplyPremiumCom.py @@ -10,8 +10,7 @@ class SimplyPremiumCom(Account): __version__ = "0.01" __description__ = """Simply-Premium.com account plugin""" - __author_name__ = "EvolutionClip" - __author_mail__ = "evolutionclip@live.de" + __authors__ = [("EvolutionClip", "evolutionclip@live.de")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py index 70f2d39b9..6e3c46dcd 100644 --- a/module/plugins/accounts/SimplydebridCom.py +++ b/module/plugins/accounts/SimplydebridCom.py @@ -11,8 +11,7 @@ class SimplydebridCom(Account): __version__ = "0.1" __description__ = """Simply-Debrid.com account plugin""" - __author_name__ = "Kagenoshin" - __author_mail__ = "kagenoshin@gmx.ch" + __authors__ = [("Kagenoshin", "kagenoshin@gmx.ch")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py index 6d9c3e924..d49c4f7f7 100644 --- a/module/plugins/accounts/StahnuTo.py +++ b/module/plugins/accounts/StahnuTo.py @@ -12,8 +12,7 @@ class StahnuTo(Account): __version__ = "0.02" __description__ = """StahnuTo account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py index b50669afe..4a544b691 100644 --- a/module/plugins/accounts/StreamcloudEu.py +++ b/module/plugins/accounts/StreamcloudEu.py @@ -9,8 +9,7 @@ class StreamcloudEu(XFSPAccount): __version__ = "0.01" __description__ = """Streamcloud.eu account plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_URL = "http://www.streamcloud.eu/" diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index a477b06c0..d66b37da3 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -12,8 +12,7 @@ class TurbobitNet(Account): __version__ = "0.01" __description__ = """TurbobitNet account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py index 3de98564c..eb244e7ea 100644 --- a/module/plugins/accounts/TusfilesNet.py +++ b/module/plugins/accounts/TusfilesNet.py @@ -14,8 +14,7 @@ class TusfilesNet(XFSPAccount): __version__ = "0.02" __description__ = """ Tusfile.net account plugin """ - __author_name__ = "guidobelix" - __author_mail__ = "guidobelix@hotmail.it" + __authors__ = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_URL = "http://www.tusfiles.net/" diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index 6f0d0ae7d..bb7f167e2 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -11,8 +11,9 @@ class UlozTo(Account): __version__ = "0.06" __description__ = """Uloz.to account plugin""" - __author_name__ = ("zoidberg", "pulpe") - __author_mail__ = "zoidberg@mujmail.cz" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("pulpe", None)] + TRAFFIC_LEFT_PATTERN = r'
  • (\d+|\d\d\.\d\d\.)