summaryrefslogtreecommitdiffstats
path: root/module/plugins/accounts
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-07 01:23:55 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-07 01:23:55 +0200
commitb1759bc440cd6013837697eb8de540914f693ffd (patch)
treed170caf63d7f65e44d23ea2d91a65759a1665928 /module/plugins/accounts
parent[Plugin] Fix decoding in load method (diff)
downloadpyload-b1759bc440cd6013837697eb8de540914f693ffd.tar.xz
No camelCase style anymore
Diffstat (limited to 'module/plugins/accounts')
-rw-r--r--module/plugins/accounts/AlldebridCom.py18
-rw-r--r--module/plugins/accounts/BackinNet.py2
-rw-r--r--module/plugins/accounts/BitshareCom.py8
-rw-r--r--module/plugins/accounts/CatShareNet.py10
-rw-r--r--module/plugins/accounts/CloudzillaTo.py6
-rw-r--r--module/plugins/accounts/CramitIn.py2
-rw-r--r--module/plugins/accounts/CzshareCom.py10
-rw-r--r--module/plugins/accounts/DebridItaliaCom.py8
-rw-r--r--module/plugins/accounts/DepositfilesCom.py6
-rw-r--r--module/plugins/accounts/EasybytezCom.py2
-rw-r--r--module/plugins/accounts/EuroshareEu.py6
-rw-r--r--module/plugins/accounts/ExashareCom.py2
-rw-r--r--module/plugins/accounts/FastixRu.py8
-rw-r--r--module/plugins/accounts/FastshareCz.py8
-rw-r--r--module/plugins/accounts/File4SafeCom.py2
-rw-r--r--module/plugins/accounts/FileParadoxIn.py2
-rw-r--r--module/plugins/accounts/FilecloudIo.py10
-rw-r--r--module/plugins/accounts/FilefactoryCom.py6
-rw-r--r--module/plugins/accounts/FilejungleCom.py6
-rw-r--r--module/plugins/accounts/FileomCom.py2
-rw-r--r--module/plugins/accounts/FilerNet.py10
-rw-r--r--module/plugins/accounts/FilerioCom.py2
-rw-r--r--module/plugins/accounts/FilesMailRu.py6
-rw-r--r--module/plugins/accounts/FileserveCom.py10
-rw-r--r--module/plugins/accounts/FourSharedCom.py6
-rw-r--r--module/plugins/accounts/FreakshareCom.py8
-rw-r--r--module/plugins/accounts/FreeWayMe.py22
-rw-r--r--module/plugins/accounts/FshareVn.py16
-rw-r--r--module/plugins/accounts/Ftp.py2
-rw-r--r--module/plugins/accounts/HellshareCz.py22
-rw-r--r--module/plugins/accounts/HighWayMe.py8
-rw-r--r--module/plugins/accounts/Http.py2
-rw-r--r--module/plugins/accounts/HugefilesNet.py2
-rw-r--r--module/plugins/accounts/HundredEightyUploadCom.py2
-rw-r--r--module/plugins/accounts/JunkyvideoCom.py2
-rw-r--r--module/plugins/accounts/JunocloudMe.py2
-rw-r--r--module/plugins/accounts/Keep2ShareCc.py14
-rw-r--r--module/plugins/accounts/LetitbitNet.py12
-rw-r--r--module/plugins/accounts/LinestorageCom.py2
-rw-r--r--module/plugins/accounts/LinksnappyCom.py12
-rw-r--r--module/plugins/accounts/MegaDebridEu.py10
-rw-r--r--module/plugins/accounts/MegaRapidCz.py6
-rw-r--r--module/plugins/accounts/MegaRapidoNet.py8
-rw-r--r--module/plugins/accounts/MegasharesCom.py12
-rw-r--r--module/plugins/accounts/MovReelCom.py2
-rw-r--r--module/plugins/accounts/MultihostersCom.py2
-rw-r--r--module/plugins/accounts/MultishareCz.py10
-rw-r--r--module/plugins/accounts/MyfastfileCom.py12
-rw-r--r--module/plugins/accounts/NitroflareCom.py18
-rw-r--r--module/plugins/accounts/NoPremiumPl.py18
-rw-r--r--module/plugins/accounts/NosuploadCom.py2
-rw-r--r--module/plugins/accounts/NovafileCom.py2
-rw-r--r--module/plugins/accounts/NowVideoSx.py10
-rw-r--r--module/plugins/accounts/OboomCom.py20
-rw-r--r--module/plugins/accounts/OneFichierCom.py10
-rw-r--r--module/plugins/accounts/OverLoadMe.py10
-rw-r--r--module/plugins/accounts/PremiumTo.py6
-rw-r--r--module/plugins/accounts/PremiumizeMe.py16
-rw-r--r--module/plugins/accounts/PutdriveCom.py2
-rw-r--r--module/plugins/accounts/QuickshareCz.py8
-rw-r--r--module/plugins/accounts/RPNetBiz.py18
-rw-r--r--module/plugins/accounts/RapideoPl.py18
-rw-r--r--module/plugins/accounts/RapidfileshareNet.py2
-rw-r--r--module/plugins/accounts/RapidgatorNet.py22
-rw-r--r--module/plugins/accounts/RapiduNet.py10
-rw-r--r--module/plugins/accounts/RarefileNet.py2
-rw-r--r--module/plugins/accounts/RealdebridCom.py8
-rw-r--r--module/plugins/accounts/RehostTo.py14
-rw-r--r--module/plugins/accounts/RyushareCom.py2
-rw-r--r--module/plugins/accounts/SafesharingEu.py2
-rw-r--r--module/plugins/accounts/SecureUploadEu.py2
-rw-r--r--module/plugins/accounts/SendmywayCom.py2
-rw-r--r--module/plugins/accounts/SharebeastCom.py2
-rw-r--r--module/plugins/accounts/ShareonlineBiz.py12
-rw-r--r--module/plugins/accounts/SimplyPremiumCom.py8
-rw-r--r--module/plugins/accounts/SimplydebridCom.py6
-rw-r--r--module/plugins/accounts/SmoozedCom.py16
-rw-r--r--module/plugins/accounts/StreamcloudEu.py2
-rw-r--r--module/plugins/accounts/TurbobitNet.py6
-rw-r--r--module/plugins/accounts/TusfilesNet.py2
-rw-r--r--module/plugins/accounts/UlozTo.py6
-rw-r--r--module/plugins/accounts/UploadableCh.py6
-rw-r--r--module/plugins/accounts/UploadcCom.py2
-rw-r--r--module/plugins/accounts/UploadedTo.py8
-rw-r--r--module/plugins/accounts/UploadheroCom.py8
-rw-r--r--module/plugins/accounts/UploadingCom.py8
-rw-r--r--module/plugins/accounts/UptoboxCom.py2
-rw-r--r--module/plugins/accounts/VidPlayNet.py2
-rw-r--r--module/plugins/accounts/WebshareCz.py16
-rw-r--r--module/plugins/accounts/WorldbytezCom.py2
-rw-r--r--module/plugins/accounts/XFileSharingPro.py6
-rw-r--r--module/plugins/accounts/YibaishiwuCom.py8
-rw-r--r--module/plugins/accounts/ZeveraCom.py10
93 files changed, 355 insertions, 355 deletions
diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py
index a109faf4f..eb58da928 100644
--- a/module/plugins/accounts/AlldebridCom.py
+++ b/module/plugins/accounts/AlldebridCom.py
@@ -12,36 +12,36 @@ from module.plugins.internal.Account import Account
class AlldebridCom(Account):
__name__ = "AlldebridCom"
__type__ = "account"
- __version__ = "0.25"
+ __version__ = "0.26"
__description__ = """AllDebrid.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("Andy Voigt", "spamsales@online.de")]
- def loadAccountInfo(self, user, req):
- data = self.getAccountData(user)
+ def load_account_info(self, user, req):
+ data = self.get_account_data(user)
html = self.load("http://www.alldebrid.com/account/", req=req)
soup = BeautifulSoup(html)
- #Try to parse expiration date directly from the control panel page (better accuracy)
+ # Try to parse expiration date directly from the control panel page (better accuracy)
try:
time_text = soup.find('div', attrs={'class': 'remaining_time_text'}).strong.string
- self.logDebug("Account expires in: %s" % time_text)
+ self.log_debug("Account expires in: %s" % time_text)
p = re.compile('\d+')
exp_data = p.findall(time_text)
exp_time = time.time() + int(exp_data[0]) * 24 * 60 * 60 + int(
exp_data[1]) * 60 * 60 + (int(exp_data[2]) - 1) * 60
- #Get expiration date from API
+ # Get expiration date from API
except Exception:
- data = self.getAccountData(user)
+ data = self.get_account_data(user)
html = self.load("https://www.alldebrid.com/api.php",
get={'action': "info_user", 'login': user, 'pw': data['password']}, req=req)
- self.logDebug(html)
+ self.log_debug(html)
xml = dom.parseString(html)
exp_time = time.time() + int(xml.getElementsByTagName("date")[0].childNodes[0].nodeValue) * 24 * 60 * 60
@@ -60,4 +60,4 @@ class AlldebridCom(Account):
if "This login doesn't exist" in html \
or "The password is not valid" in html \
or "Invalid captcha" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/BackinNet.py b/module/plugins/accounts/BackinNet.py
index 46c8d7ac5..c0c88d6f1 100644
--- a/module/plugins/accounts/BackinNet.py
+++ b/module/plugins/accounts/BackinNet.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class BackinNet(XFSAccount):
__name__ = "BackinNet"
__type__ = "account"
- __version__ = "0.01"
+ __version__ = "0.02"
__description__ = """Backin.net account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py
index 8f748b9e9..912b58173 100644
--- a/module/plugins/accounts/BitshareCom.py
+++ b/module/plugins/accounts/BitshareCom.py
@@ -6,21 +6,21 @@ from module.plugins.internal.Account import Account
class BitshareCom(Account):
__name__ = "BitshareCom"
__type__ = "account"
- __version__ = "0.14"
+ __version__ = "0.15"
__description__ = """Bitshare account plugin"""
__license__ = "GPLv3"
__authors__ = [("Paul King", None)]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("http://bitshare.com/mysettings.html", req=req)
if "\"http://bitshare.com/myupgrade.html\">Free" in html:
return {"validuntil": -1, "trafficleft": -1, "premium": False}
if not '<input type="checkbox" name="directdownload" checked="checked" />' in html:
- self.logWarning(_("Activate direct Download in your Bitshare Account"))
+ self.log_warning(_("Activate direct Download in your Bitshare Account"))
return {"validuntil": -1, "trafficleft": -1, "premium": True}
@@ -30,4 +30,4 @@ class BitshareCom(Account):
post={"user": user, "password": data['password'], "submit": "Login"}, req=req)
if "login" in req.lastEffectiveURL:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/CatShareNet.py b/module/plugins/accounts/CatShareNet.py
index 79e94cc17..8eb422962 100644
--- a/module/plugins/accounts/CatShareNet.py
+++ b/module/plugins/accounts/CatShareNet.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class CatShareNet(Account):
__name__ = "CatShareNet"
__type__ = "account"
- __version__ = "0.07"
+ __version__ = "0.08"
__description__ = """Catshare.net account plugin"""
__license__ = "GPLv3"
@@ -21,7 +21,7 @@ class CatShareNet(Account):
TRAFFIC_LEFT_PATTERN = r'<a href="/premium">([0-9.]+ [kMG]B)'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
premium = False
validuntil = -1
trafficleft = -1
@@ -33,7 +33,7 @@ class CatShareNet(Account):
try:
expiredate = re.search(self.VALID_UNTIL_PATTERN, html).group(1)
- self.logDebug("Expire date: " + expiredate)
+ self.log_debug("Expire date: " + expiredate)
validuntil = time.mktime(time.strptime(expiredate, "%Y-%m-%d %H:%M:%S"))
@@ -41,7 +41,7 @@ class CatShareNet(Account):
pass
try:
- trafficleft = self.parseTraffic(re.search(self.TRAFFIC_LEFT_PATTERN, html).group(1))
+ trafficleft = self.parse_traffic(re.search(self.TRAFFIC_LEFT_PATTERN, html).group(1))
except Exception:
pass
@@ -57,4 +57,4 @@ class CatShareNet(Account):
'user[submit]': "Login"}, req=req)
if not '<a href="/logout">Wyloguj</a>' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/CloudzillaTo.py b/module/plugins/accounts/CloudzillaTo.py
index 2328b0a86..5716c8d94 100644
--- a/module/plugins/accounts/CloudzillaTo.py
+++ b/module/plugins/accounts/CloudzillaTo.py
@@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account
class CloudzillaTo(Account):
__name__ = "CloudzillaTo"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """Cloudzilla.to account plugin"""
__license__ = "GPLv3"
@@ -18,7 +18,7 @@ class CloudzillaTo(Account):
PREMIUM_PATTERN = r'<h2>account type</h2>\s*Premium Account'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("http://www.cloudzilla.to/", req=req)
premium = True if re.search(self.PREMIUM_PATTERN, html) else False
@@ -33,4 +33,4 @@ class CloudzillaTo(Account):
'w' : "dologin"}, req=req)
if "ERROR" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py
index a9e2274a2..1e6dcca20 100644
--- a/module/plugins/accounts/CramitIn.py
+++ b/module/plugins/accounts/CramitIn.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class CramitIn(XFSAccount):
__name__ = "CramitIn"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """Cramit.in account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index c53c1807b..f86264cf5 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class CzshareCom(Account):
__name__ = "CzshareCom"
__type__ = "account"
- __version__ = "0.19"
+ __version__ = "0.20"
__description__ = """Czshare.com account plugin, now Sdilej.cz"""
__license__ = "GPLv3"
@@ -20,7 +20,7 @@ class CzshareCom(Account):
CREDIT_LEFT_PATTERN = r'<tr class="active">\s*<td>([\d ,]+) (KiB|MiB|GiB)</td>\s*<td>([^<]*)</td>\s*</tr>'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
premium = False
validuntil = None
trafficleft = None
@@ -29,11 +29,11 @@ class CzshareCom(Account):
try:
m = re.search(self.CREDIT_LEFT_PATTERN, html)
- trafficleft = self.parseTraffic(m.group(1).replace(' ', '').replace(',', '.')) + m.group(2)
+ trafficleft = self.parse_traffic(m.group(1).replace(' ', '').replace(',', '.')) + m.group(2)
validuntil = time.mktime(time.strptime(m.group(3), '%d.%m.%y %H:%M'))
except Exception, e:
- self.logError(e)
+ self.log_error(e)
else:
premium = True
@@ -50,4 +50,4 @@ class CzshareCom(Account):
"login-name": user}, req=req)
if '<div class="login' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
index defa1a313..16101d177 100644
--- a/module/plugins/accounts/DebridItaliaCom.py
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class DebridItaliaCom(Account):
__name__ = "DebridItaliaCom"
__type__ = "account"
- __version__ = "0.14"
+ __version__ = "0.15"
__description__ = """Debriditalia.com account plugin"""
__license__ = "GPLv3"
@@ -20,7 +20,7 @@ class DebridItaliaCom(Account):
WALID_UNTIL_PATTERN = r'Premium valid till: (.+?) \|'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
info = {"premium": False, "validuntil": None, "trafficleft": None}
html = self.load("http://debriditalia.com/", req=req)
@@ -30,7 +30,7 @@ class DebridItaliaCom(Account):
validuntil = time.mktime(time.strptime(m.group(1), "%d/%m/%Y %H:%M"))
info = {"premium": True, "validuntil": validuntil, "trafficleft": -1}
else:
- self.logError(_("Unable to retrieve account information"))
+ self.log_error(_("Unable to retrieve account information"))
return info
@@ -40,4 +40,4 @@ class DebridItaliaCom(Account):
get={'u': user, 'p': data['password']}, req=req)
if 'NO' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py
index e89f0add8..24cbad486 100644
--- a/module/plugins/accounts/DepositfilesCom.py
+++ b/module/plugins/accounts/DepositfilesCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class DepositfilesCom(Account):
__name__ = "DepositfilesCom"
__type__ = "account"
- __version__ = "0.33"
+ __version__ = "0.34"
__description__ = """Depositfiles.com account plugin"""
__license__ = "GPLv3"
@@ -18,7 +18,7 @@ class DepositfilesCom(Account):
("Walter Purcaro", "vuolter@gmail.com")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("https://dfiles.eu/de/gold/", req=req)
validuntil = re.search(r"Sie haben Gold Zugang bis: <b>(.*?)</b></div>", html).group(1)
@@ -32,4 +32,4 @@ class DepositfilesCom(Account):
post={"login": user, "password": data['password']}, req=req)
if r'<div class="error_message">Sie haben eine falsche Benutzername-Passwort-Kombination verwendet.</div>' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index 93d3e2c19..b78523b62 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class EasybytezCom(XFSAccount):
__name__ = "EasybytezCom"
__type__ = "account"
- __version__ = "0.12"
+ __version__ = "0.13"
__description__ = """EasyBytez.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index 4af9803b7..ffe30d02f 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -9,14 +9,14 @@ from module.plugins.internal.Account import Account
class EuroshareEu(Account):
__name__ = "EuroshareEu"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """Euroshare.eu account plugin"""
__license__ = "GPLv3"
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
self.relogin(user)
html = self.load("http://euroshare.eu/customer-zone/settings/", req=req)
@@ -38,4 +38,4 @@ class EuroshareEu(Account):
"password": data['password']}, req=req)
if u">Nesprávne prihlasovacie meno alebo heslo" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/ExashareCom.py b/module/plugins/accounts/ExashareCom.py
index 431798522..907592bf7 100644
--- a/module/plugins/accounts/ExashareCom.py
+++ b/module/plugins/accounts/ExashareCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class ExashareCom(XFSAccount):
__name__ = "ExashareCom"
__type__ = "account"
- __version__ = "0.01"
+ __version__ = "0.02"
__description__ = """Exashare.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py
index dedbc0d5d..eaf12619a 100644
--- a/module/plugins/accounts/FastixRu.py
+++ b/module/plugins/accounts/FastixRu.py
@@ -7,15 +7,15 @@ from module.common.json_layer import json_loads
class FastixRu(Account):
__name__ = "FastixRu"
__type__ = "account"
- __version__ = "0.04"
+ __version__ = "0.05"
__description__ = """Fastix account plugin"""
__license__ = "GPLv3"
__authors__ = [("Massimo Rosamilia", "max@spiritix.eu")]
- def loadAccountInfo(self, user, req):
- data = self.getAccountData(user)
+ def load_account_info(self, user, req):
+ data = self.get_account_data(user)
html = json_loads(self.load("http://fastix.ru/api_v2/", get={'apikey': data['api'], 'sub': "getaccountdetails"}), req=req)
points = html['points']
@@ -38,4 +38,4 @@ class FastixRu(Account):
data['api'] = api
if "error_code" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index 54253041c..be3a91a16 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account
class FastshareCz(Account):
__name__ = "FastshareCz"
__type__ = "account"
- __version__ = "0.07"
+ __version__ = "0.08"
__description__ = """Fastshare.cz account plugin"""
__license__ = "GPLv3"
@@ -19,7 +19,7 @@ class FastshareCz(Account):
CREDIT_PATTERN = r'Credit\s*:\s*</td>\s*<td>(.+?)\s*<'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = -1
trafficleft = None
premium = False
@@ -28,7 +28,7 @@ class FastshareCz(Account):
m = re.search(self.CREDIT_PATTERN, html)
if m:
- trafficleft = self.parseTraffic(m.group(1))
+ trafficleft = self.parse_traffic(m.group(1))
premium = bool(trafficleft)
@@ -46,4 +46,4 @@ class FastshareCz(Account):
post={'login': user, 'heslo': data['password']}, req=req)
if ">Wrong username or password" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/File4SafeCom.py b/module/plugins/accounts/File4SafeCom.py
index 50fe1aac8..74038a457 100644
--- a/module/plugins/accounts/File4SafeCom.py
+++ b/module/plugins/accounts/File4SafeCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class File4SafeCom(XFSAccount):
__name__ = "File4SafeCom"
__type__ = "account"
- __version__ = "0.05"
+ __version__ = "0.06"
__description__ = """File4Safe.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py
index c12d99d6a..4bf179fbf 100644
--- a/module/plugins/accounts/FileParadoxIn.py
+++ b/module/plugins/accounts/FileParadoxIn.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class FileParadoxIn(XFSAccount):
__name__ = "FileParadoxIn"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """FileParadox.in account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py
index 4d69a2ae2..3c3f79ed8 100644
--- a/module/plugins/accounts/FilecloudIo.py
+++ b/module/plugins/accounts/FilecloudIo.py
@@ -7,7 +7,7 @@ from module.common.json_layer import json_loads
class FilecloudIo(Account):
__name__ = "FilecloudIo"
__type__ = "account"
- __version__ = "0.05"
+ __version__ = "0.06"
__description__ = """FilecloudIo account plugin"""
__license__ = "GPLv3"
@@ -15,16 +15,16 @@ class FilecloudIo(Account):
("stickell", "l.stickell@yahoo.it")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
#: It looks like the first API request always fails, so we retry 5 times, it should work on the second try
for _i in xrange(5):
rep = self.load("https://secure.filecloud.io/api-fetch_apikey.api",
- post={"username": user, "password": self.getAccountData(user)['password']})
+ post={"username": user, "password": self.get_account_data(user)['password']})
rep = json_loads(rep)
if rep['status'] == 'ok':
break
elif rep['status'] == 'error' and rep['message'] == 'no such user or wrong password':
- self.logError(_("Wrong username or password"))
+ self.log_error(_("Wrong username or password"))
return {"valid": False, "premium": False}
else:
return {"premium": False}
@@ -56,4 +56,4 @@ class FilecloudIo(Account):
req=req)
if "you have successfully logged in" not in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py
index 9d61ea927..a950217f4 100644
--- a/module/plugins/accounts/FilefactoryCom.py
+++ b/module/plugins/accounts/FilefactoryCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account
class FilefactoryCom(Account):
__name__ = "FilefactoryCom"
__type__ = "account"
- __version__ = "0.16"
+ __version__ = "0.17"
__description__ = """Filefactory.com account plugin"""
__license__ = "GPLv3"
@@ -21,7 +21,7 @@ class FilefactoryCom(Account):
VALID_UNTIL_PATTERN = r'Premium valid until: <strong>(?P<D>\d{1,2})\w{1,2} (?P<M>\w{3}), (?P<Y>\d{4})</strong>'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("http://www.filefactory.com/account/", req=req)
m = re.search(self.VALID_UNTIL_PATTERN, html)
@@ -45,4 +45,4 @@ class FilefactoryCom(Account):
"Submit" : "Sign In"}, req=req)
if req.lastEffectiveURL != "http://www.filefactory.com/account/":
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py
index 459c70c95..5b4092681 100644
--- a/module/plugins/accounts/FilejungleCom.py
+++ b/module/plugins/accounts/FilejungleCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class FilejungleCom(Account):
__name__ = "FilejungleCom"
__type__ = "account"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = """Filejungle.com account plugin"""
__license__ = "GPLv3"
@@ -23,7 +23,7 @@ class FilejungleCom(Account):
LOGIN_FAILED_PATTERN = r'<span htmlfor="loginUser(Name|Password)" generated="true" class="fail_info">'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load(self.URL + "dashboard.php", req=req)
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
if m:
@@ -46,4 +46,4 @@ class FilejungleCom(Account):
"recaptcha_shortencode_field": ""}, req=req)
if re.search(self.LOGIN_FAILED_PATTERN, html):
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py
index 7c743f56a..820185497 100644
--- a/module/plugins/accounts/FileomCom.py
+++ b/module/plugins/accounts/FileomCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class FileomCom(XFSAccount):
__name__ = "FileomCom"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Fileom.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
index 9ab900831..acee71912 100644
--- a/module/plugins/accounts/FilerNet.py
+++ b/module/plugins/accounts/FilerNet.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class FilerNet(Account):
__name__ = "FilerNet"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """Filer.net account plugin"""
__license__ = "GPLv3"
@@ -22,7 +22,7 @@ class FilerNet(Account):
FREE_PATTERN = r'Account Status</th>\s*<td>\s*Free'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("https://filer.net/profile", req=req)
#: Free user
@@ -34,11 +34,11 @@ class FilerNet(Account):
if until and traffic:
validuntil = time.mktime(time.strptime(until.group(1), "%d.%m.%Y %H:%M:%S"))
- trafficleft = self.parseTraffic(traffic.group(1))
+ trafficleft = self.parse_traffic(traffic.group(1))
return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
else:
- self.logError(_("Unable to retrieve account information"))
+ self.log_error(_("Unable to retrieve account information"))
return {"premium": False, "validuntil": None, "trafficleft": None}
@@ -55,4 +55,4 @@ class FilerNet(Account):
"_target_path": "https://filer.net/"}, req=req)
if 'Logout' not in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py
index 4c6755293..6c34ab04c 100644
--- a/module/plugins/accounts/FilerioCom.py
+++ b/module/plugins/accounts/FilerioCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class FilerioCom(XFSAccount):
__name__ = "FilerioCom"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """FileRio.in account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py
index a1f86f7b5..c8490bf2f 100644
--- a/module/plugins/accounts/FilesMailRu.py
+++ b/module/plugins/accounts/FilesMailRu.py
@@ -6,14 +6,14 @@ from module.plugins.internal.Account import Account
class FilesMailRu(Account):
__name__ = "FilesMailRu"
__type__ = "account"
- __version__ = "0.12"
+ __version__ = "0.13"
__description__ = """Filesmail.ru account plugin"""
__license__ = "GPLv3"
__authors__ = [("RaNaN", "RaNaN@pyload.org")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
return {"validuntil": None, "trafficleft": None}
@@ -27,4 +27,4 @@ class FilesMailRu(Account):
"Page": "http://files.mail.ru/"}, req=req)
if "НеверМПе ОЌя пПльзПвателя ОлО парПль" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index bda6efc8d..5c6c15167 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -9,15 +9,15 @@ from module.common.json_layer import json_loads
class FileserveCom(Account):
__name__ = "FileserveCom"
__type__ = "account"
- __version__ = "0.21"
+ __version__ = "0.22"
__description__ = """Fileserve.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("mkaay", "mkaay@mkaay.de")]
- def loadAccountInfo(self, user, req):
- data = self.getAccountData(user)
+ def load_account_info(self, user, req):
+ data = self.get_account_data(user)
html = self.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'],
"submit": "Submit+Query"}, req=req)
@@ -36,9 +36,9 @@ class FileserveCom(Account):
res = json_loads(html)
if not res['type']:
- self.wrongPassword()
+ self.wrong_password()
- #login at fileserv html
+ # login at fileserv html
self.load("http://www.fileserve.com/login.php",
post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked",
"loginFormSubmit": "Login"}, req=req)
diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py
index 2f79d944c..9471e49ca 100644
--- a/module/plugins/accounts/FourSharedCom.py
+++ b/module/plugins/accounts/FourSharedCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account
class FourSharedCom(Account):
__name__ = "FourSharedCom"
__type__ = "account"
- __version__ = "0.05"
+ __version__ = "0.06"
__description__ = """FourShared.com account plugin"""
__license__ = "GPLv3"
@@ -14,7 +14,7 @@ class FourSharedCom(Account):
("stickell", "l.stickell@yahoo.it")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
#: Free mode only for now
return {"premium": False}
@@ -30,4 +30,4 @@ class FourSharedCom(Account):
'returnTo' : "http://www.4shared.com/account/home.jsp"}, req=req)
if 'Please log in to access your 4shared account' in res:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index b33790071..7548338f4 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -9,14 +9,14 @@ from module.plugins.internal.Account import Account
class FreakshareCom(Account):
__name__ = "FreakshareCom"
__type__ = "account"
- __version__ = "0.14"
+ __version__ = "0.15"
__description__ = """Freakshare.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("RaNaN", "RaNaN@pyload.org")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
premium = False
validuntil = None
trafficleft = None
@@ -32,7 +32,7 @@ class FreakshareCom(Account):
try:
m = re.search(r'Traffic verbleibend:</td>\s*<td>([^<]+)', html, re.M)
- trafficleft = self.parseTraffic(m.group(1))
+ trafficleft = self.parse_traffic(m.group(1))
except Exception:
pass
@@ -47,4 +47,4 @@ class FreakshareCom(Account):
post={"submit": "Login", "user": user, "pass": data['password']}, req=req)
if ">Wrong Username or Password" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py
index b9a0acea7..95977bd0f 100644
--- a/module/plugins/accounts/FreeWayMe.py
+++ b/module/plugins/accounts/FreeWayMe.py
@@ -7,21 +7,21 @@ from module.common.json_layer import json_loads
class FreeWayMe(Account):
__name__ = "FreeWayMe"
__type__ = "account"
- __version__ = "0.15"
+ __version__ = "0.16"
__description__ = """FreeWayMe account plugin"""
__license__ = "GPLv3"
__authors__ = [("Nicolas Giese", "james@free-way.me")]
- def loadAccountInfo(self, user, req):
- status = self.getAccountStatus(user, req)
+ def load_account_info(self, user, req):
+ status = self.get_account_status(user, req)
- self.logDebug(status)
+ self.log_debug(status)
account_info = {"validuntil": -1, "premium": False}
if status['premium'] == "Free":
- account_info['trafficleft'] = self.parseTraffic(status['guthaben'] + "MB")
+ account_info['trafficleft'] = self.parse_traffic(status['guthaben'] + "MB")
elif status['premium'] == "Spender":
account_info['trafficleft'] = -1
elif status['premium'] == "Flatrate":
@@ -33,20 +33,20 @@ class FreeWayMe(Account):
def login(self, user, data, req):
- status = self.getAccountStatus(user, req)
+ status = self.get_account_status(user, req)
#: Check if user and password are valid
if not status:
- self.wrongPassword()
+ self.wrong_password()
- def getAccountStatus(self, user, req):
+ def get_account_status(self, user, req):
answer = self.load("http://www.free-way.bz/ajax/jd.php", #@TODO: Revert to `https` in 0.4.10
- get={"id": 4, "user": user, "pass": self.getAccountData(user)['password']})
+ get={"id": 4, "user": user, "pass": self.get_account_data(user)['password']})
- self.logDebug("Login: %s" % answer)
+ self.log_debug("Login: %s" % answer)
if answer == "Invalid login":
- self.wrongPassword()
+ self.wrong_password()
return json_loads(answer)
diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py
index 67aafae86..3149d6548 100644
--- a/module/plugins/accounts/FshareVn.py
+++ b/module/plugins/accounts/FshareVn.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class FshareVn(Account):
__name__ = "FshareVn"
__type__ = "account"
- __version__ = "0.10"
+ __version__ = "0.11"
__description__ = """Fshare.vn account plugin"""
__license__ = "GPLv3"
@@ -23,19 +23,19 @@ class FshareVn(Account):
DIRECT_DOWNLOAD_PATTERN = ur'<input type="checkbox"\s*([^=>]*)[^>]*/>Kích hoạt download trực tiếp</dt>'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("http://www.fshare.vn/account_info.php", req=req)
if re.search(self.LIFETIME_PATTERN, html):
- self.logDebug("Lifetime membership detected")
- trafficleft = self.getTrafficLeft()
+ self.log_debug("Lifetime membership detected")
+ trafficleft = self.get_traffic_left()
return {"validuntil": -1, "trafficleft": trafficleft, "premium": True}
m = re.search(self.VALID_UNTIL_PATTERN, html)
if m:
premium = True
validuntil = time.mktime(time.strptime(m.group(1), '%I:%M:%S %p %d-%m-%Y'))
- trafficleft = self.getTrafficLeft()
+ trafficleft = self.get_traffic_left()
else:
premium = False
validuntil = None
@@ -53,9 +53,9 @@ class FshareVn(Account):
referer=True, req=req)
if not re.search(r'<img\s+alt="VIP"', html):
- self.wrongPassword()
+ self.wrong_password()
- def getTrafficLeft(self):
+ def get_traffic_left(self):
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
- return self.parseTraffic(m.group(1) + m.group(2)) if m else 0
+ return self.parse_traffic(m.group(1) + m.group(2)) if m else 0
diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py
index 145ba47be..bebe0e2d6 100644
--- a/module/plugins/accounts/Ftp.py
+++ b/module/plugins/accounts/Ftp.py
@@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account
class Ftp(Account):
__name__ = "Ftp"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Ftp dummy account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index a1f50eb8b..76a9597ee 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class HellshareCz(Account):
__name__ = "HellshareCz"
__type__ = "account"
- __version__ = "0.17"
+ __version__ = "0.18"
__description__ = """Hellshare.cz account plugin"""
__license__ = "GPLv3"
@@ -19,7 +19,7 @@ class HellshareCz(Account):
CREDIT_LEFT_PATTERN = r'<div class="credit-link">\s*<table>\s*<tr>\s*<th>(\d+|\d\d\.\d\d\.)</th>'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
self.relogin(user)
html = self.load("http://www.hellshare.com/", req=req)
@@ -33,18 +33,18 @@ class HellshareCz(Account):
premium = True
try:
if "." in credit:
- #Time-based account
+ # Time-based account
vt = [int(x) for x in credit.split('.')[:2]]
lt = time.localtime()
year = lt.tm_year + int(vt[1] < lt.tm_mon or (vt[1] == lt.tm_mon and vt[0] < lt.tm_mday))
validuntil = time.mktime(time.strptime("%s%d 23:59:59" % (credit, year), "%d.%m.%Y %H:%M:%S"))
trafficleft = -1
else:
- #Traffic-based account
- trafficleft = self.parseTraffic(credit + "MB")
+ # Traffic-based account
+ trafficleft = self.parse_traffic(credit + "MB")
validuntil = -1
except Exception, e:
- self.logError(_("Unable to parse credit info"), e)
+ self.log_error(_("Unable to parse credit info"), e)
validuntil = -1
trafficleft = -1
@@ -54,18 +54,18 @@ class HellshareCz(Account):
def login(self, user, data, req):
html = self.load('http://www.hellshare.com/', req=req)
if req.lastEffectiveURL != 'http://www.hellshare.com/':
- #Switch to English
- self.logDebug("Switch lang - URL: %s" % req.lastEffectiveURL)
+ # Switch to English
+ self.log_debug("Switch lang - URL: %s" % req.lastEffectiveURL)
json = self.load("%s?do=locRouter-show" % req.lastEffectiveURL, req=req)
hash = re.search(r"(\-\-[0-9a-f]+\-)", json).group(1)
- self.logDebug("Switch lang - HASH: %s" % hash)
+ self.log_debug("Switch lang - HASH: %s" % hash)
html = self.load('http://www.hellshare.com/%s/' % hash, req=req)
if re.search(self.CREDIT_LEFT_PATTERN, html):
- self.logDebug("Already logged in")
+ self.log_debug("Already logged in")
return
html = self.load('https://www.hellshare.com/login?do=loginForm-submit',
@@ -75,4 +75,4 @@ class HellshareCz(Account):
"perm_login": "on"}, req=req)
if "<p>You input a wrong user name or wrong password</p>" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py
index d85db9769..f6baaa0a1 100644
--- a/module/plugins/accounts/HighWayMe.py
+++ b/module/plugins/accounts/HighWayMe.py
@@ -7,21 +7,21 @@ from module.plugins.internal.Account import Account
class HighWayMe(Account):
__name__ = "HighWayMe.py"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """High-Way.me account plugin"""
__license__ = "GPLv3"
__authors__ = [("EvolutionClip", "evolutionclip@live.de")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
premium = False
validuntil = -1
trafficleft = None
json_data = self.load('https://high-way.me/api.php?user', req=req)
- self.logDebug("JSON data: %s" % json_data)
+ self.log_debug("JSON data: %s" % json_data)
json_data = json_loads(json_data)
@@ -44,4 +44,4 @@ class HighWayMe(Account):
post={'login': '1', 'user': user, 'pass': data['password']}, req=req)
if 'UserOrPassInvalid' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py
index 2f12e56d9..369deade4 100644
--- a/module/plugins/accounts/Http.py
+++ b/module/plugins/accounts/Http.py
@@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account
class Http(Account):
__name__ = "Http"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Http dummy account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py
index 5da3bbc37..9fd7b319b 100644
--- a/module/plugins/accounts/HugefilesNet.py
+++ b/module/plugins/accounts/HugefilesNet.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class HugefilesNet(XFSAccount):
__name__ = "HugefilesNet"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Hugefiles.net account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py
index 319a3feee..f8dcd2252 100644
--- a/module/plugins/accounts/HundredEightyUploadCom.py
+++ b/module/plugins/accounts/HundredEightyUploadCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class HundredEightyUploadCom(XFSAccount):
__name__ = "HundredEightyUploadCom"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """180upload.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/JunkyvideoCom.py b/module/plugins/accounts/JunkyvideoCom.py
index 8275ff176..f4c12affb 100644
--- a/module/plugins/accounts/JunkyvideoCom.py
+++ b/module/plugins/accounts/JunkyvideoCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class JunkyvideoCom(XFSAccount):
__name__ = "JunkyvideoCom"
__type__ = "account"
- __version__ = "0.01"
+ __version__ = "0.02"
__description__ = """Junkyvideo.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/JunocloudMe.py b/module/plugins/accounts/JunocloudMe.py
index b0fc160f3..a72b1a634 100644
--- a/module/plugins/accounts/JunocloudMe.py
+++ b/module/plugins/accounts/JunocloudMe.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class JunocloudMe(XFSAccount):
__name__ = "JunocloudMe"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Junocloud.me account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/Keep2ShareCc.py b/module/plugins/accounts/Keep2ShareCc.py
index 617e18f25..71c099bea 100644
--- a/module/plugins/accounts/Keep2ShareCc.py
+++ b/module/plugins/accounts/Keep2ShareCc.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class Keep2ShareCc(Account):
__name__ = "Keep2ShareCc"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """Keep2Share.cc account plugin"""
__license__ = "GPLv3"
@@ -23,7 +23,7 @@ class Keep2ShareCc(Account):
LOGIN_FAIL_PATTERN = r'Please fix the following input errors'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = None
trafficleft = -1
premium = False
@@ -33,7 +33,7 @@ class Keep2ShareCc(Account):
m = re.search(self.VALID_UNTIL_PATTERN, html)
if m:
expiredate = m.group(1).strip()
- self.logDebug("Expire date: " + expiredate)
+ self.log_debug("Expire date: " + expiredate)
if expiredate == "LifeTime":
premium = True
@@ -43,7 +43,7 @@ class Keep2ShareCc(Account):
validuntil = time.mktime(time.strptime(expiredate, "%Y.%m.%d"))
except Exception, e:
- self.logError(e)
+ self.log_error(e)
else:
premium = True if validuntil > time.mktime(time.gmtime()) else False
@@ -51,10 +51,10 @@ class Keep2ShareCc(Account):
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
if m:
try:
- trafficleft = self.parseTraffic(m.group(1))
+ trafficleft = self.parse_traffic(m.group(1))
except Exception, e:
- self.logError(e)
+ self.log_error(e)
return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
@@ -69,4 +69,4 @@ class Keep2ShareCc(Account):
'yt0' : ""}, req=req)
if re.search(self.LOGIN_FAIL_PATTERN, html):
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py
index 811abd971..6b8fcf960 100644
--- a/module/plugins/accounts/LetitbitNet.py
+++ b/module/plugins/accounts/LetitbitNet.py
@@ -7,23 +7,23 @@ from module.plugins.internal.Account import Account
class LetitbitNet(Account):
__name__ = "LetitbitNet"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """Letitbit.net account plugin"""
__license__ = "GPLv3"
__authors__ = [("stickell", "l.stickell@yahoo.it")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
## DISABLED BECAUSE IT GET 'key exausted' EVEN IF VALID ##
- # api_key = self.getAccountData(user)['password']
+ # api_key = self.get_account_data(user)['password']
# json_data = [api_key, ['key/info']]
# api_rep = self.load('http://api.letitbit.net/json', post={'r': json_dumps(json_data)}, req=req)
- # self.logDebug("API Key Info: " + api_rep)
+ # self.log_debug("API Key Info: " + api_rep)
# api_rep = json_loads(api_rep)
#
# if api_rep['status'] == 'FAIL':
- # self.logWarning(api_rep['data'])
+ # self.log_warning(api_rep['data'])
# return {'valid': False, 'premium': False}
return {"premium": True}
@@ -31,4 +31,4 @@ class LetitbitNet(Account):
def login(self, user, data, req):
#: API_KEY is the username and the PREMIUM_KEY is the password
- self.logInfo(_("You must use your API KEY as username and the PREMIUM KEY as password"))
+ self.log_info(_("You must use your API KEY as username and the PREMIUM KEY as password"))
diff --git a/module/plugins/accounts/LinestorageCom.py b/module/plugins/accounts/LinestorageCom.py
index a48d5beb9..6f6f21c4f 100644
--- a/module/plugins/accounts/LinestorageCom.py
+++ b/module/plugins/accounts/LinestorageCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class LinestorageCom(XFSAccount):
__name__ = "LinestorageCom"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """Linestorage.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/LinksnappyCom.py b/module/plugins/accounts/LinksnappyCom.py
index 4a475bd24..466495ac0 100644
--- a/module/plugins/accounts/LinksnappyCom.py
+++ b/module/plugins/accounts/LinksnappyCom.py
@@ -9,19 +9,19 @@ from module.common.json_layer import json_loads
class LinksnappyCom(Account):
__name__ = "LinksnappyCom"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """Linksnappy.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("stickell", "l.stickell@yahoo.it")]
- def loadAccountInfo(self, user, req):
- data = self.getAccountData(user)
+ def load_account_info(self, user, req):
+ data = self.get_account_data(user)
r = self.load('http://gen.linksnappy.com/lseAPI.php',
get={'act': 'USERDETAILS', 'username': user, 'password': hashlib.md5(data['password'], req=req).hexdigest()})
- self.logDebug("JSON data: " + r)
+ self.log_debug("JSON data: " + r)
j = json_loads(r)
@@ -42,7 +42,7 @@ class LinksnappyCom(Account):
if 'trafficleft' not in j['return'] or isinstance(j['return']['trafficleft'], str):
trafficleft = -1
else:
- trafficleft = self.parseTraffic("%d MB" % j['return']['trafficleft'])
+ trafficleft = self.parse_traffic("%d MB" % j['return']['trafficleft'])
return {'premium' : True ,
'validuntil' : validuntil ,
@@ -56,4 +56,4 @@ class LinksnappyCom(Account):
'password': hashlib.md5(data['password'], req=req).hexdigest()})
if "Invalid Account Details" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py
index 53c67833c..7a6e36f05 100644
--- a/module/plugins/accounts/MegaDebridEu.py
+++ b/module/plugins/accounts/MegaDebridEu.py
@@ -7,7 +7,7 @@ from module.common.json_layer import json_loads
class MegaDebridEu(Account):
__name__ = "MegaDebridEu"
__type__ = "account"
- __version__ = "0.21"
+ __version__ = "0.22"
__description__ = """Mega-debrid.eu account plugin"""
__license__ = "GPLv3"
@@ -18,8 +18,8 @@ class MegaDebridEu(Account):
API_URL = "https://www.mega-debrid.eu/api.php"
- def loadAccountInfo(self, user, req):
- data = self.getAccountData(user)
+ def load_account_info(self, user, req):
+ data = self.get_account_data(user)
jsonResponse = self.load(self.API_URL,
get={'action': 'connectUser', 'login': user, 'password': data['password']}, req=req)
res = json_loads(jsonResponse)
@@ -27,7 +27,7 @@ class MegaDebridEu(Account):
if res['response_code'] == "ok":
return {"premium": True, "validuntil": float(res['vip_end']), "status": True}
else:
- self.logError(res)
+ self.log_error(res)
return {"status": False, "premium": False}
@@ -36,4 +36,4 @@ class MegaDebridEu(Account):
get={'action': 'connectUser', 'login': user, 'password': data['password']}, req=req)
res = json_loads(jsonResponse)
if res['response_code'] != "ok":
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py
index af23b7bf3..c8650ed8e 100644
--- a/module/plugins/accounts/MegaRapidCz.py
+++ b/module/plugins/accounts/MegaRapidCz.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class MegaRapidCz(Account):
__name__ = "MegaRapidCz"
__type__ = "account"
- __version__ = "0.36"
+ __version__ = "0.37"
__description__ = """MegaRapid.cz account plugin"""
__license__ = "GPLv3"
@@ -24,12 +24,12 @@ class MegaRapidCz(Account):
TRAFFIC_LEFT_PATTERN = r'<tr><td>Kredit</td><td>(.*?) GiB'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
htmll = self.load("http://megarapid.cz/mujucet/", req=req)
m = re.search(self.LIMITDL_PATTERN, htmll)
if m:
- data = self.getAccountData(user)
+ data = self.get_account_data(user)
data['options']['limitDL'] = [int(m.group(1))]
m = re.search(self.VALID_UNTIL_PATTERN, htmll)
diff --git a/module/plugins/accounts/MegaRapidoNet.py b/module/plugins/accounts/MegaRapidoNet.py
index de1c775c7..ddb7e090a 100644
--- a/module/plugins/accounts/MegaRapidoNet.py
+++ b/module/plugins/accounts/MegaRapidoNet.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class MegaRapidoNet(Account):
__name__ = "MegaRapidoNet"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """MegaRapido.net account plugin"""
__license__ = "GPLv3"
@@ -20,7 +20,7 @@ class MegaRapidoNet(Account):
USER_ID_PATTERN = r'<\s*?div[^>]*?class\s*?=\s*?["\']checkbox_compartilhar["\'].*?>.*?<\s*?input[^>]*?name\s*?=\s*?["\']usar["\'].*?>.*?<\s*?input[^>]*?name\s*?=\s*?["\']user["\'][^>]*?value\s*?=\s*?["\'](.*?)\s*?["\']'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = None
trafficleft = None
premium = False
@@ -29,7 +29,7 @@ class MegaRapidoNet(Account):
validuntil = re.search(self.VALID_UNTIL_PATTERN, html)
if validuntil:
- #hier weitermachen!!! (mÌssen umbedingt die zeit richtig machen damit! (sollte aber möglich))
+ # hier weitermachen!!! (mÌssen umbedingt die zeit richtig machen damit! (sollte aber möglich))
validuntil = time.time() + int(validuntil.group(1)) * 24 * 3600 + int(validuntil.group(2)) * 3600 + int(validuntil.group(3)) * 60 + int(validuntil.group(4))
trafficleft = -1
premium = True
@@ -47,7 +47,7 @@ class MegaRapidoNet(Account):
html = self.load("http://megarapido.net/gerador", req=req)
if "sair" not in html.lower():
- self.wrongPassword()
+ self.wrong_password()
else:
m = re.search(self.USER_ID_PATTERN, html)
if m:
diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py
index af0987ed3..3aa26692c 100644
--- a/module/plugins/accounts/MegasharesCom.py
+++ b/module/plugins/accounts/MegasharesCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class MegasharesCom(Account):
__name__ = "MegasharesCom"
__type__ = "account"
- __version__ = "0.04"
+ __version__ = "0.05"
__description__ = """Megashares.com account plugin"""
__license__ = "GPLv3"
@@ -19,8 +19,8 @@ class MegasharesCom(Account):
VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>'
- def loadAccountInfo(self, user, req):
- #self.relogin(user)
+ def load_account_info(self, user, req):
+ # self.relogin(user)
html = self.load("http://d01.megashares.com/myms.php", req=req)
premium = False if '>Premium Upgrade<' in html else True
@@ -28,10 +28,10 @@ class MegasharesCom(Account):
validuntil = trafficleft = -1
try:
timestr = re.search(self.VALID_UNTIL_PATTERN, html).group(1)
- self.logDebug(timestr)
+ self.log_debug(timestr)
validuntil = time.mktime(time.strptime(timestr, "%b %d, %Y"))
except Exception, e:
- self.logError(e)
+ self.log_error(e)
return {"validuntil": validuntil, "trafficleft": -1, "premium": premium}
@@ -44,4 +44,4 @@ class MegasharesCom(Account):
"mymspassword" : data['password']}, req=req)
if not '<span class="b ml">%s</span>' % user in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py
index 6128cddc8..885204615 100644
--- a/module/plugins/accounts/MovReelCom.py
+++ b/module/plugins/accounts/MovReelCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class MovReelCom(XFSAccount):
__name__ = "MovReelCom"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """Movreel.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/MultihostersCom.py b/module/plugins/accounts/MultihostersCom.py
index e98f17b2d..65c6ea778 100644
--- a/module/plugins/accounts/MultihostersCom.py
+++ b/module/plugins/accounts/MultihostersCom.py
@@ -6,7 +6,7 @@ from module.plugins.accounts.ZeveraCom import ZeveraCom
class MultihostersCom(ZeveraCom):
__name__ = "MultihostersCom"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """Multihosters.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index be947f7f2..ddb605ac7 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account
class MultishareCz(Account):
__name__ = "MultishareCz"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """Multishare.cz account plugin"""
__license__ = "GPLv3"
@@ -19,12 +19,12 @@ class MultishareCz(Account):
ACCOUNT_INFO_PATTERN = r'<input type="hidden" id="(u_ID|u_hash)" name=".+?" value="(.+?)">'
- def loadAccountInfo(self, user, req):
- #self.relogin(user)
+ def load_account_info(self, user, req):
+ # self.relogin(user)
html = self.load("http://www.multishare.cz/profil/", req=req)
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
- trafficleft = self.parseTraffic(m.group('S') + m.group('U')) if m else 0
+ trafficleft = self.parse_traffic(m.group('S') + m.group('U')) if m else 0
self.premium = True if trafficleft else False
html = self.load("http://www.multishare.cz/", req=req)
@@ -40,4 +40,4 @@ class MultishareCz(Account):
"jmeno": user}, req=req)
if '<div class="akce-chyba akce">' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py
index 258c99346..aa2dde191 100644
--- a/module/plugins/accounts/MyfastfileCom.py
+++ b/module/plugins/accounts/MyfastfileCom.py
@@ -9,19 +9,19 @@ from module.plugins.internal.Account import Account
class MyfastfileCom(Account):
__name__ = "MyfastfileCom"
__type__ = "account"
- __version__ = "0.05"
+ __version__ = "0.06"
__description__ = """Myfastfile.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("stickell", "l.stickell@yahoo.it")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
if 'days_left' in self.json_data:
validuntil = time.time() + self.json_data['days_left'] * 24 * 60 * 60
return {"premium": True, "validuntil": validuntil, "trafficleft": -1}
else:
- self.logError(_("Unable to get account information"))
+ self.log_error(_("Unable to get account information"))
def login(self, user, data, req):
@@ -29,9 +29,9 @@ class MyfastfileCom(Account):
html = self.load("https://myfastfile.com/api.php",
get={"user": user, "pass": data['password']}, req=req)
- self.logDebug("JSON data: " + html)
+ self.log_debug("JSON data: " + html)
self.json_data = json_loads(html)
if self.json_data['status'] != 'ok':
- self.logError(_('Invalid login. The password to use is the API-Password you find in your "My Account" page'))
- self.wrongPassword()
+ self.log_error(_('Invalid login. The password to use is the API-Password you find in your "My Account" page'))
+ self.wrong_password()
diff --git a/module/plugins/accounts/NitroflareCom.py b/module/plugins/accounts/NitroflareCom.py
index cc2f4e232..c17f0b8b4 100644
--- a/module/plugins/accounts/NitroflareCom.py
+++ b/module/plugins/accounts/NitroflareCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class NitroflareCom(Account):
__name__ = "NitroflareCom"
__type__ = "account"
- __version__ = "0.05"
+ __version__ = "0.06"
__description__ = """Nitroflare.com account plugin"""
__license__ = "GPLv3"
@@ -23,7 +23,7 @@ class NitroflareCom(Account):
TOKEN_PATTERN = r'name="token" value="(.+?)"'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = -1
trafficleft = None
premium = False
@@ -34,16 +34,16 @@ class NitroflareCom(Account):
m = re.search(self.VALID_UNTIL_PATTERN, html)
if m:
expiredate = m.group(1).strip()
- self.logDebug("Time Left: " + expiredate)
+ self.log_debug("Time Left: " + expiredate)
try:
validuntil = sum(int(v) * {'day': 24 * 3600, 'hour': 3600, 'minute': 60}[u.lower()] for v, u in
re.findall(r'(\d+)\s*(day|hour|minute)', expiredate, re.I))
except Exception, e:
- self.logError(e)
+ self.log_error(e)
else:
- self.logDebug("Valid until: %s" % validuntil)
+ self.log_debug("Valid until: %s" % validuntil)
if validuntil:
validuntil += time.time()
@@ -54,12 +54,12 @@ class NitroflareCom(Account):
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
if m:
try:
- trafficleft = self.parseTraffic(str(max(0, 50 - float(m.group(1)))) + " GB")
+ trafficleft = self.parse_traffic(str(max(0, 50 - float(m.group(1)))) + " GB")
except Exception, e:
- self.logError(e)
+ self.log_error(e)
else:
- self.logDebug("TRAFFIC_LEFT_PATTERN not found")
+ self.log_debug("TRAFFIC_LEFT_PATTERN not found")
return {'validuntil' : validuntil,
'trafficleft': trafficleft,
@@ -78,4 +78,4 @@ class NitroflareCom(Account):
'token' : token}, req=req)
if re.search(self.LOGIN_FAIL_PATTERN, html):
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/NoPremiumPl.py b/module/plugins/accounts/NoPremiumPl.py
index 01060250b..6f82f3c97 100644
--- a/module/plugins/accounts/NoPremiumPl.py
+++ b/module/plugins/accounts/NoPremiumPl.py
@@ -11,7 +11,7 @@ from module.plugins.internal.Account import Account
class NoPremiumPl(Account):
__name__ = "NoPremiumPl"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = "NoPremium.pl account plugin"
__license__ = "GPLv3"
@@ -31,10 +31,10 @@ class NoPremiumPl(Account):
_pwd = None
- def loadAccountInfo(self, name, req):
+ def load_account_info(self, name, req):
self._req = req
try:
- result = json_loads(self.runAuthQuery())
+ result = json_loads(self.run_auth_query())
except Exception:
#@TODO: return or let it be thrown?
return
@@ -59,23 +59,23 @@ class NoPremiumPl(Account):
self._req = req
try:
- response = json_loads(self.runAuthQuery())
+ response = json_loads(self.run_auth_query())
except Exception:
- self.wrongPassword()
+ self.wrong_password()
if "errno" in response.keys():
- self.wrongPassword()
+ self.wrong_password()
data['usr'] = self._usr
data['pwd'] = self._pwd
- def createAuthQuery(self):
+ def create_auth_query(self):
query = self.API_QUERY
query['username'] = self._usr
query['password'] = self._pwd
return query
- def runAuthQuery(self):
- return self._self.load(self.API_URL, post=self.createAuthQuery(), req=req)
+ def run_auth_query(self):
+ return self._self.load(self.API_URL, post=self.create_auth_query(), req=req)
diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py
index e523ee2f4..9fb1a6484 100644
--- a/module/plugins/accounts/NosuploadCom.py
+++ b/module/plugins/accounts/NosuploadCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class NosuploadCom(XFSAccount):
__name__ = "NosuploadCom"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Nosupload.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py
index ab61bf0fc..077312c9d 100644
--- a/module/plugins/accounts/NovafileCom.py
+++ b/module/plugins/accounts/NovafileCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class NovafileCom(XFSAccount):
__name__ = "NovafileCom"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Novafile.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/NowVideoSx.py b/module/plugins/accounts/NowVideoSx.py
index 81267d413..e679367d6 100644
--- a/module/plugins/accounts/NowVideoSx.py
+++ b/module/plugins/accounts/NowVideoSx.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class NowVideoSx(Account):
__name__ = "NowVideoSx"
__type__ = "account"
- __version__ = "0.04"
+ __version__ = "0.05"
__description__ = """NowVideo.at account plugin"""
__license__ = "GPLv3"
@@ -19,7 +19,7 @@ class NowVideoSx(Account):
VALID_UNTIL_PATTERN = r'>Your premium membership expires on: (.+?)<'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = None
trafficleft = -1
premium = None
@@ -29,13 +29,13 @@ class NowVideoSx(Account):
m = re.search(self.VALID_UNTIL_PATTERN, html)
if m:
expiredate = m.group(1).strip()
- self.logDebug("Expire date: " + expiredate)
+ self.log_debug("Expire date: " + expiredate)
try:
validuntil = time.mktime(time.strptime(expiredate, "%Y-%b-%d"))
except Exception, e:
- self.logError(e)
+ self.log_error(e)
else:
if validuntil > time.mktime(time.gmtime()):
@@ -52,4 +52,4 @@ class NowVideoSx(Account):
post={'user': user, 'pass': data['password']}, req=req)
if re.search(r'>Log In<', html):
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py
index 96ef51f1e..958613e9e 100644
--- a/module/plugins/accounts/OboomCom.py
+++ b/module/plugins/accounts/OboomCom.py
@@ -23,31 +23,31 @@ from module.plugins.internal.Account import Account
class OboomCom(Account):
__name__ = "OboomCom"
__type__ = "account"
- __version__ = "0.25"
+ __version__ = "0.26"
__description__ = """Oboom.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("stanley", "stanley.foerster@gmail.com")]
- def loadAccountData(self, user, req):
- passwd = self.getAccountData(user)['password']
+ def load_account_data(self, user, req):
+ passwd = self.get_account_data(user)['password']
salt = passwd[::-1]
pbkdf2 = PBKDF2(passwd, salt, 1000).hexread(16)
result = json_loads(self.load("https://www.oboom.com/1/login", get={"auth": user, "pass": pbkdf2}), req=req)
if not result[0] == 200:
- self.logWarning(_("Failed to log in: %s") % result[1])
- self.wrongPassword()
+ self.log_warning(_("Failed to log in: %s") % result[1])
+ self.wrong_password()
return result[1]
- def loadAccountInfo(self, name, req):
- accountData = self.loadAccountData(name, req)
+ def load_account_info(self, name, req):
+ account_data = self.load_account_data(name, req)
- userData = accountData['user']
+ userData = account_data['user']
if userData['premium'] == "null":
premium = False
@@ -64,7 +64,7 @@ class OboomCom(Account):
trafficLeft = traffic['current'] / 1024 #@TODO: Remove `/ 1024` in 0.4.10
maxTraffic = traffic['max'] / 1024 #@TODO: Remove `/ 1024` in 0.4.10
- session = accountData['session']
+ session = account_data['session']
return {'premium' : premium,
'validuntil' : validUntil,
@@ -74,4 +74,4 @@ class OboomCom(Account):
def login(self, user, data, req):
- self.loadAccountData(user, req)
+ self.load_account_data(user, req)
diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py
index 3a345bd9f..12be92c3e 100644
--- a/module/plugins/accounts/OneFichierCom.py
+++ b/module/plugins/accounts/OneFichierCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account
class OneFichierCom(Account):
__name__ = "OneFichierCom"
__type__ = "account"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = """1fichier.com account plugin"""
__license__ = "GPLv3"
@@ -21,7 +21,7 @@ class OneFichierCom(Account):
VALID_UNTIL_PATTERN = r'Your Premium Status will end the (\d+/\d+/\d+)'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = None
trafficleft = -1
premium = None
@@ -31,12 +31,12 @@ class OneFichierCom(Account):
m = re.search(self.VALID_UNTIL_PATTERN, html)
if m:
expiredate = m.group(1)
- self.logDebug("Expire date: " + expiredate)
+ self.log_debug("Expire date: " + expiredate)
try:
validuntil = time.mktime(time.strptime(expiredate, "%d/%m/%Y"))
except Exception, e:
- self.logError(e)
+ self.log_error(e)
else:
premium = True
@@ -54,4 +54,4 @@ class OneFichierCom(Account):
'valider': "Send"}, req=req)
if '>Invalid email address' in html or '>Invalid password' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py
index 898c122cd..d47a579f2 100644
--- a/module/plugins/accounts/OverLoadMe.py
+++ b/module/plugins/accounts/OverLoadMe.py
@@ -7,21 +7,21 @@ from module.common.json_layer import json_loads
class OverLoadMe(Account):
__name__ = "OverLoadMe"
__type__ = "account"
- __version__ = "0.05"
+ __version__ = "0.06"
__description__ = """Over-Load.me account plugin"""
__license__ = "GPLv3"
__authors__ = [("marley", "marley@over-load.me")]
- def loadAccountInfo(self, user, req):
- data = self.getAccountData(user)
+ def load_account_info(self, user, req):
+ data = self.get_account_data(user)
html = self.load("https://api.over-load.me/account.php",
get={'user': user,
'auth': data['password']}, req=req).strip()
data = json_loads(html)
- self.logDebug(data)
+ self.log_debug(data)
#: Check for premium
if data['membership'] == "Free":
@@ -38,4 +38,4 @@ class OverLoadMe(Account):
data = json_loads(jsondata)
if data['err'] == 1:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py
index fb99cfd59..639ea1529 100644
--- a/module/plugins/accounts/PremiumTo.py
+++ b/module/plugins/accounts/PremiumTo.py
@@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account
class PremiumTo(Account):
__name__ = "PremiumTo"
__type__ = "account"
- __version__ = "0.10"
+ __version__ = "0.11"
__description__ = """Premium.to account plugin"""
__license__ = "GPLv3"
@@ -15,7 +15,7 @@ class PremiumTo(Account):
("stickell", "l.stickell@yahoo.it")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
traffic = self.load("http://premium.to/api/straffic.php", #@TODO: Revert to `https` in 0.4.10
get={'username': self.username, 'password': self.password}, req=req)
@@ -33,4 +33,4 @@ class PremiumTo(Account):
get={'username': user, 'password': self.password}, req=req)
if "wrong username" in authcode:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py
index d7f0b7391..a2a6c139c 100644
--- a/module/plugins/accounts/PremiumizeMe.py
+++ b/module/plugins/accounts/PremiumizeMe.py
@@ -7,17 +7,17 @@ from module.plugins.internal.Account import Account
class PremiumizeMe(Account):
__name__ = "PremiumizeMe"
__type__ = "account"
- __version__ = "0.18"
+ __version__ = "0.19"
__description__ = """Premiumize.me account plugin"""
__license__ = "GPLv3"
__authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
#: Get user data from premiumize.me
- status = self.getAccountStatus(user, req)
- self.logDebug(status)
+ status = self.get_account_status(user, req)
+ self.log_debug(status)
#: Parse account info
account_info = {"validuntil": float(status['result']['expires']),
@@ -31,18 +31,18 @@ class PremiumizeMe(Account):
def login(self, user, data, req):
#: Get user data from premiumize.me
- status = self.getAccountStatus(user, req)
+ status = self.get_account_status(user, req)
#: Check if user and password are valid
if status['status'] != 200:
- self.wrongPassword()
+ self.wrong_password()
- def getAccountStatus(self, user, req):
+ def get_account_status(self, user, req):
#: Use premiumize.me API v1 (see https://secure.premiumize.me/?show=api)
#: to retrieve account info and return the parsed json answer
answer = self.load("http://api.premiumize.me/pm-api/v1.php", #@TODO: Revert to `https` in 0.4.10
get={'method' : "accountstatus",
'params[login]': user,
- 'params[pass]' : self.getAccountData(user)['password']})
+ 'params[pass]' : self.get_account_data(user)['password']})
return json_loads(answer)
diff --git a/module/plugins/accounts/PutdriveCom.py b/module/plugins/accounts/PutdriveCom.py
index 4f2fadbcc..61f59fd75 100644
--- a/module/plugins/accounts/PutdriveCom.py
+++ b/module/plugins/accounts/PutdriveCom.py
@@ -6,7 +6,7 @@ from module.plugins.accounts.ZeveraCom import ZeveraCom
class PutdriveCom(ZeveraCom):
__name__ = "PutdriveCom"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Putdrive.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index c3cfe6f6f..17d3bfce8 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account
class QuickshareCz(Account):
__name__ = "QuickshareCz"
__type__ = "account"
- __version__ = "0.04"
+ __version__ = "0.05"
__description__ = """Quickshare.cz account plugin"""
__license__ = "GPLv3"
@@ -18,12 +18,12 @@ class QuickshareCz(Account):
TRAFFIC_LEFT_PATTERN = r'Stav kreditu: <strong>(.+?)</strong>'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("http://www.quickshare.cz/premium", req=req)
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
if m:
- trafficleft = self.parseTraffic(m.group(1))
+ trafficleft = self.parse_traffic(m.group(1))
premium = True if trafficleft else False
else:
trafficleft = None
@@ -39,4 +39,4 @@ class QuickshareCz(Account):
"jmeno": user}, req=req)
if u'>TakovÜ uşivatel neexistuje.<' in html or u'>Špatné heslo.<' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py
index be456f2d7..d103e918d 100644
--- a/module/plugins/accounts/RPNetBiz.py
+++ b/module/plugins/accounts/RPNetBiz.py
@@ -7,16 +7,16 @@ from module.common.json_layer import json_loads
class RPNetBiz(Account):
__name__ = "RPNetBiz"
__type__ = "account"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = """RPNet.biz account plugin"""
__license__ = "GPLv3"
__authors__ = [("Dman", "dmanugm@gmail.com")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
#: Get account information from rpnet.biz
- res = self.getAccountStatus(user, req)
+ res = self.get_account_status(user, req)
try:
if res['accountInfo']['isPremium']:
#: Parse account info. Change the trafficleft later to support per host info.
@@ -26,7 +26,7 @@ class RPNetBiz(Account):
account_info = {"validuntil": None, "trafficleft": None, "premium": False}
except KeyError:
- #handle wrong password exception
+ # handle wrong password exception
account_info = {"validuntil": None, "trafficleft": None, "premium": False}
return account_info
@@ -34,18 +34,18 @@ class RPNetBiz(Account):
def login(self, user, data, req):
#: Get account information from rpnet.biz
- res = self.getAccountStatus(user, req)
+ res = self.get_account_status(user, req)
#: If we have an error in the res, we have wrong login information
if 'error' in res:
- self.wrongPassword()
+ self.wrong_password()
- def getAccountStatus(self, user, req):
+ def get_account_status(self, user, req):
#: Using the rpnet API, check if valid premium account
res = self.load("https://premium.rpnet.biz/client_api.php",
- get={"username": user, "password": self.getAccountData(user)['password'],
+ get={"username": user, "password": self.get_account_data(user)['password'],
"action": "showAccountInformation"})
- self.logDebug("JSON data: %s" % res)
+ self.log_debug("JSON data: %s" % res)
return json_loads(res)
diff --git a/module/plugins/accounts/RapideoPl.py b/module/plugins/accounts/RapideoPl.py
index f5ce2e2b1..1f4140846 100644
--- a/module/plugins/accounts/RapideoPl.py
+++ b/module/plugins/accounts/RapideoPl.py
@@ -11,7 +11,7 @@ from module.plugins.internal.Account import Account
class RapideoPl(Account):
__name__ = "RapideoPl"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = "Rapideo.pl account plugin"
__license__ = "GPLv3"
@@ -31,10 +31,10 @@ class RapideoPl(Account):
_pwd = None
- def loadAccountInfo(self, name, req):
+ def load_account_info(self, name, req):
self._req = req
try:
- result = json_loads(self.runAuthQuery())
+ result = json_loads(self.run_auth_query())
except Exception:
#@TODO: return or let it be thrown?
return
@@ -59,23 +59,23 @@ class RapideoPl(Account):
self._req = req
try:
- response = json_loads(self.runAuthQuery())
+ response = json_loads(self.run_auth_query())
except Exception:
- self.wrongPassword()
+ self.wrong_password()
if "errno" in response.keys():
- self.wrongPassword()
+ self.wrong_password()
data['usr'] = self._usr
data['pwd'] = self._pwd
- def createAuthQuery(self):
+ def create_auth_query(self):
query = self.API_QUERY
query['username'] = self._usr
query['password'] = self._pwd
return query
- def runAuthQuery(self):
- return self._self.load(self.API_URL, post=self.createAuthQuery(), req=req)
+ def run_auth_query(self):
+ return self._self.load(self.API_URL, post=self.create_auth_query(), req=req)
diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py
index c0dd7eaee..8758e799b 100644
--- a/module/plugins/accounts/RapidfileshareNet.py
+++ b/module/plugins/accounts/RapidfileshareNet.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class RapidfileshareNet(XFSAccount):
__name__ = "RapidfileshareNet"
__type__ = "account"
- __version__ = "0.05"
+ __version__ = "0.06"
__description__ = """Rapidfileshare.net account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py
index c14490dd5..c17765e12 100644
--- a/module/plugins/accounts/RapidgatorNet.py
+++ b/module/plugins/accounts/RapidgatorNet.py
@@ -7,7 +7,7 @@ from module.common.json_layer import json_loads
class RapidgatorNet(Account):
__name__ = "RapidgatorNet"
__type__ = "account"
- __version__ = "0.10"
+ __version__ = "0.11"
__description__ = """Rapidgator.net account plugin"""
__license__ = "GPLv3"
@@ -17,34 +17,34 @@ class RapidgatorNet(Account):
API_URL = "http://rapidgator.net/api/user"
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = None
trafficleft = None
premium = False
sid = None
try:
- sid = self.getAccountData(user).get('sid', None)
+ sid = self.get_account_data(user).get('sid', None)
assert sid
html = self.load("%s/info" % self.API_URL, get={'sid': sid}, req=req)
- self.logDebug("API:USERINFO", html)
+ self.log_debug("API:USERINFO", html)
json = json_loads(html)
if json['response_status'] == 200:
if "reset_in" in json['response']:
- self.scheduleRefresh(user, json['response']['reset_in'])
+ self.schedule_refresh(user, json['response']['reset_in'])
validuntil = json['response']['expire_date']
trafficleft = float(json['response']['traffic_left']) / 1024 #@TODO: Remove `/ 1024` in 0.4.10
premium = True
else:
- self.logError(json['response_details'])
+ self.log_error(json['response_details'])
except Exception, e:
- self.logError(e)
+ self.log_error(e)
return {'validuntil' : validuntil,
'trafficleft': trafficleft,
@@ -56,7 +56,7 @@ class RapidgatorNet(Account):
try:
html = self.load('%s/login' % self.API_URL, post={"username": user, "password": data['password']}, req=req)
- self.logDebug("API:LOGIN", html)
+ self.log_debug("API:LOGIN", html)
json = json_loads(html)
@@ -64,9 +64,9 @@ class RapidgatorNet(Account):
data['sid'] = str(json['response']['session_id'])
return
else:
- self.logError(json['response_details'])
+ self.log_error(json['response_details'])
except Exception, e:
- self.logError(e)
+ self.log_error(e)
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py
index 5e74e18bb..256b612a1 100644
--- a/module/plugins/accounts/RapiduNet.py
+++ b/module/plugins/accounts/RapiduNet.py
@@ -10,7 +10,7 @@ from module.common.json_layer import json_loads
class RapiduNet(Account):
__name__ = "RapiduNet"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """Rapidu.net account plugin"""
__license__ = "GPLv3"
@@ -25,7 +25,7 @@ class RapiduNet(Account):
TRAFFIC_LEFT_PATTERN = r'class="tipsyS"><b>(.+?)<'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = None
trafficleft = -1
premium = False
@@ -41,7 +41,7 @@ class RapiduNet(Account):
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
if m:
- trafficleft = self.parseTraffic(m.group(1))
+ trafficleft = self.parse_traffic(m.group(1))
return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
@@ -59,7 +59,7 @@ class RapiduNet(Account):
'pass' : data['password'],
'remember': "1"}, req=req))
- self.logDebug(json)
+ self.log_debug(json)
if not json['message'] == "success":
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py
index 577a6c8f6..e8be7925b 100644
--- a/module/plugins/accounts/RarefileNet.py
+++ b/module/plugins/accounts/RarefileNet.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class RarefileNet(XFSAccount):
__name__ = "RarefileNet"
__type__ = "account"
- __version__ = "0.04"
+ __version__ = "0.05"
__description__ = """RareFile.net account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py
index 83fdc5dbc..f16ebed27 100644
--- a/module/plugins/accounts/RealdebridCom.py
+++ b/module/plugins/accounts/RealdebridCom.py
@@ -8,14 +8,14 @@ from module.plugins.internal.Account import Account
class RealdebridCom(Account):
__name__ = "RealdebridCom"
__type__ = "account"
- __version__ = "0.47"
+ __version__ = "0.48"
__description__ = """Real-Debrid.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
if self.pin_code:
return
@@ -36,8 +36,8 @@ class RealdebridCom(Account):
get={"user": user, "pass": data['password']}, req=req)
if "Your login informations are incorrect" in html:
- self.wrongPassword()
+ self.wrong_password()
elif "PIN Code required" in html:
- self.logWarning(_("PIN code required. Please login to https://real-debrid.com using the PIN or disable the double authentication in your control panel on https://real-debrid.com"))
+ self.log_warning(_("PIN code required. Please login to https://real-debrid.com using the PIN or disable the double authentication in your control panel on https://real-debrid.com"))
self.pin_code = True
diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py
index 5f0c1253e..43c0cb029 100644
--- a/module/plugins/accounts/RehostTo.py
+++ b/module/plugins/accounts/RehostTo.py
@@ -6,14 +6,14 @@ from module.plugins.internal.Account import Account
class RehostTo(Account):
__name__ = "RehostTo"
__type__ = "account"
- __version__ = "0.17"
+ __version__ = "0.18"
__description__ = """Rehost.to account plugin"""
__license__ = "GPLv3"
__authors__ = [("RaNaN", "RaNaN@pyload.org")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
premium = False
trafficleft = None
validuntil = -1
@@ -21,7 +21,7 @@ class RehostTo(Account):
html = self.load("https://rehost.to/api.php",
get={'cmd' : "login", 'user': user,
- 'pass': self.getAccountData(user)['password']})
+ 'pass': self.get_account_data(user)['password']})
try:
session = html.split(",")[1].split("=")[1]
@@ -29,12 +29,12 @@ class RehostTo(Account):
get={'cmd': "get_premium_credits", 'long_ses': session}, req=req)
if html.strip() == "0,0" or "ERROR" in html:
- self.logDebug(html)
+ self.log_debug(html)
else:
traffic, valid = html.split(",")
premium = True
- trafficleft = self.parseTraffic(traffic + "MB")
+ trafficleft = self.parse_traffic(traffic + "MB")
validuntil = float(valid)
finally:
@@ -49,5 +49,5 @@ class RehostTo(Account):
get={'cmd': "login", 'user': user, 'pass': data['password']}, req=req)
if "ERROR" in html:
- self.logDebug(html)
- self.wrongPassword()
+ self.log_debug(html)
+ self.wrong_password()
diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py
index 8c56ff20f..de627a8f7 100644
--- a/module/plugins/accounts/RyushareCom.py
+++ b/module/plugins/accounts/RyushareCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class RyushareCom(XFSAccount):
__name__ = "RyushareCom"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """Ryushare.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/SafesharingEu.py b/module/plugins/accounts/SafesharingEu.py
index 2e58d33b3..a42c06ac6 100644
--- a/module/plugins/accounts/SafesharingEu.py
+++ b/module/plugins/accounts/SafesharingEu.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class SafesharingEu(XFSAccount):
__name__ = "SafesharingEu"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Safesharing.eu account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py
index b335c94da..3686e07e2 100644
--- a/module/plugins/accounts/SecureUploadEu.py
+++ b/module/plugins/accounts/SecureUploadEu.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class SecureUploadEu(XFSAccount):
__name__ = "SecureUploadEu"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """SecureUpload.eu account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py
index 4fcbe0b7a..eb5c3b033 100644
--- a/module/plugins/accounts/SendmywayCom.py
+++ b/module/plugins/accounts/SendmywayCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class SendmywayCom(XFSAccount):
__name__ = "SendmywayCom"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Sendmyway.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/SharebeastCom.py b/module/plugins/accounts/SharebeastCom.py
index d233ffd37..68b76fda8 100644
--- a/module/plugins/accounts/SharebeastCom.py
+++ b/module/plugins/accounts/SharebeastCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class SharebeastCom(XFSAccount):
__name__ = "SharebeastCom"
__type__ = "account"
- __version__ = "0.01"
+ __version__ = "0.02"
__description__ = """Sharebeast.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py
index 5a3359496..56c1d08f2 100644
--- a/module/plugins/accounts/ShareonlineBiz.py
+++ b/module/plugins/accounts/ShareonlineBiz.py
@@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account
class ShareonlineBiz(Account):
__name__ = "ShareonlineBiz"
__type__ = "account"
- __version__ = "0.34"
+ __version__ = "0.35"
__description__ = """Share-online.biz account plugin"""
__license__ = "GPLv3"
@@ -20,10 +20,10 @@ class ShareonlineBiz(Account):
get={'q' : "userdetails",
'aux' : "traffic",
'username': user,
- 'password': self.getAccountData(user)['password']})
+ 'password': self.get_account_data(user)['password']})
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
premium = False
validuntil = None
trafficleft = -1
@@ -35,7 +35,7 @@ class ShareonlineBiz(Account):
key, value = line.split("=")
api[key] = value
- self.logDebug(api)
+ self.log_debug(api)
if api['a'].lower() != "not_available":
req.cj.setCookie("share-online.biz", 'a', api['a'])
@@ -64,5 +64,5 @@ class ShareonlineBiz(Account):
html = self.api_response(user, req)
err = re.search(r'\*\*(.+?)\*\*', html)
if err:
- self.logError(err.group(1).strip())
- self.wrongPassword()
+ self.log_error(err.group(1).strip())
+ self.wrong_password()
diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py
index 053f2c33b..e030a7dd8 100644
--- a/module/plugins/accounts/SimplyPremiumCom.py
+++ b/module/plugins/accounts/SimplyPremiumCom.py
@@ -7,21 +7,21 @@ from module.plugins.internal.Account import Account
class SimplyPremiumCom(Account):
__name__ = "SimplyPremiumCom"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """Simply-Premium.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("EvolutionClip", "evolutionclip@live.de")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
premium = False
validuntil = -1
trafficleft = None
json_data = self.load('http://www.simply-premium.com/api/user.php?format=json', req=req)
- self.logDebug("JSON data: %s" % json_data)
+ self.log_debug("JSON data: %s" % json_data)
json_data = json_loads(json_data)
@@ -44,4 +44,4 @@ class SimplyPremiumCom(Account):
post={'key': user} if not data['password'] else {'login_name': user, 'login_pass': data['password']}, req=req)
if 'logout' not in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py
index e9fda682b..14e33e827 100644
--- a/module/plugins/accounts/SimplydebridCom.py
+++ b/module/plugins/accounts/SimplydebridCom.py
@@ -8,14 +8,14 @@ from module.plugins.internal.Account import Account
class SimplydebridCom(Account):
__name__ = "SimplydebridCom"
__type__ = "account"
- __version__ = "0.12"
+ __version__ = "0.13"
__description__ = """Simply-Debrid.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("Kagenoshin", "kagenoshin@gmx.ch")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
get_data = {'login': 2, 'u': self.loginname, 'p': self.password}
res = self.load("http://simply-debrid.com/api.php", get=get_data, req=req)
data = [x.strip() for x in res.split(";")]
@@ -32,4 +32,4 @@ class SimplydebridCom(Account):
res = self.load("https://simply-debrid.com/api.php", get=get_data, req=req)
if res != "02: loggin success":
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/SmoozedCom.py b/module/plugins/accounts/SmoozedCom.py
index 0b0d7ed74..853963c4a 100644
--- a/module/plugins/accounts/SmoozedCom.py
+++ b/module/plugins/accounts/SmoozedCom.py
@@ -26,17 +26,17 @@ from module.plugins.internal.Account import Account
class SmoozedCom(Account):
__name__ = "SmoozedCom"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """Smoozed.com account plugin"""
__license__ = "GPLv3"
__authors__ = [("", "")]
- def loadAccountInfo(self, user, req):
- status = self.getAccountStatus(user, req)
+ def load_account_info(self, user, req):
+ status = self.get_account_status(user, req)
- self.logDebug(status)
+ self.log_debug(status)
if status['state'] != 'ok':
info = {'validuntil' : None,
@@ -62,15 +62,15 @@ class SmoozedCom(Account):
def login(self, user, data, req):
#: Get user data from premiumize.me
- status = self.getAccountStatus(user, req)
+ status = self.get_account_status(user, req)
#: Check if user and password are valid
if status['state'] != 'ok':
- self.wrongPassword()
+ self.wrong_password()
- def getAccountStatus(self, user, req):
- password = self.getAccountData(user)['password']
+ def get_account_status(self, user, req):
+ password = self.get_account_data(user)['password']
salt = hashlib.sha256(password).hexdigest()
encrypted = PBKDF2(password, salt, iterations=1000).hexread(32)
diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py
index aa1eafcbd..46b1e97de 100644
--- a/module/plugins/accounts/StreamcloudEu.py
+++ b/module/plugins/accounts/StreamcloudEu.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class StreamcloudEu(XFSAccount):
__name__ = "StreamcloudEu"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Streamcloud.eu account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py
index 7e3bd628f..518ed66f8 100644
--- a/module/plugins/accounts/TurbobitNet.py
+++ b/module/plugins/accounts/TurbobitNet.py
@@ -9,14 +9,14 @@ from module.plugins.internal.Account import Account
class TurbobitNet(Account):
__name__ = "TurbobitNet"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """TurbobitNet account plugin"""
__license__ = "GPLv3"
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("http://turbobit.net", req=req)
m = re.search(r'<u>Turbo Access</u> to ([\d.]+)', html)
@@ -39,4 +39,4 @@ class TurbobitNet(Account):
"user[submit]": "Login"}, req=req)
if not '<div class="menu-item user-name">' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index 18e7b0b57..bada60fe0 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -9,7 +9,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class TusfilesNet(XFSAccount):
__name__ = "TusfilesNet"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """Tusfile.net account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
index 3763e2a16..e83124b81 100644
--- a/module/plugins/accounts/UlozTo.py
+++ b/module/plugins/accounts/UlozTo.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class UlozTo(Account):
__name__ = "UlozTo"
__type__ = "account"
- __version__ = "0.11"
+ __version__ = "0.12"
__description__ = """Uloz.to account plugin"""
__license__ = "GPLv3"
@@ -20,7 +20,7 @@ class UlozTo(Account):
TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a .*?title=".+?GB = ([\d.]+) MB"'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("http://www.ulozto.net/", req=req)
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
@@ -45,4 +45,4 @@ class UlozTo(Account):
'remember': "on"})
if '<div class="flash error">' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/UploadableCh.py b/module/plugins/accounts/UploadableCh.py
index 2936a2a6b..e196620af 100644
--- a/module/plugins/accounts/UploadableCh.py
+++ b/module/plugins/accounts/UploadableCh.py
@@ -6,14 +6,14 @@ from module.plugins.internal.Account import Account
class UploadableCh(Account):
__name__ = "UploadableCh"
__type__ = "account"
- __version__ = "0.04"
+ __version__ = "0.05"
__description__ = """Uploadable.ch account plugin"""
__license__ = "GPLv3"
__authors__ = [("Sasch", "gsasch@gmail.com")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("http://www.uploadable.ch/login.php", req=req)
premium = '<a href="/logout.php"' in html
@@ -30,4 +30,4 @@ class UploadableCh(Account):
'action__login': "normalLogin"}, req=req)
if "Login failed" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/UploadcCom.py b/module/plugins/accounts/UploadcCom.py
index d1e1a2ead..7ccfe481d 100644
--- a/module/plugins/accounts/UploadcCom.py
+++ b/module/plugins/accounts/UploadcCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class UploadcCom(XFSAccount):
__name__ = "UploadcCom"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """Uploadc.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 55bddabae..6a9270153 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class UploadedTo(Account):
__name__ = "UploadedTo"
__type__ = "account"
- __version__ = "0.31"
+ __version__ = "0.32"
__description__ = """Uploaded.to account plugin"""
__license__ = "GPLv3"
@@ -21,7 +21,7 @@ class UploadedTo(Account):
TRAFFIC_LEFT_PATTERN = r'<b class="cB">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = None
trafficleft = None
premium = None
@@ -53,7 +53,7 @@ class UploadedTo(Account):
trafficleft = float(size.replace(',', '.')) / 1024
trafficleft *= 1 << 40
else:
- trafficleft = self.parseTraffic(size + unit)
+ trafficleft = self.parse_traffic(size + unit)
return {'validuntil' : validuntil,
'trafficleft': trafficleft,
@@ -67,4 +67,4 @@ class UploadedTo(Account):
post={'id': user, 'pw': data['password'], '_': ""}, req=req)
if '"err"' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py
index 598b7ac57..b72102300 100644
--- a/module/plugins/accounts/UploadheroCom.py
+++ b/module/plugins/accounts/UploadheroCom.py
@@ -10,17 +10,17 @@ from module.plugins.internal.Account import Account
class UploadheroCom(Account):
__name__ = "UploadheroCom"
__type__ = "account"
- __version__ = "0.22"
+ __version__ = "0.23"
__description__ = """Uploadhero.co account plugin"""
__license__ = "GPLv3"
__authors__ = [("mcmyst", "mcmyst@hotmail.fr")]
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
premium_pattern = re.compile('Il vous reste <span class="bleu">(\d+)</span> jours premium')
- data = self.getAccountData(user)
+ data = self.get_account_data(user)
html = self.load("http://uploadhero.co/my-account", req=req)
if premium_pattern.search(html):
@@ -38,4 +38,4 @@ class UploadheroCom(Account):
post={"pseudo_login": user, "password_login": data['password']}, req=req)
if "mot de passe invalide" in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py
index c701fb8fa..5052266a4 100644
--- a/module/plugins/accounts/UploadingCom.py
+++ b/module/plugins/accounts/UploadingCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.Plugin import set_cookies
class UploadingCom(Account):
__name__ = "UploadingCom"
__type__ = "account"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = """Uploading.com account plugin"""
__license__ = "GPLv3"
@@ -21,7 +21,7 @@ class UploadingCom(Account):
VALID_UNTIL_PATTERN = r'Valid Until:(.+?)<'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = None
trafficleft = None
premium = None
@@ -33,13 +33,13 @@ class UploadingCom(Account):
m = re.search(self.VALID_UNTIL_PATTERN, html)
if m:
expiredate = m.group(1).strip()
- self.logDebug("Expire date: " + expiredate)
+ self.log_debug("Expire date: " + expiredate)
try:
validuntil = time.mktime(time.strptime(expiredate, "%b %d, %Y"))
except Exception, e:
- self.logError(e)
+ self.log_error(e)
else:
if validuntil > time.mktime(time.gmtime()):
diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py
index c40dbd6e6..fcadce927 100644
--- a/module/plugins/accounts/UptoboxCom.py
+++ b/module/plugins/accounts/UptoboxCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class UptoboxCom(XFSAccount):
__name__ = "UptoboxCom"
__type__ = "account"
- __version__ = "0.08"
+ __version__ = "0.09"
__description__ = """DDLStorage.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py
index 5bfc24963..01e16bb78 100644
--- a/module/plugins/accounts/VidPlayNet.py
+++ b/module/plugins/accounts/VidPlayNet.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class VidPlayNet(XFSAccount):
__name__ = "VidPlayNet"
__type__ = "account"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """VidPlay.net account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/WebshareCz.py b/module/plugins/accounts/WebshareCz.py
index b1ecef3fd..c8711838f 100644
--- a/module/plugins/accounts/WebshareCz.py
+++ b/module/plugins/accounts/WebshareCz.py
@@ -12,7 +12,7 @@ from module.plugins.internal.Account import Account
class WebshareCz(Account):
__name__ = "WebshareCz"
__type__ = "account"
- __version__ = "0.09"
+ __version__ = "0.10"
__description__ = """Webshare.cz account plugin"""
__license__ = "GPLv3"
@@ -24,17 +24,17 @@ class WebshareCz(Account):
TRAFFIC_LEFT_PATTERN = r'<bytes>(.+)</bytes>'
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
html = self.load("https://webshare.cz/api/user_data/",
- post={'wst': self.getAccountData(user).get('wst', None)})
+ post={'wst': self.get_account_data(user).get('wst', None)})
- self.logDebug("Response: " + html)
+ self.log_debug("Response: " + html)
expiredate = re.search(self.VALID_UNTIL_PATTERN, html).group(1)
- self.logDebug("Expire date: " + expiredate)
+ self.log_debug("Expire date: " + expiredate)
validuntil = time.mktime(time.strptime(expiredate, "%Y-%m-%d %H:%M:%S"))
- trafficleft = self.parseTraffic(re.search(self.TRAFFIC_LEFT_PATTERN, html).group(1))
+ trafficleft = self.parse_traffic(re.search(self.TRAFFIC_LEFT_PATTERN, html).group(1))
premium = validuntil > time.time()
return {'validuntil': validuntil, 'trafficleft': -1, 'premium': premium}
@@ -46,7 +46,7 @@ class WebshareCz(Account):
'wst' : ""}, req=req)
if "<status>OK</status>" not in salt:
- self.wrongPassword()
+ self.wrong_password()
salt = re.search('<salt>(.+)</salt>', salt).group(1)
password = hashlib.sha1(md5_crypt.encrypt(data['password'], salt=salt)).hexdigest()
@@ -60,6 +60,6 @@ class WebshareCz(Account):
'wst' : ""}, req=req)
if "<status>OK</status>" not in login:
- self.wrongPassword()
+ self.wrong_password()
data['wst'] = re.search('<token>(.+)</token>', login).group(1)
diff --git a/module/plugins/accounts/WorldbytezCom.py b/module/plugins/accounts/WorldbytezCom.py
index a90dbea56..6ad4f2543 100644
--- a/module/plugins/accounts/WorldbytezCom.py
+++ b/module/plugins/accounts/WorldbytezCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class WorldbytezCom(XFSAccount):
__name__ = "WorldbytezCom"
__type__ = "account"
- __version__ = "0.01"
+ __version__ = "0.02"
__description__ = """Worldbytez.com account plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
index 8dc7f3a30..e47e8fafc 100644
--- a/module/plugins/accounts/XFileSharingPro.py
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
class XFileSharingPro(XFSAccount):
__name__ = "XFileSharingPro"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.07"
__description__ = """XFileSharingPro multi-purpose account plugin"""
__license__ = "GPLv3"
@@ -21,8 +21,8 @@ class XFileSharingPro(XFSAccount):
return super(XFileSharingPro, self).init()
- def loadAccountInfo(self, user, req):
- return super(XFileSharingPro if self.HOSTER_DOMAIN else XFSAccount, self).loadAccountInfo(user, req)
+ def load_account_info(self, user, req):
+ return super(XFileSharingPro if self.HOSTER_DOMAIN else XFSAccount, self).load_account_info(user, req)
def login(self, user, data, req):
diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py
index 9d1d1d38f..fad22b4c6 100644
--- a/module/plugins/accounts/YibaishiwuCom.py
+++ b/module/plugins/accounts/YibaishiwuCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account
class YibaishiwuCom(Account):
__name__ = "YibaishiwuCom"
__type__ = "account"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """115.com account plugin"""
__license__ = "GPLv3"
@@ -18,8 +18,8 @@ class YibaishiwuCom(Account):
ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}'
- def loadAccountInfo(self, user, req):
- #self.relogin(user)
+ def load_account_info(self, user, req):
+ # self.relogin(user)
html = self.load("http://115.com/", req=req)
m = re.search(self.ACCOUNT_INFO_PATTERN, html, re.S)
@@ -36,4 +36,4 @@ class YibaishiwuCom(Account):
"login[passwd]": data['password']}, req=req)
if not 'var USER_PERMISSION = {' in html:
- self.wrongPassword()
+ self.wrong_password()
diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py
index 0ca7fba45..bec59be46 100644
--- a/module/plugins/accounts/ZeveraCom.py
+++ b/module/plugins/accounts/ZeveraCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account
class ZeveraCom(Account):
__name__ = "ZeveraCom"
__type__ = "account"
- __version__ = "0.27"
+ __version__ = "0.28"
__description__ = """Zevera.com account plugin"""
__license__ = "GPLv3"
@@ -26,13 +26,13 @@ class ZeveraCom(Account):
def init(self):
if not self.HOSTER_DOMAIN:
- self.logError(_("Missing HOSTER_DOMAIN"))
+ self.log_error(_("Missing HOSTER_DOMAIN"))
if not hasattr(self, "API_URL"):
self.API_URL = "http://api.%s/jDownloader.ashx" % (self.HOSTER_DOMAIN or "")
- def loadAccountInfo(self, user, req):
+ def load_account_info(self, user, req):
validuntil = None
trafficleft = None
premium = False
@@ -52,7 +52,7 @@ class ZeveraCom(Account):
self.password = data['password']
if self.api_response(req) == "No trafic":
- self.wrongPassword()
+ self.wrong_password()
def api_response(self, req, just_header=False, **kwargs):
@@ -66,7 +66,7 @@ class ZeveraCom(Account):
get=get_data,
just_header=just_header, req=req)
- self.logDebug(res)
+ self.log_debug(res)
if ':' in res:
if not just_header: