kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 10:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

#1659 Autoload next video - use correct path for content and match on video content

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2020-04-20 17:03:17 +01:00
parent bfcb2e263e
commit 62d2ff3685
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
View File

@ -114,7 +114,8 @@ class ZimFileReader constructor(
valueOfJniStringAfter(jniKiwixReader::getRandomPage)
fun load(uri: String): InputStream? {
if (uri.matches(VIDEO_REGEX)) {
val extension = uri.substringAfterLast(".")
if (videoExtensions.any { it == extension }) {
try {
return loadVideo(uri)
} catch (ioException: IOException) {
@ -155,7 +156,7 @@ class ZimFileReader constructor(
return AssetFileDescriptor(
infoPair.parcelFileDescriptor,
infoPair.offset,
jniKiwixReader.getArticleSize(uri)
jniKiwixReader.getArticleSize(uri.filePath)
).createInputStream()
}
@ -171,7 +172,7 @@ class ZimFileReader constructor(
private fun getContent(url: String) = getContentAndMimeType(url).let { (content, _) -> content }
private fun streamZimContentToPipe(uri: String, outputStream: OutputStream) {
Completable.fromCallable {
Completable.fromAction {
try {
outputStream.use {
getContentAndMimeType(uri).let { (content: ByteArray, mimeType: String) ->
@ -245,7 +246,7 @@ class ZimFileReader constructor(
filter: invert(0);
}
""".trimIndent()
private val VIDEO_REGEX = Regex("([^\\s]+(\\.(?i)(3gp|mp4|m4a|webm|mkv|ogg|ogv))\$)")
private val videoExtensions = listOf("3gp", "mp4", "m4a", "webm", "mkv", "ogg", "ogv")
}
}