From 9db910eca1dbae92fc59ac5a10649a72ac989a56 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:44:08 -0300 Subject: [PATCH] [skip ci] refactor(lib): Refactor some libraries (#2454) --- build.gradle.kts | 2 +- .../lib/bloggerextractor/BloggerExtractor.kt | 2 +- .../BurstCloudExtractor.kt | 20 +- .../BurstCloudExtractorDto.kt | 8 +- lib/fastream-extractor/build.gradle.kts | 7 +- .../fastreamextractor/FastreamExtractor.kt | 79 ++++--- .../lib/fastreamextractor/JsUnpacker.kt | 193 ------------------ lib/filemoon-extractor/build.gradle.kts | 1 + .../filemoonextractor/FilemoonExtractor.kt | 63 ++---- .../streamhubextractor/StreamHubExtractor.kt | 11 +- .../StreamTapeExtractor.kt | 8 +- .../lib/vidoextractor/VidoExtractor.kt | 13 +- .../tachiyomi/lib/vkextractor/VkExtractor.kt | 36 ++-- .../lib/voeextractor/VoeExtractor.kt | 8 +- .../es/animefenix/Animefenix.kt | 4 +- .../es/animemovil/AnimeMovil.kt | 4 +- .../animeextension/es/animeyt/Animeyt.kt | 2 +- .../es/asialiveaction/AsiaLiveAction.kt | 2 +- .../animeextension/es/cuevana/CuevanaCh.kt | 2 +- .../es/doramasflix/Doramasflix.kt | 2 +- .../animeextension/es/gnula/Gnula.kt | 2 +- .../es/metroseries/MetroSeries.kt | 2 +- .../es/mundodonghua/MundoDonghua.kt | 2 +- .../es/pelisforte/PelisForte.kt | 2 +- .../es/pelisplushd/Pelisplushd.kt | 2 +- .../es/pelisplushd/Pelisplusph.kt | 2 +- .../es/pelisplushd/Pelisplusto.kt | 2 +- 27 files changed, 152 insertions(+), 329 deletions(-) delete mode 100644 lib/fastream-extractor/src/main/java/eu/kanade/tachiyomi/lib/fastreamextractor/JsUnpacker.kt diff --git a/build.gradle.kts b/build.gradle.kts index 25521f385..c4abc2659 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } tasks.register("clean") { - delete(rootProject.buildDir) + delete(rootProject.layout.buildDirectory.asFile.get()) } allprojects { diff --git a/lib/blogger-extractor/src/main/java/eu/kanade/tachiyomi/lib/bloggerextractor/BloggerExtractor.kt b/lib/blogger-extractor/src/main/java/eu/kanade/tachiyomi/lib/bloggerextractor/BloggerExtractor.kt index 35e87df28..f587eb9da 100644 --- a/lib/blogger-extractor/src/main/java/eu/kanade/tachiyomi/lib/bloggerextractor/BloggerExtractor.kt +++ b/lib/blogger-extractor/src/main/java/eu/kanade/tachiyomi/lib/bloggerextractor/BloggerExtractor.kt @@ -26,7 +26,7 @@ class BloggerExtractor(private val client: OkHttpClient) { "37" -> "1080p" else -> "Unknown" } - Video(videoUrl, "Blogger - $quality $suffix".trim(), videoUrl, headers) + Video(videoUrl, "Blogger - $quality $suffix".trimEnd(), videoUrl, headers) } } } diff --git a/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt b/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt index 0025be0ca..f8150169d 100644 --- a/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt +++ b/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt @@ -15,19 +15,23 @@ class BurstCloudExtractor(private val client: OkHttpClient) { private val json: Json by injectLazy() fun videoFromUrl(url: String, headers: Headers, name: String = "BurstCloud", prefix: String = ""): List