Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wrong space in attachment (Sourcery refactored) #738

Closed
wants to merge 2 commits into from

Conversation

sourcery-ai[bot]
Copy link

@sourcery-ai sourcery-ai bot commented Oct 11, 2022

Pull Request #737 refactored by Sourcery.

Since the original Pull Request was opened as a fork in a contributor's
repository, we are unable to create a Pull Request branching from it.

To incorporate these changes, you can either:

  1. Merge this Pull Request instead of the original, or

  2. Ask your contributor to locally incorporate these commits and push them to
    the original Pull Request

    Incorporate changes via command line
    git fetch https://github.com/Ehco1996/django-sspanel pull/737/head
    git merge --ff-only FETCH_HEAD
    git push

NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.

See our documentation here.

Run Sourcery locally

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

Help us improve this pull request!

@sourcery-ai sourcery-ai bot requested a review from sljeff October 11, 2022 05:50
Comment on lines -185 to +188
port_set = {i for i in range(cls.MIN_PORT, max_port + 1)}.difference(
port_set = set(range(cls.MIN_PORT, max_port + 1)).difference(
port_set.union(cls.PORT_BLACK_SET)
)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function User.get_not_used_port refactored with the following changes:

Comment on lines -212 to +213
return settings.HOST + f"/api/subscribe/?{urlencode(params)}"
return f"{settings.HOST}/api/subscribe/?{urlencode(params)}"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function User.sub_link refactored with the following changes:

Comment on lines -218 to +219
return settings.HOST + f"/register/?{urlencode(params)}"
return f"{settings.HOST}/register/?{urlencode(params)}"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function User.ref_link refactored with the following changes:

Comment on lines -262 to +263
return (
settings.HOST + f"/api/subscribe/clash/proxy_providers/?{urlencode(params)}"
)
return f"{settings.HOST}/api/subscribe/clash/proxy_providers/?{urlencode(params)}"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function User.clash_proxy_provider_endpoint refactored with the following changes:

Comment on lines -413 to +412
changed = order.check_order_status()
if changed:
if changed := order.check_order_status():
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UserOrder.make_up_lost_orders refactored with the following changes:

Comment on lines -664 to +662
return "{}-{}".format(self.user, self.money)
return f"{self.user}-{self.money}"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function Donate.__str__ refactored with the following changes:

Comment on lines -725 to +723
self.code = "{}{}".format(self.code, get_long_random_string())
self.code = f"{self.code}{get_long_random_string()}"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function MoneyCode.clean refactored with the following changes:

Comment on lines -796 to +794
if self.status == self.STATUS_ON:
return "上架"
else:
return "下架"
return "上架" if self.status == self.STATUS_ON else "下架"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function Goods.status_cn refactored with the following changes:

Comment on lines -898 to +893
"{} ~ {} 时间内 商品: {} 共销售 {} 次 总金额 {} 元".format(
start.date(), end.date(), good, count, amount
)
f"{start.date()} ~ {end.date()} 时间内 商品: {good} 共销售 {count} 次 总金额 {amount} 元"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function PurchaseHistory.cost_statistics refactored with the following changes:

Comment on lines -940 to +933
return "日期:{}".format(str(self.time)[:9])
return f"日期:{str(self.time)[:9]}"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function Announcement.__str__ refactored with the following changes:

@sourcery-ai
Copy link
Author

sourcery-ai bot commented Oct 11, 2022

Sourcery Code Quality Report

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

Quality metrics Before After Change
Complexity 1.61 ⭐ 1.60 ⭐ -0.01 👍
Method Length 40.50 ⭐ 40.51 ⭐ 0.01 👎
Working memory 5.75 ⭐ 5.91 ⭐ 0.16 👎
Quality 83.11% 82.75% -0.36% 👎
Other metrics Before After Change
Lines 610 603 -7
Changed files Quality Before Quality After Quality Change
apps/sspanel/models.py 83.11% ⭐ 82.75% ⭐ -0.36% 👎

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

File Function Complexity Length Working Memory Quality Recommendation
apps/sspanel/models.py Goods.purchase_by_user 7 ⭐ 189 😞 9 🙂 54.43% 🙂 Try splitting into smaller methods
apps/sspanel/models.py PurchaseHistory.cost_statistics 1 ⭐ 119 🙂 12 😞 61.88% 🙂 Extract out complex expressions
apps/sspanel/models.py UserOrder.get_or_create_order 2 ⭐ 130 😞 9 🙂 65.23% 🙂 Try splitting into smaller methods
apps/sspanel/models.py User.get_subinfo_header 0 ⭐ 59 ⭐ 10 😞 75.06% ⭐ 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!

@sourcery-ai sourcery-ai bot closed this Oct 11, 2022
@sourcery-ai sourcery-ai bot deleted the sourcery/pull-737 branch October 11, 2022 05:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant