NXDRIVE-2767: Clean up systray menu (Sourcery refactored) #3974
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
|
Sourcery AI seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## wip-NXDRIVE-2767-Clean-up-systray-menu #3974 +/- ##
==========================================================================
+ Coverage 46.91% 46.96% +0.04%
==========================================================================
Files 93 93
Lines 15642 15630 -12
==========================================================================
+ Hits 7339 7341 +2
+ Misses 8303 8289 -14
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
sourcery-ai
bot
force-pushed
the
sourcery/wip-NXDRIVE-2767-Clean-up-systray-menu
branch
from
ac70c63
to
ba1e7d2
Compare
sourcery-ai
bot
force-pushed
the
sourcery/wip-NXDRIVE-2767-Clean-up-systray-menu
branch
from
ba1e7d2
to
91b31f9
Compare
sourcery-ai
bot
force-pushed
the
sourcery/wip-NXDRIVE-2767-Clean-up-systray-menu
branch
from
91b31f9
to
d5567dd
Compare
sourcery-ai
bot
force-pushed
the
sourcery/wip-NXDRIVE-2767-Clean-up-systray-menu
branch
from
d5567dd
to
032b7c4
Compare
| if value in ("unsync", "delete_server"): | ||
| if value in {"unsync", "delete_server"}: |
There was a problem hiding this comment.
Function _validate_deletion_behavior refactored with the following changes:
- Use set when checking membership of a collection of literals (
collection-into-set)
| return int(value) | ||
| return value |
There was a problem hiding this comment.
Function validate_sync_root_max_level_limits refactored with the following changes:
- Remove unnecessary casts to int, str, float or bool (
remove-unnecessary-cast)
| for feature in vars(Feature).keys(): | ||
| for feature in vars(Feature): |
There was a problem hiding this comment.
Lines 642-642 refactored with the following changes:
- Remove unnecessary call to keys() (
remove-dict-keys)
| if not engine: | ||
| return "" | ||
|
|
||
| return getattr(engine, self.names[role].decode()) | ||
| return "" if not engine else getattr(engine, self.names[role].decode()) |
There was a problem hiding this comment.
Function EngineModel.data refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-99
to
+96
| if not engine: | ||
| return "" | ||
|
|
||
| return getattr(engine, role) | ||
| return "" if not engine else getattr(engine, role) |
There was a problem hiding this comment.
Function EngineModel.get refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-492
to
+497
| datetime = get_date_from_sqlite(row["created_on"]) | ||
| if datetime: | ||
| if datetime := get_date_from_sqlite(row["created_on"]): | ||
| label += "_ON" | ||
| # As date_time is in UTC | ||
| offset = tzlocal().utcoffset(datetime) | ||
| if offset: | ||
| if offset := tzlocal().utcoffset(datetime): | ||
| datetime += offset | ||
| args.append(Translator.format_datetime(datetime)) | ||
| return self.tr(label, values=args) | ||
| elif role == self.COMPLETED_ON: | ||
| label = "COMPLETED" if row["status"].name == "DONE" else "CANCELLED" | ||
| args = [] | ||
| datetime = get_date_from_sqlite(row["completed_on"]) | ||
| if datetime: | ||
| if datetime := get_date_from_sqlite(row["completed_on"]): | ||
| label += "_ON" | ||
| offset = tzlocal().utcoffset(datetime) | ||
| if offset: | ||
| if offset := tzlocal().utcoffset(datetime): |
There was a problem hiding this comment.
Function ActiveSessionModel.data refactored with the following changes:
- Use named expression to simplify assignment and conditional [×4] (
use-named-expression)
This removes the following comments ( why? ):
# As date_time is in UTC
| datetime = get_date_from_sqlite(row["created_on"]) | ||
| if datetime: | ||
| if datetime := get_date_from_sqlite(row["created_on"]): | ||
| label += "_ON" | ||
| # As date_time is in UTC | ||
| offset = tzlocal().utcoffset(datetime) | ||
| if offset: | ||
| if offset := tzlocal().utcoffset(datetime): | ||
| datetime += offset | ||
| args.append(Translator.format_datetime(datetime)) | ||
| return self.tr(label, values=args) | ||
| elif role == self.COMPLETED_ON: | ||
| label = "COMPLETED" if row["status"].name == "DONE" else "CANCELLED" | ||
| args = [] | ||
| datetime = get_date_from_sqlite(row["completed_on"]) | ||
| if datetime: | ||
| if datetime := get_date_from_sqlite(row["completed_on"]): | ||
| label += "_ON" | ||
| offset = tzlocal().utcoffset(datetime) | ||
| if offset: | ||
| if offset := tzlocal().utcoffset(datetime): |
There was a problem hiding this comment.
Function CompletedSessionModel.data refactored with the following changes:
- Use named expression to simplify assignment and conditional [×4] (
use-named-expression)
This removes the following comments ( why? ):
# As date_time is in UTC
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request #3973 refactored by Sourcery.
If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
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:
Review changes via command line
To manually merge these changes, make sure you're on the
wip-NXDRIVE-2767-Clean-up-systray-menubranch, then run:Help us improve this pull request!