justinzeus/wolfskin
1
0
Fork 0
Code Issues 2 Pull requests Releases 3 Packages Activity

Consolidate sending media reports & app logs (#1936)

Browse source 
## Description
Consolidates sending reports/logs to the server into
`ServerReportService` (renamed from `MediaReportService`)

Also ensures a consistent header is used including the build flavor.

### Related issues
N/A

### Testing
Emulator

## Screenshots
N/A

## AI or LLM usage
None
This commit is contained in:
Damontecres 2026-09-05 12:11:38 -04:00 • committed by GitHub
parent 39239dd444
commit 1778bdb34c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 131 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

54
app/src/main/java/com/github/damontecres/wholphin/services/MediaReportService.kt → app/src/main/java/com/github/damontecres/wholphin/services/ServerReportService.kt
View file

@ -2,8 +2,10 @@ package com.github.damontecres.wholphin.services
import android.content.Context
import android.os.Build
import com.github.damontecres.wholphin.BuildConfig
import com.github.damontecres.wholphin.data.ServerRepository
import com.github.damontecres.wholphin.services.hilt.IoCoroutineScope
import com.github.damontecres.wholphin.ui.detail.DebugViewModel.Companion.getLogCatLines
import com.github.damontecres.wholphin.ui.launchIO
import com.github.damontecres.wholphin.ui.showToast
import com.github.damontecres.wholphin.util.ExceptionHandler
@ -23,10 +25,10 @@ import javax.inject.Inject
import javax.inject.Singleton
/**
* Send media info to the server
* Send reports to the server such as media info or app logs
*/
@Singleton
class MediaReportService
class ServerReportService
@Inject
constructor(
@param:ApplicationContext private val context: Context,
@ -46,17 +48,17 @@ class MediaReportService
/**
* Fetch the media info and send it to the server
*/
fun sendReportFor(itemId: UUID) {
fun sendMediaReportFor(itemId: UUID) {
ioScope.launchIO(ExceptionHandler(autoToast = true)) {
val item = api.userLibraryApi.getItem(itemId = itemId).content
sendReportFor(item)
sendMediaReportFor(item)
}
}
/**
* Send the media report for the given item
*/
suspend fun sendReportFor(item: BaseItemDto) {
suspend fun sendMediaReportFor(item: BaseItemDto) {
val sources =
item.mediaSources ?: api.userLibraryApi
.getItem(itemId = item.id)
@ -68,27 +70,43 @@ class MediaReportService
deviceProfileService.getOrCreateDeviceProfile(appPreferences, serverVersion)
val deviceProfileJson = json.encodeToString(deviceProfile)
val body =
"""
Send media info
serverVersion=$serverVersion
clientInfo=$clientInfo
deviceInfo=$deviceInfo
manufacturer=${Build.MANUFACTURER}
model=${Build.MODEL}
apiLevel=${Build.VERSION.SDK_INT}
buildLogHeader("Send media info") + "\n\n" +
"""
playbackPrefs=${appPreferences.playbackPreferences.toStringOneLine()}
playbackPrefs=${appPreferences.playbackPreferences.toStringOneLine()}
experimental=${appPreferences.experimentalPreferences.toStringOneLine()}
experimental=${appPreferences.experimentalPreferences.toStringOneLine()}
mediaSources=$sourcesJson
mediaSources=$sourcesJson
deviceProfile=$deviceProfileJson
""".trimIndent()
deviceProfile=$deviceProfileJson
""".trimIndent()
body.chunked(2048).forEach { Timber.w(it) }
Timber.w("End send media info")
val response by api.clientLogApi.logFile(body)
showToast(context, "Sent! Filename=${response.fileName}")
}
fun buildLogHeader(title: String): String {
val serverVersion = serverRepository.currentServer?.serverVersion
return """
$title
serverVersion=$serverVersion
clientInfo=$clientInfo
flavor=${BuildConfig.FLAVOR}
deviceInfo=$deviceInfo
manufacturer=${Build.MANUFACTURER}
model=${Build.MODEL}
apiLevel=${Build.VERSION.SDK_INT}
""".trimIndent()
}
suspend fun sendAppLogs() {
val logcat = getLogCatLines().joinToString("\n") { it.text }
val header = buildLogHeader("Send App Logs")
Timber.w(header)
val response by api.clientLogApi.logFile(header + "\n\n" + logcat)
showToast(context, "Sent! Filename=${response.fileName}")
}
}
private fun MessageLiteOrBuilder.toStringOneLine(): String = toString().replace("\n", ", ").replace("\t", " ")