mirror of https://github.com/FreeTubeApp/FreeTube
fix loading invidious instances from static file for electron builds (#4681)
This commit is contained in:
parent
b2fff65ca6
commit
d15dd43d07
|
@ -39,6 +39,7 @@ const actions = {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the invidious instance fetch isn't returning anything interpretable
|
// If the invidious instance fetch isn't returning anything interpretable
|
||||||
if (instances.length === 0) {
|
if (instances.length === 0) {
|
||||||
// Fallback: read from static file
|
// Fallback: read from static file
|
||||||
|
@ -46,7 +47,6 @@ const actions = {
|
||||||
/* eslint-disable-next-line n/no-path-concat */
|
/* eslint-disable-next-line n/no-path-concat */
|
||||||
const fileLocation = process.env.NODE_ENV === 'development' ? './static/' : `${__dirname}/static/`
|
const fileLocation = process.env.NODE_ENV === 'development' ? './static/' : `${__dirname}/static/`
|
||||||
const filePath = `${fileLocation}${fileName}`
|
const filePath = `${fileLocation}${fileName}`
|
||||||
if (!process.env.IS_ELECTRON) {
|
|
||||||
console.warn('reading static file for invidious instances')
|
console.warn('reading static file for invidious instances')
|
||||||
const fileData = process.env.IS_ELECTRON ? await fs.readFile(filePath, 'utf8') : await (await fetch(createWebURL(filePath))).text()
|
const fileData = process.env.IS_ELECTRON ? await fs.readFile(filePath, 'utf8') : await (await fetch(createWebURL(filePath))).text()
|
||||||
instances = JSON.parse(fileData).filter(e => {
|
instances = JSON.parse(fileData).filter(e => {
|
||||||
|
@ -55,7 +55,6 @@ const actions = {
|
||||||
return e.url
|
return e.url
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
|
||||||
commit('setInvidiousInstancesList', instances)
|
commit('setInvidiousInstancesList', instances)
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue