{{ channel.name }}
+
-
{{ channel.name }}
+
+
{{ channel.name }}
+
Last update: {{ channel.last_update }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {% for video in videos %}
-
- {% endfor %}
+ {% csrf_token %}
+
+
+
+
+ {% if not videos %}
+
No videos
+ {% endif %}
+ {% include "ucast/videos_items.html" %}
+
+
+ {% if videos.has_previous or videos.has_next %}
+
+ {% endif %}
{% endblock content %}
diff --git a/ucast/templates/ucast/videos_items.html b/ucast/templates/ucast/videos_items.html
new file mode 100644
index 0000000..b526bfe
--- /dev/null
+++ b/ucast/templates/ucast/videos_items.html
@@ -0,0 +1,48 @@
+{% for video in videos %}
+
+
+ 
+
+
+
+
+
+
+
+
+ {{ video.published|date:"SHORT_DATE_FORMAT" }}
+
+
+
+
+
+
+{% endfor %}
diff --git a/ucast/tests/tasks/test_download.py b/ucast/tests/tasks/test_download.py
index c9b8b8f..919156d 100644
--- a/ucast/tests/tasks/test_download.py
+++ b/ucast/tests/tasks/test_download.py
@@ -28,27 +28,6 @@ def test_download_video(download_dir, rq_queue):
assert os.path.isfile(cf.get_thumbnail(VIDEO_SLUG_INTRO, True))
-@pytest.mark.django_db
-def test_import_channel(
- download_dir, rq_queue, mock_get_video_details, mock_download_audio
-):
- # Remove 2 videos from the database so they can be imported
- Video.objects.get(video_id="ZPxEr4YdWt8").delete()
- Video.objects.get(video_id="_I5IFObm_-k").delete()
-
- job = rq_queue.enqueue(download.import_channel, CHANNEL_ID_THETADEV)
- assert job.is_finished
-
- mock_download_audio.assert_any_call(
- "_I5IFObm_-k",
- download_dir / "ThetaDev" / "20180331_Easter_special_3D_printed_Bunny.mp3",
- )
- mock_download_audio.assert_any_call(
- "ZPxEr4YdWt8",
- download_dir / "ThetaDev" / "20190602_ThetaDev_Embedded_World_2019.mp3",
- )
-
-
@pytest.mark.django_db
def test_update_channel(
download_dir, rq_queue, mock_get_video_details, mock_download_audio
diff --git a/ucast/urls.py b/ucast/urls.py
index bd11551..b329e95 100644
--- a/ucast/urls.py
+++ b/ucast/urls.py
@@ -4,7 +4,7 @@ from ucast import views
urlpatterns = [
path("", views.home),
- path("channel/
", views.videos),
+ path("channel/", views.videos, name="videos"),
path("feed/", views.podcast_feed),
path("files/audio//", views.audio),
path("files/cover//", views.cover),
diff --git a/ucast/views.py b/ucast/views.py
index 07051e5..349070e 100644
--- a/ucast/views.py
+++ b/ucast/views.py
@@ -8,13 +8,15 @@ from django.conf import settings
from django.contrib.auth.decorators import login_required
from django.contrib.sites.shortcuts import get_current_site
from django.contrib.syndication.views import add_domain
+from django.core.paginator import Paginator
from django.middleware.http import ConditionalGetMiddleware
from django.shortcuts import render
+from django.urls import reverse
from django.utils.decorators import decorator_from_middleware
from ucast import feed, forms, queue
from ucast.models import Channel, User, Video
-from ucast.service import storage
+from ucast.service import controller, storage
from ucast.tasks import download
@@ -23,12 +25,22 @@ def home(request: http.HttpRequest):
channels = Channel.objects.all()
site_url = add_domain(get_current_site(request).domain, "", request.is_secure())
+ form = forms.AddChannelForm()
if request.method == "POST":
form = forms.AddChannelForm(request.POST)
if form.is_valid():
channel_str = form.cleaned_data["channel_str"]
- queue.enqueue(download.import_channel, channel_str)
+ try:
+ channel = controller.create_channel(channel_str)
+ queue.enqueue(download.update_channel, channel)
+ except ValueError:
+ form.add_error("channel_str", "Channel URL invalid")
+ except controller.ChannelAlreadyExistsException:
+ form.add_error("channel_str", "Channel already exists")
+
+ if form.is_valid():
+ return http.HttpResponseRedirect(reverse(home))
return render(
request,
@@ -36,7 +48,7 @@ def home(request: http.HttpRequest):
{
"channels": channels,
"site_url": site_url,
- "add_channel_form": forms.AddChannelForm,
+ "form": form,
},
)
@@ -44,14 +56,49 @@ def home(request: http.HttpRequest):
@login_required
def videos(request: http.HttpRequest, channel: str):
chan = Channel.objects.get(slug=channel)
- vids = Video.objects.filter(channel=chan).order_by("-published")
+ if request.method == "POST":
+ if "activate" in request.POST:
+ chan.active = True
+ chan.save()
+ elif "deactivate" in request.POST:
+ chan.active = False
+ chan.save()
+ elif "delete_video" in request.POST:
+ form = forms.DeleteVideoForm(request.POST)
+ if form.is_valid():
+ id = form.cleaned_data["id"]
+ controller.delete_video(id)
+ else:
+ return http.HttpResponseBadRequest()
+ elif "delete_channel" in request.POST:
+ controller.delete_channel(chan.id)
+ return http.HttpResponseRedirect(reverse(home))
+ else:
+ return http.HttpResponseBadRequest()
+
+ return http.HttpResponseRedirect(reverse(videos, args=[channel]))
+
+ vids = Video.objects.filter(channel=chan, downloaded__isnull=False).order_by(
+ "-published"
+ )
site_url = add_domain(get_current_site(request).domain, "", request.is_secure())
+ page_number = request.GET.get("page")
+ videos_p = Paginator(vids, 20)
+
+ template_name = "ucast/videos.html"
+ if request.htmx:
+ template_name = "ucast/videos_items.html"
+
return render(
request,
- "ucast/videos.html",
- {"videos": vids, "channel": chan, "site_url": site_url},
+ template_name,
+ {
+ "videos": videos_p.get_page(page_number),
+ "channel": chan,
+ "site_url": site_url,
+ },
)
diff --git a/ucast_project/settings.py b/ucast_project/settings.py
index 04feb01..0263581 100644
--- a/ucast_project/settings.py
+++ b/ucast_project/settings.py
@@ -98,6 +98,7 @@ INSTALLED_APPS = [
"django.contrib.messages",
"django.contrib.staticfiles",
"bulma",
+ "django_htmx",
]
MIDDLEWARE = [
@@ -109,6 +110,7 @@ MIDDLEWARE = [
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
+ "django_htmx.middleware.HtmxMiddleware",
]
ROOT_URLCONF = "ucast_project.urls"
@@ -218,6 +220,7 @@ REDIS_QUEUE_TIMEOUT = get_env("REDIS_QUEUE_TIMEOUT", 600)
REDIS_QUEUE_RESULT_TTL = 600
YT_UPDATE_INTERVAL = get_env("YT_UPDATE_INTERVAL", 900)
+FEED_MAX_ITEMS = get_env("FEED_MAX_ITEMS", 100)
INTERNAL_FILES_ROOT = get_env("INTERNAL_FILES_ROOT", "internal_files")
INTERNAL_REDIRECT_HEADER = get_env("INTERNAL_REDIRECT_HEADER", "X-Accel-Redirect")