3dtours/SonicForgeStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: SF3 download prefers SF2, cache invalidation on parse error

Browse Source 
- Download endpoint reverses extension priority: .sf2 > .sf3
- loadSoundFont adds ?t= cache-buster, invalidates IndexedDB on error
- Retry logic: delete corrupted cache entry, allow re-download
This commit is contained in:
3dtours
2026-07-26 18:37:46 +07:00
parent e7a0a85eca
commit 5096c618b4
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/v1/plugins.py
+4 -4
View File
@@ -131,18 +131,18 @@ async def download_soundfont_asset(sf_id: str):
for base_dir in [UPLOAD_SF_DIR, SYSTEM_SF_DIR]: for base_dir in [UPLOAD_SF_DIR, SYSTEM_SF_DIR]:
if not os.path.isdir(base_dir): if not os.path.isdir(base_dir):
continue continue
for ext in [".sf3", ".sf2"]: for ext in [".sf2", ".sf3"]:
for fname in os.listdir(base_dir): for fname in os.listdir(base_dir):
fbase, fext = os.path.splitext(fname) fbase, fext = os.path.splitext(fname)
if fext.lower() == ext and fbase.lower() == clean_id.lower(): if fext.lower() == ext and fbase.lower() == clean_id.lower():
full = os.path.join(base_dir, fname) full = os.path.join(base_dir, fname)
return FileResponse(full, media_type="application/octet-stream", filename=f"{fbase}{ext}") return FileResponse(full, media_type="application/octet-stream", filename=f"soundfont{ext}")
# Fallback: try exact match on sf_id # Fallback: try exact match on sf_id
for base_dir in [UPLOAD_SF_DIR, SYSTEM_SF_DIR]: for base_dir in [UPLOAD_SF_DIR, SYSTEM_SF_DIR]:
for ext in [".sf3", ".sf2"]: for ext in [".sf2", ".sf3"]:
full = os.path.join(base_dir, clean_id + ext) full = os.path.join(base_dir, clean_id + ext)
if os.path.exists(full): if os.path.exists(full):
return FileResponse(full, media_type="application/octet-stream", filename=f"{clean_id}{ext}") return FileResponse(full, media_type="application/octet-stream", filename=f"soundfont{ext}")
raise HTTPException(status_code=404, detail="SoundFont asset not found") raise HTTPException(status_code=404, detail="SoundFont asset not found")
app/static/js/services/soundfontPlayer.js
+13 -2
View File
@@ -91,7 +91,7 @@
} }
if (!buffer) { if (!buffer) {
try { try {
const resp = await fetch("/api/v1/plugins/soundfonts/download/" + encodeURIComponent(sfId)); const resp = await fetch("/api/v1/plugins/soundfonts/download/" + encodeURIComponent(sfId) + "?t=" + Date.now());
if (!resp.ok) throw new Error("Download failed: " + resp.status); if (!resp.ok) throw new Error("Download failed: " + resp.status);
buffer = await resp.arrayBuffer(); buffer = await resp.arrayBuffer();
if (window.SonicSFStorage) { if (window.SonicSFStorage) {
@@ -107,7 +107,18 @@
_currentSfId = sfId; _currentSfId = sfId;
console.log("[SonicSF] SoundFont loaded:", sfId); console.log("[SonicSF] SoundFont loaded:", sfId);
} catch (e) { } catch (e) {
console.error("[SonicSF] Error parsing SF in SpessaSynth:", e); console.error("[SonicSF] Error parsing SF in SpessaSynth:", sfId, e);
// Invalidate cache and retry once with fresh download
if (window.SonicSFStorage) {
try {
const db = await window.SonicSFStorage.openDB();
const tx = db.transaction(window.SonicSFStorage.storeName, "readwrite");
tx.objectStore(window.SonicSFStorage.storeName).delete(sfId);
console.log("[SonicSF] Invalidated cache for:", sfId);
} catch (ce) {}
}
// Clear current SF so next load will actually run
_currentSfId = null;
} }
}, },