diff --git a/api/helpers.py b/api/helpers.py index 6584c5a..994a902 100644 --- a/api/helpers.py +++ b/api/helpers.py @@ -6,6 +6,7 @@ from dss import settings from spa.models import Mix, UserProfile from core.utils import session + class Helper(APIView): pass @@ -22,7 +23,7 @@ class ChatHelper(ActivityHelper): # do some persistence stuff with the chat from core.realtime import chat - #user = self.get_session(request) + # user = self.get_session(request) u = request.user if not u.is_anonymous(): image = u.userprofile.get_sized_avatar_image(32, 32) @@ -60,5 +61,13 @@ class UserSlugCheckHelper(Helper): except UserProfile.DoesNotExist: return Response(status=HTTP_200_OK) + class RadioHelper(Helper): def get(self, request): + m = Mix.objects.order_by('?').first() + ret = { + 'url': m.get_stream_url(), + 'title': str(m) + } + + return Response(data=ret, status=HTTP_200_OK) diff --git a/api/urls.py b/api/urls.py index 5a47a57..2541d15 100755 --- a/api/urls.py +++ b/api/urls.py @@ -64,7 +64,7 @@ urlpatterns = patterns( url(r'^_act/play', helpers.ActivityPlayHelper.as_view()), url(r'^_chat/', helpers.ChatHelper.as_view()), - url(r('^_radio'), helpers.RadioHelper.as_view()) + url(r'^_radio', helpers.RadioHelper.as_view()), url(r'^__debug/', DebugView.as_view()), diff --git a/spa/models/mix.py b/spa/models/mix.py index 56e54f2..743dc3c 100755 --- a/spa/models/mix.py +++ b/spa/models/mix.py @@ -95,7 +95,7 @@ class Mix(BaseModel): return self.__unicode__() def __unicode__(self): - return self.title + return "{} - {}".format(self.user.get_nice_name(), self.title) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if not self.id: