Sourcery refactored master branch #1

sourcery-ai · 2022-10-06T05:37:40Z

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-06T05:37:41Z

unrar/rarfile.py

-        if (msg == constants.UCM_NEEDPASSWORD or
-            msg == constants.UCM_NEEDPASSWORDW):
+        if msg in [constants.UCM_NEEDPASSWORD, constants.UCM_NEEDPASSWORDW]:


Function _ReadIntoMemory._callback refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2022-10-06T05:37:41Z

unrar/rarfile.py

-        rarinfo = self._read_header(handle)
-        while rarinfo:
+        while rarinfo := self._read_header(handle):
            self.filelist.append(rarinfo)
            self.NameToInfo[rarinfo.filename] = rarinfo
            self._process_current(handle, constants.RAR_SKIP)
-            rarinfo = self._read_header(handle)


Function RarFile._load_metadata refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2022-10-06T05:37:41Z

unrar/rarfile.py

-            raise BadRarFile("Bad RAR archive data: %s" % str(e))
+            raise BadRarFile(f"Bad RAR archive data: {str(e)}")


Function RarFile.open refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-10-06T05:37:41Z

unrar/rarfile.py

-        names = []
-        for member in self.filelist:
-            names.append(member.filename)
-        return names
+        return [member.filename for member in self.filelist]


Function RarFile.namelist refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

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

sourcery-ai · 2022-10-06T05:37:42Z

unrar/rarfile.py

-            raise BadRarFile("Bad RAR archive data: %s" % str(e))
+            raise BadRarFile(f"Bad RAR archive data: {str(e)}")


Function RarFile._extract_members refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-10-06T05:37:42Z

unrar/rarfile.py

-        err = rf.testrar()
-        if err:
+        if err := rf.testrar():


Function main refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2022-10-06T05:37:42Z

unrar/unrarlib.py

-    lib_path = lib_path or find_library("unrar.dll")
-    if lib_path:
+    if lib_path := lib_path or find_library("unrar.dll"):


Lines 44-67 refactored with the following changes:

Use named expression to simplify assignment and conditional [×2] (use-named-expression)

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

sourcery-ai · 2022-10-06T05:37:42Z

unrar/unrarlib.py

-            res.append('%s=%s' % (field[0], field_value))
-        return self.__class__.__name__ + '(' + ','.join(res) + ')'
+            res.append(f'{field[0]}={field_value}')
+        return f'{self.__class__.__name__}(' + ','.join(res) + ')'


Function _Structure.__repr__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

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

sourcery-ai · 2022-10-06T05:37:42Z

unrar/tests/test_rarfile.py

-        rar = RarFile(rar_filename)
-        return rar
+        return RarFile(rar_filename)


Function TestRarFile._open_rarfile refactored with the following changes:

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

sourcery-ai · 2022-10-06T05:37:42Z

unrar/tests/test_rarfile.py

-        rar = RarFile(rar_filename, pwd='password')
-        return rar
+        return RarFile(rar_filename, pwd='password')


Function TestPasswordRarFile._open_rarfile refactored with the following changes:

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

sourcery-ai · 2022-10-06T05:37:47Z

Sourcery Code Quality Report

❌ Merging this PR will decrease code quality in the affected files by 0.19%.

Quality metrics	Before	After	Change
Complexity	5.15 ⭐	5.14 ⭐	-0.01 👍
Method Length	49.25 ⭐	48.93 ⭐	-0.32 👍
Working memory	7.28 🙂	7.38 🙂	0.10 👎
Quality	73.85% 🙂	73.66% 🙂	-0.19% 👎

Other metrics	Before	After	Change
Lines	708	696	-12

Changed files	Quality Before	Quality After	Quality Change
unrar/rarfile.py	72.74% 🙂	72.25% 🙂	-0.49% 👎
unrar/unrarlib.py	61.49% 🙂	61.75% 🙂	0.26% 👍
unrar/tests/test_rarfile.py	94.77% ⭐	94.74% ⭐	-0.03% 👎

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

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
unrar/unrarlib.py	_check_readheader_result	17 🙂	172 😞	19 ⛔	33.47% 😞	Try splitting into smaller methods. Extract out complex expressions
unrar/unrarlib.py	_check_process_result	17 🙂	172 😞	19 ⛔	33.47% 😞	Try splitting into smaller methods. Extract out complex expressions
unrar/rarfile.py	RarFile.open	16 🙂	203 😞	9 🙂	45.37% 😞	Try splitting into smaller methods
unrar/rarfile.py	main	10 🙂	145 😞	9 🙂	55.81% 🙂	Try splitting into smaller methods
unrar/rarfile.py	RarFile._extract_members	10 🙂	143 😞	8 🙂	58.24% 🙂	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'

2df2464

sourcery-ai bot requested a review from synodriver October 6, 2022 05:37

sourcery-ai bot commented Oct 6, 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 Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot Oct 6, 2022

sourcery-ai bot commented Oct 6, 2022

		raise BadRarFile("Bad RAR archive data: %s" % str(e))
		raise BadRarFile(f"Bad RAR archive data: {str(e)}")

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Conversation

sourcery-ai bot commented Oct 6, 2022

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot Oct 6, 2022

Choose a reason for hiding this comment

sourcery-ai bot commented Oct 6, 2022

Sourcery Code Quality Report

Legend and Explanation