Minor cleanup

2022-11-10 22:23:34 -05:00
parent 08d5633d81
commit 811931ccc0
19 changed files with 120 additions and 146 deletions
@@ -4,6 +4,7 @@ import eu.kanade.domain.track.service.TrackPreferences
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import kotlinx.serialization.Serializable
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -72,6 +73,16 @@ data class ALUserManga(
    }
 }

+@Serializable
+data class OAuth(
+    val access_token: String,
+    val token_type: String,
+    val expires: Long,
+    val expires_in: Long,
+)
+
+fun OAuth.isExpired() = System.currentTimeMillis() > expires
+
 fun Track.toAnilistStatus() = when (status) {
    Anilist.READING -> "CURRENT"
    Anilist.COMPLETED -> "COMPLETED"
@@ -1,14 +0,0 @@
-package eu.kanade.tachiyomi.data.track.anilist
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class OAuth(
-    val access_token: String,
-    val token_type: String,
-    val expires: Long,
-    val expires_in: Long,
-) {
-
-    fun isExpired() = System.currentTimeMillis() > expires
-}
@@ -1,10 +0,0 @@
-package eu.kanade.tachiyomi.data.track.bangumi
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Avatar(
-    val large: String? = "",
-    val medium: String? = "",
-    val small: String? = "",
-)
@@ -1,6 +1,58 @@
 package eu.kanade.tachiyomi.data.track.bangumi

 import eu.kanade.tachiyomi.data.database.models.Track
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Avatar(
+    val large: String? = "",
+    val medium: String? = "",
+    val small: String? = "",
+)
+
+@Serializable
+data class Collection(
+    val `private`: Int? = 0,
+    val comment: String? = "",
+    val ep_status: Int? = 0,
+    val lasttouch: Int? = 0,
+    val rating: Float? = 0f,
+    val status: Status? = Status(),
+    val tag: List<String?>? = emptyList(),
+    val user: User? = User(),
+    val vol_status: Int? = 0,
+)
+
+@Serializable
+data class Status(
+    val id: Int? = 0,
+    val name: String? = "",
+    val type: String? = "",
+)
+
+@Serializable
+data class User(
+    val avatar: Avatar? = Avatar(),
+    val id: Int? = 0,
+    val nickname: String? = "",
+    val sign: String? = "",
+    val url: String? = "",
+    val usergroup: Int? = 0,
+    val username: String? = "",
+)
+
+@Serializable
+data class OAuth(
+    val access_token: String,
+    val token_type: String,
+    val created_at: Long = System.currentTimeMillis() / 1000,
+    val expires_in: Long,
+    val refresh_token: String?,
+    val user_id: Long?,
+)
+
+// Access token refresh before expired
+fun OAuth.isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)

 fun Track.toBangumiStatus() = when (status) {
    Bangumi.READING -> "do"
@@ -1,16 +0,0 @@
-package eu.kanade.tachiyomi.data.track.bangumi
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Collection(
-    val `private`: Int? = 0,
-    val comment: String? = "",
-    val ep_status: Int? = 0,
-    val lasttouch: Int? = 0,
-    val rating: Float? = 0f,
-    val status: Status? = Status(),
-    val tag: List<String?>? = listOf(),
-    val user: User? = User(),
-    val vol_status: Int? = 0,
-)
@@ -1,17 +0,0 @@
-package eu.kanade.tachiyomi.data.track.bangumi
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class OAuth(
-    val access_token: String,
-    val token_type: String,
-    val created_at: Long = System.currentTimeMillis() / 1000,
-    val expires_in: Long,
-    val refresh_token: String?,
-    val user_id: Long?,
-) {
-
-    // Access token refresh before expired
-    fun isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)
-}
@@ -1,10 +0,0 @@
-package eu.kanade.tachiyomi.data.track.bangumi
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Status(
-    val id: Int? = 0,
-    val name: String? = "",
-    val type: String? = "",
-)
@@ -1,14 +0,0 @@
-package eu.kanade.tachiyomi.data.track.bangumi
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class User(
-    val avatar: Avatar? = Avatar(),
-    val id: Int? = 0,
-    val nickname: String? = "",
-    val sign: String? = "",
-    val url: String? = "",
-    val usergroup: Int? = 0,
-    val username: String? = "",
-)
@@ -4,6 +4,7 @@ import androidx.annotation.CallSuper
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.int
@@ -93,6 +94,17 @@ class KitsuLibManga(obj: JsonObject, manga: JsonObject) {
    }
 }

+@Serializable
+data class OAuth(
+    val access_token: String,
+    val token_type: String,
+    val created_at: Long,
+    val expires_in: Long,
+    val refresh_token: String?,
+)
+
+fun OAuth.isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)
+
 fun Track.toKitsuStatus() = when (status) {
    Kitsu.READING -> "current"
    Kitsu.COMPLETED -> "completed"
@@ -1,15 +0,0 @@
-package eu.kanade.tachiyomi.data.track.kitsu
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class OAuth(
-    val access_token: String,
-    val token_type: String,
-    val created_at: Long,
-    val expires_in: Long,
-    val refresh_token: String?,
-) {
-
-    fun isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)
-}
@@ -1,6 +1,18 @@
 package eu.kanade.tachiyomi.data.track.myanimelist

 import eu.kanade.tachiyomi.data.database.models.Track
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class OAuth(
+    val refresh_token: String,
+    val access_token: String,
+    val token_type: String,
+    val created_at: Long = System.currentTimeMillis(),
+    val expires_in: Long,
+)
+
+fun OAuth.isExpired() = System.currentTimeMillis() > created_at + (expires_in * 1000)

 fun Track.toMyAnimeListStatus() = when (status) {
    MyAnimeList.READING -> "reading"
@@ -1,15 +0,0 @@
-package eu.kanade.tachiyomi.data.track.myanimelist
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class OAuth(
-    val refresh_token: String,
-    val access_token: String,
-    val token_type: String,
-    val created_at: Long = System.currentTimeMillis(),
-    val expires_in: Long,
-) {
-
-    fun isExpired() = System.currentTimeMillis() > created_at + (expires_in * 1000)
-}
@@ -1,16 +0,0 @@
-package eu.kanade.tachiyomi.data.track.shikimori
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class OAuth(
-    val access_token: String,
-    val token_type: String,
-    val created_at: Long,
-    val expires_in: Long,
-    val refresh_token: String?,
-) {
-
-    // Access token lives 1 day
-    fun isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)
-}
@@ -1,6 +1,19 @@
 package eu.kanade.tachiyomi.data.track.shikimori

 import eu.kanade.tachiyomi.data.database.models.Track
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class OAuth(
+    val access_token: String,
+    val token_type: String,
+    val created_at: Long,
+    val expires_in: Long,
+    val refresh_token: String?,
+)
+
+// Access token lives 1 day
+fun OAuth.isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)

 fun Track.toShikimoriStatus() = when (status) {
    Shikimori.READING -> "watching"