Skip to content
Snippets Groups Projects
Commit ceb0ec03 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Added sample track, can now return sample track URL for track files

parent 4796dffa
Branches
No related tags found
No related merge requests found
...@@ -215,6 +215,9 @@ STATICFILES_FINDERS = ( ...@@ -215,6 +215,9 @@ STATICFILES_FINDERS = (
# See: https://docs.djangoproject.com/en/dev/ref/settings/#media-root # See: https://docs.djangoproject.com/en/dev/ref/settings/#media-root
MEDIA_ROOT = str(APPS_DIR('media')) MEDIA_ROOT = str(APPS_DIR('media'))
USE_SAMPLE_TRACK = env.bool("USE_SAMPLE_TRACK", False)
# See: https://docs.djangoproject.com/en/dev/ref/settings/#media-url # See: https://docs.djangoproject.com/en/dev/ref/settings/#media-url
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
......
...@@ -28,6 +28,8 @@ django: ...@@ -28,6 +28,8 @@ django:
- .:/app - .:/app
ports: ports:
- "12081" - "12081"
environment:
- USE_SAMPLE_TRACK=true
links: links:
- postgres - postgres
- redis - redis
......
...@@ -7,6 +7,7 @@ import shutil ...@@ -7,6 +7,7 @@ import shutil
from django.conf import settings from django.conf import settings
from django.db import models from django.db import models
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.core.files import File from django.core.files import File
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.utils import timezone from django.utils import timezone
...@@ -232,6 +233,11 @@ class TrackFile(models.Model): ...@@ -232,6 +233,11 @@ class TrackFile(models.Model):
shutil.rmtree(tmp_dir) shutil.rmtree(tmp_dir)
return self.audio_file return self.audio_file
@property
def path(self):
if settings.USE_SAMPLE_TRACK:
return static('music/sample1.ogg')
return self.audio_file.url
class ImportBatch(models.Model): class ImportBatch(models.Model):
creation_date = models.DateTimeField(default=timezone.now) creation_date = models.DateTimeField(default=timezone.now)
......
...@@ -34,7 +34,7 @@ class ImportBatchSerializer(serializers.ModelSerializer): ...@@ -34,7 +34,7 @@ class ImportBatchSerializer(serializers.ModelSerializer):
class TrackFileSerializer(serializers.ModelSerializer): class TrackFileSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = models.TrackFile model = models.TrackFile
fields = ('id', 'audio_file', 'duration', 'source') fields = ('id', 'path', 'duration', 'source')
class SimpleAlbumSerializer(serializers.ModelSerializer): class SimpleAlbumSerializer(serializers.ModelSerializer):
......
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment