From e486e00d87dc2ce55d07cf6422e3d1f372e159fe Mon Sep 17 00:00:00 2001 From: h7x4 Date: Wed, 1 May 2024 13:37:51 +0200 Subject: [PATCH] WIP --- .gitea/assets/test-results.css | 0 .gitea/pull_request_template.md | 1 + .gitea/workflows/build-and-test.yml | 72 ++++++++++++++++++++++++++--- .gitea/workflows/build-docs.yml | 4 +- src/event_parser.rs | 3 +- 5 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 .gitea/assets/test-results.css create mode 100644 .gitea/pull_request_template.md diff --git a/.gitea/assets/test-results.css b/.gitea/assets/test-results.css new file mode 100644 index 0000000..e69de29 diff --git a/.gitea/pull_request_template.md b/.gitea/pull_request_template.md new file mode 100644 index 0000000..e30561f --- /dev/null +++ b/.gitea/pull_request_template.md @@ -0,0 +1 @@ +![]() \ No newline at end of file diff --git a/.gitea/workflows/build-and-test.yml b/.gitea/workflows/build-and-test.yml index 518b287..589db12 100644 --- a/.gitea/workflows/build-and-test.yml +++ b/.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 - path: target/test-report/test-report.md + source: 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 - uses: actions/upload-artifact@v3 + - name: Upload test report + uses: https://git.pvv.ntnu.no/oysteikt/rsync-action@main with: - name: coverage - path: target/coverage/html + source: 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 <~/.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/" \ No newline at end of file diff --git a/.gitea/workflows/build-docs.yml b/.gitea/workflows/build-docs.yml index 8f27f21..f2b4e11 100644 --- a/.gitea/workflows/build-docs.yml +++ b/.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 }}/" \ No newline at end of file + "oysteikt@microbel.pvv.ntnu.no:mpvipc/${{ gitea.ref_name }}/docs/" \ No newline at end of file diff --git a/src/event_parser.rs b/src/event_parser.rs index e5ff359..4aac655 100644 --- a/src/event_parser.rs +++ b/src/event_parser.rs @@ -88,8 +88,7 @@ pub(crate) fn parse_event(raw_event: MpvIpcEvent) -> Result { "metadata-update" => Ok(Event::MetadataUpdate), "seek" => Ok(Event::Seek), "playback-restart" => Ok(Event::PlaybackRestart), - "property-change" => parse_event_property(event) - .and_then(|(id, property)| Ok(Event::PropertyChange { id, property })), + "property-change" => parse_event_property(event).map(|(id, property)| Event::PropertyChange { id, property }), "chapter-change" => Ok(Event::ChapterChange), "client-message" => { let args = event