mirror of
https://github.com/advplyr/audiobookshelf-app.git
synced 2026-08-28 14:17:19 +02:00
Reuse the existing ObjectMapper
This commit is contained in:
@@ -6,6 +6,7 @@ package com.audiobookshelf.app.data
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
|
||||||
import com.fasterxml.jackson.core.json.JsonReadFeature
|
import com.fasterxml.jackson.core.json.JsonReadFeature
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
||||||
import com.fasterxml.jackson.module.kotlin.readValue
|
import com.fasterxml.jackson.module.kotlin.readValue
|
||||||
import org.json.JSONObject
|
import org.json.JSONObject
|
||||||
@@ -18,8 +19,7 @@ data class ItemInProgress(
|
|||||||
val isLocal: Boolean
|
val isLocal: Boolean
|
||||||
) {
|
) {
|
||||||
companion object {
|
companion object {
|
||||||
fun makeFromServerObject(serverItem: JSONObject):ItemInProgress {
|
fun makeFromServerObject(serverItem: JSONObject, jacksonMapper: ObjectMapper):ItemInProgress {
|
||||||
val jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())
|
|
||||||
val libraryItem = jacksonMapper.readValue<LibraryItem>(serverItem.toString())
|
val libraryItem = jacksonMapper.readValue<LibraryItem>(serverItem.toString())
|
||||||
|
|
||||||
var episode:PodcastEpisode? = null
|
var episode:PodcastEpisode? = null
|
||||||
|
|||||||
@@ -334,8 +334,7 @@ class ApiHandler(var ctx:Context) {
|
|||||||
val array = it.getJSONArray("libraryItems")
|
val array = it.getJSONArray("libraryItems")
|
||||||
for (i in 0 until array.length()) {
|
for (i in 0 until array.length()) {
|
||||||
val jsobj = array.get(i) as JSONObject
|
val jsobj = array.get(i) as JSONObject
|
||||||
|
val itemInProgress = ItemInProgress.makeFromServerObject(jsobj, jacksonMapper)
|
||||||
val itemInProgress = ItemInProgress.makeFromServerObject(jsobj)
|
|
||||||
items.add(itemInProgress)
|
items.add(itemInProgress)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user