fix(NextTrack): add language

Author: Dark-Kernel

src/ai/command_handler.hpp

@@ -120,7 +120,7 @@ class CommandHandler {
                 if (selected_track.source == "soundcloud") {
                     next_tracks = soundcloud.fetch_next_tracks(selected_track.url);
                 } else if (selected_track.source == "saavn") {
-                    next_tracks = saavn.fetch_next_tracks(selected_track.id);
+                    next_tracks = saavn.fetch_next_tracks(selected_track.id, selected_track.language);
                 }
             } catch (const std::exception& e) {
                 // If fetching next tracks fails, just play the selected track

src/common/Track.h

@@ -8,6 +8,7 @@ struct Track {
     std::string id;
     std::string source;
     std::string coverImage;
+    std::string language;
 
     // Convert to display string for FTXUI menu
     std::string to_string() const {

src/core/main.cpp

@@ -761,7 +761,7 @@ int main(int argc, char *argv[]) {
                     next_tracks = soundcloud.fetch_next_tracks(track_data[selected].url);
                 }else {//if(track_data[selected].source=="saavn"){
                     // system(("notify-send 'Tuisic' 'Fetching next'" + track_data[selected].id).c_str());
-                    next_tracks = saavn.fetch_next_tracks(track_data[selected].id);
+                    next_tracks = saavn.fetch_next_tracks(track_data[selected].id, track_data[selected].language);
                     // system(("notify-send 'Tuisic' 'Fetching next'" + next_tracks[0].id).c_str());
 
                 }

src/services/saavn/saavn.cpp

@@ -27,6 +27,7 @@ class Saavn {
                 track.url = result["perma_url"].GetString();
                 track.artist = result["more_info"]["artistMap"]["primary_artists"][0]["name"].GetString();
                 track.source = "saavn";
+                track.language = result["language"].GetString();
                 tracks.push_back(track);
             }
             // std::cout << "NEXT TRACKS \n" << tracks[0].name << std::endl;
@@ -44,6 +45,7 @@ class Saavn {
                 track.url = result["perma_url"].GetString();
                 track.artist = result["more_info"]["artistMap"]["artists"][0]["name"].GetString();
                 track.source = "saavn";
+                track.language = result["language"].GetString();
                 tracks.push_back(track);
             }
             return tracks;
@@ -68,6 +70,9 @@ class Saavn {
                     if (result.HasMember("perma_url") && result["perma_url"].IsString()) {
                         track.url = result["perma_url"].GetString();
                     }
+                    if (result.HasMember("language") && result["language"].IsString()) {
+                        track.language = result["language"].GetString();
+                    }
                     if (result.HasMember("more_info") && result["more_info"].IsObject()) {
                         const auto &more_info = result["more_info"];
                         if (more_info.HasMember("artistMap") &&
@@ -137,27 +142,28 @@ class Saavn {
             return extractTracks(readBuffer);
         }
 
-        std::vector<Track> fetch_trending() {
-            std::string url = "https://www.jiosaavn.com/api.php?__call=content.getTrending&api_version=4&_format=json&_marker=0&ctx=web6dot0&entity_type=album&entity_language=english";
+        std::vector<Track> fetch_trending(std::string language = "english") {
+            std::string url = "https://www.jiosaavn.com/api.php?__call=content.getTrending&api_version=4&_format=json&_marker=0&ctx=web6dot0&entity_type=album&entity_language=" + language;
             std::string readBuffer = make_request(url);
             return extractTrendingTracks(readBuffer);
         }
 
-        std::vector<Track> fetch_next_tracks(std::string id) {
+        std::vector<Track> fetch_next_tracks(std::string id, std::string language = "english") {
             CURL *curl = curl_easy_init();
             if (!curl) {
                 throw std::runtime_error("CURL initialization failed.");
             }
 
             std::string url = "https://www.jiosaavn.com/api.php?__call=reco.getreco&api_version=4&_format=json&_marker=0&ctx=web6dot0&pid=" + std::string(curl_easy_escape(curl, id.c_str(), id.length()));
-            // std::cout << url << std::endl;
+            // std::cout << "[NEXT TRACK]:  " << url << std::endl;
             curl_easy_cleanup(curl);
             std::string readBuffer = make_request(url);
             // std::cout << readBuffer  << readBuffer.size()<< std::endl;
 
             if(readBuffer.size() == 2) {
                 // std::cout << "in fi";
-                std::string url = "https://www.jiosaavn.com/api.php?__call=content.getTrending&api_version=4&_format=json&_marker=0&ctx=web6dot0&entity_type=song&entity_language=english";
+                // std::cout << "[TRENDING] ====== No next track found" << std::endl;
+                std::string url = "https://www.jiosaavn.com/api.php?__call=content.getTrending&api_version=4&_format=json&_marker=0&ctx=web6dot0&entity_type=song&entity_language=" + std::string(curl_easy_escape(curl, language.c_str(), language.length()));
                 curl_easy_cleanup(curl);
                 std::string readBuffer = make_request(url);
                 return extractTrendingTracks(readBuffer);
@@ -178,6 +184,7 @@ class Saavn {
 //        std::cout << "Title: " << track.name << "\n";
 //        std::cout << "URL: " << track.url << "\n";
 //        std::cout << "Primary Artists: " << track.artist << "\n";
+//        std::cout << "Language: " << track.language << "\n";
 //         for (const auto& artist : track.artist) {
 //             std::cout << artist << "";
 //         }
@@ -190,6 +197,7 @@ class Saavn {
 //        std::cout << "Title: " << track.name << "\n";
 //        std::cout << "URL: " << track.url << "\n";
 //        std::cout << "Primary Artists: " << track.artist << "\n";
+//        std::cout << "Language: " << track.language << "\n";
 //         for (const auto& artist : track.artist) {
 //             std::cout << artist << "";
 //         }