ext: add clipboard-rs

mpv-easy · Jun 19, 2024 · 02f26ff · 02f26ff
1 parent 93a71de
commit 02f26ff
Show file tree

Hide file tree

Showing 11 changed files with 206 additions and 117 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -145,12 +145,12 @@ jobs:
           cargo build --release --out-dir=./output -Z unstable-options
           cd ..
 
-          mv ./mpv-easy-ext/output/mpv-easy-ext ./mpv-easy-ext-ubuntu
+          mv ./mpv-easy-ext/output/mpv-easy-ext ./mpv-easy-ext-linux
       - name: Upload ubuntu Artifact ext
         uses: actions/upload-artifact@v4
         with:
-          name: mpv-easy-ext-ubuntu
-          path: ./mpv-easy-ext-ubuntu
+          name: mpv-easy-ext-linux
+          path: ./mpv-easy-ext-linux
 
   build-ext-android:
     runs-on: ubuntu-latest
@@ -239,7 +239,7 @@ jobs:
           cp -r ./dist ./mpy-easy-boa-windows
 
           cp ./mpv-easy-ext/mpv-easy-ext-macos ./mpy-easy-macos/scripts/mpv-easy-config/mpv-easy-ext/mpv-easy-ext-macos
-          cp ./mpv-easy-ext/mpv-easy-ext-ubuntu ./mpy-easy-linux/scripts/mpv-easy-config/mpv-easy-ext/mpv-easy-ext-linux
+          cp ./mpv-easy-ext/mpv-easy-ext-linux ./mpy-easy-linux/scripts/mpv-easy-config/mpv-easy-ext/mpv-easy-ext-linux
           cp ./mpv-easy-ext/mpv-easy-ext-android ./mpy-easy-android/scripts/mpv-easy-config/mpv-easy-ext/mpv-easy-ext-android
           cp ./mpv-easy-ext/mpv-easy-ext-windows ./mpy-easy-windows/scripts/mpv-easy-config/mpv-easy-ext/mpv-easy-ext-windows
           cp ./mpv-easy-ext/mpv-easy-ext-windows ./mpy-easy-deno-windows/scripts/mpv-easy-config/mpv-easy-ext/mpv-easy-ext-windows
@@ -304,4 +304,4 @@ jobs:
           cd ..
       - uses: ncipollo/release-action@v1
         with:
-          artifacts: "./mpy-easy-*/*.zip,./mpv-easy/es5/mpv-easy-es5.js,./mpv-easy/bundle/mpv-easy-es6.js"
+          artifacts: "./mpy-easy-*/*.zip,./mpv-easy/es5/mpv-easy-es5.js,./mpv-easy/bundle/mpv-easy-es6.js,./mpv-easy-ext/*"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mpv-easy-ext/Cargo.toml b/mpv-easy-ext/Cargo.toml
@@ -35,6 +35,5 @@ webdav-serde = "0.1.1"
 image = "0.25.1"
 rand = "0.8.5"
 glob = "0.3.1"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-clipboard-win = "5.1.0"
+[target.'cfg(not(target_os = "android"))'.dependencies]
+clipboard-rs = "0.1.7"
diff --git a/mpv-easy-ext/src/cmd/clip/clip_android.rs b/mpv-easy-ext/src/cmd/clip/clip_android.rs
diff --git a/mpv-easy-ext/src/cmd/clip/clip_linux.rs b/mpv-easy-ext/src/cmd/clip/clip_linux.rs
diff --git a/mpv-easy-ext/src/cmd/clip/clip_mac.rs b/mpv-easy-ext/src/cmd/clip/clip_mac.rs
diff --git a/mpv-easy-ext/src/cmd/clip/clip_win.rs b/mpv-easy-ext/src/cmd/clip/clip_win.rs
diff --git a/mpv-easy-ext/src/cmd/clip/mod.rs b/mpv-easy-ext/src/cmd/clip/mod.rs