aa-intel-tool 2.6.0__tar.gz → 2.6.2__tar.gz

{aa_intel_tool-2.6.0 → aa_intel_tool-2.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-intel-tool
-Version: 2.6.0
+Version: 2.6.2
 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
@@ -986,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.6.0 → aa_intel_tool-2.6.2}/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.6.0 → aa_intel_tool-2.6.2}/aa_intel_tool/__init__.py

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

{aa_intel_tool-2.6.0 → aa_intel_tool-2.6.2}/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
@@ -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.6.0 → aa_intel_tool-2.6.2}/aa_intel_tool/constants.py

@@ -80,10 +80,11 @@ SUPPORTED_INTEL_TYPES = {
 
 # Building our user agent for ESI calls
 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_NAME}/{__version__} ({GITHUB_URL}) via django-esi/{esi_version}"
+USER_AGENT = f"{APP_VERBOSE_NAME_USERAGENT}/{__version__} (+{GITHUB_URL}) Django-ESI/{esi_version}"
 
-AA_INTEL_TOOL_BASE_DIR = os.path.join(os.path.dirname(__file__))
-AA_INTEL_TOOL_STATIC_DIR = os.path.join(
-    AA_INTEL_TOOL_BASE_DIR, "static", "aa_intel_tool"
-)
+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.0 → aa_intel_tool-2.6.2}/aa_intel_tool/helper/eve_character.py

@@ -25,7 +25,7 @@ from aa_intel_tool import __title__
 logger = LoggerAddTag(my_logger=get_extension_logger(name=__name__), prefix=__title__)
 
 
-def _create_alliance(alliance_ids: Iterable[int] = None) -> None:
+def _create_alliance(alliance_ids: Iterable[int]) -> None:
     """
     Bulk creation of EveAllianceInfo objects
 
@@ -36,7 +36,6 @@ def _create_alliance(alliance_ids: Iterable[int] = None) -> None:
     """
 
     alliance_ids = set(alliance_ids)
-
     existing_alliance_ids = set(
         EveAllianceInfo.objects.filter(alliance_id__in=alliance_ids).values_list(
             "alliance_id", flat=True
@@ -44,23 +43,21 @@ def _create_alliance(alliance_ids: Iterable[int] = None) -> None:
     )
 
     alliances_to_fetch = alliance_ids - existing_alliance_ids
-    count_alliances_to_fetch = len(alliances_to_fetch)
 
     if alliances_to_fetch:
         logger.debug(
-            f"{count_alliances_to_fetch} EveAllianceInfo object(s) need to be created …"
+            f"{len(alliances_to_fetch)} EveAllianceInfo object(s) need to be created …"
         )
 
-        for loop_count, alliance_id in enumerate(alliances_to_fetch):
+        for loop_count, alliance_id in enumerate(alliances_to_fetch, start=1):
             alliance = EveAllianceInfo.objects.create_alliance(alliance_id=alliance_id)
-
             logger.debug(
-                f"({loop_count + 1}/{count_alliances_to_fetch}) "
+                f"({loop_count}/{len(alliances_to_fetch)}) "
                 f"EveAllianceInfo object created for: {alliance.alliance_name}"
             )
 
 
-def _create_corporation(corporation_ids: Iterable[int] = None) -> None:
+def _create_corporation(corporation_ids: Iterable[int]) -> None:
     """
     Bulk creation of EveCorporationInfo objects
 
@@ -71,7 +68,6 @@ def _create_corporation(corporation_ids: Iterable[int] = None) -> None:
     """
 
     corporation_ids = set(corporation_ids)
-
     existing_corporation_ids = set(
         EveCorporationInfo.objects.filter(
             corporation_id__in=corporation_ids
@@ -79,26 +75,25 @@ def _create_corporation(corporation_ids: Iterable[int] = None) -> None:
     )
 
     corporations_to_fetch = corporation_ids - existing_corporation_ids
-    count_corporations_to_fetch = len(corporations_to_fetch)
 
     if corporations_to_fetch:
         logger.debug(
-            f"{count_corporations_to_fetch} EveCorporationInfo object(s) need to be created …"  # pylint: disable=line-too-long
+            f"{len(corporations_to_fetch)} EveCorporationInfo object(s) need to be created …"
         )
 
-        for loop_count, corporation_id in enumerate(corporations_to_fetch):
+        for loop_count, corporation_id in enumerate(corporations_to_fetch, start=1):
             corporation = EveCorporationInfo.objects.create_corporation(
                 corp_id=corporation_id
             )
 
             logger.debug(
-                f"({loop_count + 1}/{count_corporations_to_fetch}) "
+                f"({loop_count}/{len(corporations_to_fetch)}) "
                 f"EveCorporationInfo object created for: {corporation.corporation_name}"
             )
 
 
 def _create_character(
-    character_ids: Iterable[int] = None, with_affiliation: bool = True
+    character_ids: Iterable[int], with_affiliation: bool = True
 ) -> None:
     """
     Bulk creation of EveCharacter objects
@@ -112,35 +107,30 @@ def _create_character(
     """
 
     character_ids = set(character_ids)
+    tmp_affiliation_ids = {"alliance": set(), "corporation": set()}
 
-    count_characters_to_fetch = len(character_ids)
-
-    logger.debug(
-        f"{count_characters_to_fetch} EveCharacter object(s) need to be created …"
-    )
-
-    tmp_character_ids = {"corporation": [], "alliance": []}
+    logger.info(f"{len(character_ids)} EveCharacter object(s) need to be created …")
 
-    for loop_count, character_id in enumerate(character_ids):
+    for loop_count, character_id in enumerate(character_ids, start=1):
         # Create character
         character = EveCharacter.objects.create_character(character_id=character_id)
 
         logger.debug(
-            f"({loop_count + 1}/{count_characters_to_fetch}) "
+            f"({loop_count}/{len(character_ids)}) "
             f"EveCharacter object created for: {character.character_name}"
         )
 
-        if character.alliance_id is not None:
-            tmp_character_ids["alliance"].append(character.alliance_id)
-        else:
-            tmp_character_ids["corporation"].append(character.corporation_id)
+        affiliation_key = "alliance" if character.alliance_id else "corporation"
+        tmp_affiliation_ids[affiliation_key].add(
+            character.alliance_id or character.corporation_id
+        )
 
-    if with_affiliation is True:
-        if len(tmp_character_ids["alliance"]) > 0:
-            _create_alliance(tmp_character_ids["alliance"])
+    if with_affiliation:
+        if tmp_affiliation_ids["alliance"]:
+            _create_alliance(tmp_affiliation_ids["alliance"])
 
-        if len(tmp_character_ids["corporation"]) > 0:
-            _create_corporation(tmp_character_ids["corporation"])
+        if tmp_affiliation_ids["corporation"]:
+            _create_corporation(tmp_affiliation_ids["corporation"])
 
 
 def get_or_create_character(
@@ -157,7 +147,7 @@ def get_or_create_character(
     :rtype:
     """
 
-    character_ids = set(character_ids)
+    character_ids = set(character_ids or [])
 
     logger.debug(
         msg=f"Getting information for {len(character_ids)} character(s) from AA …"
@@ -174,6 +164,4 @@ def get_or_create_character(
     if character_ids_to_fetch:
         _create_character(character_ids=character_ids_to_fetch, with_affiliation=True)
 
-    characters = EveCharacter.objects.filter(character_id__in=character_ids)
-
-    return characters
+    return EveCharacter.objects.filter(character_id__in=character_ids)

{aa_intel_tool-2.6.0 → aa_intel_tool-2.6.2}/aa_intel_tool/helper/static_files.py

@@ -17,7 +17,7 @@ from app_utils.logging import LoggerAddTag
 
 # AA Intel Tool
 from aa_intel_tool import __title__
-from aa_intel_tool.constants import AA_INTEL_TOOL_STATIC_DIR
+from aa_intel_tool.constants import APP_STATIC_DIR
 
 logger = LoggerAddTag(my_logger=get_extension_logger(__name__), prefix=__title__)
 
@@ -25,17 +25,18 @@ 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 `aa-intel-tool/aa_intel_tool/static/aa_intel_tool` folder
+    :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(AA_INTEL_TOOL_STATIC_DIR, relative_file_path)
     integrity_hash = calculate_integrity(
-        path=Path(file_path), algorithm=Algorithm.SHA512
+        path=Path(os.path.join(APP_STATIC_DIR, relative_file_path)),
+        algorithm=Algorithm.SHA512,
     )
 
     return integrity_hash

{aa_intel_tool-2.6.0 → aa_intel_tool-2.6.2}/aa_intel_tool/locale/cs_CZ/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ 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: 2025-01-31 11:24+0100\n"
+"POT-Creation-Date: 2025-04-09 11:22+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-intel-tool/cs/>\n"
@@ -18,8 +18,8 @@ msgstr ""
 "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
@@ -159,23 +159,23 @@ msgstr ""
 msgid "No suitable parser found. Input is not a supported intel type or malformed …"
 msgstr ""
 
-#: aa_intel_tool/parser/general.py:80
+#: aa_intel_tool/parser/general.py:63
 msgid "No data to parse …"
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:65
+#: aa_intel_tool/parser/module/chatlist.py:60
 msgid "Something went wrong while fetching the character information from ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:76
+#: aa_intel_tool/parser/module/chatlist.py:67
 msgid "Character unknown to ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:278
+#: aa_intel_tool/parser/module/chatlist.py:256
 msgid "The chat list module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:299
+#: aa_intel_tool/parser/module/chatlist.py:275
 #, 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."
@@ -184,99 +184,31 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: aa_intel_tool/parser/module/dscan.py:350
+#: aa_intel_tool/parser/module/dscan.py:362
 msgid "The D-Scan module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/fleetcomp.py:187
+#: aa_intel_tool/parser/module/fleetcomp.py:181
 msgid "The fleet composition module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/base.html:20
+#: aa_intel_tool/templates/aa_intel_tool/base.html:23
 msgid "Permalink successfully copied"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/base.html:21
+#: 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/base.html:22
+#: 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/base.html:23
-msgid "NPC Corp"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:24
-msgctxt "Decimal separator"
-msgid "."
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:25
-msgctxt "Thousands separator"
-msgid ","
-msgstr ""
-
 #: aa_intel_tool/templates/aa_intel_tool/base.html:26
-msgid "No data available in this table"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:27
-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/base.html:28
-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/base.html:29
-msgid "No records available"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:30
-msgid "Loading …"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:31
-msgid "Processing …"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:32
-msgid "Nothing found, sorry …"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:33
-msgid "Search …"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:34
-msgid "First"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:35
-msgid "Last"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:36
-msgid "Next"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:37
-msgid "Previous"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:38
-msgid ": activate to sort column ascending"
-msgstr ""
-
-#: aa_intel_tool/templates/aa_intel_tool/base.html:39
-msgid ": activate to sort column descending"
+msgid "NPC Corp"
 msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/body/scan-retention-note.html:5
@@ -457,7 +389,7 @@ msgid "No data."
 msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/evetime.html:5
-msgid "Scan taken at (Eve time)"
+msgid "Scan taken at (EVE time)"
 msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details.html:8