Minor changes:

  *) simplified 'config.ini' parsing.
  *) added 'USER_AGENT' handling.
  *) added 'ATC_STREAM_URL' to the window title.

Author: gvanem

src/externals/Retro-ADSB-radar/config.ini

@@ -2,6 +2,7 @@
 FETCH_INTERVAL  = 4
 MIL_PREFIX_LIST = 7CF
 TAR1090_URL     = http://127.0.0.1:8080/data/aircraft.json
+USER_AGENT      = Retro-ADSB-Radar
 BLINK_MILITARY  = true
 VERBOSE         = false
 

src/externals/Retro-ADSB-radar/config.py

@@ -1,39 +1,20 @@
 import os, configparser
 
-#
-# Fix a line like 'key = value # some trailing comment\n'
-# into 'key = value\n'
-#
-def strip_trailing_comment (s):
-  a = s.find ("#")
-  b = s.find ("=")
-  if a > 0 and a > b:
-     s = s[:a].rstrip (" ") + "\n"
-  return s
-
-def get_lines (file):
-  f = open (file, "rt")
-  lines = f.readlines()
-  lines2 = ""
-  f.close()
-  for l in lines:
-      lines2 += strip_trailing_comment (l)
-  return lines2
-
 #
 # Configuration Loading
 #
-config = configparser.ConfigParser (strict=False)
-
 script_dir = os.path.dirname (os.path.abspath(__file__)).replace ("\\", "/")
-config.read_string (get_lines(f"{script_dir}/config.ini"))
+
+config = configparser.ConfigParser (strict = False, inline_comment_prefixes = ("#"))
+config.read (f"{script_dir}/config.ini")
 
 #
 # General Settings
 #
 FETCH_INTERVAL  = config.getint ("General", "FETCH_INTERVAL", fallback=10)
 MIL_PREFIX_LIST = [ prefix.strip() for prefix in config.get("General", "MIL_PREFIX_LIST", fallback="7CF").split(",") ]
 TAR1090_URL     = config.get ("General", "TAR1090_URL", fallback="http://localhost/data/aircraft.json")
+USER_AGENT      = config.get ("General", "USER_AGENT", fallback=None)
 BLINK_MILITARY  = config.getboolean ("General", "BLINK_MILITARY", fallback=True)
 VERBOSE         = config.getboolean ("General", "VERBOSE", fallback=False)
 

src/externals/Retro-ADSB-radar/data_fetcher.py

@@ -16,9 +16,14 @@ def __init__ (self):
     def fetch_data (self) -> List [Aircraft]:
       """Fetch aircraft from local tar1090"""
       try:
-        if 0:
+        if config.VERBOSE:
            print (f"Fetching aircraft data from {config.TAR1090_URL}...")
-        response = requests.get (config.TAR1090_URL, timeout=10)
+        if config.USER_AGENT:
+           headers = { "User-Agent": config.USER_AGENT }
+        else:
+           headers = None  # becomes default "python-requests/2.31.0"
+
+        response = requests.get (config.TAR1090_URL, timeout=10, headers=headers)
         response.raise_for_status()
         data = response.json()
         aircraft_list = []

src/externals/Retro-ADSB-radar/main.py

@@ -56,7 +56,12 @@ def main():
     # Display Setup
     #
     screen = pygame.display.set_mode ((config.SCREEN_WIDTH, config.SCREEN_HEIGHT), flags)
-    pygame.display.set_caption (f"{config.AREA_NAME} ADS-B RADAR")
+
+    win_caption = f"ADS-B RADAR, {config.AREA_NAME}"
+    if config.ATC_STREAM_URL:
+       win_caption += f", qAudio: {config.ATC_STREAM_URL}"
+    pygame.display.set_caption (win_caption)
+
     clock = pygame.time.Clock()
     if config.BACKGROUND_PATH:
        background = utils.load_background (config.BACKGROUND_PATH)
@@ -233,6 +238,7 @@ def main():
                   running = False
                last_mouse_move = time.time()
                pygame.mouse.set_visible (True)
+
             elif event.type in (pygame.MOUSEMOTION, pygame.MOUSEBUTTONUP):
                last_mouse_move = time.time()
                pygame.mouse.set_visible (True)