Update.

can't get tnis to build!

.github/workflows/build.yml

@@ -12,20 +12,12 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v1
 
-    - name: Packages
-      run: sudo apt-get update && sudo apt-get install build-essential yasm -y
-
-    - name: Build
+    - name: Build x86
       run: |
-        cargo build --release --features=symphonia
-        strip target/release/bliss-analyser
-        mkdir releases
-        cp target/release/bliss-analyser releases/bliss-analyser
-        cp UserGuide.md releases/README.md
-        cp LICENSE releases/
-        cp configs/linux.ini releases/config.ini
+        docker build -t bliss-analyser-x86-symphonia - < docker/Dockerfile_x86_symphonia
+        docker run --rm -v $PWD/target:/build -v $PWD:/src bliss-analyser-x86-symphonia
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
@@ -33,6 +25,23 @@ jobs:
         name: bliss-analyser-linux-x86-symphonia
         path: releases/
 
+#  Linux_x86_ffmpeg:
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#    - name: Checkout
+#      uses: actions/checkout@v1
+#
+#    - name: Build x86
+#      run: |
+#        docker build -t bliss-analyser-x86-ffmpeg - < docker/Dockerfile_x86_ffmpeg
+#        docker run --rm -v $PWD/target:/build -v $PWD:/src bliss-analyser-x86-ffmpeg
+#
+#    - name: Upload artifacts
+#      uses: actions/upload-artifact@v4
+#      with:
+#        name: bliss-analyser-linux-x86-ffmpeg
+#        path: releases/
 
   Linux_x86_ffmpeg:
     runs-on: ubuntu-22.04
@@ -60,18 +69,17 @@ jobs:
         name: bliss-analyser-linux-x86-ffmpeg
         path: releases/
 
-
   Linux_arm_symphonia:
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v1
 
-    - name: Build
+    - name: Build ARM
       run: |
-        docker build --pull --no-cache -t bliss-analyser-cross - < docker/Dockerfile_Bullseye_symphonia
-        docker run --rm -v $PWD/target:/build -v $PWD:/src bliss-analyser-cross
+        docker build -t bliss-analyser-arm-symphonia - < docker/Dockerfile_arm_symphonia
+        docker run --rm -v $PWD/target:/build -v $PWD:/src bliss-analyser-arm-symphonia
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
@@ -79,18 +87,17 @@ jobs:
         name: bliss-analyser-linux-arm-symphonia
         path: releases/
 
-
   Linux_arm_ffmpeg:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v1
 
-    - name: Build ARM static-ffmpeg on Debian
+    - name: Build ARM
       run: |
-        docker build -t bliss-analyser-cross - < docker/Dockerfile_Bullseye_static
-        docker run --rm -v $PWD/target:/build -v $PWD:/src bliss-analyser-cross
+        docker build -t bliss-analyser-arm-ffmpeg - < docker/Dockerfile_arm_ffmpeg
+        docker run --rm -v $PWD/target:/build -v $PWD:/src bliss-analyser-arm-ffmpeg
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
@@ -98,7 +105,6 @@ jobs:
         name: bliss-analyser-linux-arm-ffmpeg
         path: releases/
 
-
   macOS_symphonia:
     runs-on: macos-13
 

Cargo.lock

@@ -201,7 +201,7 @@ dependencies = [
 
 [[package]]
 name = "bliss-analyser"
-version = "0.5.0"
+version = "0.5.1"
 dependencies = [
  "anyhow",
  "argparse",
@@ -221,6 +221,7 @@ dependencies = [
  "rcue",
  "regex",
  "rusqlite",
+ "serde_json",
  "substring",
  "ureq",
  "which 7.0.2",
@@ -1479,13 +1480,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.109"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bliss-analyser"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Craig Drummond <craig.p.drummond@gmail.com>"]
 edition = "2021"
 license = "GPL-3.0-only"
@@ -33,6 +33,7 @@ which = { version = "7.0.2", optional = true }
 rcue = { version = "0.1.3", optional = true }
 hhmmss = { version = "0.1.0", optional = true }
 ctrlc = "3.4"
+serde_json = "1.0.145"
 
 [features]
 libav = ["bliss-audio/ffmpeg"]

ChangeLog

@@ -1,3 +1,7 @@
+0.5.1
+-----
+1. Use serde_json to build JSONRPC notification strings.
+
 0.5.0
 -----
 1. Update to bliss-rs 0.11.1

docker/Dockerfile_Bookworm_libav

@@ -1,38 +0,0 @@
-# Cross compilation environment for bliss-analyser
-
-FROM debian:bookworm
-
-RUN dpkg --add-architecture arm64 && \
-    dpkg --add-architecture armhf
-RUN apt-get update
-
-RUN apt-get install -y curl git yasm
-RUN apt-get install -y build-essential clang
-RUN apt-get install -y crossbuild-essential-armhf crossbuild-essential-arm64
-
-RUN apt-get install -y pkg-config:arm64 \
-                       libavutil-dev:arm64 libavcodec-dev:arm64 libavformat-dev:arm64 \
-                       libavfilter-dev:arm64 libavdevice-dev:arm64 libswresample-dev:arm64 libfftw3-dev:arm64
-
-RUN apt-get install -y pkg-config:armhf \
-                       libavutil-dev:armhf libavcodec-dev:armhf libavformat-dev:armhf \
-                       libavfilter-dev:armhf libavdevice-dev:armhf libswresample-dev:armhf libfftw3-dev:armhf
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-ENV PATH="/root/.cargo/bin/:${PATH}"
-RUN rustup target add aarch64-unknown-linux-gnu && \
-    rustup target add arm-unknown-linux-gnueabihf
-
-RUN mkdir /.cargo && \
-    echo '[target.aarch64-unknown-linux-gnu]\nlinker = "aarch64-linux-gnu-gcc"' > /.cargo/config && \
-    echo '[target.arm-unknown-linux-gnueabihf]\nlinker = "arm-linux-gnueabihf-gcc"' >> /.cargo/config
-
-RUN mkdir /build
-ENV CARGO_TARGET_DIR /build
-ENV CARGO_HOME /build/cache
-
-RUN mkdir /src
-
-WORKDIR /src
-CMD ["/src/docker/docker-build-arm-libav.sh"]
-

docker/Dockerfile_Bullseye_static

@@ -1,36 +0,0 @@
-# Cross compilation environment for bliss-anlyser
-
-FROM debian:bullseye
-
-RUN dpkg --add-architecture arm64 && \
-    dpkg --add-architecture armhf
-RUN apt-get update
-
-RUN apt-get install -y curl git pkg-config yasm
-RUN apt-get install -y build-essential clang
-RUN apt-get install -y crossbuild-essential-armhf crossbuild-essential-arm64
-
-RUN apt-get install -y libavutil-dev:arm64 libavcodec-dev:arm64 libavformat-dev:arm64 \
-                       libavfilter-dev:arm64 libavdevice-dev:arm64 libswresample-dev:arm64 libfftw3-dev:arm64
-
-RUN apt-get install -y libavutil-dev:armhf libavcodec-dev:armhf libavformat-dev:armhf \
-                       libavfilter-dev:armhf libavdevice-dev:armhf libswresample-dev:armhf libfftw3-dev:armhf
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-ENV PATH="/root/.cargo/bin/:${PATH}"
-RUN rustup target add aarch64-unknown-linux-gnu && \
-    rustup target add arm-unknown-linux-gnueabihf
-
-RUN mkdir /.cargo && \
-    echo '[target.aarch64-unknown-linux-gnu]\nlinker = "aarch64-linux-gnu-gcc"' > /.cargo/config && \
-    echo '[target.arm-unknown-linux-gnueabihf]\nlinker = "arm-linux-gnueabihf-gcc"' >> /.cargo/config
-
-RUN mkdir /build
-ENV CARGO_TARGET_DIR /build
-ENV CARGO_HOME /build/cache
-
-RUN mkdir /src
-
-WORKDIR /src
-CMD ["/src/docker/docker-build-arm-staticlibav.sh"]
-

docker/Dockerfile_Ubuntu2404_libav

@@ -1,25 +0,0 @@
-# Cross compilation environment for bliss-anlyser
-
-FROM ubuntu:24.04
-
-RUN apt-get update
-
-RUN apt-get install -y curl git pkg-config
-RUN apt-get install -y build-essential yasm clang
-
-RUN apt-get install -y libavutil-dev libavcodec-dev libavformat-dev \
-                       libavfilter-dev libavdevice-dev libswresample-dev libfftw3-dev \
-                       ffmpeg
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-ENV PATH="/root/.cargo/bin/:${PATH}"
-
-RUN mkdir /build
-ENV CARGO_TARGET_DIR /build
-ENV CARGO_HOME /build/cache
-
-RUN mkdir /src
-
-WORKDIR /src
-CMD ["/src/docker/docker-build-x86-libav.sh"]
-

docker/Dockerfile_arm_ffmpeg

@@ -1,6 +1,4 @@
-# Cross compilation environment for bliss-anlyser
-
-FROM debian:bullseye
+FROM debian:bookworm
 
 RUN dpkg --add-architecture arm64 && \
     dpkg --add-architecture armhf
@@ -10,12 +8,6 @@ RUN apt-get install -y curl git pkg-config yasm
 RUN apt-get install -y build-essential clang
 RUN apt-get install -y crossbuild-essential-armhf crossbuild-essential-arm64
 
-RUN apt-get install -y libavutil-dev:arm64 libavcodec-dev:arm64 libavformat-dev:arm64 \
-                       libavfilter-dev:arm64 libavdevice-dev:arm64 libswresample-dev:arm64 libfftw3-dev:arm64
-
-RUN apt-get install -y libavutil-dev:armhf libavcodec-dev:armhf libavformat-dev:armhf \
-                       libavfilter-dev:armhf libavdevice-dev:armhf libswresample-dev:armhf libfftw3-dev:armhf
-
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 ENV PATH="/root/.cargo/bin/:${PATH}"
 RUN rustup target add aarch64-unknown-linux-gnu && \
@@ -32,5 +24,5 @@ ENV CARGO_HOME /build/cache
 RUN mkdir /src
 
 WORKDIR /src
-CMD ["/src/docker/docker-build-arm-libav.sh"]
+CMD ["/src/docker/docker-build-arm-ffmpeg.sh"]
 

docker/Dockerfile_arm_symphonia

@@ -1,6 +1,4 @@
-# Cross compilation environment for bliss-anlyser
-
-FROM debian:bullseye
+FROM debian:bookworm
 
 RUN dpkg --add-architecture arm64 && \
     dpkg --add-architecture armhf

docker/Dockerfile_x86_ffmpeg

@@ -0,0 +1,30 @@
+FROM debian:bookworm
+
+RUN dpkg --add-architecture amd64
+RUN apt-get update
+
+RUN apt-get install -y curl git pkg-config yasm
+RUN apt-get install -y build-essential clang
+
+# Download and extract musl-cross toolchain for x86_64
+RUN curl -LO https://musl.cc/x86_64-linux-musl-cross.tgz \
+    && tar -xzf x86_64-linux-musl-cross.tgz \
+    && mv x86_64-linux-musl-cross /opt/musl-toolchain \
+    && rm x86_64-linux-musl-cross.tgz
+
+ENV PATH="/opt/musl-toolchain/bin:/root/.cargo/bin:${PATH}"
+
+# Optionally, still install musl-tools (for musl-gcc wrapper, not strictly needed now)
+RUN apt-get install -y musl-tools musl-dev musl
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+RUN rustup target add x86_64-unknown-linux-musl
+
+RUN mkdir /build
+ENV CARGO_TARGET_DIR /build
+ENV CARGO_HOME /build/cache
+
+RUN mkdir /src
+
+WORKDIR /src
+CMD ["/src/docker/docker-build-x86-ffmpeg.sh"]

docker/Dockerfile_x86_symphonia

@@ -0,0 +1,22 @@
+FROM debian:bookworm
+
+RUN dpkg --add-architecture amd64
+RUN apt-get update
+
+RUN apt-get install -y curl git pkg-config yasm
+RUN apt-get install -y build-essential clang
+RUN apt-get install -y musl-tools musl-dev musl
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+ENV PATH="/root/.cargo/bin/:${PATH}"
+RUN rustup target add x86_64-unknown-linux-musl
+
+RUN mkdir /build
+ENV CARGO_TARGET_DIR /build
+ENV CARGO_HOME /build/cache
+
+RUN mkdir /src
+
+WORKDIR /src
+CMD ["/src/docker/docker-build-x86-symphonia.sh"]
+

docker/docker-build-arm-ffmpeg.sh

@@ -11,13 +11,11 @@ rm -rf $DESTDIR/bin/*
 function build {
 	echo Building for $1 to $3...
 
-	if [[ ! -f /build/$1/release/bliss-analyser ]]; then
-		export RUST_BACKTRACE=full
-		export PKG_CONFIG=${1//unknown-/}-pkg-config
-		BINDGEN_EXTRA_CLANG_ARGS="--sysroot /usr/${1//unknown-/}" cargo build --release --features=libav --target $1
-	fi
+    if [[ ! -f /build/$1/release/bliss-analyser ]]; then
+        cargo build --release --features=libav,staticlibav --target $1
+    fi
 
-	$2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3
+    $2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3
 }
 
 build arm-unknown-linux-gnueabihf arm-linux-gnueabihf-strip bin/bliss-analyser-armhf

docker/docker-build-arm-staticlibav.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-## #!/usr/bin/env bash
-set -eux
-
-uname -a
-DESTDIR=/src/releases
-
-mkdir -p $DESTDIR/bin
-rm -rf $DESTDIR/bin/*
-
-function build {
-	echo Building for $1 to $3...
-
-	if [[ ! -f /build/$1/release/bliss-analyser ]]; then
-		export RUST_BACKTRACE=full
-		export PKG_CONFIG=${1//unknown-/}-pkg-config
-		BINDGEN_EXTRA_CLANG_ARGS="--sysroot /usr/${1//unknown-/}" cargo build --release --features=libav,staticlibav --target $1
-	fi
-
-	$2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3
-}
-
-build arm-unknown-linux-gnueabihf arm-linux-gnueabihf-strip bin/bliss-analyser-armhf
-build aarch64-unknown-linux-gnu aarch64-linux-gnu-strip bin/bliss-analyser-aarch64
-
-cp UserGuide.md $DESTDIR/README.md
-cp LICENSE $DESTDIR/
-cp configs/linux.ini $DESTDIR/config.ini
-cp scripts/bliss-analyser-arm $DESTDIR/bliss-analyser

docker/docker-build-arm-symphonia.sh

@@ -11,13 +11,11 @@ rm -rf $DESTDIR/bin/*
 function build {
 	echo Building for $1 to $3...
 
-	if [[ ! -f /build/$1/release/bliss-analyser ]]; then
-		export RUST_BACKTRACE=full
-		export PKG_CONFIG=${1//unknown-/}-pkg-config
-		BINDGEN_EXTRA_CLANG_ARGS="--sysroot /usr/${1//unknown-/}" cargo build --release --features=symphonia --target $1
-	fi
+    if [[ ! -f /build/$1/release/bliss-analyser ]]; then
+        cargo build --release --features=symphonia --target $1
+    fi
 
-	$2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3
+    $2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3
 }
 
 build arm-unknown-linux-gnueabihf arm-linux-gnueabihf-strip bin/bliss-analyser-armhf

docker/docker-build-x86-ffmpeg.sh

@@ -0,0 +1,22 @@
+#!/bin/ash
+set -eux
+
+uname -a
+DESTDIR=/src/releases
+mkdir -p $DESTDIR
+
+function build {
+	echo Building for $1 to $3...
+
+    if [[ ! -f /build/$1/release/bliss-analyser ]]; then
+        cargo build --release --features=update-aubio-bindings,libav,staticlibav --target $1
+    fi
+
+    $2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3
+}
+
+build x86_64-unknown-linux-musl strip bliss-analyser
+
+cp UserGuide.md $DESTDIR/README.md
+cp LICENSE $DESTDIR/
+cp configs/linux.ini $DESTDIR/config.ini

docker/docker-build-x86-libav.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-## #!/usr/bin/env bash
-set -eux
-
-uname -a
-DESTDIR=/src/releases
-
-mkdir -p $DESTDIR/bin
-rm -rf $DESTDIR/bin/*
-
-export RUST_BACKTRACE=full
-cargo build --release --features=libav
-
-strip /build/release/bliss-analyser && cp /build/release/bliss-analyser $DESTDIR/bliss-analyser
-
-cp UserGuide.md $DESTDIR/README.md
-cp LICENSE $DESTDIR/
-cp configs/linux.ini $DESTDIR/config.ini

docker/docker-build-x86-symphonia.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+## #!/usr/bin/env bash
+set -eux
+
+uname -a
+DESTDIR=/src/releases
+mkdir -p $DESTDIR
+
+function build {
+	echo Building for $1 to $3...
+
+    if [[ ! -f /build/$1/release/bliss-analyser ]]; then
+        cargo build --release --features update-aubio-bindings,symphonia --target $1
+    fi
+
+    $2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3
+}
+
+build x86_64-unknown-linux-musl strip bliss-analyser
+
+cp UserGuide.md $DESTDIR/README.md
+cp LICENSE $DESTDIR/
+cp configs/linux.ini $DESTDIR/config.ini

src/analyse.rs

@@ -28,6 +28,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use std::thread;
 use std::sync::mpsc;
 use std::sync::mpsc::{Receiver, Sender};
+use serde_json::json;
 
 const DONT_ANALYSE: &str = ".notmusic";
 const MAX_ERRORS_TO_SHOW: usize = 100;
@@ -57,9 +58,9 @@ fn handle_ctrl_c() {
 }
 
 fn send_notif_msg(notifs: &mut NotifInfo, text: &str) {
-    let json = &format!("{{\"id\":1, \"method\":\"slim.request\",\"params\":[\"\",[\"blissmixer\",\"analyser\",\"act:update\",\"msg:{}\"]]}}", text);
+    let js = json!({"id":"1", "method":"slim.request", "params":["", ["blissmixer", "analyser", "act:update", format!("msg:{}", text)]]});
     log::info!("Sending notif to LMS: {}", text);
-    let _ = ureq::post(&notifs.address).send_string(&json);
+    let _ = ureq::post(&notifs.address).send_string(&js.to_string());
 }
 
 fn send_notif(notifs: &mut NotifInfo, text: &str) {