refactor: Sync-Zusammenfassung als eigener Text-Baustein
Etappe 7 (Textteil). Der Text der Sync-Zusammenfassung liegt in `src/whiteboard/view/sync_summary_text.gd`; der Controller setzt nur noch das Label. Der Sync-Test nutzt die Klasse direkt statt einer Controller-Methode. Bewusst offen bleibt die Orchestrierung: Thread starten/pollen, OAuth, Konflikte aufräumen, Küren verwalten (~700 Zeilen). Das braucht einen Node mit Signalen, weil Fortschritt, Dialoge und Threads zusammenhängen. Controller: 8.459 -> 8.412 Zeilen. Suite grün.
This commit is contained in:
parent
dbc7e1e484
commit
5bec745825
6 changed files with 83 additions and 58 deletions
|
|
@ -6980,59 +6980,12 @@ func _poll_sync_thread() -> void:
|
|||
_update_status()
|
||||
return
|
||||
|
||||
var summary := _format_sync_summary(job.result)
|
||||
var summary := SyncSummaryText.format(job.result)
|
||||
_reload_after_sync(job.result)
|
||||
_update_status()
|
||||
_show_message("Sync abgeschlossen\n\n" + summary)
|
||||
|
||||
|
||||
func _format_sync_summary(result: Dictionary) -> String:
|
||||
var uploaded: Array = result.get("uploaded", [])
|
||||
var downloaded: Array = result.get("downloaded", [])
|
||||
var resolved: Array = result.get("resolved", [])
|
||||
var skipped: Array = result.get("skipped", [])
|
||||
var errors: Array = result.get("errors", [])
|
||||
|
||||
var lines := PackedStringArray()
|
||||
lines.append("Hochgeladen: %d" % uploaded.size())
|
||||
if not uploaded.is_empty():
|
||||
lines.append(" " + ", ".join(uploaded))
|
||||
lines.append("Heruntergeladen: %d" % downloaded.size())
|
||||
if not downloaded.is_empty():
|
||||
lines.append(" " + ", ".join(downloaded))
|
||||
lines.append(I18n.t("Automatisch aufgelöste Konflikte: %d") % resolved.size())
|
||||
for entry: Dictionary in resolved:
|
||||
var winner := (
|
||||
"Cloud-Fassung"
|
||||
if str(entry.get("winner", "")) == "cloud"
|
||||
else "lokale Fassung"
|
||||
)
|
||||
var moment := int(entry.get("timestamp", 0))
|
||||
var when := (
|
||||
SyncPlan.timestamp_label(moment)
|
||||
if moment > 0
|
||||
else "Zeit unbekannt"
|
||||
)
|
||||
lines.append(" %s – %s vom %s übernommen" % [
|
||||
str(entry.get("name", "")),
|
||||
winner,
|
||||
when,
|
||||
])
|
||||
if not resolved.is_empty():
|
||||
lines.append(
|
||||
" Ältere Fassungen liegen im Konfliktarchiv "
|
||||
+ "(Datei → Konfliktarchiv öffnen)."
|
||||
)
|
||||
if not skipped.is_empty():
|
||||
lines.append(I18n.t("Unverändert: %d") % skipped.size())
|
||||
if not errors.is_empty():
|
||||
lines.append("")
|
||||
lines.append("Fehler:")
|
||||
for message: String in errors:
|
||||
lines.append(" " + message)
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
func _start_conflict_scan() -> void:
|
||||
if _sync_running:
|
||||
return
|
||||
|
|
|
|||
58
rinkplanner/src/whiteboard/view/sync_summary_text.gd
Normal file
58
rinkplanner/src/whiteboard/view/sync_summary_text.gd
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
class_name SyncSummaryText
|
||||
extends RefCounted
|
||||
|
||||
## Text of the sync result dialog ("Synchronisierung").
|
||||
##
|
||||
## Pure: the result dictionary of a sync job goes in, the lines come out. The
|
||||
## controller only sets the label, which keeps this formatting testable without
|
||||
## a scene.
|
||||
|
||||
static func format(result: Dictionary) -> String:
|
||||
var uploaded: Array = result.get("uploaded", [])
|
||||
var downloaded: Array = result.get("downloaded", [])
|
||||
var resolved: Array = result.get("resolved", [])
|
||||
var skipped: Array = result.get("skipped", [])
|
||||
var errors: Array = result.get("errors", [])
|
||||
|
||||
var lines := PackedStringArray()
|
||||
lines.append("Hochgeladen: %d" % uploaded.size())
|
||||
if not uploaded.is_empty():
|
||||
lines.append(" " + ", ".join(uploaded))
|
||||
lines.append("Heruntergeladen: %d" % downloaded.size())
|
||||
if not downloaded.is_empty():
|
||||
lines.append(" " + ", ".join(downloaded))
|
||||
lines.append(I18n.t("Automatisch aufgelöste Konflikte: %d") % resolved.size())
|
||||
for entry: Dictionary in resolved:
|
||||
lines.append(" " + _resolved_line(entry))
|
||||
if not resolved.is_empty():
|
||||
lines.append(
|
||||
" Ältere Fassungen liegen im Konfliktarchiv "
|
||||
+ "(Datei → Konfliktarchiv öffnen)."
|
||||
)
|
||||
if not skipped.is_empty():
|
||||
lines.append(I18n.t("Unverändert: %d") % skipped.size())
|
||||
if not errors.is_empty():
|
||||
lines.append("")
|
||||
lines.append("Fehler:")
|
||||
for message: String in errors:
|
||||
lines.append(" " + message)
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
static func _resolved_line(entry: Dictionary) -> String:
|
||||
var winner := (
|
||||
"Cloud-Fassung"
|
||||
if str(entry.get("winner", "")) == "cloud"
|
||||
else "lokale Fassung"
|
||||
)
|
||||
var moment := int(entry.get("timestamp", 0))
|
||||
var when := (
|
||||
SyncPlan.timestamp_label(moment)
|
||||
if moment > 0
|
||||
else "Zeit unbekannt"
|
||||
)
|
||||
return "%s – %s vom %s übernommen" % [
|
||||
str(entry.get("name", "")),
|
||||
winner,
|
||||
when,
|
||||
]
|
||||
1
rinkplanner/src/whiteboard/view/sync_summary_text.gd.uid
Normal file
1
rinkplanner/src/whiteboard/view/sync_summary_text.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://b8j6xkdhtcai
|
||||
|
|
@ -792,7 +792,7 @@ func _test_controller_wiring() -> void:
|
|||
controller.cleanup_conflicts_dialog != null,
|
||||
"der Aufräumdialog ist in der Szene verdrahtet"
|
||||
)
|
||||
var summary := controller._format_sync_summary({
|
||||
var summary := SyncSummaryText.format({
|
||||
"uploaded": [],
|
||||
"downloaded": [],
|
||||
"skipped": [],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue