From fd2cf996bc039e789771b5889d4d3a21f8009ada Mon Sep 17 00:00:00 2001 From: "Fabian P. Schmidt" Date: Sat, 2 Nov 2019 14:59:32 +0100 Subject: [PATCH] Refactor twolineelement into a seperate module --- auto_scheduler/__init__.py | 1 + auto_scheduler/tle.py | 17 +++++++++++++++++ schedule_single_station.py | 20 +------------------- 3 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 auto_scheduler/__init__.py create mode 100644 auto_scheduler/tle.py diff --git a/auto_scheduler/__init__.py b/auto_scheduler/__init__.py new file mode 100644 index 0000000..aacd1be --- /dev/null +++ b/auto_scheduler/__init__.py @@ -0,0 +1 @@ +from .tle import twolineelement diff --git a/auto_scheduler/tle.py b/auto_scheduler/tle.py new file mode 100644 index 0000000..1dafd00 --- /dev/null +++ b/auto_scheduler/tle.py @@ -0,0 +1,17 @@ +class twolineelement: + """TLE class""" + + def __init__(self, tle0, tle1, tle2): + """Define a TLE""" + + self.tle0 = tle0 + self.tle1 = tle1 + self.tle2 = tle2 + if tle0[:2] == "0 ": + self.name = tle0[2:] + else: + self.name = tle0 + if tle1.split(" ")[1] == "": + self.id = int(tle1.split(" ")[2][:4]) + else: + self.id = int(tle1.split(" ")[1][:5]) diff --git a/schedule_single_station.py b/schedule_single_station.py index 9567876..b521352 100755 --- a/schedule_single_station.py +++ b/schedule_single_station.py @@ -12,6 +12,7 @@ from utils import get_active_transmitter_info, get_transmitter_stats, \ get_groundstation_info, get_scheduled_passes_from_network, ordered_scheduler, \ report_efficiency, find_passes, schedule_observation, read_priorities_transmitters, \ get_satellite_info, update_needed, get_priority_passes +from auto_scheduler import twolineelement import settings from tqdm import tqdm import sys @@ -19,25 +20,6 @@ import sys _LOG_LEVEL_STRINGS = ['CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG'] -class twolineelement: - """TLE class""" - - def __init__(self, tle0, tle1, tle2): - """Define a TLE""" - - self.tle0 = tle0 - self.tle1 = tle1 - self.tle2 = tle2 - if tle0[:2] == "0 ": - self.name = tle0[2:] - else: - self.name = tle0 - if tle1.split(" ")[1] == "": - self.id = int(tle1.split(" ")[2][:4]) - else: - self.id = int(tle1.split(" ")[1][:5]) - - class satellite: """Satellite class"""