Merge branch 'feature/playlist-search-videos-in-one-user-playlist-2' …

…into custom-builds/tmp

* feature/playlist-search-videos-in-one-user-playlist-2:
  Fix local API search erroring, because the default parameter values were not getting applied (FreeTubeApp#4704)
  * Show message when search returns no result
  ! Fix load more button appears when searching & visible items under pagination limit
  * Update single playlist view for user playlists to add search video function

src/renderer/components/playlist-info/playlist-info.js

@@ -5,10 +5,12 @@ import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import FtPrompt from '../ft-prompt/ft-prompt.vue'
+import FtButton from '../ft-button/ft-button.vue'
 import {
   formatNumber,
   showToast,
 } from '../../helpers/utils'
+import debounce from 'lodash.debounce'
 
 export default defineComponent({
   name: 'PlaylistInfo',
@@ -18,6 +20,7 @@ export default defineComponent({
     'ft-icon-button': FtIconButton,
     'ft-input': FtInput,
     'ft-prompt': FtPrompt,
+    'ft-button': FtButton,
   },
   props: {
     id: {
@@ -83,6 +86,9 @@ export default defineComponent({
   },
   data: function () {
     return {
+      searchVideoMode: false,
+      query: '',
+      updateQueryDebounce: function() {},
       editMode: false,
       showDeletePlaylistPrompt: false,
       showRemoveVideosOnWatchPrompt: false,
@@ -232,6 +238,8 @@ export default defineComponent({
   created: function () {
     this.newTitle = this.title
     this.newDescription = this.description
+
+    this.updateQueryDebounce = debounce(this.updateQuery, 500)
   },
   methods: {
     toggleCopyVideosPrompt: function (force = false) {
@@ -373,6 +381,25 @@ export default defineComponent({
       showToast(this.$t('User Playlists.SinglePlaylistView.Toast.Quick bookmark disabled'))
     },
 
+    updateQuery(query) {
+      this.query = query
+      this.$emit('search-video-query-change', query)
+    },
+    enableVideoSearchMode() {
+      this.searchVideoMode = true
+      this.$emit('search-video-mode-on')
+
+      nextTick(() => {
+        // Some elements only present after rendering update
+        this.$refs.searchInput.focus()
+      })
+    },
+    disableVideoSearchMode() {
+      this.searchVideoMode = false
+      this.updateQuery('')
+      this.$emit('search-video-mode-off')
+    },
+
     ...mapActions([
       'showAddToPlaylistPromptForManyVideos',
       'updatePlaylist',

src/renderer/components/playlist-info/playlist-info.scss

@@ -73,6 +73,16 @@
   justify-content: flex-end;
 }
 
+.searchInputsRow {
+  margin-block-start: 8px;
+
+  display: grid;
+
+  /* 2 columns */
+  grid-template-columns: 1fr auto;
+  column-gap: 8px;
+}
+
 @media only screen and (max-width: 1250px) {
   :deep(.sharePlaylistIcon .iconDropdown) {
     inset-inline-start: auto;

src/renderer/components/playlist-info/playlist-info.vue

@@ -76,6 +76,7 @@
     <hr>
 
     <div
+      v-if="!searchVideoMode"
       class="channelShareWrapper"
     >
       <router-link
@@ -106,6 +107,13 @@
       </div>
 
       <div class="playlistOptions">
+        <ft-icon-button
+          v-if="isUserPlaylist && !editMode"
+          :title="$t('User Playlists.SinglePlaylistView.Search for Videos')"
+          :icon="['fas', 'search']"
+          theme="secondary"
+          @click="enableVideoSearchMode"
+        />
         <ft-icon-button
           v-if="editMode"
           :title="$t('User Playlists.Save Changes')"
@@ -187,6 +195,28 @@
         @click="handleRemoveVideosOnWatchPromptAnswer"
       />
     </div>
+
+    <div
+      v-if="isUserPlaylist && searchVideoMode"
+      class="searchInputsRow"
+    >
+      <ft-input
+        ref="searchInput"
+        class="searchInput"
+        :placeholder="$t('User Playlists.SinglePlaylistView.Search for Videos')"
+        :show-clear-text-button="true"
+        :show-action-button="false"
+        @input="(input) => updateQueryDebounce(input)"
+        @clear="updateQueryDebounce('')"
+      />
+      <ft-icon-button
+        v-if="isUserPlaylist && searchVideoMode"
+        :title="$t('User Playlists.Cancel')"
+        :icon="['fas', 'times']"
+        theme="secondary"
+        @click="disableVideoSearchMode"
+      />
+    </div>
   </div>
 </template>
 

src/renderer/helpers/api/local.js

@@ -35,23 +35,23 @@ const TRACKING_PARAM_NAMES = [
  * @param {boolean} options.generateSessionLocally generate the session locally or let YouTube generate it (local is faster, remote is more accurate)
  * @returns the Innertube instance
  */
-async function createInnertube(options = { withPlayer: false, location: undefined, safetyMode: false, clientType: undefined, generateSessionLocally: true }) {
+async function createInnertube({ withPlayer = false, location = undefined, safetyMode = false, clientType = undefined, generateSessionLocally = true } = {}) {
   let cache
-  if (options.withPlayer) {
+  if (withPlayer) {
     const userData = await getUserDataPath()
     cache = new PlayerCache(join(userData, 'player_cache'))
   }
 
   return await Innertube.create({
-    retrieve_player: !!options.withPlayer,
-    location: options.location,
-    enable_safety_mode: !!options.safetyMode,
-    client_type: options.clientType,
+    retrieve_player: !!withPlayer,
+    location: location,
+    enable_safety_mode: !!safetyMode,
+    client_type: clientType,
 
     // use browser fetch
     fetch: (input, init) => fetch(input, init),
     cache,
-    generate_session_locally: !!options.generateSessionLocally
+    generate_session_locally: !!generateSessionLocally
   })
 }
 

src/renderer/views/Playlist/Playlist.js

@@ -60,6 +60,9 @@ export default defineComponent({
       getPlaylistInfoDebounce: function() {},
       playlistInEditMode: false,
 
+      playlistInVideoSearchMode: false,
+      videoSearchQuery: '',
+
       promptOpen: false,
     }
   },
@@ -104,7 +107,7 @@ export default defineComponent({
 
     moreVideoDataAvailable() {
       if (this.isUserPlaylistRequested) {
-        return this.userPlaylistVisibleLimit < this.videoCount
+        return this.userPlaylistVisibleLimit < this.sometimesFilteredUserPlaylistItems.length
       } else {
         return this.continuationData !== null
       }
@@ -123,17 +126,29 @@ export default defineComponent({
       return this.selectedUserPlaylist?._id !== this.quickBookmarkPlaylistId
     },
 
+    sometimesFilteredUserPlaylistItems() {
+      if (!this.isUserPlaylistRequested) { return this.playlistItems }
+      if (this.processedVideoSearchQuery === '') { return this.playlistItems }
+
+      return this.playlistItems.filter((v) => {
+        return v.title.toLowerCase().includes(this.processedVideoSearchQuery)
+      })
+    },
     visiblePlaylistItems: function () {
       if (!this.isUserPlaylistRequested) {
+        // No filtering for non user playlists yet
         return this.playlistItems
       }
 
-      if (this.userPlaylistVisibleLimit < this.videoCount) {
-        return this.playlistItems.slice(0, this.userPlaylistVisibleLimit)
+      if (this.userPlaylistVisibleLimit < this.sometimesFilteredUserPlaylistItems.length) {
+        return this.sometimesFilteredUserPlaylistItems.slice(0, this.userPlaylistVisibleLimit)
       } else {
-        return this.playlistItems
+        return this.sometimesFilteredUserPlaylistItems
       }
-    }
+    },
+    processedVideoSearchQuery() {
+      return this.videoSearchQuery.trim().toLowerCase()
+    },
   },
   watch: {
     $route () {

src/renderer/views/Playlist/Playlist.vue

@@ -28,6 +28,9 @@
       }"
       @enter-edit-mode="playlistInEditMode = true"
       @exit-edit-mode="playlistInEditMode = false"
+      @search-video-mode-on="playlistInVideoSearchMode = true"
+      @search-video-mode-off="playlistInVideoSearchMode = false"
+      @search-video-query-change="(v) => videoSearchQuery = v"
       @prompt-open="promptOpen = true"
       @prompt-close="promptOpen = false"
     />
@@ -39,48 +42,59 @@
       <template
         v-if="playlistItems.length > 0"
       >
-        <transition-group
-          name="playlistItem"
-          tag="span"
+        <template
+          v-if="visiblePlaylistItems.length > 0"
         >
-          <ft-list-video-numbered
-            v-for="(item, index) in visiblePlaylistItems"
-            :key="`${item.videoId}-${item.playlistItemId || index}`"
-            class="playlistItem"
-            :data="item"
-            :playlist-id="playlistId"
-            :playlist-type="infoSource"
-            :playlist-index="index"
-            :playlist-item-id="item.playlistItemId"
-            appearance="result"
-            :always-show-add-to-playlist-button="true"
-            :quick-bookmark-button-enabled="quickBookmarkButtonEnabled"
-            :can-move-video-up="index > 0"
-            :can-move-video-down="index < visiblePlaylistItems.length - 1"
-            :can-remove-from-playlist="true"
-            :video-index="index"
-            :initial-visible-state="index < 10"
-            @move-video-up="moveVideoUp(item.videoId, item.playlistItemId)"
-            @move-video-down="moveVideoDown(item.videoId, item.playlistItemId)"
-            @remove-from-playlist="removeVideoFromPlaylist(item.videoId, item.playlistItemId)"
-          />
-        </transition-group>
+          <transition-group
+            name="playlistItem"
+            tag="span"
+          >
+            <ft-list-video-numbered
+              v-for="(item, index) in visiblePlaylistItems"
+              :key="`${item.videoId}-${item.playlistItemId || index}`"
+              class="playlistItem"
+              :data="item"
+              :playlist-id="playlistId"
+              :playlist-type="infoSource"
+              :playlist-index="index"
+              :playlist-item-id="item.playlistItemId"
+              appearance="result"
+              :always-show-add-to-playlist-button="true"
+              :quick-bookmark-button-enabled="quickBookmarkButtonEnabled"
+              :can-move-video-up="index > 0 && !playlistInVideoSearchMode"
+              :can-move-video-down="index < playlistItems.length - 1 && !playlistInVideoSearchMode"
+              :can-remove-from-playlist="true"
+              :video-index="index"
+              :initial-visible-state="index < 10"
+              @move-video-up="moveVideoUp(item.videoId, item.playlistItemId)"
+              @move-video-down="moveVideoDown(item.videoId, item.playlistItemId)"
+              @remove-from-playlist="removeVideoFromPlaylist(item.videoId, item.playlistItemId)"
+            />
+          </transition-group>
+          <ft-flex-box
+            v-if="moreVideoDataAvailable && !isLoadingMore"
+          >
+            <ft-button
+              :label="$t('Subscriptions.Load More Videos')"
+              background-color="var(--primary-color)"
+              text-color="var(--text-with-main-color)"
+              @click="getNextPage"
+            />
+          </ft-flex-box>
+          <div
+            v-if="isLoadingMore"
+            class="loadNextPageWrapper"
+          >
+            <ft-loader />
+          </div>
+        </template>
         <ft-flex-box
-          v-if="moreVideoDataAvailable && !isLoadingMore"
+          v-else
         >
-          <ft-button
-            :label="$t('Subscriptions.Load More Videos')"
-            background-color="var(--primary-color)"
-            text-color="var(--text-with-main-color)"
-            @click="getNextPage"
-          />
+          <p class="message">
+            {{ $t("User Playlists['Empty Search Message']") }}
+          </p>
         </ft-flex-box>
-        <div
-          v-if="isLoadingMore"
-          class="loadNextPageWrapper"
-        >
-          <ft-loader />
-        </div>
       </template>
       <ft-flex-box
         v-else

static/locales/en-US.yaml

@@ -187,6 +187,8 @@ User Playlists:
     EarliestPlayedFirst: 'Earliest Played'
 
   SinglePlaylistView:
+    Search for Videos: Search for Videos
+
     Toast:
       This video cannot be moved up.: This video cannot be moved up.
       This video cannot be moved down.: This video cannot be moved down.