summaryrefslogtreecommitdiffstats
path: root/module/plugins/accounts
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-07-20 03:02:09 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-07-20 03:34:54 +0200
commit9395182da7afed55a29bde1c7cbefe4204e783f0 (patch)
tree14c5f5f2dc5ea428c4625e8ce9208c5d77d1fc18 /module/plugins/accounts
parent[account] self.html -> html (where was possible) (diff)
downloadpyload-9395182da7afed55a29bde1c7cbefe4204e783f0.tar.xz
Store all re.search/match object as "m" instead "found"
Diffstat (limited to 'module/plugins/accounts')
-rw-r--r--module/plugins/accounts/CzshareCom.py10
-rw-r--r--module/plugins/accounts/EasybytezCom.py14
-rw-r--r--module/plugins/accounts/EuroshareEu.py6
-rw-r--r--module/plugins/accounts/FastshareCz.py6
-rw-r--r--module/plugins/accounts/FilejungleCom.py6
-rw-r--r--module/plugins/accounts/FshareVn.py10
-rw-r--r--module/plugins/accounts/HellshareCz.py6
-rw-r--r--module/plugins/accounts/MultishareCz.py4
-rw-r--r--module/plugins/accounts/QuickshareCz.py6
-rw-r--r--module/plugins/accounts/ShareRapidCom.py18
-rw-r--r--module/plugins/accounts/StahnuTo.py4
-rw-r--r--module/plugins/accounts/TurbobitNet.py6
-rw-r--r--module/plugins/accounts/UlozTo.py4
-rw-r--r--module/plugins/accounts/YibaishiwuCom.py6
14 files changed, 53 insertions, 53 deletions
diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 3b1989591..912b9328b 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -36,13 +36,13 @@ class CzshareCom(Account):
def loadAccountInfo(self, user, req):
html = req.load("http://sdilej.cz/prehled_kreditu/")
- found = re.search(self.CREDIT_LEFT_PATTERN, html)
- if found is None:
+ m = re.search(self.CREDIT_LEFT_PATTERN, html)
+ if m is None:
return {"validuntil": 0, "trafficleft": 0}
else:
- credits = float(found.group(1).replace(' ', '').replace(',', '.'))
- credits = credits * 1024 ** {'KiB': 0, 'MiB': 1, 'GiB': 2}[found.group(2)]
- validuntil = mktime(strptime(found.group(3), '%d.%m.%y %H:%M'))
+ credits = float(m.group(1).replace(' ', '').replace(',', '.'))
+ credits = credits * 1024 ** {'KiB': 0, 'MiB': 1, 'GiB': 2}[m.group(2)]
+ validuntil = mktime(strptime(m.group(3), '%d.%m.%y %H:%M'))
return {"validuntil": validuntil, "trafficleft": credits}
def login(self, user, data, req):
diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index 9b41c9135..755a4dbff 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -42,20 +42,20 @@ class EasybytezCom(Account):
validuntil = trafficleft = None
premium = False
- found = re.search(self.VALID_UNTIL_PATTERN, html)
- if found:
+ m = re.search(self.VALID_UNTIL_PATTERN, html)
+ if m:
try:
- self.logDebug("Expire date: " + found.group(1))
- validuntil = mktime(strptime(found.group(1), "%d %B %Y"))
+ self.logDebug("Expire date: " + m.group(1))
+ validuntil = mktime(strptime(m.group(1), "%d %B %Y"))
except Exception, e:
self.logError(e)
if validuntil > mktime(gmtime()):
premium = True
trafficleft = -1
else:
- found = re.search(self.TRAFFIC_LEFT_PATTERN, html)
- if found:
- trafficleft = found.group(1)
+ m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+ if m:
+ trafficleft = m.group(1)
if "Unlimited" in trafficleft:
trafficleft = -1
else:
diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index 4123b520f..f396f9bf2 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -35,12 +35,12 @@ class EuroshareEu(Account):
self.relogin(user)
html = req.load("http://euroshare.eu/customer-zone/settings/")
- found = re.search('id="input_expire_date" value="(\d+\.\d+\.\d+ \d+:\d+)"', html)
- if found is None:
+ m = re.search('id="input_expire_date" value="(\d+\.\d+\.\d+ \d+:\d+)"', html)
+ if m is None:
premium, validuntil = False, -1
else:
premium = True
- validuntil = mktime(strptime(found.group(1), "%d.%m.%Y %H:%M"))
+ validuntil = mktime(strptime(m.group(1), "%d.%m.%Y %H:%M"))
return {"validuntil": validuntil, "trafficleft": -1, "premium": premium}
diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index cf7854b3c..2ac24cf39 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -35,9 +35,9 @@ class FastshareCz(Account):
def loadAccountInfo(self, user, req):
html = req.load("http://www.fastshare.cz/user", decode=True)
- found = re.search(self.CREDIT_PATTERN, html)
- if found:
- trafficleft = parseFileSize(found.group(1)) / 1024
+ m = re.search(self.CREDIT_PATTERN, html)
+ if m:
+ trafficleft = parseFileSize(m.group(1)) / 1024
premium = True if trafficleft else False
else:
trafficleft = None
diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py
index e105d1e26..7c894e3d6 100644
--- a/module/plugins/accounts/FilejungleCom.py
+++ b/module/plugins/accounts/FilejungleCom.py
@@ -39,10 +39,10 @@ class FilejungleCom(Account):
def loadAccountInfo(self, user, req):
html = req.load(self.URL + "dashboard.php")
- found = re.search(self.TRAFFIC_LEFT_PATTERN, html)
- if found:
+ m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+ if m:
premium = True
- validuntil = mktime(strptime(found.group(1), "%d %b %Y"))
+ validuntil = mktime(strptime(m.group(1), "%d %b %Y"))
else:
premium = False
validuntil = -1
diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py
index 3996322ad..5726ad410 100644
--- a/module/plugins/accounts/FshareVn.py
+++ b/module/plugins/accounts/FshareVn.py
@@ -45,10 +45,10 @@ class FshareVn(Account):
trafficleft = self.getTrafficLeft()
return {"validuntil": -1, "trafficleft": trafficleft, "premium": True}
- found = re.search(self.VALID_UNTIL_PATTERN, html)
- if found:
+ m = re.search(self.VALID_UNTIL_PATTERN, html)
+ if m:
premium = True
- validuntil = mktime(strptime(found.group(1), '%I:%M:%S %p %d-%m-%Y'))
+ validuntil = mktime(strptime(m.group(1), '%I:%M:%S %p %d-%m-%Y'))
trafficleft = self.getTrafficLeft()
else:
premium = False
@@ -70,5 +70,5 @@ class FshareVn(Account):
self.wrongPassword()
def getTrafficLeft(self):
- found = re.search(self.TRAFFIC_LEFT_PATTERN, html)
- return float(found.group(1)) * 1024 ** {'k': 0, 'K': 0, 'M': 1, 'G': 2}[found.group(2)] if found else 0
+ m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+ return float(m.group(1)) * 1024 ** {'k': 0, 'K': 0, 'M': 1, 'G': 2}[m.group(2)] if m else 0
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index dfe5b57d8..d6e65a33e 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -37,13 +37,13 @@ class HellshareCz(Account):
self.relogin(user)
html = req.load("http://www.hellshare.com/")
- found = re.search(self.CREDIT_LEFT_PATTERN, html)
- if found is None:
+ m = re.search(self.CREDIT_LEFT_PATTERN, html)
+ if m is None:
trafficleft = None
validuntil = None
premium = False
else:
- credit = found.group(1)
+ credit = m.group(1)
premium = True
try:
if "." in credit:
diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index 08b8e5d52..3d8852955 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -39,8 +39,8 @@ class MultishareCz(Account):
#self.relogin(user)
html = req.load("http://www.multishare.cz/profil/", decode=True)
- found = re.search(self.TRAFFIC_LEFT_PATTERN, html)
- trafficleft = parseFileSize(found.group('S'), found.group('U')) / 1024 if found else 0
+ m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+ trafficleft = parseFileSize(m.group('S'), m.group('U')) / 1024 if m else 0
self.premium = True if trafficleft else False
html = req.load("http://www.multishare.cz/", decode=True)
diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index 8e5a18689..34a3a971a 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -33,9 +33,9 @@ class QuickshareCz(Account):
def loadAccountInfo(self, user, req):
html = req.load("http://www.quickshare.cz/premium", decode=True)
- found = re.search(r'Stav kreditu: <strong>(.+?)</strong>', html)
- if found:
- trafficleft = parseFileSize(found.group(1)) / 1024
+ m = re.search(r'Stav kreditu: <strong>(.+?)</strong>', html)
+ if m:
+ trafficleft = parseFileSize(m.group(1)) / 1024
premium = True if trafficleft else False
else:
trafficleft = None
diff --git a/module/plugins/accounts/ShareRapidCom.py b/module/plugins/accounts/ShareRapidCom.py
index 3aa67ffd1..a1cb40130 100644
--- a/module/plugins/accounts/ShareRapidCom.py
+++ b/module/plugins/accounts/ShareRapidCom.py
@@ -21,19 +21,19 @@ class ShareRapidCom(Account):
def loadAccountInfo(self, user, req):
src = req.load("http://megarapid.cz/mujucet/", decode=True)
- found = re.search(ur'<td>Max. počet paralelních stahování: </td><td>(\d+)', src)
- if found:
+ m = re.search(ur'<td>Max. počet paralelních stahování: </td><td>(\d+)', src)
+ if m:
data = self.getAccountData(user)
- data['options']['limitDL'] = [int(found.group(1))]
+ data['options']['limitDL'] = [int(m.group(1))]
- found = re.search(ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>', src)
- if found:
- validuntil = mktime(strptime(found.group(1), "%d.%m.%Y - %H:%M"))
+ m = re.search(ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>', src)
+ if m:
+ validuntil = mktime(strptime(m.group(1), "%d.%m.%Y - %H:%M"))
return {"premium": True, "trafficleft": -1, "validuntil": validuntil}
- found = re.search(r'<tr><td>Kredit</td><td>(.*?) GiB', src)
- if found:
- trafficleft = float(found.group(1)) * (1 << 20)
+ m = re.search(r'<tr><td>Kredit</td><td>(.*?) GiB', src)
+ if m:
+ trafficleft = float(m.group(1)) * (1 << 20)
return {"premium": True, "trafficleft": trafficleft, "validuntil": -1}
return {"premium": False, "trafficleft": None, "validuntil": None}
diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py
index a177ae8e8..e22030cdf 100644
--- a/module/plugins/accounts/StahnuTo.py
+++ b/module/plugins/accounts/StahnuTo.py
@@ -34,8 +34,8 @@ class StahnuTo(Account):
def loadAccountInfo(self, user, req):
html = req.load("http://www.stahnu.to/")
- found = re.search(r'>VIP: (\d+.*)<', html)
- trafficleft = parseFileSize(found.group(1)) * 1024 if found else 0
+ m = re.search(r'>VIP: (\d+.*)<', html)
+ trafficleft = parseFileSize(m.group(1)) * 1024 if m else 0
return {"premium": trafficleft > (512 * 1024), "trafficleft": trafficleft, "validuntil": -1}
diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py
index 5da480180..7e0f8b8a7 100644
--- a/module/plugins/accounts/TurbobitNet.py
+++ b/module/plugins/accounts/TurbobitNet.py
@@ -34,10 +34,10 @@ class TurbobitNet(Account):
def loadAccountInfo(self, user, req):
html = req.load("http://turbobit.net")
- found = re.search(r'<u>Turbo Access</u> to ([0-9.]+)', html)
- if found:
+ m = re.search(r'<u>Turbo Access</u> to ([0-9.]+)', html)
+ if m:
premium = True
- validuntil = mktime(strptime(found.group(1), "%d.%m.%Y"))
+ validuntil = mktime(strptime(m.group(1), "%d.%m.%Y"))
else:
premium = False
validuntil = -1
diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
index 8476167b3..689ad0a9a 100644
--- a/module/plugins/accounts/UlozTo.py
+++ b/module/plugins/accounts/UlozTo.py
@@ -23,8 +23,8 @@ class UlozTo(Account):
html = req.load("http://www.ulozto.net/", decode=True)
req.cj.setCookie("www.ulozto.net", "ULOSESSID", self.phpsessid)
- found = re.search(self.TRAFFIC_LEFT_PATTERN, html)
- trafficleft = int(float(found.group(1).replace(' ', '').replace(',', '.')) * 1000 * 1.048) if found else 0
+ m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+ trafficleft = int(float(m.group(1).replace(' ', '').replace(',', '.')) * 1000 * 1.048) if m else 0
self.premium = True if trafficleft else False
return {"validuntil": -1, "trafficleft": trafficleft}
diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py
index 4a0c72c34..1894258a3 100644
--- a/module/plugins/accounts/YibaishiwuCom.py
+++ b/module/plugins/accounts/YibaishiwuCom.py
@@ -36,9 +36,9 @@ class YibaishiwuCom(Account):
#self.relogin(user)
html = req.load("http://115.com/", decode=True)
- found = re.search(self.ACCOUNT_INFO_PATTERN, html, re.S)
- premium = True if (found and 'is_vip: 1' in found.group(1)) else False
- validuntil = trafficleft = (-1 if found else 0)
+ m = re.search(self.ACCOUNT_INFO_PATTERN, html, re.S)
+ premium = True if (m and 'is_vip: 1' in m.group(1)) else False
+ validuntil = trafficleft = (-1 if m else 0)
return dict({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium})
def login(self, user, data, req):