From 76d9997262fc5ccb8f05ac85f89bc66d04e8c3b9 Mon Sep 17 00:00:00 2001
From: BrutuZ <BrutuZ@users.noreply.github.com>
Date: Sat, 2 Dec 2023 12:44:23 -0300
Subject: [PATCH] [Cubari] Cleanup chapter titles (#19117)

* Avoid stray hyphen on chapter title if it has no name

* Fix typo and add explanation to README
Remove CHANGELOG

* Check and ignore empty string passed as Volume number
---
 src/all/cubari/CHANGELOG.md                   | 67 -------------------
 src/all/cubari/README.md                      |  3 +-
 src/all/cubari/build.gradle                   |  2 +-
 .../tachiyomi/extension/all/cubari/Cubari.kt  | 12 ++--
 4 files changed, 8 insertions(+), 76 deletions(-)
 delete mode 100644 src/all/cubari/CHANGELOG.md

diff --git a/src/all/cubari/CHANGELOG.md b/src/all/cubari/CHANGELOG.md
deleted file mode 100644
index ae1c5e216..000000000
--- a/src/all/cubari/CHANGELOG.md
+++ /dev/null
@@ -1,67 +0,0 @@
-## 1.2.11
-
-### Features
-
-* Add `CHANGELOG.md` & `README.md`
-
-## 1.2.10
-
-### Features
-
-* Wildcard hosts in URL intent
-
-## 1.2.9
-
-### Fix
-
-* release date
-* empty volume
-
-## 1.2.8
-
-### Fix
-
-* Upload fate
-
-## 1.2.7
-
-### Fix
-
-* proxy methode
-
-## 1.2.6
-
-### Refactor
-
-* replace Gson with kotlinx.serialization
-
-## 1.2.5
-
-### Fix
-
-* Volume default
-
-## 1.2.4
-
-### Fix
-
-* seriesSlug being the wrong type
-
-## 1.2.3
-
-### Features
-
-* Volume support
-* Fall back release date
-
-## 1.2.2
-
-### Features
-
-* Migrate Guya proxy to Cubari
-
-## 1.2.1
-
-### Features
-
-* first version
diff --git a/src/all/cubari/README.md b/src/all/cubari/README.md
index 56d26d07c..d79b828ab 100644
--- a/src/all/cubari/README.md
+++ b/src/all/cubari/README.md
@@ -13,7 +13,8 @@ Don't find the question you are look for go check out our general FAQs and Guide
 ## FAQ
 
 ### Why do I see no manga?
-Cubari is a proxy for image gallery's.
+Cubari is a proxy for image galleries.
+If you've setup the Remote Storage via WebView the Recent tab shows your recent, unpinned entries, conversely the Popular tab shows your pinned entries.
 
 ### Where can I get more information about Cubari?
 You can visit the [Cubari](https://cubari.moe/) website for for more information.
diff --git a/src/all/cubari/build.gradle b/src/all/cubari/build.gradle
index b42771158..5624032dc 100644
--- a/src/all/cubari/build.gradle
+++ b/src/all/cubari/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'Cubari'
     pkgNameSuffix = "all.cubari"
     extClass = '.CubariFactory'
-    extVersionCode = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt b/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt
index c1103f386..29465701d 100644
--- a/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt
+++ b/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt
@@ -286,7 +286,7 @@ open class Cubari(override val lang: String) : HttpSource() {
 
     // ------------- Helpers and whatnot ---------------
 
-    private val volumeNotSpecifiedTerms = setOf("Uncategorized", "null")
+    private val volumeNotSpecifiedTerms = setOf("Uncategorized", "null", "")
 
     private fun parseChapterList(payload: String, manga: SManga): List<SChapter> {
         val jsonObj = json.parseToJsonElement(payload).jsonObject
@@ -326,12 +326,10 @@ open class Cubari(override val lang: String) : HttpSource() {
                         seriesPrefs.getLong(chapterNum, currentTimeMillis)
                     }
 
-                    name = if (volume != null) {
-                        // Output "Vol. 1 Ch. 1 - Chapter Name"
-                        "Vol. $volume Ch. $chapterNum - $title"
-                    } else {
-                        // Output "Ch. 1 - Chapter Name"
-                        "Ch. $chapterNum - $title"
+                    name = buildString {
+                        if (!volume.isNullOrBlank()) append("Vol.$volume ")
+                        append("Ch.$chapterNum")
+                        if (title.isNotBlank()) append(" - $title")
                     }
 
                     url = if (chapterGroups[groupNum] is JsonArray) {