mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-21 14:55:43 +00:00
fix(settings): show including state on library index include action
Mirror the exclude UX: flushSync before bootstrap, block repeat clicks, show "Including…" on the row, and roll back exclusion if bind fails.
This commit is contained in:
@@ -60,6 +60,7 @@ export default function LibraryIndexSection() {
|
||||
const [progressByServer, setProgressByServer] = useState<Record<string, string | null>>({});
|
||||
const [busyServerId, setBusyServerId] = useState<string | null>(null);
|
||||
const [excludingServerId, setExcludingServerId] = useState<string | null>(null);
|
||||
const [includingServerId, setIncludingServerId] = useState<string | null>(null);
|
||||
const [bootstrapping, setBootstrapping] = useState(false);
|
||||
|
||||
const pollTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
@@ -133,6 +134,7 @@ export default function LibraryIndexSection() {
|
||||
setProgressByServer({});
|
||||
setBusyServerId(null);
|
||||
setExcludingServerId(null);
|
||||
setIncludingServerId(null);
|
||||
return;
|
||||
}
|
||||
void runBootstrap();
|
||||
@@ -251,22 +253,38 @@ export default function LibraryIndexSection() {
|
||||
};
|
||||
|
||||
const handleIncludeServer = async (serverId: string) => {
|
||||
setServerSyncExcluded(serverId, false);
|
||||
if (includingServerId || excludingServerId) return;
|
||||
const srv = servers.find(s => s.id === serverId);
|
||||
if (srv) {
|
||||
setBootstrapping(true);
|
||||
try {
|
||||
const result = await bootstrapIndexedServer(srv);
|
||||
applyConnectionResults({ [serverId]: result });
|
||||
await refreshAllStatuses();
|
||||
} finally {
|
||||
setBootstrapping(false);
|
||||
if (!srv) return;
|
||||
flushSync(() => {
|
||||
setIncludingServerId(serverId);
|
||||
setServerSyncExcluded(serverId, false);
|
||||
});
|
||||
try {
|
||||
const result = await bootstrapIndexedServer(srv);
|
||||
applyConnectionResults({ [serverId]: result });
|
||||
if (result === 'error') {
|
||||
setServerSyncExcluded(serverId, true);
|
||||
showToast(t('settings.libraryIndexBindError', { error: t('settings.libraryIndexStatusError') }), 5000, 'error');
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const fresh = await libraryGetStatus(serverId);
|
||||
syncPhaseRef.current[serverId] = fresh.syncPhase;
|
||||
setStatusByServer(prev => ({ ...prev, [serverId]: fresh }));
|
||||
} catch {
|
||||
/* status poll is best-effort */
|
||||
}
|
||||
} catch (e) {
|
||||
setServerSyncExcluded(serverId, true);
|
||||
showToast(t('settings.libraryIndexBindError', { error: String(e) }), 5000, 'error');
|
||||
} finally {
|
||||
setIncludingServerId(null);
|
||||
}
|
||||
};
|
||||
|
||||
const handleExcludeServer = async (serverId: string) => {
|
||||
if (excludingServerId) return;
|
||||
if (excludingServerId || includingServerId) return;
|
||||
flushSync(() => setExcludingServerId(serverId));
|
||||
try {
|
||||
const syncing =
|
||||
@@ -316,7 +334,8 @@ export default function LibraryIndexSection() {
|
||||
}
|
||||
};
|
||||
|
||||
const globalBusy = bootstrapping || busyServerId != null || excludingServerId != null;
|
||||
const globalBusy =
|
||||
bootstrapping || busyServerId != null || excludingServerId != null || includingServerId != null;
|
||||
|
||||
return (
|
||||
<SettingsSubSection
|
||||
@@ -344,7 +363,7 @@ export default function LibraryIndexSection() {
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={masterEnabled}
|
||||
disabled={servers.length === 0 || bootstrapping}
|
||||
disabled={servers.length === 0 || bootstrapping || includingServerId != null || excludingServerId != null}
|
||||
onChange={e => void handleMasterToggle(e.target.checked)}
|
||||
/>
|
||||
<span className="toggle-track" />
|
||||
@@ -373,9 +392,12 @@ export default function LibraryIndexSection() {
|
||||
connection={connectionByServer[srv.id] ?? 'unknown'}
|
||||
progressLabel={progressByServer[srv.id] ?? null}
|
||||
busy={busyServerId === srv.id}
|
||||
including={includingServerId === srv.id}
|
||||
excluding={excludingServerId === srv.id}
|
||||
actionsDisabled={
|
||||
(globalBusy && busyServerId !== srv.id) || excludingServerId != null
|
||||
(globalBusy && busyServerId !== srv.id)
|
||||
|| excludingServerId != null
|
||||
|| includingServerId != null
|
||||
}
|
||||
onFullSync={() => void runServerAction(srv.id, 'full')}
|
||||
onDeltaSync={() => void runServerAction(srv.id, 'delta')}
|
||||
@@ -403,10 +425,15 @@ export default function LibraryIndexSection() {
|
||||
type="button"
|
||||
className="btn btn-surface"
|
||||
style={{ fontSize: 12, padding: '4px 10px' }}
|
||||
disabled={bootstrapping || excludingServerId != null}
|
||||
disabled={
|
||||
includingServerId != null || excludingServerId != null
|
||||
}
|
||||
aria-busy={includingServerId === srv.id}
|
||||
onClick={() => void handleIncludeServer(srv.id)}
|
||||
>
|
||||
{t('settings.libraryIndexIncludeServer')}
|
||||
{includingServerId === srv.id
|
||||
? t('settings.libraryIndexIncludingServer')
|
||||
: t('settings.libraryIndexIncludeServer')}
|
||||
</button>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -18,6 +18,7 @@ interface LibraryIndexServerRowProps {
|
||||
connection: LibraryServerConnection;
|
||||
progressLabel: string | null;
|
||||
busy: boolean;
|
||||
including: boolean;
|
||||
excluding: boolean;
|
||||
actionsDisabled: boolean;
|
||||
onFullSync: () => void;
|
||||
@@ -34,6 +35,7 @@ export default function LibraryIndexServerRow({
|
||||
connection,
|
||||
progressLabel,
|
||||
busy,
|
||||
including,
|
||||
excluding,
|
||||
actionsDisabled,
|
||||
onFullSync,
|
||||
@@ -93,6 +95,9 @@ export default function LibraryIndexServerRow({
|
||||
{busy && (
|
||||
<span style={{ fontSize: 11, color: 'var(--accent)' }}>{t('settings.libraryIndexServerSyncing')}</span>
|
||||
)}
|
||||
{including && !busy && (
|
||||
<span style={{ fontSize: 11, color: 'var(--accent)' }}>{t('settings.libraryIndexIncludingServer')}</span>
|
||||
)}
|
||||
</div>
|
||||
<div style={{ fontSize: 12, color: 'var(--text-muted)', marginTop: 4, lineHeight: 1.45 }}>
|
||||
{phaseLabel}
|
||||
|
||||
@@ -264,6 +264,7 @@ export const settings = {
|
||||
libraryIndexExcludingServer: 'Wird ausgeschlossen…',
|
||||
libraryIndexExcludedTitle: 'Von Synchronisation ausgeschlossen',
|
||||
libraryIndexIncludeServer: 'Wieder einschließen',
|
||||
libraryIndexIncludingServer: 'Wird eingeschlossen…',
|
||||
libraryIndexStatus: 'Status',
|
||||
libraryIndexStatusIdle: 'Bereit',
|
||||
libraryIndexStatusProbing: 'Server wird geprüft…',
|
||||
|
||||
@@ -267,6 +267,7 @@ export const settings = {
|
||||
libraryIndexExcludingServer: 'Excluding…',
|
||||
libraryIndexExcludedTitle: 'Excluded from sync',
|
||||
libraryIndexIncludeServer: 'Include again',
|
||||
libraryIndexIncludingServer: 'Including…',
|
||||
libraryIndexStatus: 'Status',
|
||||
libraryIndexStatusIdle: 'Idle',
|
||||
libraryIndexStatusProbing: 'Checking server…',
|
||||
|
||||
@@ -262,6 +262,7 @@ export const settings = {
|
||||
libraryIndexExcludingServer: 'Excluyendo…',
|
||||
libraryIndexExcludedTitle: 'Excluidos de la sincronización',
|
||||
libraryIndexIncludeServer: 'Incluir de nuevo',
|
||||
libraryIndexIncludingServer: 'Incluyendo…',
|
||||
libraryIndexStatus: 'Estado',
|
||||
libraryIndexStatusIdle: 'Inactivo',
|
||||
libraryIndexStatusProbing: 'Comprobando servidor…',
|
||||
|
||||
@@ -260,6 +260,7 @@ export const settings = {
|
||||
libraryIndexExcludingServer: 'Exclusion…',
|
||||
libraryIndexExcludedTitle: 'Exclus de la synchronisation',
|
||||
libraryIndexIncludeServer: 'Réinclure',
|
||||
libraryIndexIncludingServer: 'Réinclusion…',
|
||||
libraryIndexStatus: 'État',
|
||||
libraryIndexStatusIdle: 'Inactif',
|
||||
libraryIndexStatusProbing: 'Vérification du serveur…',
|
||||
|
||||
@@ -259,6 +259,7 @@ export const settings = {
|
||||
libraryIndexExcludingServer: 'Ekskluderer…',
|
||||
libraryIndexExcludedTitle: 'Ekskludert fra synkronisering',
|
||||
libraryIndexIncludeServer: 'Inkluder igjen',
|
||||
libraryIndexIncludingServer: 'Inkluderer…',
|
||||
libraryIndexStatus: 'Status',
|
||||
libraryIndexStatusIdle: 'Inaktiv',
|
||||
libraryIndexStatusProbing: 'Sjekker server…',
|
||||
|
||||
@@ -260,6 +260,7 @@ export const settings = {
|
||||
libraryIndexExcludingServer: 'Uitsluiten…',
|
||||
libraryIndexExcludedTitle: 'Uitgesloten van synchronisatie',
|
||||
libraryIndexIncludeServer: 'Weer opnemen',
|
||||
libraryIndexIncludingServer: 'Opnemen…',
|
||||
libraryIndexStatus: 'Status',
|
||||
libraryIndexStatusIdle: 'Inactief',
|
||||
libraryIndexStatusProbing: 'Server controleren…',
|
||||
|
||||
@@ -266,6 +266,7 @@ export const settings = {
|
||||
libraryIndexExcludingServer: 'Se exclude…',
|
||||
libraryIndexExcludedTitle: 'Excluse din sincronizare',
|
||||
libraryIndexIncludeServer: 'Include din nou',
|
||||
libraryIndexIncludingServer: 'Se include…',
|
||||
libraryIndexStatus: 'Stare',
|
||||
libraryIndexStatusIdle: 'Inactiv',
|
||||
libraryIndexStatusProbing: 'Se verifică serverul…',
|
||||
|
||||
@@ -272,6 +272,7 @@ export const settings = {
|
||||
libraryIndexExcludingServer: 'Отключается…',
|
||||
libraryIndexExcludedTitle: 'Исключены из синхронизации',
|
||||
libraryIndexIncludeServer: 'Включить снова',
|
||||
libraryIndexIncludingServer: 'Подключается…',
|
||||
libraryIndexStatus: 'Статус',
|
||||
libraryIndexStatusIdle: 'Ожидание',
|
||||
libraryIndexStatusProbing: 'Проверка сервера…',
|
||||
|
||||
@@ -259,6 +259,7 @@ export const settings = {
|
||||
libraryIndexExcludingServer: '正在排除…',
|
||||
libraryIndexExcludedTitle: '已排除同步',
|
||||
libraryIndexIncludeServer: '重新纳入',
|
||||
libraryIndexIncludingServer: '正在纳入…',
|
||||
libraryIndexStatus: '状态',
|
||||
libraryIndexStatusIdle: '空闲',
|
||||
libraryIndexStatusProbing: '正在检查服务器…',
|
||||
|
||||
Reference in New Issue
Block a user