feat: Sync-Einstellungen auf Dropbox festlegen

- Cloud-Ordner-Feld entfernt; der Sync nutzt fest den Dropbox-App-Ordner
  Apps/<App-Name>
- Alte directory-Einträge werden beim Laden einmalig entfernt, bei Bedarf
  mit Reset des Sync-Stands
- Google Drive erscheint nur noch, wenn Zugangsdaten im Build konfiguriert
  sind; sonst wird der Anbieter auf Dropbox normalisiert
- Roadmap, Sync-Doku und Cloud-Setup an den Dropbox-only-Stand angepasst
- Sync-Tests für Migration und Anbieter-Sichtbarkeit erweitert
This commit is contained in:
torsten 2026-11-10 16:26:24 +01:00
parent 55e7b163b5
commit 6f22350934
10 changed files with 94 additions and 76 deletions

View file

@ -1095,7 +1095,7 @@ cancel_button_text = "Abbrechen"
[node name="SyncSettingsDialog" type="ConfirmationDialog" parent="."]
unique_name_in_owner = true
title = "Sync-Einstellungen"
size = Vector2i(620, 500)
size = Vector2i(620, 460)
ok_button_text = "Speichern"
cancel_button_text = "Abbrechen"
@ -1103,7 +1103,7 @@ cancel_button_text = "Abbrechen"
offset_left = 12.0
offset_top = 12.0
offset_right = 608.0
offset_bottom = 430.0
offset_bottom = 390.0
theme_override_constants/separation = 10
[node name="SyncHint" type="Label" parent="SyncSettingsDialog/SyncBox"]
@ -1111,7 +1111,7 @@ custom_minimum_size = Vector2(560, 0)
layout_mode = 2
theme_override_colors/font_color = Color(0.580392, 0.639216, 0.721569, 1)
theme_override_font_sizes/font_size = 14
text = "Jedes Gerät verbindet sein eigenes Google- oder Dropbox-Konto. Rinkplanner speichert die Kürdateien und Musik nur in diesem Konto; es gibt keinen gemeinsamen Server."
text = "Jedes Gerät verbindet sein eigenes Dropbox-Konto. Rinkplanner speichert die Kürdateien und Musik nur in diesem Konto; es gibt keinen gemeinsamen Server."
autowrap_mode = 2
[node name="SyncGrid" type="GridContainer" parent="SyncSettingsDialog/SyncBox"]
@ -1130,17 +1130,6 @@ custom_minimum_size = Vector2(330, 48)
layout_mode = 2
size_flags_horizontal = 3
[node name="SyncDirectoryLabel" type="Label" parent="SyncSettingsDialog/SyncBox/SyncGrid"]
layout_mode = 2
text = "Cloud-Ordner"
[node name="SyncDirectoryEdit" type="LineEdit" parent="SyncSettingsDialog/SyncBox/SyncGrid"]
unique_name_in_owner = true
custom_minimum_size = Vector2(330, 48)
layout_mode = 2
size_flags_horizontal = 3
placeholder_text = "leer = Cloud-Hauptordner"
[node name="SyncAccountRow" type="HBoxContainer" parent="SyncSettingsDialog/SyncBox"]
layout_mode = 2
theme_override_constants/separation = 10

View file

@ -246,7 +246,6 @@ const MAX_MUSIC_FILE_BYTES := 64 * 1024 * 1024
@onready var sync_provider_option: OptionButton = %SyncProviderOption
@onready var sync_account_value: Label = %SyncAccountValue
@onready var sync_connect_button: Button = %SyncConnectButton
@onready var sync_directory_edit: LineEdit = %SyncDirectoryEdit
@onready var cloud_auth_dialog: ConfirmationDialog = %CloudAuthDialog
@onready var cloud_auth_status: Label = %CloudAuthStatus
@onready var cloud_auth_url_edit: LineEdit = %CloudAuthUrlEdit
@ -5424,7 +5423,6 @@ func _apply_responsive_layout() -> void:
func load_sync_settings() -> Dictionary:
var settings := {
"provider": "dropbox",
"directory": "",
"tokens": {},
}
var config := ConfigFile.new()
@ -5432,12 +5430,30 @@ func load_sync_settings() -> Dictionary:
return settings
for key: String in settings.keys():
settings[key] = config.get_value("connection", key, settings[key])
# The cloud folder is always the provider's app folder (Dropbox:
# Apps/<App-Name>). Drop an old custom subfolder once so existing
# installations move to the app-folder root.
if config.has_section_key("connection", "directory"):
var legacy_directory := str(
config.get_value("connection", "directory", "")
).strip_edges()
config.erase_section_key("connection", "directory")
config.save(SYNC_SETTINGS_PATH)
_protect_sync_settings()
if not legacy_directory.is_empty():
_reset_sync_state()
var tokens: Variant = settings.get("tokens", {})
if not tokens is Dictionary:
settings["tokens"] = {}
var provider := str(settings.get("provider", ""))
if not SYNC_PROVIDERS.has(provider):
settings["provider"] = "dropbox"
elif provider == "google_drive" and not SyncAppConfig.is_configured(
"google_drive", SyncAppConfig.load_config()
):
# Google Drive stays hidden until its OAuth app is configured for
# this build; never start a sync with an unavailable provider.
settings["provider"] = "dropbox"
return settings
@ -5467,10 +5483,9 @@ func _open_sync_settings_dialog() -> void:
var settings := load_sync_settings()
_ensure_sync_provider_items()
_apply_sync_provider_to_ui(str(settings.get("provider", "dropbox")))
sync_directory_edit.text = str(settings.get("directory", ""))
_update_sync_account(settings)
sync_settings_dialog.popup_centered(Vector2i(620, 500))
sync_directory_edit.grab_focus()
sync_settings_dialog.popup_centered(Vector2i(620, 460))
sync_provider_option.grab_focus()
func _ensure_sync_provider_items() -> void:
@ -5479,11 +5494,10 @@ func _ensure_sync_provider_items() -> void:
var app := SyncAppConfig.load_config()
var has_dropbox := SyncAppConfig.is_configured("dropbox", app)
var has_google := SyncAppConfig.is_configured("google_drive", app)
if not has_dropbox and not has_google:
# Developer build without app credentials: show both so the missing
# configuration is visible instead of an empty dropdown.
if not has_dropbox:
# Developer build without app credentials: show Dropbox so the
# missing configuration is visible instead of an empty dropdown.
has_dropbox = true
has_google = true
if has_dropbox:
sync_provider_option.add_item("Dropbox", 0)
sync_provider_option.set_item_metadata(
@ -5533,19 +5547,8 @@ func _on_sync_provider_selected(_index: int) -> void:
func _on_sync_settings_confirmed() -> void:
var settings := load_sync_settings()
var provider := _selected_sync_provider()
var directory := (
sync_directory_edit.text.strip_edges()
.replace("/", "-")
.replace("\\", "-")
)
if directory.is_empty() and provider == "google_drive":
directory = "Rinkplanner"
var changed := (
str(settings.get("provider", "")) != provider
or str(settings.get("directory", "")) != directory
)
var changed := str(settings.get("provider", "")) != provider
settings["provider"] = provider
settings["directory"] = directory
save_sync_settings(settings)
if changed:
_reset_sync_state()

View file

@ -339,7 +339,10 @@ func _test_controller_wiring() -> void:
})
var loaded := controller.load_sync_settings()
_check(loaded["provider"] == provider, "Sync-Einstellungen speichern den Anbieter")
_check(loaded["directory"] == "Kueren", "Sync-Einstellungen speichern den Cloud-Ordner")
_check(
not loaded.has("directory"),
"Sync-Einstellungen verwerfen den alten Cloud-Unterordner"
)
_check(
RoutineSync.provider_tokens(loaded, provider).get("refresh_token") == "refresh",
"Sync-Einstellungen speichern den Refresh-Token"
@ -354,9 +357,13 @@ func _test_controller_wiring() -> void:
controller._selected_sync_provider() == provider,
"Dialog wählt den gespeicherten Anbieter"
)
var google_items := 0
for index: int in range(controller.sync_provider_option.item_count):
if str(controller.sync_provider_option.get_item_metadata(index)) == "google_drive":
google_items += 1
_check(
controller.sync_directory_edit.text == "Kueren",
"Dialog ist mit dem gespeicherten Ordner gefüllt"
google_items == (1 if SyncAppConfig.is_configured("google_drive", app_config) else 0),
"Google Drive erscheint nur mit konfigurierten Zugangsdaten"
)
_check(
controller.sync_account_value.text == "konto@example.org",
@ -371,7 +378,6 @@ func _test_controller_wiring() -> void:
# Ohne Refresh-Token öffnet "Jetzt synchronisieren" die Einstellungen.
controller.save_sync_settings({
"provider": "dropbox",
"directory": "Rinkplanner",
"tokens": {},
})
controller.start_sync()