third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-05-03 17:11:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #653 from ultrasonic/draft/okhttp

Browse Source 
Update OkHttp to 4.9.1
This commit is contained in:
Nite 2022-03-21 19:07:50 +01:00 committed by GitHub
commit cf7cef9831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt
View File

@ -8,7 +8,8 @@ import java.util.Locale
import java.util.TimeZone import java.util.TimeZone
import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.MockWebServer import okhttp3.mockwebserver.MockWebServer
import okio.Okio import okio.buffer
import okio.source
import org.amshove.kluent.`should be` import org.amshove.kluent.`should be`
import org.amshove.kluent.`should contain` import org.amshove.kluent.`should contain`
import org.amshove.kluent.`should not be` import org.amshove.kluent.`should not be`
@ -40,12 +41,12 @@ fun MockWebServer.enqueueResponse(resourceName: String) {
} }
fun Any.loadJsonResponse(name: String): String { fun Any.loadJsonResponse(name: String): String {
val source = Okio.buffer(Okio.source(javaClass.classLoader.getResourceAsStream(name))) val source = javaClass.classLoader.getResourceAsStream(name)!!.source().buffer()
return source.readString(Charset.forName("UTF-8")) return source.readString(Charset.forName("UTF-8"))
} }
fun Any.loadResourceStream(name: String): InputStream { fun Any.loadResourceStream(name: String): InputStream {
val source = Okio.buffer(Okio.source(javaClass.classLoader.getResourceAsStream(name))) val source = javaClass.classLoader.getResourceAsStream(name)!!.source().buffer()
return source.inputStream() return source.inputStream()
} }

6
core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/Extensions.kt
View File

@ -17,8 +17,8 @@ fun Response<out ResponseBody>.toStreamResponse(): StreamResponse {
val contentType = responseBody?.contentType() val contentType = responseBody?.contentType()
if ( if (
contentType != null && contentType != null &&
contentType.type().equals("application", true) && contentType.type.equals("application", true) &&
contentType.subtype().equals("json", true) contentType.subtype.equals("json", true)
) { ) {
val error = SubsonicAPIClient.jacksonMapper.readValue<SubsonicResponse>( val error = SubsonicAPIClient.jacksonMapper.readValue<SubsonicResponse>(
responseBody.byteStream() responseBody.byteStream()
@ -40,7 +40,7 @@ fun Response<out ResponseBody>.toStreamResponse(): StreamResponse {
* It creates Exceptions from the results returned by the Subsonic API * It creates Exceptions from the results returned by the Subsonic API
*/ */
@Suppress("ThrowsCount") @Suppress("ThrowsCount")
fun <T : SubsonicResponse> Response<out T>.throwOnFailure(): Response<out T> { fun <T : SubsonicResponse> Response<T>.throwOnFailure(): Response<T> {
val response = this val response = this
if (response.isSuccessful && response.body()!!.status === SubsonicResponse.Status.OK) { if (response.isSuccessful && response.body()!!.status === SubsonicResponse.Status.OK) {

2
core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt
View File

@ -68,7 +68,7 @@ class SubsonicAPIClient(
.addInterceptor { chain -> .addInterceptor { chain ->
// Adds default request params // Adds default request params
val originalRequest = chain.request() val originalRequest = chain.request()
val newUrl = originalRequest.url().newBuilder() val newUrl = originalRequest.url.newBuilder()
.addQueryParameter("u", config.username) .addQueryParameter("u", config.username)
.addQueryParameter("c", config.clientID) .addQueryParameter("c", config.clientID)
.addQueryParameter("f", "json") .addQueryParameter("f", "json")

2
core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordHexInterceptor.kt
View File

@ -18,7 +18,7 @@ class PasswordHexInterceptor(private val password: String) : Interceptor {
override fun intercept(chain: Chain): Response { override fun intercept(chain: Chain): Response {
val originalRequest = chain.request() val originalRequest = chain.request()
val updatedUrl = originalRequest.url().newBuilder() val updatedUrl = originalRequest.url.newBuilder()
.addEncodedQueryParameter("p", passwordHex).build() .addEncodedQueryParameter("p", passwordHex).build()
return chain.proceed(originalRequest.newBuilder().url(updatedUrl).build()) return chain.proceed(originalRequest.newBuilder().url(updatedUrl).build())
} }

2
core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt
View File

@ -21,7 +21,7 @@ class PasswordMD5Interceptor(private val password: String) : Interceptor {
override fun intercept(chain: Chain): Response { override fun intercept(chain: Chain): Response {
val originalRequest = chain.request() val originalRequest = chain.request()
val salt = getSalt() val salt = getSalt()
val updatedUrl = originalRequest.url().newBuilder() val updatedUrl = originalRequest.url.newBuilder()
.addQueryParameter("t", getPasswordMD5Hash(salt)) .addQueryParameter("t", getPasswordMD5Hash(salt))
.addQueryParameter("s", salt) .addQueryParameter("s", salt)
.build() .build()

2
core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt
View File

@ -19,7 +19,7 @@ internal const val TIMEOUT_MILLIS_PER_OFFSET_BYTE = 0.02
internal class RangeHeaderInterceptor : Interceptor { internal class RangeHeaderInterceptor : Interceptor {
override fun intercept(chain: Chain): Response { override fun intercept(chain: Chain): Response {
val originalRequest = chain.request() val originalRequest = chain.request()
val headers = originalRequest.headers() val headers = originalRequest.headers
return if (headers.names().contains("Range")) { return if (headers.names().contains("Range")) {
val offsetValue = headers["Range"] ?: "0" val offsetValue = headers["Range"] ?: "0"
val offset = "bytes=$offsetValue-" val offset = "bytes=$offsetValue-"

2
core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptor.kt
View File

@ -18,7 +18,7 @@ internal class VersionInterceptor(
val newRequest = originalRequest.newBuilder() val newRequest = originalRequest.newBuilder()
.url( .url(
originalRequest originalRequest
.url() .url
.newBuilder() .newBuilder()
.addQueryParameter("v", protocolVersion.restApiVersion) .addQueryParameter("v", protocolVersion.restApiVersion)
.build() .build()

6
gradle/libs.versions.toml
View File

@ -22,9 +22,9 @@ kotlin = "1.6.10"
kotlinxCoroutines = "1.6.0-native-mt" kotlinxCoroutines = "1.6.0-native-mt"
viewModelKtx = "2.3.0" viewModelKtx = "2.3.0"
retrofit = "2.6.4" retrofit = "2.9.0"
jackson = "2.9.5" jackson = "2.10.1"
okhttp = "3.12.13" okhttp = "4.9.1"
koin = "3.0.2" koin = "3.0.2"
picasso = "2.71828" picasso = "2.71828"

4
ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/AvatarRequestHandler.kt
View File

@ -4,7 +4,7 @@ import com.squareup.picasso.Picasso
import com.squareup.picasso.Request import com.squareup.picasso.Request
import com.squareup.picasso.RequestHandler import com.squareup.picasso.RequestHandler
import java.io.IOException import java.io.IOException
import okio.Okio import okio.source
import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient
/** /**
@ -29,7 +29,7 @@ class AvatarRequestHandler(
if (response.hasError() || response.stream == null) { if (response.hasError() || response.stream == null) {
throw IOException("${response.apiError}") throw IOException("${response.apiError}")
} else { } else {
return Result(Okio.source(response.stream!!), Picasso.LoadedFrom.NETWORK) return Result(response.stream!!.source(), Picasso.LoadedFrom.NETWORK)
} }
} }
} }

4
ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandler.kt
View File

@ -5,7 +5,7 @@ import com.squareup.picasso.Picasso.LoadedFrom.NETWORK
import com.squareup.picasso.Request import com.squareup.picasso.Request
import com.squareup.picasso.RequestHandler import com.squareup.picasso.RequestHandler
import java.io.IOException import java.io.IOException
import okio.Okio import okio.source
import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient
import org.moire.ultrasonic.api.subsonic.toStreamResponse import org.moire.ultrasonic.api.subsonic.toStreamResponse
import org.moire.ultrasonic.util.FileUtil.SUFFIX_LARGE import org.moire.ultrasonic.util.FileUtil.SUFFIX_LARGE
@ -44,7 +44,7 @@ class CoverArtRequestHandler(private val client: SubsonicAPIClient) : RequestHan
// Handle the response // Handle the response
if (!response.hasError() && response.stream != null) { if (!response.hasError() && response.stream != null) {
return Result(Okio.source(response.stream!!), NETWORK) return Result(response.stream!!.source(), NETWORK)
} }
// Throw an error if still not successful // Throw an error if still not successful

14
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
View File

@ -10,12 +10,11 @@ import java.io.IOException
import java.io.InputStream import java.io.InputStream
import okhttp3.Protocol import okhttp3.Protocol
import okhttp3.Response import okhttp3.Response
import okhttp3.ResponseBody import okhttp3.ResponseBody.Companion.toResponseBody
import org.moire.ultrasonic.api.subsonic.ApiNotSupportedException import org.moire.ultrasonic.api.subsonic.ApiNotSupportedException
import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient
import org.moire.ultrasonic.api.subsonic.models.AlbumListType.Companion.fromName import org.moire.ultrasonic.api.subsonic.models.AlbumListType.Companion.fromName
import org.moire.ultrasonic.api.subsonic.models.JukeboxAction import org.moire.ultrasonic.api.subsonic.models.JukeboxAction
import org.moire.ultrasonic.api.subsonic.response.StreamResponse
import org.moire.ultrasonic.api.subsonic.throwOnFailure import org.moire.ultrasonic.api.subsonic.throwOnFailure
import org.moire.ultrasonic.api.subsonic.toStreamResponse import org.moire.ultrasonic.api.subsonic.toStreamResponse
import org.moire.ultrasonic.data.ActiveServerProvider import org.moire.ultrasonic.data.ActiveServerProvider
@ -425,14 +424,13 @@ open class RESTMusicService(
save: Boolean save: Boolean
): Pair<InputStream, Boolean> { ): Pair<InputStream, Boolean> {
val songOffset = if (offset < 0) 0 else offset val songOffset = if (offset < 0) 0 else offset
lateinit var response: StreamResponse
// Use semantically correct call // Use semantically correct call
if (save) { val response = if (save) {
response = API.download(song.id, maxBitrate, offset = songOffset) API.download(song.id, maxBitrate, offset = songOffset)
.execute().toStreamResponse() .execute().toStreamResponse()
} else { } else {
response = API.stream(song.id, maxBitrate, offset = songOffset) API.stream(song.id, maxBitrate, offset = songOffset)
.execute().toStreamResponse() .execute().toStreamResponse()
} }
@ -463,7 +461,7 @@ open class RESTMusicService(
// Returns a dummy response // Returns a dummy response
Response.Builder() Response.Builder()
.code(100) .code(100)
.body(ResponseBody.create(null, "")) .body("".toResponseBody(null))
.protocol(Protocol.HTTP_2) .protocol(Protocol.HTTP_2)
.message("Empty response") .message("Empty response")
.request(chain.request()) .request(chain.request())
@ -480,7 +478,7 @@ open class RESTMusicService(
val response = client.newCall(request).execute() val response = client.newCall(request).execute()
// The complete url :) // The complete url :)
val url = response.request().url() val url = response.request.url
return url.toString() return url.toString()
} }

5
ultrasonic/src/test/kotlin/org/moire/ultrasonic/imageloader/CommonFunctions.kt
View File

@ -1,9 +1,10 @@
package org.moire.ultrasonic.imageloader package org.moire.ultrasonic.imageloader
import java.io.InputStream import java.io.InputStream
import okio.Okio import okio.buffer
import okio.source
fun Any.loadResourceStream(name: String): InputStream { fun Any.loadResourceStream(name: String): InputStream {
val source = Okio.buffer(Okio.source(javaClass.classLoader!!.getResourceAsStream(name))) val source = javaClass.classLoader!!.getResourceAsStream(name).source().buffer()
return source.inputStream() return source.inputStream()
} }