Skip to content

fix(api): stop doubling the extension on stem zip filenames #1061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dylanjeffers merged 1 commit into from
Oct 23, 2026
Merged

fix(api): stop doubling the extension on stem zip filenames #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions api/v1_track_stems_download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,20 @@ var audioExtensions = map[string]string{
"audio/ogg": ".ogg",
}

// stemsZipFilename is the download filename, except that an original with no
// recorded filename gets its extension from the blob's content type rather
// than createFilename's .mp3, since the bytes are the original upload.
// stemsZipFilename is the download filename, except for an original with no
// recorded filename. createFilename gives that title + ".mp3", but the bytes
// are the original upload, so the extension comes from the blob's content
// type. Such titles often already end in the upload's extension ("DRUMS.wav").
func stemsZipFilename(t *dbv1.Track, contentType string) string {
name := sanitizeZipName(createFilename(t))
if t.OrigFileCid.String != "" && t.OrigFilename.String == "" {
if ext, ok := audioExtensions[strings.ToLower(contentType)]; ok {
name = strings.TrimSuffix(name, path.Ext(name)) + ext
title := sanitizeZipName(t.Title.String)
titleExt := strings.ToLower(path.Ext(title))
if isAudioExtension(titleExt) {
title = strings.TrimSuffix(title, path.Ext(title))
}
name = title + ext
}
}
if name == "" || strings.HasPrefix(name, ".") {
Expand All @@ -256,6 +262,15 @@ func stemsZipFilename(t *dbv1.Track, contentType string) string {
return name
}

func isAudioExtension(ext string) bool {
for _, e := range audioExtensions {
if e == ext {
return true
}
}
return false
}

func sanitizeZipName(name string) string {
name = strings.Map(func(r rune) rune {
switch {
Expand Down
4 changes: 4 additions & 0 deletions api/v1_track_stems_download_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ func TestStemsZipFilename(t *testing.T) {
}
assert.Equal(t, "馃崟DRUMS.wav", stemsZipFilename(track(map[string]string{"orig_cid": "Qm", "orig_filename": " 馃崟DRUMS.wav"}), "audio/wav"))
assert.Equal(t, "Bass.wav", stemsZipFilename(track(map[string]string{"title": "Bass", "orig_cid": "Qm"}), "audio/x-wav"))
assert.Equal(t, "馃崟DRUMS.wav", stemsZipFilename(track(map[string]string{"title": " 馃崟DRUMS.wav", "orig_cid": "Qm"}), "audio/wav"))
assert.Equal(t, "Bass.wav", stemsZipFilename(track(map[string]string{"title": "Bass.WAV", "orig_cid": "Qm"}), "audio/wav"))
assert.Equal(t, "Bass.flac", stemsZipFilename(track(map[string]string{"title": "Bass.wav", "orig_cid": "Qm"}), "audio/flac"))
assert.Equal(t, "Mix v1.2.wav", stemsZipFilename(track(map[string]string{"title": "Mix v1.2", "orig_cid": "Qm"}), "audio/wav"))
assert.Equal(t, "Bass.mp3", stemsZipFilename(track(map[string]string{"title": "Bass"}), "audio/wav"))
assert.Equal(t, "a_b.mp3", stemsZipFilename(track(map[string]string{"title": "a/b"}), ""))
}
Expand Down
Loading