Jonas_Jones/ZtereoMUSIC
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/ZtereoMUSIC.git synced 2025-10-26 12:59:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: clean up README and files, add comments, and add last part of previous commit that was missing

Browse source
This commit is contained in:
ZtereoHYPE 2021-12-05 02:18:13 +01:00
parent b0c00d48ee
commit bdbf2b44d5
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/codes/ztereohype/ztereomusic/audio/AudioPlayerSendHandler.java
View file

@ -2,7 +2,6 @@ package codes.ztereohype.ztereomusic.audio;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
//import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
import net.dv8tion.jda.api.audio.AudioSendHandler;
import java.nio.ByteBuffer;

17
src/main/java/codes/ztereohype/ztereomusic/audio/TrackManager.java
View file

@ -7,6 +7,7 @@ import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.MessageChannel;
@ -16,8 +17,9 @@ import java.util.List;
public class TrackManager extends AudioEventAdapter {
private final @Getter AudioPlayer player;
public final List<AudioTrack> trackQueue = new ArrayList<>();
private final MessageChannel infoChannel;
private @Getter @Setter MessageChannel infoChannel;
private final Guild guild;
private boolean trackHasErrored = false; // this is a temporary workaround that helps me debug stuff. will be removed.
public TrackManager(AudioPlayerManager playerManager, MessageChannel infoChannel, Guild guild) {
this.player = playerManager.createPlayer();
@ -110,9 +112,16 @@ public class TrackManager extends AudioEventAdapter {
@Override
public void onTrackException(AudioPlayer player, AudioTrack track, FriendlyException exception) {
infoChannel.sendMessage("Uh oh, a track did something strange. Skipping...").queue();
trackQueue.remove(track);
playNext();
System.out.println(exception.getMessage());
if (!trackHasErrored) {
infoChannel.sendMessage("Uh oh, a track did something strange. The error was: " + exception.getMessage() + ". Trying to replay...").queue();
player.playTrack(track);
} else {
infoChannel.sendMessage("The error happened again. Skipping...").queue();
playNext();
}
trackHasErrored = !trackHasErrored;
}
@Override

5
src/main/java/codes/ztereohype/ztereomusic/networking/YoutubeSearch.java
View file

@ -2,14 +2,11 @@ package codes.ztereohype.ztereomusic.networking;
import codes.ztereohype.ztereomusic.ZtereoMUSIC;
import net.shadew.json.Json;
import net.shadew.json.JsonNode;
import net.shadew.json.JsonPath;
import net.shadew.json.JsonSyntaxException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
public class YoutubeSearch {
@ -27,8 +24,10 @@ public class YoutubeSearch {
e.printStackTrace();
return Optional.empty();
}
JsonPath path = JsonPath.parse("items[0].id.videoId");
//todo: actually check if there is a response before parsing directly to the response + get the music-related one with most views
try {
return Optional.ofNullable(JSON.parse(jsonResponse).query(path).asString());
} catch (JsonSyntaxException e) {