diff --git a/requirements.txt b/requirements.txt index 12dafde..318bcfa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django +Django>=4.2 djangorestframework django-cors-headers django-filter diff --git a/task/migrations/0011_alter_task_shared_id_alter_task_shared_link_and_more.py b/task/migrations/0011_alter_task_shared_id_alter_task_shared_link_and_more.py new file mode 100644 index 0000000..55b4e46 --- /dev/null +++ b/task/migrations/0011_alter_task_shared_id_alter_task_shared_link_and_more.py @@ -0,0 +1,36 @@ +# Generated by Django 4.1.7 on 2023-07-23 17:27 +from django.db import migrations +from django.db import models + + +class Migration(migrations.Migration): + + dependencies = [ + ("task", "0010_alter_task_full_download_now"), + ] + + operations = [ + migrations.AlterField( + model_name="task", + name="shared_id", + field=models.CharField(blank=True, default="", max_length=50), + ), + migrations.AlterField( + model_name="task", + name="shared_link", + field=models.CharField( + help_text="Link, with or without password", + max_length=100, + ), + ), + migrations.AlterField( + model_name="task", + name="shared_password", + field=models.CharField( + blank=True, + help_text="Password, if not included in the shared link", + max_length=4, + null=True, + ), + ), + ] diff --git a/task/models.py b/task/models.py index f8cf340..c8a4383 100644 --- a/task/models.py +++ b/task/models.py @@ -19,9 +19,17 @@ class Status(models.TextChoices): SAMPLING_DOWNLOADED = "SampleDLed" FINISHED = "Finished" - shared_id = models.CharField(max_length=50, default="", editable=False) - shared_link = models.CharField(max_length=100) - shared_password = models.CharField(max_length=4, blank=True, null=True) + shared_id = models.CharField(max_length=50, default="", blank=True) + shared_link = models.CharField( + max_length=100, + help_text="Link, with or without password", + ) + shared_password = models.CharField( + max_length=4, + blank=True, + null=True, + help_text="Password, if not included in the shared link", + ) status = models.CharField( max_length=12, editable=False, diff --git a/task/utils.py b/task/utils.py index bba64df..1a3d49b 100644 --- a/task/utils.py +++ b/task/utils.py @@ -55,7 +55,7 @@ def parse_shared_link(url: str) -> str: >>> parse_shared_link('https://test.com/xyb') Traceback (most recent call last): ... - ValueError: The shared url is not a valid url. https://test.com/xyb + ValueError: The shared url is invalid: https://test.com/xyb """ pwd = get_url_query(url, "pwd") or "" @@ -72,7 +72,7 @@ def parse_shared_link(url: str) -> str: if m: return dict(id="1" + m.group(1), password=pwd) - raise ValueError(f"The shared url is not a valid url. {url}") + raise ValueError(f"The shared url is invalid: {url}") def unify_shared_link(url): diff --git a/ui/forms.py b/ui/forms.py index fa27183..3ee712d 100644 --- a/ui/forms.py +++ b/ui/forms.py @@ -1,14 +1,33 @@ from django import forms from task.models import Task +from task.utils import parse_shared_link -class TaskForm(forms.ModelForm): +class NewTaskForm(forms.ModelForm): class Meta: model = Task - fields = ["shared_link", "shared_password", "full_download_now"] + fields = ["shared_link", "shared_id", "shared_password", "full_download_now"] widgets = { - "shared_link": forms.TextInput(attrs={"class": "form-control"}), - "shared_password": forms.TextInput(attrs={"class": "form-control"}), + "shared_link": forms.TextInput( + attrs={"class": "input input-bordered w-full max-w-xxs"}, + ), + "shared_password": forms.TextInput( + attrs={"class": "input input-bordered w-full max-w-xxs"}, + ), "full_download_now": forms.TextInput(attrs={"class": "form-control"}), } + + def clean(self): + cleaned_data = super().clean() + shared_link = cleaned_data.get("shared_link") + if not shared_link: + return cleaned_data + try: + link = parse_shared_link(shared_link) + except ValueError as e: + self.add_error("shared_link", str(e)) + return cleaned_data + cleaned_data["shared_id"] = link["id"] + if not cleaned_data["shared_password"] and link["password"]: + cleaned_data["shared_password"] = link["password"] diff --git a/ui/templates/ui/base.html b/ui/templates/ui/base.html index a76d06b..b8733dc 100644 --- a/ui/templates/ui/base.html +++ b/ui/templates/ui/base.html @@ -7,14 +7,19 @@ {% load static %} - - + {% comment %} + + + {% endcomment %} + + + - -
+ +
{% block content %}{% endblock %}
diff --git a/ui/templates/ui/index.html b/ui/templates/ui/index.html index cbb3812..a5df8e0 100644 --- a/ui/templates/ui/index.html +++ b/ui/templates/ui/index.html @@ -44,6 +44,8 @@

Leecher

+
+ {% comment %} + {% if form.non_field_errors %} +
+ {{ form.non_field_errors }} +
+ {% endif %} + {% for error in form.shared_link.errors %} +
+ {{ error|escape }} +
+ {% endfor %} + {% for error in form.shared_password.errors %} +
+ {{ error|escape }} +
+ {% endfor %} + {% for error in form.full_download_now.errors %} +
+ {{ error|escape }} +
+ {% endfor %} + diff --git a/ui/templates/ui/new_task_form.html b/ui/templates/ui/new_task_form.html index 5570a52..2dd92b5 100644 --- a/ui/templates/ui/new_task_form.html +++ b/ui/templates/ui/new_task_form.html @@ -1,4 +1,8 @@ -
+ {% csrf_token %} {{ form.non_field_errors }} New Task @@ -6,16 +10,20 @@ - + {{ form.shared_link }} + {% if form.shared_link.help_text %} +

{{ form.shared_link.help_text|safe }}

+ {% endif %} {{ form.shared_link.errors }}
- + {{ form.shared_password }} + {% if form.shared_password.help_text %} +

{{ form.shared_password.help_text|safe }}

+ {% endif %} {{ form.shared_password.errors }}
diff --git a/ui/tests/test_index.py b/ui/tests/test_index.py index 6be99b0..14e127e 100644 --- a/ui/tests/test_index.py +++ b/ui/tests/test_index.py @@ -5,7 +5,7 @@ from task.models import Task -class TaskUITestCase(TestCase): +class BaseTestCase(TestCase): def setUp(self): self.client = Client() url = reverse("task-list") @@ -25,6 +25,8 @@ def setUp(self): task.status = task.Status.FINISHED task.save() + +class TaskUITestCase(BaseTestCase): def test_task_list(self): url = reverse("index") @@ -35,6 +37,22 @@ def test_task_list(self): self.assertTrue(b"bee" in response.content) self.assertTrue(b"Next Page" not in response.content) + def test_list_failed_task(self): + response = self.client.get(reverse("index")) + assert b"bg-red" not in response.content + task = Task.objects.get(id=1) + task.transfer_completed_at = task.created_at + task.sample_downloaded_at = task.created_at + task.full_downloaded_at = None + task.status = task.Status.FINISHED + task.failed = True + task.save() + + response = self.client.get(reverse("index")) + + assert response.status_code == 200 + assert b"bg-red" in response.content + def test_next_page(self): url = reverse("index") @@ -60,6 +78,7 @@ def test_prev_page(self): self.assertTrue(b"2 / 2 Pages" in response.content) def test_new_task(self): + assert len(Task.objects.all()) == 2 response = self.client.get(reverse("index")) assert b"hello" not in response.content assert b"wrld" not in response.content @@ -73,6 +92,100 @@ def test_new_task(self): ) self.assertEqual(response.status_code, 302) + assert len(Task.objects.all()) == 3 response = self.client.get(reverse("index")) assert b"hello" in response.content assert b"wrld" in response.content + + def test_new_task_failed(self): + response = self.client.post( + reverse("new_task"), + { + "shared_link": "wrongurl", + }, + ) + + self.assertEqual(response.status_code, 200) + assert len(Task.objects.all()) == 2 + response = self.client.get(reverse("index")) + assert b"wrongurl" not in response.content + + def test_nothing(self): + response = self.client.get(reverse("nothing")) + + assert response.status_code == 200 + assert response.content == b"" + + +class HTMXTestCase(BaseTestCase): + def test_task_list(self): + url = reverse("task_list") + + response = self.client.get(url) + + self.assertEqual(response.status_code, 200) + self.assertTrue(b"badbeef" in response.content) + self.assertTrue(b"bee" in response.content) + self.assertTrue(b"feedcafe" in response.content) + self.assertTrue(b"c0de" in response.content) + + def test_next_page(self): + url = reverse("task_list") + + response = self.client.get(url, {"per_page": 1, "page": 1}) + + self.assertEqual(response.status_code, 200) + self.assertTrue(b"feedcafe" in response.content) + self.assertTrue(b"c0de" in response.content) + self.assertTrue(b"Next Page" in response.content) + self.assertTrue(b"Last Page" in response.content) + self.assertTrue(b"1 / 2 Pages" in response.content) + + def test_prev_page(self): + url = reverse("task_list") + + response = self.client.get(url, {"per_page": 1, "page": 2}) + + self.assertEqual(response.status_code, 200) + self.assertTrue(b"badbeef" in response.content) + self.assertTrue(b"bee" in response.content) + self.assertTrue(b"Prev Page" in response.content) + self.assertTrue(b"First Page" in response.content) + self.assertTrue(b"2 / 2 Pages" in response.content) + + def test_new_task(self): + assert len(Task.objects.all()) == 2 + response = self.client.get(reverse("index")) + assert b"hello" not in response.content + assert b"wrld" not in response.content + + response = self.client.post( + reverse("new_task"), + { + "shared_link": "https://pan.baidu.com/s/hello", + "shared_password": "wrld", + }, + headers={"HX-Request": "true"}, + ) + + assert "HX-Trigger" in response.headers + assert "taskListChanged" in response.headers["HX-Trigger"] + assert response.status_code == 204 + assert len(Task.objects.all()) == 3 + response = self.client.get(reverse("index")) + assert b"hello" in response.content + assert b"wrld" in response.content + + def test_new_task_failed(self): + response = self.client.post( + reverse("new_task"), + data={ + "shared_link": "wrongurl", + }, + headers={"HX-Request": "true"}, + ) + + assert response.status_code == 422 + assert len(Task.objects.all()) == 2 + response = self.client.get(reverse("index")) + assert b"wrongurl" not in response.content diff --git a/ui/urls.py b/ui/urls.py index 2e7d204..63266a6 100644 --- a/ui/urls.py +++ b/ui/urls.py @@ -6,4 +6,5 @@ path("", views.index, name="index"), path("new", views.new_task, name="new_task"), path("list", views.task_list, name="task_list"), + path("nothing", views.nothing, name="nothing"), ] diff --git a/ui/views.py b/ui/views.py index c67f8c9..177528c 100644 --- a/ui/views.py +++ b/ui/views.py @@ -1,16 +1,24 @@ import json +from django.core.paginator import Page from django.core.paginator import Paginator +from django.http import HttpRequest from django.http import HttpResponse from django.http import HttpResponseRedirect from django.shortcuts import render +from django.views.decorators.http import require_GET +from django.views.decorators.http import require_POST +from django_htmx.middleware import HtmxDetails -from .forms import TaskForm +from .forms import NewTaskForm from task.models import Task -from task.utils import parse_shared_link -def get_task_list_page(request): +class HtmxHttpRequest(HttpRequest): + htmx: HtmxDetails + + +def get_task_list_page(request: HtmxHttpRequest) -> Page: tasks = Task.objects.all().order_by("-id") page_number = int(request.GET.get("page") or 1) per_page = int(request.GET.get("per_page") or 10) @@ -19,40 +27,48 @@ def get_task_list_page(request): return page -def index(request): +@require_GET +def index(request: HtmxHttpRequest) -> HttpResponse: page = get_task_list_page(request) - return render(request, "ui/index.html", {"page": page}) + return render(request, "ui/index.html", {"page": page, "form": NewTaskForm()}) -def task_list(request): +@require_GET +def task_list(request: HtmxHttpRequest) -> HttpResponse: page = get_task_list_page(request) return render(request, "ui/task_list.html", {"page": page}) -def new_task(request): - form = TaskForm() - if request.method == "POST": - form = TaskForm(request.POST) - if form.is_valid(): - task = form.save() - link = parse_shared_link(task.shared_link) - task.shared_id = link["id"] - if not task.shared_password and link["password"]: - task.shared_password = link["password"] - task.save() - - if request.htmx: - return HttpResponse( - status=204, - headers={ - "HX-Trigger": json.dumps( - { - "taskListChanged": None, - "showMessage": f"{task.id} added.", - }, - ), - }, - ) - else: - return HttpResponseRedirect("/ui/") - return render(request, "ui/new_task_form.html", {"form": form}) +@require_POST +def new_task(request: HtmxHttpRequest) -> HttpResponse: + form = NewTaskForm(request.POST) + if not form.is_valid(): + if not request.htmx: + return render(request, "ui/new_task_form.html", {"form": form}) + + return HttpResponse( + status=422, + content=render(request, "ui/new_task_errors.html", {"form": form}), + ) + + task = form.save() + + if not request.htmx: + return HttpResponseRedirect("/ui/") + + return HttpResponse( + status=204, + headers={ + "HX-Trigger": json.dumps( + { + "taskListChanged": None, + "showMessage": f"{task.id} added.", + }, + ), + }, + ) + + +@require_GET +def nothing(request: HtmxHttpRequest) -> HttpResponse: + return HttpResponse()