fixup! Extract state package from GUI

freedomofpress · Jan 11, 2022 · d0bcb6e · d0bcb6e
1 parent 079c7bb
commit d0bcb6e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/securedrop_client/gui/widgets.py b/securedrop_client/gui/widgets.py
@@ -66,6 +66,7 @@
     QWidget,
 )
 
+from securedrop_client import state
 from securedrop_client.db import (
     DraftReply,
     File,
@@ -2330,10 +2331,10 @@ def _set_file_name(self) -> None:
             self.horizontal_line.hide()
             self.spacer.show()
 
-    @pyqtSlot(str)
-    def _on_file_download_started(self, file_uuid: str) -> None:
-        if file_uuid == self.uuid:
-            logger.debug(f"Starting animation: {file_uuid}")
+    @pyqtSlot(state.FileId)
+    def _on_file_download_started(self, id: state.FileId) -> None:
+        if str(id) == self.uuid:
+            logger.debug(f"Starting animation: {id}")
             self.downloading = True
             QTimer.singleShot(300, self.start_button_animation)
 

diff --git a/securedrop_client/logic.py b/securedrop_client/logic.py
@@ -227,9 +227,9 @@ class Controller(QObject):
     This signal indicates that a file download has been started.
 
     Emits:
-        str: the file UUID
+        FileId: the file UUID
     """
-    file_download_started = pyqtSignal(str)
+    file_download_started = pyqtSignal(state.FileId)
 
     """
     This signal indicates that a file has been successfully downloaded.

diff --git a/securedrop_client/state/writer.py b/securedrop_client/state/writer.py
@@ -34,7 +34,7 @@ def set_selected_conversation(self, id: ConversationId) -> None:
         if id not in self._state._conversations:
             self.upsert_conversation(id, [])
         self._state._selected_conversation = id
-        logger.debug("selected source/convesation:", id)
+        logger.debug(f"selected source/conversation: {id}")
 
     def upsert_conversation(
         self, id: ConversationId, files: List[Union[FileId, DownloadedFileId]]