aa-intel-tool 2.5.2__tar.gz → 2.6.1__tar.gz

{aa_intel_tool-2.5.2 → aa_intel_tool-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: aa-intel-tool
-Version: 2.5.2
+Version: 2.6.1
 Summary: A simple parser for D-Scans and more for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-intel-tool/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/ppfeufer/aa-intel-tool/blob/master/README.md
@@ -683,6 +683,7 @@ License:                     GNU GENERAL PUBLIC LICENSE
         the library.  If this is what you want to do, use the GNU Lesser General
         Public License instead of this License.  But first, please read
         <https://www.gnu.org/licenses/why-not-lgpl.html>.
+License-File: LICENSE
 Keywords: allianceauth,eveonline
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
@@ -700,7 +701,7 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.10
 Requires-Dist: allianceauth-app-utils>=1.19.1
-Requires-Dist: allianceauth<5,>=4.3.1
+Requires-Dist: allianceauth<5,>=4.6
 Requires-Dist: django-eveuniverse>=1.3
 Provides-Extra: tests-allianceauth-latest
 Requires-Dist: coverage; extra == 'tests-allianceauth-latest'
@@ -985,9 +986,9 @@ Please make sure to read the [Contribution Guidelines].\
 [code of conduct]: https://github.com/ppfeufer/aa-intel-tool/blob/master/CODE_OF_CONDUCT.md
 [contribution guidelines]: https://github.com/ppfeufer/aa-intel-tool/blob/master/CONTRIBUTING.md "Contribution Guidelines"
 [eve universe]: https://gitlab.com/ErikKalkoken/django-eveuniverse "Eve Universe"
-[image: chat scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/chat-scan.jpg "Chat Scan Module"
-[image: d-scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/d-scan.jpg "D-Scan Module"
-[image: fleet composition module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/fleet-composition.jpg "Fleet Composition Module"
+[image: chat scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/presentation/chat-scan.jpg "Chat Scan Module"
+[image: d-scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/presentation/d-scan.jpg "D-Scan Module"
+[image: fleet composition module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/presentation/fleet-composition.jpg "Fleet Composition Module"
 [ppfeufer on ko-fi]: https://ko-fi.com/ppfeufer "Buy Me a Coffee!"
 [pre-commit.ci status]: https://results.pre-commit.ci/latest/github/ppfeufer/aa-intel-tool/master "pre-commit.ci"
 [support discord]: https://discord.gg/zmh52wnfvM "Alliance Auth Community Apps Support Discord"

{aa_intel_tool-2.5.2 → aa_intel_tool-2.6.1}/README.md

@@ -276,9 +276,9 @@ Please make sure to read the [Contribution Guidelines].\
 [code of conduct]: https://github.com/ppfeufer/aa-intel-tool/blob/master/CODE_OF_CONDUCT.md
 [contribution guidelines]: https://github.com/ppfeufer/aa-intel-tool/blob/master/CONTRIBUTING.md "Contribution Guidelines"
 [eve universe]: https://gitlab.com/ErikKalkoken/django-eveuniverse "Eve Universe"
-[image: chat scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/chat-scan.jpg "Chat Scan Module"
-[image: d-scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/d-scan.jpg "D-Scan Module"
-[image: fleet composition module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/fleet-composition.jpg "Fleet Composition Module"
+[image: chat scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/presentation/chat-scan.jpg "Chat Scan Module"
+[image: d-scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/presentation/d-scan.jpg "D-Scan Module"
+[image: fleet composition module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/presentation/fleet-composition.jpg "Fleet Composition Module"
 [ppfeufer on ko-fi]: https://ko-fi.com/ppfeufer "Buy Me a Coffee!"
 [pre-commit.ci status]: https://results.pre-commit.ci/latest/github/ppfeufer/aa-intel-tool/master "pre-commit.ci"
 [support discord]: https://discord.gg/zmh52wnfvM "Alliance Auth Community Apps Support Discord"

{aa_intel_tool-2.5.2 → aa_intel_tool-2.6.1}/aa_intel_tool/__init__.py

@@ -5,5 +5,5 @@ App init
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = "2.5.2"
+__version__ = "2.6.1"
 __title__ = _("Intel Parser")

{aa_intel_tool-2.5.2 → aa_intel_tool-2.6.1}/aa_intel_tool/app_settings.py

@@ -4,6 +4,10 @@ App settings
 
 # Standard Library
 from enum import IntEnum
+from re import RegexFlag
+
+# Django
+from django.conf import settings
 
 # Alliance Auth
 from allianceauth.services.hooks import get_extension_logger
@@ -57,7 +61,7 @@ class AppSettings:
     )
 
     # Set the grid size for D-Scans.
-    # This defines the size of teh grid in which ships and
+    # This defines the size of the grid in which ships and
     # structure are considered to be "on grid"
     INTELTOOL_DSCAN_GRID_SIZE = clean_setting(
         name="INTELTOOL_DSCAN_GRID_SIZE", default_value=10000, required_type=int
@@ -81,3 +85,14 @@ class UpwellStructureId(IntEnum):
     """
 
     ANSIBLEX_JUMP_GATE = 35841
+
+
+def debug_enabled() -> RegexFlag:
+    """
+    Check if DEBUG is enabled
+
+    :return:
+    :rtype:
+    """
+
+    return settings.DEBUG

{aa_intel_tool-2.5.2 → aa_intel_tool-2.6.1}/aa_intel_tool/constants.py

@@ -3,12 +3,15 @@ App constants
 """
 
 # Standard Library
+import os
 import re
 
 # Django
-from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
+# Alliance Auth
+from esi import __version__ as esi_version
+
 # AA Intel Tool
 import aa_intel_tool.parser.module.chatlist
 import aa_intel_tool.parser.module.dscan
@@ -76,7 +79,12 @@ SUPPORTED_INTEL_TYPES = {
 
 
 # Building our user agent for ESI calls
-VERBOSE_NAME = "AA Intel Tool"
-verbose_name_slugified: str = slugify(VERBOSE_NAME, allow_unicode=True)
-github_url: str = "https://github.com/ppfeufer/aa-intel-tool"
-USER_AGENT = f"{verbose_name_slugified} v{__version__} {github_url}"
+APP_NAME = "aa-intel-tool"
+PACKAGE_NAME = "aa_intel_tool"
+APP_VERBOSE_NAME = "AA Intel Tool"
+APP_VERBOSE_NAME_USERAGENT = "AA-Intel-Tool"
+GITHUB_URL = f"https://github.com/ppfeufer/{APP_NAME}"
+USER_AGENT = f"{APP_VERBOSE_NAME_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_intel_tool-2.6.1/aa_intel_tool/helper/static_files.py

@@ -0,0 +1,42 @@
+"""
+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 Intel Tool
+from aa_intel_tool import __title__
+from aa_intel_tool.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_intel_tool-2.5.2 → aa_intel_tool-2.6.1}/aa_intel_tool/locale/cs_CZ/LC_MESSAGES/django.po

@@ -6,22 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Intel Tool 2.5.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-intel-tool/issues\n"
-"POT-Creation-Date: 2024-12-14 18:06+0100\n"
+"POT-Creation-Date: 2025-03-07 15:55+0100\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-intel-tool/cs/>\n"
+"Language-Team: Czech <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-intel-tool/cs/>\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
-"<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 "X-Generator: Weblate 5.6.2\n"
 
 #: aa_intel_tool/__init__.py:9
-#: aa_intel_tool/templates/aa_intel_tool/base.html:6
-#: aa_intel_tool/templates/aa_intel_tool/base.html:10
+#: aa_intel_tool/templates/aa_intel_tool/base.html:7
+#: aa_intel_tool/templates/aa_intel_tool/base.html:11
 #: aa_intel_tool/templates/aa_intel_tool/views/index.html:8
 #: aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html:5
 #: aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html:5
@@ -47,16 +45,16 @@ msgstr ""
 msgid "Intel Parser v{__version__}"
 msgstr ""
 
-#: aa_intel_tool/constants.py:58 aa_intel_tool/models.py:24
+#: aa_intel_tool/constants.py:61 aa_intel_tool/models.py:24
 msgid "Chat list"
 msgstr ""
 
-#: aa_intel_tool/constants.py:64 aa_intel_tool/models.py:22
+#: aa_intel_tool/constants.py:67 aa_intel_tool/models.py:22
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:28
 msgid "D-Scan"
 msgstr ""
 
-#: aa_intel_tool/constants.py:70 aa_intel_tool/models.py:23
+#: aa_intel_tool/constants.py:73 aa_intel_tool/models.py:23
 #: aa_intel_tool/models.py:123
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:33
 msgid "Fleet composition"
@@ -158,8 +156,7 @@ msgid "Scan data"
 msgstr ""
 
 #: aa_intel_tool/parser/general.py:46
-msgid ""
-"No suitable parser found. Input is not a supported intel type or malformed …"
+msgid "No suitable parser found. Input is not a supported intel type or malformed …"
 msgstr ""
 
 #: aa_intel_tool/parser/general.py:80
@@ -180,12 +177,8 @@ msgstr ""
 
 #: aa_intel_tool/parser/module/chatlist.py:299
 #, python-brace-format
-msgid ""
-"Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot "
-"per scan. Your list of pilots exceeds this limit."
-msgid_plural ""
-"Chat scans are currently limited to a maximum of {max_allowed_pilots} pilots "
-"per scan. Your list of pilots exceeds this limit."
+msgid "Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot per scan. Your list of pilots exceeds this limit."
+msgid_plural "Chat scans are currently limited to a maximum of {max_allowed_pilots} pilots per scan. Your list of pilots exceeds this limit."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -199,100 +192,25 @@ msgstr ""
 msgid "The fleet composition module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:9
+#: aa_intel_tool/templates/aa_intel_tool/base.html:23
 msgid "Permalink successfully copied"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:10
-msgid ""
-"Something went wrong. Nothing copied. Maybe your browser does not support "
-"this function."
+#: aa_intel_tool/templates/aa_intel_tool/base.html:24
+msgid "Something went wrong. Nothing copied. Maybe your browser does not support this function."
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:15
+#: aa_intel_tool/templates/aa_intel_tool/base.html:25
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:4
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:4
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:3
 msgid "Unaffiliated / No Alliance"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:16
+#: aa_intel_tool/templates/aa_intel_tool/base.html:26
 msgid "NPC Corp"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:20
-msgctxt "Decimal separator"
-msgid "."
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:21
-msgctxt "Thousands separator"
-msgid ","
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:22
-msgid "No data available in this table"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:23
-msgctxt "Keep _END_ as it is. It will be replaced by a number."
-msgid "Showing _END_ entries"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:24
-msgctxt "Keep _MAX_ as it is. It will be replaced by a number."
-msgid "(filtered from _MAX_ total entries)"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:25
-msgid "No records available"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:27
-msgctxt "Keep _MENU_ as it is. It will be replaced by an HTML construct."
-msgid "Show _MENU_"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:28
-msgid "Loading …"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:29
-msgid "Processing …"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:30
-msgid "Nothing found, sorry …"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:32
-msgid "Search …"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:34
-msgid "First"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:35
-msgid "Last"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:36
-msgid "Next"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:37
-msgid "Previous"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:40
-msgid ": activate to sort column ascending"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:41
-msgid ": activate to sort column descending"
-msgstr ""
-
 #: aa_intel_tool/templates/aa_intel_tool/partials/body/scan-retention-note.html:5
 #, python-format
 msgid "Scans will be deleted after %(scan_retention_time)s day."
@@ -303,12 +221,8 @@ msgstr[2] ""
 msgstr[3] ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/footer/app-translation-footer.html:5
-msgid ""
-"Do you want to help translate this app into your language or improve the "
-"existing translation?"
-msgstr ""
-"Chceš pomoc s překladem této aplikace do tvého jazyka, nebo vylepšit "
-"současný překlad?"
+msgid "Do you want to help translate this app into your language or improve the existing translation?"
+msgstr "Chceš pomoc s překladem této aplikace do tvého jazyka, nebo vylepšit současný překlad?"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/footer/app-translation-footer.html:8
 msgid "Join our team of translators!"
@@ -332,9 +246,7 @@ msgstr[2] ""
 msgstr[3] ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:40
-msgid ""
-"Please keep in mind, parsing large amounts of data can take some time. Be "
-"patient, CCP's API is not the fastest to answer …"
+msgid "Please keep in mind, parsing large amounts of data can take some time. Be patient, CCP's API is not the fastest to answer …"
 msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:51
@@ -350,8 +262,7 @@ msgid "Detecting the intel type"
 msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:59
-msgid ""
-"Fetching potentially missing information from ESI (this might take a moment)"
+msgid "Fetching potentially missing information from ESI (this might take a moment)"
 msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:60