diff options
Diffstat (limited to 'packages/meshbay-hub')
3 files changed, 23 insertions, 6 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/static/file-utils.js b/packages/meshbay-hub/src/meshbay_hub/static/file-utils.js index 4541290..a005e2e 100644 --- a/packages/meshbay-hub/src/meshbay_hub/static/file-utils.js +++ b/packages/meshbay-hub/src/meshbay_hub/static/file-utils.js @@ -23,7 +23,7 @@ const PREVIEWABLE_TEXT = /\.(txt|md|json|csv|log|xml|yaml|yml|ini|conf|py|js|html|css|sh|c|h|java|rs|go|rb|toml)$/i; function canPreview(e) { - return ['image', 'video', 'document'].includes(e.type) + return ['image', 'video', 'audio', 'document'].includes(e.type) || PREVIEWABLE_TEXT.test(e.name); } diff --git a/packages/meshbay-hub/src/meshbay_hub/static/files-app.js b/packages/meshbay-hub/src/meshbay_hub/static/files-app.js index 561d8a7..c09ef40 100644 --- a/packages/meshbay-hub/src/meshbay_hub/static/files-app.js +++ b/packages/meshbay-hub/src/meshbay_hub/static/files-app.js @@ -307,8 +307,9 @@ function FilesPanel({ </button> `; - const canPlay = !!(onlyFile && onlyFile.type === 'video'); - const canView = !!(onlyFile && onlyFile.type !== 'video' && canPreview(onlyFile)); + const canPlay = !!(onlyFile && (onlyFile.type === 'video' || onlyFile.type === 'audio')); + const canView = !!(onlyFile && onlyFile.type !== 'video' && onlyFile.type !== 'audio' + && canPreview(onlyFile)); const deletableCount = deletableFiles.length + (operatorPaired ? selectedDirs.length : 0); // The operator can always delete; anyone else only ever sees the button if diff --git a/packages/meshbay-hub/src/meshbay_hub/static/group-page.js b/packages/meshbay-hub/src/meshbay_hub/static/group-page.js index d2d56b5..2331977 100644 --- a/packages/meshbay-hub/src/meshbay_hub/static/group-page.js +++ b/packages/meshbay-hub/src/meshbay_hub/static/group-page.js @@ -432,10 +432,26 @@ function GroupPage({ groupId, group, token, username, userId, userPrefs, // A single dispatcher so any app can open the right modal without owning // video/preview state itself — Files' table and Chat's attachments both - // call this the same way. + // call this the same way. Audio goes to the same persistent player Music + // uses (onPlayQueue) rather than a modal — but the queue it builds is + // Explorer's own next/previous, deliberately not Music's: every audio + // entry sharing this file's literal containing directory, in filename + // order, never Music's artist/album grouping, which would pull in files + // nowhere near this one on disk. onPlayQueue always replaces whatever is + // already playing (from Music, or a previous Files click) rather than + // merging with it, so there is nothing to special-case here. const onPreview = useCallback((entry) => { - if (entry.type === 'video') setVideoEntry(entry); else setPreviewEntry(entry); - }, []); + if (entry.type === 'video') { setVideoEntry(entry); return; } + if (entry.type === 'audio') { + const siblings = entries + .filter((e) => e.type === 'audio' && e.path === entry.path) + .sort((a, b) => a.name.localeCompare(b.name)); + const startIndex = Math.max(0, siblings.findIndex((e) => e.id === entry.id)); + onPlayQueue(siblings, startIndex); + return; + } + setPreviewEntry(entry); + }, [entries, onPlayQueue]); const apps = visibleApps(enabledApps); const commonProps = { |