Skip to content
Snippets Groups Projects
Commit 7245bbb7 authored by dnns01's avatar dnns01
Browse files

Make clip controls optional

parent 350c3f1c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
strolchguru/templates/strolchguru_home.html
+ 3
− 1
View file @ 7245bbb7
...@@ -37,12 +37,14 @@ ...@@ -37,12 +37,14 @@
<body style="background: black;"> <body style="background: black;">
<video id="clip" autoplay <video id="clip" autoplay
controls {% if controls %}controls{% endif %}
{% if mode == "loop" %} {% if mode == "loop" %}
loop loop
{% else %} {% else %}
onended="window.location.reload(true)" onended="window.location.reload(true)"
{% endif %} {% endif %}
src="/media/clips/{{ clip.clip_id }}.mp4"> src="/media/clips/{{ clip.clip_id }}.mp4">
</video> </video>
<div id="caption"> <div id="caption">
......
strolchguru/views.py
+ 10
− 7
View file @ 7245bbb7
import random import random
from django.forms.models import model_to_dict from django.forms.models import model_to_dict
from django.http import HttpResponse, JsonResponse from django.http import HttpResponse, JsonResponse, Http404
from django.shortcuts import render, get_object_or_404 from django.shortcuts import render, get_object_or_404
from .models import Clip from .models import Clip
def home(request) -> HttpResponse: def home(request) -> HttpResponse:
controls = True if request.GET.get("controls") == "1" else False
clips = list(Clip.objects.filter(is_published=True, is_downloaded=True)) clips = list(Clip.objects.filter(is_published=True, is_downloaded=True))
clip = random.choice(clips) clip = random.choice(clips)
return render(request, 'strolchguru_home.html', context={'clip': clip, 'mode': "random_clips"}) return render(request, 'strolchguru_home.html',
context={'clip': clip, 'mode': "random_clips", 'controls': controls})
def clip(request, id) -> HttpResponse: def clip(request, id) -> HttpResponse:
controls = True if request.GET.get("controls") == "1" else False
clip = get_object_or_404(Clip, pk=id) clip = get_object_or_404(Clip, pk=id)
return render(request, 'strolchguru_home.html', context={'clip': clip, 'mode': "loop"})
if not clip.is_published:
raise Http404()
return render(request, 'strolchguru_home.html', context={'clip': clip, 'mode': "loop", 'controls': controls})
def clip_json(request, id) -> JsonResponse: def clip_json(request, id) -> JsonResponse:
...@@ -25,7 +32,3 @@ def clip_json(request, id) -> JsonResponse: ...@@ -25,7 +32,3 @@ def clip_json(request, id) -> JsonResponse:
return JsonResponse(json) return JsonResponse(json)
except Clip.DoesNotExist: except Clip.DoesNotExist:
return JsonResponse({"error": "Clip with this id does not exist"}) return JsonResponse({"error": "Clip with this id does not exist"})
# def clips_today(request) -> HttpResponse:
# clips = twitch_api.get_clips(today=True)
# return render(request, 'strolchguru_home.html', context={'clip': clip, 'url_name': "clips_today"})
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