Merge pull request #132 from kl3jvi/new_parser_impl

fixed anime sync
kl3jvi · Aug 16, 2023 · 4a181b7 · 4a181b7
2 parents 3eaed4d + aac4ce0
commit 4a181b7
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 48 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.kl3jvi.animity"
         minSdk 21
         targetSdk 33
-        versionCode 16
-        versionName "1.1.6"
+        versionCode 17
+        versionName "1.1.7"
         archivesBaseName = "Animity-v$versionName"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,9 +11,9 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 16,
-      "versionName": "1.1.5",
-      "outputFile": "Animity-v1.1.5-universal-release.apk"
+      "versionCode": 17,
+      "versionName": "1.1.7",
+      "outputFile": "Animity-v1.1.7-universal-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -24,35 +24,35 @@
         }
       ],
       "attributes": [],
-      "versionCode": 16,
-      "versionName": "1.1.5",
-      "outputFile": "Animity-v1.1.5-armeabi-v7a-release.apk"
+      "versionCode": 17,
+      "versionName": "1.1.7",
+      "outputFile": "Animity-v1.1.7-armeabi-v7a-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "x86"
         }
       ],
       "attributes": [],
-      "versionCode": 16,
-      "versionName": "1.1.5",
-      "outputFile": "Animity-v1.1.5-arm64-v8a-release.apk"
+      "versionCode": 17,
+      "versionName": "1.1.7",
+      "outputFile": "Animity-v1.1.7-x86-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
-      "versionCode": 16,
-      "versionName": "1.1.5",
-      "outputFile": "Animity-v1.1.5-x86-release.apk"
+      "versionCode": 17,
+      "versionName": "1.1.7",
+      "outputFile": "Animity-v1.1.7-arm64-v8a-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -63,9 +63,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 16,
-      "versionName": "1.1.5",
-      "outputFile": "Animity-v1.1.5-x86_64-release.apk"
+      "versionCode": 17,
+      "versionName": "1.1.7",
+      "outputFile": "Animity-v1.1.7-x86_64-release.apk"
     }
   ],
   "elementType": "File"

diff --git a/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/DetailedAnimeInfo.kt b/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/DetailedAnimeInfo.kt
@@ -3,7 +3,7 @@ package com.kl3jvi.animity.data.model.ui_models
 import com.google.gson.annotations.SerializedName
 
 data class DetailedAnimeInfo(
-    @SerializedName("Pages")
+    @SerializedName("Sites")
     val pages: Pages?
 )
 

diff --git a/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/MalSyncResponse.kt b/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/MalSyncResponse.kt
@@ -0,0 +1,29 @@
+package com.kl3jvi.animity.data.model.ui_models
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class MalSyncResponse(
+    @SerialName("aniId")
+    val aniId: Int,
+    @SerialName("aniUrl")
+    val aniUrl: String,
+    @SerialName("identifier")
+    val identifier: String,
+    @SerialName("image")
+    val image: String,
+    @SerialName("malId")
+    val malId: Int,
+    @SerialName("malUrl")
+    val malUrl: String,
+    @SerialName("page")
+    val page: String,
+    @SerialName("title")
+    val title: String,
+    @SerialName("type")
+    val type: String,
+    @SerialName("url")
+    val url: String
+)
diff --git a/app/src/main/java/com/kl3jvi/animity/data/network/anime_service/gogo/GogoAnimeApiClient.kt b/app/src/main/java/com/kl3jvi/animity/data/network/anime_service/gogo/GogoAnimeApiClient.kt
@@ -121,7 +121,7 @@ class GogoAnimeApiClient @Inject constructor(
     ) = (animeService as GogoAnimeService).fetchM3u8PreProcessor(header, url)
 
     suspend fun getGogoUrlFromAniListId(id: Int) =
-        (animeService as GogoAnimeService).getGogoUrlFromAniListId(id)
+        (animeService as GogoAnimeService).getGoGoDetailedUrl(id)
 
     companion object {
         val keysAndIv: Keys = Keys(

diff --git a/app/src/main/java/com/kl3jvi/animity/data/network/anime_service/gogo/GogoAnimeService.kt b/app/src/main/java/com/kl3jvi/animity/data/network/anime_service/gogo/GogoAnimeService.kt
@@ -3,6 +3,7 @@ package com.kl3jvi.animity.data.network.anime_service.gogo
 import com.kl3jvi.animity.data.model.ui_models.DetailedAnimeInfo
 import com.kl3jvi.animity.data.model.ui_models.EpisodeWithTitle
 import com.kl3jvi.animity.data.model.ui_models.GogoAnimeKeys
+import com.kl3jvi.animity.data.model.ui_models.MalSyncResponse
 import com.kl3jvi.animity.data.network.anime_service.base.BaseService
 import okhttp3.ResponseBody
 import retrofit2.http.*
@@ -49,8 +50,8 @@ interface GogoAnimeService : BaseService {
         @Query("alias") alias: String
     ): ResponseBody
 
-    @GET("$MAL_SYNC_URL/{id}.json")
-    suspend fun getGogoUrlFromAniListId(
+    @GET("$MAL_SYNC_URL:{id}")
+    suspend fun getGoGoDetailedUrl(
         @Path("id") id: Int
     ): DetailedAnimeInfo
 
@@ -62,7 +63,7 @@ interface GogoAnimeService : BaseService {
 
     companion object {
         const val MAL_SYNC_URL =
-            "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/anilist/anime"
+            "https://api.malsync.moe/mal/anime/anilist"
 
         const val EPISODE_TITLES =
             "https://raw.githubusercontent.com/saikou-app/mal-id-filler-list/main/fillers"

diff --git a/app/src/main/java/com/kl3jvi/animity/data/repository/FavoriteRepositoryImpl.kt b/app/src/main/java/com/kl3jvi/animity/data/repository/FavoriteRepositoryImpl.kt
@@ -10,7 +10,9 @@ import com.kl3jvi.animity.data.paging.FavoritesPagingSource
 import com.kl3jvi.animity.domain.repositories.FavoriteRepository
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
 import javax.inject.Inject
 
 @ExperimentalCoroutinesApi
@@ -32,6 +34,7 @@ class FavoriteRepositoryImpl @Inject constructor(
             pagingSourceFactory = { FavoritesPagingSource(aniListGraphQlClient, userId) }
         ).flow.flowOn(ioDispatcher)
     }
+
     companion object {
         const val NETWORK_PAGE_SIZE = 50
     }

diff --git a/app/src/main/java/com/kl3jvi/animity/ui/activities/main/MainActivity.kt b/app/src/main/java/com/kl3jvi/animity/ui/activities/main/MainActivity.kt
@@ -18,9 +18,7 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.azhon.appupdate.manager.DownloadManager
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.kl3jvi.animity.BuildConfig
 import com.kl3jvi.animity.R
 import com.kl3jvi.animity.databinding.ActivityMainBinding
 import com.kl3jvi.animity.utils.OnNeedToRequestPermissions
@@ -95,7 +93,6 @@ class MainActivity : AppCompatActivity(), PermissionsFeature {
     }
 
 
-
     /* Hiding the bottom navigation bar. */
     private fun hideBottomNavBar() {
         binding.navView.animate().translationY(binding.navView.height.toFloat())

diff --git a/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsFragment.kt b/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsFragment.kt
@@ -19,6 +19,7 @@ import androidx.navigation.fragment.navArgs
 import coil.load
 import com.google.android.material.chip.Chip
 import com.google.android.material.tabs.TabLayoutMediator
+import com.google.android.material.transition.MaterialFadeThrough
 import com.kl3jvi.animity.R
 import com.kl3jvi.animity.data.mapper.MediaStatusAnimity
 import com.kl3jvi.animity.data.model.ui_models.EpisodeModel
@@ -53,6 +54,7 @@ class DetailsFragment : Fragment(R.layout.fragment_details) {
     private lateinit var title: String
     private var check by Delegates.notNull<Boolean>()
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentDetailsBinding.bind(view)

diff --git a/app/versionInfo.json b/app/versionInfo.json
@@ -1,39 +1,39 @@
 {
     "Animity": {
         "x86": {
-            "versionCode": 16,
-            "versionName": "1.1.6",
-            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.2/Animity-v1.1.6-x86-release.apk",
+            "versionCode": 17,
+            "versionName": "1.1.7",
+            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.3/Animity-v1.1.7-x86-release.apk",
             "update_message": "New update available",
-            "apkSize": "Unknown size"
+            "apkSize": "7.17MB"
         },
         "armeabi-v7a": {
-            "versionCode": 16,
-            "versionName": "1.1.6",
-            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.2/Animity-v1.1.6-armeabi-v7a-release.apk",
+            "versionCode": 17,
+            "versionName": "1.1.7",
+            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.3/Animity-v1.1.7-armeabi-v7a-release.apk",
             "update_message": "New update available",
-            "apkSize": "Unknown size"
+            "apkSize": "7.17MB"
         },
         "arm64_v8a": {
-            "versionCode": 16,
-            "versionName": "1.1.6",
-            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.2/Animity-v1.1.6-arm64_v8a-release.apk",
+            "versionCode": 17,
+            "versionName": "1.1.7",
+            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.3/Animity-v1.1.7-arm64_v8a-release.apk",
             "update_message": "New update available",
             "apkSize": "Unknown size"
         },
         "x86_64": {
-            "versionCode": 16,
-            "versionName": "1.1.6",
-            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.2/Animity-v1.1.6-x86_64-release.apk",
+            "versionCode": 17,
+            "versionName": "1.1.7",
+            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.3/Animity-v1.1.7-x86_64-release.apk",
             "update_message": "New update available",
-            "apkSize": "Unknown size"
+            "apkSize": "7.17MB"
         },
         "universal": {
-            "versionCode": 16,
-            "versionName": "1.1.6",
-            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.2/Animity-v1.1.6-universal-release.apk",
+            "versionCode": 17,
+            "versionName": "1.1.7",
+            "direct_link": "https://github.com/kl3jvi/animity/releases/download/v0.2.3/Animity-v1.1.7-universal-release.apk",
             "update_message": "New update available",
-            "apkSize": "Unknown size"
+            "apkSize": "7.17MB"
         }
     }
-}
+}