mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-07-11 02:05:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source 
# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	core/common/src/main/kotlin/eu/kanade/tachiyomi/util/storage/SevenZUtil.kt
#	source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
This commit is contained in:
AbdallahMehiz
2024-02-03 17:00:15 +01:00
parent 9be2e514d9 170daf9fb2
commit 05797a2433
359 changed files with 2984 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source-local/build.gradle.kts
View File

@ -8,8 +8,8 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation(project(":source-api"))
api(project(":i18n"))
implementation(projects.sourceApi)
api(projects.i18n)
implementation(libs.unifile)
implementation(libs.junrar)
@ -18,11 +18,11 @@ kotlin {
}
val androidMain by getting {
dependencies {
implementation(project(":core"))
implementation(project(":core-metadata"))
implementation(projects.core.common)
implementation(projects.coreMetadata)
// Move ChapterRecognition to separate module?
implementation(project(":domain"))
implementation(projects.domain)
implementation(kotlinx.bundles.serialization)
}

14
source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
View File

@ -20,19 +20,19 @@ import kotlinx.serialization.json.decodeFromStream
import logcat.LogPriority
import nl.adaptivity.xmlutil.AndroidXmlReader
import nl.adaptivity.xmlutil.serialization.XML
import tachiyomi.core.common.i18n.stringResource
import org.apache.commons.compress.archivers.sevenz.SevenZFile
import tachiyomi.core.i18n.stringResource
import tachiyomi.core.metadata.comicinfo.COMIC_INFO_FILE
import tachiyomi.core.metadata.comicinfo.ComicInfo
import tachiyomi.core.metadata.comicinfo.copyFromComicInfo
import tachiyomi.core.metadata.comicinfo.getComicInfo
import tachiyomi.core.metadata.tachiyomi.MangaDetails
import tachiyomi.core.storage.UniFileTempFileManager
import tachiyomi.core.storage.extension
import tachiyomi.core.storage.nameWithoutExtension
import tachiyomi.core.util.lang.withIOContext
import tachiyomi.core.util.system.ImageUtil
import tachiyomi.core.util.system.logcat
import tachiyomi.core.common.storage.UniFileTempFileManager
import tachiyomi.core.common.storage.extension
import tachiyomi.core.common.storage.nameWithoutExtension
import tachiyomi.core.common.util.lang.withIOContext
import tachiyomi.core.common.util.system.ImageUtil
import tachiyomi.core.common.util.system.logcat
import tachiyomi.domain.chapter.service.ChapterRecognition
import tachiyomi.domain.manga.model.Manga
import tachiyomi.i18n.MR

2
source-local/src/androidMain/kotlin/tachiyomi/source/local/filter/OrderBy.kt
View File

@ -2,7 +2,7 @@ package tachiyomi.source.local.filter
import android.content.Context
import eu.kanade.tachiyomi.source.model.Filter
import tachiyomi.core.i18n.stringResource
import tachiyomi.core.common.i18n.stringResource
import tachiyomi.i18n.MR
sealed class OrderBy(context: Context, selection: Selection) : Filter.Sort(

4
source-local/src/androidMain/kotlin/tachiyomi/source/local/image/LocalCoverManager.kt
View File

@ -4,8 +4,8 @@ import android.content.Context
import com.hippo.unifile.UniFile
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.util.storage.DiskUtil
import tachiyomi.core.storage.nameWithoutExtension
import tachiyomi.core.util.system.ImageUtil
import tachiyomi.core.common.storage.nameWithoutExtension
import tachiyomi.core.common.util.system.ImageUtil
import tachiyomi.source.local.io.LocalSourceFileSystem
import java.io.InputStream

2
source-local/src/commonMain/kotlin/tachiyomi/source/local/io/Archive.kt
View File

@ -1,7 +1,7 @@
package tachiyomi.source.local.io
import com.hippo.unifile.UniFile
import tachiyomi.core.storage.extension
import tachiyomi.core.common.storage.extension
object Archive {

2
source-local/src/commonMain/kotlin/tachiyomi/source/local/io/Format.kt
View File

@ -1,7 +1,7 @@
package tachiyomi.source.local.io
import com.hippo.unifile.UniFile
import tachiyomi.core.storage.extension
import tachiyomi.core.common.storage.extension
sealed interface Format {
data class Directory(val file: UniFile) : Format