Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/dbv1/full_tracks.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,11 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg FullTracksParams) (ma

var download *MediaLink
if track.IsDownloadable && access.Download {
download, err = mediaLink(track.OrigFileCid.String, track.TrackID, arg.MyID.(int32), id3Tags)
cid := track.OrigFileCid.String
if cid == "" {
cid = track.TrackCid.String
}
download, err = mediaLink(cid, track.TrackID, arg.MyID.(int32), nil)
if err != nil {
return nil, err
}
Expand Down
6 changes: 0 additions & 6 deletions api/swagger/swagger-v1.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1466,12 +1466,6 @@ paths:
We perform checks on it and pass it through to CN.
schema:
type: string
- name: original
in: query
description: Optional - true if downloading original file
schema:
type: boolean
default: false
- name: filename
in: query
description: "Optional - name of file to download. If not provided, defaults\
Expand Down
41 changes: 20 additions & 21 deletions api/v1_track_download.go
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
package api

import (
"path/filepath"
"strings"

"bridgerton.audius.co/api/dbv1"
"github.com/gofiber/fiber/v2"
)

func createFilename(track *dbv1.FullTrack, isOriginal bool) string {
origFilename := track.OrigFilename
if origFilename.String == "" {
origFilename = track.Title
}

if isOriginal {
return origFilename.String
func createFilename(track *dbv1.FullTrack) string {
filename := track.OrigFilename.String
if filename == "" && track.OrigFileCid.String == "" {
filename = track.Title.String + ".mp3"
}
return filename
}

// Remove extension and add .mp3
ext := filepath.Ext(origFilename.String)
nameWithoutExt := strings.TrimSuffix(origFilename.String, ext)
return nameWithoutExt + ".mp3"
type trackDownloadParams struct {
Filename string `query:"filename"`
}

func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {
myId := app.getMyId(c)
trackId := c.Locals("trackId").(int)
filename := c.Query("filename")
isOriginal := c.Query("is_original") == "true"
var params trackDownloadParams
if err := c.QueryParser(&params); err != nil {
return err
}

tracks, err := app.queries.FullTracks(c.Context(), dbv1.FullTracksParams{
GetTracksParams: dbv1.GetTracksParams{
Expand All@@ -46,17 +41,21 @@ func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {

track := tracks[0]
if !track.Access.Download {
return fiber.NewError(fiber.StatusForbidden, "track not downloadable")
return fiber.NewError(fiber.StatusForbidden, "you are not allowed to download this track")
}

if track.Download == nil {
return fiber.NewError(fiber.StatusNotFound, "track is not downloadable")
}

downloadUrl := tryFindWorkingUrl(track.Download)

q := downloadUrl.Query()
q.Set("skip_play_count", "true")
if filename != "" {
q.Set("filename", filename)
if params.Filename != "" {
q.Set("filename", params.Filename)
} else {
q.Set("filename", createFilename(&track, isOriginal))
q.Set("filename", createFilename(&track))
}
downloadUrl.RawQuery = q.Encode()

Expand Down
30 changes: 30 additions & 0 deletions api/v1_track_download_test.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import (
"net/http/httptest"
"testing"

"bridgerton.audius.co/database"
"bridgerton.audius.co/trashid"
"github.com/stretchr/testify/assert"
)

Expand All@@ -15,3 +17,31 @@ func TestGetTrackDownload(t *testing.T) {
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=T1.mp3")
}

func TestGetTrackDownload_Original(t *testing.T) {
app := emptyTestApp(t)
fixtures := database.FixtureMap{
"tracks": []map[string]any{
{
"track_id": 1,
"owner_id": 1,
"title": "T1",
"orig_file_cid": "QmX123",
"orig_filename": "DharitRocks.wav",
"is_downloadable": true,
},
},
"users": []map[string]any{
{
"user_id": 1,
"handle": "testuser1",
},
},
}
database.Seed(app.pool, fixtures)
req := httptest.NewRequest("GET", "/v1/tracks/"+trashid.MustEncodeHashID(1)+"/download", nil)
res, err := app.Test(req, -1)
assert.NoError(t, err)
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22QmX123%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=DharitRocks.wav")
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix stems download by raymondjacobson · Pull Request #304 · AudiusProject/api · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/dbv1/full_tracks.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,11 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg FullTracksParams) (ma

var download *MediaLink
if track.IsDownloadable && access.Download {
download, err = mediaLink(track.OrigFileCid.String, track.TrackID, arg.MyID.(int32), id3Tags)
cid := track.OrigFileCid.String
if cid == "" {
cid = track.TrackCid.String
}
download, err = mediaLink(cid, track.TrackID, arg.MyID.(int32), nil)
if err != nil {
return nil, err
}
Expand Down
6 changes: 0 additions & 6 deletions api/swagger/swagger-v1.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1466,12 +1466,6 @@ paths:
We perform checks on it and pass it through to CN.
schema:
type: string
- name: original
in: query
description: Optional - true if downloading original file
schema:
type: boolean
default: false
- name: filename
in: query
description: "Optional - name of file to download. If not provided, defaults\
Expand Down
41 changes: 20 additions & 21 deletions api/v1_track_download.go
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
package api

import (
"path/filepath"
"strings"

"bridgerton.audius.co/api/dbv1"
"github.com/gofiber/fiber/v2"
)

func createFilename(track *dbv1.FullTrack, isOriginal bool) string {
origFilename := track.OrigFilename
if origFilename.String == "" {
origFilename = track.Title
}

if isOriginal {
return origFilename.String
func createFilename(track *dbv1.FullTrack) string {
filename := track.OrigFilename.String
if filename == "" && track.OrigFileCid.String == "" {
filename = track.Title.String + ".mp3"
}
return filename
}

// Remove extension and add .mp3
ext := filepath.Ext(origFilename.String)
nameWithoutExt := strings.TrimSuffix(origFilename.String, ext)
return nameWithoutExt + ".mp3"
type trackDownloadParams struct {
Filename string `query:"filename"`
}

func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {
myId := app.getMyId(c)
trackId := c.Locals("trackId").(int)
filename := c.Query("filename")
isOriginal := c.Query("is_original") == "true"
var params trackDownloadParams
if err := c.QueryParser(&params); err != nil {
return err
}

tracks, err := app.queries.FullTracks(c.Context(), dbv1.FullTracksParams{
GetTracksParams: dbv1.GetTracksParams{
Expand All@@ -46,17 +41,21 @@ func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {

track := tracks[0]
if !track.Access.Download {
return fiber.NewError(fiber.StatusForbidden, "track not downloadable")
return fiber.NewError(fiber.StatusForbidden, "you are not allowed to download this track")
}

if track.Download == nil {
return fiber.NewError(fiber.StatusNotFound, "track is not downloadable")
}

downloadUrl := tryFindWorkingUrl(track.Download)

q := downloadUrl.Query()
q.Set("skip_play_count", "true")
if filename != "" {
q.Set("filename", filename)
if params.Filename != "" {
q.Set("filename", params.Filename)
} else {
q.Set("filename", createFilename(&track, isOriginal))
q.Set("filename", createFilename(&track))
}
downloadUrl.RawQuery = q.Encode()

Expand Down
30 changes: 30 additions & 0 deletions api/v1_track_download_test.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import (
"net/http/httptest"
"testing"

"bridgerton.audius.co/database"
"bridgerton.audius.co/trashid"
"github.com/stretchr/testify/assert"
)

Expand All@@ -15,3 +17,31 @@ func TestGetTrackDownload(t *testing.T) {
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=T1.mp3")
}

func TestGetTrackDownload_Original(t *testing.T) {
app := emptyTestApp(t)
fixtures := database.FixtureMap{
"tracks": []map[string]any{
{
"track_id": 1,
"owner_id": 1,
"title": "T1",
"orig_file_cid": "QmX123",
"orig_filename": "DharitRocks.wav",
"is_downloadable": true,
},
},
"users": []map[string]any{
{
"user_id": 1,
"handle": "testuser1",
},
},
}
database.Seed(app.pool, fixtures)
req := httptest.NewRequest("GET", "/v1/tracks/"+trashid.MustEncodeHashID(1)+"/download", nil)
res, err := app.Test(req, -1)
assert.NoError(t, err)
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22QmX123%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=DharitRocks.wav")
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix stems download by raymondjacobson · Pull Request #304 · AudiusProject/api · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/dbv1/full_tracks.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,11 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg FullTracksParams) (ma

var download *MediaLink
if track.IsDownloadable && access.Download {
download, err = mediaLink(track.OrigFileCid.String, track.TrackID, arg.MyID.(int32), id3Tags)
cid := track.OrigFileCid.String
if cid == "" {
cid = track.TrackCid.String
}
download, err = mediaLink(cid, track.TrackID, arg.MyID.(int32), nil)
if err != nil {
return nil, err
}
Expand Down
6 changes: 0 additions & 6 deletions api/swagger/swagger-v1.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1466,12 +1466,6 @@ paths:
We perform checks on it and pass it through to CN.
schema:
type: string
- name: original
in: query
description: Optional - true if downloading original file
schema:
type: boolean
default: false
- name: filename
in: query
description: "Optional - name of file to download. If not provided, defaults\
Expand Down
41 changes: 20 additions & 21 deletions api/v1_track_download.go
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
package api

import (
"path/filepath"
"strings"

"bridgerton.audius.co/api/dbv1"
"github.com/gofiber/fiber/v2"
)

func createFilename(track *dbv1.FullTrack, isOriginal bool) string {
origFilename := track.OrigFilename
if origFilename.String == "" {
origFilename = track.Title
}

if isOriginal {
return origFilename.String
func createFilename(track *dbv1.FullTrack) string {
filename := track.OrigFilename.String
if filename == "" && track.OrigFileCid.String == "" {
filename = track.Title.String + ".mp3"
}
return filename
}

// Remove extension and add .mp3
ext := filepath.Ext(origFilename.String)
nameWithoutExt := strings.TrimSuffix(origFilename.String, ext)
return nameWithoutExt + ".mp3"
type trackDownloadParams struct {
Filename string `query:"filename"`
}

func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {
myId := app.getMyId(c)
trackId := c.Locals("trackId").(int)
filename := c.Query("filename")
isOriginal := c.Query("is_original") == "true"
var params trackDownloadParams
if err := c.QueryParser(&params); err != nil {
return err
}

tracks, err := app.queries.FullTracks(c.Context(), dbv1.FullTracksParams{
GetTracksParams: dbv1.GetTracksParams{
Expand All@@ -46,17 +41,21 @@ func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {

track := tracks[0]
if !track.Access.Download {
return fiber.NewError(fiber.StatusForbidden, "track not downloadable")
return fiber.NewError(fiber.StatusForbidden, "you are not allowed to download this track")
}

if track.Download == nil {
return fiber.NewError(fiber.StatusNotFound, "track is not downloadable")
}

downloadUrl := tryFindWorkingUrl(track.Download)

q := downloadUrl.Query()
q.Set("skip_play_count", "true")
if filename != "" {
q.Set("filename", filename)
if params.Filename != "" {
q.Set("filename", params.Filename)
} else {
q.Set("filename", createFilename(&track, isOriginal))
q.Set("filename", createFilename(&track))
}
downloadUrl.RawQuery = q.Encode()

Expand Down
30 changes: 30 additions & 0 deletions api/v1_track_download_test.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import (
"net/http/httptest"
"testing"

"bridgerton.audius.co/database"
"bridgerton.audius.co/trashid"
"github.com/stretchr/testify/assert"
)

Expand All@@ -15,3 +17,31 @@ func TestGetTrackDownload(t *testing.T) {
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=T1.mp3")
}

func TestGetTrackDownload_Original(t *testing.T) {
app := emptyTestApp(t)
fixtures := database.FixtureMap{
"tracks": []map[string]any{
{
"track_id": 1,
"owner_id": 1,
"title": "T1",
"orig_file_cid": "QmX123",
"orig_filename": "DharitRocks.wav",
"is_downloadable": true,
},
},
"users": []map[string]any{
{
"user_id": 1,
"handle": "testuser1",
},
},
}
database.Seed(app.pool, fixtures)
req := httptest.NewRequest("GET", "/v1/tracks/"+trashid.MustEncodeHashID(1)+"/download", nil)
res, err := app.Test(req, -1)
assert.NoError(t, err)
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22QmX123%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=DharitRocks.wav")
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix stems download by raymondjacobson · Pull Request #304 · AudiusProject/api · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/dbv1/full_tracks.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,11 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg FullTracksParams) (ma

var download *MediaLink
if track.IsDownloadable && access.Download {
download, err = mediaLink(track.OrigFileCid.String, track.TrackID, arg.MyID.(int32), id3Tags)
cid := track.OrigFileCid.String
if cid == "" {
cid = track.TrackCid.String
}
download, err = mediaLink(cid, track.TrackID, arg.MyID.(int32), nil)
if err != nil {
return nil, err
}
Expand Down
6 changes: 0 additions & 6 deletions api/swagger/swagger-v1.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1466,12 +1466,6 @@ paths:
We perform checks on it and pass it through to CN.
schema:
type: string
- name: original
in: query
description: Optional - true if downloading original file
schema:
type: boolean
default: false
- name: filename
in: query
description: "Optional - name of file to download. If not provided, defaults\
Expand Down
41 changes: 20 additions & 21 deletions api/v1_track_download.go
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
package api

import (
"path/filepath"
"strings"

"bridgerton.audius.co/api/dbv1"
"github.com/gofiber/fiber/v2"
)

func createFilename(track *dbv1.FullTrack, isOriginal bool) string {
origFilename := track.OrigFilename
if origFilename.String == "" {
origFilename = track.Title
}

if isOriginal {
return origFilename.String
func createFilename(track *dbv1.FullTrack) string {
filename := track.OrigFilename.String
if filename == "" && track.OrigFileCid.String == "" {
filename = track.Title.String + ".mp3"
}
return filename
}

// Remove extension and add .mp3
ext := filepath.Ext(origFilename.String)
nameWithoutExt := strings.TrimSuffix(origFilename.String, ext)
return nameWithoutExt + ".mp3"
type trackDownloadParams struct {
Filename string `query:"filename"`
}

func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {
myId := app.getMyId(c)
trackId := c.Locals("trackId").(int)
filename := c.Query("filename")
isOriginal := c.Query("is_original") == "true"
var params trackDownloadParams
if err := c.QueryParser(&params); err != nil {
return err
}

tracks, err := app.queries.FullTracks(c.Context(), dbv1.FullTracksParams{
GetTracksParams: dbv1.GetTracksParams{
Expand All@@ -46,17 +41,21 @@ func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {

track := tracks[0]
if !track.Access.Download {
return fiber.NewError(fiber.StatusForbidden, "track not downloadable")
return fiber.NewError(fiber.StatusForbidden, "you are not allowed to download this track")
}

if track.Download == nil {
return fiber.NewError(fiber.StatusNotFound, "track is not downloadable")
}

downloadUrl := tryFindWorkingUrl(track.Download)

q := downloadUrl.Query()
q.Set("skip_play_count", "true")
if filename != "" {
q.Set("filename", filename)
if params.Filename != "" {
q.Set("filename", params.Filename)
} else {
q.Set("filename", createFilename(&track, isOriginal))
q.Set("filename", createFilename(&track))
}
downloadUrl.RawQuery = q.Encode()

Expand Down
30 changes: 30 additions & 0 deletions api/v1_track_download_test.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import (
"net/http/httptest"
"testing"

"bridgerton.audius.co/database"
"bridgerton.audius.co/trashid"
"github.com/stretchr/testify/assert"
)

Expand All@@ -15,3 +17,31 @@ func TestGetTrackDownload(t *testing.T) {
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=T1.mp3")
}

func TestGetTrackDownload_Original(t *testing.T) {
app := emptyTestApp(t)
fixtures := database.FixtureMap{
"tracks": []map[string]any{
{
"track_id": 1,
"owner_id": 1,
"title": "T1",
"orig_file_cid": "QmX123",
"orig_filename": "DharitRocks.wav",
"is_downloadable": true,
},
},
"users": []map[string]any{
{
"user_id": 1,
"handle": "testuser1",
},
},
}
database.Seed(app.pool, fixtures)
req := httptest.NewRequest("GET", "/v1/tracks/"+trashid.MustEncodeHashID(1)+"/download", nil)
res, err := app.Test(req, -1)
assert.NoError(t, err)
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22QmX123%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=DharitRocks.wav")
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Fix stems download by raymondjacobson · Pull Request #304 · AudiusProject/api · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/dbv1/full_tracks.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,11 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg FullTracksParams) (ma

var download *MediaLink
if track.IsDownloadable && access.Download {
download, err = mediaLink(track.OrigFileCid.String, track.TrackID, arg.MyID.(int32), id3Tags)
cid := track.OrigFileCid.String
if cid == "" {
cid = track.TrackCid.String
}
download, err = mediaLink(cid, track.TrackID, arg.MyID.(int32), nil)
if err != nil {
return nil, err
}
Expand Down
6 changes: 0 additions & 6 deletions api/swagger/swagger-v1.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1466,12 +1466,6 @@ paths:
We perform checks on it and pass it through to CN.
schema:
type: string
- name: original
in: query
description: Optional - true if downloading original file
schema:
type: boolean
default: false
- name: filename
in: query
description: "Optional - name of file to download. If not provided, defaults\
Expand Down
41 changes: 20 additions & 21 deletions api/v1_track_download.go
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
package api

import (
"path/filepath"
"strings"

"bridgerton.audius.co/api/dbv1"
"github.com/gofiber/fiber/v2"
)

func createFilename(track *dbv1.FullTrack, isOriginal bool) string {
origFilename := track.OrigFilename
if origFilename.String == "" {
origFilename = track.Title
}

if isOriginal {
return origFilename.String
func createFilename(track *dbv1.FullTrack) string {
filename := track.OrigFilename.String
if filename == "" && track.OrigFileCid.String == "" {
filename = track.Title.String + ".mp3"
}
return filename
}

// Remove extension and add .mp3
ext := filepath.Ext(origFilename.String)
nameWithoutExt := strings.TrimSuffix(origFilename.String, ext)
return nameWithoutExt + ".mp3"
type trackDownloadParams struct {
Filename string `query:"filename"`
}

func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {
myId := app.getMyId(c)
trackId := c.Locals("trackId").(int)
filename := c.Query("filename")
isOriginal := c.Query("is_original") == "true"
var params trackDownloadParams
if err := c.QueryParser(&params); err != nil {
return err
}

tracks, err := app.queries.FullTracks(c.Context(), dbv1.FullTracksParams{
GetTracksParams: dbv1.GetTracksParams{
Expand All@@ -46,17 +41,21 @@ func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {

track := tracks[0]
if !track.Access.Download {
return fiber.NewError(fiber.StatusForbidden, "track not downloadable")
return fiber.NewError(fiber.StatusForbidden, "you are not allowed to download this track")
}

if track.Download == nil {
return fiber.NewError(fiber.StatusNotFound, "track is not downloadable")
}

downloadUrl := tryFindWorkingUrl(track.Download)

q := downloadUrl.Query()
q.Set("skip_play_count", "true")
if filename != "" {
q.Set("filename", filename)
if params.Filename != "" {
q.Set("filename", params.Filename)
} else {
q.Set("filename", createFilename(&track, isOriginal))
q.Set("filename", createFilename(&track))
}
downloadUrl.RawQuery = q.Encode()

Expand Down
30 changes: 30 additions & 0 deletions api/v1_track_download_test.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import (
"net/http/httptest"
"testing"

"bridgerton.audius.co/database"
"bridgerton.audius.co/trashid"
"github.com/stretchr/testify/assert"
)

Expand All@@ -15,3 +17,31 @@ func TestGetTrackDownload(t *testing.T) {
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=T1.mp3")
}

func TestGetTrackDownload_Original(t *testing.T) {
app := emptyTestApp(t)
fixtures := database.FixtureMap{
"tracks": []map[string]any{
{
"track_id": 1,
"owner_id": 1,
"title": "T1",
"orig_file_cid": "QmX123",
"orig_filename": "DharitRocks.wav",
"is_downloadable": true,
},
},
"users": []map[string]any{
{
"user_id": 1,
"handle": "testuser1",
},
},
}
database.Seed(app.pool, fixtures)
req := httptest.NewRequest("GET", "/v1/tracks/"+trashid.MustEncodeHashID(1)+"/download", nil)
res, err := app.Test(req, -1)
assert.NoError(t, err)
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22QmX123%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=DharitRocks.wav")
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix stems download by raymondjacobson · Pull Request #304 · AudiusProject/api · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/dbv1/full_tracks.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,11 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg FullTracksParams) (ma

var download *MediaLink
if track.IsDownloadable && access.Download {
download, err = mediaLink(track.OrigFileCid.String, track.TrackID, arg.MyID.(int32), id3Tags)
cid := track.OrigFileCid.String
if cid == "" {
cid = track.TrackCid.String
}
download, err = mediaLink(cid, track.TrackID, arg.MyID.(int32), nil)
if err != nil {
return nil, err
}
Expand Down
6 changes: 0 additions & 6 deletions api/swagger/swagger-v1.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1466,12 +1466,6 @@ paths:
We perform checks on it and pass it through to CN.
schema:
type: string
- name: original
in: query
description: Optional - true if downloading original file
schema:
type: boolean
default: false
- name: filename
in: query
description: "Optional - name of file to download. If not provided, defaults\
Expand Down
41 changes: 20 additions & 21 deletions api/v1_track_download.go
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
package api

import (
"path/filepath"
"strings"

"bridgerton.audius.co/api/dbv1"
"github.com/gofiber/fiber/v2"
)

func createFilename(track *dbv1.FullTrack, isOriginal bool) string {
origFilename := track.OrigFilename
if origFilename.String == "" {
origFilename = track.Title
}

if isOriginal {
return origFilename.String
func createFilename(track *dbv1.FullTrack) string {
filename := track.OrigFilename.String
if filename == "" && track.OrigFileCid.String == "" {
filename = track.Title.String + ".mp3"
}
return filename
}

// Remove extension and add .mp3
ext := filepath.Ext(origFilename.String)
nameWithoutExt := strings.TrimSuffix(origFilename.String, ext)
return nameWithoutExt + ".mp3"
type trackDownloadParams struct {
Filename string `query:"filename"`
}

func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {
myId := app.getMyId(c)
trackId := c.Locals("trackId").(int)
filename := c.Query("filename")
isOriginal := c.Query("is_original") == "true"
var params trackDownloadParams
if err := c.QueryParser(&params); err != nil {
return err
}

tracks, err := app.queries.FullTracks(c.Context(), dbv1.FullTracksParams{
GetTracksParams: dbv1.GetTracksParams{
Expand All@@ -46,17 +41,21 @@ func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {

track := tracks[0]
if !track.Access.Download {
return fiber.NewError(fiber.StatusForbidden, "track not downloadable")
return fiber.NewError(fiber.StatusForbidden, "you are not allowed to download this track")
}

if track.Download == nil {
return fiber.NewError(fiber.StatusNotFound, "track is not downloadable")
}

downloadUrl := tryFindWorkingUrl(track.Download)

q := downloadUrl.Query()
q.Set("skip_play_count", "true")
if filename != "" {
q.Set("filename", filename)
if params.Filename != "" {
q.Set("filename", params.Filename)
} else {
q.Set("filename", createFilename(&track, isOriginal))
q.Set("filename", createFilename(&track))
}
downloadUrl.RawQuery = q.Encode()

Expand Down
30 changes: 30 additions & 0 deletions api/v1_track_download_test.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import (
"net/http/httptest"
"testing"

"bridgerton.audius.co/database"
"bridgerton.audius.co/trashid"
"github.com/stretchr/testify/assert"
)

Expand All@@ -15,3 +17,31 @@ func TestGetTrackDownload(t *testing.T) {
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=T1.mp3")
}

func TestGetTrackDownload_Original(t *testing.T) {
app := emptyTestApp(t)
fixtures := database.FixtureMap{
"tracks": []map[string]any{
{
"track_id": 1,
"owner_id": 1,
"title": "T1",
"orig_file_cid": "QmX123",
"orig_filename": "DharitRocks.wav",
"is_downloadable": true,
},
},
"users": []map[string]any{
{
"user_id": 1,
"handle": "testuser1",
},
},
}
database.Seed(app.pool, fixtures)
req := httptest.NewRequest("GET", "/v1/tracks/"+trashid.MustEncodeHashID(1)+"/download", nil)
res, err := app.Test(req, -1)
assert.NoError(t, err)
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22QmX123%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=DharitRocks.wav")
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix stems download by raymondjacobson · Pull Request #304 · AudiusProject/api · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/dbv1/full_tracks.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,11 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg FullTracksParams) (ma

var download *MediaLink
if track.IsDownloadable && access.Download {
download, err = mediaLink(track.OrigFileCid.String, track.TrackID, arg.MyID.(int32), id3Tags)
cid := track.OrigFileCid.String
if cid == "" {
cid = track.TrackCid.String
}
download, err = mediaLink(cid, track.TrackID, arg.MyID.(int32), nil)
if err != nil {
return nil, err
}
Expand Down
6 changes: 0 additions & 6 deletions api/swagger/swagger-v1.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1466,12 +1466,6 @@ paths:
We perform checks on it and pass it through to CN.
schema:
type: string
- name: original
in: query
description: Optional - true if downloading original file
schema:
type: boolean
default: false
- name: filename
in: query
description: "Optional - name of file to download. If not provided, defaults\
Expand Down
41 changes: 20 additions & 21 deletions api/v1_track_download.go
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
package api

import (
"path/filepath"
"strings"

"bridgerton.audius.co/api/dbv1"
"github.com/gofiber/fiber/v2"
)

func createFilename(track *dbv1.FullTrack, isOriginal bool) string {
origFilename := track.OrigFilename
if origFilename.String == "" {
origFilename = track.Title
}

if isOriginal {
return origFilename.String
func createFilename(track *dbv1.FullTrack) string {
filename := track.OrigFilename.String
if filename == "" && track.OrigFileCid.String == "" {
filename = track.Title.String + ".mp3"
}
return filename
}

// Remove extension and add .mp3
ext := filepath.Ext(origFilename.String)
nameWithoutExt := strings.TrimSuffix(origFilename.String, ext)
return nameWithoutExt + ".mp3"
type trackDownloadParams struct {
Filename string `query:"filename"`
}

func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {
myId := app.getMyId(c)
trackId := c.Locals("trackId").(int)
filename := c.Query("filename")
isOriginal := c.Query("is_original") == "true"
var params trackDownloadParams
if err := c.QueryParser(&params); err != nil {
return err
}

tracks, err := app.queries.FullTracks(c.Context(), dbv1.FullTracksParams{
GetTracksParams: dbv1.GetTracksParams{
Expand All@@ -46,17 +41,21 @@ func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {

track := tracks[0]
if !track.Access.Download {
return fiber.NewError(fiber.StatusForbidden, "track not downloadable")
return fiber.NewError(fiber.StatusForbidden, "you are not allowed to download this track")
}

if track.Download == nil {
return fiber.NewError(fiber.StatusNotFound, "track is not downloadable")
}

downloadUrl := tryFindWorkingUrl(track.Download)

q := downloadUrl.Query()
q.Set("skip_play_count", "true")
if filename != "" {
q.Set("filename", filename)
if params.Filename != "" {
q.Set("filename", params.Filename)
} else {
q.Set("filename", createFilename(&track, isOriginal))
q.Set("filename", createFilename(&track))
}
downloadUrl.RawQuery = q.Encode()

Expand Down
30 changes: 30 additions & 0 deletions api/v1_track_download_test.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import (
"net/http/httptest"
"testing"

"bridgerton.audius.co/database"
"bridgerton.audius.co/trashid"
"github.com/stretchr/testify/assert"
)

Expand All@@ -15,3 +17,31 @@ func TestGetTrackDownload(t *testing.T) {
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=T1.mp3")
}

func TestGetTrackDownload_Original(t *testing.T) {
app := emptyTestApp(t)
fixtures := database.FixtureMap{
"tracks": []map[string]any{
{
"track_id": 1,
"owner_id": 1,
"title": "T1",
"orig_file_cid": "QmX123",
"orig_filename": "DharitRocks.wav",
"is_downloadable": true,
},
},
"users": []map[string]any{
{
"user_id": 1,
"handle": "testuser1",
},
},
}
database.Seed(app.pool, fixtures)
req := httptest.NewRequest("GET", "/v1/tracks/"+trashid.MustEncodeHashID(1)+"/download", nil)
res, err := app.Test(req, -1)
assert.NoError(t, err)
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22QmX123%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=DharitRocks.wav")
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Fix stems download by raymondjacobson · Pull Request #304 · AudiusProject/api · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/dbv1/full_tracks.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,11 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg FullTracksParams) (ma

var download *MediaLink
if track.IsDownloadable && access.Download {
download, err = mediaLink(track.OrigFileCid.String, track.TrackID, arg.MyID.(int32), id3Tags)
cid := track.OrigFileCid.String
if cid == "" {
cid = track.TrackCid.String
}
download, err = mediaLink(cid, track.TrackID, arg.MyID.(int32), nil)
if err != nil {
return nil, err
}
Expand Down
6 changes: 0 additions & 6 deletions api/swagger/swagger-v1.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1466,12 +1466,6 @@ paths:
We perform checks on it and pass it through to CN.
schema:
type: string
- name: original
in: query
description: Optional - true if downloading original file
schema:
type: boolean
default: false
- name: filename
in: query
description: "Optional - name of file to download. If not provided, defaults\
Expand Down
41 changes: 20 additions & 21 deletions api/v1_track_download.go
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
package api

import (
"path/filepath"
"strings"

"bridgerton.audius.co/api/dbv1"
"github.com/gofiber/fiber/v2"
)

func createFilename(track *dbv1.FullTrack, isOriginal bool) string {
origFilename := track.OrigFilename
if origFilename.String == "" {
origFilename = track.Title
}

if isOriginal {
return origFilename.String
func createFilename(track *dbv1.FullTrack) string {
filename := track.OrigFilename.String
if filename == "" && track.OrigFileCid.String == "" {
filename = track.Title.String + ".mp3"
}
return filename
}

// Remove extension and add .mp3
ext := filepath.Ext(origFilename.String)
nameWithoutExt := strings.TrimSuffix(origFilename.String, ext)
return nameWithoutExt + ".mp3"
type trackDownloadParams struct {
Filename string `query:"filename"`
}

func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {
myId := app.getMyId(c)
trackId := c.Locals("trackId").(int)
filename := c.Query("filename")
isOriginal := c.Query("is_original") == "true"
var params trackDownloadParams
if err := c.QueryParser(&params); err != nil {
return err
}

tracks, err := app.queries.FullTracks(c.Context(), dbv1.FullTracksParams{
GetTracksParams: dbv1.GetTracksParams{
Expand All@@ -46,17 +41,21 @@ func (app *ApiServer) v1TrackDownload(c *fiber.Ctx) error {

track := tracks[0]
if !track.Access.Download {
return fiber.NewError(fiber.StatusForbidden, "track not downloadable")
return fiber.NewError(fiber.StatusForbidden, "you are not allowed to download this track")
}

if track.Download == nil {
return fiber.NewError(fiber.StatusNotFound, "track is not downloadable")
}

downloadUrl := tryFindWorkingUrl(track.Download)

q := downloadUrl.Query()
q.Set("skip_play_count", "true")
if filename != "" {
q.Set("filename", filename)
if params.Filename != "" {
q.Set("filename", params.Filename)
} else {
q.Set("filename", createFilename(&track, isOriginal))
q.Set("filename", createFilename(&track))
}
downloadUrl.RawQuery = q.Encode()

Expand Down
30 changes: 30 additions & 0 deletions api/v1_track_download_test.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import (
"net/http/httptest"
"testing"

"bridgerton.audius.co/database"
"bridgerton.audius.co/trashid"
"github.com/stretchr/testify/assert"
)

Expand All@@ -15,3 +17,31 @@ func TestGetTrackDownload(t *testing.T) {
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=T1.mp3")
}

func TestGetTrackDownload_Original(t *testing.T) {
app := emptyTestApp(t)
fixtures := database.FixtureMap{
"tracks": []map[string]any{
{
"track_id": 1,
"owner_id": 1,
"title": "T1",
"orig_file_cid": "QmX123",
"orig_filename": "DharitRocks.wav",
"is_downloadable": true,
},
},
"users": []map[string]any{
{
"user_id": 1,
"handle": "testuser1",
},
},
}
database.Seed(app.pool, fixtures)
req := httptest.NewRequest("GET", "/v1/tracks/"+trashid.MustEncodeHashID(1)+"/download", nil)
res, err := app.Test(req, -1)
assert.NoError(t, err)
assert.Contains(t, res.Header.Get("Location"), "signature=%7B%22data%22%3A%22%7B%5C%22cid%5C%22%3A%5C%22QmX123%5C%22%2C%5C%22timestamp%5C%22%3")
assert.Contains(t, res.Header.Get("Location"), "filename=DharitRocks.wav")
}
Loading