implement one click update,sync option

This commit is contained in:
rambros 2026-03-01 18:25:06 +05:30
parent bc500641bf
commit cbfeb8e51e

View file

@ -173,7 +173,7 @@ class DiscoReaperCLI:
finally: finally:
await self.engine.close_connections() await self.engine.close_connections()
async def backup_messages(self): async def backup_messages(self, force_overwrite=None, skip_found_prompt=False, auto_sync_existing=False):
"""Option 2: Backup Channels structure and all message history.""" """Option 2: Backup Channels structure and all message history."""
if not self.tokens_valid: return if not self.tokens_valid: return
try: try:
@ -200,48 +200,61 @@ class DiscoReaperCLI:
console.print("[yellow]No text/news channels found to backup.[/yellow]") console.print("[yellow]No text/news channels found to backup.[/yellow]")
return return
console.print(f"\n[bold]Select Channels to Backup ({len(eligible_channels)} total):[/bold]")
# Identify duplicate names to show categories for them
name_counts = {}
for chan in eligible_channels:
name_counts[chan.name] = name_counts.get(chan.name, 0) + 1
for i, chan in enumerate(eligible_channels):
display_name = chan.name
if name_counts[chan.name] > 1:
cat_name = cat_map.get(chan.category_id)
if cat_name:
display_name = f"{chan.name} [{cat_name}]"
# Check for existing backup
found_prefix = ""
backup_file = self.exporter.export_path / "message_backup" / f"{chan.id}.json"
if backup_file.exists():
found_prefix = "[green][FOUND][/green] "
console.print(f"({i+1}) {found_prefix}{display_name}")
console.print("(A) [bold green]All Channels[/bold green]")
console.print("(B) Back")
choices = [str(i+1) for i in range(len(eligible_channels))] + ["A", "B", "a", "b"]
selection_input = Prompt.ask("\nSelect option or indices (e.g. 1,2,5)", default="B")
if selection_input.upper() == "B":
return
selected_channels = [] selected_channels = []
if selection_input.upper() == "A":
selected_channels = eligible_channels if auto_sync_existing:
else: selected_channels = [
try: c for c in eligible_channels
# Handle multiple indices like '1,2,5' if (self.exporter.export_path / "message_backup" / f"{c.id}.json").exists()
indices = [int(i.strip()) - 1 for i in selection_input.split(",") if i.strip().isdigit()] ]
selected_channels = [eligible_channels[i] for i in indices if 0 <= i < len(eligible_channels)] if not selected_channels:
except Exception: console.print("[yellow]No existing backups found to sync.[/yellow]")
console.print("[red]Invalid selection. Aborting.[/red]")
return return
# In auto-sync mode, we always use sync (force_overwrite=False) and skip prompts
force_overwrite = False
skip_found_prompt = True
else:
console.print(f"\n[bold]Select Channels to Backup ({len(eligible_channels)} total):[/bold]")
# Identify duplicate names to show categories for them
name_counts = {}
for chan in eligible_channels:
name_counts[chan.name] = name_counts.get(chan.name, 0) + 1
for i, chan in enumerate(eligible_channels):
display_name = chan.name
if name_counts[chan.name] > 1:
cat_name = cat_map.get(chan.category_id)
if cat_name:
display_name = f"{chan.name} [{cat_name}]"
# Check for existing backup
found_prefix = ""
backup_file = self.exporter.export_path / "message_backup" / f"{chan.id}.json"
if backup_file.exists():
found_prefix = "[green][FOUND][/green] "
console.print(f"({i+1}) {found_prefix}{display_name}")
console.print("(A) [bold green]All Channels[/bold green]")
console.print("(B) Back")
choices = [str(i+1) for i in range(len(eligible_channels))] + ["A", "B", "a", "b"]
selection_input = Prompt.ask("\nSelect option or indices (e.g. 1,2,5)", default="B")
if selection_input.upper() == "B":
return
if selection_input.upper() == "A":
selected_channels = eligible_channels
else:
try:
# Handle multiple indices like '1,2,5'
indices = [int(i.strip()) - 1 for i in selection_input.split(",") if i.strip().isdigit()]
selected_channels = [eligible_channels[i] for i in indices if 0 <= i < len(eligible_channels)]
except Exception:
console.print("[red]Invalid selection. Aborting.[/red]")
return
if not selected_channels: if not selected_channels:
console.print("[yellow]No valid channels selected.[/yellow]") console.print("[yellow]No valid channels selected.[/yellow]")
@ -254,17 +267,18 @@ class DiscoReaperCLI:
any_found = True any_found = True
break break
force_overwrite = False if force_overwrite is None:
if any_found: force_overwrite = False
console.print("\n[bold yellow]Existing backup(s) found for some selected channels.[/bold yellow]") if any_found and not skip_found_prompt:
console.print("(Y) Update & Sync Backup") console.print("\n[bold yellow]Existing backup(s) found for some selected channels.[/bold yellow]")
console.print("(F) [bold red]Force Overwrite Backup[/bold red]") console.print("(Y) Update & Sync Backup")
console.print("(B) Back") console.print("(F) [bold red]Force Overwrite Backup[/bold red]")
console.print("(B) Back")
sync_choice = Prompt.ask("\nSelect option", choices=["Y", "F", "B"], default="Y").upper() sync_choice = Prompt.ask("\nSelect option", choices=["Y", "F", "B"], default="Y").upper()
if sync_choice == "B": if sync_choice == "B":
return return
force_overwrite = (sync_choice == "F") force_overwrite = (sync_choice == "F")
console.print(f"\n[yellow]Starting backup for {len(selected_channels)} channels...[/yellow]") console.print(f"\n[yellow]Starting backup for {len(selected_channels)} channels...[/yellow]")
@ -304,10 +318,11 @@ class DiscoReaperCLI:
await self.engine.close_connections() await self.engine.close_connections()
async def sync_backup(self): async def sync_backup(self):
"""Option 3: Update & Sync Backup (Runs a full pass but overwrites where needed).""" """Option 3: Update & Sync Backup (Automated incremental sync for existing backups)."""
console.print("[yellow]Syncing backup... (Re-validating all data)[/yellow]") console.print("[yellow]Syncing backup... (Updating existing data)[/yellow]")
await self.backup_server_profile() await self.backup_server_profile()
await self.backup_messages() # Automatically select and sync existing backups
await self.backup_messages(auto_sync_existing=True)
async def edit_configuration(self): async def edit_configuration(self):
# reuse or implement simplified version of edit_configuration from app.py # reuse or implement simplified version of edit_configuration from app.py