From ab9aa6c21866bcf2fc396483a014ece60e1fe096 Mon Sep 17 00:00:00 2001
From: Shashank Pujari <shashank-p@users.noreply.github.com>
Date: Sat, 29 Aug 2020 06:19:39 +0530
Subject: [PATCH] mangakiss.org site no longer exist (#4214)

* mangakiss.org site no longer exist

* Remove Knight no Scanlation, AhStudios, GetManhwa

* comments

Co-authored-by: snakedoc83 <mikepeterson83@gmail.com>
---
 src/all/madara/build.gradle                   |  2 +-
 .../extension/all/madara/MadaraFactory.kt     | 39 ++-----------------
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle
index 84767ea55..2dbb7400e 100644
--- a/src/all/madara/build.gradle
+++ b/src/all/madara/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Madara (multiple sources)'
     pkgNameSuffix = "all.madara"
     extClass = '.MadaraFactory'
-    extVersionCode = 130
+    extVersionCode = 131
     libVersion = '1.2'
     containsNsfw = true
 }
diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
index 9a9b770e2..dc772894d 100644
--- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
+++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import eu.kanade.tachiyomi.annotations.Nsfw
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.model.Filter
@@ -13,8 +12,6 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.util.asJsoup
-import java.text.SimpleDateFormat
-import java.util.Locale
 import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.Headers
@@ -24,13 +21,13 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
+import java.text.SimpleDateFormat
+import java.util.Locale
 
 class MadaraFactory : SourceFactory {
     override fun createSources(): List<Source> = listOf(
         ATMSubs(),
         AdonisFansub(),
-        AhStudios(),
         AkuManga(),
         AllPornComic(),
         AoCTranslations(),
@@ -60,7 +57,6 @@ class MadaraFactory : SourceFactory {
         FriendlyTranslations(),
         FunList(),
         FurioScans(),
-        GetManhwa(),
         GoldenManga(),
         GuncelManga(),
         HeroManhua(),
@@ -74,7 +70,6 @@ class MadaraFactory : SourceFactory {
         KingzManga(),
         KlanKomik(),
         KlikManga(),
-        KnightNoScanlation(),
         KomikGo(),
         LilyManga(),
         LuxyScans(),
@@ -86,7 +81,6 @@ class MadaraFactory : SourceFactory {
         MangaBob(),
         MangaDods(),
         MangaHentai(),
-        MangaKiss(),
         MangaKomi(),
         MangaLord(),
         MangaPhoenix(),
@@ -169,11 +163,11 @@ class MadaraFactory : SourceFactory {
         // MangaGecesi(),
         // MangaWOW(),
         // MangaStein(),
+        // KnightNoScanlation(),
+        // AhStudios(),
     )
 }
 
-class AhStudios : Madara("AhStudios", "https://ahstudios.net", "es")
-
 class AsuraScans : Madara("AsuraScans", "https://asurascans.com", "en")
 
 class TritiniaScans : Madara("TritiniaScans", "https://tritiniaman.ga", "en") {
@@ -327,25 +321,6 @@ class AdonisFansub : Madara("Adonis Fansub", "https://manga.adonisfansub.com", "
     override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=latest", headers)
 }
 
-class GetManhwa : Madara("GetManhwa", "https://getmanhwa.co", "en") {
-    override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
-        return client.newCall(mangaDetailsRequest(manga))
-            .asObservableSuccess()
-            .map { response ->
-                mangaDetailsParse(response.asJsoup(), manga).apply { initialized = true }
-            }
-    }
-    private fun mangaDetailsParse(document: Document, manga: SManga): SManga {
-        return SManga.create().apply {
-            if (manga.thumbnail_url.isNullOrEmpty()) thumbnail_url = searchMangaParse(client.newCall(searchMangaRequest(1, manga.title, FilterList())).execute())
-                .mangas.firstOrNull()?.thumbnail_url
-            author = document.select("div.summary-heading-creator a").joinToString { it.text() }
-            genre = document.select("div.genres-content a").joinToString { it.text() }
-            description = document.select("div.description-summary p").joinToString("\n") { it.text() }
-        }
-    }
-}
-
 @Nsfw
 class AllPornComic : Madara("AllPornComic", "https://allporncomic.com", "en") {
     override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=views", headers)
@@ -788,10 +763,6 @@ class DisasterScans : Madara("Disaster Scans", "https://disasterscans.com", "en"
     }
 }
 
-class MangaKiss : Madara("MangaKiss", "https://mangakiss.org", "en", SimpleDateFormat("dd/MM/yyyy", Locale.US)) {
-    override fun headersBuilder(): Headers.Builder = super.headersBuilder().add("Referer", baseUrl)
-}
-
 class MangaDods : Madara("MangaDods", "https://www.mangadods.com", "en", SimpleDateFormat("yyyy-MM-dd", Locale.US))
 
 class MangaStream : Madara("MangaStream", "https://www.mangastream.cc", "en") {
@@ -1045,8 +1016,6 @@ class TurkceManga : Madara("Türkçe Manga", "https://turkcemanga.com", "tr") {
 
 class EinherjarScan : Madara("Einherjar Scan", "https://einherjarscans.space", "en")
 
-class KnightNoScanlation : Madara("Knight no Scanlation", "https://knightnoscanlation.com", "es")
-
 class DoujinYosh : Madara("DoujinYosh", "https://doujinyosh.work", "id") {
     // source issue, doing this limits results to one page but not doing it returns no results at all
     override fun searchPage(page: Int) = ""