mirror of
				https://git.ianrenton.com/ian/spothole.git
				synced 2025-10-27 16:59:25 +00:00 
			
		
		
		
	Implement a max spot age filter. Closes #18
This commit is contained in:
		| @@ -5,7 +5,7 @@ from threading import Thread | ||||
| import aprslib | ||||
| import pytz | ||||
|  | ||||
| from core.config import config | ||||
| from core.config import SERVER_OWNER_CALLSIGN | ||||
| from data.spot import Spot | ||||
| from providers.provider import Provider | ||||
|  | ||||
| @@ -23,7 +23,7 @@ class APRSIS(Provider): | ||||
|         self.thread.start() | ||||
|  | ||||
|     def connect(self): | ||||
|         self.aprsis = aprslib.IS(config["server-owner-callsign"]) | ||||
|         self.aprsis = aprslib.IS(SERVER_OWNER_CALLSIGN) | ||||
|         self.status = "Connecting" | ||||
|         logging.info("APRS-IS connecting...") | ||||
|         self.aprsis.connect() | ||||
|   | ||||
| @@ -8,7 +8,7 @@ import pytz | ||||
| import telnetlib3 | ||||
|  | ||||
| from data.spot import Spot | ||||
| from core.config import config | ||||
| from core.config import SERVER_OWNER_CALLSIGN | ||||
| from providers.provider import Provider | ||||
|  | ||||
|  | ||||
| @@ -47,7 +47,7 @@ class DXCluster(Provider): | ||||
|                     logging.info("DX Cluster " + self.hostname + " connecting...") | ||||
|                     self.telnet = telnetlib3.Telnet(self.hostname, self.port) | ||||
|                     self.telnet.read_until("login: ".encode("latin-1")) | ||||
|                     self.telnet.write((config["server-owner-callsign"] + "\n").encode("latin-1")) | ||||
|                     self.telnet.write((SERVER_OWNER_CALLSIGN + "\n").encode("latin-1")) | ||||
|                     connected = True | ||||
|                     logging.info("DX Cluster " + self.hostname + " connected.") | ||||
|                 except Exception as e: | ||||
|   | ||||
| @@ -3,14 +3,14 @@ from datetime import datetime | ||||
| import pytz | ||||
|  | ||||
| from core.constants import SOFTWARE_NAME, SOFTWARE_VERSION | ||||
| from core.config import config | ||||
| from core.config import config, SERVER_OWNER_CALLSIGN | ||||
|  | ||||
|  | ||||
| # Generic data provider class. Subclasses of this query the individual APIs for data. | ||||
| class Provider: | ||||
|  | ||||
|     # HTTP headers used for providers that use HTTP | ||||
|     HTTP_HEADERS = { "User-Agent": SOFTWARE_NAME + " " + SOFTWARE_VERSION + " (operated by " + config["server-owner-callsign"] + ")" } | ||||
|     HTTP_HEADERS = { "User-Agent": SOFTWARE_NAME + " " + SOFTWARE_VERSION + " (operated by " + SERVER_OWNER_CALLSIGN + ")" } | ||||
|  | ||||
|     # Constructor | ||||
|     def __init__(self, provider_config): | ||||
|   | ||||
| @@ -8,7 +8,7 @@ import pytz | ||||
| import telnetlib3 | ||||
|  | ||||
| from data.spot import Spot | ||||
| from core.config import config | ||||
| from core.config import SERVER_OWNER_CALLSIGN | ||||
| from providers.provider import Provider | ||||
|  | ||||
|  | ||||
| @@ -48,7 +48,7 @@ class RBN(Provider): | ||||
|                     logging.info("RBN port " + str(self.port) + " connecting...") | ||||
|                     self.telnet = telnetlib3.Telnet("telnet.reversebeacon.net", self.port) | ||||
|                     telnet_output = self.telnet.read_until("Please enter your call: ".encode("latin-1")) | ||||
|                     self.telnet.write((config["server-owner-callsign"] + "\n").encode("latin-1")) | ||||
|                     self.telnet.write((SERVER_OWNER_CALLSIGN + "\n").encode("latin-1")) | ||||
|                     connected = True | ||||
|                     logging.info("RBN port " + str(self.port) + " connected.") | ||||
|                 except Exception as e: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Ian Renton
					Ian Renton