w1cdn/spothole
1
0
Fork 0
mirror of https://git.ianrenton.com/ian/spothole.git synced 2025-10-27 08:49:27 +00:00
Code Issues 11 Packages Projects Releases Wiki Activity

Only fill missing info if spot passes the timestamp check in submit(). Closes #14

Browse Source
This commit is contained in:
Ian Renton
2025-09-29 19:18:20 +01:00
parent 89a8db579e
commit cd575e7ed2
11 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
providers/aprsis.py
View File

@@ -51,8 +51,7 @@ class APRSIS(Provider):
latitude=data["latitude"] if "latitude" in data else None,
longitude=data["longitude"] if "longitude" in data else None,
time=datetime.now(pytz.UTC)) # APRS-IS spots are live so we can assume spot time is "now"
# Fill in any blanks
spot.infer_missing()
# Add to our list
self.submit(spot)
print(spot)

3
providers/dxcluster.py
View File

@@ -73,8 +73,7 @@ class DXCluster(Provider):
freq=float(match.group(2)),
comment=match.group(4).strip(),
time=spot_datetime)
# Fill in any blanks
spot.infer_missing()
# Add to our list
self.submit(spot)

2
providers/gma.py
View File

@@ -46,8 +46,6 @@ class GMA(HTTPProvider):
ref_info = ref_response.json()
spot.sig = ref_info["reftype"]
# Fill in any missing data
spot.infer_missing()
# Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
# that for us.
new_spots.append(spot)

2
providers/hema.py
View File

@@ -61,8 +61,6 @@ class HEMA(HTTPProvider):
latitude=float(spot_items[7]),
longitude=float(spot_items[8]))
# Fill in any missing data
spot.infer_missing()
# Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
# that for us.
new_spots.append(spot)

2
providers/parksnpeaks.py
View File

@@ -37,8 +37,6 @@ class ParksNPeaks(HTTPProvider):
# If this is POTA, SOTA or WWFF data we already have it through other means, so ignore.
if spot.sig not in ["POTA", "SOTA", "WWFF"]:
logging.warn("PNP spot found with sig " + spot.sig + ", developer needs to figure out how to look this up for grid/lat/lon!")
# Fill in any missing data
spot.infer_missing()
# Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
# that for us.
new_spots.append(spot)

3
providers/pota.py
View File

@@ -36,8 +36,7 @@ class POTA(HTTPProvider):
grid=source_spot["grid6"],
latitude=source_spot["latitude"],
longitude=source_spot["longitude"])
# Fill in any missing data
spot.infer_missing()
# Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
# that for us.
new_spots.append(spot)

14
providers/provider.py
View File

@@ -32,17 +32,25 @@ class Provider:
raise NotImplementedError("Subclasses must implement this method")
# Submit a batch of spots retrieved from the provider. Only spots that are newer than the last spot retrieved
# by this provider will be added to the spot list, to prevent duplications. This is called by the API-querying
# by this provider will be added to the spot list, to prevent duplications. Spots passing the check will also have
# their infer_missing() method called to complete their data set. This is called by the API-querying
# subclasses on receiving spots.
def submit_batch(self, spots):
for spot in spots:
if spot.time > self.last_spot_time:
# Fill in any blanks
spot.infer_missing()
# Append to the list
self.spot_list.append(spot)
self.last_spot_time = max(map(lambda s: s.time, spots))
# Submit a single spot retrieved from the provider. This will be added to the list regardless of its age. This is
# called by the data streaming subclasses, which can be relied upon not to re-provide old spots.
# Submit a single spot retrieved from the provider. This will be added to the list regardless of its age. Spots
# passing the check will also have their infer_missing() method called to complete their data set. This is called by
# the data streaming subclasses, which can be relied upon not to re-provide old spots.
def submit(self, spot):
# Fill in any blanks
spot.infer_missing()
# Append to the list
self.spot_list.append(spot)
self.last_spot_time = spot.time

3
providers/rbn.py
View File

@@ -74,8 +74,7 @@ class RBN(Provider):
freq=float(match.group(2)),
comment=match.group(4).strip(),
time=spot_datetime)
# Fill in any blanks
spot.infer_missing()
# Add to our list
self.submit(spot)

2
providers/sota.py
View File

@@ -60,8 +60,6 @@ class SOTA(HTTPProvider):
spot.latitude = summit_data["latitude"]
spot.longitude = summit_data["longitude"]
# Fill in any missing data
spot.infer_missing()
# Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
# that for us.
new_spots.append(spot)

3
providers/wwbota.py
View File

@@ -42,8 +42,7 @@ class WWBOTA(HTTPProvider):
latitude=source_spot["references"][0]["lat"],
longitude=source_spot["references"][0]["long"],
qrt=source_spot["type"] == "QRT")
# Fill in any missing data
spot.infer_missing()
# Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
# that for us. But WWBOTA does support a special "Test" spot type, we need to avoid adding that.
if source_spot["type"] != "Test":

3
providers/wwff.py
View File

@@ -35,8 +35,7 @@ class WWFF(HTTPProvider):
time=datetime.fromtimestamp(source_spot["spot_time"]).replace(tzinfo=pytz.UTC),
latitude=source_spot["latitude"],
longitude=source_spot["longitude"])
# Fill in any missing data
spot.infer_missing()
# Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
# that for us.
new_spots.append(spot)