Merge branch 'miscs'

Author: Jenselme

.pre-commit-config.yaml

@@ -51,28 +51,28 @@ repos:
           - --allow-past-years
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: "1.22.1"
+    rev: "1.23.1"
     hooks:
       - id: django-upgrade
         args: ["--target-version", "5.0"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py312-plus]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.9.2
+    rev: v0.9.10
     hooks:
       - id: ruff
         args: [--fix, --preview]
       - id: ruff-format
         args: [--preview]
 
   - repo: https://github.com/seddonym/import-linter
-    rev: v2.1
+    rev: v2.2
     hooks:
       - id: import-linter
 
@@ -91,7 +91,7 @@ repos:
         args: [-e, SC1091]
 
   - repo: https://github.com/thibaudcolas/pre-commit-stylelint
-    rev: v16.10.0
+    rev: v16.15.0
     hooks:
       - id: stylelint
         args: [--fix]
@@ -100,7 +100,7 @@ repos:
           - "[email protected]"
 
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: "v9.15.0"
+    rev: "v9.22.0"
     hooks:
       - id: eslint
         args: [--fix]

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 25.03.1
+
+- Can filter tags in tags admin.
+- Enable tags hierarchy when updating an article on the details page.
+
 ## 25.01.1
 
 - Correct footer background on dark mode.

legadilo/constants.py

@@ -0,0 +1,17 @@
+# Legadilo
+# Copyright (C) 2023-2025 by Legadilo contributors.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+SEARCHED_TEXT_MIN_LENGTH = 3

legadilo/feeds/models/feed.py

@@ -32,6 +32,7 @@
 from legadilo.reading.models.tag import Tag
 from legadilo.users.models import User
 
+from ...constants import SEARCHED_TEXT_MIN_LENGTH
 from ...users.models import Notification
 from ...utils.time_utils import utcnow
 from .. import constants as feeds_constants
@@ -216,7 +217,7 @@ def get_by_categories(
             .order_by("category__title", "id")
         )
 
-        if len(searched_text) > 3:  # noqa: PLR2004 Magic value used in comparison
+        if len(searched_text) > SEARCHED_TEXT_MIN_LENGTH:
             qs = qs.filter(title__icontains=searched_text)
 
         for feed in qs:

legadilo/reading/models/tag.py

@@ -25,6 +25,7 @@
 from django.db.models.functions import Coalesce
 from slugify import slugify
 
+from legadilo.constants import SEARCHED_TEXT_MIN_LENGTH
 from legadilo.core import constants as core_constants
 from legadilo.core.forms import FormChoices
 from legadilo.reading import constants
@@ -169,14 +170,19 @@ def get_or_create_from_list(self, user: User, titles_or_slugs: Iterable[str]) ->
 
         return [*existing_tags, *tags_to_create]
 
-    def list_for_admin(self, user: User) -> list[Tag]:
-        return list(
+    def list_for_admin(self, user: User, searched_text: str = "") -> list[Tag]:
+        qs = (
             self.get_queryset()
             .for_user(user)
             .annotate(annot_articles_count=models.Count("articles"))
             .order_by("title")
         )
 
+        if len(searched_text) > SEARCHED_TEXT_MIN_LENGTH:
+            qs = qs.filter(title__icontains=searched_text)
+
+        return list(qs)
+
 
 class Tag(models.Model):
     title = models.CharField(max_length=50)

legadilo/reading/services/article_fetching.py

@@ -189,8 +189,8 @@ async def _get_page_content(url: str) -> tuple[str, BeautifulSoup, str | None]:
             )
             if (
                 (http_equiv_refresh := soup.find("meta", attrs={"http-equiv": "refresh"}))
-                and (http_equiv_refresh_value := http_equiv_refresh.get("content"))
-                and (http_equiv_refresh_url := _parse_http_equiv_refresh(http_equiv_refresh_value))
+                and (http_equiv_refresh_value := http_equiv_refresh.get("content"))  # type: ignore[union-attr]
+                and (http_equiv_refresh_url := _parse_http_equiv_refresh(http_equiv_refresh_value))  # type: ignore[arg-type]
             ):
                 url = http_equiv_refresh_url
                 continue
@@ -228,7 +228,7 @@ def _build_article_data_from_soup(
         external_article_id="",
         source_title=_get_site_title(fetched_url, soup),
         title=forced_title or _get_title(soup),
-        summary=_get_summary(soup, content),
+        summary=_get_summary(soup),
         content=content,
         authors=tuple(_get_authors(soup)),
         contributors=(),
@@ -242,7 +242,7 @@ def _build_article_data_from_soup(
     )
 
 
-def _get_title(soup: BeautifulSoup) -> str:
+def _get_title(soup) -> str:
     title = ""
     if (og_title := soup.find("meta", attrs={"property": "og:title"})) and og_title.get("content"):
         title = og_title.get("content")
@@ -262,7 +262,7 @@ def _get_title(soup: BeautifulSoup) -> str:
     return title
 
 
-def _get_site_title(fetched_url: str, soup: BeautifulSoup) -> str:
+def _get_site_title(fetched_url: str, soup) -> str:
     site_title = urlparse(fetched_url).netloc
     if (og_site_name := soup.find("meta", attrs={"property": "og:site_name"})) and og_site_name.get(
         "content"
@@ -274,7 +274,7 @@ def _get_site_title(fetched_url: str, soup: BeautifulSoup) -> str:
     return site_title
 
 
-def _get_summary(soup: BeautifulSoup, content: str) -> str:
+def _get_summary(soup) -> str:
     summary = ""
     if (
         og_description := soup.find("meta", attrs={"property": "og:description"})
@@ -302,7 +302,7 @@ def _get_fallback_summary_from_content(content: str) -> str:
     )
 
 
-def _get_content(soup: BeautifulSoup) -> str:
+def _get_content(soup) -> str:
     articles = soup.find_all("article")
     article_content = None
     if len(articles) > 1:
@@ -323,7 +323,7 @@ def _get_content(soup: BeautifulSoup) -> str:
     return str(article_content)
 
 
-def _parse_multiple_articles(soup: BeautifulSoup):
+def _parse_multiple_articles(soup):
     for article in soup.find_all(["article", "section"]):
         attrs = set()
         if article_id := article.get("id"):
@@ -350,20 +350,20 @@ def _parse_multiple_articles(soup: BeautifulSoup):
     return soup.find("article")
 
 
-def _extract_tag_from_content(soup: BeautifulSoup, tag_name: str):
+def _extract_tag_from_content(soup, tag_name: str):
     for tag in soup.find_all(tag_name):
         tag.extract()
 
 
-def _get_authors(soup: BeautifulSoup) -> list[str]:
+def _get_authors(soup) -> list[str]:
     authors = []
     if (meta_author := soup.find("meta", {"name": "author"})) and meta_author.get("content"):
         authors = [meta_author.get("content")]
 
     return authors
 
 
-def _get_tags(soup: BeautifulSoup) -> list[str]:
+def _get_tags(soup) -> list[str]:
     tags = set()
 
     if article_tags := soup.find_all("meta", attrs={"property": "article:tag"}):
@@ -388,7 +388,7 @@ def parse_tags_list(tags_str: str) -> set[str]:
     return parsed_tags
 
 
-def _get_link(fetched_url: str, soup: BeautifulSoup) -> str:
+def _get_link(fetched_url: str, soup) -> str:
     link = fetched_url
     if (canonical_link := soup.find("link", {"rel": "canonical"})) and canonical_link.get("href"):
         link = canonical_link.get("href")
@@ -399,7 +399,7 @@ def _get_link(fetched_url: str, soup: BeautifulSoup) -> str:
     return fetched_url
 
 
-def _get_preview_picture_url(fetched_url, soup: BeautifulSoup) -> str:
+def _get_preview_picture_url(fetched_url, soup) -> str:
     preview_picture_url = ""
 
     if (og_image := soup.find("meta", attrs={"property": "og:image"})) and (
@@ -432,7 +432,7 @@ def _get_preview_picture_url(fetched_url, soup: BeautifulSoup) -> str:
     return preview_picture_url
 
 
-def _get_published_at(soup: BeautifulSoup) -> datetime | None:
+def _get_published_at(soup) -> datetime | None:
     published_at = None
     if (
         article_published_time := soup.find("meta", attrs={"property": "article:published_time"})
@@ -442,7 +442,7 @@ def _get_published_at(soup: BeautifulSoup) -> datetime | None:
     return published_at
 
 
-def _get_updated_at(soup: BeautifulSoup) -> datetime | None:
+def _get_updated_at(soup) -> datetime | None:
     updated_at = None
     if (
         article_modified_time := soup.find("meta", attrs={"property": "article:modified_time"})
@@ -452,11 +452,11 @@ def _get_updated_at(soup: BeautifulSoup) -> datetime | None:
     return updated_at
 
 
-def _get_lang(soup: BeautifulSoup, content_language: str | None) -> str:
+def _get_lang(soup, content_language: str | None) -> str:
     if not soup.find("html") or (language := soup.find("html").get("lang")) is None:
         language = content_language
 
-    return language
+    return str(language or "")
 
 
 def _build_table_of_content(content: str) -> tuple[str, list[TableOfContentTopItem]]:

legadilo/reading/tests/test_models/test_tag.py

@@ -66,7 +66,7 @@ def test_associate_tag_with_sub_tags_clear_existing(self, user, django_assert_nu
 class TestTagManager:
     @pytest.fixture(autouse=True)
     def _setup_data(self, user):
-        self.tag1 = TagFactory(user=user)
+        self.tag1 = TagFactory(user=user, title="Super tag for search")
         self.tag2 = TagFactory(user=user)
         self.existing_tag_with_spaces = TagFactory(
             user=user, title="Existing tag with spaces", slug="existing-tag-with-spaces"
@@ -159,6 +159,13 @@ def test_list_for_admin(self, user):
         assert all_tags[1].annot_articles_count == 1  # type: ignore[attr-defined]
         assert all_tags[2].annot_articles_count == 0  # type: ignore[attr-defined]
 
+    def test_list_for_admin_with_search(self, user):
+        all_tags = Tag.objects.list_for_admin(user, searched_text="seArcH")
+
+        assert all_tags == [
+            self.tag1,
+        ]
+
 
 @pytest.mark.django_db
 class TestArticleTagQuerySet:

legadilo/reading/views/article_details_views.py

@@ -71,7 +71,7 @@ def article_details_view(
         slug=article_slug,
         user=request.user,
     )
-    tag_choices = Tag.objects.get_all_choices(request.user)
+    tag_choices, hierarchy = Tag.objects.get_all_choices_with_hierarchy(request.user)
     if request.method == "POST":
         status, edit_article_form, article = _handle_update(request, article, tag_choices)
     else:
@@ -97,6 +97,7 @@ def article_details_view(
             "edit_article_form": edit_article_form,
             "comment_article_form": CommentArticleForm(),
             "from_url": get_from_url_for_article_details(request, request.GET),
+            "tags_hierarchy": hierarchy,
         },
         status=status,
     )

legadilo/reading/views/search_views.py

@@ -37,6 +37,7 @@
 from legadilo.users.user_types import AuthenticatedHttpRequest
 from legadilo.utils.security import full_sanitize
 
+from ...constants import SEARCHED_TEXT_MIN_LENGTH
 from ...users.models import User
 from ...utils.collections_utils import alist, aset
 from ...utils.validators import is_url_valid
@@ -45,7 +46,7 @@
 
 class SearchForm(forms.Form):
     # Main fields.
-    q = forms.CharField(required=True, min_length=4, label=_("Search query"))
+    q = forms.CharField(required=True, min_length=SEARCHED_TEXT_MIN_LENGTH, label=_("Search query"))
     search_type = forms.ChoiceField(
         required=False,
         choices=constants.ArticleSearchType.choices,
@@ -125,7 +126,8 @@ def clean_q(self):
         q = full_sanitize(q)
         if len(q) < self.fields["q"].min_length:  # type: ignore[attr-defined]
             raise ValidationError(
-                "You must at least enter 3 characters", code="q-too-short-after-cleaning"
+                f"You must at least enter {SEARCHED_TEXT_MIN_LENGTH} characters",
+                code="q-too-short-after-cleaning",
             )
 
         return q

legadilo/reading/views/tags_admin_views.py

@@ -32,13 +32,21 @@
 from legadilo.reading.models.tag import SubTagMapping
 from legadilo.users.models import User
 from legadilo.users.user_types import AuthenticatedHttpRequest
+from legadilo.utils.security import full_sanitize
 
 
 @require_GET
 @login_required
 def tags_admin_view(request: AuthenticatedHttpRequest) -> TemplateResponse:
+    searched_text = full_sanitize(request.GET.get("q", ""))
+
     return TemplateResponse(
-        request, "reading/tags_admin.html", {"tags": Tag.objects.list_for_admin(request.user)}
+        request,
+        "reading/tags_admin.html",
+        {
+            "tags": Tag.objects.list_for_admin(request.user, searched_text=searched_text),
+            "searched_text": searched_text,
+        },
     )
 
 

legadilo/static/css/grid.css

@@ -1,6 +1,6 @@
 .grid {
   display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+  grid-template-columns: repeat(auto-fit, 24%);
   grid-gap: 1rem;
   grid-auto-rows: 1fr;
 }

legadilo/templates/feeds/feeds_admin.html

@@ -27,6 +27,7 @@ <h1>{% translate "Feeds admin" %}</h1>
                    value="{{ searched_text }}"
                    aria-label="Search for feeds"
                    aria-describedby="feeds-search-glass" />
+            <button class="btn btn-outline-secondary" type="submit">{% translate "Search" %}</button>
         </div>
     </form>
     <div id="feeds-by-categories-accordion" class="accordion mt-3">

legadilo/templates/reading/article_details.html

@@ -9,6 +9,7 @@
     <script src="{% static 'js/tag_edition.js' %}"
             nonce="{{request.csp_nonce}}"
             type="module"></script>
+    {{ tags_hierarchy|json_script:"tags-hierarchy" }}
 {% endblock page_js %}
 {% block page_css %}
     <link rel="stylesheet"