DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup in ImageUtil and SourceFilterPresenter (#7106)

Browse Source 
* Minor cleanup in `ImageUtil` and `SourceFilterPresenter`

* Fix missed stuff
This commit is contained in:
FourTOne5 2022-05-14 21:34:15 +06:00 committed by GitHub
parent 6d011ebe32
commit 71bb8ed975
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
View File

@ -392,7 +392,10 @@ class Downloader(
return pageObservable
// When the page is ready, set page path, progress (just in case) and status
.doOnNext { file ->
splitTallImageIfNeeded(page, tmpDir)
val success = splitTallImageIfNeeded(page, tmpDir)
if (success.not()) {
notifier.onError(context.getString(R.string.download_notifier_split_failed), download.chapter.name, download.manga.title)
}
page.uri = file.uri
page.progress = 100
download.downloadedImages++
@ -477,8 +480,8 @@ class Downloader(
return MimeTypeMap.getSingleton().getExtensionFromMimeType(mime) ?: "jpg"
}
private fun splitTallImageIfNeeded(page: Page, tmpDir: UniFile) {
if (!preferences.splitTallImages().get()) return
private fun splitTallImageIfNeeded(page: Page, tmpDir: UniFile): Boolean {
if (!preferences.splitTallImages().get()) return true
val filename = String.format("%03d", page.number)
val imageFile = tmpDir.listFiles()?.find { it.name!!.startsWith(filename) }
@ -487,8 +490,9 @@ class Downloader(
?: throw Error(context.getString(R.string.download_notifier_split_page_path_not_found, page.number))
// check if the original page was previously splitted before then skip.
if (imageFile.name!!.contains("__")) return
ImageUtil.splitTallImage(imageFile, imageFilePath)
if (imageFile.name!!.contains("__")) return true
return ImageUtil.splitTallImage(imageFile, imageFilePath)
}
/**

10
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterPresenter.kt
View File

@ -33,15 +33,12 @@ class SourceFilterPresenter(
.catch { exception ->
_state.value = SourceFilterState.Error(exception)
}
.collectLatest { sourceLangMap ->
val uiModels = sourceLangMap.toFilterUiModels()
_state.value = SourceFilterState.Success(uiModels)
}
.collectLatest(::collectLatestSourceLangMap)
}
}
private fun Map<String, List<Source>>.toFilterUiModels(): List<FilterUiModel> {
return this.flatMap {
private fun collectLatestSourceLangMap(sourceLangMap: Map<String, List<Source>>) {
val uiModels = sourceLangMap.flatMap {
val isLangEnabled = it.key in preferences.enabledLanguages().get()
val header = listOf(FilterUiModel.Header(it.key, isLangEnabled))
@ -53,6 +50,7 @@ class SourceFilterPresenter(
)
}
}
_state.value = SourceFilterState.Success(uiModels)
}
fun toggleSource(source: Source) {

22
app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
View File

@ -19,6 +19,7 @@ import androidx.core.graphics.createBitmap
import androidx.core.graphics.green
import androidx.core.graphics.red
import com.hippo.unifile.UniFile
import logcat.LogPriority
import tachiyomi.decoder.Format
import tachiyomi.decoder.ImageDecoder
import java.io.BufferedInputStream
@ -182,7 +183,7 @@ object ImageUtil {
*
* @return true if the height:width ratio is greater than 3.
*/
fun isTallImage(imageStream: InputStream): Boolean {
private fun isTallImage(imageStream: InputStream): Boolean {
val options = extractImageOptions(imageStream, false)
return (options.outHeight / options.outWidth) > 3
}
@ -190,9 +191,9 @@ object ImageUtil {
/**
* Splits tall images to improve performance of reader
*/
fun splitTallImage(imageFile: UniFile, imageFilePath: String) {
fun splitTallImage(imageFile: UniFile, imageFilePath: String): Boolean {
if (isAnimatedAndSupported(imageFile.openInputStream()) || !isTallImage(imageFile.openInputStream())) {
return
return true
}
val options = extractImageOptions(imageFile.openInputStream(), false).apply { inJustDecodeBounds = false }
@ -213,6 +214,11 @@ object ImageUtil {
BitmapRegionDecoder.newInstance(imageFile.openInputStream(), false)
}
if (bitmapRegionDecoder == null) {
logcat { "Failed to create new instance of BitmapRegionDecoder" }
return false
}
try {
(0 until partCount).forEach { splitIndex ->
val splitPath = imageFilePath.substringBeforeLast(".") + "__${"%03d".format(splitIndex + 1)}.jpg"
@ -225,19 +231,21 @@ object ImageUtil {
val region = Rect(0, topOffset, imageWidth, bottomOffset)
FileOutputStream(splitPath).use { outputStream ->
val splitBitmap = bitmapRegionDecoder!!.decodeRegion(region, options)
val splitBitmap = bitmapRegionDecoder.decodeRegion(region, options)
splitBitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream)
}
}
imageFile.delete()
return true
} catch (e: Exception) {
// Image splits were not successfully saved so delete them and keep the original image
(0 until partCount)
.map { imageFile.filePath!!.substringBeforeLast(".") + "__${"%03d".format(it + 1)}.jpg" }
.map { imageFilePath.substringBeforeLast(".") + "__${"%03d".format(it + 1)}.jpg" }
.forEach { File(it).delete() }
throw e
logcat(LogPriority.ERROR, e)
return false
} finally {
bitmapRegionDecoder?.recycle()
bitmapRegionDecoder.recycle()
}
}

1
app/src/main/res/values/strings.xml
View File

@ -820,6 +820,7 @@
<string name="download_notifier_download_finish">Download completed</string>
<string name="download_notifier_split_page_not_found">Page %d not found while splitting</string>
<string name="download_notifier_split_page_path_not_found">Couldn\'t find file path of page %d</string>
<string name="download_notifier_split_failed">Couldn\'t split downloaded image</string>
<!-- Notification channels -->
<string name="channel_common">Common</string>