Refactoring

Author: TalbotGooday

app/src/main/java/com/gapps/videonoapi/ui/main/MainActivity.kt

@@ -15,6 +15,7 @@ import com.gapps.videonoapi.utils.recycler_view.MarginItemDecoration
 import com.gapps.videonoapi.utils.scroll.ScrollListener
 import com.gapps.videonoapi.utils.extensions.alphaSmooth
 import com.gapps.videonoapi.utils.extensions.convertDpToPx
+import com.gapps.videonoapi.video_utils.youtube.MyYoutubeVideoInfoModel
 import kotlinx.android.synthetic.main.activity_main.*
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -64,9 +65,9 @@ class MainActivity : BaseActivity() {
 		videoService = VideoService.build {
 			with(this@MainActivity)
 			httpClient(okHttpClient)
-			enableCache(true)
+			enableCache(false)
 			enableLog(true)
-			withCustomVideoInfoModels(UltimediaVideoInfoModel())
+			withCustomVideoInfoModels(UltimediaVideoInfoModel(), MyYoutubeVideoInfoModel())
 		}
 	}
 

app/src/main/java/com/gapps/videonoapi/video_utils/youtube/MyYoutubeVideoInfoModel.kt

@@ -0,0 +1,31 @@
+package com.gapps.videonoapi.video_utils.youtube
+
+import com.gapps.library.api.FORMAT
+import com.gapps.library.api.FORMAT_JSON
+import com.gapps.library.api.URL
+import com.gapps.library.api.models.api.YoutubeVideoInfoModel
+import com.gapps.library.api.models.video.youtube.YoutubeResponse
+
+class MyYoutubeVideoInfoModel: YoutubeVideoInfoModel() {
+	override val baseUrl: String
+		get() = "https://www.youtube.com"
+	//https://regex101.com/r/nJzgG0/1
+	override val pattern: String
+		get() = "(?:http[s]?:\\/\\/)(?:www.)?(?:m.)?youtu(?:be|.be)?(?:\\.com)?(?:(?:\\w*.?:\\/\\/)?\\w*.?\\w*-?.?\\w*\\/(?:embed|e|v|watch|.*\\/)?\\??(?:feature=\\w*\\.?\\w*)?&?(?:v=)?\\/?)([\\w\\d_-]{11})[^,;\\s]*"
+	override val idPattern: String
+		get() = pattern
+	override val type: Class<YoutubeResponse>
+		get() = YoutubeResponse::class.java
+	override val hostingName: String
+		get() = "YouTube"
+
+	override fun getInfoUrl(incomingUrl: String?): String? {
+		val id = parseVideoId(incomingUrl)
+
+		return "$baseUrl/oembed?$FORMAT=$FORMAT_JSON&$URL=https://www.youtube.com/watch?v=$id"
+	}
+
+	override fun getPlayLink(videoId: String): String {
+		return "https://www.youtube.com/embed/${videoId}?autoplay=0&vq=small&hl=uk"
+	}
+}

library/src/main/java/com/gapps/library/api/VideoService.kt

@@ -43,6 +43,11 @@ class VideoService(
 			builder.isLogEnabled,
 			builder.customModels
 	) {
+
+		customModels.forEach { custom ->
+			videoInfoModelsList.removeAll { it.hostingName == custom.hostingName }
+		}
+
 		videoInfoModelsList.addAll(customModels)
 	}
 

library/src/main/java/com/gapps/library/api/models/api/CoubVideoInfoModel.kt

@@ -5,9 +5,9 @@ import com.gapps.library.api.URL
 import com.gapps.library.api.models.api.base.VideoInfoModel
 import com.gapps.library.api.models.video.coub.CoubResponse
 
-class CoubVideoInfoModel : VideoInfoModel<CoubResponse>() {
+open class CoubVideoInfoModel : VideoInfoModel<CoubResponse>() {
 	override val baseUrl: String
-		get() = "http://coub.com/"
+		get() = "http://coub.com"
 
 	//https://regex101.com/r/ZoQVLa/1
 	override val pattern: String

library/src/main/java/com/gapps/library/api/models/api/DailymotionVideoInfoModel.kt

@@ -4,7 +4,7 @@ import com.gapps.library.api.URL
 import com.gapps.library.api.models.api.base.VideoInfoModel
 import com.gapps.library.api.models.video.dailymotion.DailymotionResponse
 
-class DailymotionVideoInfoModel : VideoInfoModel<DailymotionResponse>() {
+open class DailymotionVideoInfoModel : VideoInfoModel<DailymotionResponse>() {
 	override val baseUrl: String
 		get() = "https://www.dailymotion.com"
 

library/src/main/java/com/gapps/library/api/models/api/FacebookVideoInfoModel.kt

@@ -5,7 +5,7 @@ import com.gapps.library.api.URL
 import com.gapps.library.api.models.api.base.VideoInfoModel
 import com.gapps.library.api.models.video.facebook.FacebookResponse
 
-class FacebookVideoInfoModel : VideoInfoModel<FacebookResponse>() {
+open class FacebookVideoInfoModel : VideoInfoModel<FacebookResponse>() {
 	override val baseUrl: String
 		get() = "https://apps.facebook.com"
 	//Pattern: https://regex101.com/r/98Nfkr/5

library/src/main/java/com/gapps/library/api/models/api/HuluVideoInfoModel.kt

@@ -6,7 +6,7 @@ import com.gapps.library.api.URL
 import com.gapps.library.api.models.api.base.VideoInfoModel
 import com.gapps.library.api.models.video.hulu.HuluResponse
 
-class HuluVideoInfoModel : VideoInfoModel<HuluResponse>() {
+open class HuluVideoInfoModel : VideoInfoModel<HuluResponse>() {
 	override val baseUrl: String
 		get() = "https://www.hulu.com"
 	//https://regex101.com/r/LORZgZ/2

library/src/main/java/com/gapps/library/api/models/api/RutubeVideoInfoModel.kt

@@ -6,9 +6,9 @@ import com.gapps.library.api.URL
 import com.gapps.library.api.models.api.base.VideoInfoModel
 import com.gapps.library.api.models.video.rutube.RutubeResponse
 
-class RutubeVideoInfoModel : VideoInfoModel<RutubeResponse>() {
+open class RutubeVideoInfoModel : VideoInfoModel<RutubeResponse>() {
 	override val baseUrl: String
-		get() = "http://rutube.ru/api"
+		get() = "http://rutube.ru"
 	override val pattern: String
 		get() = "(?:http[s]?://)(?:w{3})?(?:player\\.)?rutube\\.ru/video/(?:embed/)?([A-Za-z0-9]+)[^,\\s]*"
 	override val idPattern: String
@@ -22,9 +22,9 @@ class RutubeVideoInfoModel : VideoInfoModel<RutubeResponse>() {
 		val id = parseVideoId(incomingUrl) ?: return null
 
 		return if (id.length < 32) {
-			"$baseUrl/oembed?$FORMAT=$FORMAT_JSON&$URL=$id"
+			"$baseUrl/api/oembed?$FORMAT=$FORMAT_JSON&$URL=$id"
 		} else {
-			"$baseUrl/video/$id/"
+			"$baseUrl/api/video/$id/"
 		}
 	}
 

library/src/main/java/com/gapps/library/api/models/api/TedTalksVideoInfoModel.kt

@@ -5,7 +5,7 @@ import com.gapps.library.api.URL
 import com.gapps.library.api.models.api.base.VideoInfoModel
 import com.gapps.library.api.models.video.ted.TedTalksResponse
 
-class TedTalksVideoInfoModel : VideoInfoModel<TedTalksResponse>() {
+open class TedTalksVideoInfoModel : VideoInfoModel<TedTalksResponse>() {
 	override val baseUrl: String
 		get() = "https://www.ted.com"
 	override val pattern: String

library/src/main/java/com/gapps/library/api/models/api/UstreamVideoInfoModel.kt

@@ -5,9 +5,9 @@ import com.gapps.library.api.models.api.base.VideoInfoModel
 import com.gapps.library.api.models.video.ustream.UstreamResponse
 import com.gapps.library.utils.getGroupValue
 
-class UstreamVideoInfoModel : VideoInfoModel<UstreamResponse>() {
+open class UstreamVideoInfoModel : VideoInfoModel<UstreamResponse>() {
 	override val baseUrl: String
-		get() = "https://video.ibm.com/"
+		get() = "https://video.ibm.com"
 	//https://regex101.com/r/E0PMAV/2
 	override val pattern: String
 		get() = "(?:http[s]?:\\/\\/)?(?:www\\.)?ustream.(?:com|tv)\\/(?:recorded|embed|channel)\\/?(?:([0-9]+)|(\\S+))[^,;\\s]*"