From 5d8b98f369506977a50293482cd5747ff5acb824 Mon Sep 17 00:00:00 2001
From: Alessandro Jean <14254807+alessandrojean@users.noreply.github.com>
Date: Mon, 19 Sep 2022 16:27:23 -0300
Subject: [PATCH] Add French to Bilibili Comics (#13515)

* Add French to Bilibili Comics.

* Add missing translations.
---
 .../src/BilibiliComicsFactory.kt              | 20 ++++++++++++++++++-
 .../multisrc/bilibili/BilibiliGenerator.kt    |  4 ++--
 .../multisrc/bilibili/BilibiliIntl.kt         |  6 ++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt b/multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt
index d4b2defbc..692deb55a 100644
--- a/multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt
+++ b/multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt
@@ -25,6 +25,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
+import okhttp3.internal.closeQuietly
 import okio.Buffer
 import java.io.IOException
 import java.net.URLDecoder
@@ -34,7 +35,8 @@ class BilibiliComicsFactory : SourceFactory {
         BilibiliComicsEn(),
         BilibiliComicsCn(),
         BilibiliComicsId(),
-        BilibiliComicsEs()
+        BilibiliComicsEs(),
+        BilibiliComicsFr(),
     )
 }
 
@@ -207,6 +209,7 @@ abstract class BilibiliComics(lang: String) : Bilibili(
             val refreshTokenResponse = chain.proceed(refreshTokenRequest)
 
             accessTokenCookie = refreshTokenParse(refreshTokenResponse)
+            refreshTokenResponse.closeQuietly()
 
             request = request.newBuilder()
                 .header("Authorization", "Bearer ${accessTokenCookie!!.accessToken}")
@@ -355,3 +358,18 @@ class BilibiliComicsEs : BilibiliComics(BilibiliIntl.SPANISH) {
         BilibiliTag("Wuxia", 103)
     )
 }
+
+class BilibiliComicsFr : BilibiliComics(BilibiliIntl.FRENCH) {
+
+    override fun getAllGenres(): Array<BilibiliTag> = arrayOf(
+        BilibiliTag("Tout", -1),
+        BilibiliTag("BL", 3),
+        BilibiliTag("Science Fiction", 8),
+        BilibiliTag("Historique", 12),
+        BilibiliTag("Romance", 13),
+        BilibiliTag("GL", 16),
+        BilibiliTag("Fantasy Orientale", 30),
+        BilibiliTag("Suspense", 41),
+        BilibiliTag("Moderne", 111)
+    )
+}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt
index bef00b807..07d47aa7b 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt
@@ -16,9 +16,9 @@ class BilibiliGenerator : ThemeSourceGenerator {
         MultiLang(
             name = "BILIBILI COMICS",
             baseUrl = "https://www.bilibilicomics.com",
-            langs = listOf("en", "zh-Hans", "id", "es"),
+            langs = listOf("en", "zh-Hans", "id", "es", "fr"),
             className = "BilibiliComicsFactory",
-            overrideVersionCode = 1
+            overrideVersionCode = 2
         ),
         SingleLang(
             name = "BILIBILI MANGA",
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliIntl.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliIntl.kt
index 6a9c959ec..c30aa6d22 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliIntl.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliIntl.kt
@@ -83,6 +83,7 @@ class BilibiliIntl(lang: String) {
         CHINESE, SIMPLIFIED_CHINESE -> "人气推荐"
         INDONESIAN -> "Populer"
         SPANISH -> "Popularidad"
+        FRENCH -> "Préférences"
         else -> "Popular"
     }
 
@@ -90,6 +91,7 @@ class BilibiliIntl(lang: String) {
         CHINESE, SIMPLIFIED_CHINESE -> "更新时间"
         INDONESIAN -> "Terbaru"
         SPANISH -> "Actualización"
+        FRENCH -> "Récent"
         else -> "Updated"
     }
 
@@ -107,6 +109,7 @@ class BilibiliIntl(lang: String) {
         CHINESE, SIMPLIFIED_CHINESE -> "全部"
         INDONESIAN -> "Semua"
         SPANISH -> "Todos"
+        FRENCH -> "Tout"
         else -> "All"
     }
 
@@ -114,6 +117,7 @@ class BilibiliIntl(lang: String) {
         CHINESE, SIMPLIFIED_CHINESE -> "连载中"
         INDONESIAN -> "Berlangsung"
         SPANISH -> "En curso"
+        FRENCH -> "En cours"
         else -> "Ongoing"
     }
 
@@ -121,6 +125,7 @@ class BilibiliIntl(lang: String) {
         CHINESE, SIMPLIFIED_CHINESE -> "已完结"
         INDONESIAN -> "Tamat"
         SPANISH -> "Finalizado"
+        FRENCH -> "Complet"
         else -> "Completed"
     }
 
@@ -168,5 +173,6 @@ class BilibiliIntl(lang: String) {
         const val INDONESIAN = "id"
         const val SIMPLIFIED_CHINESE = "zh-Hans"
         const val SPANISH = "es"
+        const val FRENCH = "fr"
     }
 }