Add progress bar on pass calculation and nicer logging

merge-requests/1/head
Pierros Papadeas 2018-12-19 11:00:27 +02:00
parent 33aa708ae2
commit 9a93a16776
No known key found for this signature in database
GPG Key ID: 8DB97129D9982991
3 changed files with 10 additions and 3 deletions

View File

@ -2,3 +2,4 @@ ephem
satellitetle>=0.5.0
requests
lxml
tqdm

View File

@ -12,6 +12,7 @@ from utils import get_active_transmitter_info, get_transmitter_stats, \
get_groundstation_info, get_last_update, get_scheduled_passes_from_network, ordered_scheduler, \
efficiency, find_passes, schedule_observation
import settings
from tqdm import tqdm
_LOG_LEVEL_STRINGS = ['CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG']
@ -297,11 +298,13 @@ if __name__ == "__main__":
schedule_needed = False
logging.info("NORAD | Start time | End time | El | Priority | " +
"Transmitter UUID | Satellite name ")
for satpass in sorted(scheduledpasses, key=lambda satpass: satpass['tr']):
if not satpass['scheduled']:
schedule_needed = True
logging.info(
"%05d %s %s %3.0f %4.3f %s %s" %
"%05d | %s | %s | %3.0f | %4.6f | %s | %s" %
(int(
satpass['id']),
satpass['tr'].strftime("%Y-%m-%dT%H:%M:%S"),
@ -325,7 +328,8 @@ if __name__ == "__main__":
form["password"] = password
session.post(loginUrl, data=form, headers={'referer': loginUrl}) # Login
for satpass in sorted(scheduledpasses, key=lambda satpass: satpass['tr']):
logging.info('Checking and scheduling passes as needed.')
for satpass in tqdm(sorted(scheduledpasses, key=lambda satpass: satpass['tr'])):
if not satpass['scheduled']:
logging.debug(
"Scheduling %05d %s %s %3.0f %4.3f %s %s" %

View File

@ -6,6 +6,7 @@ from datetime import datetime, timedelta
import ephem
import lxml
import settings
from tqdm import tqdm
def get_paginated_endpoint(url, max_entries=None):
@ -162,7 +163,8 @@ def find_passes(satellites, observer, tmin, tmax, minimum_altitude):
# Loop over satellites
passes = []
passid = 0
for satellite in satellites:
logging.info('Finding all passes for %s satellites:' % len(satellites))
for satellite in tqdm(satellites):
# Set start time
observer.date = ephem.date(tmin)