summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/account
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugin/account')
-rw-r--r--pyload/plugin/account/FastixRu.py7
-rw-r--r--pyload/plugin/account/NoPremiumPl.py2
-rw-r--r--pyload/plugin/account/OboomCom.py4
-rw-r--r--pyload/plugin/account/PremiumTo.py2
-rw-r--r--pyload/plugin/account/PremiumizeMe.py2
-rw-r--r--pyload/plugin/account/RapidgatorNet.py2
-rw-r--r--pyload/plugin/account/ShareonlineBiz.py5
-rw-r--r--pyload/plugin/account/SimplyPremiumCom.py2
-rw-r--r--pyload/plugin/account/UnrestrictLi.py2
-rw-r--r--pyload/plugin/account/UploadedTo.py6
-rw-r--r--pyload/plugin/account/ZeveraCom.py2
11 files changed, 15 insertions, 21 deletions
diff --git a/pyload/plugin/account/FastixRu.py b/pyload/plugin/account/FastixRu.py
index fbb635437..ead4e63aa 100644
--- a/pyload/plugin/account/FastixRu.py
+++ b/pyload/plugin/account/FastixRu.py
@@ -18,13 +18,14 @@ class FastixRu(Account):
data = self.getAccountData(user)
html = json_loads(req.load("http://fastix.ru/api_v2/", get={'apikey': data['api'], 'sub': "getaccountdetails"}))
- points = html['points']
- kb = float(points) * 1024 ** 2 / 1000
+ points = html['points']
+ trafficleft = float(points) * 1024 ** 2 / 1000
if points > 0:
- account_info = {"validuntil": -1, "trafficleft": kb}
+ account_info = {"validuntil": -1, "trafficleft": trafficleft}
else:
account_info = {"validuntil": None, "trafficleft": None, "premium": False}
+
return account_info
diff --git a/pyload/plugin/account/NoPremiumPl.py b/pyload/plugin/account/NoPremiumPl.py
index ac0e64cd4..d825b38ed 100644
--- a/pyload/plugin/account/NoPremiumPl.py
+++ b/pyload/plugin/account/NoPremiumPl.py
@@ -46,7 +46,7 @@ class NoPremiumPl(Account):
if "expire" in result.keys() and result["expire"]:
premium = True
valid_untill = time.mktime(datetime.datetime.fromtimestamp(int(result["expire"])).timetuple())
- traffic_left = result["balance"] * 1024
+ traffic_left = result["balance"] * 2 ** 20
return ({
"validuntil": valid_untill,
diff --git a/pyload/plugin/account/OboomCom.py b/pyload/plugin/account/OboomCom.py
index 17d81428c..68e083d75 100644
--- a/pyload/plugin/account/OboomCom.py
+++ b/pyload/plugin/account/OboomCom.py
@@ -64,8 +64,8 @@ class OboomCom(Account):
traffic = userData['traffic']
- trafficLeft = traffic['current'] / 1024 #@TODO: Remove `/ 1024` in 0.4.10
- maxTraffic = traffic['max'] / 1024 #@TODO: Remove `/ 1024` in 0.4.10
+ trafficLeft = traffic['current']
+ maxTraffic = traffic['max']
session = accountData['session']
diff --git a/pyload/plugin/account/PremiumTo.py b/pyload/plugin/account/PremiumTo.py
index fcd856ea7..586ddf635 100644
--- a/pyload/plugin/account/PremiumTo.py
+++ b/pyload/plugin/account/PremiumTo.py
@@ -20,7 +20,7 @@ class PremiumTo(Account):
get={'username': self.username, 'password': self.password})
if "wrong username" not in traffic:
- trafficleft = sum(map(float, traffic.split(';'))) / 1024 #@TODO: Remove `/ 1024` in 0.4.10
+ trafficleft = sum(map(float, traffic.split(';')))
return {'premium': True, 'trafficleft': trafficleft, 'validuntil': -1}
else:
return {'premium': False, 'trafficleft': None, 'validuntil': None}
diff --git a/pyload/plugin/account/PremiumizeMe.py b/pyload/plugin/account/PremiumizeMe.py
index 7a701d03b..06e6ffb98 100644
--- a/pyload/plugin/account/PremiumizeMe.py
+++ b/pyload/plugin/account/PremiumizeMe.py
@@ -22,7 +22,7 @@ class PremiumizeMe(Account):
# Parse account info
account_info = {"validuntil": float(status['result']['expires']),
- "trafficleft": max(0, status['result']['trafficleft_bytes'] / 1024)} #@TODO: Remove `/ 1024` in 0.4.10
+ "trafficleft": max(0, status['result']['trafficleft_bytes'])}
if status['result']['type'] == 'free':
account_info['premium'] = False
diff --git a/pyload/plugin/account/RapidgatorNet.py b/pyload/plugin/account/RapidgatorNet.py
index 17b615a0b..729635037 100644
--- a/pyload/plugin/account/RapidgatorNet.py
+++ b/pyload/plugin/account/RapidgatorNet.py
@@ -38,7 +38,7 @@ class RapidgatorNet(Account):
self.scheduleRefresh(user, json['response']['reset_in'])
validuntil = json['response']['expire_date']
- trafficleft = float(json['response']['traffic_left']) / 1024 #@TODO: Remove `/ 1024` in 0.4.10
+ trafficleft = float(json['response']['traffic_left'])
premium = True
else:
self.logError(json['response_details'])
diff --git a/pyload/plugin/account/ShareonlineBiz.py b/pyload/plugin/account/ShareonlineBiz.py
index a27d52736..06b2818c9 100644
--- a/pyload/plugin/account/ShareonlineBiz.py
+++ b/pyload/plugin/account/ShareonlineBiz.py
@@ -27,7 +27,7 @@ class ShareonlineBiz(Account):
premium = False
validuntil = None
trafficleft = -1
- maxtraffic = 100 * 1024 * 1024 * 1024 #: 100 GB
+ maxtraffic = 100 * 2 ** 30 #: 100 GB
api = {}
for line in self.api_response(user, req).splitlines():
@@ -48,9 +48,6 @@ class ShareonlineBiz(Account):
maxtraffic = max(maxtraffic, traffic)
trafficleft = maxtraffic - traffic
- maxtraffic /= 1024 #@TODO: Remove `/ 1024` in 0.4.10
- trafficleft /= 1024 #@TODO: Remove `/ 1024` in 0.4.10
-
return {'premium' : premium,
'validuntil' : validuntil,
'trafficleft': trafficleft,
diff --git a/pyload/plugin/account/SimplyPremiumCom.py b/pyload/plugin/account/SimplyPremiumCom.py
index 92e4edbb9..2547dad56 100644
--- a/pyload/plugin/account/SimplyPremiumCom.py
+++ b/pyload/plugin/account/SimplyPremiumCom.py
@@ -32,7 +32,7 @@ class SimplyPremiumCom(Account):
validuntil = float(json_data['result']['timeend'])
if 'remain_traffic' in json_data['result'] and json_data['result']['remain_traffic']:
- trafficleft = float(json_data['result']['remain_traffic']) / 1024 #@TODO: Remove `/ 1024` in 0.4.10
+ trafficleft = float(json_data['result']['remain_traffic'])
return {"premium": premium, "validuntil": validuntil, "trafficleft": trafficleft}
diff --git a/pyload/plugin/account/UnrestrictLi.py b/pyload/plugin/account/UnrestrictLi.py
index 8d3071580..d57b998ca 100644
--- a/pyload/plugin/account/UnrestrictLi.py
+++ b/pyload/plugin/account/UnrestrictLi.py
@@ -23,7 +23,7 @@ class UnrestrictLi(Account):
return {"premium": False}
validuntil = json_data['result']['expires']
- trafficleft = float(json_data['result']['traffic'] / 1024) #@TODO: Remove `/ 1024` in 0.4.10
+ trafficleft = float(json_data['result']['traffic'])
return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
diff --git a/pyload/plugin/account/UploadedTo.py b/pyload/plugin/account/UploadedTo.py
index 13b0f3112..61765faf8 100644
--- a/pyload/plugin/account/UploadedTo.py
+++ b/pyload/plugin/account/UploadedTo.py
@@ -49,11 +49,7 @@ class UploadedTo(Account):
size = traffic['S'].replace('.', '')
unit = traffic['U'].lower()
- if unit.startswith('t'): #@NOTE: Remove in 0.4.10
- trafficleft = float(size.replace(',', '.')) / 1024
- trafficleft *= 1 << 40
- else:
- trafficleft = self.parseTraffic(size + unit)
+ trafficleft = self.parseTraffic(size + unit)
return {'validuntil' : validuntil,
'trafficleft': trafficleft,
diff --git a/pyload/plugin/account/ZeveraCom.py b/pyload/plugin/account/ZeveraCom.py
index 9be032ca1..25c2c5512 100644
--- a/pyload/plugin/account/ZeveraCom.py
+++ b/pyload/plugin/account/ZeveraCom.py
@@ -41,7 +41,7 @@ class ZeveraCom(Account):
if "No trafic" not in api and api['endsubscriptiondate'] != "Expired!":
validuntil = time.mktime(time.strptime(api['endsubscriptiondate'], "%Y/%m/%d %H:%M:%S"))
- trafficleft = float(api['availabletodaytraffic']) * 1024 if api['orondaytrafficlimit'] != '0' else -1
+ trafficleft = float(api['availabletodaytraffic']) * 2 ** 20 if api['orondaytrafficlimit'] != '0' else -1
premium = True
return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 13:02:06 +0100