github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor cleanup

Browse source
This commit is contained in:
arkon 2022-05-24 18:16:07 -04:00
parent ad17eb1386
commit 87661eb85a
5 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupTracking.kt
View file

@ -12,7 +12,8 @@ data class BackupTracking(
@ProtoNumber(1) var syncId: Int, @ProtoNumber(1) var syncId: Int,
// LibraryId is not null in 1.x // LibraryId is not null in 1.x
@ProtoNumber(2) var libraryId: Long, @ProtoNumber(2) var libraryId: Long,
@Deprecated("Use mediaId instead", level = DeprecationLevel.WARNING) @ProtoNumber(3) var mediaIdInt: Int = 0, @Deprecated("Use mediaId instead", level = DeprecationLevel.WARNING) @ProtoNumber(3)
var mediaIdInt: Int = 0,
// trackingUrl is called mediaUrl in 1.x // trackingUrl is called mediaUrl in 1.x
@ProtoNumber(4) var trackingUrl: String = "", @ProtoNumber(4) var trackingUrl: String = "",
@ProtoNumber(5) var title: String = "", @ProtoNumber(5) var title: String = "",

12
app/src/main/java/eu/kanade/tachiyomi/data/database/models/TrackImpl.kt
View file

@ -30,19 +30,21 @@ class TrackImpl : Track {
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
if (this === other) return true if (this === other) return true
if (other == null || javaClass != other.javaClass) return false if (javaClass != other?.javaClass) return false
other as Track other as TrackImpl
if (manga_id != other.manga_id) return false if (manga_id != other.manga_id) return false
if (sync_id != other.sync_id) return false if (sync_id != other.sync_id) return false
return media_id == other.media_id if (media_id != other.media_id) return false
return true
} }
override fun hashCode(): Int { override fun hashCode(): Int {
var result = (manga_id xor manga_id.ushr(32)).toInt() var result = manga_id.hashCode()
result = 31 * result + sync_id result = 31 * result + sync_id
result = 31 * result + media_id.toInt() result = 31 * result + media_id.hashCode()
return result return result
} }
} }

4
app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt
View file

@ -34,11 +34,11 @@ class MangaUpdatesApi(
interceptor: MangaUpdatesInterceptor, interceptor: MangaUpdatesInterceptor,
private val client: OkHttpClient, private val client: OkHttpClient,
) { ) {
private val json: Json by injectLazy()
private val baseUrl = "https://api.mangaupdates.com" private val baseUrl = "https://api.mangaupdates.com"
private val contentType = "application/vnd.api+json".toMediaType() private val contentType = "application/vnd.api+json".toMediaType()
private val json by injectLazy<Json>()
private val authClient by lazy { private val authClient by lazy {
client.newBuilder() client.newBuilder()
.addInterceptor(interceptor) .addInterceptor(interceptor)

12
app/src/main/java/eu/kanade/tachiyomi/data/track/model/TrackSearch.kt
View file

@ -42,19 +42,21 @@ class TrackSearch : Track {
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
if (this === other) return true if (this === other) return true
if (other == null || javaClass != other.javaClass) return false if (javaClass != other?.javaClass) return false
other as Track other as TrackSearch
if (manga_id != other.manga_id) return false if (manga_id != other.manga_id) return false
if (sync_id != other.sync_id) return false if (sync_id != other.sync_id) return false
return media_id == other.media_id if (media_id != other.media_id) return false
return true
} }
override fun hashCode(): Int { override fun hashCode(): Int {
var result = (manga_id xor manga_id.ushr(32)).toInt() var result = manga_id.hashCode()
result = 31 * result + sync_id result = 31 * result + sync_id
result = 31 * result + media_id.toInt() result = 31 * result + media_id.hashCode()
return result return result
} }

4
app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
View file

@ -1,7 +1,6 @@
package eu.kanade.tachiyomi.source package eu.kanade.tachiyomi.source
import android.content.Context import android.content.Context
import androidx.core.net.toUri
import com.github.junrar.Archive import com.github.junrar.Archive
import com.hippo.unifile.UniFile import com.hippo.unifile.UniFile
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
@ -20,7 +19,6 @@ import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.storage.DiskUtil
import eu.kanade.tachiyomi.util.storage.EpubFile import eu.kanade.tachiyomi.util.storage.EpubFile
import eu.kanade.tachiyomi.util.system.ImageUtil import eu.kanade.tachiyomi.util.system.ImageUtil
import eu.kanade.tachiyomi.util.system.logcat
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonObject
@ -29,7 +27,6 @@ import kotlinx.serialization.json.decodeFromStream
import kotlinx.serialization.json.intOrNull import kotlinx.serialization.json.intOrNull
import kotlinx.serialization.json.jsonArray import kotlinx.serialization.json.jsonArray
import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.jsonPrimitive
import logcat.LogPriority
import rx.Observable import rx.Observable
import tachiyomi.source.model.ChapterInfo import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo import tachiyomi.source.model.MangaInfo
@ -359,7 +356,6 @@ class LocalSource(
var coverFile = getCoverFile(manga.url, baseDirsFiles) var coverFile = getCoverFile(manga.url, baseDirsFiles)
if (coverFile == null) { if (coverFile == null) {
coverFile = File(mangaDir.absolutePath, DEFAULT_COVER_NAME) coverFile = File(mangaDir.absolutePath, DEFAULT_COVER_NAME)
} }
// It might not exist at this point // It might not exist at this point