NXDRIVE-2861: Fix behavior when not entering the correct URL format (Sourcery refactored) #4232
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -119,19 +119,19 @@ | |
| @pyqtSlot(str, int, result=list) | ||
| def get_last_files(self, uid: str, number: int, /) -> List[Dict[str, Any]]: | ||
| """Return the last files transferred (see EngineDAO).""" | ||
| if engine := self._manager.engines.get(uid): | ||
| return [s.export() for s in engine.dao.get_last_files(number)] | ||
| else: | ||
| return [] | ||
|
|
||
| @pyqtSlot(str, result=int) | ||
| def get_last_files_count(self, uid: str, /) -> int: | ||
| """Return the count of the last files transferred (see EngineDAO).""" | ||
| return ( | ||
| engine.dao.get_last_files_count(duration=60) | ||
| if (engine := self._manager.engines.get(uid)) | ||
| else 0 | ||
| ) | ||
|
Comment on lines
-130
to
+134
There was a problem hiding this comment. Function
|
||
|
|
||
| @pyqtSlot(QUrl, result=str) | ||
| def to_local_file(self, url: QUrl, /) -> str: | ||
|
|
@@ -217,8 +217,7 @@ | |
| @pyqtSlot(str, result=int) | ||
| def get_active_sessions_count(self, uid: str, /) -> int: | ||
| """Return the count of active sessions items.""" | ||
| if engine := self._manager.engines.get(uid): | ||
|
There was a problem hiding this comment. Function
|
||
| return engine.dao.get_count( | ||
| f"status IN ({TransferStatus.ONGOING.value}, {TransferStatus.PAUSED.value})", | ||
| table="Sessions", | ||
|
|
@@ -228,8 +227,7 @@ | |
| @pyqtSlot(str, result=int) | ||
| def get_completed_sessions_count(self, uid: str, /) -> int: | ||
| """Return the count of completed sessions items.""" | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-231
to
+230
There was a problem hiding this comment. Function
|
||
| return engine.dao.get_count( | ||
| f"status IN ({TransferStatus.CANCELLED.value}, {TransferStatus.DONE.value})", | ||
| table="Sessions", | ||
|
|
@@ -249,12 +247,12 @@ | |
| ) -> None: | ||
| """Pause a given transfer. *nature* is either downloads or upload.""" | ||
| log.info(f"Pausing {nature} {transfer_uid} for engine {engine_uid!r}") | ||
| if engine := self._manager.engines.get(engine_uid): | ||
| engine.dao.pause_transfer( | ||
| nature, transfer_uid, progress, is_direct_transfer=is_direct_transfer | ||
| ) | ||
| else: | ||
| return | ||
|
Comment on lines
-252
to
-257
There was a problem hiding this comment. Function
|
||
|
|
||
| @pyqtSlot(str, str, int, bool) | ||
| def resume_transfer( | ||
|
|
@@ -268,77 +266,79 @@ | |
| ) -> None: | ||
| """Resume a given transfer. *nature* is either downloads or upload.""" | ||
| log.info(f"Resume {nature} {uid} for engine {engine_uid!r}") | ||
| if engine := self._manager.engines.get(engine_uid): | ||
| engine.resume_transfer(nature, uid, is_direct_transfer=is_direct_transfer) | ||
| else: | ||
| return | ||
|
Comment on lines
-271
to
-274
There was a problem hiding this comment. Function
|
||
|
|
||
| @pyqtSlot(str, int) | ||
| def resume_session(self, engine_uid: str, uid: int, /) -> None: | ||
| """Resume a given session and it's transfers.""" | ||
| log.info(f"Resume session {uid} for engine {engine_uid!r}") | ||
| if engine := self._manager.engines.get(engine_uid): | ||
| engine.resume_session(uid) | ||
| else: | ||
| return | ||
|
Comment on lines
-280
to
-283
There was a problem hiding this comment. Function
|
||
|
|
||
| @pyqtSlot(str, int) | ||
| def pause_session(self, engine_uid: str, uid: int, /) -> None: | ||
| """Pause a given session and it's transfers.""" | ||
| log.info(f"Pausing session {uid} for engine {engine_uid!r}") | ||
| if engine := self._manager.engines.get(engine_uid): | ||
| engine.dao.pause_session(uid) | ||
| else: | ||
| return | ||
|
Comment on lines
-289
to
-292
There was a problem hiding this comment. Function
|
||
|
|
||
| def cancel_session(self, engine_uid: str, uid: int, /) -> None: | ||
| """Cancel a given session and it's transfers.""" | ||
| log.info(f"Cancelling session {uid} for engine {engine_uid!r}") | ||
| if engine := self._manager.engines.get(engine_uid): | ||
| engine.cancel_session(uid) | ||
| else: | ||
| return | ||
|
Comment on lines
-297
to
-300
There was a problem hiding this comment. Function
|
||
|
|
||
| @pyqtSlot(str, str) | ||
| def show_metadata(self, uid: str, ref: str, /) -> None: | ||
| self.application.hide_systray() | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-305
to
+303
There was a problem hiding this comment. Function
|
||
| path = engine.local.abspath(Path(ref)) | ||
| self.application.show_metadata(path) | ||
|
|
||
| @pyqtSlot(str, result=list) | ||
| def get_unsynchronizeds(self, uid: str, /) -> List[Dict[str, Any]]: | ||
| result = [] | ||
| if engine := self._manager.engines.get(uid): | ||
| result.extend( | ||
| self._export_formatted_state(uid, state=conflict) | ||
| for conflict in engine.dao.get_unsynchronizeds() | ||
| ) | ||
|
Comment on lines
-313
to
+314
There was a problem hiding this comment. Function
|
||
| return result | ||
|
|
||
| @pyqtSlot(str, result=list) | ||
| def get_conflicts(self, uid: str, /) -> List[Dict[str, Any]]: | ||
| result = [] | ||
| if engine := self._manager.engines.get(uid): | ||
| result.extend( | ||
| self._export_formatted_state(uid, state=conflict) | ||
| for conflict in engine.get_conflicts() | ||
| ) | ||
|
Comment on lines
-322
to
+324
There was a problem hiding this comment. Function
|
||
| return result | ||
|
|
||
| @pyqtSlot(str, result=list) | ||
| def get_errors(self, uid: str, /) -> List[Dict[str, Any]]: | ||
| result = [] | ||
| if engine := self._manager.engines.get(uid): | ||
| result.extend( | ||
| self._export_formatted_state(uid, state=error) | ||
| for error in engine.dao.get_errors() | ||
| ) | ||
|
Comment on lines
-331
to
+334
There was a problem hiding this comment. Function
|
||
| return result | ||
|
|
||
| @pyqtSlot(result=list) | ||
| def get_features_list(self) -> List[List[str]]: | ||
| """Return the list of declared features with their value, title and translation key.""" | ||
| result = [] | ||
| for feature in vars(Feature): | ||
|
There was a problem hiding this comment. Function
|
||
| title = feature.replace("_", " ").title() | ||
| translation_key = f"FEATURE_{feature.upper()}" | ||
| result.append([title, feature, translation_key]) | ||
|
|
@@ -350,7 +350,7 @@ | |
| return str(self._manager.generate_report()) | ||
| except Exception as e: | ||
| log.exception("Report error") | ||
| return f"[ERROR] {str(e)}" | ||
|
There was a problem hiding this comment. Function
|
||
|
|
||
| @pyqtSlot(str, str, result=bool) | ||
| def generate_csv(self, session_id: str, engine_uid: str) -> bool: | ||
|
|
@@ -383,12 +383,11 @@ | |
| def open_server_folders(self, uid: str, /) -> None: | ||
| """Hide the systray and show the server folders dialog.""" | ||
| self.application.hide_systray() | ||
| if engine := self._manager.engines.get(uid): | ||
| self.application.show_server_folders(engine, None) | ||
| else: | ||
| return | ||
|
|
||
|
Comment on lines
-386
to
-390
There was a problem hiding this comment. Function
|
||
| @pyqtSlot(str, result=str) | ||
| def get_hostname_from_url(self, url: str, /) -> str: | ||
| urlp = urlparse(url) | ||
|
|
@@ -397,8 +396,7 @@ | |
| @pyqtSlot(str) | ||
| def open_remote_server(self, uid: str, /) -> None: | ||
| self.application.hide_systray() | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-400
to
+399
There was a problem hiding this comment. Function
|
||
| engine.open_remote() | ||
|
|
||
| @pyqtSlot(str) | ||
|
|
@@ -415,11 +413,9 @@ | |
| filepath = Path(force_decode(path).lstrip("/")) | ||
| if not uid: | ||
| self._manager.open_local_file(filepath) | ||
| elif engine := self._manager.engines.get(uid): | ||
| filepath = engine.local.abspath(filepath) | ||
| self._manager.open_local_file(filepath) | ||
|
There was a problem hiding this comment. Function
|
||
|
|
||
| @pyqtSlot() | ||
| def open_help(self) -> None: | ||
|
|
@@ -448,8 +444,7 @@ | |
| @pyqtSlot(str) | ||
| def show_conflicts_resolution(self, uid: str, /) -> None: | ||
| self.application.hide_systray() | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-451
to
+447
There was a problem hiding this comment. Function
|
||
| self.application.show_conflicts_resolution(engine) | ||
|
|
||
| @pyqtSlot(str) | ||
|
|
@@ -576,7 +571,7 @@ | |
| def _balance_percents(self, result: Dict[str, float], /) -> Dict[str, float]: | ||
| """Return an altered version of the dict in which no value is under a minimum threshold.""" | ||
|
|
||
| result = dict(sorted(result.items(), key=lambda item: item[1])) | ||
|
Comment on lines
-579
to
+574
There was a problem hiding this comment. Function
|
||
| keys = list(result) | ||
| min_threshold = 10 | ||
| data = 0.0 | ||
|
|
@@ -638,8 +633,7 @@ | |
|
|
||
| @pyqtSlot(str) | ||
| def filters_dialog(self, uid: str, /) -> None: | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-641
to
+636
There was a problem hiding this comment. Function
|
||
| self.application.show_filters(engine) | ||
|
|
||
| def _bind_server( | ||
|
|
@@ -873,8 +867,7 @@ | |
| self.setMessage.emit("PROXY_NO_PAC_FILE", "error") | ||
| return False | ||
|
|
||
| if error := self._manager.set_proxy(proxy): | ||
|
Comment on lines
-876
to
+870
There was a problem hiding this comment. Function
|
||
| self.setMessage.emit(error, "error") | ||
| return False | ||
|
|
||
|
|
@@ -1048,44 +1041,39 @@ | |
|
|
||
| @pyqtSlot(str, result=int) | ||
| def get_syncing_count(self, uid: str, /) -> int: | ||
| return ( | ||
| engine.dao.get_syncing_count() | ||
| if (engine := self._manager.engines.get(uid)) | ||
| else 0 | ||
| ) | ||
|
Comment on lines
-1051
to
+1048
There was a problem hiding this comment. Function
|
||
|
|
||
| # Conflicts section | ||
|
|
||
| @pyqtSlot(str, int) | ||
| def resolve_with_local(self, uid: str, state_id: int, /) -> None: | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-1061
to
+1054
There was a problem hiding this comment. Function
|
||
| engine.resolve_with_local(state_id) | ||
|
|
||
| @pyqtSlot(str, int) | ||
| def resolve_with_remote(self, uid: str, state_id: int, /) -> None: | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-1067
to
+1059
There was a problem hiding this comment. Function
|
||
| engine.resolve_with_remote(state_id) | ||
|
|
||
| @pyqtSlot(str, int) | ||
| def retry_pair(self, uid: str, state_id: int, /) -> None: | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-1073
to
+1064
There was a problem hiding this comment. Function
|
||
| engine.retry_pair(state_id) | ||
|
|
||
| @pyqtSlot(str, int, str) | ||
| def ignore_pair(self, uid: str, state_id: int, reason: str, /) -> None: | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-1079
to
+1069
There was a problem hiding this comment. Function
|
||
| engine.ignore_pair(state_id, reason) | ||
|
|
||
| @pyqtSlot(str, str, str) | ||
| def open_remote(self, uid: str, remote_ref: str, remote_name: str, /) -> None: | ||
| log.info(f"Should open {remote_name!r} ({remote_ref!r})") | ||
| try: | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-1087
to
+1076
There was a problem hiding this comment. Function
|
||
| engine.open_edit(remote_ref, remote_name) | ||
| except OSError: | ||
| log.exception("Remote open error") | ||
|
|
@@ -1096,8 +1084,7 @@ | |
| ) -> None: | ||
| log.info(f"Should open remote document {remote_path!r} ({remote_ref!r})") | ||
| try: | ||
| if engine := self._manager.engines.get(uid): | ||
|
Comment on lines
-1099
to
+1087
There was a problem hiding this comment. Function
|
||
| url = engine.get_metadata_url(remote_ref) | ||
| engine.open_remote(url=url) | ||
| except OSError: | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Function
QMLDriveApi.get_last_filesrefactored with the following changes:use-named-expression)reintroduce-else)swap-if-else-branches)