diff --git a/network/base/tasks.py b/network/base/tasks.py index dfdbd53..8f5d597 100644 --- a/network/base/tasks.py +++ b/network/base/tasks.py @@ -19,7 +19,7 @@ from satellite_tle import fetch_tles from network.base.models import DemodData, LatestTle, Observation, Satellite, \ Station, Tle, Transmitter -from network.base.utils import demod_to_db +from network.base.utils import sync_demoddata_to_db @shared_task @@ -160,18 +160,16 @@ def clean_observations(): @shared_task def sync_to_db(): """Task to send demod data to SatNOGS DB / SiDS""" - period = now() - timedelta(days=1) transmitters = Transmitter.objects.filter(sync_to_db=True).values_list('uuid', flat=True) + frames = DemodData.objects.filter( - observation__end__gte=period, - copied_to_db=False, - observation__transmitter_uuid__in=transmitters + copied_to_db=False, observation__transmitter_uuid__in=transmitters ) for frame in frames: try: if not frame.is_image() and not frame.copied_to_db: if os.path.isfile(frame.payload_demod.path): - demod_to_db(frame.id) + sync_demoddata_to_db(frame.id) except Exception: continue diff --git a/network/base/utils.py b/network/base/utils.py index 0b6af56..9e6fbd5 100644 --- a/network/base/utils.py +++ b/network/base/utils.py @@ -71,7 +71,7 @@ def export_station_status(self, request, queryset): return response -def demod_to_db(frame_id): +def sync_demoddata_to_db(frame_id): """Task to send a frame from SatNOGS Network to SatNOGS DB""" frame = DemodData.objects.get(id=frame_id) obs = frame.observation