Merge branch 'srp-provider' into 'v2.9.x'

Decouple allianceauth.srp ESI Provider from allianceauth.eveonline

See merge request allianceauth/allianceauth!1358

allianceauth/srp/managers.py

@@ -5,7 +5,7 @@ import requests
 from django.contrib.auth.models import User
 
 from allianceauth import NAME
-from allianceauth.eveonline.providers import provider
+from allianceauth.srp.providers import esi
 
 from .models import SrpUserRequest
 
@@ -32,8 +32,7 @@ class SRPManager:
         if result:
             killmail_id = result['killmail_id']
             killmail_hash = result['zkb']['hash']
-            c = provider.client
-            km = c.Killmails.get_killmails_killmail_id_killmail_hash(
+            km = esi.client.Killmails.get_killmails_killmail_id_killmail_hash(
                 killmail_id=killmail_id,
                 killmail_hash=killmail_hash
             ).result()

allianceauth/srp/providers.py

@@ -0,0 +1,18 @@
+import os
+from esi.clients import EsiClientProvider
+
+from allianceauth import __version__
+
+SWAGGER_SPEC = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
+
+"""
+Swagger spec operations:
+get_killmails_killmail_id_killmail_hash
+get_universe_types_type_id
+"""
+
+
+esi = EsiClientProvider(
+    spec_file=SWAGGER_SPEC,
+    app_info_text=("allianceauth v" + __version__)
+)

allianceauth/srp/views.py

@@ -11,7 +11,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.db.models import Sum
 from allianceauth.authentication.decorators import permissions_required
-from allianceauth.eveonline.providers import provider
+from allianceauth.srp.providers import esi
 from allianceauth.notifications import notify
 from .form import SrpFleetMainForm
 from .form import SrpFleetMainUpdateForm
@@ -201,7 +201,8 @@ def srp_request_view(request, fleet_srp):
                 return redirect("srp:management")
 
             if request.user.character_ownerships.filter(character__character_id=str(victim_id)).exists():
-                srp_request.srp_ship_name = provider.get_itemtype(ship_type_id).name
+                item_type = esi.client.Universe.get_universe_types_type_id(type_id=ship_type_id).result()
+                srp_request.srp_ship_name = item_type['name']
                 srp_request.kb_total_loss = ship_value
                 srp_request.post_time = post_time
                 srp_request.save()