Skip to content

Commit 9bfa8f5

Browse files
Jérôme DeuchnordDeuchnord
authored andcommitted
fix(events): ignore unsupported event types
1 parent 2fd0d57 commit 9bfa8f5

2 files changed

Lines changed: 38 additions & 21 deletions

File tree

_kosmorro/dumper.py

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525
import shutil
2626
from pathlib import Path
2727

28+
import kosmorrolib
2829
from tabulate import tabulate
2930
from termcolor import colored
3031

31-
from kosmorrolib import AsterEphemerides, Event
32+
from kosmorrolib import AsterEphemerides, Event, EventType
3233
from kosmorrolib.model import ASTERS, MoonPhase
3334

3435
from .i18n.utils import _, FULL_DATE_FORMAT, SHORT_DATETIME_FORMAT, TIME_FORMAT
@@ -89,18 +90,34 @@ def is_file_output_needed() -> bool:
8990

9091

9192
class JsonDumper(Dumper):
93+
SUPPORTED_EVENTS = [
94+
EventType.OPPOSITION,
95+
EventType.CONJUNCTION,
96+
EventType.OCCULTATION,
97+
EventType.MAXIMAL_ELONGATION,
98+
EventType.PERIGEE,
99+
EventType.APOGEE,
100+
]
101+
92102
def to_string(self):
93103
return json.dumps(
94104
{
95105
"ephemerides": [
96106
ephemeris.serialize() for ephemeris in self.ephemerides
97107
],
98108
"moon_phase": self.moon_phase.serialize(),
99-
"events": [event.serialize() for event in self.events],
109+
"events": list(self.get_events()),
100110
},
101111
indent=4,
102112
)
103113

114+
def get_events(self) -> [{str: any}]:
115+
for event in self.events:
116+
if event.event_type not in self.SUPPORTED_EVENTS:
117+
continue
118+
119+
yield event.serialize()
120+
104121

105122
class TextDumper(Dumper):
106123
def to_string(self):

_kosmorro/locales/messages.pot

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PROJECT VERSION\n"
1010
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
11-
"POT-Creation-Date: 2022-01-12 13:59+0100\n"
11+
"POT-Creation-Date: 2022-02-04 13:30+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,84 +27,84 @@ msgid ""
2727
"offset format."
2828
msgstr ""
2929

30-
#: _kosmorro/dumper.py:120
30+
#: _kosmorro/dumper.py:137
3131
msgid "Expected events:"
3232
msgstr ""
3333

34-
#: _kosmorro/dumper.py:127
34+
#: _kosmorro/dumper.py:144
3535
msgid "Note: All the hours are given in UTC."
3636
msgstr ""
3737

38-
#: _kosmorro/dumper.py:134
38+
#: _kosmorro/dumper.py:151
3939
msgid "Note: All the hours are given in the UTC{offset} timezone."
4040
msgstr ""
4141

42-
#: _kosmorro/dumper.py:202 _kosmorro/dumper.py:335
42+
#: _kosmorro/dumper.py:219 _kosmorro/dumper.py:352
4343
msgid "Object"
4444
msgstr ""
4545

46-
#: _kosmorro/dumper.py:203 _kosmorro/dumper.py:336
46+
#: _kosmorro/dumper.py:220 _kosmorro/dumper.py:353
4747
msgid "Rise time"
4848
msgstr ""
4949

50-
#: _kosmorro/dumper.py:204 _kosmorro/dumper.py:338
50+
#: _kosmorro/dumper.py:221 _kosmorro/dumper.py:355
5151
msgid "Culmination time"
5252
msgstr ""
5353

54-
#: _kosmorro/dumper.py:205 _kosmorro/dumper.py:340
54+
#: _kosmorro/dumper.py:222 _kosmorro/dumper.py:357
5555
msgid "Set time"
5656
msgstr ""
5757

58-
#: _kosmorro/dumper.py:236
58+
#: _kosmorro/dumper.py:253
5959
msgid "Moon phase is unavailable for this date."
6060
msgstr ""
6161

62-
#: _kosmorro/dumper.py:240 _kosmorro/dumper.py:344
62+
#: _kosmorro/dumper.py:257 _kosmorro/dumper.py:361
6363
msgid "Moon phase:"
6464
msgstr ""
6565

66-
#: _kosmorro/dumper.py:244
66+
#: _kosmorro/dumper.py:261
6767
msgid "{next_moon_phase} on {next_moon_phase_date} at {next_moon_phase_time}"
6868
msgstr ""
6969

70-
#: _kosmorro/dumper.py:308
70+
#: _kosmorro/dumper.py:325
7171
msgid "Overview of your sky"
7272
msgstr ""
7373

74-
#: _kosmorro/dumper.py:316
74+
#: _kosmorro/dumper.py:333
7575
msgid ""
7676
"This document summarizes the ephemerides and the events of {date}. It "
7777
"aims to help you to prepare your observation session. All the hours are "
7878
"given in {timezone}."
7979
msgstr ""
8080

81-
#: _kosmorro/dumper.py:326
81+
#: _kosmorro/dumper.py:343
8282
msgid ""
8383
"Don't forget to check the weather forecast before you go out with your "
8484
"equipment."
8585
msgstr ""
8686

87-
#: _kosmorro/dumper.py:333
87+
#: _kosmorro/dumper.py:350
8888
msgid "Ephemerides of the day"
8989
msgstr ""
9090

91-
#: _kosmorro/dumper.py:342
91+
#: _kosmorro/dumper.py:359
9292
msgid "hours"
9393
msgstr ""
9494

95-
#: _kosmorro/dumper.py:349
95+
#: _kosmorro/dumper.py:366
9696
msgid "Expected events"
9797
msgstr ""
9898

99-
#: _kosmorro/dumper.py:503
99+
#: _kosmorro/dumper.py:520
100100
msgid ""
101101
"Building PDF was not possible, because some dependencies are not "
102102
"installed.\n"
103103
"Please look at the documentation at https://kosmorro.space/cli/generate-"
104104
"pdf/ for more information."
105105
msgstr ""
106106

107-
#: _kosmorro/dumper.py:556
107+
#: _kosmorro/dumper.py:573
108108
#, python-format
109109
msgid ""
110110
"An error occurred during the compilation of the PDF.\n"

0 commit comments

Comments
 (0)