Add Play All link when possible, parse more types

FreeTubeApp · Nov 20, 2024 · 170e473 · 170e473
1 parent 4c2e832
commit 170e473
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 2 deletions.
diff --git a/src/renderer/components/ChannelHome/ChannelHome.css b/src/renderer/components/ChannelHome/ChannelHome.css
@@ -10,3 +10,19 @@
   border-color: var(--primary-color);
 }
 
+.playAllSpan {
+  font-size: large;
+  margin-inline-start: 10px;
+}
+
+.playAllLink {
+  font-style: italic;
+  padding-block: 5px;
+  padding-inline: 7px;
+  border-radius: 10px;
+  text-decoration: none;
+}
+
+.playAllLink:hover {
+  background-color: var(--bg-color);
+}
diff --git a/src/renderer/components/ChannelHome/ChannelHome.vue b/src/renderer/components/ChannelHome/ChannelHome.vue
@@ -9,6 +9,24 @@
           class="shelfTitle"
         >
           {{ shelf.title }}
+          <span
+            v-if="shelf.playlistId"
+            class="playAllSpan"
+          >
+            <router-link
+              class="playAllLink"
+              :to="{
+                path: `/playlist/${shelf.playlistId}`,
+                query: searchSettings
+              }"
+            >
+              <FontAwesomeIcon
+                class="thumbnail"
+                :icon="['fas', 'play']"
+              />
+              {{ $t('Channel.Home.Play all') }}
+            </router-link>
+          </span>
           <hr class="shelfUnderline">
         </summary>
         <FtElementList

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
@@ -884,7 +884,8 @@ export function parseChannelHomeTab(homeTab) {
         const shelf = itemSection.contents.at(0)
         shelves.push({
           title: shelf.title.text,
-          content: shelf.content.items.map(parseListItem).filter(_ => _)
+          content: shelf.content.items.map(parseListItem).filter(_ => _),
+          playlistId: shelf.play_all_button?.endpoint.payload.playlistId
         })
       } else if (itemSection.contents.at(0).type === 'ReelShelf') {
         /** @type {import('youtubei.js').YTNodes.ReelShelf} */
@@ -893,6 +894,13 @@ export function parseChannelHomeTab(homeTab) {
           title: shelf.title.text,
           content: shelf.items.map(parseListItem).filter(_ => _)
         })
+      } else if (itemSection.contents.at(0).type === 'HorizontalCardList') {
+        /** @type {import('youtubei.js').YTNodes.HorizontalCardList} */
+        const shelf = itemSection.contents.at(0)
+        shelves.push({
+          title: shelf.header.title.text,
+          content: shelf.cards.map(parseListItem).filter(_ => _)
+        })
       }
     } else if (section.type === 'RichSection') {
       /** @type {import('youtubei.js').YTNodes.RichShelf} */
@@ -1053,13 +1061,28 @@ export function parseLocalListVideo(item) {
   } else if (item.type === 'GridVideo') {
     /** @type {import('youtubei.js').YTNodes.GridVideo} */
     const video = item
+
+    let publishedText
+
+    if (video.published != null && !video.published.isEmpty()) {
+      publishedText = video.published.text
+    }
+
+    const published = calculatePublishedDate(
+      publishedText,
+      video.is_live,
+      video.is_upcoming || video.is_premiere,
+      video.upcoming
+    )
+
     return {
       type: 'video',
       videoId: video.id,
       title: video.title.text,
       author: video.author?.name,
       authorId: video.author?.id,
       viewCount: video.views.text == null ? null : extractNumberFromString(video.views.text),
+      published,
       lengthSeconds: Number(timestampToDuration(video.duration.text)),
       isUpcoming: video.is_upcoming,
       premiereDate: video.upcoming
@@ -1101,7 +1124,7 @@ export function parseLocalListVideo(item) {
       author: video.author.name,
       authorId: video.author.id,
       description: video.description,
-      viewCount: video.view_count == null ? null : extractNumberFromString(video.view_count.text),
+      viewCount: isNaN(video.view_count) ? (video.short_view_count.text == null ? null : parseLocalSubscriberCount(video.short_view_count.text)) : extractNumberFromString(video.view_count.text),
       published,
       lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
       liveNow: video.is_live,
@@ -1162,7 +1185,21 @@ function parseListItem(item) {
     case 'Video':
     case 'GridVideo':
     case 'GridMovie':
+    case 'VideoCard':
       return parseLocalListVideo(item)
+    case 'GameCard': {
+      /** @type {import('youtubei.js').YTNodes.GameCard} */
+      const channel = item
+      /** @type {import('youtubei.js').YTNodes.GameDetails} */
+      const game = channel.game
+      return {
+        type: 'channel',
+        dataSource: 'local',
+        thumbnail: game.box_art.at(0).url,
+        name: game.title.text,
+        id: game.endpoint.payload.browseId
+      }
+    }
     case 'GridChannel': {
       /** @type {import('youtubei.js').YTNodes.GridChannel} */
       const channel = item

diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
@@ -744,6 +744,7 @@ Channel:
       Oldest: Oldest
   Home:
     Home: Home
+    Play all: Play all
   Podcasts:
     Podcasts: Podcasts
     This channel does not currently have any podcasts: This channel does not currently have any podcasts