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

Fix handling when the channel scraper fails

This commit is contained in:
Preston 2020-09-12 16:59:49 -04:00
parent cc77cd9a6a
commit f440a5b38c
2 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/renderer/components/data-settings/data-settings.js
View File

@ -247,6 +247,8 @@ export default Vue.extend({
this.updateShowProgressBar(true)
this.setProgressBarPercentage(0)
let count = 0
feedData.forEach(async (channel, index) => {
const channelId = channel.xmlurl.replace('https://www.youtube.com/feeds/videos.xml?channel_id=', '')
let channelInfo
@ -256,6 +258,7 @@ export default Vue.extend({
channelInfo = await this.getChannelInfoLocal(channelId)
}
if (typeof channelInfo.author !== 'undefined') {
const subscription = {
id: channelId,
name: channelInfo.author,
@ -263,17 +266,27 @@ export default Vue.extend({
}
subscriptions.push(subscription)
}
const progressPercentage = ((subscriptions.length + 1) / feedData.length) * 100
count++
const progressPercentage = (count / feedData.length) * 100
this.setProgressBarPercentage(progressPercentage)
if (subscriptions.length === feedData.length) {
if (count === feedData.length) {
primaryProfile.subscriptions = primaryProfile.subscriptions.concat(subscriptions)
this.updateProfile(primaryProfile)
if (subscriptions.length < count) {
this.showToast({
message: this.$t('Settings.Data Settings.One or more subscriptions were unable to be imported')
})
} else {
this.showToast({
message: this.$t('Settings.Data Settings.All subscriptions have been successfully imported')
})
}
this.updateShowProgressBar(false)
}
})
@ -331,6 +344,8 @@ export default Vue.extend({
this.updateShowProgressBar(true)
this.setProgressBarPercentage(0)
let count = 0
newPipeSubscriptions.forEach(async (channel, index) => {
const channelId = channel.url.replace(/https:\/\/(www\.)?youtube\.com\/channel\//, '')
let channelInfo
@ -340,6 +355,7 @@ export default Vue.extend({
channelInfo = await this.getChannelInfoLocal(channelId)
}
if (typeof channelInfo.author !== 'undefined') {
const subscription = {
id: channelId,
name: channelInfo.author,
@ -347,17 +363,27 @@ export default Vue.extend({
}
subscriptions.push(subscription)
}
const progressPercentage = ((subscriptions.length + 1) / newPipeSubscriptions.length) * 100
count++
const progressPercentage = (count / newPipeSubscriptions.length) * 100
this.setProgressBarPercentage(progressPercentage)
if (subscriptions.length === newPipeSubscriptions.length) {
if (count === newPipeSubscriptions.length) {
primaryProfile.subscriptions = primaryProfile.subscriptions.concat(subscriptions)
this.updateProfile(primaryProfile)
if (subscriptions.length < count) {
this.showToast({
message: this.$t('Settings.Data Settings.One or more subscriptions were unable to be imported')
})
} else {
this.showToast({
message: this.$t('Settings.Data Settings.All subscriptions have been successfully imported')
})
}
this.updateShowProgressBar(false)
}
})

1
static/locales/en-US.yaml
View File

@ -202,6 +202,7 @@ Settings:
Profile object has insufficient data, skipping item: Profile object has insufficient data, skipping item
All subscriptions and profiles have been successfully imported: All subscriptions and profiles have been successfully imported
All subscriptions have been successfully imported: All subscriptions have been successfully imported
One or more subscriptions were unable to be imported: One or more subscriptions were unable to be imported
Invalid subscriptions file: Invalid subscriptions file
This might take a while, please wait: This might take a while, please wait
Invalid history file: Invalid history file