print quiteaplaylist and google links for deleted videos (#22)

shalva97 · Oct 1, 2022 · 23ab845 · 23ab845
1 parent 9f52948
commit 23ab845
Show file tree

Hide file tree

Showing 10 changed files with 204 additions and 465 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "1.7.20"
+    kotlin("multiplatform") version "1.7.10"
     kotlin("plugin.serialization") version "1.6.10"
 //    id("com.github.johnrengelman.shadow") version "7.1.2" // TODO also add support for jvm
     id("com.adarshr.test-logger") version "3.2.0"

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/src/commonMain/kotlin/models/Channel.kt b/src/commonMain/kotlin/models/Channel.kt
@@ -0,0 +1,10 @@
+package models
+
+data class Channel(val name: String, val url: String) {
+    companion object {
+        operator fun invoke(video: YoutubeVideo): Channel {
+            val first = video.channel?.first()
+            return Channel(first?.name ?: "unknown channel", first?.url ?: "unknown url")
+        }
+    }
+}
diff --git a/src/commonMain/kotlin/models/ChannelStatistics.kt b/src/commonMain/kotlin/models/ChannelStatistics.kt
@@ -0,0 +1,7 @@
+package models
+
+data class ChannelStatistics(val channel: Channel, val timesClicked: Int) {
+    override fun toString(): String {
+        return " - [${channel.name} - ${timesClicked}](${channel.url})"
+    }
+}
diff --git a/src/commonMain/kotlin/models/VideoStatistics.kt b/src/commonMain/kotlin/models/VideoStatistics.kt
@@ -3,34 +3,31 @@ package models
 import kotlinx.datetime.Instant
 
 data class VideoStatistics(
-    val title: String,
+    private val title: String,
     val firstTimeWatched: Instant,
     val timesClicked: Int,
     val url: String,
     val channel: Channel,
 ) {
-    override fun toString(): String {
-        return " - [${getVideoName(this)} - ${timesClicked}](${url})"
-    }
-
-    private fun getVideoName(music: VideoStatistics): String {
-        return music.title.replace(VIDEO_PREFIX, "")
-    }
-}
+    val name: String = getVideoName(title)
+    val isDeleted: Boolean = name == url
 
-data class ChannelStatistics(val channel: Channel, val timesClicked: Int) {
     override fun toString(): String {
-        return " - [${channel.name} - ${timesClicked}](${channel.url})"
+        return if (isDeleted) {
+            " - Deleted Video $videoID - [quiteaplaylist]($QUITE_A_PLAYLIST$url) - [Google]($GOOGLE$url)"
+        } else {
+            " - [${name} - ${timesClicked}](${url})"
+        }
     }
 }
 
-data class Channel(val name: String, val url: String) {
-    companion object {
-        operator fun invoke(video: YoutubeVideo): Channel {
-            val first = video.channel?.first()
-            return Channel(first?.name ?: "unknown channel", first?.url ?: "unknown url")
-        }
-    }
+private val VideoStatistics.videoID
+    get() = url.split('=').last()
+
+private fun getVideoName(title: String): String {
+    return title.replace(VIDEO_PREFIX, "")
 }
 
 private const val VIDEO_PREFIX = "Watched "
+private const val QUITE_A_PLAYLIST = "https://quiteaplaylist.com/search?url="
+private const val GOOGLE = "https://www.google.com/search?q="
diff --git a/src/commonTest/kotlin/MonthTest.kt b/src/commonTest/kotlin/MonthTest.kt
@@ -1,6 +1,3 @@
-import kotlinx.datetime.Instant
-import models.Channel
-import models.VideoStatistics
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -16,33 +13,11 @@ class MonthTest {
     }
 }
 
-val someRandomVideo = VideoStatistics(
-    title = "Watched Cepheid - Gaia (feat. Nonon & Sithu Aye)",
-    firstTimeWatched = Instant.parse("2020-05-14T15:48:29.760Z"),
-    timesClicked = 6,
-    url = "https://www.youtube.com/watch?v=SZvrKO763Mc",
-    channel = Channel(
-        name = "Watched Cepheid -Gaia(feat.Nonon & Sithu Aye)",
-        url = "https://www.youtube.com/watch?v=SZvrKO763Mc"
-    )
-)
-
 const val someRandomVideoString = """### MAY
 
  - [Cepheid - Gaia (feat. Nonon & Sithu Aye) - 6](https://www.youtube.com/watch?v=SZvrKO763Mc)
 """
 
-val anotherRandomVideo = VideoStatistics(
-    title = "Watched Owl vision - zyborg | Music Visualization",
-    firstTimeWatched = Instant.parse("2021-02-13T19:52:45.459Z"),
-    timesClicked = 3,
-    url = "https://www.youtube.com/watch?v=HkNU0FTBYEI",
-    channel = Channel(
-        name = "Watched Owl vision - zyborg | Music Visualization",
-        url = "https://www.youtube.com/watch?v=HkNU0FTBYEI"
-    )
-)
-
 const val anotherRandomVideoString = """### FEBRUARY
 
  - [Owl vision - zyborg | Music Visualization - 3](https://www.youtube.com/watch?v=HkNU0FTBYEI)

diff --git a/src/commonTest/kotlin/VideoStatisticsTest.kt b/src/commonTest/kotlin/VideoStatisticsTest.kt
@@ -6,7 +6,16 @@ class VideoStatisticsTest {
     fun toString_returnsMarkdownFormattedEntry() {
         assertEquals(statisticsText, someRandomVideo.toString())
     }
+
+    @Test
+    fun toString_returnsCorrectTextWhenVideoIsDeleted() {
+        assertEquals(deletedVideoText, someRandomDeletedVideo.toString())
+    }
+
 }
 
 private const val statisticsText =
-    " - [Cepheid - Gaia (feat. Nonon & Sithu Aye) - 6](https://www.youtube.com/watch?v=SZvrKO763Mc)"
+    " - [Cepheid - Gaia (feat. Nonon & Sithu Aye) - 6](https://www.youtube.com/watch?v=SZvrKO763Mc)"
+
+private const val deletedVideoText =
+    " - Deleted Video _rfxqRRN2hM - [quiteaplaylist](https://quiteaplaylist.com/search?url=https://www.youtube.com/watch?v=_rfxqRRN2hM) - [Google](https://www.google.com/search?q=https://www.youtube.com/watch?v=_rfxqRRN2hM)"
diff --git a/src/commonTest/kotlin/YoutubeHistoryTest.kt b/src/commonTest/kotlin/YoutubeHistoryTest.kt
@@ -16,9 +16,9 @@ class YoutubeHistoryTest {
     fun topTenVideos_sortingIsByMostTimesClickedVideo() {
         val top10 = YoutubeHistory(sampleData, 0).topTenVideos()
 
-        assertTrue(top10[0].title == "Watched Sabaton - To Hell And Back")
-        assertTrue(top10[1].title == "Watched WIND ROSE - Diggy Diggy Hole (Official Video) | Napalm Records")
-        assertTrue(top10[2].title == "Watched Happy Halloween (feat. Megumi) 【Intense Symphonic Metal Cover】")
+        assertTrue(top10[0].name == "Sabaton - To Hell And Back")
+        assertTrue(top10[1].name == "WIND ROSE - Diggy Diggy Hole (Official Video) | Napalm Records")
+        assertTrue(top10[2].name == "Happy Halloween (feat. Megumi) 【Intense Symphonic Metal Cover】")
     }
 
     @Test

diff --git a/src/commonTest/kotlin/sampleData.kt b/src/commonTest/kotlin/sampleData.kt
@@ -1,3 +1,40 @@
+import kotlinx.datetime.Instant
+import models.Channel
+import models.VideoStatistics
+
+val someRandomVideo = VideoStatistics(
+    title = "Watched Cepheid - Gaia (feat. Nonon & Sithu Aye)",
+    firstTimeWatched = Instant.parse("2020-05-14T15:48:29.760Z"),
+    timesClicked = 6,
+    url = "https://www.youtube.com/watch?v=SZvrKO763Mc",
+    channel = Channel(
+        name = "Watched Cepheid -Gaia(feat.Nonon & Sithu Aye)",
+        url = "https://www.youtube.com/watch?v=SZvrKO763Mc"
+    )
+)
+
+val someRandomDeletedVideo = VideoStatistics(
+    title = "Watched https://www.youtube.com/watch?v\u003d_rfxqRRN2hM",
+    firstTimeWatched = Instant.parse("2018-12-06T00:30:28.390Z"),
+    timesClicked = 6,
+    url = "https://www.youtube.com/watch?v\u003d_rfxqRRN2hM",
+    channel = Channel(
+        name = "Some Channel Name here",
+        url = "https://www.youtube.com/watch?v=SZvrKO763Mc"
+    )
+)
+
+val anotherRandomVideo = VideoStatistics(
+    title = "Watched Owl vision - zyborg | Music Visualization",
+    firstTimeWatched = Instant.parse("2021-02-13T19:52:45.459Z"),
+    timesClicked = 3,
+    url = "https://www.youtube.com/watch?v=HkNU0FTBYEI",
+    channel = Channel(
+        name = "Watched Owl vision - zyborg | Music Visualization",
+        url = "https://www.youtube.com/watch?v=HkNU0FTBYEI"
+    )
+)
+
 // TODO reformat
 const val sampleData = """
 [

diff --git a/web/build.gradle.kts b/web/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("js")
-    id("org.jetbrains.compose") version "1.2.0-alpha01-dev750"
+    id("org.jetbrains.compose") version "1.2.0-beta02"
 }
 
 group = "com.github.shalva97"