tesses50
/
freetube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Subscription List when changing profiles in a different view

This commit is contained in:
Preston 2020-09-28 20:48:20 -04:00
parent 09740d4edf
commit 70d5b3453f
2 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/renderer/themes.css
View File

@ -472,6 +472,7 @@ a:visited {
::-webkit-scrollbar-thumb {
background: var(--scrollbar-color);
border-radius: 6px;
height: 6px;
}
::-webkit-scrollbar-thumb:hover {

68
src/renderer/views/Subscriptions/Subscriptions.js
View File

@ -86,27 +86,7 @@ export default Vue.extend({
},
watch: {
activeProfile: async function (val) {
if (this.allSubscriptionsList.length !== 0) {
this.isLoading = true
this.videoList = await Promise.all(this.allSubscriptionsList.filter((video) => {
const channelIndex = this.activeSubscriptionList.findIndex((x) => {
return x.id === video.authorId
})
const historyIndex = this.historyCache.findIndex((x) => {
return x.videoId === video.videoId
})
if (this.hideWatchedSubs) {
return channelIndex !== -1 && historyIndex === -1
} else {
return channelIndex !== -1
}
}))
this.isLoading = false
} else {
this.getSubscriptions()
}
this.getProfileSubscriptions()
}
},
mounted: async function () {
@ -117,17 +97,21 @@ export default Vue.extend({
}
if (this.profileSubscriptions.videoList.length !== 0) {
const subscriptionList = JSON.parse(JSON.stringify(this.profileSubscriptions))
if (this.hideWatchedSubs) {
this.videoList = await Promise.all(subscriptionList.videoList.filter((video) => {
const historyIndex = this.historyCache.findIndex((x) => {
return x.videoId === video.videoId
})
if (this.profileSubscriptions.activeProfile === this.activeProfile) {
const subscriptionList = JSON.parse(JSON.stringify(this.profileSubscriptions))
if (this.hideWatchedSubs) {
this.videoList = await Promise.all(subscriptionList.videoList.filter((video) => {
const historyIndex = this.historyCache.findIndex((x) => {
return x.videoId === video.videoId
})
return historyIndex === -1
}))
return historyIndex === -1
}))
} else {
this.videoList = subscriptionList.videoList
}
} else {
this.videoList = subscriptionList.videoList
this.getProfileSubscriptions()
}
this.isLoading = false
@ -205,6 +189,30 @@ export default Vue.extend({
})
},
getProfileSubscriptions: async function () {
if (this.allSubscriptionsList.length !== 0) {
this.isLoading = true
this.videoList = await Promise.all(this.allSubscriptionsList.filter((video) => {
const channelIndex = this.activeSubscriptionList.findIndex((x) => {
return x.id === video.authorId
})
const historyIndex = this.historyCache.findIndex((x) => {
return x.videoId === video.videoId
})
if (this.hideWatchedSubs) {
return channelIndex !== -1 && historyIndex === -1
} else {
return channelIndex !== -1
}
}))
this.isLoading = false
} else {
this.getSubscriptions()
}
},
getChannelVideosLocalScraper: function (channel, failedAttempts = 0) {
return new Promise((resolve, reject) => {
ytch.getChannelVideos(channel.id, 'latest').then(async (response) => {