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

Merge branch 'bugfixes-swarm' into 'develop'

Bugfixes swarm

Closes #172

See merge request funkwhale/funkwhale!152
parents f4dbe1ea b602ed38
......@@ -126,7 +126,8 @@ def _do_import(import_job, replace=False, use_acoustid=True):
else:
# no downloading, we hotlink
pass
elif import_job.audio_file:
elif not import_job.audio_file and not import_job.source.startswith('file://'):
# not an implace import, and we have a source, so let's download it
track_file.download_file()
track_file.save()
import_job.status = 'finished'
......
......@@ -33,6 +33,7 @@ musicbrainzngs==0.6
youtube_dl>=2017.12.14
djangorestframework>=3.7,<3.8
djangorestframework-jwt>=1.11,<1.12
oauth2client<4
google-api-python-client>=1.6,<1.7
arrow>=0.12,<0.13
persisting-theory>=0.2,<0.3
......
Fixed broken login due to badly configured Axios (#172)
......@@ -73,7 +73,10 @@ export default {
},
methods: {
errored: function () {
this.$store.dispatch('player/trackErrored')
let self = this
setTimeout(
() => { self.$store.dispatch('player/trackErrored') }
, 1000)
},
sourceErrored: function () {
this.sourceErrors += 1
......
......@@ -42,7 +42,7 @@ Vue.directive('title', {
axios.defaults.baseURL = config.API_URL
axios.interceptors.request.use(function (config) {
// Do something before request is sent
if (store.state.auth.authenticated) {
if (store.state.auth.token) {
config.headers['Authorization'] = store.getters['auth/header']
}
return config
......
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