mirror of
https://github.com/advplyr/audiobookshelf-app.git
synced 2025-08-04 10:04:39 +02:00
Check app version, fix close stream bug, show audiobook progress, add toasts
This commit is contained in:
parent
98076927ff
commit
619b6f3686
51 changed files with 551 additions and 141 deletions
|
@ -9,18 +9,13 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { AppUpdate } from '@robingenz/capacitor-app-update'
|
||||
|
||||
export default {
|
||||
middleware: 'authenticated',
|
||||
data() {
|
||||
return {}
|
||||
},
|
||||
// watch: {
|
||||
// routeName(newVal, oldVal) {
|
||||
// if (newVal === 'connect' && this.$server.connected) {
|
||||
// this.$router.replace('/')
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
computed: {
|
||||
streaming() {
|
||||
return this.$store.state.streamAudiobook
|
||||
|
@ -46,63 +41,95 @@ export default {
|
|||
this.$refs.streamContainer.streamOpen(stream)
|
||||
}
|
||||
},
|
||||
parseSemver(ver) {
|
||||
if (!ver) return null
|
||||
var groups = ver.match(/^v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)$/)
|
||||
if (groups && groups.length > 6) {
|
||||
var total = Number(groups[3]) * 100 + Number(groups[4]) * 10 + Number(groups[5])
|
||||
if (isNaN(total)) {
|
||||
console.warn('Invalid version total', groups[3], groups[4], groups[5])
|
||||
return null
|
||||
}
|
||||
return {
|
||||
total,
|
||||
version: groups[2],
|
||||
major: Number(groups[3]),
|
||||
minor: Number(groups[4]),
|
||||
patch: Number(groups[5]),
|
||||
preRelease: groups[6] || null
|
||||
}
|
||||
async clickUpdateToast() {
|
||||
var immediateUpdateAllowed = this.$store.state.appUpdateInfo.immediateUpdateAllowed
|
||||
if (immediateUpdateAllowed) {
|
||||
await AppUpdate.performImmediateUpdate()
|
||||
} else {
|
||||
console.warn('Invalid semver string', ver)
|
||||
await AppUpdate.openAppStore()
|
||||
}
|
||||
return null
|
||||
},
|
||||
checkForUpdate() {
|
||||
if (!this.$config.version) {
|
||||
return
|
||||
}
|
||||
var currVerObj = this.parseSemver(this.$config.version)
|
||||
if (!currVerObj) {
|
||||
console.error('Invalid version', this.$config.version)
|
||||
return
|
||||
}
|
||||
console.log('Check for update, your version:', currVerObj.version)
|
||||
this.$store.commit('setCurrentVersion', currVerObj)
|
||||
|
||||
var largestVer = null
|
||||
this.$axios.$get(`https://api.github.com/repos/advplyr/audiobookshelf-app/tags`).then((tags) => {
|
||||
if (tags && tags.length) {
|
||||
tags.forEach((tag) => {
|
||||
var verObj = this.parseSemver(tag.name)
|
||||
if (verObj) {
|
||||
if (!largestVer || largestVer.total < verObj.total) {
|
||||
largestVer = verObj
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
showUpdateToast(availableVersion, immediateUpdateAllowed) {
|
||||
var toastText = immediateUpdateAllowed ? `Click here to update` : `Click here to open app store`
|
||||
this.$toast.info(`Update is available for v${availableVersion}! ${toastText}`, {
|
||||
draggable: false,
|
||||
hideProgressBar: false,
|
||||
timeout: 10000,
|
||||
closeButton: false,
|
||||
onClick: this.clickUpdateToast()
|
||||
})
|
||||
if (!largestVer) {
|
||||
console.error('No valid version tags to compare with')
|
||||
},
|
||||
async checkForUpdate() {
|
||||
const result = await AppUpdate.getAppUpdateInfo()
|
||||
if (!result) {
|
||||
console.error('Invalid version check')
|
||||
return
|
||||
}
|
||||
this.$store.commit('setLatestVersion', largestVer)
|
||||
if (largestVer.total > currVerObj.total) {
|
||||
console.log('Has Update!', largestVer.version)
|
||||
this.$store.commit('setHasUpdate', true)
|
||||
this.$store.commit('setAppUpdateInfo', result)
|
||||
|
||||
if (result.updateAvailability === 2) {
|
||||
setTimeout(() => {
|
||||
this.showUpdateToast(result.availableVersion, !!result.immediateUpdateAllowed)
|
||||
}, 5000)
|
||||
}
|
||||
}
|
||||
// parseSemver(ver) {
|
||||
// if (!ver) return null
|
||||
// var groups = ver.match(/^v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)$/)
|
||||
// if (groups && groups.length > 6) {
|
||||
// var total = Number(groups[3]) * 100 + Number(groups[4]) * 10 + Number(groups[5])
|
||||
// if (isNaN(total)) {
|
||||
// console.warn('Invalid version total', groups[3], groups[4], groups[5])
|
||||
// return null
|
||||
// }
|
||||
// return {
|
||||
// total,
|
||||
// version: groups[2],
|
||||
// major: Number(groups[3]),
|
||||
// minor: Number(groups[4]),
|
||||
// patch: Number(groups[5]),
|
||||
// preRelease: groups[6] || null
|
||||
// }
|
||||
// } else {
|
||||
// console.warn('Invalid semver string', ver)
|
||||
// }
|
||||
// return null
|
||||
// },
|
||||
// checkForUpdateWebVersion() {
|
||||
// if (!this.$config.version) {
|
||||
// return
|
||||
// }
|
||||
// var currVerObj = this.parseSemver(this.$config.version)
|
||||
// if (!currVerObj) {
|
||||
// console.error('Invalid version', this.$config.version)
|
||||
// return
|
||||
// }
|
||||
// console.log('Check for update, your version:', currVerObj.version)
|
||||
// this.$store.commit('setCurrentVersion', currVerObj)
|
||||
|
||||
// var largestVer = null
|
||||
// this.$axios.$get(`https://api.github.com/repos/advplyr/audiobookshelf-app/tags`).then((tags) => {
|
||||
// if (tags && tags.length) {
|
||||
// tags.forEach((tag) => {
|
||||
// var verObj = this.parseSemver(tag.name)
|
||||
// if (verObj) {
|
||||
// if (!largestVer || largestVer.total < verObj.total) {
|
||||
// largestVer = verObj
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// if (!largestVer) {
|
||||
// console.error('No valid version tags to compare with')
|
||||
// return
|
||||
// }
|
||||
// this.$store.commit('setLatestVersion', largestVer)
|
||||
// if (largestVer.total > currVerObj.total) {
|
||||
// console.log('Has Update!', largestVer.version)
|
||||
// this.$store.commit('setHasUpdate', true)
|
||||
// }
|
||||
// }
|
||||
},
|
||||
mounted() {
|
||||
if (!this.$server) return console.error('No Server')
|
||||
|
@ -114,6 +141,8 @@ export default {
|
|||
this.$router.push('/connect')
|
||||
}
|
||||
|
||||
this.checkForUpdate()
|
||||
|
||||
// var checkForUpdateFlag = localStorage.getItem('checkForUpdate')
|
||||
// if (!checkForUpdateFlag || checkForUpdateFlag !== '1') {
|
||||
// this.checkForUpdate()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue