From 996eca0ac97d46e430d557307eb15f3ffe85eada Mon Sep 17 00:00:00 2001
From: Mike <51273546+SnakeDoc83@users.noreply.github.com>
Date: Sat, 25 Jul 2020 05:56:49 -0400
Subject: [PATCH] Madara - add toonily.net (#3888)

---
 src/all/madara/build.gradle                       |  6 +-----
 .../extension/all/madara/MadaraFactory.kt         | 15 ++++-----------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle
index 05bcd13b6..f84440d53 100644
--- a/src/all/madara/build.gradle
+++ b/src/all/madara/build.gradle
@@ -5,12 +5,8 @@ ext {
     extName = 'Madara (multiple sources)'
     pkgNameSuffix = "all.madara"
     extClass = '.MadaraFactory'
-    extVersionCode = 122
+    extVersionCode = 123
     libVersion = '1.2'
 }
 
-dependencies {
-    implementation project(':lib-dataimage')
-}
-
 apply from: "$rootDir/common.gradle"
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 b8387570d..6e1b30cdc 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
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.all.madara
 
 import android.annotation.SuppressLint
 import eu.kanade.tachiyomi.annotations.MultiSource
-import eu.kanade.tachiyomi.lib.dataimage.DataImageInterceptor
-import eu.kanade.tachiyomi.lib.dataimage.dataImageAsUrl
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.Source
@@ -156,7 +154,8 @@ class MadaraFactory : SourceFactory {
         TritiniaScans(),
         AkuManga(),
         AsgardTeam(),
-        Skymanga()
+        Skymanga(),
+        ToonilyNet()
         // Removed by request of site owner
         // EarlyManga(),
         // MangaGecesi(),
@@ -1131,15 +1130,7 @@ class Manga347 : Madara("Manga347", "https://manga347.com", "en", SimpleDateForm
 class RenaScans : Madara("Renascence Scans (Renascans)", "https://new.renascans.com", "en", SimpleDateFormat("dd/MM/yyyy", Locale.US))
 
 class QueensManga : Madara("QueensManga ملكات المانجا", "https://queensmanga.com", "ar") {
-    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
-        .addInterceptor(DataImageInterceptor())
-        .build()
     override fun chapterListSelector(): String = "div.listing-chapters_wrap a"
-    override fun pageListParse(document: Document): List<Page> {
-        return document.select("picture > source").mapIndexed { i, source ->
-            Page(i, "", source.dataImageAsUrl("srcset"))
-        }
-    }
 }
 
 class DropeScan : Madara("Drope Scan", "https://dropescan.com", "pt-BR") {
@@ -1207,3 +1198,5 @@ class AkuManga : Madara("AkuManga", "https://akumanga.com", "ar")
 class AsgardTeam : Madara("Asgard Team", "https://www.asgard1team.com", "ar")
 
 class Skymanga : Madara("Skymanga", "https://skymanga.co", "en")
+
+class ToonilyNet : Madara("Toonily.net", "https://toonily.net", "en")