Fix subscriptions double loading on launch (FreeTubeApp#5930)

kommunarr · Oct 24, 2024 · 9e00e06 · 9e00e06
1 parent 7ebc910
commit 9e00e06
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/renderer/components/subscriptions-community/subscriptions-community.js b/src/renderer/components/subscriptions-community/subscriptions-community.js
@@ -14,6 +14,7 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
+      alreadyLoadedRemotely: false,
       postList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -97,7 +98,9 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      this.loadPostsFromCacheSometimes()
+      if (!this.alreadyLoadedRemotely) {
+        this.loadPostsFromCacheSometimes()
+      }
     },
   },
   mounted: async function () {
@@ -115,6 +118,7 @@ export default defineComponent({
         return
       }
 
+      this.alreadyLoadedRemotely = true
       this.loadPostsForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForCommunityPostsFirstAutoFetchRun')
     },

diff --git a/src/renderer/components/subscriptions-live/subscriptions-live.js b/src/renderer/components/subscriptions-live/subscriptions-live.js
@@ -21,6 +21,7 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
+      alreadyLoadedRemotely: false,
       videoList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -107,7 +108,9 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      this.loadVideosFromCacheSometimes()
+      if (!this.alreadyLoadedRemotely) {
+        this.loadVideosFromCacheSometimes()
+      }
     },
   },
   mounted: async function () {
@@ -125,6 +128,7 @@ export default defineComponent({
         return
       }
 
+      this.alreadyLoadedRemotely = true
       this.loadVideosForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForLiveStreamsFirstAutoFetchRun')
     },

diff --git a/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js b/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js
@@ -19,6 +19,7 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
+      alreadyLoadedRemotely: false,
       videoList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -101,7 +102,9 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      this.loadVideosFromCacheSometimes()
+      if (!this.alreadyLoadedRemotely) {
+        this.loadVideosFromCacheSometimes()
+      }
     },
   },
   mounted: async function () {
@@ -119,6 +122,7 @@ export default defineComponent({
         return
       }
 
+      this.alreadyLoadedRemotely = true
       this.loadVideosForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForShortsFirstAutoFetchRun')
     },

diff --git a/src/renderer/components/subscriptions-videos/subscriptions-videos.js b/src/renderer/components/subscriptions-videos/subscriptions-videos.js
@@ -21,6 +21,7 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
+      alreadyLoadedRemotely: false,
       videoList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -111,7 +112,9 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      this.loadVideosFromCacheSometimes()
+      if (!this.alreadyLoadedRemotely) {
+        this.loadVideosFromCacheSometimes()
+      }
     },
   },
   mounted: async function () {
@@ -129,6 +132,7 @@ export default defineComponent({
         return
       }
 
+      this.alreadyLoadedRemotely = true
       this.loadVideosForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForVideosFirstAutoFetchRun')
     },