thePR0M3TH3AN/seedPass
1
0
Fork 0
mirror of https://github.com/PR0M3TH3AN/SeedPass.git synced 2025-09-08 23:38:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add modified_ts tracking and merge logic

Browse Source
This commit is contained in:
thePR0M3TH3AN
2025-07-24 20:28:21 -04:00
parent db90d9caf0
commit 747e2be5a9
6 changed files with 90 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/seedpass/core/manager.py
View File

@@ -1179,7 +1179,7 @@ class PasswordManager:
updated = False
if current != encrypted:
if self.vault.decrypt_and_save_index_from_nostr(
encrypted, strict=False
encrypted, strict=False, merge=False
):
updated = True
current = encrypted
@@ -1189,7 +1189,7 @@ class PasswordManager:
for delta in deltas:
if current != delta:
if self.vault.decrypt_and_save_index_from_nostr(
delta, strict=False
delta, strict=False, merge=True
):
updated = True
current = delta
@@ -1314,7 +1314,7 @@ class PasswordManager:
manifest, chunks = result
encrypted = gzip.decompress(b"".join(chunks))
success = self.vault.decrypt_and_save_index_from_nostr(
encrypted, strict=False
encrypted, strict=False, merge=False
)
if success:
have_data = True
@@ -1325,7 +1325,7 @@ class PasswordManager:
for delta in deltas:
if current != delta:
if self.vault.decrypt_and_save_index_from_nostr(
delta, strict=False
delta, strict=False, merge=True
):
current = delta
logger.info("Initialized local database from Nostr.")
@@ -3641,7 +3641,7 @@ class PasswordManager:
:param encrypted_data: The encrypted data retrieved from Nostr.
"""
try:
self.vault.decrypt_and_save_index_from_nostr(encrypted_data)
self.vault.decrypt_and_save_index_from_nostr(encrypted_data, merge=True)
logging.info("Index file updated from Nostr successfully.")
print(colored("Index file updated from Nostr successfully.", "green"))
except Exception as e: