NXDRIVE-2861: Fix behavior when not entering the correct URL format (Sourcery refactored) #4338

sourcery-ai · 2023-11-20T08:14:10Z

Pull Request #4337 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-2861-Fix-behavior-when-not-entering-the-correct-URL-formatt branch, then run:

git fetch origin sourcery/wip-NXDRIVE-2861-Fix-behavior-when-not-entering-the-correct-URL-formatt
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

…pdated 5.3.3.md

…pdated api.py

…reated test_api.py

CLAassistant · 2023-11-20T08:14:18Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

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.}

CLAassistant · 2023-11-20T08:14:19Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

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 · 2023-11-20T08:16:15Z

Codecov Report

Attention: 40 lines in your changes are missing coverage. Please review.

Comparison is base (58b527a) 48.99% compared to head (4fe67fb) 49.10%.

Files	Patch %	Lines
nxdrive/gui/api.py	0.00%	40 Missing ⚠️

Additional details and impacted files

@@                                             Coverage Diff                                             @@
##           wip-NXDRIVE-2861-Fix-behavior-when-not-entering-the-correct-URL-formatt    #4338      +/-   ##
===========================================================================================================
+ Coverage                                                                    48.99%   49.10%   +0.10%     
===========================================================================================================
  Files                                                                           94       94              
  Lines                                                                        15680    15645      -35     
===========================================================================================================
  Hits                                                                          7683     7683              
+ Misses                                                                        7997     7962      -35

Flag	Coverage Δ
functional	`38.03% <0.00%> (+0.08%)`	⬆️
integration	`2.07% <0.00%> (+<0.01%)`	⬆️
unit	`37.49% <0.00%> (+0.08%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…ixed failed style

…ering-the-correct-URL-formatt

sourcery-ai · 2023-11-20T10:12:51Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if not engine:
+        if engine := self._manager.engines.get(uid):
+            return [s.export() for s in engine.dao.get_last_files(number)]
+        else:
            return []
-        return [s.export() for s in engine.dao.get_last_files(number)]


Function QMLDriveApi.get_last_files refactored with the following changes:

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

Lift code into else after jump in control flow (reintroduce-else)

Swap if/else branches (swap-if-else-branches)

sourcery-ai · 2023-11-20T10:12:51Z

nxdrive/gui/api.py

-        count = 0
-        engine = self._manager.engines.get(uid)
-        if engine:
-            count = engine.dao.get_last_files_count(duration=60)
-        return count
+        return (
+            engine.dao.get_last_files_count(duration=60)
+            if (engine := self._manager.engines.get(uid))
+            else 0
+        )


Function QMLDriveApi.get_last_files_count refactored with the following changes:

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

Move setting of default value for variable into else branch (introduce-default-else)

Replace if statement with if expression (assign-if-exp)

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

sourcery-ai · 2023-11-20T10:12:51Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if engine:
+        if engine := self._manager.engines.get(uid):


Function QMLDriveApi.get_active_sessions_count refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:51Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if engine:
+        if engine := self._manager.engines.get(uid):


Function QMLDriveApi.get_completed_sessions_count refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:51Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(engine_uid)
-        if not engine:
+        if engine := self._manager.engines.get(engine_uid):
+            engine.dao.pause_transfer(
+                nature, transfer_uid, progress, is_direct_transfer=is_direct_transfer
+            )
+        else:
            return
-        engine.dao.pause_transfer(
-            nature, transfer_uid, progress, is_direct_transfer=is_direct_transfer
-        )


Function QMLDriveApi.pause_transfer refactored with the following changes:

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

Lift code into else after jump in control flow (reintroduce-else)

Swap if/else branches (swap-if-else-branches)

sourcery-ai · 2023-11-20T10:12:52Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if engine:
+        if engine := self._manager.engines.get(uid):


Function QMLDriveApi.open_remote_server refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:52Z

nxdrive/gui/api.py

-        else:
-            engine = self._manager.engines.get(uid)
-            if engine:
-                filepath = engine.local.abspath(filepath)
-                self._manager.open_local_file(filepath)
+        elif engine := self._manager.engines.get(uid):
+            filepath = engine.local.abspath(filepath)
+            self._manager.open_local_file(filepath)


Function QMLDriveApi.open_local refactored with the following changes:

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

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

sourcery-ai · 2023-11-20T10:12:52Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if engine:
+        if engine := self._manager.engines.get(uid):


Function QMLDriveApi.show_conflicts_resolution refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:53Z

nxdrive/gui/api.py

-        result = {k: v for k, v in sorted(result.items(), key=lambda item: item[1])}
+        result = dict(sorted(result.items(), key=lambda item: item[1]))


Function QMLDriveApi._balance_percents refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:53Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if engine:
+        if engine := self._manager.engines.get(uid):


Function QMLDriveApi.filters_dialog refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:56Z

nxdrive/gui/api.py

-        error = self._manager.set_proxy(proxy)
-        if error:
+        if error := self._manager.set_proxy(proxy):


Function QMLDriveApi.set_proxy_settings refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:56Z

nxdrive/gui/api.py

-        count = 0
-        engine = self._manager.engines.get(uid)
-        if engine:
-            count = engine.dao.get_syncing_count()
-        return count
+        return (
+            engine.dao.get_syncing_count()
+            if (engine := self._manager.engines.get(uid))
+            else 0
+        )


Function QMLDriveApi.get_syncing_count refactored with the following changes:

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

Move setting of default value for variable into else branch (introduce-default-else)

Replace if statement with if expression (assign-if-exp)

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

sourcery-ai · 2023-11-20T10:12:56Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if engine:
+        if engine := self._manager.engines.get(uid):


Function QMLDriveApi.resolve_with_local refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:57Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if engine:
+        if engine := self._manager.engines.get(uid):


Function QMLDriveApi.resolve_with_remote refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:57Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if engine:
+        if engine := self._manager.engines.get(uid):


Function QMLDriveApi.retry_pair refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:57Z

nxdrive/gui/api.py

-        engine = self._manager.engines.get(uid)
-        if engine:
+        if engine := self._manager.engines.get(uid):


Function QMLDriveApi.ignore_pair refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:58Z

nxdrive/gui/api.py

-            engine = self._manager.engines.get(uid)
-            if engine:
+            if engine := self._manager.engines.get(uid):


Function QMLDriveApi.open_remote refactored with the following changes:

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

sourcery-ai · 2023-11-20T10:12:58Z

nxdrive/gui/api.py

-            engine = self._manager.engines.get(uid)
-            if engine:
+            if engine := self._manager.engines.get(uid):


Function QMLDriveApi.open_remote_document refactored with the following changes:

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

gitofanindya added 3 commits November 20, 2023 13:40

NXDRIVE-2861: Fix behavior when not entering the correct URL format-U…

4bc3296

…pdated 5.3.3.md

NXDRIVE-2861: Fix behavior when not entering the correct URL format-U…

8af543a

…pdated api.py

NXDRIVE-2861: Fix behavior when not entering the correct URL format-C…

b51f0ef

…reated test_api.py

sourcery-ai bot requested a review from gitofanindya November 20, 2023 08:14

NXDRIVE-2861: Fix behavior when not entering the correct URL format-f…

09c3729

…ixed failed style

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2861-Fix-behavior-when-not-entering-the-correct-URL-formatt branch from 2d5d618 to 7d6c48b Compare November 20, 2023 08:23

gitofanindya and others added 2 commits November 20, 2023 15:41

Merge branch 'master' into wip-NXDRIVE-2861-Fix-behavior-when-not-ent…

58b527a

…ering-the-correct-URL-formatt

'Refactored by Sourcery'

4fe67fb

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2861-Fix-behavior-when-not-entering-the-correct-URL-formatt branch from 7d6c48b to 4fe67fb Compare November 20, 2023 10:12

sourcery-ai bot commented Nov 20, 2023

View reviewed changes

Base automatically changed from wip-NXDRIVE-2861-Fix-behavior-when-not-entering-the-correct-URL-formatt to master November 21, 2023 07:13

sourcery-ai bot closed this Nov 21, 2023

sourcery-ai bot deleted the sourcery/wip-NXDRIVE-2861-Fix-behavior-when-not-entering-the-correct-URL-formatt branch November 21, 2023 07:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NXDRIVE-2861: Fix behavior when not entering the correct URL format (Sourcery refactored) #4338

NXDRIVE-2861: Fix behavior when not entering the correct URL format (Sourcery refactored) #4338

sourcery-ai bot commented Nov 20, 2023 •

edited

Loading

CLAassistant commented Nov 20, 2023

CLAassistant commented Nov 20, 2023

codecov bot commented Nov 20, 2023 •

edited

Loading

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

sourcery-ai bot Nov 20, 2023

		result = {k: v for k, v in sorted(result.items(), key=lambda item: item[1])}
		result = dict(sorted(result.items(), key=lambda item: item[1]))

NXDRIVE-2861: Fix behavior when not entering the correct URL format (Sourcery refactored) #4338

NXDRIVE-2861: Fix behavior when not entering the correct URL format (Sourcery refactored) #4338

Conversation

sourcery-ai bot commented Nov 20, 2023 • edited Loading

CLAassistant commented Nov 20, 2023

CLAassistant commented Nov 20, 2023

codecov bot commented Nov 20, 2023 • edited Loading

Codecov Report

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 20, 2023

Choose a reason for hiding this comment

sourcery-ai bot commented Nov 20, 2023 •

edited

Loading

codecov bot commented Nov 20, 2023 •

edited

Loading