differ between URL and file custom bg

This commit is contained in:
SpikeHD
2022-06-01 19:04:21 -07:00
parent c1973a2d2e
commit 54d400d67b
2 changed files with 34 additions and 14 deletions

View File

@@ -92,9 +92,22 @@ class App extends React.Component<IProps, IState> {
bgFile: bgLoc
}, this.forceUpdate)
}
} else this.setState({
bgFile: convertFileSrc(custom_bg)
}, this.forceUpdate)
} else {
const isUrl = /^(?:http(s)?:\/\/)/gm.test(custom_bg)
console.log(isUrl)
if (!isUrl) {
this.setState({
bgFile: convertFileSrc(custom_bg)
}, this.forceUpdate)
} else {
this.setState({
bgFile: custom_bg
}, this.forceUpdate)
}
}
if (!cert_generated) {
// Generate the certificate

View File

@@ -84,18 +84,25 @@ export default class Options extends React.Component<IProps, IState> {
}
async setCustomBackground(value: string) {
const filename = value.replace(/\\/g, '/').split('/').pop()
const localBgPath = (await dataDir() as string).replace(/\\/g, '/')
const isUrl = /^(?:http(s)?:\/\/)/gm.test(value)
await setConfigOption('customBackground', `${localBgPath}/cultivation/bg/${filename}`)
// Copy the file over to the local directory
await invoke('copy_file', {
path: value.replace(/\\/g, '/'),
newPath: `${localBgPath}cultivation/bg/`
})
window.location.reload()
if (!isUrl) {
const filename = value.replace(/\\/g, '/').split('/').pop()
const localBgPath = (await dataDir() as string).replace(/\\/g, '/')
await setConfigOption('customBackground', `${localBgPath}/cultivation/bg/${filename}`)
// Copy the file over to the local directory
await invoke('copy_file', {
path: value.replace(/\\/g, '/'),
newPath: `${localBgPath}cultivation/bg/`
})
window.location.reload()
} else {
await setConfigOption('customBackground', value)
window.location.reload()
}
}
render() {