Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for searching Bandcamp tracks #115

Merged
merged 3 commits into from
May 18, 2024
Merged

Add support for searching Bandcamp tracks #115

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7044865
Add bandcamp searching support.
devoxin May 12, 2024
af27d5e
Improve artist extraction
devoxin May 12, 2024
1d73e28
Support isrc extraction from bandcamp tracks
devoxin May 12, 2024
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
108 changes: 93 additions & 15 deletions ...ain/java/com/sedmelluq/discord/lavaplayer/source/bandcamp/BandcampAudioSourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
import com.sedmelluq.discord.lavaplayer.tools.*;
import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
Expand All @@ -16,11 +13,18 @@
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.impl.client.HttpClientBuilder;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -36,17 +40,24 @@
* Audio source manager that implements finding Bandcamp tracks based on URL.
*/
public class BandcampAudioSourceManager implements AudioSourceManager, HttpConfigurable {
private static final String SEARCH_PREFIX = "bcsearch:";
private static final String URL_REGEX = "^(https?://(?:[^.]+\\.|)bandcamp\\.com)/(track|album)/([a-zA-Z0-9-_]+)/?(?:\\?.*|)$";
private static final Pattern urlRegex = Pattern.compile(URL_REGEX);

private static final String ARTWORK_URL_FORMAT = "https://f4.bcbits.com/img/a%s_1.png";

private final HttpInterfaceManager httpInterfaceManager;
private final boolean allowSearch;

/**
* Create an instance.
*/
public BandcampAudioSourceManager() {
this(true);
}

public BandcampAudioSourceManager(boolean allowSearch) {
this.allowSearch = allowSearch;
httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
}

Expand All @@ -57,19 +68,85 @@ public String getSourceName() {

@Override
public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference) {
UrlInfo urlInfo = parseUrl(reference.identifier);
if (reference.identifier.startsWith(SEARCH_PREFIX)) {
if (allowSearch) {
String query = reference.identifier.substring(SEARCH_PREFIX.length());
return loadSearch(query);
}
} else {
UrlInfo urlInfo = parseUrl(reference.identifier);

if (urlInfo != null) {
if (urlInfo.isAlbum) {
return loadAlbum(urlInfo);
} else {
return loadTrack(urlInfo);
if (urlInfo != null) {
if (urlInfo.isAlbum) {
return loadAlbum(urlInfo);
} else {
return loadTrack(urlInfo);
}
}
}

return null;
}

private URI buildSearchUri(String query) {
try {
return new URIBuilder("https://bandcamp.com/search")
.addParameter("q", query)
.addParameter("item_type", "t")
.build();
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
}

private AudioItem loadSearch(String query) {
return extractFromPage(buildSearchUri(query).toString(), (httpClient, text) -> {
Document doc = Jsoup.parse(text);
Elements elements = doc.select(".searchresult");
List<AudioTrack> tracks = new ArrayList<>();

for (Element e : elements) {
if (!"track".equalsIgnoreCase(e.select(".itemtype").text())) {
continue;
}

tracks.add(extractHtmlTrack(e));
}

if (tracks.isEmpty()) {
return AudioReference.NO_TRACK;
}

return new BasicAudioPlaylist("Search results for: " + query, tracks, null, true);
});
}

private AudioTrack extractHtmlTrack(Element e) {
String title = e.select(".heading a").text();
String[] artists = e.select(".subhead").text().split("by");
String artist = artists[artists.length - 1].split(",")[0].trim();
String trackUrl = e.select(".itemurl a").text();

int queryIndex = trackUrl.indexOf("?");

if (queryIndex > -1) {
trackUrl = trackUrl.substring(0, queryIndex);
}

String artworkUrl = e.select(".art img").attr("src");

return new BandcampAudioTrack(new AudioTrackInfo(
title,
artist,
Units.DURATION_MS_UNKNOWN,
trackUrl,
false,
trackUrl,
artworkUrl,
null
), this);
}

private UrlInfo parseUrl(String url) {
Matcher matcher = urlRegex.matcher(url);

Expand All @@ -86,7 +163,7 @@ private AudioItem loadTrack(UrlInfo urlInfo) {
String artist = trackListInfo.get("artist").safeText();
String artworkUrl = extractArtwork(trackListInfo);

return extractTrack(trackListInfo.get("trackinfo").index(0), urlInfo.baseUrl, artist, artworkUrl);
return extractTrack(trackListInfo.get("trackinfo").index(0), urlInfo.baseUrl, artist, artworkUrl, trackListInfo.get("current").get("isrc").text());
});
}

Expand All @@ -98,15 +175,16 @@ private AudioItem loadAlbum(UrlInfo urlInfo) {

List<AudioTrack> tracks = new ArrayList<>();
for (JsonBrowser trackInfo : trackListInfo.get("trackinfo").values()) {
tracks.add(extractTrack(trackInfo, urlInfo.baseUrl, artist, artworkUrl));
// album track json does not include isrc
tracks.add(extractTrack(trackInfo, urlInfo.baseUrl, artist, artworkUrl, null));
}

JsonBrowser albumInfo = readAlbumInformation(text);
return new BasicAudioPlaylist(albumInfo.get("current").get("title").text(), tracks, null, false);
});
}

private AudioTrack extractTrack(JsonBrowser trackInfo, String bandUrl, String artist, String artworkUrl) {
private AudioTrack extractTrack(JsonBrowser trackInfo, String bandUrl, String artist, String artworkUrl, String isrc) {
String trackPageUrl = bandUrl + trackInfo.get("title_link").text();

return new BandcampAudioTrack(new AudioTrackInfo(
Expand All @@ -117,7 +195,7 @@ private AudioTrack extractTrack(JsonBrowser trackInfo, String bandUrl, String ar
false,
trackPageUrl,
artworkUrl,
null
isrc
), this);
}

Expand Down Expand Up @@ -147,7 +225,7 @@ private AudioItem extractFromPage(String url, AudioItemExtractor extractor) {
try (HttpInterface httpInterface = httpInterfaceManager.getInterface()) {
return extractFromPageWithInterface(httpInterface, url, extractor);
} catch (Exception e) {
throw ExceptionTools.wrapUnfriendlyExceptions("Loading information for a Bandcamp track failed.", FAULT, e);
throw ExceptionTools.wrapUnfriendlyExceptions("Loading information for a Bandcamp resource failed.", FAULT, e);
}
}

Expand Down
Loading