lasers/FreeTube
1
0
Fork 0
mirror of https://github.com/FreeTubeApp/FreeTube synced 2024-12-11 20:19:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix Invidious Fallback logic

Browse Source
This commit is contained in:
Preston 2020-10-31 11:23:26 -04:00
parent 3c8dfb84b5
commit de3cff57c5
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/renderer/store/modules/invidious.js
View File

@ -28,16 +28,6 @@ const actions = {
})
},
/* eslint-disable-next-line */
invidiousDefaultErrorHandler({}, xhr) {
if (typeof (xhr.responseJSON.error) !== 'undefined') {
console.log('Invidious API Error: ' + xhr.responseJSON.error)
} else {
console.log('There was an error calling the Invidious API')
console.log(xhr)
}
},
invidiousGetChannelInfo ({ commit, dispatch }, channelId) {
return new Promise((resolve, reject) => {
commit('toggleIsGetChannelInfoRunning')
@ -53,7 +43,6 @@ const actions = {
}).catch((xhr) => {
console.log('found an error')
console.log(xhr)
dispatch('invidiousDefaultErrorHandler', xhr)
commit('toggleIsGetChannelInfoRunning')
reject(xhr)
})
@ -67,7 +56,6 @@ const actions = {
}).catch((xhr) => {
console.log('found an error')
console.log(xhr)
dispatch('invidiousDefaultErrorHandler', xhr)
commit('toggleIsGetChannelInfoRunning')
reject(xhr)
})
@ -87,7 +75,6 @@ const actions = {
}).catch((xhr) => {
console.log('found an error')
console.log(xhr)
dispatch('invidiousDefaultErrorHandler', xhr)
reject(xhr)
})
})

10
src/renderer/views/Watch/Watch.js
View File

@ -427,7 +427,7 @@ export default Vue.extend({
}
})
console.log(err)
if (!this.usingElectron || (this.backendPreference === 'local' && this.backendFallback && !err.includes('private'))) {
if (!this.usingElectron || (this.backendPreference === 'local' && this.backendFallback && !err.toString().includes('private'))) {
this.showToast({
message: this.$t('Falling back to Invidious API')
})
@ -580,16 +580,17 @@ export default Vue.extend({
}
}
this.isLoading = false
this.updateTitle()
this.isLoading = false
})
.catch(err => {
const errorMessage = this.$t('Invidious API Error (Click to copy)')
this.showToast({
message: `${errorMessage}: ${err}`,
message: `${errorMessage}: ${err.responseText}`,
time: 10000,
action: () => {
navigator.clipboard.writeText(err)
navigator.clipboard.writeText(err.responseText)
}
})
console.log(err)
@ -600,7 +601,6 @@ export default Vue.extend({
this.getVideoInformationLocal()
} else {
this.isLoading = false
// TODO: Show toast with error message
}
})
},