Merge remote-tracking branch 'origin/master' into fix-disconnection-bug

- Bump ubuntu version
- Switch to apt from apt-get
- Add extra install for apt-transport-https

.gitea/workflows/build.yml.bak

@@ -3,7 +3,7 @@ name: release-tag
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   release-image:
@@ -11,9 +11,8 @@ jobs:
     container:
       image: catthehacker/ubuntu:act-latest
     env:
-      DOCKER_ORG: teacup
       DOCKER_LATEST: nightly
-      RUNNER_TOOL_CACHE: /toolcache
+      CONTAINER_NAME: drb-client-discord-bot
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -42,15 +41,19 @@ jobs:
           echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
           echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT                
 
+      - name: Validate build configuration
+        uses: docker/build-push-action@v6
+        with:
+          call: check
+
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
           platforms: |
             linux/amd64
-            linux/arm64                        
           push: true
           tags: | # replace it with your local IP and tags
-            git.vpn.cusano.net/${{ vars.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            git.vpn.cusano.net/${{ vars.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}/${{ env.CONTAINER_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
-            git.vpn.cusano.net/${{ vars.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+            git.vpn.cusano.net/${{ vars.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}/${{ env.CONTAINER_NAME }}:${{ env.DOCKER_LATEST }}

.gitea/workflows/lint.yml

@@ -3,22 +3,22 @@ name: Lint
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
     branches:
-      - main
+      - "*"
 
 jobs:
   lint:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.x
+        python-version: '3.13'
 
     - name: Install dependencies
       run: |

.github/workflows/test.yml

@@ -1,30 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.x
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install pytest
-    
-    - name: Run tests
-      run: |
-        pytest

Dockerfile

@@ -5,8 +5,9 @@ FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install system dependencies
-RUN apt-get update && \
+RUN apt update && \
-    apt-get install -y git \
+    apt-get install -y --no-install-recommends libc-bin apt-transport-https && \
+    apt install -y --no-install-recommends git \
     curl \
     python3 \
     python3-pip \

app/NoiseGatev2.py

@@ -30,15 +30,15 @@ class AudioStream:
             if _input:
                 self.paInstance_kwargs['input_device_index'] = _input_device_index
             else:
-                LOGGER.warning(f"[AudioStream.__init__]:\tInput was not enabled."
+                LOGGER.warning("[AudioStream.__init__]:\tInput was not enabled."
-                               f" Reinitialize with '_input=True'")
+                               " Reinitialize with '_input=True'")
 
         if _output_device_index:
             if _output:
                 self.paInstance_kwargs['output_device_index'] = _output_device_index
             else:
-                LOGGER.warning(f"[AudioStream.__init__]:\tOutput was not enabled."
+                LOGGER.warning("[AudioStream.__init__]:\tOutput was not enabled."
-                               f" Reinitialize with '_output=True'")
+                               " Reinitialize with '_output=True'")
 
         if _init_on_startup:
             # Init PyAudio instance
@@ -59,15 +59,15 @@ class AudioStream:
             if self.paInstance_kwargs['input']:
                 self.paInstance_kwargs['input_device_index'] = _new_input_device_index
             else:
-                LOGGER.warning(f"[AudioStream.init_stream]:\tInput was not enabled when initialized."
+                LOGGER.warning("[AudioStream.init_stream]:\tInput was not enabled when initialized."
-                               f" Reinitialize with '_input=True'")
+                               " Reinitialize with '_input=True'")
 
         if _new_output_device_index:
             if self.paInstance_kwargs['output']:
                 self.paInstance_kwargs['output_device_index'] = _new_output_device_index
             else:
-                LOGGER.warning(f"[AudioStream.init_stream]:\tOutput was not enabled when initialized."
+                LOGGER.warning("[AudioStream.init_stream]:\tOutput was not enabled when initialized."
-                               f" Reinitialize with '_output=True'")
+                               " Reinitialize with '_output=True'")
 
         self.close_if_open()
 
@@ -80,7 +80,7 @@ class AudioStream:
             if self.stream.is_active():
                 self.stream.stop_stream()
                 self.stream.close()
-                LOGGER.debug(f"[ReopenStream.close_if_open]:\t Stream was open; It was closed.")
+                LOGGER.debug("[ReopenStream.close_if_open]:\t Stream was open; It was closed.")
 
     def list_devices(self, _display_input_devices: bool = True, _display_output_devices: bool = True):
         LOGGER.info('Getting a list of the devices connected')
@@ -126,7 +126,7 @@ class NoiseGate(AudioStream):
     def run(self) -> None:
         global voice_connection
         # Start the audio stream
-        LOGGER.debug(f"Starting stream")
+        LOGGER.debug("Starting stream")
         self.stream.start_stream()
         # Start the stream to discord
         self.core()
@@ -139,15 +139,15 @@ class NoiseGate(AudioStream):
             time.sleep(.2)
 
         if not voice_connection.is_playing():
-            LOGGER.debug(f"Playing stream to discord")
+            LOGGER.debug("Playing stream to discord")
             voice_connection.play(self.NGStream, after=self.core)
 
     async def close(self):
-        LOGGER.debug(f"Closing")
+        LOGGER.debug("Closing")
         await voice_connection.disconnect()
         if self.stream.is_active:
             self.stream.stop_stream()
-            LOGGER.debug(f"Stopping stream")
+            LOGGER.debug("Stopping stream")
 
 
 # noinspection PyUnresolvedReferences
@@ -155,7 +155,7 @@ class NoiseGateStream(discord.AudioSource):
     def __init__(self, _stream):
         super(NoiseGateStream, self).__init__()
         self.stream = _stream       # The actual audio stream object
-        self.NG_fadeout = 240/20    # Fadeout value used to hold the noisegate after de-triggering
+        self.NG_fadeout = 240 / 20    # Fadeout value used to hold the noisegate after de-triggering
         self.NG_fadeout_count = 0   # A count set when the noisegate is triggered and was de-triggered
         self.process_set_count = 0  # Counts how many processes have been made
 

app/bot.py

@@ -116,6 +116,7 @@ class DiscordBotManager:
         del self.voice_clients[guild_id]
         LOGGER.info(f"Left guild {guild_id} voice channel.")
 
+# Initialize Discord Bot Manager
 bot_manager = DiscordBotManager()
 
 # API Endpoints
@@ -164,4 +165,4 @@ async def get_status():
     return status
 
 app.include_router(op25_controller.router, prefix="/op25")
-app.include_router(pulse.router, prefix="/pulse")
+app.include_router(pulse.router, prefix="/pulse")

app/get_devices.py

@@ -8,4 +8,4 @@ for inputDevice in list_of_devices['Input']:
 
 print("----- OUTPUT DEVICES -----")
 for outputDevice in list_of_devices['Output']:
-    print(f"{outputDevice}\t-\t{list_of_devices['Output'][outputDevice]}")
+    print(f"{outputDevice}\t-\t{list_of_devices['Output'][outputDevice]}")

app/op25_controller.py

@@ -1,4 +1,4 @@
-from fastapi import FastAPI, HTTPException, APIRouter
+from fastapi import HTTPException, APIRouter
 from pydantic import BaseModel
 from enum import Enum
 import subprocess
@@ -6,7 +6,7 @@ import os
 import signal
 import json
 import csv
-from typing import List, Optional, Union
+from typing import List, Optional
 
 router = APIRouter()
 
@@ -87,7 +87,7 @@ class ChannelConfig(BaseModel):
     symbol_rate: Optional[int] = 4800
     blacklist: Optional[str] = ""
     whitelist: Optional[str] = ""
-    
+
 class DeviceConfig(BaseModel):
     args: Optional[str] = "rtl"
     gains: Optional[str] = "lna:39"
@@ -170,7 +170,7 @@ async def generate_config(generator: ConfigGenerator):
                 "audio": audio.dict(),
                 "terminal": terminal.dict()
             }
-        
+
         elif generator.type == DecodeMode.ANALOG:
             generator = generator.config
             channels = [ChannelConfig(
@@ -190,11 +190,11 @@ async def generate_config(generator: ConfigGenerator):
 
         else:
             raise HTTPException(status_code=400, detail="Invalid configuration type. Must be 'p25' or 'nbfm'.")
-        
+
         with open('/configs/active.cfg.json', 'w') as f:
             json.dump(del_none_in_dict(config_dict), f, indent=2)
 
-        return {"message": f"Config exported to '/configs/active.cfg.json'"}
+        return {"message": "Config exported to '/configs/active.cfg.json'"}
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 
@@ -222,7 +222,7 @@ def save_whitelist(talkgroup_tags: List[int]) -> None:
         writer = csv.writer(file, delimiter='\t', lineterminator='\n')
         # Write rows
         for tag in talkgroup_tags:
-            writer.writerow([tag]) 
+            writer.writerow([tag])
 
 def del_none_in_dict(d):
     """
@@ -239,4 +239,4 @@ def del_none_in_dict(d):
         elif isinstance(value, list):
             for iterative_value in value:
                 del_none_in_dict(iterative_value)
-    return d  # For convenience
+    return d  # For convenience

app/pulse.py

@@ -11,4 +11,4 @@ async def get_status():
     return {"status": "running" if pulse_process else "stopped"}
 
 
-# subprocess.Popen(os.path.join(OP25_PATH, OP25_SCRIPT), shell=True, preexec_fn=os.setsid, cwd=OP25_PATH)
+# subprocess.Popen(os.path.join(OP25_PATH, OP25_SCRIPT), shell=True, preexec_fn=os.setsid, cwd=OP25_PATH)