Statically link VCRuntime for MSVC

.github/workflows/release.yml

@@ -23,15 +23,12 @@ jobs:
             # 22.04 is the earliest version with OpenSSL 3
             image: ubuntu-22.04
             build_name: linux
-            rustflags:
           - target: x86_64-pc-windows-msvc
             image: windows-latest
             build_name: windows
-            rustflags: -C target-feature=+crt-static
     runs-on: ${{ matrix.image }}
     env:
       TARGET: ${{ matrix.target }}
-      RUSTFLAGS: ${{ matrix.rustflags }}
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies for Ubuntu
@@ -59,3 +56,15 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: target/${{ matrix.target }}/release/aw-watcher-media-player-${{ matrix.build_name }}.zip
+
+      - run: cargo install cargo-deb
+        if: ${{ contains(matrix.image, 'ubuntu') }}
+      - run: cargo deb
+        if: ${{ contains(matrix.image, 'ubuntu') }}
+      - name: Upload deb to release
+        if: ${{ contains(matrix.image, 'ubuntu') }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file_glob: true
+          file: target/debian/aw-*.deb

Cargo.toml

@@ -3,7 +3,8 @@ name = "aw-watcher-media-player"
 authors = ["Demmie <[email protected]>"]
 version = "1.0.0"
 edition = "2021"
-description = "A cross-platform watcher to send currently playing media to ActivityWatch."
+description = "A cross-platform watcher to report currently playing media to ActivityWatch."
+license-file = "LICENSE"
 
 [dependencies]
 aw-client-rust = { git = "https://github.com/ActivityWatch/aw-server-rust", rev = "448312d" }
@@ -21,6 +22,9 @@ clap-verbosity-flag = "2.1.0"
 tokio = { version = "1.34.0", features = ["time", "macros", "signal"] }
 dirs = "5.0.1"
 
+[target.'cfg(target_env = "msvc")'.build-dependencies]
+static_vcruntime = { version = "2.0" }
+
 [target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
 mpris = "2.0.1"
 
@@ -30,3 +34,6 @@ features = [
 	"Foundation",
 	"Media_Control",
 ]
+
+[package.metadata.deb]
+extended-description = "ActivityWatch must be available by the given address for this watcher to work."

README.md

@@ -11,7 +11,10 @@ such as Spotify, Foobar, browser-based players, and others. Most media players a
 | Windows       | :heavy_check_mark: Yes         |
 | MacOS         | :hourglass: Not yet supported  |
 
-Example of report for Spotify in Linux:
+<details open>
+<summary>Examples of reported data</summary>
+
+Spotify in Linux:
 ```json
 {
   "album": "How to Measure a Planet? (Deluxe Edition)",
@@ -29,6 +32,25 @@ Firefox in Linux (no plugins):
     "title": "🇺🇦 🇵🇱 Гей, соколи! / Hej, sokoły! – Ukrainian/Polish folk song"
 }
 ```
+MS Edge in Windows:
+```json
+{
+  "artist": "Bel Canto Choir Vilnius",
+  "player": "MSEdge",
+  "title": "Shchedryk (Carol of the Bells) – Bel Canto Choir Vilnius"
+}
+```
+Default Windows player
+```json
+{
+  "album": "Zemlya",
+  "artist": "Okean Elzy",
+  "player": "Microsoft.ZuneMusic_8wekyb3d8bbwe!Microsoft.ZuneMusic",
+  "title": "Obijmy"
+}
+```
+
+</details>
 
 ## Configuration
 

build.rs

@@ -0,0 +1,4 @@
+fn main() {
+    #[cfg(target_env = "msvc")]
+    static_vcruntime::metabuild();
+}

src/main.rs

@@ -51,6 +51,8 @@ async fn main() -> anyhow::Result<()> {
             if let Some(data) = data {
                 if config.report_player(&data.player) {
                     watcher.send_active_window(&data).await.unwrap();
+                } else {
+                    trace!("Player \"{}\" is filtered out", data.player);
                 }
             }
         }

src/platform/linux.rs

@@ -49,6 +49,15 @@ fn mediadata(player_finder: &PlayerFinder) -> Option<MediaData> {
     let player = player_finder.find_active().ok()?;
 
     if player.get_playback_status().ok()? != PlaybackStatus::Playing {
+        trace!(
+            "Player {} is not playing with status {}",
+            player.bus_name(),
+            player
+                .get_playback_status()
+                .map(|status| format!("{status:?}"))
+                .unwrap_or("not found".to_string())
+        );
+
         return None;
     }
 

src/watcher.rs

@@ -8,6 +8,7 @@ use chrono::Utc;
 use super::config::Config;
 
 const BUCKET_NAME: &str = env!("CARGO_PKG_NAME");
+const TCP_ERROR: &str = "tcp connect error: Connection refused";
 
 pub struct Watcher {
     client: AwClient,
@@ -27,10 +28,25 @@ impl Watcher {
     }
 
     pub async fn init(&self) -> anyhow::Result<()> {
-        self.client
-            .create_bucket_simple(&self.bucket_name, "currently-playing")
-            .await
-            .with_context(|| format!("Failed to create bucket {}", self.bucket_name))
+        let mut interval = tokio::time::interval(tokio::time::Duration::from_secs(1));
+        let mut attempts = 0;
+        loop {
+            let f = self
+                .client
+                .create_bucket_simple(&self.bucket_name, "currently-playing");
+            match f.await {
+                Ok(val) => return Ok(val),
+                Err(e) if attempts < 3 && e.to_string().contains(TCP_ERROR) => {
+                    warn!("Failed to connect, retrying: {}", e);
+
+                    attempts += 1;
+                    interval.tick().await;
+                }
+                Err(e) => {
+                    return Err(e).context(format!("Failed to create bucket {}", self.bucket_name))
+                }
+            }
+        }
     }
 
     pub async fn send_active_window(&self, data: &MediaData) -> anyhow::Result<()> {