Merge pull request Harsh-23#4 from cyberboysumanjay/master

Multiple Fixes
pkpkp-pk · Aug 12, 2020 · d002dcf · d002dcf
2 parents 41df0b1 + 3e0e90d
commit d002dcf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/API/saavn.dart b/lib/API/saavn.dart
@@ -32,8 +32,9 @@ Future fetchSongDetails(songId) async {
   title = (getMain[songId]["title"])
       .toString()
       .split("(")[0]
-      .replaceAll("&amp;", "&");
-  image = (getMain[songId]["image"]);
+      .replaceAll("&amp;", "&")
+      .replaceAll("&quot;", "\"");
+  image = (getMain[songId]["image"]).replaceAll("150x150", "500x500");
   artist = (getMain[songId]["more_info"]["artistMap"]["primary_artists"][0]
           ["name"])
       .toString()
@@ -63,8 +64,11 @@ Future fetchSongDetails(songId) async {
       key, getMain[songId]["more_info"]["encrypted_media_url"]);
   kUrl = kUrl
       .replaceAll("aac.saavncdn.com", "h.saavncdn.com")
-      .replaceAll("c.saavncdn.com", "h.saavncdn.com")
-      .replaceAll("_96.mp4", "_320.mp3");
+      .replaceAll("c.saavncdn.com", "h.saavncdn.com");
+
+  if (getMain[songId]["more_info"]["320kbps"] == "true") {
+    kUrl = kUrl.replaceAll("_96.mp4", "_320.mp4");
+  }
 
   final client = http.Client();
   final request = new http.Request('GET', Uri.parse(kUrl))

diff --git a/lib/main.dart b/lib/main.dart
@@ -96,14 +96,13 @@ class AppState extends State<AppName> {
     );
     await pr.show();
 
-    final filename = title + ".mp3";
+    final filename = title + ".m4a";
     final artname = title + "_artwork.jpg";
 
     String dlPath = await ExtStorage.getExternalStoragePublicDirectory(
         ExtStorage.DIRECTORY_MUSIC);
     String filepath = dlPath + "/" + filename;
     String filepath2 = dlPath + "/" + artname;
-
     var request = await HttpClient().getUrl(Uri.parse(kUrl));
     var response = await request.close();
     var bytes = await consolidateHttpClientResponseBytes(response);