aa-fleetfinder 2.3.4__tar.gz → 2.5.0__tar.gz

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-fleetfinder
-Version: 2.3.4
+Version: 2.5.0
 Summary: Fleet finder plugin for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-fleetfinder/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/ppfeufer/aa-fleetfinder/blob/master/README.md
@@ -702,6 +702,7 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.10
 Requires-Dist: allianceauth-app-utils>=1.14.2
 Requires-Dist: allianceauth<5,>=4.6
+Requires-Dist: django-esi>=7.0.1
 Provides-Extra: tests-allianceauth-latest
 Requires-Dist: coverage; extra == 'tests-allianceauth-latest'
 Requires-Dist: django-webtest; extra == 'tests-allianceauth-latest'

aa_fleetfinder-2.5.0/fleetfinder/__init__.py

@@ -0,0 +1,17 @@
+"""
+Initialize the app
+"""
+
+# Django
+from django.utils.translation import gettext_lazy as _
+
+__version__ = "2.5.0"
+__title__ = _("Fleet Finder")
+__verbose_name__ = "Fleet Finder for Alliance Auth"
+
+__package_name__ = "aa-fleetfinder"
+__app_name__ = "fleetfinder"
+__app_name_verbose__ = "AA Fleet Finder"
+__app_name_useragent__ = "AA-Fleet-Finder"
+
+__github_url__ = f"https://github.com/ppfeufer/{__package_name__}"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/cs_CZ/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2024-07-10 14:26+0000\n"
 "Last-Translator: Dadas Aideron <dadas.aideron@gmail.com>\n"
 "Language-Team: Czech <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/cs/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/de/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2025-04-25 11:24+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: German <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/de/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/django.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: AA Fleet Finder 2.3.4\n"
+"Project-Id-Version: AA Fleet Finder 2.4.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/es/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2024-12-02 17:40+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Spanish <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/es/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/fr_FR/LC_MESSAGES/django.po

@@ -6,13 +6,13 @@
 # Matthias P <randomusernetcom@gmail.com>, 2024.
 # Hexo <ghostcig@free.fr>, 2024.
 # Houbi_Houba <paul.lacape@live.fr>, 2024.
-# balbozorre <loic.petiot2002@gmail.com>, 2024.
+# balbozorre <loic.petiot2002@gmail.com>, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
-"PO-Revision-Date: 2024-12-10 17:15+0000\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
+"PO-Revision-Date: 2025-05-20 16:24+0000\n"
 "Last-Translator: balbozorre <loic.petiot2002@gmail.com>\n"
 "Language-Team: French <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/fr/>\n"
 "Language: fr_FR\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.8.4\n"
+"X-Generator: Weblate 5.11.4\n"
 
 #: fleetfinder/__init__.py:9 fleetfinder/models.py:24
 #: fleetfinder/templates/fleetfinder/base.html:6
@@ -74,16 +74,16 @@ msgstr "Date et heure de création"
 #: fleetfinder/models.py:62
 #: fleetfinder/templates/fleetfinder/partials/body/form-fleet-details.html:37
 msgid "Fleet MOTD"
-msgstr ""
+msgstr "MOTD de la flotte"
 
 #: fleetfinder/models.py:63
 msgid "Free move"
-msgstr ""
+msgstr "Mouvement libre"
 
 #: fleetfinder/models.py:69
 #: fleetfinder/templates/fleetfinder/partials/body/form-fleet-details.html:32
 msgid "Only selected groups will have access to the fleet. If no groups are selected the fleet will be available to all who have access to this module."
-msgstr ""
+msgstr "Seuls les groupes sélectionnés auront accès à la flotte. Si aucun groupe n'est sélectionné, la flotte sera accessible à tous ceux qui ont accès à ce module."
 
 #: fleetfinder/models.py:73
 msgid "Group restrictions"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/it_IT/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2024-12-22 21:15+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Italian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/it/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/ja/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2024-08-06 11:28+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Japanese <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/ja/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/ko_KR/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2025-04-28 07:24+0000\n"
 "Last-Translator: SiO4 <hohoit0078@gmail.com>\n"
 "Language-Team: Korean <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/ko/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/nl_NL/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2024-05-10 14:03+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Dutch <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/nl/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/pl_PL/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2024-05-10 14:03+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Polish <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/pl/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/ru/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2024-06-06 14:27+0000\n"
 "Last-Translator: Roycce_ <malyasov.roma@mail.ru>\n"
 "Language-Team: Russian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/ru/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/sk/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2024-05-10 14:03+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Slovak <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/sk/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/uk/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2025-04-10 07:05+0000\n"
 "Last-Translator: s0k0l -_- <salarysalo@gmail.com>\n"
 "Language-Team: Ukrainian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/uk/>\n"

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/fleetfinder/locale/zh_Hans/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-05-05 21:13+0200\n"
+"POT-Creation-Date: 2025-06-03 10:57+0200\n"
 "PO-Revision-Date: 2024-06-06 14:27+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/zh_Hans/>\n"

aa_fleetfinder-2.5.0/fleetfinder/providers.py

@@ -0,0 +1,14 @@
+"""
+Providers
+"""
+
+# Alliance Auth
+from esi.clients import EsiClientProvider
+
+# AA Fleet Finder
+from fleetfinder import __app_name_useragent__, __github_url__, __version__
+
+# ESI client
+esi = EsiClientProvider(
+    ua_appname=__app_name_useragent__, ua_version=__version__, ua_url=__github_url__
+)

aa_fleetfinder-2.5.0/fleetfinder/templates/fleetfinder/bundles/css/fleetfinder-css.html

@@ -0,0 +1,3 @@
+{% load sri %}
+
+{% sri_static "fleetfinder/css/fleetfinder.min.css" %}

aa_fleetfinder-2.5.0/fleetfinder/templates/fleetfinder/bundles/css/slim-select-css.html

@@ -0,0 +1,3 @@
+{% load sri %}
+
+{% sri_static "fleetfinder/libs/slim-select/2.6.0/css/slimselect.min.css" %}

aa_fleetfinder-2.5.0/fleetfinder/templates/fleetfinder/bundles/js/slim-select-js.html

@@ -0,0 +1,3 @@
+{% load sri %}
+
+{% sri_static "fleetfinder/libs/slim-select/2.6.0/js/slimselect.min.js" %}

aa_fleetfinder-2.5.0/fleetfinder/templatetags/fleetfinder.py

@@ -0,0 +1,33 @@
+"""
+Versioned static URLs to break browser caches when changing the app version
+"""
+
+# Django
+from django.template.defaulttags import register
+
+# Alliance Auth
+from allianceauth.services.hooks import get_extension_logger
+
+# Alliance Auth (External Libs)
+from app_utils.logging import LoggerAddTag
+
+# AA Fleet Finder
+from fleetfinder import __title__
+
+logger = LoggerAddTag(my_logger=get_extension_logger(__name__), prefix=__title__)
+
+
+@register.filter
+def get_item(dictionary: dict | None, key: str) -> str | None:
+    """
+    Little helper: get a key from a dictionary
+
+    :param dictionary:
+    :param key:
+    :return:
+    """
+
+    if dictionary is None:
+        return None
+
+    return dictionary.get(key, None)

aa_fleetfinder-2.5.0/fleetfinder/tests/test_templatetags.py

@@ -0,0 +1,67 @@
+"""
+Test the apps' template tags
+"""
+
+# Django
+from django.test import TestCase
+
+# AA Fleet Finder
+from fleetfinder.templatetags.fleetfinder import get_item
+
+
+class TestGetItem(TestCase):
+    """
+    Test the `get_item` template tag
+    """
+
+    def test_returns_value_for_existing_key(self):
+        """
+        Test should return the value for an existing key
+
+        :return:
+        :rtype:
+        """
+
+        dictionary = {"key1": "value1", "key2": "value2"}
+        result = get_item(dictionary, "key1")
+
+        self.assertEqual(result, "value1")
+
+    def test_returns_none_for_non_existing_key(self):
+        """
+        Test should return None for a non-existing key
+
+        :return:
+        :rtype:
+        """
+
+        dictionary = {"key1": "value1", "key2": "value2"}
+        result = get_item(dictionary, "key3")
+
+        self.assertIsNone(result)
+
+    def test_returns_none_for_empty_dictionary(self):
+        """
+        Test should return None for an empty dictionary
+
+        :return:
+        :rtype:
+        """
+
+        dictionary = {}
+        result = get_item(dictionary, "key1")
+
+        self.assertIsNone(result)
+
+    def test_returns_none_for_none_dictionary(self):
+        """
+        Test should return None for a None dictionary
+
+        :return:
+        :rtype:
+        """
+
+        dictionary = None
+        result = get_item(dictionary, "key1")
+
+        self.assertIsNone(result)

aa_fleetfinder-2.5.0/fleetfinder/tests/test_user_agent.py

@@ -0,0 +1,40 @@
+"""
+Test user agent header for ESI requests
+"""
+
+# Django
+from django.conf import settings
+from django.test import TestCase
+
+# Alliance Auth
+from esi import __url__ as esi_url
+from esi import __version__ as esi_version
+
+# AA Fleet Finder
+from fleetfinder import __app_name_useragent__, __github_url__, __version__
+from fleetfinder.providers import esi
+
+
+class TestUserAgent(TestCase):
+    """
+    Test the user agent header for ESI requests
+    """
+
+    def test_user_agent_header(self):
+        """
+        Test that the user agent header is set correctly for ESI requests.
+
+        :return:
+        :rtype:
+        """
+
+        operation = esi.client.Universe.get_universe_factions()
+
+        self.assertEqual(
+            operation.future.request.headers["User-Agent"],
+            (
+                f"{__app_name_useragent__}/{__version__} "
+                f"({settings.ESI_USER_CONTACT_EMAIL}; +{__github_url__}) "
+                f"Django-ESI/{esi_version} (+{esi_url})"
+            ),
+        )

{aa_fleetfinder-2.3.4 → aa_fleetfinder-2.5.0}/pyproject.toml

@@ -40,6 +40,7 @@ dynamic = [
 dependencies = [
     "allianceauth>=4.6,<5",
     "allianceauth-app-utils>=1.14.2",
+    "django-esi>=7.0.1",
 ]
 optional-dependencies.tests-allianceauth-latest = [
     "coverage",

aa_fleetfinder-2.3.4/fleetfinder/__init__.py

@@ -1,10 +0,0 @@
-"""
-Initialize the app
-"""
-
-# Django
-from django.utils.translation import gettext_lazy as _
-
-__version__ = "2.3.4"
-__title__ = _("Fleet Finder")
-__verbose_name__ = "Fleet Finder for Alliance Auth"

aa_fleetfinder-2.3.4/fleetfinder/constants.py

@@ -1,22 +0,0 @@
-"""
-Constants used in this app
-"""
-
-# Standard Library
-import os
-
-# Alliance Auth
-from esi import __version__ as esi_version
-
-# AA Fleet Finder
-from fleetfinder import __version__
-
-APP_NAME = "aa-fleetfinder"
-APP_NAME_VERBOSE = "AA Fleet Finder"
-APP_NAME_VERBOSE_USERAGENT = "AA-Fleet-Finder"
-PACKAGE_NAME = "fleetfinder"
-GITHUB_URL = f"https://github.com/ppfeufer/{APP_NAME}"
-USER_AGENT = f"{APP_NAME_VERBOSE_USERAGENT}/{__version__} (+{GITHUB_URL}) Django-ESI/{esi_version}"
-
-APP_BASE_DIR = os.path.join(os.path.dirname(__file__))
-APP_STATIC_DIR = os.path.join(APP_BASE_DIR, "static", PACKAGE_NAME)

aa_fleetfinder-2.3.4/fleetfinder/helper/static_files.py

@@ -1,42 +0,0 @@
-"""
-Helper functions for static integrity calculations
-"""
-
-# Standard Library
-import os
-from pathlib import Path
-
-# Third Party
-from sri import Algorithm, calculate_integrity
-
-# Alliance Auth
-from allianceauth.services.hooks import get_extension_logger
-
-# Alliance Auth (External Libs)
-from app_utils.logging import LoggerAddTag
-
-# AA Fleet Finder
-from fleetfinder import __title__
-from fleetfinder.constants import APP_STATIC_DIR
-
-logger = LoggerAddTag(my_logger=get_extension_logger(__name__), prefix=__title__)
-
-
-def calculate_integrity_hash(relative_file_path: str) -> str:
-    """
-    Calculates the integrity hash for a given static file
-
-    :param self:
-    :type self:
-    :param relative_file_path: The file path relative to the `{APP_NAME}/{PACKAGE_NAME}/static/{PACKAGE_NAME}` folder
-    :type relative_file_path: str
-    :return: The integrity hash
-    :rtype: str
-    """
-
-    file_path = os.path.join(APP_STATIC_DIR, relative_file_path)
-    integrity_hash = calculate_integrity(
-        path=Path(file_path), algorithm=Algorithm.SHA512
-    )
-
-    return integrity_hash

aa_fleetfinder-2.3.4/fleetfinder/providers.py

@@ -1,12 +0,0 @@
-"""
-Providers
-"""
-
-# Alliance Auth
-from esi.clients import EsiClientProvider
-
-# AA Fleet Finder
-from fleetfinder.constants import USER_AGENT
-
-# ESI client
-esi = EsiClientProvider(app_info_text=USER_AGENT)

aa_fleetfinder-2.3.4/fleetfinder/templates/fleetfinder/bundles/css/fleetfinder-css.html

@@ -1,3 +0,0 @@
-{% load fleetfinder %}
-
-{% fleetfinder_static "css/fleetfinder.min.css" %}

aa_fleetfinder-2.3.4/fleetfinder/templates/fleetfinder/bundles/css/slim-select-css.html

@@ -1,3 +0,0 @@
-{% load fleetfinder %}
-
-{% fleetfinder_static "libs/slim-select/2.6.0/css/slimselect.min.css" %}

aa_fleetfinder-2.3.4/fleetfinder/templates/fleetfinder/bundles/js/slim-select-js.html

@@ -1,3 +0,0 @@
-{% load fleetfinder %}
-
-{% fleetfinder_static "libs/slim-select/2.6.0/js/slimselect.min.js" %}

aa_fleetfinder-2.3.4/fleetfinder/templatetags/fleetfinder.py

@@ -1,102 +0,0 @@
-"""
-Versioned static URLs to break browser caches when changing the app version
-"""
-
-# Standard Library
-import os
-
-# Django
-from django.template.defaulttags import register
-from django.templatetags.static import static
-from django.utils.safestring import mark_safe
-
-# Alliance Auth
-from allianceauth.services.hooks import get_extension_logger
-
-# Alliance Auth (External Libs)
-from app_utils.logging import LoggerAddTag
-
-# AA Fleet Finder
-from fleetfinder import __title__, __version__
-from fleetfinder.app_settings import debug_enabled
-from fleetfinder.constants import PACKAGE_NAME
-from fleetfinder.helper.static_files import calculate_integrity_hash
-
-logger = LoggerAddTag(my_logger=get_extension_logger(__name__), prefix=__title__)
-
-
-@register.simple_tag
-def fleetfinder_static(relative_file_path: str, script_type: str = None) -> str | None:
-    """
-    Versioned static URL
-
-    :param relative_file_path: The file path relative to the `{APP_NAME}/{PACKAGE_NAME}/static/{PACKAGE_NAME}` folder
-    :type relative_file_path: str
-    :param script_type: The script type
-    :type script_type: str
-    :return: Versioned static URL
-    :rtype: str
-    """
-
-    logger.debug(f"Getting versioned static URL for: {relative_file_path}")
-
-    file_type = os.path.splitext(relative_file_path)[1][1:]
-
-    logger.debug(f"File extension: {file_type}")
-
-    # Only support CSS and JS files
-    if file_type not in ["css", "js"]:
-        raise ValueError(f"Unsupported file type: {file_type}")
-
-    static_file_path = os.path.join(PACKAGE_NAME, relative_file_path)
-    static_url = static(static_file_path)
-
-    # Integrity hash calculation only for non-debug mode
-    sri_string = (
-        f' integrity="{calculate_integrity_hash(relative_file_path)}" crossorigin="anonymous"'
-        if not debug_enabled()
-        else ""
-    )
-
-    # Versioned URL for CSS and JS files
-    # Add version query parameter to break browser caches when changing the app version
-    # Do not add version query parameter for libs as they are already versioned through their file path
-    versioned_url = (
-        static_url
-        if relative_file_path.startswith("libs/")
-        else static_url + "?v=" + __version__
-    )
-
-    return_value = None
-
-    # Return the versioned URL with integrity hash for CSS
-    if file_type == "css":
-        return_value = mark_safe(
-            f'<link rel="stylesheet" href="{versioned_url}"{sri_string}>'
-        )
-
-    # Return the versioned URL with integrity hash for JS files
-    if file_type == "js":
-        js_type = f' type="{script_type}"' if script_type else ""
-
-        return_value = mark_safe(
-            f'<script{js_type} src="{versioned_url}"{sri_string}></script>'
-        )
-
-    return return_value
-
-
-@register.filter
-def get_item(dictionary: dict | None, key: str) -> str | None:
-    """
-    Little helper: get a key from a dictionary
-
-    :param dictionary:
-    :param key:
-    :return:
-    """
-
-    if dictionary is None:
-        return None
-
-    return dictionary.get(key, None)

aa_fleetfinder-2.3.4/fleetfinder/tests/test_templatetags.py

@@ -1,154 +0,0 @@
-"""
-Test the apps' template tags
-"""
-
-# Django
-from django.template import Context, Template
-from django.test import TestCase, override_settings
-
-# AA Fleet Finder
-from fleetfinder import __version__
-from fleetfinder.constants import PACKAGE_NAME
-from fleetfinder.helper.static_files import calculate_integrity_hash
-from fleetfinder.templatetags.fleetfinder import get_item
-
-
-class TestVersionedStatic(TestCase):
-    """
-    Test the `fleetfinder_static` template tag
-    """
-
-    @override_settings(DEBUG=False)
-    def test_versioned_static(self):
-        """
-        Test should return the versioned static
-
-        :return:
-        :rtype:
-        """
-
-        context = Context(dict_={"version": __version__})
-        template_to_render = Template(
-            template_string=(
-                "{% load fleetfinder %}"
-                "{% fleetfinder_static 'css/fleetfinder.min.css' %}"
-            )
-        )
-
-        rendered_template = template_to_render.render(context=context)
-
-        expected_static_css_src = (
-            f'/static/{PACKAGE_NAME}/css/fleetfinder.min.css?v={context["version"]}'
-        )
-        expected_static_css_src_integrity = calculate_integrity_hash(
-            "css/fleetfinder.min.css"
-        )
-
-        self.assertIn(member=expected_static_css_src, container=rendered_template)
-        self.assertIn(
-            member=expected_static_css_src_integrity, container=rendered_template
-        )
-
-    @override_settings(DEBUG=True)
-    def test_versioned_static_with_debug_enabled(self) -> None:
-        """
-        Test versioned static template tag with DEBUG enabled
-
-        :return:
-        :rtype:
-        """
-
-        context = Context({"version": __version__})
-        template_to_render = Template(
-            template_string=(
-                "{% load fleetfinder %}"
-                "{% fleetfinder_static 'css/fleetfinder.min.css' %}"
-            )
-        )
-
-        rendered_template = template_to_render.render(context=context)
-
-        expected_static_css_src = (
-            f'/static/{PACKAGE_NAME}/css/fleetfinder.min.css?v={context["version"]}'
-        )
-
-        self.assertIn(member=expected_static_css_src, container=rendered_template)
-        self.assertNotIn(member="integrity=", container=rendered_template)
-
-    @override_settings(DEBUG=False)
-    def test_invalid_file_type(self) -> None:
-        """
-        Test should raise a ValueError for an invalid file type
-
-        :return:
-        :rtype:
-        """
-
-        context = Context({"version": __version__})
-        template_to_render = Template(
-            template_string=(
-                "{% load fleetfinder %}"
-                "{% fleetfinder_static 'invalid/invalid.txt' %}"
-            )
-        )
-
-        with self.assertRaises(ValueError):
-            template_to_render.render(context=context)
-
-
-class TestGetItem(TestCase):
-    """
-    Test the `get_item` template tag
-    """
-
-    def test_returns_value_for_existing_key(self):
-        """
-        Test should return the value for an existing key
-
-        :return:
-        :rtype:
-        """
-
-        dictionary = {"key1": "value1", "key2": "value2"}
-        result = get_item(dictionary, "key1")
-
-        self.assertEqual(result, "value1")
-
-    def test_returns_none_for_non_existing_key(self):
-        """
-        Test should return None for a non-existing key
-
-        :return:
-        :rtype:
-        """
-
-        dictionary = {"key1": "value1", "key2": "value2"}
-        result = get_item(dictionary, "key3")
-
-        self.assertIsNone(result)
-
-    def test_returns_none_for_empty_dictionary(self):
-        """
-        Test should return None for an empty dictionary
-
-        :return:
-        :rtype:
-        """
-
-        dictionary = {}
-        result = get_item(dictionary, "key1")
-
-        self.assertIsNone(result)
-
-    def test_returns_none_for_none_dictionary(self):
-        """
-        Test should return None for a None dictionary
-
-        :return:
-        :rtype:
-        """
-
-        dictionary = None
-        result = get_item(dictionary, "key1")
-
-        self.assertIsNone(result)