From 478b7a006626d7216ab023ef252fb68243059848 Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Sat, 16 Apr 2022 10:51:56 +0800
Subject: [PATCH] [Fix] Additional Extractor fixes related to #954 (#956)

* cleanup on fembed class

* additional fixes

* additional cleanup on xstreamcdn extractor
---
 .../cloudstream3/extractors/AsianLoad.kt         |  5 ++---
 .../lagradost/cloudstream3/extractors/FEmbed.kt  | 13 -------------
 .../lagradost/cloudstream3/extractors/FeHD.kt    | 14 --------------
 .../lagradost/cloudstream3/extractors/Fplayer.kt | 13 -------------
 .../cloudstream3/extractors/GenericM3U8.kt       |  5 ++---
 .../cloudstream3/extractors/Jawcloud.kt          |  5 ++---
 .../lagradost/cloudstream3/extractors/Mcloud.kt  |  5 ++---
 .../cloudstream3/extractors/MultiQuality.kt      |  2 +-
 .../cloudstream3/extractors/OkRuExtractor.kt     |  2 +-
 .../cloudstream3/extractors/Pelisplus.kt         |  2 +-
 .../cloudstream3/extractors/XStreamCdn.kt        | 16 ++++++++++++++++
 11 files changed, 27 insertions(+), 55 deletions(-)
 delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/FEmbed.kt
 delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/FeHD.kt
 delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Fplayer.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
index 290ff002..ed33334a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
@@ -24,14 +24,13 @@ class AsianLoad : ExtractorApi() {
                         ), true
                     )
                         .forEach { stream ->
-                            val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
                             extractedLinksList.add(
                                 ExtractorLink(
                                     name,
-                                    "$name $qualityString",
+                                    name = name,
                                     stream.streamUrl,
                                     url,
-                                    getQualityFromName(stream.quality.toString()),
+                                    getQualityFromName(stream.quality?.toString()),
                                     true
                                 )
                             )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/FEmbed.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/FEmbed.kt
deleted file mode 100644
index 9a12db6f..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/FEmbed.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.module.kotlin.readValue
-import com.lagradost.cloudstream3.network.Session
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.mapper
-
-class FEmbed: XStreamCdn() {
-    override val name: String = "FEmbed"
-    override val mainUrl: String = "https://www.fembed.com"
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/FeHD.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/FeHD.kt
deleted file mode 100644
index 9b060761..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/FeHD.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.module.kotlin.readValue
-import com.lagradost.cloudstream3.network.Session
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.mapper
-
-class FeHD: XStreamCdn() {
-    override val name: String = "FeHD"
-    override val mainUrl: String = "https://fembed-hd.com"
-    override var domainUrl: String = "fembed-hd.com"
-}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Fplayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Fplayer.kt
deleted file mode 100644
index c7ee9cbf..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Fplayer.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.module.kotlin.readValue
-import com.lagradost.cloudstream3.network.Session
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.mapper
-
-class Fplayer: XStreamCdn() {
-    override val name: String = "Fplayer"
-    override val mainUrl: String = "https://fplayer.info"
-}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/GenericM3U8.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/GenericM3U8.kt
index 3d986cea..49bf4fd5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/GenericM3U8.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/GenericM3U8.kt
@@ -30,13 +30,12 @@ open class GenericM3U8 : ExtractorApi() {
             ), true
         )
             .map { stream ->
-                val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
                 sources.add( ExtractorLink(
                     name,
-                    "$name $qualityString",
+                    name = name,
                     stream.streamUrl,
                     url,
-                    getQualityFromName(stream.quality.toString()),
+                    getQualityFromName(stream.quality?.toString()),
                     true
                 ))
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Jawcloud.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Jawcloud.kt
index 04130a53..abc6e017 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Jawcloud.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Jawcloud.kt
@@ -21,13 +21,12 @@ open class Jawcloud : ExtractorApi() {
             ), true
         )
             .map { stream ->
-                val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
                 sources.add(  ExtractorLink(
                     name,
-                    "$name $qualityString",
+                    name = name,
                     stream.streamUrl,
                     url,
-                    getQualityFromName(stream.quality.toString()),
+                    getQualityFromName(stream.quality?.toString()),
                     true
                 ))
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mcloud.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mcloud.kt
index 1cc0ba95..a819c57d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mcloud.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mcloud.kt
@@ -63,14 +63,13 @@ open class Mcloud : ExtractorApi() {
                         ), true
                     )
                         .map { stream ->
-                            val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
                             sources.add(
                                 ExtractorLink(
                                     name,
-                                    "$name $qualityString",
+                                    name = name,
                                     stream.streamUrl,
                                     url,
-                                    getQualityFromName(stream.quality.toString()),
+                                    getQualityFromName(stream.quality?.toString()),
                                     true
                                 )
                             )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
index 8dc13592..0c0b5c68 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
@@ -31,7 +31,7 @@ class MultiQuality : ExtractorApi() {
                             extractedLinksList.add(
                                 ExtractorLink(
                                     name,
-                                    "$name ${match.groupValues[1]}p",
+                                    name = name,
                                     urlRegex.find(this.url)!!.groupValues[1] + match.groupValues[0],
                                     url,
                                     getQualityFromName(match.groupValues[1]),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
index 41016e47..c3b6a023 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
@@ -50,7 +50,7 @@ open class OkRu : ExtractorApi() {
                 val extractedurl = it.url.replace("\\\\u0026", "&")
                 sources.add(ExtractorLink(
                     name,
-                    "$name $quality",
+                    name = this.name,
                     extractedurl,
                     url,
                     getQualityFromName(quality),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
index 1811826a..0bc66308 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
@@ -56,7 +56,7 @@ class Pelisplus(val mainUrl: String) {
                         callback.invoke(
                             ExtractorLink(
                                 this.name,
-                                if (qual == "null") this.name else "${this.name} - " + qual + "p",
+                                name = this.name,
                                 href,
                                 page.url,
                                 getQualityFromName(qual),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
index 09f08149..833eab15 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
@@ -8,6 +8,22 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 
+class FEmbed: XStreamCdn() {
+    override val name: String = "FEmbed"
+    override val mainUrl: String = "https://www.fembed.com"
+}
+
+class Fplayer: XStreamCdn() {
+    override val name: String = "Fplayer"
+    override val mainUrl: String = "https://fplayer.info"
+}
+
+class FeHD: XStreamCdn() {
+    override val name: String = "FeHD"
+    override val mainUrl: String = "https://fembed-hd.com"
+    override var domainUrl: String = "fembed-hd.com"
+}
+
 open class XStreamCdn : ExtractorApi() {
     override val name: String = "XStreamCdn"
     override val mainUrl: String = "https://embedsito.com"