Sourcery refactored master branch #1

sourcery-ai · 2022-08-12T14:51:46Z

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-08-12T14:51:48Z

pyon.py

-		
+
 		self.data = ''
-		
+
 		self.length = None
 		self.set_terminator(2)
-		
+


Found the following improvement in Function AionConnection.__init__:

sourcery-ai · 2022-08-12T14:51:48Z

pyon.py

-		
+


Function AionConnection.decrypt_message refactored with the following changes:

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

Use str.join() instead of for loop (use-join)

sourcery-ai · 2022-08-12T14:51:48Z

pyon.py

-		
+
 		if not self.encryption_key:
 			return data
-		
+


Function AionConnection.encrypt_message refactored with the following changes:

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

Use str.join() instead of for loop (use-join)

sourcery-ai · 2022-08-12T14:51:48Z

pyon.py

-		
+
 		self.server = None
 		self.modules = []
-		
+


Found the following improvement in Function AionClientConnection.__init__:

sourcery-ai · 2022-08-12T14:51:49Z

pyon.py

-		__import__('modules.'+name)
-		
-		module = sys.modules['modules.'+name]
-		
+		__import__(f'modules.{name}')
+
+		module = sys.modules[f'modules.{name}']
+
 		if self.modules.count(module) > 0:
 			reload(self.modules[self.modules.index(module)])
-			
+


Function AionClientConnection.load_module refactored with the following changes:

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

sourcery-ai · 2022-08-12T14:51:50Z

modules/handlers.py

-
-	quests = []
-
-	for i in range(0, quests_length):
-		quests.append(struct.unpack('I', data[4+(4*i):8+(4*i)])[0])
-
-	print 'server_questlist', quests
-
+
+	quests = [
+		struct.unpack('I', data[4 + (4 * i) : 8 + (4 * i)])[0]
+		for i in range(quests_length)
+	]
+
+
+	(quests_length,) = struct.unpack('I', data[:4])
+


Function preprocess_server_questlist refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

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

sourcery-ai · 2022-08-12T14:51:50Z

modules/quests.py

-quests = {}
 tree = lxml.objectify.parse(open('quest.xml'))

-for quest in tree.getroot().quest:
-	quests[quest.id.pyval] = quest
+quests = {quest.id.pyval: quest for quest in tree.getroot().quest}


Lines 4-8 refactored with the following changes:

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

Convert for loop into dictionary comprehension (dict-comprehension)

sourcery-ai · 2022-08-12T14:51:50Z

modules/warpzone.py

-		
+
 	if tokens[0] == 'nudge':
-		
+
 		if len(tokens) < 4:
 			return None
-		
+
 		x = float(tokens[1])
 		y = float(tokens[2])
 		z = float(tokens[3])
-		
+


Found the following improvement in Function preprocess_client_whisper:

sourcery-ai · 2022-08-12T14:51:50Z

modules/workhorse.py

-	
+
 	(player_id, objid, unknown, status) = struct.unpack('=2IHB', data)
-	
+
 	if player_id != 0x30562:
 		return
-	
-	if status == 0 or status == 1:
+
+	if status in [0, 1]:
 		return
-	
+
 	if status == 2:
 		success += 1
-	
+
 	if status == 4:
 		failure += 1
-	
+
 	if success+failure >= 4:
-		
+
 		if success < 3:
 			constructors.client_abandon_quest(server.client, work_order_id)
 		else:
 			constructors.client_npcoption(server.client, expert_id, 17, 1, 5, work_order_id, 0)
-		
+
 		return
-		
+


Function postprocess_server_craft_status refactored with the following changes:

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

sourcery-ai · 2022-08-12T14:51:51Z

modules/workhorse.py

-	
+
 	(quests_length,) = struct.unpack('I', data[:4])
-
-	quests = []
-
-	for i in range(0, quests_length):
-		quests.append(struct.unpack('I', data[4+(4*i):8+(4*i)])[0])
-
-	if work_order_id in quests:
-		#constructors.client_npcoption(server.client, expert_id, 1002, 1, 4, work_order_id, 0)
-		pass
+
+	quests = [
+		struct.unpack('I', data[4 + (4 * i) : 8 + (4 * i)])[0]
+		for i in range(quests_length)
+	]


Function postprocess_server_available_quest_list refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

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

Remove redundant conditional (remove-redundant-if)

This removes the following comments ( why? ):

#constructors.client_npcoption(server.client, expert_id, 1002, 1, 4, work_order_id, 0)

sourcery-ai · 2022-08-12T14:52:12Z

Sourcery Code Quality Report

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

Quality metrics	Before	After	Change
Complexity	1.93 ⭐	1.82 ⭐	-0.11 👍
Method Length	42.77 ⭐	42.76 ⭐	-0.01 👍
Working memory	8.61 🙂	8.66 🙂	0.05 👎
Quality	78.35% ⭐	78.45% ⭐	0.10% 👍

Other metrics	Before	After	Change
Lines	1417	1410	-7

Changed files	Quality Before	Quality After	Quality Change
pyon.py	83.43% ⭐	84.27% ⭐	0.84% 👍
modules/barrage.py	58.24% 🙂	58.11% 🙂	-0.13% 👎
modules/constructors.py	83.62% ⭐	83.62% ⭐	0.00%
modules/gatherer.py	76.94% ⭐	77.24% ⭐	0.30% 👍
modules/handlers.py	79.30% ⭐	79.20% ⭐	-0.10% 👎
modules/quests.py	93.24% ⭐	94.74% ⭐	1.50% 👍
modules/warpzone.py	66.46% 🙂	66.46% 🙂	0.00%
modules/workhorse.py	71.28% 🙂	71.21% 🙂	-0.07% 👎

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

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
modules/barrage.py	preprocess_client_skill	11 🙂	216 ⛔	15 😞	38.78% 😞	Try splitting into smaller methods. Extract out complex expressions
modules/handlers.py	preprocess_client_create_character	0 ⭐	195 😞	62 ⛔	42.40% 😞	Try splitting into smaller methods. Extract out complex expressions
modules/handlers.py	preprocess_server_system_message	5 ⭐	142 😞	15 😞	50.95% 🙂	Try splitting into smaller methods. Extract out complex expressions
modules/workhorse.py	postprocess_server_craft_status	8 ⭐	104 🙂	16 ⛔	51.61% 🙂	Extract out complex expressions
modules/handlers.py	preprocess_client_location	8 ⭐	131 😞	13 😞	52.00% 🙂	Try splitting into smaller methods. Extract out complex expressions

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'

e183ac6

sourcery-ai bot requested a review from WaDn-X August 12, 2022 14:51

sourcery-ai bot commented Aug 12, 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 Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot Aug 12, 2022

sourcery-ai bot commented Aug 12, 2022

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Conversation

sourcery-ai bot commented Aug 12, 2022

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot Aug 12, 2022

Choose a reason for hiding this comment

sourcery-ai bot commented Aug 12, 2022

Sourcery Code Quality Report

Legend and Explanation