From 3e87db92c439a4b8378a165f42a01ba142b56a5c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 17 Apr 2015 00:50:31 +0200
Subject: Spare code cosmetics (1)
---
pyload/api/__init__.py | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
(limited to 'pyload/api/__init__.py')
diff --git a/pyload/api/__init__.py b/pyload/api/__init__.py
index 461c77cac..9338b5337 100644
--- a/pyload/api/__init__.py
+++ b/pyload/api/__init__.py
@@ -109,8 +109,8 @@ class Api(Iface):
item = ConfigItem()
item.name = key
item.description = data["desc"]
- item.value = str(data["value"]) if not isinstance(data["value"], basestring) else data["value"]
- item.type = data["type"]
+ item.value = str(data['value']) if not isinstance(data['value'], basestring) else data['value']
+ item.type = data['type']
items.append(item)
section.items = items
sections[sectionName] = section
@@ -120,37 +120,37 @@ class Api(Iface):
@permission(PERMS.SETTINGS)
- def getConfigValue(self, category, option, section="core"):
+ def getConfigValue(self, section, option, section="core"):
"""Retrieve config value.
- :param category: name of category, or plugin
+ :param section: name of section, or plugin
:param option: config option
:param section: 'plugin' or 'core'
:return: config value as string
"""
if section == "core":
- value = self.core.config.get(category, option)
+ value = self.core.config.get(section, option)
else:
- value = self.core.config.getPlugin(category, option)
+ value = self.core.config.getPlugin(section, option)
return str(value)
@permission(PERMS.SETTINGS)
- def setConfigValue(self, category, option, value, section="core"):
+ def setConfigValue(self, section, option, value, section="core"):
"""Set new config value.
- :param category:
+ :param section:
:param option:
:param value: new config value
:param section: 'plugin' or 'core
"""
- self.core.addonManager.dispatchEvent("config-changed", category, option, value, section)
+ self.core.addonManager.dispatchEvent("config-changed", section, option, value, section)
if section == "core":
- self.core.config[category][option] = value
+ self.core.config.set(section, option, value)
if option in ("limit_speed", "max_speed"): # not so nice to update the limit
self.core.requestFactory.updateBucket()
elif section == "plugin":
- self.core.config.setPlugin(category, option, value)
+ self.core.config.setPlugin(section, option, value)
@permission(PERMS.SETTINGS)
@@ -895,7 +895,7 @@ class Api(Iface):
accs = self.core.accountManager.getAccountInfos(False, refresh)
for group in accs.values():
accounts = [AccountInfo(acc["validuntil"], acc["login"], acc["options"], acc["valid"],
- acc["trafficleft"], acc["maxtraffic"], acc["premium"], acc["type"])
+ acc["trafficleft"], acc["maxtraffic"], acc["premium"], acc['type'])
for acc in group]
return accounts or []
--
cgit v1.2.3
From 20226f8cc5889efbefa61209e1adf6184d42cd00 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 17 Apr 2015 01:21:41 +0200
Subject: Spare code cosmetics (3)
---
pyload/api/__init__.py | 84 +++++++++++++++++++++++++-------------------------
1 file changed, 42 insertions(+), 42 deletions(-)
(limited to 'pyload/api/__init__.py')
diff --git a/pyload/api/__init__.py b/pyload/api/__init__.py
index 9338b5337..62af70cf8 100644
--- a/pyload/api/__init__.py
+++ b/pyload/api/__init__.py
@@ -92,30 +92,30 @@ class Api(Iface):
def _convertPyFile(self, p):
- fdata = FileData(p["id"], p["url"], p["name"], p["plugin"], p["size"],
- p["format_size"], p["status"], p["statusmsg"],
- p["package"], p["error"], p["order"])
+ fdata = FileData(p['id'], p['url'], p['name'], p['plugin'], p['size'],
+ p['format_size'], p['status'], p['statusmsg'],
+ p['package'], p['error'], p['order'])
return fdata
def _convertConfigFormat(self, c):
sections = {}
for sectionName, sub in c.iteritems():
- section = ConfigSection(sectionName, sub["desc"])
+ section = ConfigSection(sectionName, sub['desc'])
items = []
for key, data in sub.iteritems():
if key in ("desc", "outline"):
continue
item = ConfigItem()
item.name = key
- item.description = data["desc"]
+ item.description = data['desc']
item.value = str(data['value']) if not isinstance(data['value'], basestring) else data['value']
item.type = data['type']
items.append(item)
section.items = items
sections[sectionName] = section
if "outline" in sub:
- section.outline = sub["outline"]
+ section.outline = sub['outline']
return sections
@@ -424,7 +424,7 @@ class Api(Iface):
"""
result = self.core.threadManager.getInfoResult(rid)
if "ALL_INFO_FETCHED" in result:
- del result["ALL_INFO_FETCHED"]
+ del result['ALL_INFO_FETCHED']
return OnlineCheck(-1, result)
else:
return OnlineCheck(rid, result)
@@ -475,9 +475,9 @@ class Api(Iface):
data = self.core.files.getPackageData(int(pid))
if not data:
raise PackageDoesNotExists(pid)
- return PackageData(data["id"], data["name"], data["folder"], data["site"], data["password"],
- data["queue"], data["order"],
- links=[self._convertPyFile(x) for x in data["links"].itervalues()])
+ return PackageData(data['id'], data['name'], data['folder'], data['site'], data['password'],
+ data['queue'], data['order'],
+ links=[self._convertPyFile(x) for x in data['links'].itervalues()])
@permission(PERMS.LIST)
@@ -491,9 +491,9 @@ class Api(Iface):
if not data:
raise PackageDoesNotExists(pid)
- return PackageData(data["id"], data["name"], data["folder"], data["site"], data["password"],
- data["queue"], data["order"],
- fids=[int(x) for x in data["links"]])
+ return PackageData(data['id'], data['name'], data['folder'], data['site'], data['password'],
+ data['queue'], data['order'],
+ fids=[int(x) for x in data['links']])
@permission(PERMS.LIST)
@@ -538,10 +538,10 @@ class Api(Iface):
:return: list of `PackageInfo`
"""
- return [PackageData(pack["id"], pack["name"], pack["folder"], pack["site"],
- pack["password"], pack["queue"], pack["order"],
- pack["linksdone"], pack["sizedone"], pack["sizetotal"],
- pack["linkstotal"])
+ return [PackageData(pack['id'], pack['name'], pack['folder'], pack['site'],
+ pack['password'], pack['queue'], pack['order'],
+ pack['linksdone'], pack['sizedone'], pack['sizetotal'],
+ pack['linkstotal'])
for pack in self.core.files.getInfoData(Destination.Queue).itervalues()]
@@ -552,10 +552,10 @@ class Api(Iface):
:return: list of `PackageData`
"""
- return [PackageData(pack["id"], pack["name"], pack["folder"], pack["site"],
- pack["password"], pack["queue"], pack["order"],
- pack["linksdone"], pack["sizedone"], pack["sizetotal"],
- links=[self._convertPyFile(x) for x in pack["links"].itervalues()])
+ return [PackageData(pack['id'], pack['name'], pack['folder'], pack['site'],
+ pack['password'], pack['queue'], pack['order'],
+ pack['linksdone'], pack['sizedone'], pack['sizetotal'],
+ links=[self._convertPyFile(x) for x in pack['links'].itervalues()])
for pack in self.core.files.getCompleteData(Destination.Queue).itervalues()]
@@ -565,10 +565,10 @@ class Api(Iface):
:return: list of `PackageInfo`
"""
- return [PackageData(pack["id"], pack["name"], pack["folder"], pack["site"],
- pack["password"], pack["queue"], pack["order"],
- pack["linksdone"], pack["sizedone"], pack["sizetotal"],
- pack["linkstotal"])
+ return [PackageData(pack['id'], pack['name'], pack['folder'], pack['site'],
+ pack['password'], pack['queue'], pack['order'],
+ pack['linksdone'], pack['sizedone'], pack['sizetotal'],
+ pack['linkstotal'])
for pack in self.core.files.getInfoData(Destination.Collector).itervalues()]
@@ -578,10 +578,10 @@ class Api(Iface):
:return: list of `PackageInfo`
"""
- return [PackageData(pack["id"], pack["name"], pack["folder"], pack["site"],
- pack["password"], pack["queue"], pack["order"],
- pack["linksdone"], pack["sizedone"], pack["sizetotal"],
- links=[self._convertPyFile(x) for x in pack["links"].itervalues()])
+ return [PackageData(pack['id'], pack['name'], pack['folder'], pack['site'],
+ pack['password'], pack['queue'], pack['order'],
+ pack['linksdone'], pack['sizedone'], pack['sizetotal'],
+ links=[self._convertPyFile(x) for x in pack['links'].itervalues()])
for pack in self.core.files.getCompleteData(Destination.Collector).itervalues()]
@@ -777,9 +777,9 @@ class Api(Iface):
order = {}
for pid in packs:
pack = self.core.files.getPackageData(int(pid))
- while pack["order"] in order.keys(): # just in case
- pack["order"] += 1
- order[pack["order"]] = pack["id"]
+ while pack['order'] in order.keys(): # just in case
+ pack['order'] += 1
+ order[pack['order']] = pack['id']
return order
@@ -792,10 +792,10 @@ class Api(Iface):
"""
rawdata = self.core.files.getPackageData(int(pid))
order = {}
- for id, pyfile in rawdata["links"].iteritems():
- while pyfile["order"] in order.keys(): # just in case
- pyfile["order"] += 1
- order[pyfile["order"]] = pyfile["id"]
+ for id, pyfile in rawdata['links'].iteritems():
+ while pyfile['order'] in order.keys(): # just in case
+ pyfile['order'] += 1
+ order[pyfile['order']] = pyfile['id']
return order
@@ -894,8 +894,8 @@ class Api(Iface):
"""
accs = self.core.accountManager.getAccountInfos(False, refresh)
for group in accs.values():
- accounts = [AccountInfo(acc["validuntil"], acc["login"], acc["options"], acc["valid"],
- acc["trafficleft"], acc["maxtraffic"], acc["premium"], acc['type'])
+ accounts = [AccountInfo(acc['validuntil'], acc['login'], acc['options'], acc['valid'],
+ acc['trafficleft'], acc['maxtraffic'], acc['premium'], acc['type'])
for acc in group]
return accounts or []
@@ -958,9 +958,9 @@ class Api(Iface):
:param userdata: dictionary of user data
:return: boolean
"""
- if userdata == "local" or userdata["role"] == ROLE.ADMIN:
+ if userdata == "local" or userdata['role'] == ROLE.ADMIN:
return True
- elif func in permMap and has_permission(userdata["permission"], permMap[func]):
+ elif func in permMap and has_permission(userdata['permission'], permMap[func]):
return True
else:
return False
@@ -971,14 +971,14 @@ class Api(Iface):
"""similar to `checkAuth` but returns UserData thrift type """
user = self.checkAuth(username, password)
if user:
- return UserData(user["name"], user["email"], user["role"], user["permission"], user["template"])
+ return UserData(user['name'], user['email'], user['role'], user['permission'], user['template'])
else:
return UserData()
def getAllUserData(self):
"""returns all known user and info"""
- return dict((user, UserData(user, data["email"], data["role"], data["permission"], data["template"])) for user, data
+ return dict((user, UserData(user, data['email'], data['role'], data['permission'], data['template'])) for user, data
in self.core.db.getAllUserData().iteritems())
--
cgit v1.2.3
From 938b7e6141e2895c7d41b0e8ef4b9416912e2e9e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 17 Apr 2015 17:28:58 +0200
Subject: Spare code cosmetics (4)
---
pyload/api/__init__.py | 1 -
1 file changed, 1 deletion(-)
(limited to 'pyload/api/__init__.py')
diff --git a/pyload/api/__init__.py b/pyload/api/__init__.py
index 62af70cf8..676e76d7b 100644
--- a/pyload/api/__init__.py
+++ b/pyload/api/__init__.py
@@ -38,7 +38,6 @@ permMap = {}
# decorator only called on init, never initialized, so has no effect on runtime
def permission(bits):
class _Dec(object):
-
def __new__(cls, func, *args, **kwargs):
permMap[func.__name__] = bits
return func
--
cgit v1.2.3
From bb5a115533711fd8bb87f53cb32ff7342137208d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 18 Apr 2015 00:29:55 +0200
Subject: Spare code cosmetics (5)
---
pyload/api/__init__.py | 1 +
1 file changed, 1 insertion(+)
(limited to 'pyload/api/__init__.py')
diff --git a/pyload/api/__init__.py b/pyload/api/__init__.py
index 676e76d7b..62af70cf8 100644
--- a/pyload/api/__init__.py
+++ b/pyload/api/__init__.py
@@ -38,6 +38,7 @@ permMap = {}
# decorator only called on init, never initialized, so has no effect on runtime
def permission(bits):
class _Dec(object):
+
def __new__(cls, func, *args, **kwargs):
permMap[func.__name__] = bits
return func
--
cgit v1.2.3