Commit 33ae51fc authored by Agate's avatar Agate 💬

Merge branch '274-logging' into 'develop'

Resolve "Broken logging formatting in import task"

Closes #274 and #278

See merge request funkwhale/funkwhale!233
parents 1a6492ff b7295382
......@@ -259,7 +259,9 @@ def get_cover_from_fs(dir_path):
'import_job')
def import_job_run(self, import_job, replace=False, use_acoustid=False):
def mark_errored(exc):
logger.error('[Import Job %s] Error during import: %s', str(exc))
logger.error(
'[Import Job %s] Error during import: %s',
import_job.pk, str(exc))
import_job.status = 'errored'
import_job.save(update_fields=['status'])
......
Broken logging statement during import error (#274)
Broken search bar on library home (#278)
......@@ -29,9 +29,9 @@
</template>
<script>
import _ from 'lodash'
import axios from 'axios'
import logger from '@/logging'
import backend from '@/audio/backend'
import AlbumCard from '@/components/audio/album/Card'
import ArtistCard from '@/components/audio/artist/Card'
......@@ -50,7 +50,6 @@ export default {
albums: [],
artists: []
},
backend: backend,
isLoading: false
}
},
......@@ -61,7 +60,7 @@ export default {
this.search()
},
methods: {
search () {
search: _.debounce(function () {
if (this.query.length < 1) {
return
}
......@@ -77,15 +76,11 @@ export default {
self.results = self.castResults(response.data)
self.isLoading = false
})
},
}, 500),
castResults (results) {
return {
albums: results.albums.map((album) => {
return backend.Album.clean(album)
}),
artists: results.artists.map((artist) => {
return backend.Artist.clean(artist)
})
albums: results.albums,
artists: results.artists
}
}
},
......
Markdown is supported
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