aa-intel-tool 0.0.1a4__py3-none-any.whl → 0.0.1a6__py3-none-any.whl

aa_intel_tool/admin.py

@@ -4,6 +4,11 @@ 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
@@ -16,7 +21,8 @@ class BaseReadOnlyAdminMixin:
 
     actions = None  # Removes the default delete action.
 
-    def has_add_permission(self, request):  # pylint: disable=unused-argument
+    @staticmethod
+    def has_add_permission(request):  # pylint: disable=unused-argument
         """
         Has "add" permissions
 
@@ -28,9 +34,8 @@ class BaseReadOnlyAdminMixin:
 
         return False
 
-    def has_change_permission(
-        self, request, obj=None  # pylint: disable=unused-argument
-    ):
+    @staticmethod
+    def has_change_permission(request, obj=None):  # pylint: disable=unused-argument
         """
         Has "change" permissions
 
@@ -44,9 +49,8 @@ class BaseReadOnlyAdminMixin:
 
         return False
 
-    def has_delete_permission(
-        self, request, obj=None  # pylint: disable=unused-argument
-    ):
+    @staticmethod
+    def has_delete_permission(request, obj=None):  # pylint: disable=unused-argument
         """
         Has "delete" permissions
 
@@ -67,4 +71,38 @@ class ScanAdmin(BaseReadOnlyAdminMixin, admin.ModelAdmin):
     Scan Admin
     """
 
-    list_display = ("hash", "created")
+    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/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/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/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/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/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.dist-info → aa_intel_tool-0.0.1a6.dist-info}/METADATA

@@ -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.1a4.dist-info → aa_intel_tool-0.0.1a6.dist-info}/RECORD

@@ -1,19 +1,19 @@
 aa_intel_tool/__init__.py,sha256=u6zbS8cbdtUvtSfC1nRmGMXJHAnt4vTQmD6EAjhN_-U,174
-aa_intel_tool/admin.py,sha256=AgIfPdtRjZxii3BIMJ5GMXUFx2vhDIG9pxRCLGCGY30,1281
+aa_intel_tool/admin.py,sha256=ytQfm5h58e8BQajvBbs4W2LrJFqx8elVq2pUbFyu4g4,2410
 aa_intel_tool/app_settings.py,sha256=qoTpu9DY4KQs-MXiwy_rUgJ8VD6n2hFkTRUx3M7zaoc,1412
 aa_intel_tool/apps.py,sha256=0LcoWtasZy27ywjmV-rC6yJSKUTic_yscf1yyXtMQKg,450
 aa_intel_tool/auth_hooks.py,sha256=hqLLe3I0nvvth1K1MNfItzp4OUiftwL7RyACDOgaTDI,1538
 aa_intel_tool/constants.py,sha256=j4KNu486WPq1DaR1HaUE9LZusw1EDeTgOz5bC64Yy7Y,1471
 aa_intel_tool/exceptions.py,sha256=1uEreioXqnWR8trgU5RSvj7CZ6GdkaWG-wI5G1pfvqs,693
 aa_intel_tool/form.py,sha256=zpIigT8Q0XxpS4_izUX7XXxMlcBIuKWWlZcpkNJn4LE,503
-aa_intel_tool/models.py,sha256=-hyQFhZSpG9VSezNv2cISCI5N2wEhf6yNWkSC4Rww3o,3753
+aa_intel_tool/models.py,sha256=y5YaRwOFXnBP0lDWk-VYJlaitiTdKhG77qeNQVzVoGA,3693
 aa_intel_tool/providers.py,sha256=jIo3ErUfshRhwqALHV5I7toZ9p0PWn3ZRQFof_DXnh4,198
 aa_intel_tool/tasks.py,sha256=lkW1kDJzU8iOINp_tKEL5rG9DM5icvEkyYQUhGrW_hU,1088
 aa_intel_tool/urls.py,sha256=cncBfnPbJErN9w0qM83ZmtlnMJEolDHLQllU8bvxUa0,720
 aa_intel_tool/helper/eve_character.py,sha256=EekvX6yw_uzDkLp-3w3hnjmkralxZ0YCiajW-K2-Fcg,5134
 aa_intel_tool/locale/django.pot,sha256=WvlJPKzEOR_2JAKWfqmTwLm1mSILTTzE3k1dr2RsoGo,10403
-aa_intel_tool/locale/de/LC_MESSAGES/django.mo,sha256=R6e7aTcv1gy1Hyd1C76eMKTwUjnuAMsN6c80jHBaYjQ,8063
-aa_intel_tool/locale/de/LC_MESSAGES/django.po,sha256=vjt1WROyEeksp7wNO1cGgRvHtd1iOuWYvAiP8qReiv8,13311
+aa_intel_tool/locale/de/LC_MESSAGES/django.mo,sha256=We-_ZP6pivBEV7un_2q49lQDHar-h9J8rOa6M09immk,8079
+aa_intel_tool/locale/de/LC_MESSAGES/django.po,sha256=4-0Yc3mEpEDHdiT3iRJO4S-2epedBSm_-AloC4Cuj0c,13327
 aa_intel_tool/locale/es/LC_MESSAGES/django.po,sha256=rKigO_89-Ms2afeEMtDtkBf7XVZwlSAYLReLJ5CvNzk,10395
 aa_intel_tool/locale/fr_FR/LC_MESSAGES/django.po,sha256=WvlJPKzEOR_2JAKWfqmTwLm1mSILTTzE3k1dr2RsoGo,10403
 aa_intel_tool/locale/it_IT/LC_MESSAGES/django.po,sha256=WvlJPKzEOR_2JAKWfqmTwLm1mSILTTzE3k1dr2RsoGo,10403
@@ -22,16 +22,17 @@ aa_intel_tool/locale/ko_KR/LC_MESSAGES/django.po,sha256=WvlJPKzEOR_2JAKWfqmTwLm1
 aa_intel_tool/locale/ru/LC_MESSAGES/django.po,sha256=nQiNeVO_2JcqeAiDrZ42c0tbDJ8CLIZAx_7Qr82h1BU,10539
 aa_intel_tool/locale/uk/LC_MESSAGES/django.po,sha256=9slcSUYAMdibbW1LLZkni9gIc_p65xieRS3XsMW4-vA,10626
 aa_intel_tool/locale/zh_Hans/LC_MESSAGES/django.po,sha256=qy7QpNcOUpmkWz2qkNImRQ5ut964c89gwosTmKlnuLc,10388
-aa_intel_tool/management/commands/aa_intel_tool_load_eve_types.py,sha256=DpQlv4ybAOQ1ByK7iHJyOC712F8T5cEvKj6NfgyIQ_k,1482
+aa_intel_tool/management/commands/aa_intel_tool_load_eve_types.py,sha256=REMnWZF241S6YHrZj4-Lv9q78vivAtcfaTciN6tgEC4,1559
 aa_intel_tool/migrations/0001_initial.py,sha256=XPiUlXjkRHqgb-_g91_XAzbKIdGW2FhyeaavXkHMZcg,2019
 aa_intel_tool/migrations/0002_remove_scan_processed_data_scandata.py,sha256=3L5eXOlGcRkXvQuPnEVTW9tOIx2ySjJ8SRNG6oVH_kA,2208
 aa_intel_tool/migrations/0003_alter_scandata_scan.py,sha256=AX_9prazV-ewLB9l6Eekjjc4N2o5hfcM7yQ8QV2yGwQ,718
 aa_intel_tool/migrations/0004_alter_scandata_section.py,sha256=tmOTfA3_gX0mn4C78yGg-Y9nyVYTuQFuoNudBBrdK9w,1150
+aa_intel_tool/migrations/0005_alter_scan_options_alter_scandata_options_and_more.py,sha256=sCHsJPxPjHGkkGK_5oE6_DKkrqzup_PtH52poBKTa0o,3106
 aa_intel_tool/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aa_intel_tool/parser/__init__.py,sha256=BAFdCEaeC0cmv74ZuZGZJCgJOiliMVBpgdQI63ABJ2U,30
 aa_intel_tool/parser/general.py,sha256=1hZyS0cOgOK_U3yz8rOaOuoqZLzcXeF1fqeRfjMyKjI,1949
 aa_intel_tool/parser/helper/db.py,sha256=Q4VmgxApCSIpqsEmluRHOFtjevQvE9GG83IJ38e_5Us,721
-aa_intel_tool/parser/module/chatlist.py,sha256=tmEqX7CoDlvlSlR-tX1KCpeuKUEnPSeRs79evvpbyvA,10046
+aa_intel_tool/parser/module/chatlist.py,sha256=uYFNUfVh56khN83LMRC4l3WgtZdw505q8DcPpXhXnP0,9973
 aa_intel_tool/parser/module/dscan.py,sha256=2CCzsufD2yz8JfSp_jdTaYl2J_V8pR6YSHZyKG7SQec,6458
 aa_intel_tool/parser/module/fleetcomp.py,sha256=26wcMKFr4Ut4NgrVC1CoXrdaH9QarnTcf_1hr9XMCKI,2524
 aa_intel_tool/static/aa_intel_tool/css/aa-bootstrap-fix.css,sha256=FyYes1hz7RK8wiR9sZcxfKvD3ftYFr9rUTGE3zXcuRs,307
@@ -84,7 +85,7 @@ aa_intel_tool/tests/test-data/fleetcomp.txt,sha256=-ofpfNyKeeWjQIG02ED-FE3sQQhtZ
 aa_intel_tool/views/__init__.py,sha256=zf5e30BdJ772oDJkQnBfFIi5a7-HEJByUIkv0iz3Kr8,29
 aa_intel_tool/views/ajax.py,sha256=0X2TIU51jrO6sw7DBlZyjhcX-_HCdP9YErpwiFI4EaM,1030
 aa_intel_tool/views/general.py,sha256=lftJbTxVlW-cZFg8dQAvtFPP-LDBgORHj9ElXGSGBus,3649
-aa_intel_tool-0.0.1a4.dist-info/METADATA,sha256=FC8rmiDaruVBzgl1_KAuQ_Ytt2Ujmv8NeJXU_pP-vjA,12098
-aa_intel_tool-0.0.1a4.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-aa_intel_tool-0.0.1a4.dist-info/licenses/LICENSE,sha256=UTib95uJWe2NQIG3TzU8-Hm-eaEZFqv9fqsjNT_xKWU,35151
-aa_intel_tool-0.0.1a4.dist-info/RECORD,,
+aa_intel_tool-0.0.1a6.dist-info/METADATA,sha256=RbTU9FOtzLNXx1tSAUybDBzgyhFUymIeQk_idWpX-rw,12098
+aa_intel_tool-0.0.1a6.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+aa_intel_tool-0.0.1a6.dist-info/licenses/LICENSE,sha256=UTib95uJWe2NQIG3TzU8-Hm-eaEZFqv9fqsjNT_xKWU,35151
+aa_intel_tool-0.0.1a6.dist-info/RECORD,,