From bac28a1c4de0efe6c495f2141b02d57d0891c4a6 Mon Sep 17 00:00:00 2001
From: "Yukai (Donald) Shan" <xxpinapelzxx@gmail.com>
Date: Sat, 10 Dec 2022 17:01:00 -0800
Subject: Add files via upload

---
 src/main/java/utility/SpotifyAPI.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/main/java/utility/SpotifyAPI.java')

diff --git a/src/main/java/utility/SpotifyAPI.java b/src/main/java/utility/SpotifyAPI.java
index 74b792e..b4bcac1 100644
--- a/src/main/java/utility/SpotifyAPI.java
+++ b/src/main/java/utility/SpotifyAPI.java
@@ -13,9 +13,6 @@ import se.michaelthelin.spotify.requests.data.playlists.GetPlaylistRequest;
 import se.michaelthelin.spotify.requests.data.tracks.GetTrackRequest;
 import java.io.FileReader;
 import java.time.Instant;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 public class SpotifyAPI {
     private static final String clientId = readSetting("spotifyClientID");
     private static final String clientSecret = readSetting("spotifyClientSecret");
@@ -38,7 +35,6 @@ public class SpotifyAPI {
         String searchQuery = "";
         try {
            GetTrackRequest getTrackRequest = spotifyApi.getTrack(trackid)
-//          .market(CountryCode.SE)
                     .build();
             final Track track = getTrackRequest.execute();
             searchQuery = track.getName();
@@ -53,13 +49,12 @@ public class SpotifyAPI {
         return searchQuery;
 
     }
-    public static String getPlaylist_Sync(String playlistId) {
+    public static String getRandomPlaylistTrack_Sync(String playlistId) {
         checkRefreshToken();
         GetPlaylistRequest getPlaylistRequest = spotifyApi.getPlaylist(playlistId).build();
         try {
             Playlist playlist = getPlaylistRequest.execute();
             PlaylistTrack[] tracks = playlist.getTracks().getItems();
-            //pick a random track and return it
             int randomTrack = (int) (Math.random() * tracks.length);
             System.out.println(tracks[randomTrack].getTrack().getId());
             return tracks[randomTrack].getTrack().getId();
@@ -68,6 +63,18 @@ public class SpotifyAPI {
         }
         return "";
     }
+    public static PlaylistTrack[] getPlaylist_Sync(String playlistId) {
+        checkRefreshToken();
+        GetPlaylistRequest getPlaylistRequest = spotifyApi.getPlaylist(playlistId).build();
+        try {
+            Playlist playlist = getPlaylistRequest.execute();
+            PlaylistTrack[] tracks = playlist.getTracks().getItems();
+            return tracks;
+        } catch (Exception e) {
+            System.out.println("Error: " + e.getMessage());
+        }
+        return null;
+    }
     public static void clientCredentials_Sync() {
         try {
             final ClientCredentials clientCredentials = clientCredentialsRequest.execute();
-- 
cgit v1.2.3