Sourcery refactored master branch #1

sourcery-ai · 2022-07-28T04:11:44Z

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-07-28T04:11:45Z

main.py

-sys.path.append(os.getcwd()+"/.lib/")
+sys.path.append(f"{os.getcwd()}/.lib/")


Lines 4-12 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-07-28T04:11:45Z

.lib/api.py

-	resp_js = session.get('https://www.instagram.com/'+usrname+'/?__a=1').text
+	resp_js = session.get(f'https://www.instagram.com/{usrname}/?__a=1').text


Function get_page refactored with the following changes:

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

sourcery-ai · 2022-07-28T04:11:45Z

.lib/api.py

-		if xdict != {}:
-			print(f"{su} {re}most used %s :" % text)
-			i = 0
-			for key, val in xdict.items():
-				if len(mail) == 1:
-					if key in mail[0]:
-						continue
-				print(f"  {gr}%s : {wh}%s" % (key, val))
-				i += 1
-				if i > 4:
-					break
-			print()
-		else:
-			pass
-
+		if xdict == {}:
+			return
+		print(f"{su} {re}most used %s :" % text)
+		i = 0
+		for key, val in xdict.items():
+			if len(mail) == 1 and key in mail[0]:
+				continue
+			print(f"  {gr}%s : {wh}%s" % (key, val))
+			i += 1
+			if i > 4:
+				break
+		print()
+


Function exinfo refactored with the following changes:

Add guard clause (last-if-guard)

Merge nested if conditions (merge-nested-ifs)

Remove redundant pass statement (remove-redundant-pass)

sourcery-ai · 2022-07-28T04:11:46Z

.lib/api.py

-	
+
 	resp_js = get_page(usrname)
 	js = json.loads(resp_js)
 	js = js['graphql']['user']
-	
+
 	if js['is_private'] != False:
 		is_private = True
-
-	if js['edge_owner_to_timeline_media']['count'] > 12:
-		pass
-	else:
+
+	if js['edge_owner_to_timeline_media']['count'] <= 12:


Function user_info refactored with the following changes:

Swap if/else to remove empty if body (remove-pass-body)

sourcery-ai · 2022-07-28T04:11:46Z

.lib/api.py

@@ -112,7 +108,6 @@ def user_info(usrname):

 def highlight_post_info(i):

-	postinfo = {}


Function highlight_post_info refactored with the following changes:

Merge dictionary assignment with declaration [×2] (merge-dict-assign)

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

Move assignment closer to its usage within a block (move-assign-in-block)

Hoist repeated code outside conditional statement [×2] (hoist-statement-from-if)

sourcery-ai · 2022-07-28T04:11:46Z

.lib/api.py

-
-	posts = []
-
-	for x in range(total_uploads):
-		posts.append(highlight_post_info(x))
+
+	posts = [highlight_post_info(x) for x in range(total_uploads)]


Function post_info refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2022-07-28T04:11:46Z

.lib/check_mail.py

-	if match == None:
+	if match is None:


Function validate_mail refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2022-07-28T04:11:46Z

.lib/local.py

-    data = requests.get("http://tinyurl.com/api-create.php?url=" + url)
+    data = requests.get(f"http://tinyurl.com/api-create.php?url={url}")


Function urlshortner refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-07-28T04:11:46Z

.lib/local.py

-    output = {k: v for k, v in sorted(with_count.items(), reverse=True, key=lambda item: item[1])}
-    return output
+    return dict(sorted(with_count.items(), reverse=True, key=lambda item: item[1]))


Function sort_list refactored with the following changes:

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

Replace identity comprehension with call to collection constructor (identity-comprehension)

sourcery-ai · 2022-07-28T04:11:46Z

.lib/local.py

-    exinfo = {}
    email = r.findall(r"[_a-z0-9-\.]+[＠@]{1}[a-z0-9]+\.[a-z0-9]+", stri.lower())
-    exinfo['email'] = email
-
+    exinfo = {'email': email}


Function find refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

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

sourcery-ai · 2022-07-28T04:11:51Z

Sourcery Code Quality Report

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

Quality metrics	Before	After	Change
Complexity	9.40 🙂	7.78 ⭐	-1.62 👍
Method Length	78.47 🙂	76.53 🙂	-1.94 👍
Working memory	6.27 🙂	5.86 ⭐	-0.41 👍
Quality	65.56% 🙂	68.05% 🙂	2.49% 👍

Other metrics	Before	After	Change
Lines	323	306	-17

Changed files	Quality Before	Quality After	Quality Change
main.py	81.95% ⭐	81.80% ⭐	-0.15% 👎
.lib/api.py	55.04% 🙂	58.33% 🙂	3.29% 👍
.lib/check_mail.py	71.36% 🙂	71.36% 🙂	0.00%
.lib/local.py	87.35% ⭐	88.58% ⭐	1.23% 👍

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

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
.lib/api.py	highlight_post_info	7 ⭐	295 ⛔	12 😞	42.85% 😞	Try splitting into smaller methods. Extract out complex expressions
.lib/api.py	post_info	23 😞	148 😞	10 😞	43.20% 😞	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
.lib/api.py	exinfo	18 🙂	168 😞		61.62% 🙂	Try splitting into smaller methods
.lib/api.py	user_info	3 ⭐	178 😞	7 🙂	63.83% 🙂	Try splitting into smaller methods
.lib/check_mail.py	validate_mail	4 ⭐	121 😞	6 ⭐	71.36% 🙂	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!

'Refactored by Sourcery'

2b4e433

sourcery-ai bot requested a review from YaMraaJ-debug July 28, 2022 04:11

sourcery-ai bot commented Jul 28, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #1

Sourcery refactored master branch #1

sourcery-ai bot commented Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot Jul 28, 2022

sourcery-ai bot commented Jul 28, 2022

		sys.path.append(os.getcwd()+"/.lib/")
		sys.path.append(f"{os.getcwd()}/.lib/")

		resp_js = session.get('https://www.instagram.com/'+usrname+'/?__a=1').text
		resp_js = session.get(f'https://www.instagram.com/{usrname}/?__a=1').text

		@@ -112,7 +108,6 @@ def user_info(usrname):

		def highlight_post_info(i):

		postinfo = {}

		data = requests.get("http://tinyurl.com/api-create.php?url=" + url)
		data = requests.get(f"http://tinyurl.com/api-create.php?url={url}")

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Conversation

sourcery-ai bot commented Jul 28, 2022

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 28, 2022

Choose a reason for hiding this comment

sourcery-ai bot commented Jul 28, 2022

Sourcery Code Quality Report

Legend and Explanation