Merge branch 'master' into wallhaven

.gitea/workflows/release.yml

@@ -0,0 +1,26 @@
+# .gitea/workflows/release.yml
+
+on:
+  push:
+    tags: 
+      - '*'
+
+jobs:
+  release:
+    name: release ${{ matrix.target }}
+    runs-on: alma9
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [x86_64-unknown-linux-musl]
+    steps:
+      - uses: actions/checkout@master
+      - name: Install deps
+        run: apt-get update; apt-get install -y libdbus-1-dev pkg-config
+      - name: Compile and release
+        uses: rust-build/rust-build.action@v1.4.5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GT_TOKEN }}
+        with:
+          RUSTTARGET: ${{ matrix.target }}
+          EXTRA_FILES: README.md

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -658,10 +658,7 @@ dependencies = [
  "glob",
  "rand",
  "reqwest",
- "serde",
- "serde_json",
  "untildify",
- "urlencoding",
 ]
 
 [[package]]
@@ -1259,6 +1256,7 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 [[package]]
 name = "untildify"
 version = "0.1.1"
+source = "git+https://git.lovelynet.net/benjamyn/untildify.git?branch=main#91e595157c9720d4fb5c50595e7f601473066de2"
 dependencies = [
  "regex",
 ]
@@ -1280,12 +1278,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
 [[package]]
 name = "utf16_iter"
 version = "1.0.5"

Cargo.toml

@@ -8,8 +8,5 @@ configparser = "3.0.4"
 dbus = "0.9.7"
 glob = "0.3.1"
 rand = "0.8.5"
+untildify = { git = "https://git.lovelynet.net/benjamyn/untildify.git", branch = "main" }
 reqwest = { version = "0.12.9", features = ["json", "blocking"] }
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.133"
-untildify = { path = "../untildify" }
-urlencoding = "2.1.3"

src/handlers/plasma.rs

@@ -30,7 +30,7 @@ pub fn change_wallpapers(wallpapers: &Wallpapers) {
 pub fn generate_js(wallpapers: &Wallpapers) -> String {
     let mut javascript = String::new();
     javascript.push_str("var allDesktops = desktops();\n");
-    for (count, monitor) in wallpapers.config.monitors.monitors.iter().enumerate() {
+    for (_count, monitor) in wallpapers.config.monitors.monitors.iter().enumerate() {
         let mut boilerplate = String::new();
         let _ = write!(
             &mut boilerplate,
@@ -44,6 +44,5 @@ pub fn generate_js(wallpapers: &Wallpapers) -> String {
         );
         javascript.push_str(&boilerplate);
     }
-    println!("{}", javascript);
     javascript
 }