Sourcery Starbot ⭐ refactored mfhbam/pyload by SourceryAI · Pull Request #1 · mfhbam/pyload

SourceryAI · 2020-12-16T06:51:20Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

To manually merge these changes, make sure you're on the stable branch, then run:

git fetch https://github.com/sourcery-ai-bot/pyload stable
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI

Sourcery timed out performing refactorings.

Due to GitHub API limits, only the first 60 comments can be shown.

SourceryAI · 2020-12-16T06:51:22Z

-else:
-    enc = "utf8"
-
+enc = "cp850" if os.name == "nt" else "utf8"


Lines 37-41 refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

SourceryAI · 2020-12-16T06:51:22Z

            self.threadManager.pause = False
            return False
-        elif not self.threadManager.pause:
+        else:


Function Core.__init__.toggle_pause refactored with the following changes:

Remove redundant conditional (remove-redundant-if)

SourceryAI · 2020-12-16T06:51:22Z

-        f = open(self.pidfile, "wb")
-        f.write(str(pid))
-        f.close()
+        with open(self.pidfile, "wb") as f:
+            f.write(str(pid))


Function Core.__init__.writePidFile refactored with the following changes:

Use with when opening file to ensure closure (ensure-file-closed)

SourceryAI · 2020-12-16T06:51:22Z

-            pid = f.read().strip()
-            f.close()
+            with open(self.pidfile, "rb") as f:
+                pid = f.read().strip()


Function Core.__init__.checkPidFile refactored with the following changes:

Use with when opening file to ensure closure (ensure-file-closed)

SourceryAI · 2020-12-16T06:51:22Z

-            data = {}
-            data["type"] = conn.attribute("type", "remote")
+            data = {"type": conn.attribute("type", "remote")}
            data["default"] = conn.attribute("default", "False")
            data["id"] = conn.attribute("id", uuid().hex)
-            if data["default"] == "True":
-                data["default"] = True
-            else:
-                data["default"] = False
+            data["default"] = data["default"] == "True"
            subs = self.parser.parseNode(conn, "dict")
-            if not subs.has_key("name"):
-                data["name"] = _("Unnamed")
-            else:
-                data["name"] = subs["name"].text()
+            data["name"] = subs["name"].text() if subs.has_key("name") else _("Unnamed")
            if data["type"] == "remote":
                if not subs.has_key("server"):
                    continue
-                else:
-                    data["host"] = subs["server"].text()
-                    data["user"] = subs["server"].attribute("user", "admin")
-                    data["port"] = int(subs["server"].attribute("port", "7227"))
-                    data["password"] = subs["server"].attribute("password", "")
+                data["host"] = subs["server"].text()
+                data["user"] = subs["server"].attribute("user", "admin")
+                data["port"] = int(subs["server"].attribute("port", "7227"))
+                data["password"] = subs["server"].attribute("password", "")


Function main.getConnections refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

Replace if statement with if expression (assign-if-exp)

Simplify boolean if expression (boolean-if-exp-identity)

Merge dictionary assignment with declaration (merge-dict-assign)

Swap if/else branches (swap-if-else-branches)

SourceryAI · 2020-12-16T06:51:24Z

+            data["queue"],
+            data["order"],
+            links=[self._convertPyFile(x) for x in data["links"].itervalues()],
+        )


Function Api.statusDownloads.getPackageData refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2020-12-16T06:51:24Z

-        
+
        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"]],
+        )


Function Api.statusDownloads.getPackageInfo refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2020-12-16T06:51:24Z

-        fdata = self._convertPyFile(info.values()[0])
-        return fdata
+        return self._convertPyFile(info.values()[0])


Function Api.statusDownloads.getFileData refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2020-12-16T06:51:24Z

-        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))


Function Api.statusDownloads.uploadContainer refactored with the following changes:

Use with when opening file to ensure closure (ensure-file-closed)

SourceryAI · 2020-12-16T06:51:25Z

-            while pack["order"] in order.keys(): #just in case
+            while pack["order"] in order: #just in case


Function Api.statusDownloads.getPackageOrder refactored with the following changes:

Remove unnecessary call to keys() (remove-dict-keys)

SourceryAI · 2020-12-16T06:51:27Z

-            while pyfile["order"] in order.keys(): #just in case
+            while pyfile["order"] in order: #just in case


Function Api.statusDownloads.getFileOrder refactored with the following changes:

Remove unnecessary call to keys() (remove-dict-keys)

SourceryAI · 2020-12-16T06:51:27Z

-        return not task is None
+        return task is not None


Function Api.statusDownloads.isCaptchaWaiting refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

SourceryAI · 2020-12-16T06:51:27Z

-            t = CaptchaTask(int(task.id), standard_b64encode(data), type, result)
-            return t
+            return CaptchaTask(int(task.id), standard_b64encode(data), type, result)


Function Api.statusDownloads.getCaptchaTask refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2020-12-16T06:51:27Z

-        return True if self.checkAuth(username, password, remoteip) else False
+        return bool(self.checkAuth(username, password, remoteip))


Function Api.statusDownloads.login refactored with the following changes:

Simplify boolean if expression (boolean-if-exp-identity)

SourceryAI · 2020-12-16T06:51:28Z

-        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()
+        }


Function Api.statusDownloads.getAllUserData refactored with the following changes:

Convert for loop into dictionary comprehension (dict-comprehension)

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2020-12-16T06:51:30Z


    def setProgress(self, value):
-        if not value == self.progress:
+        if value != self.progress:


Function PyFile.__init__.notifyChange.setProgress refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

SourceryAI · 2020-12-16T06:51:30Z

        try:
-            el = heappop(self.queue)
-            return el
+            return heappop(self.queue)


Function PriorityQueue.get refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2020-12-16T06:51:30Z

        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")):


Function ThreadManager.__init__ refactored with the following changes:

Replace range(0, x) with range(x) (remove-zero-from-range)

Replace unused for index with underscore (for-index-underscore)

SourceryAI · 2020-12-16T06:51:31Z


        ip = ""
-        for i in range(10):
+        for _ in range(10):


Function ThreadManager.getIP refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

SourceryAI · 2020-12-16T06:51:31Z

    now = list(time.localtime()[3:5])
    if start < now < end: return True
    elif start > end and (now > start or now < end): return True
-    elif start < now > end < start: return True


Function compare_time refactored with the following changes:

Remove redundant conditional (remove-redundant-if)

SourceryAI · 2020-12-16T06:51:33Z

-        if m:
-            traffic = float(m.group(1).replace(",", "."))
-            unit = m.group(2)
-        else:
+        if not m:
            return 0
+        traffic = float(m.group(1).replace(",", "."))
+        unit = m.group(2)


Function parseFileSize refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

SourceryAI · 2020-12-16T06:51:33Z

-        if "-" in inp:
-            l, n, h = inp.partition("-")
-            l = int(l)
-            h = int(h)
-            r = range(l, h + 1)
-
-            ret = []
-            if package:
-                for p in self.cache:
-                    if p.pid in r:
-                        ret.append(p.pid)
-            else:
-                for l in self.links.links:
-                    if l.lid in r:
-                        ret.append(l.lid)
-
-            return ret
+        if "-" not in inp:
+            return [int(x) for x in inp.split(",")]
+
+        l, n, h = inp.partition("-")
+        l = int(l)
+        h = int(h)
+        r = range(l, h + 1)

+        ret = []
+        if package:
+            for p in self.cache:
+                if p.pid in r:
+                    ret.append(p.pid)
        else:
-            return [int(x) for x in inp.split(",")]
+            for l in self.links.links:
+                if l.lid in r:
+                    ret.append(l.lid)
+
+        return ret


Function ManageFiles.init.onBackSpace.onEnter.renderBody.getLinks.parseInput refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

SourceryAI · 2020-12-16T06:51:34Z

    """ create some urls, some may fail """
    urls = []
-    for x in range(0, randint(20, 100)):
+    for _ in range(randint(20, 100)):


Function createURLs refactored with the following changes:

Replace range(0, x) with range(x) (remove-zero-from-range)

Replace unused for index with underscore (for-index-underscore)

SourceryAI · 2020-12-16T06:51:34Z


 def startApiExerciser(core, n):
-    for i in range(n):
+    for _ in range(n):


Function startApiExerciser refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

SourceryAI · 2020-12-16T06:51:34Z

-            self.api = core.api
-
-
+        self.api = ThriftClient(user=user, password=pw) if thrift else core.api


Function APIExerciser.__init__ refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

SourceryAI · 2020-12-16T06:51:36Z

-        if not ids or (pyfile.id in ids and len(ids) == 1):
-            if not pyfile.package().setFinished:
-                self.core.log.info(_("Package finished: %s") % pyfile.package().name)
-                self.core.hookManager.packageFinished(pyfile.package())
-                pyfile.package().setFinished = True
+        if (
+            not ids or (pyfile.id in ids and len(ids) == 1)
+        ) and not pyfile.package().setFinished:
+            self.core.log.info(_("Package finished: %s") % pyfile.package().name)
+            self.core.hookManager.packageFinished(pyfile.package())
+            pyfile.package().setFinished = True


Function FileHandler.addLinks.deleteLink.updateLink.restartFile.checkPackageFinished refactored with the following changes:

Merge nested if conditions (merge-nested-ifs)

SourceryAI · 2020-12-16T06:51:36Z

-        urls = []
+        urls = [
+            (pyfile["url"], pyfile["plugin"])
+            for pyfile in data.itervalues()
+            if pyfile["status"] not in (0, 12, 13)
+        ]

-        for pyfile in data.itervalues():
-            if pyfile["status"] not in  (0, 12, 13):
-                urls.append((pyfile["url"], pyfile["plugin"]))


Function FileHandler.addLinks.deleteLink.updateLink.restartFile.checkPackageFinished.reCheckPackage refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

SourceryAI · 2020-12-16T06:51:36Z

-        data = {}
-        for r in self.c:
-            data[r[0]] = {
+        return {r[0]: {


Function FileHandler.addLinks.deleteLink.updateLink.restartFile.checkPackageFinished.FileMethods._nextFileOrder.addLink.addLinks.getAllLinks refactored with the following changes:

Convert for loop into dictionary comprehension (dict-comprehension)

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2020-12-16T06:51:37Z

-        data = {}
-        for r in self.c:
-            data[r[0]] = {
+        return {r[0]: {


Function FileHandler.addLinks.deleteLink.updateLink.restartFile.checkPackageFinished.FileMethods._nextFileOrder.addLink.addLinks.getPackageData refactored with the following changes:

Convert for loop into dictionary comprehension (dict-comprehension)

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2020-12-16T06:51:37Z

-        for r in self.c:
-            ids.append(int(r[0]))
-        return ids
+        return [int(r[0]) for r in self.c]


Function FileHandler.addLinks.deleteLink.updateLink.restartFile.checkPackageFinished.FileMethods._nextFileOrder.addLink.addLinks.updateLinkInfo refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

Inline variable that is immediately returned (inline-immediately-returned-variable)

'Refactored by Sourcery'

20a317f

SourceryAI commented Dec 16, 2020

View reviewed changes

		while pack["order"] in order.keys(): #just in case
		while pack["order"] in order: #just in case

		while pyfile["order"] in order.keys(): #just in case
		while pyfile["order"] in order: #just in case

		return True if self.checkAuth(username, password, remoteip) else False
		return bool(self.checkAuth(username, password, remoteip))

		self.api = core.api


		self.api = ThriftClient(user=user, password=pw) if thrift else core.api

Conversation

SourceryAI commented Dec 16, 2020

Uh oh!

SourceryAI left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant