aa-killtracker 0.11.0__tar.gz → 0.12.1__tar.gz

{aa_killtracker-0.11.0 → aa_killtracker-0.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-killtracker
-Version: 0.11.0
+Version: 0.12.1
 Summary: "An app for running killmail trackers with Alliance Auth and Discord.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8

{aa_killtracker-0.11.0 → aa_killtracker-0.12.1}/killtracker/__init__.py

@@ -3,7 +3,7 @@
 # pylint: disable = invalid-name
 default_app_config = "killtracker.apps.KillmailsConfig"
 
-__version__ = "0.11.0"
+__version__ = "0.12.1"
 __title__ = "Killtracker"
 
 APP_NAME = "aa-killtracker"

{aa_killtracker-0.11.0 → aa_killtracker-0.12.1}/killtracker/admin.py

@@ -4,26 +4,16 @@
 
 
 from django.contrib import admin
-from django.db.models import Q
-from django.db.models.functions import Lower
-from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
 from django.utils.safestring import mark_safe
-from eveuniverse.models import EveGroup
 
 from allianceauth import NAME as site_header
-from allianceauth.eveonline.models import EveAllianceInfo, EveCorporationInfo
 
 from . import tasks
-from .constants import (
-    SESSION_KEY_TOOGLE_NPC,
-    SESSION_KEY_USES_NPC,
-    EveCategoryId,
-    EveGroupId,
-)
 from .core.killmails import Killmail
 from .forms import TrackerAdminForm, TrackerAdminKillmailIdForm, field_nice_display
-from .models import EveKillmail, EveKillmailAttacker, EveTypePlus, Tracker, Webhook
+from .models import EveKillmail, EveKillmailAttacker, Tracker, Webhook
 
 
 class EveKillmailAttackerInline(admin.TabularInline):
@@ -105,8 +95,11 @@ class TrackerAdmin(admin.ModelAdmin):
     )
     ordering = ("name",)
     actions = ["disable_tracker", "enable_tracker", "reset_color", "run_test_killmail"]
-    autocomplete_fields = ["origin_solar_system"]
-    filter_horizontal = (
+    autocomplete_fields = [
+        "origin_solar_system",
+        "require_regions",
+        "require_constellations",
+        "require_solar_systems",
         "exclude_attacker_alliances",
         "exclude_attacker_corporations",
         "require_attacker_alliances",
@@ -115,16 +108,17 @@ class TrackerAdmin(admin.ModelAdmin):
         "exclude_victim_alliances",
         "require_victim_corporations",
         "exclude_victim_corporations",
-        "exclude_attacker_states",
-        "require_attacker_states",
-        "require_victim_states",
-        "require_regions",
-        "require_constellations",
-        "require_solar_systems",
-        "require_attackers_ship_groups",
         "require_attackers_ship_types",
+        "require_attackers_ship_groups",
+        "require_attackers_weapon_groups",
+        "require_attackers_weapon_types",
         "require_victim_ship_groups",
         "require_victim_ship_types",
+    ]
+    filter_horizontal = (
+        "exclude_attacker_states",
+        "require_attacker_states",
+        "require_victim_states",
         "ping_groups",
     )
     fieldsets = (
@@ -206,11 +200,13 @@ class TrackerAdmin(admin.ModelAdmin):
             },
         ),
         (
-            "Ship types",
+            "Ship & Weapon types",
             {
                 "fields": (
                     "require_attackers_ship_groups",
                     "require_attackers_ship_types",
+                    "require_attackers_weapon_groups",
+                    "require_attackers_weapon_types",
                     "require_victim_ship_groups",
                     "require_victim_ship_types",
                 ),
@@ -237,30 +233,13 @@ class TrackerAdmin(admin.ModelAdmin):
             "require_solar_systems",
             "require_attackers_ship_groups",
             "require_attackers_ship_types",
+            "require_attackers_weapon_groups",
+            "require_attackers_weapon_types",
             "require_victim_ship_groups",
             "require_victim_ship_types",
             "ping_groups",
         )
 
-    def change_view(
-        self, request, object_id, form_url="", extra_context=None
-    ) -> HttpResponse:
-        extra_context = extra_context or {}
-        tracker = get_object_or_404(Tracker, pk=object_id)
-        is_using_npc = (
-            tracker.require_attackers_ship_types.filter(
-                eve_group__eve_category_id=EveCategoryId.ENTITY
-            ).exists()
-            or tracker.require_attackers_ship_groups.filter(
-                eve_category_id=EveCategoryId.ENTITY
-            ).exists()
-        )
-        request.session[SESSION_KEY_USES_NPC] = is_using_npc
-        extra_context["is_using_npc"] = is_using_npc
-        return super().change_view(
-            request, object_id, form_url, extra_context=extra_context
-        )
-
     def _color(self, obj):
         html = (
             f'<input type="color" value="{obj.color}" disabled>' if obj.color else "-"
@@ -306,6 +285,8 @@ class TrackerAdmin(admin.ModelAdmin):
             ("require_min_value", self._add_to_clauses_1),
             ("require_attackers_ship_groups", self._add_to_clauses_2),
             ("require_attackers_ship_types", self._add_to_clauses_2),
+            ("require_attackers_weapon_groups", self._add_to_clauses_2),
+            ("require_attackers_weapon_types", self._add_to_clauses_2),
             ("require_victim_ship_groups", self._add_to_clauses_2),
             ("require_victim_ship_types", self._add_to_clauses_2),
             ("exclude_npc_kills", self._add_to_clauses_1),
@@ -327,21 +308,21 @@ class TrackerAdmin(admin.ModelAdmin):
     def _append_field_to_clauses(self, clauses, field, text):
         clauses.append(f"{field_nice_display(field)} = {text}")
 
-    @admin.display(description="Reset color for selected trackers")
+    @admin.action(description="Reset color for selected trackers")
     def reset_color(self, request, queryset):
         queryset.update(color="")
 
-    @admin.display(description="Enable selected trackers")
+    @admin.action(description="Enable selected trackers")
     def enable_tracker(self, request, queryset):
         queryset.update(is_enabled=True)
         self.message_user(request, f"{queryset.count()} trackers enabled.")
 
-    @admin.display(description="Disable selected trackers")
+    @admin.action(description="Disable selected trackers")
     def disable_tracker(self, request, queryset):
         queryset.update(is_enabled=False)
         self.message_user(request, f"{queryset.count()} trackers disabled.")
 
-    @admin.display(description="Run test killmail with selected trackers")
+    @admin.action(description="Run test killmail with selected trackers")
     def run_test_killmail(self, request, queryset):
         if "apply" in request.POST:
             form = TrackerAdminKillmailIdForm(request.POST)
@@ -390,91 +371,3 @@ class TrackerAdmin(admin.ModelAdmin):
                 "queryset": queryset.order_by("name"),
             },
         )
-
-    def formfield_for_manytomany(self, db_field, request, **kwargs):
-        """overriding this formfield to have sorted lists in the form"""
-        show_npc_types = request.session.get(
-            SESSION_KEY_USES_NPC, False
-        ) or request.session.get(SESSION_KEY_TOOGLE_NPC, False)
-        if db_field.name in {
-            "exclude_attacker_alliances",
-            "require_attacker_alliances",
-            "require_victim_alliances",
-            "exclude_victim_alliances",
-        }:
-            kwargs["queryset"] = EveAllianceInfo.objects.order_by(
-                Lower("alliance_name")
-            )
-        elif db_field.name in {
-            "exclude_attacker_corporations",
-            "require_attacker_corporations",
-            "require_victim_corporations",
-            "exclude_victim_corporations",
-        }:
-            kwargs["queryset"] = EveCorporationInfo.objects.order_by(
-                Lower("corporation_name")
-            )
-        elif db_field.name == "require_attackers_ship_groups":
-            qs = EveGroup.objects.filter(
-                eve_category_id__in=[
-                    EveCategoryId.STRUCTURE,
-                    EveCategoryId.SHIP,
-                    EveCategoryId.FIGHTER,
-                ],
-                published=True,
-            )
-            if show_npc_types:
-                qs = (
-                    qs
-                    | EveGroup.objects.filter(
-                        eve_category_id=EveCategoryId.ENTITY
-                    ).filter(eve_types__mass__gt=1, eve_types__volume__gt=1)
-                ).distinct()
-            kwargs["queryset"] = qs.order_by(Lower("name"))
-        elif db_field.name == "require_victim_ship_groups":
-            kwargs["queryset"] = EveGroup.objects.filter(
-                (
-                    Q(
-                        eve_category_id__in=[
-                            EveCategoryId.STRUCTURE,
-                            EveCategoryId.SHIP,
-                            EveCategoryId.FIGHTER,
-                        ]
-                    )
-                    & Q(published=True)
-                )
-                | (Q(id=EveGroupId.MINING_DRONE) & Q(published=True))
-                | Q(id=EveGroupId.ORBITAL_INFRASTRUCTURE)
-            ).order_by(Lower("name"))
-        elif db_field.name == "require_attackers_ship_types":
-            qs = EveTypePlus.objects.filter(
-                eve_group__eve_category_id__in=[
-                    EveCategoryId.STRUCTURE,
-                    EveCategoryId.SHIP,
-                    EveCategoryId.FIGHTER,
-                ],
-                published=True,
-            )
-            if show_npc_types:
-                qs = qs | EveTypePlus.objects.filter(
-                    eve_group__eve_category_id=EveCategoryId.ENTITY,
-                    mass__gt=1,
-                    volume__gt=1,
-                )
-            kwargs["queryset"] = qs.order_by(Lower("name"))
-        elif db_field.name == "require_victim_ship_types":
-            kwargs["queryset"] = EveTypePlus.objects.filter(
-                (
-                    Q(
-                        eve_group__eve_category_id__in=[
-                            EveCategoryId.STRUCTURE,
-                            EveCategoryId.SHIP,
-                            EveCategoryId.FIGHTER,
-                        ]
-                    )
-                    & Q(published=True)
-                )
-                | (Q(eve_group_id=EveGroupId.MINING_DRONE) & Q(published=True))
-                | Q(eve_group_id=EveGroupId.ORBITAL_INFRASTRUCTURE)
-            ).order_by(Lower("name"))
-        return super().formfield_for_manytomany(db_field, request, **kwargs)

aa_killtracker-0.12.1/killtracker/constants.py

@@ -0,0 +1,86 @@
+"""Global constants for killtracker."""
+
+from enum import IntEnum
+from typing import Set
+
+
+class EveCategoryId(IntEnum):
+    """An Eve category ID."""
+
+    DEPLOYABLE = 22
+    ENTITY = 11
+    FIGHTER = 87
+    MODULE = 7
+    SHIP = 6
+    STRUCTURE = 65
+
+
+class EveGroupId(IntEnum):
+    """An Eve group ID."""
+
+    FRIGATE = 25
+    MINING_DRONE = 101
+    ORBITAL_INFRASTRUCTURE = 1025
+    PROJECTILE_WEAPON = 55
+    TACTICAL_DESTROYER = 1305
+
+    BURST_PROJECTORS = 842
+    ENERGY_NEUTRALIZER = 71
+    ENERGY_NOSFERATU = 68
+    ENERGY_WEAPON = 53
+    HYBRID_WEAPON = 74
+    INTERDICTION_NULLIFIER = 4117
+    INTERDICTION_SPHERE_LAUNCHER = 589
+    MISSILE_LAUNCHER_BOMB = 862
+    MISSILE_LAUNCHER_CRUISE = 506
+    MISSILE_LAUNCHER_DEFENDER = 512
+    MISSILE_LAUNCHER_HEAVY = 510
+    MISSILE_LAUNCHER_HEAVY_ASSAULT = 771
+    MISSILE_LAUNCHER_LIGHT = 509
+    MISSILE_LAUNCHER_RAPID_HEAVY = 1245
+    MISSILE_LAUNCHER_RAPID_LIGHT = 511
+    MISSILE_LAUNCHER_RAPID_TORPEDO = 1673
+    MISSILE_LAUNCHER_ROCKET = 507
+    MISSILE_LAUNCHER_TORPEDO = 508
+    MISSILE_LAUNCHER_XL_CRUISE = 1674
+    MISSILE_LAUNCHER_XL_TORPEDO = 524
+    PRECURSOR_WEAPON = 1986
+    SMART_BOMB = 72
+    STRIP_MINER = 464
+    SUPER_WEAPON = 588
+    TITAN_PHENOMENA_GENERATOR = 1815
+    VORTON_PROJECTOR = 4060
+    WARP_DISRUPT_FIELD_GENERATOR = 899
+
+    @classmethod
+    def weapons(cls) -> Set["EveGroupId"]:
+        """Return group IDs for all weapons."""
+        return {
+            cls.BURST_PROJECTORS,
+            cls.ENERGY_NEUTRALIZER,
+            cls.ENERGY_NOSFERATU,
+            cls.ENERGY_WEAPON,
+            cls.HYBRID_WEAPON,
+            cls.INTERDICTION_NULLIFIER,
+            cls.INTERDICTION_SPHERE_LAUNCHER,
+            cls.MISSILE_LAUNCHER_BOMB,
+            cls.MISSILE_LAUNCHER_CRUISE,
+            cls.MISSILE_LAUNCHER_DEFENDER,
+            cls.MISSILE_LAUNCHER_HEAVY,
+            cls.MISSILE_LAUNCHER_HEAVY_ASSAULT,
+            cls.MISSILE_LAUNCHER_LIGHT,
+            cls.MISSILE_LAUNCHER_RAPID_HEAVY,
+            cls.MISSILE_LAUNCHER_RAPID_LIGHT,
+            cls.MISSILE_LAUNCHER_RAPID_TORPEDO,
+            cls.MISSILE_LAUNCHER_ROCKET,
+            cls.MISSILE_LAUNCHER_TORPEDO,
+            cls.MISSILE_LAUNCHER_XL_CRUISE,
+            cls.MISSILE_LAUNCHER_XL_TORPEDO,
+            cls.PRECURSOR_WEAPON,
+            cls.PROJECTILE_WEAPON,
+            cls.SMART_BOMB,
+            cls.SUPER_WEAPON,
+            cls.TITAN_PHENOMENA_GENERATOR,
+            cls.VORTON_PROJECTOR,
+            cls.WARP_DISRUPT_FIELD_GENERATOR,
+        }

{aa_killtracker-0.11.0 → aa_killtracker-0.12.1}/killtracker/core/killmails.py

@@ -181,6 +181,10 @@ class Killmail(_KillmailBase):
         """Returns ship type IDs of all attackers with duplicates."""
         return [obj.ship_type_id for obj in self.attackers if obj.ship_type_id]
 
+    def attackers_weapon_type_ids(self) -> List[int]:
+        """Returns weapon type IDs of all attackers with duplicates."""
+        return [obj.weapon_type_id for obj in self.attackers if obj.weapon_type_id]
+
     def entity_ids(self) -> Set[int]:
         """Return distinct IDs of all entities (excluding None)."""
         ids = {

{aa_killtracker-0.11.0 → aa_killtracker-0.12.1}/killtracker/management/commands/killtracker_load_eve.py

@@ -19,6 +19,8 @@ class Command(BaseCommand):
             "eveuniverse_load_types",
             __title__,
             "--category_id",
+            str(EveCategoryId.DEPLOYABLE.value),
+            "--category_id",
             str(EveCategoryId.ENTITY.value),
             "--category_id",
             str(EveCategoryId.SHIP.value),
@@ -26,6 +28,8 @@ class Command(BaseCommand):
             str(EveCategoryId.STRUCTURE.value),
             "--category_id",
             str(EveCategoryId.FIGHTER.value),
+            "--category_id_with_dogma",
+            str(EveCategoryId.MODULE.value),
             "--group_id",
             str(EveGroupId.ORBITAL_INFRASTRUCTURE.value),
             "--group_id",

{aa_killtracker-0.11.0 → aa_killtracker-0.12.1}/killtracker/managers.py

@@ -20,13 +20,6 @@ from .core.killmails import Killmail, _KillmailCharacter
 logger = LoggerAddTag(get_extension_logger(__name__), __title__)
 
 
-class EveTypePlusManager(models.Manager):
-    def get_queryset(self):
-        """Add join with EveGroup to default queryset."""
-        qs = super().get_queryset()
-        return qs.select_related("eve_group")
-
-
 class EveKillmailQuerySet(models.QuerySet):
     """Custom queryset for EveKillmail"""
 

aa_killtracker-0.12.1/killtracker/migrations/0002_tracker_require_attackers_weapon_groups_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.0.10 on 2023-09-11 12:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("eveuniverse", "0010_alter_eveindustryactivityduration_eve_type_and_more"),
+        ("killtracker", "0001_initial_new"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="tracker",
+            name="require_attackers_weapon_groups",
+            field=models.ManyToManyField(
+                blank=True,
+                default=None,
+                help_text="Only include killmails where at least one attacker is using one of these weapon groups. ",
+                related_name="+",
+                to="eveuniverse.evegroup",
+            ),
+        ),
+        migrations.AddField(
+            model_name="tracker",
+            name="require_attackers_weapon_types",
+            field=models.ManyToManyField(
+                blank=True,
+                default=None,
+                help_text="Only include killmails where at least one attacker is using one of these weapon types. ",
+                related_name="+",
+                to="eveuniverse.evetype",
+            ),
+        ),
+    ]

aa_killtracker-0.12.1/killtracker/migrations/0003_optimize_tracker_form.py

@@ -0,0 +1,90 @@
+# Generated by Django 4.0.10 on 2023-10-05 18:56
+
+from django.db import migrations, models
+
+import killtracker.models.trackers
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("eveuniverse", "0010_alter_eveindustryactivityduration_eve_type_and_more"),
+        ("killtracker", "0002_tracker_require_attackers_weapon_groups_and_more"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="EveTypePlus",
+        ),
+        migrations.AlterField(
+            model_name="tracker",
+            name="require_attackers_ship_groups",
+            field=models.ManyToManyField(
+                blank=True,
+                default=None,
+                help_text="Only include killmails where at least one attacker is flying one of these ship groups. ",
+                limit_choices_to=killtracker.models.trackers._require_attackers_ship_groups_query,
+                related_name="+",
+                to="eveuniverse.evegroup",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="tracker",
+            name="require_attackers_ship_types",
+            field=models.ManyToManyField(
+                blank=True,
+                default=None,
+                help_text="Only include killmails where at least one attacker is flying one of these ship types. ",
+                limit_choices_to=killtracker.models.trackers._require_attackers_ship_types_query,
+                related_name="+",
+                to="eveuniverse.evetype",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="tracker",
+            name="require_attackers_weapon_groups",
+            field=models.ManyToManyField(
+                blank=True,
+                default=None,
+                help_text="Only include killmails where at least one attacker is using one of these weapon groups. ",
+                limit_choices_to=killtracker.models.trackers._require_attackers_weapon_groups_query,
+                related_name="+",
+                to="eveuniverse.evegroup",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="tracker",
+            name="require_attackers_weapon_types",
+            field=models.ManyToManyField(
+                blank=True,
+                default=None,
+                help_text="Only include killmails where at least one attacker is using one of these weapon types. ",
+                limit_choices_to=killtracker.models.trackers._require_attackers_weapon_types_query,
+                related_name="+",
+                to="eveuniverse.evetype",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="tracker",
+            name="require_victim_ship_groups",
+            field=models.ManyToManyField(
+                blank=True,
+                default=None,
+                help_text="Only include killmails where victim is flying one of these ship groups. ",
+                limit_choices_to=killtracker.models.trackers._require_victim_ship_groups_query,
+                related_name="+",
+                to="eveuniverse.evegroup",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="tracker",
+            name="require_victim_ship_types",
+            field=models.ManyToManyField(
+                blank=True,
+                default=None,
+                help_text="Only include killmails where victim is flying one of these ship types. ",
+                limit_choices_to=killtracker.models.trackers._require_victim_ship_types_query,
+                related_name="+",
+                to="eveuniverse.evetype",
+            ),
+        ),
+    ]

aa_killtracker-0.12.1/killtracker/models/__init__.py

@@ -0,0 +1,5 @@
+from .killmails import EveKillmail, EveKillmailAttacker
+from .trackers import Tracker
+from .webhooks import Webhook
+
+__all__ = ["EveKillmail", "EveKillmailAttacker", "Tracker", "Webhook"]