From 92bf935d3662fa0acdf717560c610da589859287 Mon Sep 17 00:00:00 2001
From: odnar-dev <73726132+odnar-dev@users.noreply.github.com>
Date: Thu, 17 Mar 2022 15:39:26 +0000
Subject: [PATCH] Update EgyBestProvider.kt (#803)

* Update EgyBestProvider.kt

scrape egybest home page and show the same categories as the site

* add movies recommendations to EgyBest

* update arabic strings

* add Cast to EgyBest
---
 .../movieproviders/EgyBestProvider.kt         | 46 +++++++++++++------
 app/src/main/res/values-ar/strings.xml        | 25 +++++-----
 2 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/EgyBestProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/EgyBestProvider.kt
index 22114816..f1c19d32 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/EgyBestProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/EgyBestProvider.kt
@@ -21,11 +21,11 @@ class EgyBestProvider : MainAPI() {
     private fun Element.toSearchResponse(): SearchResponse? {
         val url = this.attr("href") ?: return null
         val posterUrl = select("img")?.attr("src")
-        val title = select("span.title").text()
-            .replace("\\(.*\\)".toRegex(), "")
-        val year = select("span.title").text()
-            .replace(".*\\(|\\)".toRegex(), "")
-        val tvType = if (url.contains("/movie/")) TvType.Movie else TvType.TvSeries
+        var title = select("span.title").text()
+        val year = title.getYearFromTitle()
+        val isMovie = Regex(".*/movie/.*|.*/masrahiya/.*").matches(url)
+        val tvType = if (isMovie) TvType.Movie else TvType.TvSeries
+        title = if (year !== null) title else title.split(" (")[0].trim()
         // If you need to differentiate use the url.
         return MovieSearchResponse(
             title,
@@ -33,24 +33,21 @@ class EgyBestProvider : MainAPI() {
             this@EgyBestProvider.name,
             tvType,
             posterUrl,
-            year.toIntOrNull(),
+            year,
             null,
         )
     }
 
     override suspend fun getMainPage(): HomePageResponse {
         // url, title
-        val pagesUrl = listOf(
-            Pair("$mainUrl/movies/?page="+(0..25).random(), "Movies"),
-            Pair("$mainUrl/tv/?page="+(0..25).random(), "Series"),
-        )
-        val pages = pagesUrl.apmap { (url, name) ->
-            val doc = app.get(url).document
-            val list = doc.select("div.movies a").not("a.auto.load.btn.b").mapNotNull { element ->
+        val doc = app.get(mainUrl).document
+        val pages = doc.select("#mainLoad div.mbox").apmap {
+            val name = it.select(".bdb.pda > strong").text()
+            val list = it.select(".movie").mapNotNull { element ->
                 element.toSearchResponse()
             }
             HomePageList(name, list)
-        }.sortedBy { it.name }
+        }
         return HomePageResponse(pages)
     }
 
@@ -66,9 +63,13 @@ class EgyBestProvider : MainAPI() {
         return result.distinct().sortedBy { it.name }
     }
 
+    private fun String.getYearFromTitle(): Int? {
+        return Regex("""\(\d{4}\)""").find(this)?.groupValues?.firstOrNull()?.toIntOrNull()
+    }
+
     override suspend fun load(url: String): LoadResponse {
         val doc = app.get(url).document
-        val isMovie = url.contains("/movie/")
+        val isMovie = Regex(".*/movie/.*|.*/masrahiya/.*").matches(url)
         val posterUrl = doc.select("div.movie_img a img")?.attr("src")
         val year = doc.select("div.movie_title h1 a")?.text()?.toIntOrNull()
         val title = doc.select("div.movie_title h1 span[itemprop=\"name\"]").text()
@@ -81,7 +82,19 @@ class EgyBestProvider : MainAPI() {
             it.text().contains("النوع")
         }?.select("a")?.map { it.text() }
 
+        val actors = doc.select("div.cast_list .cast_item")?.mapNotNull {
+            val name = it.selectFirst("div > a > img")?.attr("alt") ?: return@mapNotNull null
+            val image = it.selectFirst("div > a > img")?.attr("src") ?: return@mapNotNull null
+            val roleString = it.selectFirst("div > span").text()
+            val mainActor = Actor(name, image)
+            ActorData(actor = mainActor, roleString = roleString)
+        }
+
         return if (isMovie) {
+            val recommendations = doc.select(".movies_small .movie")?.mapNotNull { element ->
+                element.toSearchResponse()
+            }
+
             newMovieLoadResponse(
                 title,
                 url,
@@ -90,8 +103,10 @@ class EgyBestProvider : MainAPI() {
             ) {
                 this.posterUrl = posterUrl
                 this.year = year
+                this.recommendations = recommendations
                 this.plot = synopsis
                 this.tags = tags
+                this.actors = actors
             }
         } else {
             val episodes = ArrayList<TvSeriesEpisode>()
@@ -119,6 +134,7 @@ class EgyBestProvider : MainAPI() {
                 this.tags = tags
                 this.year = year
                 this.plot = synopsis
+                this.actors = actors
             }
         }
     }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b50a31e5..ab8564cf 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -13,6 +13,7 @@
     <string name="player_speed_text_format" formatted="true">سرعة (%.2fx)</string>
     <string name="rated_format" formatted="true">Rated: %.1f</string>
     <string name="new_update_format" formatted="true">!تم إيجاد تحديث جديد\n%s -> %s</string>
+    <string name="duration_format" formatted="true">%d دقيقة</string>
 
     <string name="app_name">CloudStream</string>
     <string name="title_home">الصفحة الرئيسية</string>
@@ -23,7 +24,7 @@
     <string name="search_hint">…بحث</string>	
     <string name="no_data">لايوجد بيانات</string>
     <string name="episode_more_options_des">المزيد من الخيارات</string>
-    <string name="next_episode">الحلقة القادمة</string>
+    <string name="next_episode">الحلقة التالية</string>
     <string name="result_tags">النواع</string>
     <string name="result_share">شارك</string>
     <string name="result_open_in_browser">فتح في الويب </string>
@@ -38,7 +39,7 @@
     <string name="type_none">لا شيء</string>
     <string name="type_re_watching">إعادة المشاهدة</string>
 	
-    <string name="play_movie_button">تشغيل الفيلم</string>
+    <string name="play_movie_button">مشاهدة الفيلم</string>
     <string name="play_torrent_button">تشغيل التورنت</string>
     <string name="pick_source">المصادر</string>
     <string name="pick_subtitle">الترجمة</string>
@@ -59,8 +60,8 @@
     <string name="error_loading_links_toast">خطأ في تحميل الرابط</string>
     <string name="download_storage_text">التخزين الداخلي</string>
 
-    <string name="app_dubbed_text">دبلجة</string>
-    <string name="app_subbed_text">مترجمة</string>
+    <string name="app_dubbed_text">مدبلج</string>
+    <string name="app_subbed_text">مترجم</string>
 
     <string name="popup_delete_file">حذف ملف</string>
     <string name="popup_play_file">تشغيل الملف</string>
@@ -112,7 +113,7 @@
     <string name="normal_no_plot">لم يتم العثور على وصف</string>
     <string name="torrent_no_plot">لم يتم العثور على وصف</string>
 
-    <string name="picture_in_picture">صورة داخل صورة</string>
+    <string name="picture_in_picture">نافذة منبثقة</string>
     <string name="picture_in_picture_des">يستمر في التشغيل في مشغل مصغر فوق التطبيقات الأخرى</string>
     <string name="player_size_settings">زر تغيير حجم المشغل</string>
     <string name="player_size_settings_des">قم بإزالة الحدود السوداء</string>
@@ -162,8 +163,8 @@
     <string name="no_season">لا موسم</string>
     <string name="episode">حلقة</string>
     <string name="episodes">حلقات</string>
-    <string name="season_short">س</string>
-    <string name="episode_short">ه</string>
+    <string name="season_short">S</string>
+    <string name="episode_short">E</string>
     <string name="no_episodes_found">لم يتم العثور على أي حلقات</string>
 
     <string name="delete_file">حذف ملف</string>
@@ -173,6 +174,7 @@
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
     <string name="delete_message">This will permanently delete %s\nAre you sure?</string>
+    <string name="resume_time_left" formatted="true">%dد\nمتبقية</string>
 
     <string name="status_ongoing">جاري التنفيذ</string>
     <string name="status_completed">اكتمل</string>
@@ -246,12 +248,12 @@
 
     <string name="general">عام</string>
     <string name="provider_lang_settings">لغات الموفر</string>
-    <string name="app_layout">شكل التطبيق</string>	
+    <string name="app_layout">واجهة التطبيق</string>	
     <string name="preferred_media_settings">النوع المفضل من المشاهدة</string>	
 	
     <string name="automatic">أوتوماتيك</string> 
-    <string name="tv_layout">مناسب لتصميم التلفاز</string>
-    <string name="phone_layout">مناسبة لتصميم الهاتف</string>
+    <string name="tv_layout">واجهة خاصة بتلفاز</string>
+    <string name="phone_layout">واجهة خاصة بهاتف</string>
 	
     <string name="primary_color_settings">اللون الأساسي</string>
     <string name="app_theme_settings">مظهر التطبيق</string>
@@ -276,11 +278,12 @@
     <string name="subtitles_example_text">نصٌّ حكيمٌ لهُ سِرٌّ قاطِعٌ وَذُو شَأنٍ عَظيمٍ مكتوبٌ على ثوبٍ أخضرَ ومُغلفٌ بجلدٍ أزرق</string>
 
     <string name="recommended">موصى به</string>
-    <string name="player_load_subtitles">تحميل من ملف</string>
+    <string name="player_load_subtitles">إختيار ملف</string>
     <string name="downloaded_file">الملف الذي تم تنزيله</string>
     <string name="actor_main">رئيسي</string>
     <string name="actor_supporting">مساعد</string>
     <string name="actor_background">خلفية</string>
     <string name="chromecast_subtitles_settings">ترجمة كروم كاست</string>
     <string name="chromecast_subtitles_settings_des">إعدادات ترجمة الكروم كاست</string>
+    <string name="home_source">المصادر</string>
 </resources>