Sourcery Starbot ⭐ refactored mfhbam/pyload

module/Api.py

@@ -96,10 +96,9 @@ def __init__(self, core):
         self.core = core
 
     def _convertPyFile(self, p):
-        f = FileData(p["id"], p["url"], p["name"], p["plugin"], p["size"],
+        return 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 f
 
     def _convertConfigFormat(self, c):
         sections = {}
@@ -259,9 +258,8 @@ def getLog(self, offset=0):
         """
         filename = join(self.core.config['log']['log_folder'], 'log.txt')
         try:
-            fh = open(filename, "r")
-            lines = fh.readlines()
-            fh.close()
+            with open(filename, "r") as fh:
+                lines = fh.readlines()
             if offset >= len(lines):
                 return []
             return lines[offset:]
@@ -316,11 +314,7 @@ def addPackage(self, name, links, dest=Destination.Queue):
         :param dest: `Destination`
         :return: package id of the new package
         """
-        if self.core.config['general']['folder_per_package']:
-            folder = name
-        else:
-            folder = ""
-
+        folder = name if self.core.config['general']['folder_per_package'] else ""
         folder = folder.replace("http://", "").replace(":", "").replace("/", "_").replace("\\", "_")
 
         pid = self.core.files.addPackage(name, folder, dest)
@@ -402,10 +396,8 @@ def checkOnlineStatusContainer(self, urls, container, data):
         :param data: file content
         :return: online check
         """
-        th = open(join(self.core.config["general"]["download_folder"], "tmp_" + container), "wb")
-        th.write(str(data))
-        th.close()
-
+        with open(join(self.core.config["general"]["download_folder"], "tmp_" + container), "wb") as th:
+            th.write(str(data))
         return self.checkOnlineStatus(urls + [th.name])
 
     @permission(PERMS.ADD)
@@ -417,12 +409,12 @@ def pollResults(self, rid):
         """
         result = self.core.threadManager.getInfoResult(rid)
 
-        if "ALL_INFO_FETCHED" in result:
-            del result["ALL_INFO_FETCHED"]
-            return OnlineCheck(-1, result)
-        else:
+        if "ALL_INFO_FETCHED" not in result:
             return OnlineCheck(rid, result)
 
+        del result["ALL_INFO_FETCHED"]
+        return OnlineCheck(-1, result)
+
 
     @permission(PERMS.ADD)
     def generatePackages(self, links):
@@ -431,8 +423,7 @@ def generatePackages(self, links):
         :param links: list of urls
         :return: package names mapped to urls
         """
-        result = parseNames((x, x) for x in links)
-        return result
+        return parseNames((x, x) for x in links)
 
     @permission(PERMS.ADD)
     def generateAndAddPackages(self, links, dest=Destination.Queue):
@@ -470,11 +461,16 @@ def getPackageData(self, pid):
         if not data:
             raise PackageDoesNotExists(pid)
 
-        pdata = 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 pdata
+        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)
     def getPackageInfo(self, pid):
@@ -484,15 +480,20 @@ def getPackageInfo(self, pid):
         :return: `PackageData` with .fid attribute
         """
         data = self.core.files.getPackageData(int(pid))
-        
+
         if not data:
             raise PackageDoesNotExists(pid)
 
-        pdata = PackageData(data["id"], data["name"], data["folder"], data["site"], data["password"],
-                            data["queue"], data["order"],
-                            fids=[int(x) for x in data["links"]])
-
-        return pdata
+        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)
     def getFileData(self, fid):
@@ -505,8 +506,7 @@ def getFileData(self, fid):
         if not info:
             raise FileDoesNotExists(fid)
 
-        fdata = self._convertPyFile(info.values()[0])
-        return fdata
+        return self._convertPyFile(info.values()[0])
 
     @permission(PERMS.DELETE)
     def deleteFiles(self, fids):
@@ -695,10 +695,8 @@ def uploadContainer(self, filename, data):
         :param filename: filename, extension is important so it can correctly decrypted
         :param data: file content
         """
-        th = open(join(self.core.config["general"]["download_folder"], "tmp_" + filename), "wb")
-        th.write(str(data))
-        th.close()
-
+        with open(join(self.core.config["general"]["download_folder"], "tmp_" + filename), "wb") as th:
+            th.write(str(data))
         self.addPackage(th.name, [th.name], Destination.Queue)
 
     @permission(PERMS.MODIFY)
@@ -762,7 +760,7 @@ def getPackageOrder(self, destination):
 
         for pid in packs:
             pack = self.core.files.getPackageData(int(pid))
-            while pack["order"] in order.keys(): #just in case
+            while pack["order"] in order: #just in case
                 pack["order"] += 1
             order[pack["order"]] = pack["id"]
         return order
@@ -777,7 +775,7 @@ def getFileOrder(self, pid):
         rawData = self.core.files.getPackageData(int(pid))
         order = {}
         for id, pyfile in rawData["links"].iteritems():
-            while pyfile["order"] in order.keys(): #just in case
+            while pyfile["order"] in order: #just in case
                 pyfile["order"] += 1
             order[pyfile["order"]] = pyfile["id"]
         return order
@@ -791,7 +789,7 @@ def isCaptchaWaiting(self):
         """
         self.core.lastClientConnected = time()
         task = self.core.captchaManager.getTask()
-        return not task is None
+        return task is not None
 
     @permission(PERMS.STATUS)
     def getCaptchaTask(self, exclusive=False):
@@ -805,8 +803,7 @@ def getCaptchaTask(self, exclusive=False):
         if task:
             task.setWatingForUser(exclusive=exclusive)
             data, type, result = task.getCaptcha()
-            t = CaptchaTask(int(task.id), standard_b64encode(data), type, result)
-            return t
+            return CaptchaTask(int(task.id), standard_b64encode(data), type, result)
         else:
             return CaptchaTask(-1)
 
@@ -911,7 +908,7 @@ def login(self, username, password, remoteip=None):
         :param remoteip: Omit this argument, its only used internal
         :return: bool indicating login was successful
         """
-        return True if self.checkAuth(username, password, remoteip) else False
+        return bool(self.checkAuth(username, password, remoteip))
 
     def checkAuth(self, username, password, remoteip=None):
         """Check authentication and returns details
@@ -955,23 +952,27 @@ def getUserData(self, username, password):
 
     def getAllUserData(self):
         """returns all known user and info"""
-        res = {}
-        for user, data in self.core.db.getAllUserData().iteritems():
-            res[user] = UserData(user, data["email"], data["role"], data["permission"], data["template"])
-
-        return res
+        return {
+            user: UserData(
+                user,
+                data["email"],
+                data["role"],
+                data["permission"],
+                data["template"],
+            )
+            for user, data in self.core.db.getAllUserData().iteritems()
+        }
 
     @permission(PERMS.STATUS)
     def getServices(self):
         """ A dict of available services, these can be defined by hook plugins.
 
         :return: dict with this style: {"plugin": {"method": "description"}}
         """
-        data = {}
-        for plugin, funcs in self.core.hookManager.methods.iteritems():
-            data[plugin] = funcs
-
-        return data
+        return {
+            plugin: funcs
+            for plugin, funcs in self.core.hookManager.methods.iteritems()
+        }
 
     @permission(PERMS.STATUS)
     def hasService(self, plugin, func):

module/CaptchaManager.py

@@ -125,10 +125,7 @@ def setWaiting(self, sec):
         self.status = "waiting"
 
     def isWaiting(self):
-        if self.result or self.error or time() > self.waitUntil:
-            return False
-
-        return True
+        return not self.result and not self.error and time() <= self.waitUntil
 
     def isTextual(self):
         """ returns if text is written on the captcha """
@@ -139,10 +136,7 @@ def isPositional(self):
         return self.captchaResultType == 'positional'
 
     def setWatingForUser(self, exclusive):
-        if exclusive:
-            self.status = "user"
-        else:
-            self.status = "shared-user"
+        self.status = "user" if exclusive else "shared-user"
 
     def timedOut(self):
         return time() > self.waitUntil

module/ConfigParser.py

@@ -246,10 +246,10 @@ def cast(self, typ, value):
         elif typ == "int":
             return int(value)
         elif typ == "bool":
-            return True if value.lower() in ("1", "true", "on", "an", "yes") else False
+            return value.lower() in ("1", "true", "on", "an", "yes")
         elif typ == "time":
             if not value: value = "0:00"
-            if not ":" in value: value += ":00"
+            if ":" not in value: value += ":00"
             return value
         elif typ in ("str", "file", "folder"):
             try:

module/HookManager.py

@@ -106,7 +106,7 @@ def addRPC(self, plugin, func, doc):
     def callRPC(self, plugin, func, args, parse):
         if not args: args = tuple()
         if parse:
-            args = tuple([literal_eval(x) for x in args])
+            args = tuple(literal_eval(x) for x in args)
 
         plugin = self.pluginMap[plugin]
         f = getattr(plugin, func)
@@ -147,10 +147,11 @@ def createIndex(self):
         self.plugins = plugins
 
     def manageHooks(self, plugin, name, value):
-        if name == "activated" and value:
-            self.activateHook(plugin)
-        elif name == "activated" and not value:
-            self.deactivateHook(plugin)
+        if name == "activated":
+            if value:
+                self.activateHook(plugin)
+            else:
+                self.deactivateHook(plugin)
 
     def activateHook(self, plugin):
 

module/PullEvents.py

@@ -71,8 +71,8 @@ def addEvent(self, event):
 
 class UpdateEvent():
     def __init__(self, itype, iid, destination):
-        assert itype == "pack" or itype == "file"
-        assert destination == "queue" or destination == "collector"
+        assert itype in ["pack", "file"]
+        assert destination in ["queue", "collector"]
         self.type = itype
         self.id = iid
         self.destination = destination
@@ -82,8 +82,8 @@ def toList(self):
 
 class RemoveEvent():
     def __init__(self, itype, iid, destination):
-        assert itype == "pack" or itype == "file"
-        assert destination == "queue" or destination == "collector"
+        assert itype in ["pack", "file"]
+        assert destination in ["queue", "collector"]
         self.type = itype
         self.id = iid
         self.destination = destination
@@ -93,8 +93,8 @@ def toList(self):
 
 class InsertEvent():
     def __init__(self, itype, iid, after, destination):
-        assert itype == "pack" or itype == "file"
-        assert destination == "queue" or destination == "collector"
+        assert itype in ["pack", "file"]
+        assert destination in ["queue", "collector"]
         self.type = itype
         self.id = iid
         self.after = after
@@ -105,7 +105,7 @@ def toList(self):
 
 class ReloadAllEvent():
     def __init__(self, destination):
-        assert destination == "queue" or destination == "collector"
+        assert destination in ["queue", "collector"]
         self.destination = destination
 
     def toList(self):

module/PyFile.py

@@ -280,6 +280,6 @@ def notifyChange(self):
         self.m.core.pullManager.addEvent(e)
 
     def setProgress(self, value):
-        if not value == self.progress:
+        if value != self.progress:
             self.progress = value
             self.notifyChange()

module/Scheduler.py

@@ -133,8 +133,7 @@ def get(self):
         """ return element or None """
         self.lock.acquire()
         try:
-            el = heappop(self.queue)
-            return el
+            return heappop(self.queue)
         except IndexError:
             return None, None
         finally:

module/ThreadManager.py

@@ -68,7 +68,7 @@ def __init__(self, core):
 
         pycurl.global_init(pycurl.GLOBAL_DEFAULT)
 
-        for i in range(0, self.core.config.get("download", "max_downloads")):
+        for _ in range(self.core.config.get("download", "max_downloads")):
             self.createThread()
 
 
@@ -215,7 +215,7 @@ def getIP(self):
                     ("http://checkip.dyndns.org/",".*Current IP Address: (\S+)</body>.*")]
 
         ip = ""
-        for i in range(10):
+        for _ in range(10):
             try:
                 sv = choice(services)
                 ip = getURL(sv[0])