FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add jsonfeed parsing in LocalRSSDataSource

This commit is contained in:
Shinokuni 2020-09-16 13:57:45 +02:00
parent ca29c4acb0
commit 4b999e9fd6
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/androidTest/java/com/readrops/api/localfeed/LocalRSSDataSourceTest.kt
View File

@ -81,6 +81,20 @@ class LocalRSSDataSourceTest {
assertEquals(request.headers[LibUtils.LAST_MODIFIED_HEADER], "Last-Modified")
}
@Test
fun jsonFeedTest() {
val stream = context.resources.assets.open("localfeed/json/json_feed.json")
mockServer.enqueue(MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
.addHeader(LibUtils.CONTENT_TYPE_HEADER, "application/feed+json")
.setBody(Buffer().readFrom(stream)))
val pair = localRSSDataSource.queryRSSResource(url.toString(), null, true)!!
assertEquals(pair.first.name, "News from Flying Meat")
assertEquals(pair.second.size, 10)
}
@Test
fun response304Test() {
mockServer.enqueue(MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_MODIFIED))

23
api/src/main/java/com/readrops/api/localfeed/LocalRSSDataSource.kt
View File

@ -2,15 +2,20 @@ package com.readrops.api.localfeed
import android.accounts.NetworkErrorException
import androidx.annotation.WorkerThread
import com.readrops.api.localfeed.json.JSONFeedAdapter
import com.readrops.api.localfeed.json.JSONItemsAdapter
import com.readrops.api.utils.LibUtils
import com.readrops.api.utils.ParseException
import com.readrops.api.utils.UnknownFormatException
import com.readrops.db.entities.Feed
import com.readrops.db.entities.Item
import com.squareup.moshi.Moshi
import com.squareup.moshi.Types
import okhttp3.Headers
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import okio.Buffer
import java.io.ByteArrayInputStream
import java.io.IOException
import java.io.InputStream
@ -89,7 +94,12 @@ class LocalRSSDataSource(private val httpClient: OkHttpClient) {
adapter.fromXml(stream)
} else {
Feed()
val adapter = Moshi.Builder()
.add(JSONFeedAdapter())
.build()
.adapter<Feed>(Feed::class.java)
adapter.fromJson(Buffer().readFrom(stream))!!
}
feed.etag = response.header(LibUtils.ETAG_HEADER)
@ -98,13 +108,18 @@ class LocalRSSDataSource(private val httpClient: OkHttpClient) {
return feed
}
private fun parseItems(inputStream: InputStream, type: LocalRSSHelper.RSSType): List<Item> {
private fun parseItems(stream: InputStream, type: LocalRSSHelper.RSSType): List<Item> {
return if (type != LocalRSSHelper.RSSType.JSONFEED) {
val adapter = XmlAdapter.xmlItemsAdapterFactory(type)
adapter.fromXml(inputStream)
adapter.fromXml(stream)
} else {
listOf()
val adapter = Moshi.Builder()
.add(Types.newParameterizedType(MutableList::class.java, Item::class.java), JSONItemsAdapter())
.build()
.adapter<List<Item>>(Types.newParameterizedType(MutableList::class.java, Item::class.java))
adapter.fromJson(Buffer().readFrom(stream))!!
}
}
}