android/M3UAndroid
1
0
Fork 0
mirror of https://github.com/oxyroid/M3UAndroid.git synced 2025-05-18 03:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix connection timeout when add a large m3u playlist file (#216)

Browse Source
This commit is contained in:
tungnk123
2024-12-01 22:48:46 +07:00
committed by GitHub
parent 6cd34439d1
commit a0e774b244
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/com/m3u/core/util/Files.kt
View File

@ -4,6 +4,8 @@ import android.content.ContentResolver
import android.net.Uri import android.net.Uri
import android.provider.OpenableColumns import android.provider.OpenableColumns
import androidx.core.net.toFile import androidx.core.net.toFile
import java.io.File
import java.io.IOException
fun Uri.readFileName(resolver: ContentResolver): String? { fun Uri.readFileName(resolver: ContentResolver): String? {
return if (this == Uri.EMPTY) null return if (this == Uri.EMPTY) null
@ -32,4 +34,18 @@ fun Uri.readFileContent(resolver: ContentResolver): String? {
else -> null else -> null
} }
} }
fun Uri.copyToFile(resolver: ContentResolver, destinationFile: File): Boolean {
return try {
resolver.openInputStream(this)?.use { inputStream ->
destinationFile.outputStream().use { outputStream ->
inputStream.copyTo(outputStream)
}
}
true
} catch (e: IOException) {
e.printStackTrace()
false
}
}

14
data/src/main/java/com/m3u/data/repository/playlist/PlaylistRepositoryImpl.kt
View File

@ -16,7 +16,7 @@ import com.m3u.core.architecture.logger.sandBox
import com.m3u.core.architecture.preferences.PlaylistStrategy import com.m3u.core.architecture.preferences.PlaylistStrategy
import com.m3u.core.architecture.preferences.Preferences import com.m3u.core.architecture.preferences.Preferences
import com.m3u.core.util.basic.startsWithAny import com.m3u.core.util.basic.startsWithAny
import com.m3u.core.util.readFileContent import com.m3u.core.util.copyToFile
import com.m3u.core.util.readFileName import com.m3u.core.util.readFileName
import com.m3u.data.api.OkhttpClient import com.m3u.data.api.OkhttpClient
import com.m3u.data.database.dao.ChannelDao import com.m3u.data.database.dao.ChannelDao
@ -650,16 +650,20 @@ internal class PlaylistRepositoryImpl @Inject constructor(
return withContext(ioDispatcher) { return withContext(ioDispatcher) {
val contentResolver = context.contentResolver val contentResolver = context.contentResolver
val filename = uri.readFileName(contentResolver) ?: filenameWithTimezone val filename = uri.readFileName(contentResolver) ?: filenameWithTimezone
val content = uri.readFileContent(contentResolver).orEmpty() val destinationFile = File(context.filesDir, filename)
val file = File(context.filesDir, filename)
file.writeText(content)
val newUrl = Uri.decode(file.toUri().toString()) val success = uri.copyToFile(contentResolver, destinationFile)
if (!success) {
return@withContext this@actualUrl
}
val newUrl = Uri.decode(destinationFile.toUri().toString())
playlistDao.updateUrl(this@actualUrl, newUrl) playlistDao.updateUrl(this@actualUrl, newUrl)
newUrl newUrl
} }
} }
private fun openNetworkInput(url: String): InputStream? { private fun openNetworkInput(url: String): InputStream? {
val request = Request.Builder() val request = Request.Builder()
.url(url) .url(url)