Selaa lähdekoodia

fix: NoneType error on JSON output without position (#199)

tags/v0.10.2
Jérôme Deuchnord 4 vuotta sitten
committed by GitHub
vanhempi
commit
6988e77838
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 muutettua tiedostoa jossa 38 lisäystä ja 28 poistoa
  1. +2
    -0
      .scripts/tests-e2e.sh
  2. +16
    -8
      _kosmorro/dumper.py
  3. +19
    -19
      _kosmorro/locales/messages.pot
  4. +1
    -1
      _kosmorro/main.py
  5. +0
    -0
      test/events.py

+ 2
- 0
.scripts/tests-e2e.sh Näytä tiedosto

@@ -98,6 +98,8 @@ assertSuccess "$KOSMORRO_COMMAND --latitude=50.5876 --longitude=3.0624 -d 2020-0
assertSuccess "$KOSMORRO_COMMAND --latitude=50.5876 --longitude=3.0624 -d 2020-01-27 --format=json" assertSuccess "$KOSMORRO_COMMAND --latitude=50.5876 --longitude=3.0624 -d 2020-01-27 --format=json"
assertFailure "$KOSMORRO_COMMAND --latitude=50.5876 --longitude=3.0624 -d 2020-01-27 --format=pdf" assertFailure "$KOSMORRO_COMMAND --latitude=50.5876 --longitude=3.0624 -d 2020-01-27 --format=pdf"


assertSuccess "$KOSMORRO_COMMAND -d 2020-01-27 --format=json"

# Environment variables # Environment variables
assertSuccess "LATITUDE=50.5876 LONGITUDE=3.0624 TIMEZONE=1 kosmorro -d 2020-01-27" assertSuccess "LATITUDE=50.5876 LONGITUDE=3.0624 TIMEZONE=1 kosmorro -d 2020-01-27"
assertSuccess "LATITUDE=50.5876 LONGITUDE=3.0624 TIMEZONE=-1 kosmorro -d 2020-01-27" assertSuccess "LATITUDE=50.5876 LONGITUDE=3.0624 TIMEZONE=-1 kosmorro -d 2020-01-27"


+ 16
- 8
_kosmorro/dumper.py Näytä tiedosto

@@ -43,15 +43,23 @@ from .debug import debug_print




class Dumper(ABC): class Dumper(ABC):
ephemerides: [AsterEphemerides]
moon_phase: MoonPhase
events: [Event]
date: datetime.date
timezone: int
with_colors: bool
show_graph: bool

def __init__( def __init__(
self, self,
ephemerides: [AsterEphemerides] = None,
moon_phase: MoonPhase = None,
events: [Event] = None,
date: datetime.date = datetime.date.today(),
timezone: int = 0,
with_colors: bool = True,
show_graph: bool = False,
ephemerides: [AsterEphemerides],
moon_phase: MoonPhase,
events: [Event],
date: datetime.date,
timezone: int,
with_colors: bool,
show_graph: bool,
): ):
self.ephemerides = ephemerides self.ephemerides = ephemerides
self.moon_phase = moon_phase self.moon_phase = moon_phase
@@ -99,7 +107,7 @@ class TextDumper(Dumper):
def to_string(self): def to_string(self):
text = [self.style(self.get_date_as_string(capitalized=True), "h1")] text = [self.style(self.get_date_as_string(capitalized=True), "h1")]


if self.ephemerides is not None:
if len(self.ephemerides) > 0:
text.append(self.stringify_ephemerides()) text.append(self.stringify_ephemerides())


text.append(self.get_moon(self.moon_phase)) text.append(self.get_moon(self.moon_phase))


+ 19
- 19
_kosmorro/locales/messages.pot Näytä tiedosto

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kosmorro 0.10.1\n" "Project-Id-Version: kosmorro 0.10.1\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-07-19 12:19+0200\n"
"POT-Creation-Date: 2021-08-26 11:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,76 +27,76 @@ msgid ""
"offset format." "offset format."
msgstr "" msgstr ""


#: _kosmorro/dumper.py:111
#: _kosmorro/dumper.py:119
msgid "Expected events:" msgid "Expected events:"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:118
#: _kosmorro/dumper.py:126
msgid "Note: All the hours are given in UTC." msgid "Note: All the hours are given in UTC."
msgstr "" msgstr ""


#: _kosmorro/dumper.py:125
#: _kosmorro/dumper.py:133
msgid "Note: All the hours are given in the UTC{offset} timezone." msgid "Note: All the hours are given in the UTC{offset} timezone."
msgstr "" msgstr ""


#: _kosmorro/dumper.py:193 _kosmorro/dumper.py:323
#: _kosmorro/dumper.py:201 _kosmorro/dumper.py:331
msgid "Object" msgid "Object"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:194 _kosmorro/dumper.py:324
#: _kosmorro/dumper.py:202 _kosmorro/dumper.py:332
msgid "Rise time" msgid "Rise time"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:195 _kosmorro/dumper.py:326
#: _kosmorro/dumper.py:203 _kosmorro/dumper.py:334
msgid "Culmination time" msgid "Culmination time"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:196 _kosmorro/dumper.py:328
#: _kosmorro/dumper.py:204 _kosmorro/dumper.py:336
msgid "Set time" msgid "Set time"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:224
#: _kosmorro/dumper.py:232
msgid "Moon phase is unavailable for this date." msgid "Moon phase is unavailable for this date."
msgstr "" msgstr ""


#: _kosmorro/dumper.py:228 _kosmorro/dumper.py:332
#: _kosmorro/dumper.py:236 _kosmorro/dumper.py:340
msgid "Moon phase:" msgid "Moon phase:"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:232
#: _kosmorro/dumper.py:240
msgid "{next_moon_phase} on {next_moon_phase_date} at {next_moon_phase_time}" msgid "{next_moon_phase} on {next_moon_phase_date} at {next_moon_phase_time}"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:296
#: _kosmorro/dumper.py:304
msgid "Overview of your sky" msgid "Overview of your sky"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:304
#: _kosmorro/dumper.py:312
msgid "" msgid ""
"This document summarizes the ephemerides and the events of {date}. It " "This document summarizes the ephemerides and the events of {date}. It "
"aims to help you to prepare your observation session. All the hours are " "aims to help you to prepare your observation session. All the hours are "
"given in {timezone}." "given in {timezone}."
msgstr "" msgstr ""


#: _kosmorro/dumper.py:314
#: _kosmorro/dumper.py:322
msgid "" msgid ""
"Don't forget to check the weather forecast before you go out with your " "Don't forget to check the weather forecast before you go out with your "
"equipment." "equipment."
msgstr "" msgstr ""


#: _kosmorro/dumper.py:321
#: _kosmorro/dumper.py:329
msgid "Ephemerides of the day" msgid "Ephemerides of the day"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:330
#: _kosmorro/dumper.py:338
msgid "hours" msgid "hours"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:337
#: _kosmorro/dumper.py:345
msgid "Expected events" msgid "Expected events"
msgstr "" msgstr ""


#: _kosmorro/dumper.py:491
#: _kosmorro/dumper.py:499
msgid "" msgid ""
"Building PDF was not possible, because some dependencies are not " "Building PDF was not possible, because some dependencies are not "
"installed.\n" "installed.\n"
@@ -104,7 +104,7 @@ msgid ""
"pdf/ for more information." "pdf/ for more information."
msgstr "" msgstr ""


#: _kosmorro/dumper.py:544
#: _kosmorro/dumper.py:552
#, python-format #, python-format
msgid "" msgid ""
"An error occurred during the compilation of the PDF.\n" "An error occurred during the compilation of the PDF.\n"


+ 1
- 1
_kosmorro/main.py Näytä tiedosto

@@ -152,7 +152,7 @@ def get_information(
except OutOfRangeDateError as error: except OutOfRangeDateError as error:
raise DateRangeError(error.min_date, error.max_date) raise DateRangeError(error.min_date, error.max_date)
else: else:
eph = None
eph = []


try: try:
moon_phase = get_moon_phase(compute_date) moon_phase = get_moon_phase(compute_date)


+ 0
- 0
test/events.py Näytä tiedosto


Ladataan…
Peruuta
Tallenna