aa-intel-tool 0.0.1a4__tar.gz → 0.0.1a6__tar.gz

{aa_intel_tool-0.0.1a4 → aa_intel_tool-0.0.1a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-intel-tool
-Version: 0.0.1a4
+Version: 0.0.1a6
 Summary: A simple parser for D-Scans and more for Alliance Auth
 Project-URL: Homepage, https://github.com/ppfeufer/aa-intel-tool
 Project-URL: Documentation, https://github.com/ppfeufer/aa-intel-tool/blob/master/README.md

aa_intel_tool-0.0.1a6/aa_intel_tool/admin.py

@@ -0,0 +1,108 @@
+"""
+Django admin integration
+"""
+
+# Django
+from django.contrib import admin
+from django.utils import html, safestring
+from django.utils.translation import gettext_lazy as _
+
+# Alliance Auth (External Libs)
+from app_utils.urls import reverse_absolute
+
+# AA Intel Tool
+from aa_intel_tool.models import Scan
+
+
+class BaseReadOnlyAdminMixin:
+    """
+    Base "Read Only" mixin for admin models
+    """
+
+    actions = None  # Removes the default delete action.
+
+    @staticmethod
+    def has_add_permission(request):  # pylint: disable=unused-argument
+        """
+        Has "add" permissions
+
+        :param request:
+        :type request:
+        :return:
+        :rtype:
+        """
+
+        return False
+
+    @staticmethod
+    def has_change_permission(request, obj=None):  # pylint: disable=unused-argument
+        """
+        Has "change" permissions
+
+        :param request:
+        :type request:
+        :param obj:
+        :type obj:
+        :return:
+        :rtype:
+        """
+
+        return False
+
+    @staticmethod
+    def has_delete_permission(request, obj=None):  # pylint: disable=unused-argument
+        """
+        Has "delete" permissions
+
+        :param request:
+        :type request:
+        :param obj:
+        :type obj:
+        :return:
+        :rtype:
+        """
+
+        return False
+
+
+@admin.register(Scan)
+class ScanAdmin(BaseReadOnlyAdminMixin, admin.ModelAdmin):
+    """
+    Scan Admin
+    """
+
+    list_display = ("hash", "scan_type", "created")
+    fields = ("_scan_type", "_raw_data")
+
+    @admin.display(description=_("Scan type"))
+    def _scan_type(self, obj) -> str:
+        """
+        Add link to open the scan in a new browser tab
+
+        :param obj:
+        :type obj:
+        :return:
+        :rtype:
+        """
+        intel_type = obj.get_scan_type_display()
+        scan_link = reverse_absolute(
+            viewname="aa_intel_tool:intel_tool_scan", args=[obj.hash]
+        )
+        link_text = _("Open in a new browser tab")
+
+        return safestring.mark_safe(
+            f'{intel_type} (<a href="{scan_link}" target="_blank" rel="noreferer noopener">{link_text}</a>)'
+        )
+
+    @admin.display(description=_("RAW data"))
+    def _raw_data(self, obj) -> str:
+        """
+        Format the output properly
+
+        :param obj:
+        :type obj:
+        :return:
+        :rtype:
+        """
+
+        return html.format_html("<pre>{}</pre>", obj.raw_data)

{aa_intel_tool-0.0.1a4 → aa_intel_tool-0.0.1a6}/aa_intel_tool/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-08-10 20:47+0200\n"
-"PO-Revision-Date: 2023-08-10 19:17+0000\n"
+"PO-Revision-Date: 2023-08-12 12:28+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: German <https://weblate.ppfeufer.de/projects/"
 "alliance-auth-apps/aa-intel-tool/de/>\n"
@@ -39,7 +39,7 @@ msgstr "D-Scan"
 
 #: models.py:23 templates/aa_intel_tool/partials/index/form.html:31
 msgid "Fleet Composition"
-msgstr "Flottenzusammansetzung"
+msgstr "Flottenzusammensetzung"
 
 #: models.py:24
 msgid "Chat List"
@@ -155,7 +155,7 @@ msgstr ""
 
 #: parser/module/chatlist.py:264
 msgid "Character unknown to ESI."
-msgstr "Charakter ist nicht in ESI."
+msgstr "Charakter ist in ESI nicht bekannt."
 
 #: parser/module/dscan.py:136
 msgid "The D-Scan module is currently disabled."
@@ -313,11 +313,11 @@ msgstr "Absenden"
 
 #: templates/aa_intel_tool/partials/index/form.html:52
 msgid "Working on it, please be patient …"
-msgstr "Arbeite, bitte hab etwas Geduld …"
+msgstr "Bei der Arbeit, bitte hab etwas Geduld …"
 
 #: templates/aa_intel_tool/partials/index/form.html:54
 msgid "Detecting the intel type"
-msgstr "Erkennen des Intel-Typs"
+msgstr "Erkennung des Intel-Typs"
 
 #: templates/aa_intel_tool/partials/index/form.html:55
 msgid ""

{aa_intel_tool-0.0.1a4 → aa_intel_tool-0.0.1a6}/aa_intel_tool/management/commands/aa_intel_tool_load_eve_types.py

@@ -60,6 +60,8 @@ class Command(BaseCommand):
             __title__,
             "--category_id",
             str(EveCategoryId.SHIP.value),
+            "--category_id",
+            str(EveCategoryId.STRUCTURE.value),
         ]
 
         if options["noinput"]:

aa_intel_tool-0.0.1a6/aa_intel_tool/migrations/0005_alter_scan_options_alter_scandata_options_and_more.py

@@ -0,0 +1,94 @@
+# Generated by Django 4.0.10 on 2023-08-12 19:27
+
+# Django
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("aa_intel_tool", "0004_alter_scandata_section"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="scan",
+            options={
+                "default_permissions": (),
+                "verbose_name": "Scan",
+                "verbose_name_plural": "Scans",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="scandata",
+            options={
+                "default_permissions": (),
+                "verbose_name": "Scan data",
+                "verbose_name_plural": "Scan data",
+            },
+        ),
+        migrations.AlterField(
+            model_name="scan",
+            name="created",
+            field=models.DateTimeField(
+                auto_now_add=True, db_index=True, verbose_name="Creation date/time"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="scan",
+            name="hash",
+            field=models.CharField(
+                editable=False,
+                max_length=30,
+                primary_key=True,
+                serialize=False,
+                unique=True,
+                verbose_name="Scan hash",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="scan",
+            name="raw_data",
+            field=models.TextField(verbose_name="Scan RAW data"),
+        ),
+        migrations.AlterField(
+            model_name="scan",
+            name="scan_type",
+            field=models.CharField(
+                choices=[
+                    ("invalid", "Invalid scan data"),
+                    ("dscan", "D-Scan"),
+                    ("fleetcomp", "Fleet Composition"),
+                    ("chatlist", "Chat List"),
+                ],
+                default="invalid",
+                max_length=9,
+                verbose_name="Scan type",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="scandata",
+            name="processed_data",
+            field=models.JSONField(default=dict, verbose_name="Processed scan data"),
+        ),
+        migrations.AlterField(
+            model_name="scandata",
+            name="section",
+            field=models.CharField(
+                choices=[
+                    ("invalid", "Invalid scan data"),
+                    ("pilotlist", "Pilot list"),
+                    ("corporationlist", "Corporation list"),
+                    ("alliancelist", "Alliance list"),
+                    ("shiptypes", "Ship types"),
+                    ("shiplist", "Ship list"),
+                    ("shiplist_on_grid", "Ship list (on grid)"),
+                    ("shiplist_off_grid", "Ship list (off grid)"),
+                    ("structures_on_grid", "Structures (on grid)"),
+                    ("deployables_on_grid", "Deployables (on grid)"),
+                ],
+                default="invalid",
+                max_length=19,
+                verbose_name="Scan section",
+            ),
+        ),
+    ]

{aa_intel_tool-0.0.1a4 → aa_intel_tool-0.0.1a6}/aa_intel_tool/models.py

@@ -28,22 +28,22 @@ class Scan(models.Model):
         editable=False,
         unique=True,
         max_length=30,
-        verbose_name=_("The hash of the scan."),
+        verbose_name=_("Scan hash"),
     )
 
     created = models.DateTimeField(
         auto_now_add=True,
         db_index=True,
-        verbose_name=_("Date and time the scan was created."),
+        verbose_name=_("Creation date/time"),
     )
 
-    raw_data = models.TextField(verbose_name=_("The original scan data."))
+    raw_data = models.TextField(verbose_name=_("Scan RAW data"))
 
     scan_type = models.CharField(
         max_length=9,
         choices=Type.choices,
         default=Type.INVALID,
-        verbose_name=_("The scan type."),
+        verbose_name=_("Scan type"),
     )
 
     class Meta:  # pylint: disable=too-few-public-methods
@@ -52,8 +52,8 @@ class Scan(models.Model):
         """
 
         default_permissions = ()
-        verbose_name = _("scan")
-        verbose_name_plural = _("scans")
+        verbose_name = _("Scan")
+        verbose_name_plural = _("Scans")
 
     def __str__(self) -> str:
         return str(self.pk)
@@ -132,11 +132,11 @@ class ScanData(models.Model):
         max_length=19,
         choices=Section.choices,
         default=Section.INVALID,
-        verbose_name=_("The scan section"),
+        verbose_name=_("Scan section"),
     )
 
     processed_data = models.JSONField(
-        default=dict, verbose_name=_("The processed scan section data")
+        default=dict, verbose_name=_("Processed scan data")
     )
 
     class Meta:  # pylint: disable=too-few-public-methods
@@ -145,5 +145,5 @@ class ScanData(models.Model):
         """
 
         default_permissions = ()
-        verbose_name = _("scan data")
-        verbose_name_plural = _("scan data")
+        verbose_name = _("Scan data")
+        verbose_name_plural = _("Scan data")

{aa_intel_tool-0.0.1a4 → aa_intel_tool-0.0.1a6}/aa_intel_tool/parser/module/chatlist.py

@@ -52,9 +52,7 @@ def _parse_alliance_info(eve_character: EveCharacter) -> dict:
             "id": eve_character.alliance_id,
             "name": eve_character.alliance_name,
             "ticker": eve_character.alliance_ticker,
-            "logo": eveimageserver.alliance_logo_url(
-                alliance_id=eve_character.alliance_id, size=32
-            ),
+            "logo": eve_character.alliance_logo_url_32,
             "dotlan": dotlan.alliance_url(eve_character.alliance_name),
             "zkillboard": zkillboard.alliance_url(eve_character.alliance_id),
         }
@@ -76,9 +74,7 @@ def _parse_corporation_info(eve_character: EveCharacter) -> dict:
         "id": eve_character.corporation_id,
         "name": eve_character.corporation_name,
         "ticker": eve_character.corporation_ticker,
-        "logo": eveimageserver.corporation_logo_url(
-            corporation_id=eve_character.corporation_id, size=32
-        ),
+        "logo": eve_character.corporation_logo_url_32,
         "dotlan": dotlan.corporation_url(eve_character.corporation_name),
         "zkillboard": zkillboard.corporation_url(eve_character.corporation_id),
     }
@@ -97,9 +93,7 @@ def _parse_character_info(eve_character: EveCharacter) -> dict:
     return {
         "id": eve_character.character_id,
         "name": eve_character.character_name,
-        "portrait": eveimageserver.character_portrait_url(
-            character_id=eve_character.character_id, size=32
-        ),
+        "portrait": eve_character.portrait_url_32,
         "evewho": evewho.character_url(eve_character.character_id),
         "zkillboard": zkillboard.character_url(eve_character.character_id),
     }
@@ -237,9 +231,12 @@ def parse(scan_data: list, safe_to_db: bool = True) -> Union[Scan, dict]:
             )
 
         # Check if we have to bother Eve Universe or if we have all characters already
+        # Excluding corporation_id=1000001 (Doomheim) to force an update here …
         fetch_from_eveuniverse = False
         try:
-            eve_characters = EveCharacter.objects.filter(character_name__in=scan_data)
+            eve_characters = EveCharacter.objects.filter(
+                character_name__in=scan_data
+            ).exclude(corporation_id=1000001)
         except EveCharacter.DoesNotExist:  # pylint: disable=no-member
             fetch_from_eveuniverse = True
         else:
@@ -249,7 +246,7 @@ def parse(scan_data: list, safe_to_db: bool = True) -> Union[Scan, dict]:
         if fetch_from_eveuniverse:
             try:
                 eve_character_ids = (
-                    EveEntity.objects.fetch_by_names_esi(names=scan_data)
+                    EveEntity.objects.fetch_by_names_esi(names=scan_data, update=True)
                     .filter(category=EveEntity.CATEGORY_CHARACTER)
                     .values_list("id", flat=True)
                 )

{aa_intel_tool-0.0.1a4 → aa_intel_tool-0.0.1a6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "aa-intel-tool"
-version = "0.0.1-alpha.4"
+version = "0.0.1-alpha.6"
 description = "A simple parser for D-Scans and more for Alliance Auth"
 readme = "README.md"
 license = "GPL-3.0"

aa_intel_tool-0.0.1a4/aa_intel_tool/admin.py

@@ -1,70 +0,0 @@
-"""
-Django admin integration
-"""
-
-# Django
-from django.contrib import admin
-
-# AA Intel Tool
-from aa_intel_tool.models import Scan
-
-
-class BaseReadOnlyAdminMixin:
-    """
-    Base "Read Only" mixin for admin models
-    """
-
-    actions = None  # Removes the default delete action.
-
-    def has_add_permission(self, request):  # pylint: disable=unused-argument
-        """
-        Has "add" permissions
-
-        :param request:
-        :type request:
-        :return:
-        :rtype:
-        """
-
-        return False
-
-    def has_change_permission(
-        self, request, obj=None  # pylint: disable=unused-argument
-    ):
-        """
-        Has "change" permissions
-
-        :param request:
-        :type request:
-        :param obj:
-        :type obj:
-        :return:
-        :rtype:
-        """
-
-        return False
-
-    def has_delete_permission(
-        self, request, obj=None  # pylint: disable=unused-argument
-    ):
-        """
-        Has "delete" permissions
-
-        :param request:
-        :type request:
-        :param obj:
-        :type obj:
-        :return:
-        :rtype:
-        """
-
-        return False
-
-
-@admin.register(Scan)
-class ScanAdmin(BaseReadOnlyAdminMixin, admin.ModelAdmin):
-    """
-    Scan Admin
-    """
-
-    list_display = ("hash", "created")