Merge pull request #3 from vuolter/0.4.10

merge vuolter HEAD

4 files changed, 38 insertions, 27 deletions

diff --git a/pyload/database/Backend.py b/pyload/database/Backend.py
index 45a5c7361..b0e94711e 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):
@@ -79,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
@@ -106,6 +108,7 @@ class DatabaseJob(object):
     def wait(self):
         self.done.wait()
 
+
 class DatabaseBackend(Thread):
     subs = []
 
diff --git a/pyload/database/File.py b/pyload/database/File.py
index 205cbba1a..7cbe1890a 100644
--- a/pyload/database/File.py
+++ b/pyload/database/File.py
@@ -87,12 +87,13 @@ 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():
-            if value["package"] in packs:
-                packs[value["package"]]["links"][key] = value
+            if value['package'] in packs:
+                packs[value['package']]['links'][key] = value
 
         return packs
 
@@ -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
@@ -277,11 +279,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 +366,7 @@ class FileHandler(object):
         if jobs:
             return self.getFile(jobs[0])
         else:
-            self.jobCache["decrypt"] = "empty"
+            self.jobCache['decrypt'] = "empty"
             return None
 
 
@@ -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
@@ -516,20 +519,21 @@ 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 +542,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 +572,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 +846,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
@@ -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/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..e11961e32 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):
 
 
@@ -29,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()
 
@@ -52,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()