aa-intel-tool 2.0.0b1__py3-none-any.whl → 2.1.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. aa_intel_tool/__init__.py +1 -1
  2. aa_intel_tool/constants.py +4 -4
  3. aa_intel_tool/locale/cs/LC_MESSAGES/django.po +510 -0
  4. aa_intel_tool/locale/de/LC_MESSAGES/django.mo +0 -0
  5. aa_intel_tool/locale/de/LC_MESSAGES/django.po +54 -49
  6. aa_intel_tool/locale/django.pot +48 -44
  7. aa_intel_tool/locale/es/LC_MESSAGES/django.po +52 -48
  8. aa_intel_tool/locale/fr_FR/LC_MESSAGES/django.mo +0 -0
  9. aa_intel_tool/locale/fr_FR/LC_MESSAGES/django.po +155 -132
  10. aa_intel_tool/locale/it_IT/LC_MESSAGES/django.po +50 -46
  11. aa_intel_tool/locale/ja/LC_MESSAGES/django.po +50 -46
  12. aa_intel_tool/locale/ko_KR/LC_MESSAGES/django.mo +0 -0
  13. aa_intel_tool/locale/ko_KR/LC_MESSAGES/django.po +69 -63
  14. aa_intel_tool/locale/nl/LC_MESSAGES/django.po +509 -0
  15. aa_intel_tool/locale/pl_PL/LC_MESSAGES/django.mo +0 -0
  16. aa_intel_tool/locale/pl_PL/LC_MESSAGES/django.po +512 -0
  17. aa_intel_tool/locale/ru/LC_MESSAGES/django.po +52 -48
  18. aa_intel_tool/locale/sk/LC_MESSAGES/django.po +510 -0
  19. aa_intel_tool/locale/uk/LC_MESSAGES/django.po +50 -46
  20. aa_intel_tool/locale/zh_Hans/LC_MESSAGES/django.po +48 -44
  21. aa_intel_tool/parser/module/chatlist.py +1 -1
  22. aa_intel_tool/parser/module/dscan.py +41 -9
  23. aa_intel_tool/parser/module/fleetcomp.py +4 -1
  24. aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.js +34 -1
  25. aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.min.js +1 -1
  26. aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.min.js.map +1 -1
  27. aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.js +12 -1
  28. aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.min.js +1 -1
  29. aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.min.js.map +1 -1
  30. aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.js +6 -6
  31. aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js +1 -1
  32. aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js.map +1 -1
  33. aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html +1 -0
  34. aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html +5 -0
  35. aa_intel_tool/tests/test_access.py +1 -1
  36. {aa_intel_tool-2.0.0b1.dist-info → aa_intel_tool-2.1.0.dist-info}/METADATA +6 -4
  37. {aa_intel_tool-2.0.0b1.dist-info → aa_intel_tool-2.1.0.dist-info}/RECORD +39 -34
  38. {aa_intel_tool-2.0.0b1.dist-info → aa_intel_tool-2.1.0.dist-info}/WHEEL +1 -1
  39. {aa_intel_tool-2.0.0b1.dist-info → aa_intel_tool-2.1.0.dist-info}/licenses/LICENSE +0 -0
aa_intel_tool/locale/uk/LC_MESSAGES/django.po CHANGED
@@ -6,11 +6,11 @@ msgid ""
6
6
  msgstr ""
7
7
  "Project-Id-Version: PACKAGE VERSION\n"
8
8
  "Report-Msgid-Bugs-To: \n"
9
- "POT-Creation-Date: 2023-10-04 17:44+0200\n"
9
+ "POT-Creation-Date: 2024-04-20 22:33+0200\n"
10
10
  "PO-Revision-Date: 2023-10-04 15:47+0000\n"
11
11
  "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
12
- "Language-Team: Ukrainian <https://weblate.ppfeufer.de/projects/"
13
- "alliance-auth-apps/aa-intel-tool/uk/>\n"
12
+ "Language-Team: Ukrainian <https://weblate.ppfeufer.de/projects/alliance-auth-"
13
+ "apps/aa-intel-tool/uk/>\n"
14
14
  "Language: uk\n"
15
15
  "MIME-Version: 1.0\n"
16
16
  "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,10 @@ msgstr ""
19
19
  "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
20
20
  "X-Generator: Weblate 5.0.2\n"
21
21
 
22
- #: aa_intel_tool/__init__.py:12
22
+ #: aa_intel_tool/__init__.py:9
23
23
  #: aa_intel_tool/templates/aa_intel_tool/base.html:6
24
- #: aa_intel_tool/templates/aa_intel_tool/views/index.html:6
25
- #: aa_intel_tool/templates/aa_intel_tool/views/index.html:10
24
+ #: aa_intel_tool/templates/aa_intel_tool/base.html:10
25
+ #: aa_intel_tool/templates/aa_intel_tool/views/index.html:8
26
26
  #: aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html:5
27
27
  #: aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html:5
28
28
  #: aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html:5
@@ -47,16 +47,16 @@ msgstr ""
47
47
  msgid "Intel Parser v{__version__}"
48
48
  msgstr ""
49
49
 
50
- #: aa_intel_tool/constants.py:71 aa_intel_tool/models.py:24
50
+ #: aa_intel_tool/constants.py:58 aa_intel_tool/models.py:24
51
51
  msgid "Chat list"
52
52
  msgstr ""
53
53
 
54
- #: aa_intel_tool/constants.py:77 aa_intel_tool/models.py:22
54
+ #: aa_intel_tool/constants.py:64 aa_intel_tool/models.py:22
55
55
  #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:28
56
56
  msgid "D-Scan"
57
57
  msgstr ""
58
58
 
59
- #: aa_intel_tool/constants.py:83 aa_intel_tool/models.py:23
59
+ #: aa_intel_tool/constants.py:70 aa_intel_tool/models.py:23
60
60
  #: aa_intel_tool/models.py:123
61
61
  #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:33
62
62
  msgid "Fleet composition"
@@ -166,19 +166,19 @@ msgstr ""
166
166
  msgid "No data to parse …"
167
167
  msgstr ""
168
168
 
169
- #: aa_intel_tool/parser/module/chatlist.py:66
169
+ #: aa_intel_tool/parser/module/chatlist.py:68
170
170
  msgid "Something went wrong while fetching the character information from ESI."
171
171
  msgstr ""
172
172
 
173
- #: aa_intel_tool/parser/module/chatlist.py:77
173
+ #: aa_intel_tool/parser/module/chatlist.py:79
174
174
  msgid "Character unknown to ESI."
175
175
  msgstr ""
176
176
 
177
- #: aa_intel_tool/parser/module/chatlist.py:274
177
+ #: aa_intel_tool/parser/module/chatlist.py:281
178
178
  msgid "The chat list module is currently disabled."
179
179
  msgstr ""
180
180
 
181
- #: aa_intel_tool/parser/module/chatlist.py:292
181
+ #: aa_intel_tool/parser/module/chatlist.py:302
182
182
  #, python-brace-format
183
183
  msgid ""
184
184
  "Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot "
@@ -191,105 +191,105 @@ msgstr[1] ""
191
191
  msgstr[2] ""
192
192
  msgstr[3] ""
193
193
 
194
- #: aa_intel_tool/parser/module/dscan.py:322
194
+ #: aa_intel_tool/parser/module/dscan.py:350
195
195
  msgid "The D-Scan module is currently disabled."
196
196
  msgstr ""
197
197
 
198
- #: aa_intel_tool/parser/module/fleetcomp.py:103
198
+ #: aa_intel_tool/parser/module/fleetcomp.py:111
199
199
  msgid "The fleet composition module is currently disabled."
200
200
  msgstr ""
201
201
 
202
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:8
202
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:9
203
203
  msgid "Permalink successfully copied"
204
204
  msgstr ""
205
205
 
206
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:9
206
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:10
207
207
  msgid ""
208
208
  "Something went wrong. Nothing copied. Maybe your browser does not support "
209
209
  "this function."
210
210
  msgstr ""
211
211
 
212
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:14
212
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:15
213
213
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:4
214
214
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:4
215
215
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:3
216
216
  msgid "Unaffiliated / No Alliance"
217
217
  msgstr ""
218
218
 
219
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:15
219
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:16
220
220
  msgid "NPC Corp"
221
221
  msgstr ""
222
222
 
223
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:19
223
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:20
224
224
  msgctxt "Decimal separator"
225
225
  msgid "."
226
226
  msgstr ""
227
227
 
228
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:20
228
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:21
229
229
  msgctxt "Thousands separator"
230
230
  msgid ","
231
231
  msgstr ""
232
232
 
233
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:21
233
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:22
234
234
  msgid "No data available in this table"
235
235
  msgstr ""
236
236
 
237
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:22
237
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:23
238
238
  msgctxt "Keep _END_ as it is. It will be replaced by a number."
239
239
  msgid "Showing _END_ entries"
240
240
  msgstr ""
241
241
 
242
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:23
242
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:24
243
243
  msgctxt "Keep _MAX_ as it is. It will be replaced by a number."
244
244
  msgid "(filtered from _MAX_ total entries)"
245
245
  msgstr ""
246
246
 
247
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:24
247
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:25
248
248
  msgid "No records available"
249
249
  msgstr ""
250
250
 
251
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:26
251
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:27
252
252
  msgctxt "Keep _MENU_ as it is. It will be replaced by an HTML construct."
253
253
  msgid "Show _MENU_"
254
254
  msgstr ""
255
255
 
256
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:27
256
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:28
257
257
  msgid "Loading …"
258
258
  msgstr ""
259
259
 
260
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:28
260
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:29
261
261
  msgid "Processing …"
262
262
  msgstr ""
263
263
 
264
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:29
264
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:30
265
265
  msgid "Nothing found, sorry …"
266
266
  msgstr ""
267
267
 
268
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:31
268
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:32
269
269
  msgid "Search …"
270
270
  msgstr ""
271
271
 
272
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:33
272
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:34
273
273
  msgid "First"
274
274
  msgstr ""
275
275
 
276
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:34
276
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:35
277
277
  msgid "Last"
278
278
  msgstr ""
279
279
 
280
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:35
280
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:36
281
281
  msgid "Next"
282
282
  msgstr ""
283
283
 
284
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:36
284
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:37
285
285
  msgid "Previous"
286
286
  msgstr ""
287
287
 
288
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:39
288
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:40
289
289
  msgid ": activate to sort column ascending"
290
290
  msgstr ""
291
291
 
292
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:40
292
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:41
293
293
  msgid ": activate to sort column descending"
294
294
  msgstr ""
295
295
 
@@ -329,7 +329,13 @@ msgstr[1] ""
329
329
  msgstr[2] ""
330
330
  msgstr[3] ""
331
331
 
332
- #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:50
332
+ #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:40
333
+ msgid ""
334
+ "Please keep in mind, parsing large amounts of data can take some time. Be "
335
+ "patient, CCP's API is not the fastest to answer …"
336
+ msgstr ""
337
+
338
+ #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:51
333
339
  msgid "Submit"
334
340
  msgstr "Відправити"
335
341
 
@@ -379,7 +385,7 @@ msgstr ""
379
385
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:29
380
386
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:29
381
387
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/interesting-on-grid/items.html:25
382
- #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:32
388
+ #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:37
383
389
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html:30
384
390
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details/pilots.html:29
385
391
  msgid "Loading data …"
@@ -389,7 +395,7 @@ msgstr ""
389
395
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:35
390
396
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:35
391
397
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/interesting-on-grid/items.html:31
392
- #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:38
398
+ #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:43
393
399
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details/pilots.html:35
394
400
  msgid "No data …"
395
401
  msgstr ""
@@ -457,6 +463,10 @@ msgstr ""
457
463
  msgid "Ship class"
458
464
  msgstr ""
459
465
 
466
+ #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:30
467
+ msgid "Total mass (in kg):"
468
+ msgstr ""
469
+
460
470
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html:18
461
471
  msgid "Ship type"
462
472
  msgstr ""
@@ -493,12 +503,6 @@ msgstr "Система"
493
503
  msgid "Participation details"
494
504
  msgstr ""
495
505
 
496
- #: aa_intel_tool/templates/aa_intel_tool/views/index.html:14
497
- msgid ""
498
- "Please keep in mind, parsing large amounts of data can take some time. Be "
499
- "patient, CCP's API is not the fastest to answer …"
500
- msgstr ""
501
-
502
506
  #: aa_intel_tool/views/general.py:53
503
507
  msgid "The provided data could not be parsed."
504
508
  msgstr ""
@@ -507,6 +511,6 @@ msgstr ""
507
511
  msgid "(System Error) Something unexpected happened."
508
512
  msgstr ""
509
513
 
510
- #: aa_intel_tool/views/general.py:99 aa_intel_tool/views/general.py:129
514
+ #: aa_intel_tool/views/general.py:101 aa_intel_tool/views/general.py:131
511
515
  msgid "The scan you were looking for could not be found."
512
516
  msgstr ""
aa_intel_tool/locale/zh_Hans/LC_MESSAGES/django.po CHANGED
@@ -7,7 +7,7 @@ msgid ""
7
7
  msgstr ""
8
8
  "Project-Id-Version: PACKAGE VERSION\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
- "POT-Creation-Date: 2023-10-04 17:44+0200\n"
10
+ "POT-Creation-Date: 2024-04-20 22:33+0200\n"
11
11
  "PO-Revision-Date: 2024-01-11 21:04+0000\n"
12
12
  "Last-Translator: Dehao Wu <wudehao2000@163.com>\n"
13
13
  "Language-Team: Chinese (Simplified) <https://weblate.ppfeufer.de/projects/"
@@ -19,10 +19,10 @@ msgstr ""
19
19
  "Plural-Forms: nplurals=1; plural=0;\n"
20
20
  "X-Generator: Weblate 5.3.1\n"
21
21
 
22
- #: aa_intel_tool/__init__.py:12
22
+ #: aa_intel_tool/__init__.py:9
23
23
  #: aa_intel_tool/templates/aa_intel_tool/base.html:6
24
- #: aa_intel_tool/templates/aa_intel_tool/views/index.html:6
25
- #: aa_intel_tool/templates/aa_intel_tool/views/index.html:10
24
+ #: aa_intel_tool/templates/aa_intel_tool/base.html:10
25
+ #: aa_intel_tool/templates/aa_intel_tool/views/index.html:8
26
26
  #: aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html:5
27
27
  #: aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html:5
28
28
  #: aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html:5
@@ -47,16 +47,16 @@ msgstr ""
47
47
  msgid "Intel Parser v{__version__}"
48
48
  msgstr ""
49
49
 
50
- #: aa_intel_tool/constants.py:71 aa_intel_tool/models.py:24
50
+ #: aa_intel_tool/constants.py:58 aa_intel_tool/models.py:24
51
51
  msgid "Chat list"
52
52
  msgstr ""
53
53
 
54
- #: aa_intel_tool/constants.py:77 aa_intel_tool/models.py:22
54
+ #: aa_intel_tool/constants.py:64 aa_intel_tool/models.py:22
55
55
  #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:28
56
56
  msgid "D-Scan"
57
57
  msgstr ""
58
58
 
59
- #: aa_intel_tool/constants.py:83 aa_intel_tool/models.py:23
59
+ #: aa_intel_tool/constants.py:70 aa_intel_tool/models.py:23
60
60
  #: aa_intel_tool/models.py:123
61
61
  #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:33
62
62
  msgid "Fleet composition"
@@ -166,19 +166,19 @@ msgstr ""
166
166
  msgid "No data to parse …"
167
167
  msgstr ""
168
168
 
169
- #: aa_intel_tool/parser/module/chatlist.py:66
169
+ #: aa_intel_tool/parser/module/chatlist.py:68
170
170
  msgid "Something went wrong while fetching the character information from ESI."
171
171
  msgstr ""
172
172
 
173
- #: aa_intel_tool/parser/module/chatlist.py:77
173
+ #: aa_intel_tool/parser/module/chatlist.py:79
174
174
  msgid "Character unknown to ESI."
175
175
  msgstr ""
176
176
 
177
- #: aa_intel_tool/parser/module/chatlist.py:274
177
+ #: aa_intel_tool/parser/module/chatlist.py:281
178
178
  msgid "The chat list module is currently disabled."
179
179
  msgstr ""
180
180
 
181
- #: aa_intel_tool/parser/module/chatlist.py:292
181
+ #: aa_intel_tool/parser/module/chatlist.py:302
182
182
  #, python-brace-format
183
183
  msgid ""
184
184
  "Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot "
@@ -188,105 +188,105 @@ msgid_plural ""
188
188
  "per scan. Your list of pilots exceeds this limit."
189
189
  msgstr[0] ""
190
190
 
191
- #: aa_intel_tool/parser/module/dscan.py:322
191
+ #: aa_intel_tool/parser/module/dscan.py:350
192
192
  msgid "The D-Scan module is currently disabled."
193
193
  msgstr ""
194
194
 
195
- #: aa_intel_tool/parser/module/fleetcomp.py:103
195
+ #: aa_intel_tool/parser/module/fleetcomp.py:111
196
196
  msgid "The fleet composition module is currently disabled."
197
197
  msgstr ""
198
198
 
199
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:8
199
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:9
200
200
  msgid "Permalink successfully copied"
201
201
  msgstr ""
202
202
 
203
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:9
203
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:10
204
204
  msgid ""
205
205
  "Something went wrong. Nothing copied. Maybe your browser does not support "
206
206
  "this function."
207
207
  msgstr ""
208
208
 
209
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:14
209
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:15
210
210
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:4
211
211
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:4
212
212
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:3
213
213
  msgid "Unaffiliated / No Alliance"
214
214
  msgstr ""
215
215
 
216
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:15
216
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:16
217
217
  msgid "NPC Corp"
218
218
  msgstr ""
219
219
 
220
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:19
220
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:20
221
221
  msgctxt "Decimal separator"
222
222
  msgid "."
223
223
  msgstr ""
224
224
 
225
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:20
225
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:21
226
226
  msgctxt "Thousands separator"
227
227
  msgid ","
228
228
  msgstr ""
229
229
 
230
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:21
230
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:22
231
231
  msgid "No data available in this table"
232
232
  msgstr ""
233
233
 
234
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:22
234
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:23
235
235
  msgctxt "Keep _END_ as it is. It will be replaced by a number."
236
236
  msgid "Showing _END_ entries"
237
237
  msgstr ""
238
238
 
239
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:23
239
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:24
240
240
  msgctxt "Keep _MAX_ as it is. It will be replaced by a number."
241
241
  msgid "(filtered from _MAX_ total entries)"
242
242
  msgstr ""
243
243
 
244
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:24
244
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:25
245
245
  msgid "No records available"
246
246
  msgstr ""
247
247
 
248
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:26
248
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:27
249
249
  msgctxt "Keep _MENU_ as it is. It will be replaced by an HTML construct."
250
250
  msgid "Show _MENU_"
251
251
  msgstr ""
252
252
 
253
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:27
253
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:28
254
254
  msgid "Loading …"
255
255
  msgstr ""
256
256
 
257
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:28
257
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:29
258
258
  msgid "Processing …"
259
259
  msgstr ""
260
260
 
261
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:29
261
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:30
262
262
  msgid "Nothing found, sorry …"
263
263
  msgstr ""
264
264
 
265
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:31
265
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:32
266
266
  msgid "Search …"
267
267
  msgstr ""
268
268
 
269
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:33
269
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:34
270
270
  msgid "First"
271
271
  msgstr ""
272
272
 
273
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:34
273
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:35
274
274
  msgid "Last"
275
275
  msgstr ""
276
276
 
277
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:35
277
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:36
278
278
  msgid "Next"
279
279
  msgstr ""
280
280
 
281
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:36
281
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:37
282
282
  msgid "Previous"
283
283
  msgstr ""
284
284
 
285
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:39
285
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:40
286
286
  msgid ": activate to sort column ascending"
287
287
  msgstr ""
288
288
 
289
- #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:40
289
+ #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:41
290
290
  msgid ": activate to sort column descending"
291
291
  msgstr ""
292
292
 
@@ -320,7 +320,13 @@ msgid "Limited to a maximum of %(max_pilots)s pilot per scan."
320
320
  msgid_plural "Limited to a maximum of %(max_pilots)s pilots per scan."
321
321
  msgstr[0] ""
322
322
 
323
- #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:50
323
+ #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:40
324
+ msgid ""
325
+ "Please keep in mind, parsing large amounts of data can take some time. Be "
326
+ "patient, CCP's API is not the fastest to answer …"
327
+ msgstr ""
328
+
329
+ #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:51
324
330
  msgid "Submit"
325
331
  msgstr ""
326
332
 
@@ -370,7 +376,7 @@ msgstr ""
370
376
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:29
371
377
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:29
372
378
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/interesting-on-grid/items.html:25
373
- #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:32
379
+ #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:37
374
380
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html:30
375
381
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details/pilots.html:29
376
382
  msgid "Loading data …"
@@ -380,7 +386,7 @@ msgstr ""
380
386
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:35
381
387
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:35
382
388
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/interesting-on-grid/items.html:31
383
- #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:38
389
+ #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:43
384
390
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details/pilots.html:35
385
391
  msgid "No data …"
386
392
  msgstr ""
@@ -448,6 +454,10 @@ msgstr ""
448
454
  msgid "Ship class"
449
455
  msgstr ""
450
456
 
457
+ #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:30
458
+ msgid "Total mass (in kg):"
459
+ msgstr ""
460
+
451
461
  #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html:18
452
462
  msgid "Ship type"
453
463
  msgstr "舰船类型"
@@ -484,12 +494,6 @@ msgstr ""
484
494
  msgid "Participation details"
485
495
  msgstr ""
486
496
 
487
- #: aa_intel_tool/templates/aa_intel_tool/views/index.html:14
488
- msgid ""
489
- "Please keep in mind, parsing large amounts of data can take some time. Be "
490
- "patient, CCP's API is not the fastest to answer …"
491
- msgstr ""
492
-
493
497
  #: aa_intel_tool/views/general.py:53
494
498
  msgid "The provided data could not be parsed."
495
499
  msgstr ""
@@ -498,6 +502,6 @@ msgstr ""
498
502
  msgid "(System Error) Something unexpected happened."
499
503
  msgstr ""
500
504
 
501
- #: aa_intel_tool/views/general.py:99 aa_intel_tool/views/general.py:129
505
+ #: aa_intel_tool/views/general.py:101 aa_intel_tool/views/general.py:131
502
506
  msgid "The scan you were looking for could not be found."
503
507
  msgstr ""
aa_intel_tool/parser/module/chatlist.py CHANGED
@@ -159,7 +159,7 @@ def _parse_corporation_info(
159
159
  corporation_info["dotlan"] = dotlan.corporation_url(
160
160
  name=eve_character.corporation_name
161
161
  )
162
- corporation_info["zkillboard"] = zkillboard.alliance_url(
162
+ corporation_info["zkillboard"] = zkillboard.corporation_url(
163
163
  eve_id=eve_character.corporation_id
164
164
  )
165
165
 
aa_intel_tool/parser/module/dscan.py CHANGED
@@ -104,6 +104,15 @@ def _get_ships(eve_types: QuerySet, counter: dict) -> dict:
104
104
 
105
105
  ships = {"all": {}, "ongrid": {}, "offgrid": {}, "types": {}}
106
106
 
107
+ # Ship types
108
+ # Get all ship types
109
+ #
110
+ # Ship type list:
111
+ # - eve_type[0] = ID
112
+ # - eve_type[1] = Name
113
+ # - eve_type[2] = Group ID
114
+ # - eve_type[3] = Group Name
115
+ # - eve_type[4] = Mass
107
116
  eve_types_ships = eve_types.filter(
108
117
  eve_group__eve_category_id__exact=EveCategoryId.SHIP
109
118
  )
@@ -115,18 +124,27 @@ def _get_ships(eve_types: QuerySet, counter: dict) -> dict:
115
124
  if eve_type[1] not in ships["all"]:
116
125
  ships["all"][eve_type[1]] = _get_type_info_dict(eve_type=eve_type)
117
126
  ships["all"][eve_type[1]]["count"] = counter["all"][eve_type[0]]
127
+ ships["all"][eve_type[1]]["mass"] = (
128
+ eve_type[4] * counter["all"][eve_type[0]]
129
+ )
118
130
 
119
131
  # Info for "On Grid" table
120
132
  if eve_type[0] in counter["ongrid"]:
121
133
  if eve_type[1] not in ships["ongrid"]:
122
134
  ships["ongrid"][eve_type[1]] = _get_type_info_dict(eve_type=eve_type)
123
135
  ships["ongrid"][eve_type[1]]["count"] = counter["ongrid"][eve_type[0]]
136
+ ships["ongrid"][eve_type[1]]["mass"] = (
137
+ eve_type[4] * counter["ongrid"][eve_type[0]]
138
+ )
124
139
 
125
140
  # Info for "Off Grid" table
126
141
  if eve_type[0] in counter["offgrid"]:
127
142
  if eve_type[1] not in ships["offgrid"]:
128
143
  ships["offgrid"][eve_type[1]] = _get_type_info_dict(eve_type=eve_type)
129
144
  ships["offgrid"][eve_type[1]]["count"] = counter["offgrid"][eve_type[0]]
145
+ ships["offgrid"][eve_type[1]]["mass"] = (
146
+ eve_type[4] * counter["offgrid"][eve_type[0]]
147
+ )
130
148
 
131
149
  # Info for "Ship Types" table
132
150
  if eve_type[3] not in ships["types"]:
@@ -268,32 +286,44 @@ def _get_scan_details(scan_data: list) -> tuple:
268
286
  :rtype:
269
287
  """
270
288
 
289
+ # AA Intel Tool
290
+ from aa_intel_tool.constants import ( # pylint: disable=import-outside-toplevel
291
+ REGEX_PATTERN,
292
+ )
293
+
271
294
  ansiblex_destination = None
272
295
  counter = {"all": {}, "ongrid": {}, "offgrid": {}, "type": {}}
273
296
  eve_ids = {"all": [], "ongrid": [], "offgrid": []}
274
297
 
275
298
  # Let's split this list up
276
299
  #
277
- # line[0] => Item ID
278
- # line[1] => Name
279
- # line[2] => Ship Class / Structure Type
280
- # line[3] => Distance
300
+ # line.group(1) => Item ID
301
+ # line.group(2) => Name
302
+ # line.group(3) => Ship Class / Structure Type
303
+ # line.group(4) => Distance
281
304
  #
282
305
  # Loop through all lines
283
306
  for entry in scan_data:
284
- line = re.split(pattern=r"\t+", string=entry.rstrip("\t"))
285
- entry_id = int(line[0])
307
+ # Apparently you can copy/paste a tab into the ship name, which will cause the split by tab to fail.
308
+ # The regex is detecting the D-Scan correctly though. But splitting by tab might put the ship class as distance.
309
+ # See https://github.com/ppfeufer/aa-intel-tool/issues/82
310
+ #
311
+ # This is why we use re.search() to get the parts of the D-Scan entry, instead of re-split()
312
+ #
313
+ # Thanks CCP for sanitizing your inputs! 😂
314
+ line = re.search(pattern=REGEX_PATTERN["dscan"], string=entry)
315
+ entry_id = int(line.group(1))
286
316
 
287
317
  counter["all"][entry_id] = counter["all"].get(entry_id, 0) + 1
288
318
 
289
319
  # Check if the entry is "on grid" or not
290
- if _is_on_grid(line[3]):
320
+ if _is_on_grid(line.group(4)):
291
321
  counter["ongrid"][entry_id] = counter["ongrid"].get(entry_id, 0) + 1
292
322
 
293
323
  # If it is an Ansiblex Jump Gate, get its destination system
294
324
  if entry_id == UpwellStructureId.ANSIBLEX_JUMP_GATE:
295
325
  ansiblex_destination = _get_ansiblex_jumpgate_destination(
296
- ansiblex_name=line[1]
326
+ ansiblex_name=line.group(2)
297
327
  )
298
328
 
299
329
  eve_ids["ongrid"].append(entry_id)
@@ -330,7 +360,9 @@ def parse(scan_data: list) -> Scan:
330
360
 
331
361
  eve_types = EveType.objects.bulk_get_or_create_esi(
332
362
  ids=set(eve_ids["all"]), include_children=True
333
- ).values_list("id", "name", "eve_group__id", "eve_group__name", named=True)
363
+ ).values_list(
364
+ "id", "name", "eve_group__id", "eve_group__name", "mass", named=True
365
+ )
334
366
 
335
367
  # Parse the data parts
336
368
  ships = _get_ships(eve_types=eve_types, counter=counter)
aa_intel_tool/parser/module/fleetcomp.py CHANGED
@@ -49,7 +49,7 @@ def _get_fleet_composition(pilots: dict, ships: dict) -> dict:
49
49
  # Get ship class details
50
50
  ship_class_details = EveType.objects.bulk_get_or_create_esi(
51
51
  ids=set(ship_class_ids), include_children=True
52
- ).values_list("id", "name", "eve_group__id", "eve_group__name", named=True)
52
+ ).values_list("id", "name", "eve_group__id", "eve_group__name", "mass", named=True)
53
53
 
54
54
  # Loop through ship classes
55
55
  for ship_class in ship_class_details:
@@ -61,6 +61,9 @@ def _get_fleet_composition(pilots: dict, ships: dict) -> dict:
61
61
  ships["class"][ship_class.name]["image"] = eveimageserver.type_icon_url(
62
62
  type_id=ship_class.id, size=32
63
63
  )
64
+ ships["class"][ship_class.name]["mass"] = (
65
+ ship_class.mass * ships["class"][ship_class.name]["count"]
66
+ )
64
67
 
65
68
  # Build ship type dict
66
69
  ships["type"][ship_class.eve_group__name]["id"] = ship_class.eve_group__id