Merge pull request #53 from GoXLR-on-Linux/dev-0.10.1

Dev 0.10.1

Author: FrostyCoolSlug

audio/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-audio"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-client"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 build = "build.rs"
 authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]

daemon/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-daemon"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]
 description = "Allows control of a TC-Helicon GoXLR or GoXLR Mini, by maintaining an interaction with it over USB in the background."
@@ -47,7 +47,9 @@ json-patch = "0.3.0"
 ## HTTPd Server
 actix = "0.13.0"
 actix-web-actors = "4.1.0"
-actix-web = "4.2.1"
+
+# All we really need from actix-web are macros and compression, TLS and cookies aren't required
+actix-web = { version = "4.2.1", default-features = false, features = ["macros", "compress-brotli", "compress-gzip" ] }
 actix-cors = "0.6.4"
 mime_guess = "2.0.4"
 include_dir = "0.7.3"
@@ -63,18 +65,18 @@ rand = "0.8.5"
 
 # Under Windows and MacOS, we use tao's tray feature
 [target.'cfg(target_os = "windows")'.dependencies]
-tao = { version = "0.15.8", features=["tray"] }
+tao = { version = "0.15.8", features = ["tray"] }
 image = "0.24.5"
 sysinfo = "0.27.1"
 winrt-notification = "0.5.1"
 winreg = "0.10.1"
 mslnk = "0.1.8"
 dunce = "1.0.3"
 win-win = "0.1.1"
-winapi = { version = "0.3.9", features=["winuser"]}
+winapi = { version = "0.3.9", features = ["winuser"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-tao = { version = "0.15.8", features=["tray"] }
+tao = { version = "0.15.8", features = ["tray"] }
 image = "0.24.5"
 
 [build-dependencies]
@@ -92,15 +94,11 @@ assets = [
     ["../target/release/goxlr-client", "usr/bin/", "755"],
     ["../target/release/goxlr-defaults", "usr/bin/", "755"],
     ["../target/release/goxlr-launcher", "usr/bin/", "755"],
-
     ["../50-goxlr.rules", "etc/udev/rules.d/", "644"],
-
     ["../daemon/resources/goxlr-utility.png", "usr/share/icons/hicolor/48x48/apps/", "644"],
     ["../daemon/resources/goxlr-utility-large.png", "usr/share/pixmaps/goxlr-utility.png", "644"],
     ["../daemon/resources/goxlr-utility.svg", "usr/share/icons/hicolor/scalable/apps/", "644"],
-
     ["../daemon/resources/goxlr-utility.desktop", "usr/share/applications/", "644"],
-
     ["../deployment/deb/goxlr-client.bash", "usr/share/bash-completion/completions/", "644"],
     ["../deployment/deb/goxlr-client.fish", "usr/share/fish/vendor_completions.d/", "644"],
     ["../deployment/deb/_goxlr-client", "usr/share/zsh/vendor-completions/", "644"],
@@ -115,7 +113,6 @@ depends = "$auto"
 extended-description = """\
 A utility for monitoring and controlling a TC-Helicon GoXLR or GoXLR Mini.
 """
-revision = "1"
 
 ## cargo generate-rpm support..
 [package.metadata.generate-rpm]
@@ -125,22 +122,17 @@ assets = [
     { source = "../target/release/goxlr-client", dest = "/usr/bin/goxlr-client", mode = "0755" },
     { source = "../target/release/goxlr-defaults", dest = "/usr/bin/goxlr-defaults", mode = "0755" },
     { source = "../target/release/goxlr-launcher", dest = "/usr/bin/goxlr-launcher", mode = "0755" },
-
     { source = "../50-goxlr.rules", dest = "/etc/udev/rules.d/50-goxlr.rules", mode = "0644" },
-
     { source = "../daemon/resources/goxlr-utility.png", dest = "/usr/share/icons/hicolor/48x48/apps/goxlr-utility.png", mode = "0644" },
     { source = "../daemon/resources/goxlr-utility-large.png", dest = "/usr/share/pixmaps/goxlr-utility.png", mode = "0644" },
     { source = "../daemon/resources/goxlr-utility.svg", dest = "/usr/share/icons/hicolor/scalable/apps/goxlr-utility.svg", mode = "0644" },
-
     { source = "../daemon/resources/goxlr-utility.desktop", dest = "/usr/share/applications/goxlr-utility.desktop", mode = "0644" },
-
     { source = "../deployment/deb/goxlr-client.bash", dest = "/usr/share/bash-completion/completions/goxlr-client.bash", mode = "0644" },
     { source = "../deployment/deb/goxlr-client.fish", dest = "/usr/share/fish/vendor_completions.d/goxlr-client.fish", mode = "0644" },
     { source = "../deployment/deb/_goxlr-client", dest = "/usr/share/zsh/vendor-completions/_goxlr-client", mode = "0644" },
     { source = "../deployment/deb/goxlr-daemon.bash", dest = "/usr/share/bash-completion/completions/goxlr-daemon.bash", mode = "0644" },
     { source = "../deployment/deb/goxlr-daemon.fish", dest = "/usr/share/fish/vendor_completions.d/goxlr-daemon.fish", mode = "0644" },
     { source = "../deployment/deb/_goxlr-daemon", dest = "/usr/share/zsh/vendor-completions/_goxlr-daemon", mode = "0644" },
-
 ]
 
 # Tiny scriptlet, should reload udev.
@@ -149,7 +141,7 @@ udevadm control --reload-rules
 udevadm trigger
 """
 
-release = "1"
+#release = "1"
 
 # Because we build under Ubuntu in CI, generate-rpm is unable to calculate the dependencies required (no access
 # to rpm / yum), so we need to disable the auto and specify dependencies manually.

daemon/web-content/css/app.f4c2f69e.css daemon/web-content/css/app.f8d85e9a.cssdaemon/web-content/css/app.f4c2f69e.css renamed to daemon/web-content/css/app.f8d85e9a.css

@@ -1,4 +1,4 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>GoXLR Utility</title><script defer="defer" src="/js/chunk-vendors.26d4d4e6.js"></script><script defer="defer" src="/js/app.cfa6141b.js"></script><link href="/css/app.f4c2f69e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but goxlr-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><canvas id="wheelCanvas" style="position: absolute; top: -140px; left: -140px; width: 130px; height: 130px"></canvas><div id="colourHover" style="position: absolute; top: -20px; left: -20px; width: 20px; height: 20px; border: 2px solid #fff; border-radius: 50%; box-shadow: 0 5px 10px rgba(0,0,0,0.5); background-color: #fff; pointer-events: none;"></div><div id="app"></div><script>window.onload = function(){
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>GoXLR Utility</title><script defer="defer" src="/js/chunk-vendors.26d4d4e6.js"></script><script defer="defer" src="/js/app.e5c13eec.js"></script><link href="/css/app.f8d85e9a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but goxlr-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><canvas id="wheelCanvas" style="position: absolute; top: -140px; left: -140px; width: 130px; height: 130px"></canvas><div id="colourHover" style="position: absolute; top: -20px; left: -20px; width: 20px; height: 20px; border: 2px solid #fff; border-radius: 50%; box-shadow: 0 5px 10px rgba(0,0,0,0.5); background-color: #fff; pointer-events: none;"></div><div id="app"></div><script>window.onload = function(){
           let canvas = document.getElementById('wheelCanvas');
           let context = canvas.getContext('2d');
           let img = new Image();

daemon/web-content/index.html

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-defaults"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

daemon/web-content/js/app.cfa6141b.js.map

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-initialiser"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]
 description = "Finds, checks and initialises any unconfigured GoXLR devices"