Add progress bar on pass calculation and nicer logging
parent
33aa708ae2
commit
9a93a16776
|
@ -2,3 +2,4 @@ ephem
|
||||||
satellitetle>=0.5.0
|
satellitetle>=0.5.0
|
||||||
requests
|
requests
|
||||||
lxml
|
lxml
|
||||||
|
tqdm
|
||||||
|
|
|
@ -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, \
|
get_groundstation_info, get_last_update, get_scheduled_passes_from_network, ordered_scheduler, \
|
||||||
efficiency, find_passes, schedule_observation
|
efficiency, find_passes, schedule_observation
|
||||||
import settings
|
import settings
|
||||||
|
from tqdm import tqdm
|
||||||
|
|
||||||
_LOG_LEVEL_STRINGS = ['CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG']
|
_LOG_LEVEL_STRINGS = ['CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG']
|
||||||
|
|
||||||
|
@ -297,11 +298,13 @@ if __name__ == "__main__":
|
||||||
|
|
||||||
schedule_needed = False
|
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']):
|
for satpass in sorted(scheduledpasses, key=lambda satpass: satpass['tr']):
|
||||||
if not satpass['scheduled']:
|
if not satpass['scheduled']:
|
||||||
schedule_needed = True
|
schedule_needed = True
|
||||||
logging.info(
|
logging.info(
|
||||||
"%05d %s %s %3.0f %4.3f %s %s" %
|
"%05d | %s | %s | %3.0f | %4.6f | %s | %s" %
|
||||||
(int(
|
(int(
|
||||||
satpass['id']),
|
satpass['id']),
|
||||||
satpass['tr'].strftime("%Y-%m-%dT%H:%M:%S"),
|
satpass['tr'].strftime("%Y-%m-%dT%H:%M:%S"),
|
||||||
|
@ -325,7 +328,8 @@ if __name__ == "__main__":
|
||||||
form["password"] = password
|
form["password"] = password
|
||||||
session.post(loginUrl, data=form, headers={'referer': loginUrl}) # Login
|
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']:
|
if not satpass['scheduled']:
|
||||||
logging.debug(
|
logging.debug(
|
||||||
"Scheduling %05d %s %s %3.0f %4.3f %s %s" %
|
"Scheduling %05d %s %s %3.0f %4.3f %s %s" %
|
||||||
|
|
4
utils.py
4
utils.py
|
@ -6,6 +6,7 @@ from datetime import datetime, timedelta
|
||||||
import ephem
|
import ephem
|
||||||
import lxml
|
import lxml
|
||||||
import settings
|
import settings
|
||||||
|
from tqdm import tqdm
|
||||||
|
|
||||||
|
|
||||||
def get_paginated_endpoint(url, max_entries=None):
|
def get_paginated_endpoint(url, max_entries=None):
|
||||||
|
@ -162,7 +163,8 @@ def find_passes(satellites, observer, tmin, tmax, minimum_altitude):
|
||||||
# Loop over satellites
|
# Loop over satellites
|
||||||
passes = []
|
passes = []
|
||||||
passid = 0
|
passid = 0
|
||||||
for satellite in satellites:
|
logging.info('Finding all passes for %s satellites:' % len(satellites))
|
||||||
|
for satellite in tqdm(satellites):
|
||||||
# Set start time
|
# Set start time
|
||||||
observer.date = ephem.date(tmin)
|
observer.date = ephem.date(tmin)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue