$ Change code style

PikachuEXE · Nov 28, 2024 · 82c92d3 · 82c92d3
1 parent 6041e3a
commit 82c92d3
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 33 deletions.
diff --git a/src/renderer/components/ChannelDetails/ChannelDetails.vue b/src/renderer/components/ChannelDetails/ChannelDetails.vue
@@ -207,7 +207,7 @@
           v-if="showSearchBar"
           ref="searchBar"
           :placeholder="$t('Channel.Search Channel')"
-          :value="props.query"
+          :value="query"
           :show-clear-text-button="true"
           class="channelSearch"
           :maxlength="255"

diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
@@ -2039,31 +2039,35 @@ export default defineComponent({
     async saveStateInRouter(query) {
       this.skipRouteChangeWatcherOnce = true
       if (query === '') {
-        await this.$router.replace({ path: `/channel/${this.id}` }).catch(failure => {
+        try {
+          await this.$router.replace({ path: `/channel/${this.id}` })
+        } catch (failure) {
           if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
             return
           }
 
           throw failure
-        })
+        }
         return
       }
 
-      await this.$router.replace({
-        path: `/channel/${this.id}`,
-        params: {
-          currentTab: 'search',
-        },
-        query: {
-          searchQueryText: query,
-        },
-      }).catch(failure => {
+      try {
+        await this.$router.replace({
+          path: `/channel/${this.id}`,
+          params: {
+            currentTab: 'search',
+          },
+          query: {
+            searchQueryText: query,
+          },
+        })
+      } catch (failure) {
         if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
           return
         }
 
         throw failure
-      })
+      }
       this.skipRouteChangeWatcherOnce = false
     },
 

diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
@@ -20,7 +20,7 @@
       :query="lastSearchQuery"
       class="card channelDetails"
       @change-tab="changeTab"
-      @search="(v) => newSearchWithStatePersist(v)"
+      @search="newSearchWithStatePersist"
       @subscribed="handleSubscription"
     />
     <ft-card

diff --git a/src/renderer/views/History/History.js b/src/renderer/views/History/History.js
@@ -152,13 +152,15 @@ export default defineComponent({
 
     async saveStateInRouter({ query = this.query, searchDataLimit = this.searchDataLimit, doCaseSensitiveSearch = this.doCaseSensitiveSearch } = {}) {
       if (query === '') {
-        await this.$router.replace({ name: 'history' }).catch(failure => {
+        try {
+          await this.$router.replace({ name: 'history' })
+        } catch (failure) {
           if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
             return
           }
 
           throw failure
-        })
+        }
         return
       }
 
@@ -167,16 +169,18 @@ export default defineComponent({
         searchDataLimit: searchDataLimit,
       }
       if (doCaseSensitiveSearch) { routerQuery.doCaseSensitiveSearch = 'true' }
-      await this.$router.replace({
-        name: 'history',
-        query: routerQuery,
-      }).catch(failure => {
+      try {
+        await this.$router.replace({
+          name: 'history',
+          query: routerQuery,
+        })
+      } catch (failure) {
         if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
           return
         }
 
         throw failure
-      })
+      }
     },
 
     keyboardShortcutHandler: function (event) {

diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
@@ -624,16 +624,18 @@ export default defineComponent({
         routeQuery.searchQueryText = query
       }
 
-      await this.$router.replace({
-        path: `/playlist/${this.playlistId}`,
-        query: routeQuery,
-      }).catch(failure => {
+      try {
+        await this.$router.replace({
+          path: `/playlist/${this.playlistId}`,
+          query: routeQuery,
+        })
+      } catch (failure) {
         if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
           return
         }
 
         throw failure
-      })
+      }
     },
 
     getIconForSortPreference: (s) => getIconForSortPreference(s),

diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.js b/src/renderer/views/UserPlaylists/UserPlaylists.js
@@ -281,13 +281,15 @@ export default defineComponent({
 
     async saveStateInRouter({ query = this.query, searchDataLimit = this.searchDataLimit, doSearchPlaylistsWithMatchingVideos = this.doSearchPlaylistsWithMatchingVideos } = {}) {
       if (this.query === '') {
-        await this.$router.replace({ name: 'userPlaylists' }).catch(failure => {
+        try {
+          await this.$router.replace({ name: 'userPlaylists' })
+        } catch (failure) {
           if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
             return
           }
 
           throw failure
-        })
+        }
         return
       }
 
@@ -296,16 +298,18 @@ export default defineComponent({
         searchDataLimit: searchDataLimit,
       }
       if (doSearchPlaylistsWithMatchingVideos) { routerQuery.doSearchPlaylistsWithMatchingVideos = 'true' }
-      await this.$router.replace({
-        name: 'userPlaylists',
-        query: routerQuery,
-      }).catch(failure => {
+      try {
+        await this.$router.replace({
+          name: 'userPlaylists',
+          query: routerQuery,
+        })
+      } catch (failure) {
         if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
           return
         }
 
         throw failure
-      })
+      }
     },
 
     keyboardShortcutHandler: function (event) {