Commit 4f653e6e authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '86-media-404' into 'develop'

Resolve "On 404 error on media file, track is not skipped"

Closes #86

See merge request !67
parents c8921237 7dfafea2
skip to next track properly on 40X errors (#86)
......@@ -7,7 +7,11 @@
@timeupdate="updateProgress"
@ended="ended"
preload>
<source v-for="src in srcs" :src="src.url" :type="src.type">
<source
@error="sourceErrored"
v-for="src in srcs"
src="src.url"
:type="src.type">
</audio>
</template>
......@@ -25,6 +29,11 @@ export default {
startTime: {type: Number, default: 0},
autoplay: {type: Boolean, default: false}
},
data () {
return {
sourceErrors: 0
}
},
computed: {
...mapState({
playing: state => state.player.playing,
......@@ -65,11 +74,19 @@ export default {
errored: function () {
this.$store.dispatch('player/trackErrored')
},
sourceErrored: function () {
this.sourceErrors += 1
if (this.sourceErrors >= this.srcs.length) {
// all sources failed
this.errored()
}
},
updateDuration: function (e) {
this.$store.commit('player/duration', this.$refs.audio.duration)
},
loaded: function () {
this.$refs.audio.volume = this.volume
this.$store.commit('player/resetErrorCount')
if (this.isCurrent) {
this.$store.commit('player/duration', this.$refs.audio.duration)
if (this.startTime) {
......
......@@ -5,6 +5,8 @@ import time from '@/utils/time'
export default {
namespaced: true,
state: {
maxConsecutiveErrors: 5,
errorCount: 0,
playing: false,
volume: 0.5,
duration: 0,
......@@ -25,6 +27,12 @@ export default {
value = Math.max(value, 0)
state.volume = value
},
incrementErrorCount (state) {
state.errorCount += 1
},
resetErrorCount (state) {
state.errorCount = 0
},
duration (state, value) {
state.duration = value
},
......@@ -89,8 +97,9 @@ export default {
dispatch('queue/next', null, {root: true})
dispatch('queue/next', null, {root: true})
},
trackErrored ({commit, dispatch}) {
trackErrored ({commit, dispatch, state}) {
commit('errored', true)
commit('incrementErrorCount')
dispatch('queue/next', null, {root: true})
},
updateProgress ({commit}, t) {
......
......@@ -53,10 +53,13 @@ export default {
commit('current', null)
commit('running', false)
},
populateQueue ({state, dispatch}) {
populateQueue ({rootState, state, dispatch}) {
if (!state.running) {
return
}
if (rootState.player.errorCount >= rootState.player.maxConsecutiveErrors - 1) {
return
}
var params = {
session: state.current.session
}
......
......@@ -74,6 +74,16 @@ describe('store/player', () => {
store.mutations.toggleLooping(state)
expect(state.looping).to.equal(0)
})
it('increment error count', () => {
const state = { errorCount: 0 }
store.mutations.incrementErrorCount(state)
expect(state.errorCount).to.equal(1)
})
it('reset error count', () => {
const state = { errorCount: 10 }
store.mutations.resetErrorCount(state)
expect(state.errorCount).to.equal(0)
})
})
describe('getters', () => {
it('durationFormatted', () => {
......@@ -145,8 +155,10 @@ describe('store/player', () => {
testAction({
action: store.actions.trackErrored,
payload: {test: 'track'},
params: {state: {errorCount: 0, maxConsecutiveErrors: 5}},
expectedMutations: [
{ type: 'errored', payload: true }
{ type: 'errored', payload: true },
{ type: 'incrementErrorCount' }
],
expectedActions: [
{ type: 'queue/next', payload: null, options: {root: true} }
......
......@@ -69,7 +69,11 @@ describe('store/radios', () => {
})
testAction({
action: store.actions.populateQueue,
params: {state: {running: true, current: {session: 1}}},
params: {
state: {running: true, current: {session: 1}},
rootState: {player: {errorCount: 0, maxConsecutiveErrors: 5}}
},
expectedActions: [
{ type: 'queue/append', payload: {track: {id: 1}}, options: {root: true} }
]
......@@ -82,5 +86,17 @@ describe('store/radios', () => {
expectedActions: []
}, done)
})
it('populateQueue does nothing when too much errors', (done) => {
testAction({
action: store.actions.populateQueue,
payload: {test: 'track'},
params: {
rootState: {player: {errorCount: 5, maxConsecutiveErrors: 5}},
state: {running: true}
},
expectedActions: []
}, done)
})
})
})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment