diff --git a/schedule_single_station.py b/schedule_single_station.py index c0e35ef..80e0d16 100755 --- a/schedule_single_station.py +++ b/schedule_single_station.py @@ -120,7 +120,7 @@ if __name__ == "__main__": schedule = not args.dryrun search_transmitters = args.search_transmitters priority_filename = args.priorities - + # Set time range tnow = datetime.strptime(args.starttime, "%Y-%m-%dT%H:%M:%S") tmin = tnow @@ -215,7 +215,7 @@ if __name__ == "__main__": lines = f.readlines() tles = [twolineelement(lines[i], lines[i + 1], lines[i + 2]) for i in range(0, len(lines), 3)] - + # Read transmitters satellites = [] with open(os.path.join(cache_dir, "transmitters_%d.txt" % ground_station_id), "r") as f: @@ -232,7 +232,7 @@ if __name__ == "__main__": success_rate, good_count, data_count)) - + # Find passes passes = find_passes(satellites, observer, tmin, tmax, minimum_altitude) diff --git a/utils.py b/utils.py index b9ce6e7..270b9f5 100644 --- a/utils.py +++ b/utils.py @@ -7,8 +7,6 @@ import ephem import lxml import settings from tqdm import tqdm -import csv - def get_paginated_endpoint(url, max_entries=None): r = requests.get(url=url) @@ -26,16 +24,16 @@ def get_paginated_endpoint(url, max_entries=None): return data - def read_priorities_transmitters(filename): - with open(filename, 'rb') as csvfile: + with open(filename, "r") as fp: satprio = {} sattrans = {} - csvreader = csv.reader(csvfile, delimiter=' ', quotechar='|') - for row in csvreader: - sat = row[0] - prio = row[1] - transmitter = row[2] + lines = fp.readlines() + for line in lines: + parts = line.strip().split(" ") + sat = parts[0] + prio = parts[1] + transmitter = parts[2] satprio[sat] = float(prio) sattrans[sat] = transmitter return (satprio, sattrans)