From 20226f8cc5889efbefa61209e1adf6184d42cd00 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Apr 2015 01:21:41 +0200 Subject: Spare code cosmetics (3) --- pyload/database/File.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'pyload/database') diff --git a/pyload/database/File.py b/pyload/database/File.py index 205cbba1a..faf68b246 100644 --- a/pyload/database/File.py +++ b/pyload/database/File.py @@ -91,8 +91,8 @@ class FileHandler(object): packs[x.id].update(x.toDict()[x.id]) for key, value in data.iteritems(): - if value["package"] in packs: - packs[value["package"]]["links"][key] = value + if value['package'] in packs: + packs[value['package']]['links'][key] = value return packs @@ -277,11 +277,11 @@ class FileHandler(object): cache = self.cache.values() for x in cache: - if int(x.toDbDict()[x.id]["package"]) == int(id): + if int(x.toDbDict()[x.id]['package']) == int(id): tmplist.append((x.id, x.toDbDict()[x.id])) data.update(tmplist) - pack["links"] = data + pack['links'] = data return pack @@ -364,7 +364,7 @@ class FileHandler(object): if jobs: return self.getFile(jobs[0]) else: - self.jobCache["decrypt"] = "empty" + self.jobCache['decrypt'] = "empty" return None @@ -516,20 +516,20 @@ class FileHandler(object): f = self.getFileData(id) f = f[id] - e = RemoveEvent("file", id, "collector" if not self.getPackage(f["package"]).queue else "queue") + e = RemoveEvent("file", id, "collector" if not self.getPackage(f['package']).queue else "queue") self.core.pullManager.addEvent(e) self.db.reorderLink(f, position) pyfiles = self.cache.values() for pyfile in pyfiles: - if pyfile.packageid != f["package"] or pyfile.order < 0: continue - if f["order"] > position: - if pyfile.order >= position and pyfile.order < f["order"]: + if pyfile.packageid != f['package'] or pyfile.order < 0: continue + if f['order'] > position: + if pyfile.order >= position and pyfile.order < f['order']: pyfile.order += 1 pyfile.notifyChange() - elif f["order"] < position: - if pyfile.order <= position and pyfile.order > f["order"]: + elif f['order'] < position: + if pyfile.order <= position and pyfile.order > f['order']: pyfile.order -= 1 pyfile.notifyChange() @@ -538,7 +538,7 @@ class FileHandler(object): self.db.commit() - e = InsertEvent("file", id, position, "collector" if not self.getPackage(f["package"]).queue else "queue") + e = InsertEvent("file", id, position, "collector" if not self.getPackage(f['package']).queue else "queue") self.core.pullManager.addEvent(e) @@ -568,8 +568,8 @@ class FileHandler(object): urls = [] for pyfile in data.itervalues(): - if pyfile["status"] not in (0, 12, 13): - urls.append((pyfile["url"], pyfile["plugin"])) + if pyfile['status'] not in (0, 12, 13): + urls.append((pyfile['url'], pyfile['plugin'])) self.core.threadManager.createInfoThread(urls, pid) @@ -842,12 +842,12 @@ class FileMethods(object): @style.queue def reorderLink(self, f, position): """ reorder link with f as dict for pyfile """ - if f["order"] > position: - self.c.execute('UPDATE links SET linkorder=linkorder+1 WHERE linkorder >= ? AND linkorder < ? AND package=?', (position, f["order"], f["package"])) - elif f["order"] < position: - self.c.execute('UPDATE links SET linkorder=linkorder-1 WHERE linkorder <= ? AND linkorder > ? AND package=?', (position, f["order"], f["package"])) + if f['order'] > position: + self.c.execute('UPDATE links SET linkorder=linkorder+1 WHERE linkorder >= ? AND linkorder < ? AND package=?', (position, f['order'], f['package'])) + elif f['order'] < position: + self.c.execute('UPDATE links SET linkorder=linkorder-1 WHERE linkorder <= ? AND linkorder > ? AND package=?', (position, f['order'], f['package'])) - self.c.execute('UPDATE links SET linkorder=? WHERE id=?', (position, f["id"])) + self.c.execute('UPDATE links SET linkorder=? WHERE id=?', (position, f['id'])) @style.queue -- cgit v1.2.3 From 938b7e6141e2895c7d41b0e8ef4b9416912e2e9e Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Apr 2015 17:28:58 +0200 Subject: Spare code cosmetics (4) --- pyload/database/Backend.py | 3 +++ pyload/database/Storage.py | 1 + pyload/database/User.py | 1 + 3 files changed, 5 insertions(+) (limited to 'pyload/database') diff --git a/pyload/database/Backend.py b/pyload/database/Backend.py index 45a5c7361..cfdee058e 100644 --- a/pyload/database/Backend.py +++ b/pyload/database/Backend.py @@ -18,6 +18,7 @@ except Exception: DB_VERSION = 4 + class style(object): db = None @@ -59,6 +60,7 @@ class style(object): return cls.db.async(f, *args, **kwargs) return x + class DatabaseJob(object): def __init__(self, f, *args, **kwargs): @@ -106,6 +108,7 @@ class DatabaseJob(object): def wait(self): self.done.wait() + class DatabaseBackend(Thread): subs = [] diff --git a/pyload/database/Storage.py b/pyload/database/Storage.py index a1dfb7e9f..45ad18b2d 100644 --- a/pyload/database/Storage.py +++ b/pyload/database/Storage.py @@ -4,6 +4,7 @@ from pyload.database import style from pyload.database import DatabaseBackend + class StorageMethods(object): diff --git a/pyload/database/User.py b/pyload/database/User.py index 94f70d499..374570fb7 100644 --- a/pyload/database/User.py +++ b/pyload/database/User.py @@ -6,6 +6,7 @@ import random from pyload.database import DatabaseBackend, style + class UserMethods(object): -- cgit v1.2.3 From bb5a115533711fd8bb87f53cb32ff7342137208d Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 18 Apr 2015 00:29:55 +0200 Subject: Spare code cosmetics (5) --- pyload/database/Backend.py | 2 +- pyload/database/File.py | 18 ++++++++++++------ pyload/database/User.py | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) (limited to 'pyload/database') diff --git a/pyload/database/Backend.py b/pyload/database/Backend.py index cfdee058e..b0e94711e 100644 --- a/pyload/database/Backend.py +++ b/pyload/database/Backend.py @@ -81,7 +81,7 @@ class DatabaseJob(object): from os.path import basename frame = self.frame.f_back output = "" - for i in range(5): + for _i in range(5): output += "\t%s:%s, %s\n" % (basename(frame.f_code.co_filename), frame.f_lineno, frame.f_code.co_name) frame = frame.f_back del frame diff --git a/pyload/database/File.py b/pyload/database/File.py index faf68b246..7cbe1890a 100644 --- a/pyload/database/File.py +++ b/pyload/database/File.py @@ -87,7 +87,8 @@ class FileHandler(object): data.update([(x.id, x.toDbDict()[x.id]) for x in self.cache.values()]) for x in self.packageCache.itervalues(): - if x.queue != queue or x.id not in packs: continue + if x.queue != queue or x.id not in packs: + continue packs[x.id].update(x.toDict()[x.id]) for key, value in data.iteritems(): @@ -103,7 +104,8 @@ class FileHandler(object): packs = self.db.getAllPackages(queue) for x in self.packageCache.itervalues(): - if x.queue != queue or x.id not in packs: continue + if x.queue != queue or x.id not in packs: + continue packs[x.id].update(x.toDict()[x.id]) return packs @@ -493,7 +495,8 @@ class FileHandler(object): packs = self.packageCache.values() for pack in packs: - if pack.queue != p.queue or pack.order < 0 or pack == p: continue + if pack.queue != p.queue or pack.order < 0 or pack == p: + continue if p.order > position: if pack.order >= position and pack.order < p.order: pack.order += 1 @@ -523,7 +526,8 @@ class FileHandler(object): pyfiles = self.cache.values() for pyfile in pyfiles: - if pyfile.packageid != f['package'] or pyfile.order < 0: continue + if pyfile.packageid != f['package'] or pyfile.order < 0: + continue if f['order'] > position: if pyfile.order >= position and pyfile.order < f['order']: pyfile.order += 1 @@ -871,7 +875,8 @@ class FileMethods(object): """return package instance from id""" self.c.execute("SELECT name, folder, site, password, queue, packageorder FROM packages WHERE id=?", (str(id),)) r = self.c.fetchone() - if not r: return None + if not r: + return None return PyPackage(self.manager, id, * r) @@ -882,7 +887,8 @@ class FileMethods(object): """return link instance from id""" self.c.execute("SELECT url, name, size, status, error, plugin, package, linkorder FROM links WHERE id=?", (str(id),)) r = self.c.fetchone() - if not r: return None + if not r: + return None r = list(r) r[5] = tuple(r[5].split('.')) return PyFile(self.manager, id, * r) diff --git a/pyload/database/User.py b/pyload/database/User.py index 374570fb7..e11961e32 100644 --- a/pyload/database/User.py +++ b/pyload/database/User.py @@ -30,7 +30,7 @@ class UserMethods(object): @style.queue def addUser(db, user, password): - salt = reduce(lambda x, y: x + y, [str(random.randint(0, 9)) for i in range(0, 5)]) + salt = reduce(lambda x, y: x + y, [str(random.randint(0, 9)) for _i in range(0, 5)]) h = sha1(salt + password) password = salt + h.hexdigest() @@ -53,7 +53,7 @@ class UserMethods(object): pw = r[2][5:] h = sha1(salt + oldpw) if h.hexdigest() == pw: - salt = reduce(lambda x, y: x + y, [str(random.randint(0, 9)) for i in range(0, 5)]) + salt = reduce(lambda x, y: x + y, [str(random.randint(0, 9)) for _i in range(0, 5)]) h = sha1(salt + newpw) password = salt + h.hexdigest() -- cgit v1.2.3