Merge branch '29-broken-demo' into 'develop'

Resolve "Better demo detup"

Closes #29

See merge request funkwhale/funkwhale!75

api/demo/load-demo-data.sh

@@ -6,8 +6,8 @@ python manage.py migrate --noinput
 
 echo "Creating demo user..."
 
-cat demo/demo-user.py | python manage.py shell --plain
+cat demo/demo-user.py | python manage.py shell -i python
 
 echo "Importing demo tracks..."
 
-python manage.py import_files "/music/**/*.ogg" --recursive --noinput
+python manage.py import_files "/music/**/*.ogg" --recursive --noinput --username demo

api/funkwhale_api/music/tasks.py

@@ -33,11 +33,10 @@ def _do_import(import_job, replace):
         # we try to deduce mbid from acoustid
         client = get_acoustid_client()
         match = client.get_best_match(import_job.audio_file.path)
-        if not match:
+        if match:
-            raise ValueError('Cannot get match')
+            duration = match['recordings'][0]['duration']
-        duration = match['recordings'][0]['duration']
+            mbid = match['recordings'][0]['id']
-        mbid = match['recordings'][0]['id']
+            acoustid_track_id = match['id']
-        acoustid_track_id = match['id']
     if mbid:
         track, _ = models.Track.get_or_create_from_api(mbid=mbid)
     else:

demo/setup.sh

@@ -0,0 +1,29 @@
+#!/bin/bash -eux
+version="develop"
+music_path="/usr/share/music"
+demo_path="/srv/funkwhale-demo/demo"
+
+echo 'Cleaning everything...'
+docker-compose down -v || echo 'Nothing to stop'
+rm -rf /srv/funkwhale-demo/demo*
+mkdir -p $demo_path
+cd $demo_path
+echo 'Downloading demo files...'
+curl -L -o docker-compose.yml "https://code.eliotberriot.com/funkwhale/funkwhale/raw/$version/deploy/docker-compose.yml"
+curl -L -o .env "https://code.eliotberriot.com/funkwhale/funkwhale/raw/$version/deploy/env.prod.sample"
+
+mkdir data/
+cp -r $music_path data/music
+
+curl -L -o front.zip "https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/$version/download?job=build_front"
+unzip front.zip
+
+echo "FUNKWHALE_URL=https://demo.funkwhale.audio/" >> .env
+echo "DJANGO_SECRET_KEY=demo" >> .env
+echo "DJANGO_ALLOWED_HOSTS=demo.funkwhale.audio" >> .env
+echo "FUNKWHALE_VERSION=$version" >> .env
+echo "FUNKWHALE_API_PORT=5001" >> .env
+
+docker-compose pull
+docker-compose run --rm api "sleep 5; demo/load-demo-data.sh"
+docker-compose up -d