feat: playback proxy

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/integration.yml

@@ -1,8 +1,8 @@
 name: Integration Test
 
 on:
-  schedule:
-    - cron: "0 0 * * 0" # weekly
+  # schedule:
+  #   - cron: "0 0 * * 0" # weekly
   push:
   pull_request:
     types: [opened, synchronize]
@@ -13,33 +13,36 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, "3.10", 3.11]
+      matrix:
+        python-version: [3.12, 3.13, 3.14]
         mopidy-version: [3.3, 3.4, "git"]
       # Run all the matrix jobs, even if one fails.
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Install Mopidy system-wide
-        run: sudo apt update && sudo apt install mopidy libgirepository1.0-dev mpc
-      - name: Install Poetry
-        uses: abatilo/actions-poetry@v2
-      - name: Set up Python
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'poetry'
+          enable-cache: true
+          cache-suffix: ${{ matrix.python-version }}
+
+      - name: Install Mopidy system-wide
+        run: sudo apt update && sudo apt install mopidy libgirepository1.0-dev mpc
+
       - name: Correct mopidy version
         run: |
           if [ ${{ matrix.mopidy-version }} != "git" ]; then
-            poetry add mopidy@${{ matrix.mopidy-version }}
+            uv add mopidy==${{ matrix.mopidy-version }}
           else
-            poetry add "git+https://github.com/mopidy/mopidy.git"
+            uv add "mopidy @ git+https://github.com/mopidy/mopidy.git"
           fi
-          poetry show
+          uv pip show mopidy
       - name: Install mopidy-tidal
         run: |
-          rm poetry.lock
-          poetry install --with complete
+          uv sync --group test
+
       - name: Integration test
         run: make integration-test

.github/workflows/integration_test.yml

@@ -0,0 +1,61 @@
+name: Integration Test
+
+on:
+  schedule:
+    - cron: "0 0 * * 0" # weekly
+  push:
+  pull_request:
+    types: [opened, synchronize]
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # TODO bring back 3.12 for non-git. Should expand the cartesian product ourselves.
+        python-version: [3.13, 3.14]
+        mopidy-version: [3.3, 3.4] #, "git"]
+      # Run all the matrix jobs, even if one fails.
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+          cache-suffix: ${{ matrix.python-version }}-${{ matrix.mopidy-version }}
+
+      - name: Install Mopidy system-wide
+        run: |
+          sudo apt update
+          sudo apt install mopidy libgirepository1.0-dev mpc \
+            build-essential python3-dev python3-pip \
+            gir1.2-gst-plugins-base-1.0 \
+            gir1.2-gstreamer-1.0 \
+            gstreamer1.0-plugins-good \
+            gstreamer1.0-plugins-ugly \
+            gstreamer1.0-tools \
+            libcairo2-dev \
+            libgirepository-2.0-dev \
+            python3-gst-1.0
+
+
+
+      - name: Correct mopidy version
+        run: |
+          if [ ${{ matrix.mopidy-version }} != "git" ]; then
+            uv add mopidy==${{ matrix.mopidy-version }}
+          else
+            uv add "mopidy @ git+https://github.com/mopidy/mopidy.git"
+          fi
+          uv pip show mopidy
+      - name: Install mopidy-tidal
+        run: |
+          uv sync --group complete
+
+      - name: Integration test
+        run: make integration-test

.github/workflows/test.yml

@@ -11,30 +11,34 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, "3.10", 3.11]
+        python-version: [3.13, 3.14]
       # Run all the matrix jobs, even if one fails.
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Install Poetry
-        uses: abatilo/actions-poetry@v2
-      - name: Set up Python
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'poetry'
+          enable-cache: true
+          cache-suffix: ${{ matrix.python-version }}
+
       - name: Install mopidy-tidal
         run: |
-          poetry install
+          uv sync
+
       - name: Lint
         run: |
           make lint
+
       - name: Test
         run: |
           make test
+
       - name: Upload coverage
-        if: ${{ matrix.python-version  == '3.10' }}
+        if: ${{ matrix.python-version  == '3.12' }}
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -174,3 +174,4 @@ poetry.toml
 pyrightconfig.json
 
 # End of https://www.toptal.com/developers/gitignore/api/python
+/.direnv/

DEVELOPMENT.md

@@ -35,13 +35,16 @@ something is supposed to work is probably to have a look at the tests.
 
 
 ### Code Style
-Code should be formatted with `isort` and `black`:
+Code should be formatted with `ruff`:
 
 ```bash
-isort --profile=black mopidy_tidal tests
-black mopidy_tidal tests
+ruff format
 ```
 
+Additionally, run `ruff check` and clean up or `#noqa` its suggestions.  You may
+want to use `ruff check --fix`, potentially after staging so you can see the
+difference.
+
 if you are on *nix you can run:
 
 ```bash
@@ -107,4 +110,4 @@ by design of entering the venv permanently from within the makefile.)
 
 
 In either case, run `mopidy` inside the virtualenv to launch mopidy with your
-development version of Mopidy-Tidal.
+development version of Mopidy-Tidal.

flake.nix

@@ -0,0 +1,60 @@
+{
+  description = "gstreamer proxy";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+    ...
+  }:
+    flake-utils.lib.eachDefaultSystem
+    (
+      system: let
+        pkgs = import nixpkgs {
+          inherit system;
+        };
+        python = pkgs.python313;
+        buildInputs =
+          (with pkgs; [
+            (python.withPackages (ps:
+              with ps; [
+                gst-python
+                pygobject3
+              ]))
+            uv
+            pre-commit
+            ruff
+            mopidy # for its build inputs: it would be nice to do this properly, but I can't seem to get network playing to work
+            gobject-introspection
+            mpc # integration tests
+          ])
+          ++ (with pkgs.gst_all_1; [
+            pkgs.glib-networking
+            gst-plugins-bad
+            gst-plugins-base
+            gst-plugins-good
+            gst-plugins-ugly
+            gst-plugins-rs
+          ]);
+        env = {
+          UV_PROJECT_ENVIRONMENT = ".direnv/venv";
+        };
+      in
+        with pkgs; {
+          devShells.default = mkShell {
+            inherit buildInputs;
+            inherit env;
+            shellHook = ''
+              # pre-commit install
+              [ ! -d $UV_PROJECT_ENVIRONMENT ] && uv venv $UV_PROJECT_ENVIRONMENT --python ${python}/bin/python
+              source $UV_PROJECT_ENVIRONMENT/bin/activate
+            '';
+          };
+        }
+    );
+}

integration_tests/config/basic.conf

@@ -1,2 +1,3 @@
 [tidal]
-quality=LOSSLESS
+quality=LOSSLESS
+login_method=BLOCK

integration_tests/test_config.py

@@ -1,26 +1,36 @@
+from pathlib import Path
+
 import pytest
 
+from .util import mopidy
+
 
-def test_basic_config_loads_tidal_generates_auth_url(spawn, config_dir):
-    config = config_dir / "basic.conf"
-    with spawn(f"mopidy --config {config.resolve()}") as child:
-        child.expect("Connecting to TIDAL... Quality = LOSSLESS")
-        child.expect("Visit https://link.tidal.com/.* to log in")
+def test_basic_config_loads_tidal_generates_auth_url(
+    spawn, config_dir: Path, tmp_path: Path
+):
+    with spawn(mopidy(config_dir, "basic.conf", tmp_path)) as child:
+        child.expect("Quality: LOSSLESS")
+        child.expect("Authentication: OAuth")
+        child.expect("Please visit.*https://link.tidal.com/.* to authenticate")
 
 
-def test_lazy_config_no_connect_to_tidal(spawn, config_dir):
-    config = config_dir / "lazy.conf"
-    with spawn(f"mopidy --config {config.resolve()}") as child:
-        child.expect("Connecting to TIDAL... Quality = LOSSLESS")
+def test_lazy_config_no_connect_to_tidal(spawn, config_dir: Path, tmp_path: Path):
+    with spawn(mopidy(config_dir, "lazy.conf", tmp_path)) as child:
+        child.expect("Quality: LOSSLESS")
+        child.expect("Authentication: OAuth")
         with pytest.raises(AssertionError):
-            child.expect("Visit https://link.tidal.com/.* to log in")
+            child.expect("Please visit.*https://link.tidal.com/.* to authenticate")
 
 
-def test_lazy_config_generates_auth_url_on_access(spawn, config_dir):
-    config = config_dir / "lazy.conf"
-    with spawn(f"mopidy --config {config.resolve()}") as child:
-        child.expect("Connecting to TIDAL... Quality = LOSSLESS")
+def test_lazy_config_generates_auth_url_on_access(
+    spawn, config_dir: Path, tmp_path: Path
+):
+    with spawn(mopidy(config_dir, "lazy.conf", tmp_path)) as child:
+        child.expect("Quality: LOSSLESS")
+        child.expect("Authentication: OAuth")
+
         with pytest.raises(AssertionError):
-            child.expect("Visit https://link.tidal.com/.* to log in")
+            child.expect("Please visit.*https://link.tidal.com/.* to authenticate")
+
         with spawn("mpc list artist"):
-            child.expect("Visit https://link.tidal.com/.* to log in")
+            child.expect("Not logged in.* visit https://link.tidal.com/.*")