From e8eaf6db942b01623cd5b3a7298b5f4daac70850 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 11 Jul 2017 08:40:54 +0200
Subject: [PATCH] Now display CLI instructions to download a set of tracks
---
api/funkwhale_api/music/models.py | 6 +++
api/funkwhale_api/music/serializers.py | 2 +-
api/funkwhale_api/music/views.py | 5 +-
front/src/components/audio/track/Table.vue | 46 ++++++++++++++++++-
front/src/components/library/Album.vue | 2 +-
front/src/components/semantic/Modal.vue | 53 ++++++++++++++++++++++
6 files changed, 108 insertions(+), 6 deletions(-)
create mode 100644 front/src/components/semantic/Modal.vue
diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py
index d7a08b7a..596f890b 100644
--- a/api/funkwhale_api/music/models.py
+++ b/api/funkwhale_api/music/models.py
@@ -362,6 +362,12 @@ class TrackFile(models.Model):
'api:v1:trackfiles-serve', kwargs={'pk': self.pk})
return self.audio_file.url
+ @property
+ def filename(self):
+ return '{}{}'.format(
+ self.track.full_name,
+ os.path.splitext(self.audio_file.name)[-1])
+
class ImportBatch(models.Model):
creation_date = models.DateTimeField(default=timezone.now)
diff --git a/api/funkwhale_api/music/serializers.py b/api/funkwhale_api/music/serializers.py
index 6b839b9c..40fbb65e 100644
--- a/api/funkwhale_api/music/serializers.py
+++ b/api/funkwhale_api/music/serializers.py
@@ -34,7 +34,7 @@ class ImportBatchSerializer(serializers.ModelSerializer):
class TrackFileSerializer(serializers.ModelSerializer):
class Meta:
model = models.TrackFile
- fields = ('id', 'path', 'duration', 'source')
+ fields = ('id', 'path', 'duration', 'source', 'filename')
class SimpleAlbumSerializer(serializers.ModelSerializer):
diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index 4a4032c5..98319255 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -139,9 +139,8 @@ class TrackFileViewSet(viewsets.ReadOnlyModelViewSet):
return Response(status=404)
response = Response()
- filename = "filename*=UTF-8''{}{}".format(
- urllib.parse.quote(f.track.full_name),
- os.path.splitext(f.audio_file.name)[-1])
+ filename = "filename*=UTF-8''{}".format(
+ urllib.parse.quote(f.filename))
response["Content-Disposition"] = "attachment; {}".format(filename)
response['X-Accel-Redirect'] = "{}{}".format(
settings.PROTECT_FILES_PATH,
diff --git a/front/src/components/audio/track/Table.vue b/front/src/components/audio/track/Table.vue
index 8dca9090..e9beaa05 100644
--- a/front/src/components/audio/track/Table.vue
+++ b/front/src/components/audio/track/Table.vue
@@ -40,26 +40,70 @@
<td><track-favorite-icon class="favorite-icon" :track="track"></track-favorite-icon></td>
</tr>
</tbody>
+ <tfoot class="full-width">
+ <tr>
+ <th colspan="3">
+ <button @click="showDownloadModal = !showDownloadModal" class="ui basic button">Download...</button>
+ <modal :show.sync="showDownloadModal">
+ <div class="header">
+ Download tracks
+ </div>
+ <div class="content">
+ <div class="description">
+ <p>There is currently no way to download directly multiple tracks from funkwhale as a ZIP archive.
+ However, you can use a command line tools such as <a href="https://curl.haxx.se/" target="_blank">cURL</a> to easily download a list of tracks.
+ </p>
+ <p>Simply copy paste the snippet below into a terminal to launch the download.</p>
+ <div class="ui warning message">
+ Keep your PRIVATE_TOKEN secret as it gives access to your account.
+ </div>
+ <pre>
+export PRIVATE_TOKEN="{{ auth.getAuthToken ()}}"
+<template v-for="track in tracks">
+curl -G -o "{{ track.files[0].filename }}" <template v-if="auth.user.authenticated">--header "Authorization: JWT $PRIVATE_TOKEN"</template> "{{ backend.absoluteUrl(track.files[0].path) }}"</template>
+</pre>
+ </div>
+ </div>
+ <div class="actions">
+ <div class="ui black deny button">
+ Cancel
+ </div>
+ </div>
+ </modal>
+ </th>
+ <th></th>
+ <th colspan="4"></th>
+ <th colspan="6"></th>
+ <th colspan="6"></th>
+ <th></th>
+ </tr>
+ </tfoot>
</table>
</template>
<script>
import backend from '@/audio/backend'
+import auth from '@/auth'
import TrackFavoriteIcon from '@/components/favorites/TrackFavoriteIcon'
import PlayButton from '@/components/audio/PlayButton'
+import Modal from '@/components/semantic/Modal'
+
export default {
props: {
tracks: {type: Array, required: true},
displayPosition: {type: Boolean, default: false}
},
components: {
+ Modal,
TrackFavoriteIcon,
PlayButton
},
data () {
return {
- backend: backend
+ backend: backend,
+ auth: auth,
+ showDownloadModal: false
}
}
}
diff --git a/front/src/components/library/Album.vue b/front/src/components/library/Album.vue
index 494f2396..cf340340 100644
--- a/front/src/components/library/Album.vue
+++ b/front/src/components/library/Album.vue
@@ -34,7 +34,7 @@
</div>
<div class="ui vertical stripe segment">
<h2>Tracks</h2>
- <track-table v-if="album" display-position="true" :tracks="album.tracks"></track-table>
+ <track-table v-if="album" :display-position="true" :tracks="album.tracks"></track-table>
</div>
</template>
</div>
diff --git a/front/src/components/semantic/Modal.vue b/front/src/components/semantic/Modal.vue
new file mode 100644
index 00000000..ec7a5a08
--- /dev/null
+++ b/front/src/components/semantic/Modal.vue
@@ -0,0 +1,53 @@
+<template>
+ <div :class="['ui', {'active': show}, 'modal']">
+ <i class="close icon"></i>
+ <slot>
+
+ </slot>
+ </div>
+</template>
+
+<script>
+import $ from 'jquery'
+
+export default {
+ props: {
+ show: {type: Boolean, required: true}
+ },
+ data () {
+ return {
+ control: null
+ }
+ },
+ mounted () {
+ this.control = $(this.$el).modal({
+ onApprove: function () {
+ this.$emit('approved')
+ }.bind(this),
+ onDeny: function () {
+ this.$emit('deny')
+ }.bind(this),
+ onHidden: function () {
+ this.$emit('update:show', false)
+ }.bind(this)
+ })
+ },
+ watch: {
+ show: {
+ handler (newValue) {
+ if (newValue) {
+ this.control.modal('show')
+ } else {
+ this.control.modal('hide')
+ }
+ }
+ }
+ }
+
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+
+</style>
--
GitLab