itlxrd/Psychotoxical-psysonic
1
0
Fork 0
mirror of https://github.com/Psychotoxical/psysonic.git synced 2026-07-22 15:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(device-sync): auto-import manifest on mount, clear view on disconnect

Browse Source 
- Read psysonic-sync.json automatically when DeviceSync page opens and
  drive is already connected (no manual folder re-select needed)
- Always replace sources from manifest when choosing a folder, so
  switching between sticks loads the correct album list
- Hide source list and status badges when drive is disconnected
- Reset import flag on disconnect so re-plugging triggers a fresh import
- Fix unused `mut` warning in cancel_device_sync

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Psychotoxical
2026-04-15 23:16:06 +02:00
parent 442ed9d191
commit bf3d896016
2 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/DeviceSync.tsx
+38 -15
View File
@@ -162,6 +162,30 @@ export default function DeviceSync() {
// Scan device on mount and when targetDir changes
useEffect(() => { scanDevice(); }, [scanDevice]);
// Auto-import manifest when page loads and drive is already connected
const manifestImportedRef = useRef(false);
useEffect(() => {
if (!targetDir || !driveDetected || manifestImportedRef.current) return;
manifestImportedRef.current = true;
invoke<{ version: number; sources: DeviceSyncSource[] } | null>(
'read_device_manifest', { destDir: targetDir }
).then(manifest => {
if (manifest?.sources?.length) {
useDeviceSyncStore.getState().clearSources();
manifest.sources.forEach(s => useDeviceSyncStore.getState().addSource(s));
showToast(t('deviceSync.manifestImported', { count: manifest.sources.length }), 4000, 'info');
}
}).catch(() => {});
}, [targetDir, driveDetected, t]);
// Clear device file list and reset import flag when stick is unplugged
useEffect(() => {
if (!driveDetected) {
setDeviceFilePaths([]);
manifestImportedRef.current = false;
}
}, [driveDetected]);
// Compute expected paths for each source (for status comparison)
useEffect(() => {
if (!targetDir || sources.length === 0) {
@@ -353,19 +377,18 @@ export default function DeviceSync() {
if (sel) {
const dir = sel as string;
setTargetDir(dir);
// If the device has a psysonic-sync.json and localStorage has no sources yet,
// auto-import so the list is populated when switching machines.
if (useDeviceSyncStore.getState().sources.length === 0) {
try {
const manifest = await invoke<{ version: number; sources: DeviceSyncSource[] } | null>(
'read_device_manifest', { destDir: dir }
);
if (manifest?.sources?.length) {
manifest.sources.forEach(s => useDeviceSyncStore.getState().addSource(s));
showToast(t('deviceSync.manifestImported', { count: manifest.sources.length }), 4000, 'info');
}
} catch { /* no manifest, that's fine */ }
}
// If the device has a psysonic-sync.json, always import it — replacing any
// sources from a previous device so switching sticks works correctly.
try {
const manifest = await invoke<{ version: number; sources: DeviceSyncSource[] } | null>(
'read_device_manifest', { destDir: dir }
);
if (manifest?.sources?.length) {
useDeviceSyncStore.getState().clearSources();
manifest.sources.forEach(s => useDeviceSyncStore.getState().addSource(s));
showToast(t('deviceSync.manifestImported', { count: manifest.sources.length }), 4000, 'info');
}
} catch { /* no manifest, that's fine */ }
// Trigger a device scan after folder change
setTimeout(() => scanDevice(), 100);
}
@@ -733,7 +756,7 @@ export default function DeviceSync() {
</div>
{/* Status summary badges */}
{sources.length > 0 && (
{sources.length > 0 && driveDetected && (
<div className="device-sync-status-summary">
{syncedCount > 0 && (
<span className="device-sync-badge synced">
@@ -753,7 +776,7 @@ export default function DeviceSync() {
</div>
)}
{sources.length === 0 ? (
{sources.length === 0 || !driveDetected ? (
<p className="device-sync-empty">{t('deviceSync.noSourcesSelected')}</p>
) : (
<>