added support gzip for audio downloaders and catalogs

This commit is contained in:
gdlbo
2024-02-21 19:29:09 +03:00
parent 7a30e2aae6
commit d7c1ce4b78
3 changed files with 20 additions and 12 deletions
@@ -7,6 +7,7 @@ import com.vk.core.util.DeviceIdProvider;
import okhttp3.Headers;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -15,6 +16,7 @@ import ru.vtosters.lite.di.singleton.VtOkHttpClient;
import ru.vtosters.lite.music.cache.MusicCacheImpl;
import ru.vtosters.lite.utils.AccountManagerUtils;
import ru.vtosters.lite.utils.AndroidUtils;
import ru.vtosters.sponsorpost.utils.GzipDecompressor;
import java.io.IOException;
@@ -263,9 +265,10 @@ public class CatalogJsonInjector {
+ sectionUrl
+ "&access_token="
+ AccountManagerUtils.getUserToken())
.a("Accept-Encoding", "gzip")
.a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
try {
var json = new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
try (Response resp = mClient.a(request).execute()) {
var json = new JSONObject(GzipDecompressor.decompressResponse(resp)).getJSONObject("response");
var catalogarr = json.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
var title = catalogarr.optString("title");
@@ -279,4 +282,4 @@ public class CatalogJsonInjector {
Log.d("VTLMusic", "Error: " + e.getMessage());
}
}
}
}
@@ -8,10 +8,12 @@ import java8.util.concurrent.CompletableFuture;
import okhttp3.Headers;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.json.JSONException;
import org.json.JSONObject;
import ru.vtosters.lite.utils.AccountManagerUtils;
import ru.vtosters.lite.utils.AndroidUtils;
import ru.vtosters.sponsorpost.utils.GzipDecompressor;
import java.io.IOException;
import java.util.ArrayList;
@@ -50,17 +52,17 @@ public class PlaylistConverter {
var request = new Request.a()
.b(requestUrl)
.a("Accept-Encoding", "gzip")
.a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
try {
var response = CompletableFuture.supplyAsync(() -> {
try {
return new OkHttpClient().a(request).execute().a().g();
} catch (IOException e) {
throw new RuntimeException(e);
}
}
).get();
try (Response resp = new OkHttpClient().a(request).execute()) {
return GzipDecompressor.decompressResponse(resp);
} catch (IOException e) {
throw new RuntimeException(e);
}
}).get();
var jsonObj = new JSONObject(response);
if (!jsonObj.has("response"))
return null;
@@ -8,9 +8,11 @@ import java8.util.concurrent.CompletableFuture;
import okhttp3.Headers;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.json.JSONException;
import org.json.JSONObject;
import ru.vtosters.lite.utils.AndroidUtils;
import ru.vtosters.sponsorpost.utils.GzipDecompressor;
import java.io.IOException;
import java.util.ArrayList;
@@ -44,12 +46,13 @@ public class AudioGet {
var request = new Request.a()
.b(requestUrl)
.a("Accept-Encoding", "gzip")
.a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
try {
var response = CompletableFuture.supplyAsync(() -> {
try {
return new OkHttpClient().a(request).execute().a().g();
try (Response resp = new OkHttpClient().a(request).execute()) {
return GzipDecompressor.decompressResponse(resp);
} catch (IOException e) {
throw new RuntimeException(e);
}