From 111a6d6563430dff3d1cfa5e504790ffe652599b Mon Sep 17 00:00:00 2001 From: 3ll3d00d Date: Sun, 11 Feb 2024 11:05:10 +0000 Subject: [PATCH] bump versions of actions, add examples --- .github/workflows/create-app.yaml | 12 +++++------ .github/workflows/test.yaml | 4 ++-- examples/ezbeq_10x10.yml | 10 +++++++++ examples/ezbeq_10x10_custom.yml | 28 ++++++++++++++++++++++++ examples/ezbeq_10x10_xo.yml | 11 ++++++++++ examples/ezbeq_2x4_custom.yml | 27 +++++++++++++++++++++++ examples/ezbeq_4x10.yml | 10 +++++++++ examples/ezbeq_cdsp.yml | 10 +++++++++ examples/ezbeq_ddrc24.yml | 10 +++++++++ examples/ezbeq_ddrc88.yml | 19 ++++++++++++++++ examples/ezbeq_htp1.yml | 11 ++++++++++ examples/ezbeq_mc.yml | 15 +++++++++++++ examples/ezbeq_md.yml | 9 ++++++++ examples/ezbeq_md2.yml | 16 ++++++++++++++ examples/ezbeq_multi.yml | 36 +++++++++++++++++++++++++++++++ examples/ezbeq_qsys.yml | 15 +++++++++++++ examples/ezbeq_shd.yml | 10 +++++++++ ezbeq/config.py | 26 ---------------------- ezbeq/main.py | 3 --- pyproject.toml | 2 +- tests/conftest.py | 6 ------ 21 files changed, 246 insertions(+), 44 deletions(-) create mode 100644 examples/ezbeq_10x10.yml create mode 100644 examples/ezbeq_10x10_custom.yml create mode 100644 examples/ezbeq_10x10_xo.yml create mode 100644 examples/ezbeq_2x4_custom.yml create mode 100644 examples/ezbeq_4x10.yml create mode 100644 examples/ezbeq_cdsp.yml create mode 100644 examples/ezbeq_ddrc24.yml create mode 100644 examples/ezbeq_ddrc88.yml create mode 100644 examples/ezbeq_htp1.yml create mode 100644 examples/ezbeq_mc.yml create mode 100644 examples/ezbeq_md.yml create mode 100644 examples/ezbeq_md2.yml create mode 100644 examples/ezbeq_multi.yml create mode 100644 examples/ezbeq_qsys.yml create mode 100644 examples/ezbeq_shd.yml diff --git a/.github/workflows/create-app.yaml b/.github/workflows/create-app.yaml index 7a03341..ff01609 100644 --- a/.github/workflows/create-app.yaml +++ b/.github/workflows/create-app.yaml @@ -13,9 +13,9 @@ jobs: outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install Poetry @@ -60,7 +60,7 @@ jobs: needs: create_release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use node.js lts uses: actions/setup-node@v3 with: @@ -78,7 +78,7 @@ jobs: run: | echo ${{ steps.get_version.outputs.version-without-v }} > ezbeq/VERSION - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install Poetry @@ -120,7 +120,7 @@ jobs: os: [ macos-latest, windows-latest ] fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use node.js lts uses: actions/setup-node@v3 with: @@ -138,7 +138,7 @@ jobs: run: | echo ${{ steps.get_version.outputs.version-without-v }} > ezbeq/VERSION - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install Poetry diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a3e51c5..7306559 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -20,9 +20,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install Poetry diff --git a/examples/ezbeq_10x10.yml b/examples/ezbeq_10x10.yml new file mode 100644 index 0000000..a54d4a5 --- /dev/null +++ b/examples/ezbeq_10x10.yml @@ -0,0 +1,10 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp + device_type: 10x10 +port: 8080 diff --git a/examples/ezbeq_10x10_custom.yml b/examples/ezbeq_10x10_custom.yml new file mode 100644 index 0000000..da02774 --- /dev/null +++ b/examples/ezbeq_10x10_custom.yml @@ -0,0 +1,28 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp + descriptor: + name: 10x10 + fs: 48000 + routes: + - side: input + channels: + - 0 + - 1 + - 2 + - 3 + biquads: 6 + - side: output + channels: + - 0 + biquads: 6 + beq: + - 3 + - 4 + - 5 +port: 8080 diff --git a/examples/ezbeq_10x10_xo.yml b/examples/ezbeq_10x10_xo.yml new file mode 100644 index 0000000..6212a0f --- /dev/null +++ b/examples/ezbeq_10x10_xo.yml @@ -0,0 +1,11 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp + device_type: 10x10 + use_xo: true +port: 8080 diff --git a/examples/ezbeq_2x4_custom.yml b/examples/ezbeq_2x4_custom.yml new file mode 100644 index 0000000..4a1b8d2 --- /dev/null +++ b/examples/ezbeq_2x4_custom.yml @@ -0,0 +1,27 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp + wsDeviceId: 1 + descriptor: + name: 2x4 + fs: 96000 + routes: + - name: input + biquads: 10 + channels: [0] + slots: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + - name: crossover + biquads: 4 + channels: [0, 1, 2, 3] + slots: [] + groups: [0, 1] + - name: output + biquads: 10 + channels: [0, 1, 2, 3] + slots: [] +port: 8080 diff --git a/examples/ezbeq_4x10.yml b/examples/ezbeq_4x10.yml new file mode 100644 index 0000000..577950a --- /dev/null +++ b/examples/ezbeq_4x10.yml @@ -0,0 +1,10 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp + device_type: 4x10 +port: 8080 diff --git a/examples/ezbeq_cdsp.yml b/examples/ezbeq_cdsp.yml new file mode 100644 index 0000000..0c56b37 --- /dev/null +++ b/examples/ezbeq_cdsp.yml @@ -0,0 +1,10 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + channels: + - 0 + ip: 127.0.0.1 + port: 5432 + type: camilladsp +port: 8080 diff --git a/examples/ezbeq_ddrc24.yml b/examples/ezbeq_ddrc24.yml new file mode 100644 index 0000000..9752ab1 --- /dev/null +++ b/examples/ezbeq_ddrc24.yml @@ -0,0 +1,10 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp + device_type: DDRC24 +port: 8080 diff --git a/examples/ezbeq_ddrc88.yml b/examples/ezbeq_ddrc88.yml new file mode 100644 index 0000000..2bd14d9 --- /dev/null +++ b/examples/ezbeq_ddrc88.yml @@ -0,0 +1,19 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp + device_type: DDRC88 + sw_channels: + - 0 + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 +port: 8080 diff --git a/examples/ezbeq_htp1.yml b/examples/ezbeq_htp1.yml new file mode 100644 index 0000000..fc09e8b --- /dev/null +++ b/examples/ezbeq_htp1.yml @@ -0,0 +1,11 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + channels: + - sub1 + - sub2 + ip: 127.0.0.1:1880 + type: htp1 + autoclear: true +port: 8080 diff --git a/examples/ezbeq_mc.yml b/examples/ezbeq_mc.yml new file mode 100644 index 0000000..8479b2d --- /dev/null +++ b/examples/ezbeq_mc.yml @@ -0,0 +1,15 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + address: 127.0.0.29:63412 + auth: + pass: mypass + user: myuser + block: 2 + channels: + - SL + - SW + type: jriver + zone: Player +port: 8080 diff --git a/examples/ezbeq_md.yml b/examples/ezbeq_md.yml new file mode 100644 index 0000000..76c95d3 --- /dev/null +++ b/examples/ezbeq_md.yml @@ -0,0 +1,9 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp +port: 8080 diff --git a/examples/ezbeq_md2.yml b/examples/ezbeq_md2.yml new file mode 100644 index 0000000..fe2f291 --- /dev/null +++ b/examples/ezbeq_md2.yml @@ -0,0 +1,16 @@ +accessLogging: false +debugLogging: false +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '--tcp 127.0.0.1:5333' + type: minidsp + wsDeviceId: 0 + dsp2: + cmdTimeout: 10 + exe: minidsp + options: '--tcp 127.0.0.1:5334' + type: minidsp + wsDeviceId: 1 +port: 8080 diff --git a/examples/ezbeq_multi.yml b/examples/ezbeq_multi.yml new file mode 100644 index 0000000..359e9e0 --- /dev/null +++ b/examples/ezbeq_multi.yml @@ -0,0 +1,36 @@ +accessLogging: false +debugLogging: true +devices: + cinema: + address: 127.0.0.29:63412 + auth: + pass: mypass + user: myuser + block: 2 + channels: + - SL + - SW + type: jriver + zone: Films + games: + address: 127.0.0.17:52199 + auth: + pass: mypass + user: myuser + block: 2 + channels: + - SW + type: jriver + zone: Player + proc: + channels: + - sub1 + - sub2 + ip: 127.0.0.1:1880 + type: htp1 + tactile: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp +port: 8080 diff --git a/examples/ezbeq_qsys.yml b/examples/ezbeq_qsys.yml new file mode 100644 index 0000000..92b76a7 --- /dev/null +++ b/examples/ezbeq_qsys.yml @@ -0,0 +1,15 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + ip: 127.0.0.17 + port: 1710 + content_info: + - BEQ_Text: + text.1: filters + text.2: title + text.3: overview + text.4: mv_adjust + type: qsys + zone: Player +port: 8080 diff --git a/examples/ezbeq_shd.yml b/examples/ezbeq_shd.yml new file mode 100644 index 0000000..e09e2f6 --- /dev/null +++ b/examples/ezbeq_shd.yml @@ -0,0 +1,10 @@ +accessLogging: false +debugLogging: true +devices: + dsp1: + cmdTimeout: 10 + exe: minidsp + options: '' + type: minidsp + device_type: SHD +port: 8080 diff --git a/ezbeq/config.py b/ezbeq/config.py index 8b9846d..6b0f0c1 100644 --- a/ezbeq/config.py +++ b/ezbeq/config.py @@ -14,11 +14,8 @@ def __init__(self, name, default_port=8080, beqcatalogue_url='https://raw.github self._name = name self.logger = logging.getLogger(name + '.config') self.config = self.load_config() - self.icon_path = self.config.get('iconPath') - self.__hostname = self.config.get('host', self.default_hostname) self.__port = self.config.get('port', default_port) self.__enable_metrics = self.config.get('metrics', False) - self.__service_url = f"http://{self.hostname}:{self.port}" self.__beqcatalogue_url = beqcatalogue_url self.__catalogue_refresh_interval = self.config.get('catalogueRefreshSeconds', 300.0) if 'catalogueUrl' in self.config: @@ -52,11 +49,6 @@ def beqcatalogue_url(self) -> str: def catalogue_refresh_interval(self) -> float: return self.__catalogue_refresh_interval - @property - def default_hostname(self): - import socket - return socket.getfqdn() - @property def is_debug_logging(self): """ @@ -71,13 +63,6 @@ def is_access_logging(self): """ return self.config.get('accessLogging', False) - @property - def hostname(self): - """ - :return: the host the device is running on, defaults to that found by a call to socket.getfqdn() - """ - return self.__hostname - @property def port(self): """ @@ -85,13 +70,6 @@ def port(self): """ return self.__port - @property - def service_url(self): - """ - :return: the address on which this service is listening. - """ - return self.__service_url - @property def ignore_retcode(self): return self.config.get('ignoreRetcode', False) @@ -138,14 +116,10 @@ def load_default_config(self): Creates a default config bundle. :return: the bundle. """ - from pathlib import Path return { - 'debug': True, 'debugLogging': True, 'accessLogging': False, 'port': 8080, - 'host': self.default_hostname, - 'iconPath': str(Path.home()), 'devices': { 'master': { 'type': 'minidsp', diff --git a/ezbeq/main.py b/ezbeq/main.py index dcf0e58..6ba8905 100644 --- a/ezbeq/main.py +++ b/ezbeq/main.py @@ -129,7 +129,6 @@ def __init__(self): else: logger.error(f'No UI available in {uiRoot}') self.metrics = None - self.icons = static.File(cfg.icon_path) ws_server.factory.startFactory() self.ws_resource = WebSocketResource(ws_server.factory) @@ -156,8 +155,6 @@ def getChild(self, path, request): return self.wsgi elif path == b'static': return self.static - elif path == b'icons': - return self.icons elif path == b'metrics' and cfg.enable_metrics: from prometheus_client.twisted import MetricsResource if not self.metrics: diff --git a/pyproject.toml b/pyproject.toml index d475fe9..41d2df8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ezbeq" -version = "2.0.5" +version = "2.0.6" description = "A webapp which can send beqcatalogue filters to a DSP device" authors = ["3ll3d00d "] license = "MIT" diff --git a/tests/conftest.py b/tests/conftest.py index 72066f2..5551e09 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -258,12 +258,9 @@ def load_catalogue_at_startup(self): def load_config(self): vals = { - 'debug': False, 'debugLogging': False, 'accessLogging': False, 'port': 8080, - 'host': self.default_hostname, - 'iconPath': str(Path.home()), 'devices': { 'master': { 'type': 'minidsp', @@ -385,12 +382,9 @@ def load_catalogue_at_startup(self): def load_config(self): vals = { - 'debug': False, 'debugLogging': False, 'accessLogging': False, 'port': 8080, - 'host': self.default_hostname, - 'iconPath': str(Path.home()), 'devices': { 'master': { 'type': 'camilladsp',