Sourcery refactored master branch #19

sourcery-ai · 2022-10-20T20:50:59Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

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

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2022-10-20T20:51:04Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 0.60%.

Quality metrics	Before	After	Change
Complexity	33.43 ⛔	30.50 😞	-2.93 👍
Method Length	165.89 😞	166.00 😞	0.11 👎
Working memory	13.63 😞	14.06 😞	0.43 👎
Quality	28.66% 😞	29.26% 😞	0.60% 👍

Other metrics	Before	After	Change
Lines	240	255	15

Changed files	Quality Before	Quality After	Quality Change
svn_extractor.py	28.66% 😞	29.26% 😞	0.60% 👍

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
svn_extractor.py	main	47 ⛔	579 ⛔	17 ⛔	10.39% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
svn_extractor.py	readsvn	30 😞	245 ⛔	19 ⛔	20.04% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
svn_extractor.py	save_url_wc	20 😞	216 ⛔	10 😞	39.37% 😞	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
svn_extractor.py	readwc	13 🙂	214 ⛔	10 😞	45.03% 😞	Try splitting into smaller methods. Extract out complex expressions
svn_extractor.py	save_url_svn	5 ⭐	125 😞	7 🙂	67.42% 🙂	Try splitting into smaller methods

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Help us improve this quality report!

sourcery-ai · 2022-10-20T20:52:31Z

svn_extractor.py

-        urli = urli + "/"
+        urli = f"{urli}/"
    for a in data.text.splitlines():
        # below functionality will find all usernames from svn entries file
-        if a == "has-props":
-            author_list.append(old_line)
-        if a == "file":
-            if not pattern.search(old_line):
-                continue
-            ignore = getext(old_line) in excludes
-            if ignore:
-                print('{}{}(not extracted)'.format(urli, old_line))
-            else:
-                print('{}{}'.format(urli, old_line))
-            if no_extract and not ignore:
-                save_url_svn(urli, old_line, proxy_dict)
-            file_list = file_list + ";" + old_line
        if a == "dir":
            if old_line != "":
                folder_path = os.path.join("output", urli.replace("http://", "").replace("https://", "").replace("/", os.path.sep), old_line)
-                if not os.path.exists(folder_path):
-                    if no_extract:
-                        os.makedirs(folder_path)
-                dir_list = dir_list + ";" + old_line
-                print('{}{}'.format(urli, old_line))
+                if not os.path.exists(folder_path) and no_extract:
+                    os.makedirs(folder_path)
+                dir_list = f"{dir_list};{old_line}"
+                print(f'{urli}{old_line}')
                try:
                    d = requests.get(urli + old_line + "/.svn/entries", verify=False, proxies=(proxy_dict))
                    readsvn(d, urli + old_line, match, proxy_dict)
                except Exception:
-                    print("Error Reading {}{}/.svn/entries so killing".format(urli, old_line))
+                    print(f"Error Reading {urli}{old_line}/.svn/entries so killing")

+        elif a == "file":
+            if not pattern.search(old_line):
+                continue
+            ignore = getext(old_line) in excludes
+            if ignore:
+                print(f'{urli}{old_line}(not extracted)')
+            else:
+                print(f'{urli}{old_line}')
+            if no_extract and not ignore:
+                save_url_svn(urli, old_line, proxy_dict)
+            file_list = f"{file_list};{old_line}"
+        elif a == "has-props":
+            author_list.append(old_line)


Function readsvn refactored with the following changes:

Use f-string instead of string concatenation [×5] (use-fstring-for-concatenation)

Simplify conditional into switch-like form [×11] (switch)

Replace call to format with f-string [×4] (use-fstring-for-formatting)

Merge nested if conditions (merge-nested-ifs)

sourcery-ai · 2022-10-20T20:52:31Z

svn_extractor.py

-    with open(folder + "wc.db", "wb") as f:
+    with open(f"{folder}wc.db", "wb") as f:
        f.write(data.content)
-    conn = sqlite3.connect(folder + "wc.db")
+    conn = sqlite3.connect(f"{folder}wc.db")


Function readwc refactored with the following changes:

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

Replace call to format with f-string [×2] (use-fstring-for-formatting)

sourcery-ai · 2022-10-20T20:52:31Z

svn_extractor.py

-        print("{} : {}".format(cnt, x))
+        print(f"{cnt} : {x}")


Function show_list refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-10-20T20:52:32Z

svn_extractor.py

-                print("Error while accessing : {}{}".format(url, svn_path))
+                print(f"Error while accessing : {url}{svn_path}")


Function save_url_wc refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-10-20T20:52:32Z

svn_extractor.py

-        r = requests.get(url + "/.svn/text-base/" + filename + ".svn-base", verify=False, proxies=(proxy_dict))
+        r = requests.get(
+            f"{url}/.svn/text-base/{filename}.svn-base",
+            verify=False,
+            proxies=(proxy_dict),
+        )
+


Function save_url_svn refactored with the following changes:

Use f-string instead of string concatenation [×3] (use-fstring-for-concatenation)

sourcery-ai · 2022-10-20T20:52:32Z

svn_extractor.py

-        print("Only downloading matches to {}".format(match))
-        match = "("+match+"|entries$|wc.db$)"  # need to allow entries$ and wc.db too
+        print(f"Only downloading matches to {match}")
+        match = f"({match}|entries$|wc.db$)"


Function main refactored with the following changes:

Replace call to format with f-string [×5] (use-fstring-for-formatting)

Use f-string instead of string concatenation [×5] (use-fstring-for-concatenation)

Merge nested if conditions (merge-nested-ifs)

This removes the following comments ( why? ):

# need to allow entries$ and wc.db too

sourcery-ai bot requested a review from anantshri October 20, 2022 20:51

'Refactored by Sourcery'

20b1b17

sourcery-ai bot force-pushed the sourcery/master branch from e9a2dee to 20b1b17 Compare October 20, 2022 20:52

sourcery-ai bot commented Oct 20, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #19

Sourcery refactored master branch #19

sourcery-ai bot commented Oct 20, 2022

sourcery-ai bot commented Oct 20, 2022 •

edited

Loading

sourcery-ai bot Oct 20, 2022

sourcery-ai bot Oct 20, 2022

sourcery-ai bot Oct 20, 2022

sourcery-ai bot Oct 20, 2022

sourcery-ai bot Oct 20, 2022

sourcery-ai bot Oct 20, 2022

		print("Error while accessing : {}{}".format(url, svn_path))
		print(f"Error while accessing : {url}{svn_path}")

Sourcery refactored master branch #19

Are you sure you want to change the base?

Sourcery refactored master branch #19

Conversation

sourcery-ai bot commented Oct 20, 2022

sourcery-ai bot commented Oct 20, 2022 • edited Loading

Sourcery Code Quality Report

Legend and Explanation

sourcery-ai bot Oct 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot commented Oct 20, 2022 •

edited

Loading