w1cdn/spothole
1
0
Fork 0
mirror of https://git.ianrenton.com/ian/spothole.git synced 2026-09-20 14:27:42 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

flynt pass to provide consistency to string formatters and concatenation

Browse Source
This commit is contained in:
Ian Renton
2026-08-15 07:55:32 +01:00
parent bff5b79f8f
commit 7391c28cd0
72 changed files with 184 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/handlers/api/addspot.py
+12 -14
View File
@@ -119,13 +119,13 @@ class APISpotHandler(tornado.web.RequestHandler):
# Reject invalid-looking callsigns
if not re.match(r"^[A-Za-z0-9/\-]*$", spot.dx_call):
self.set_status(422)
self.write(safe_json_dumps("Error - '" + spot.dx_call + "' does not look like a valid callsign."))
self.write(safe_json_dumps(f"Error - '{spot.dx_call}' does not look like a valid callsign."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
if not re.match(r"^[A-Za-z0-9/\-]*$", spot.de_call):
self.set_status(422)
self.write(safe_json_dumps("Error - '" + spot.de_call + "' does not look like a valid callsign."))
self.write(safe_json_dumps(f"Error - '{spot.de_call}' does not look like a valid callsign."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
@@ -134,7 +134,7 @@ class APISpotHandler(tornado.web.RequestHandler):
if infer_band_from_freq(spot.freq) == UNKNOWN_BAND:
self.set_status(422)
self.write(
safe_json_dumps("Error - Frequency of " + str(spot.freq / 1000.0) + "kHz is not in a known band."))
safe_json_dumps(f"Error - Frequency of {spot.freq / 1000.0!s}kHz is not in a known band."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
@@ -145,7 +145,7 @@ class APISpotHandler(tornado.web.RequestHandler):
spot.dx_grid.upper()):
self.set_status(422)
self.write(
safe_json_dumps("Error - '" + spot.dx_grid + "' does not look like a valid Maidenhead grid."))
safe_json_dumps(f"Error - '{spot.dx_grid}' does not look like a valid Maidenhead grid."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
@@ -155,7 +155,7 @@ class APISpotHandler(tornado.web.RequestHandler):
spot.sig) and not re.match(get_ref_regex_for_sig(spot.sig), spot.sig_refs[0].id):
self.set_status(422)
self.write(safe_json_dumps(
"Error - '" + spot.sig_refs[0].id + "' does not look like a valid reference for " + spot.sig + "."))
f"Error - '{spot.sig_refs[0].id}' does not look like a valid reference for {spot.sig}."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
@@ -208,13 +208,11 @@ class APISpotHandler(tornado.web.RequestHandler):
threading.Timer(1.0, provider.force_poll).start()
except NotImplementedError as e:
upstream_warning = str(e)
except Exception as e:
logging.warning("Failed to submit spot upstream to " + upstream_provider_name + ": " + str(e))
upstream_warning = "Spot was saved locally but upstream submission to " + upstream_provider_name + " failed: " + str(
e)
except Exception:
logging.exception(f"Failed to submit spot upstream to {upstream_provider_name}")
upstream_warning = f"Spot was saved locally but upstream submission to {upstream_provider_name} failed."
else:
upstream_warning = "No enabled provider named '" + upstream_provider_name + "' supports upstream submission for " + (
spot.sig if spot.sig else "") + " spots."
upstream_warning = f"No enabled provider named '{upstream_provider_name}' supports upstream submission for {spot.sig if spot.sig else ''} spots."
# If we successfully submitted the spot upstream, don't add it direct to Spothole, otherwise it will be a
# duplicate with what immediately comes back from the API. But if we weren't asked to send it upstream, or
@@ -224,7 +222,7 @@ class APISpotHandler(tornado.web.RequestHandler):
self._spots.set(spot.id, spot)
if upstream_warning:
self.write(safe_json_dumps("Warning - " + upstream_warning))
self.write(safe_json_dumps(f"Warning - {upstream_warning}"))
self.set_status(201)
else:
self.write(safe_json_dumps("OK"))
@@ -256,6 +254,6 @@ class APISpotHandler(tornado.web.RequestHandler):
data={"secret": RECAPTCHA_SECRET_KEY, "response": token},
timeout=(5, 10))
return response.ok and response.json().get("success", False)
except Exception as e:
logging.warning("reCAPTCHA verification request failed: " + str(e))
except Exception:
logging.exception(f"reCAPTCHA verification request failed")
return False
server/handlers/api/alerts.py
+1 -1
View File
@@ -55,7 +55,7 @@ class APIAlertsHandler(tornado.web.RequestHandler):
self.write(safe_json_dumps(data))
self.set_status(200)
except ValueError as e:
self.write(safe_json_dumps("Bad request - " + str(e)))
self.write(safe_json_dumps(f"Bad request - {e!s}"))
self.set_status(400)
except Exception:
logging.exception("Exception when handling client request to alerts API")
server/handlers/api/lookups.py
+3 -3
View File
@@ -50,7 +50,7 @@ class APILookupCallHandler(tornado.web.RequestHandler):
self.write(safe_json_dumps(callsign_data))
else:
self.write(safe_json_dumps("Error - '" + call + "' does not look like a valid callsign."))
self.write(safe_json_dumps(f"Error - '{call}' does not look like a valid callsign."))
self.set_status(422)
else:
self.write(safe_json_dumps("Error - call must be provided"))
@@ -99,10 +99,10 @@ class APILookupSIGRefHandler(tornado.web.RequestHandler):
else:
self.write(safe_json_dumps(
"Error - '" + ref_id + "' does not look like a valid reference ID for " + sig + "."))
f"Error - '{ref_id}' does not look like a valid reference ID for {sig}."))
self.set_status(422)
else:
self.write(safe_json_dumps("Error - sig '" + sig + "' is not known."))
self.write(safe_json_dumps(f"Error - sig '{sig}' is not known."))
self.set_status(422)
else:
self.write(safe_json_dumps("Error - sig and id must be provided"))
server/handlers/api/spots.py
+1 -1
View File
@@ -55,7 +55,7 @@ class APISpotsHandler(tornado.web.RequestHandler):
self.write(safe_json_dumps(data))
self.set_status(200)
except ValueError as e:
self.write(safe_json_dumps("Bad request - " + str(e)))
self.write(safe_json_dumps(f"Bad request - {e!s}"))
self.set_status(400)
except Exception:
logging.exception("Excedption when handling client request to spots API")
server/handlers/api/v1_addspot.py
+5 -5
View File
@@ -76,13 +76,13 @@ class V1APISpotHandler(tornado.web.RequestHandler):
# Reject invalid-looking callsigns
if not re.match(r"^[A-Za-z0-9/\-]*$", spot.dx_call):
self.set_status(422)
self.write(safe_json_dumps("Error - '" + spot.dx_call + "' does not look like a valid callsign."))
self.write(safe_json_dumps(f"Error - '{spot.dx_call}' does not look like a valid callsign."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
if not re.match(r"^[A-Za-z0-9/\-]*$", spot.de_call):
self.set_status(422)
self.write(safe_json_dumps("Error - '" + spot.de_call + "' does not look like a valid callsign."))
self.write(safe_json_dumps(f"Error - '{spot.de_call}' does not look like a valid callsign."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
@@ -90,7 +90,7 @@ class V1APISpotHandler(tornado.web.RequestHandler):
# Reject if frequency not in a known band
if infer_band_from_freq(spot.freq) == UNKNOWN_BAND:
self.set_status(422)
self.write(safe_json_dumps("Error - Frequency of " + str(spot.freq / 1000.0) + "kHz is not in a known band."))
self.write(safe_json_dumps(f"Error - Frequency of {spot.freq / 1000.0!s}kHz is not in a known band."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
@@ -100,7 +100,7 @@ class V1APISpotHandler(tornado.web.RequestHandler):
r"^([A-R]{2}[0-9]{2}[A-X]{2}[0-9]{2}[A-X]{2}|[A-R]{2}[0-9]{2}[A-X]{2}[0-9]{2}|[A-R]{2}[0-9]{2}[A-X]{2}|[A-R]{2}[0-9]{2})$",
spot.dx_grid.upper()):
self.set_status(422)
self.write(safe_json_dumps("Error - '" + spot.dx_grid + "' does not look like a valid Maidenhead grid."))
self.write(safe_json_dumps(f"Error - '{spot.dx_grid}' does not look like a valid Maidenhead grid."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
@@ -110,7 +110,7 @@ class V1APISpotHandler(tornado.web.RequestHandler):
spot.sig) and not re.match(get_ref_regex_for_sig(spot.sig), spot.sig_refs[0].id):
self.set_status(422)
self.write(safe_json_dumps(
"Error - '" + spot.sig_refs[0].id + "' does not look like a valid reference for " + spot.sig + "."))
f"Error - '{spot.sig_refs[0].id}' does not look like a valid reference for {spot.sig}."))
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
return
server/handlers/api/v1_compatability.py
+1 -1
View File
@@ -15,7 +15,7 @@ class V1RedirectHandler(tornado.web.RequestHandler):
async def _proxy(self, path):
new_url = f"{self.request.protocol}://{self.request.host}/api/v2/{path}"
if self.request.query:
new_url += "?" + self.request.query
new_url += f"?{self.request.query}"
client = AsyncHTTPClient()
try: