WIP

.gitea/pull_request_template.md

@@ -0,0 +1 @@
+![]()

.gitea/workflows/build-and-test.yml

@@ -81,10 +81,14 @@ jobs:
         run: markdown-test-report target/test-report/test-report.json --output target/test-report/test-report.md
 
       - name: Upload test report
-        uses: actions/upload-artifact@v3
+        uses: https://git.pvv.ntnu.no/oysteikt/rsync-action@main
         with:
-          name: test-report.md
+          source: target/test-report/test-report.md
-          path: target/test-report/test-report.md
+          target: mpvipc/${{ gitea.ref_name }}/
+          username: oysteikt
+          ssh-key: ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }}
+          host: microbel.pvv.ntnu.no
+          known-hosts: "microbel.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="
 
       - name: Install grcov
         run: cargo binstall -y grcov
@@ -107,8 +111,62 @@ jobs:
             -o ./target/coverage/html \
             target/coverage/
 
-      - name: Upload coverage report
+      - name: Upload test report
-        uses: actions/upload-artifact@v3
+        uses: https://git.pvv.ntnu.no/oysteikt/rsync-action@main
         with:
-          name: coverage
+          source: target/coverage/html/
-          path: target/coverage/html
+          target: mpvipc/${{ gitea.ref_name }}/coverage/
+          username: oysteikt
+          ssh-key: ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }}
+          host: microbel.pvv.ntnu.no
+          known-hosts: "microbel.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="
+
+  docs:
+    runs-on: ubuntu-latest-personal
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install latest nightly toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+            toolchain: nightly
+            override: true
+
+      - name: Cache dependencies
+        uses: Swatinem/rust-cache@v2
+
+      - name: Build docs
+        run: cargo doc --all-features --document-private-items --release
+
+      - name: Transfer files
+        uses: https://git.pvv.ntnu.no/oysteikt/rsync-action@main
+        with:
+          source: target/doc/
+          target: mpvipc/${{ gitea.ref_name }}/docs/
+          username: oysteikt
+          ssh-key: ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }}
+          host: microbel.pvv.ntnu.no
+          known-hosts: "microbel.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="
+
+    # ssh-key: ${{ secrets.SSH_KEY }}
+    #   - name: Install rsync
+    #     run: apt-get update && apt-get install -y rsync
+
+    #   - name: Install SSH key
+    #     run: |
+    #       mkdir -p ~/.ssh
+    #       cat <<EOF >~/.ssh/key
+    #       ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }}
+    #       EOF
+    #       chmod 600 ~/.ssh/key
+
+    #   - name: Deploy docs
+    #     run: |
+    #       rsync \
+    #         --archive \
+    #         --compress \
+    #         --verbose \
+    #         --mkpath \
+    #         --rsh="ssh -oBatchMode=yes -oStrictHostKeyChecking=accept-new -i ~/.ssh/key" \
+    #         "target/doc/" \
+    #         "oysteikt@microbel.pvv.ntnu.no:mpvipc/${{ gitea.ref_name }}/docs/"

.gitea/workflows/build-docs.yml

@@ -32,7 +32,7 @@ jobs:
           EOF
           chmod 600 ~/.ssh/key
 
-      - name: Deploy docs to https://pvv.ntnu.no/~oysteikt/mpvipc/${{ gitea.ref_name }}/
+      - name: Deploy docs
         run: |
           rsync \
             --archive \
@@ -41,4 +41,4 @@ jobs:
             --mkpath \
             --rsh="ssh -oBatchMode=yes -oStrictHostKeyChecking=accept-new -i ~/.ssh/key" \
             "target/doc/" \
-            "oysteikt@microbel.pvv.ntnu.no:mpvipc/${{ gitea.ref_name }}/"
+            "oysteikt@microbel.pvv.ntnu.no:mpvipc/${{ gitea.ref_name }}/docs/"

src/event_parser.rs

@@ -88,8 +88,7 @@ pub(crate) fn parse_event(raw_event: MpvIpcEvent) -> Result<Event, Error> {
                 "metadata-update" => Ok(Event::MetadataUpdate),
                 "seek" => Ok(Event::Seek),
                 "playback-restart" => Ok(Event::PlaybackRestart),
-                "property-change" => parse_event_property(event)
+                "property-change" => parse_event_property(event).map(|(id, property)| Event::PropertyChange { id, property }),
-                    .and_then(|(id, property)| Ok(Event::PropertyChange { id, property })),
                 "chapter-change" => Ok(Event::ChapterChange),
                 "client-message" => {
                     let args = event