Merge pull request #376 from PR0M3TH3AN/codex/update-archiving-logic-for-retrieved-entries

Fix archive toggle in retrieval

src/password_manager/manager.py

@@ -1373,6 +1373,23 @@ class PasswordManager:
         finally:
             builtins.input = original_input
 
+    def _prompt_toggle_archive(self, entry: dict, index: int) -> None:
+        """Prompt the user to archive or restore ``entry`` based on its status."""
+        archived = entry.get("archived", entry.get("blacklisted", False))
+        prompt = (
+            "Restore this entry from archive? (y/N): "
+            if archived
+            else "Archive this entry? (y/N): "
+        )
+        choice = input(prompt).strip().lower()
+        if choice == "y":
+            if archived:
+                self.entry_manager.restore_entry(index)
+            else:
+                self.entry_manager.archive_entry(index)
+            self.is_dirty = True
+            self.last_update = time.time()
+
     def handle_retrieve_entry(self) -> None:
         """
         Handles retrieving a password from the index by prompting the user for the index number
@@ -1453,11 +1470,7 @@ class PasswordManager:
                 except Exception as e:
                     logging.error(f"Error generating TOTP code: {e}", exc_info=True)
                     print(colored(f"Error: Failed to generate TOTP code: {e}", "red"))
-                choice = input("Archive this entry? (y/N): ").strip().lower()
+                self._prompt_toggle_archive(entry, index)
-                if choice == "y":
-                    self.entry_manager.archive_entry(index)
-                    self.is_dirty = True
-                    self.last_update = time.time()
                 pause()
                 return
             if entry_type == EntryType.SSH.value:
@@ -1493,11 +1506,7 @@ class PasswordManager:
                 except Exception as e:
                     logging.error(f"Error deriving SSH key pair: {e}", exc_info=True)
                     print(colored(f"Error: Failed to derive SSH keys: {e}", "red"))
-                choice = input("Archive this entry? (y/N): ").strip().lower()
+                self._prompt_toggle_archive(entry, index)
-                if choice == "y":
-                    self.entry_manager.archive_entry(index)
-                    self.is_dirty = True
-                    self.last_update = time.time()
                 pause()
                 return
             if entry_type == EntryType.SEED.value:
@@ -1548,11 +1557,7 @@ class PasswordManager:
                 except Exception as e:
                     logging.error(f"Error deriving seed phrase: {e}", exc_info=True)
                     print(colored(f"Error: Failed to derive seed phrase: {e}", "red"))
-                choice = input("Archive this entry? (y/N): ").strip().lower()
+                self._prompt_toggle_archive(entry, index)
-                if choice == "y":
-                    self.entry_manager.archive_entry(index)
-                    self.is_dirty = True
-                    self.last_update = time.time()
                 pause()
                 return
             if entry_type == EntryType.PGP.value:
@@ -1586,11 +1591,7 @@ class PasswordManager:
                 except Exception as e:
                     logging.error(f"Error deriving PGP key: {e}", exc_info=True)
                     print(colored(f"Error: Failed to derive PGP key: {e}", "red"))
-                choice = input("Archive this entry? (y/N): ").strip().lower()
+                self._prompt_toggle_archive(entry, index)
-                if choice == "y":
-                    self.entry_manager.archive_entry(index)
-                    self.is_dirty = True
-                    self.last_update = time.time()
                 pause()
                 return
             if entry_type == EntryType.NOSTR.value:
@@ -1624,11 +1625,7 @@ class PasswordManager:
                 except Exception as e:
                     logging.error(f"Error deriving Nostr keys: {e}", exc_info=True)
                     print(colored(f"Error: Failed to derive Nostr keys: {e}", "red"))
-                choice = input("Archive this entry? (y/N): ").strip().lower()
+                self._prompt_toggle_archive(entry, index)
-                if choice == "y":
-                    self.entry_manager.archive_entry(index)
-                    self.is_dirty = True
-                    self.last_update = time.time()
                 pause()
                 return
 
@@ -1685,11 +1682,7 @@ class PasswordManager:
                                     )
                                 else:
                                     print(colored(f"  {f_label}: {f_value}", "cyan"))
-                choice = input("Archive this entry? (y/N): ").strip().lower()
+                self._prompt_toggle_archive(entry, index)
-                if choice == "y":
-                    self.entry_manager.archive_entry(index)
-                    self.is_dirty = True
-                    self.last_update = time.time()
                 pause()
                 return
 
@@ -1777,11 +1770,7 @@ class PasswordManager:
                                         print(colored(f"  {label}: {value}", "cyan"))
             else:
                 print(colored("Error: Failed to retrieve the password.", "red"))
-            choice = input("Archive this entry? (y/N): ").strip().lower()
+            self._prompt_toggle_archive(entry, index)
-            if choice == "y":
-                self.entry_manager.archive_entry(index)
-                self.is_dirty = True
-                self.last_update = time.time()
             pause()
         except Exception as e:
             logging.error(f"Error during password retrieval: {e}", exc_info=True)

src/tests/test_archive_from_retrieve.py

@@ -46,3 +46,35 @@ def test_archive_entry_from_retrieve(monkeypatch):
         pm.handle_retrieve_entry()
 
         assert entry_mgr.retrieve_entry(index)["archived"] is True
+
+
+def test_restore_entry_from_retrieve(monkeypatch):
+    """Archived entries should restore when retrieved and confirmed."""
+    with TemporaryDirectory() as tmpdir:
+        tmp_path = Path(tmpdir)
+        vault, enc_mgr = create_vault(tmp_path, TEST_SEED, TEST_PASSWORD)
+        cfg_mgr = ConfigManager(vault, tmp_path)
+        backup_mgr = BackupManager(tmp_path, cfg_mgr)
+        entry_mgr = EntryManager(vault, backup_mgr)
+
+        pm = PasswordManager.__new__(PasswordManager)
+        pm.encryption_mode = EncryptionMode.SEED_ONLY
+        pm.encryption_manager = enc_mgr
+        pm.vault = vault
+        pm.entry_manager = entry_mgr
+        pm.backup_manager = backup_mgr
+        pm.password_generator = FakePasswordGenerator()
+        pm.parent_seed = TEST_SEED
+        pm.nostr_client = SimpleNamespace()
+        pm.fingerprint_dir = tmp_path
+        pm.secret_mode_enabled = False
+
+        index = entry_mgr.add_entry("example.com", 8)
+        entry_mgr.archive_entry(index)
+
+        inputs = iter([str(index), "y"])
+        monkeypatch.setattr("builtins.input", lambda *a, **k: next(inputs))
+
+        pm.handle_retrieve_entry()
+
+        assert entry_mgr.retrieve_entry(index)["archived"] is False