fix: implement FromLua for Cha instead of AnyUserData

sxyazi · Nov 14, 2024 · f2e33da · f2e33da
1 parent 0048652
commit f2e33da
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 72 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,4 +1,7 @@
 [env]
+MACOSX_DEPLOYMENT_TARGET  = "10.11"
+JEMALLOC_SYS_WITH_LG_PAGE = "16"
+
 # environment variable for tikv-jemalloc-sys
 #
 # https://jemalloc.net/jemalloc.3.html#opt.narenas

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -21,13 +21,7 @@ jobs:
           rustup toolchain install stable --profile minimal
           rustup component add clippy
 
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          prefix-key: rust
-          shared-key: ubuntu-latest@debug
-
-      - name: Run sccache-cache
+      - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
       - name: Clippy
@@ -44,13 +38,7 @@ jobs:
           rustup toolchain install nightly --profile minimal
           rustup component add rustfmt --toolchain nightly
 
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          prefix-key: rust
-          shared-key: ubuntu-latest@debug
-
-      - name: Run sccache-cache
+      - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
       - name: Rustfmt

diff --git a/.github/workflows/draft.yml b/.github/workflows/draft.yml
@@ -2,8 +2,8 @@ name: Draft
 
 on:
   push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
+    branches: [main]
+    tags: ["v[0-9]+.[0-9]+.[0-9]+"]
   schedule:
     - cron: "0 */6 * * *"
   workflow_dispatch:
@@ -26,26 +26,19 @@ jobs:
           - os: macos-latest
             target: aarch64-apple-darwin
     runs-on: ${{ matrix.os }}
+    env:
+      CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
     steps:
       - uses: actions/checkout@v4
 
       - name: Install gcc-aarch64-linux-gnu
         if: matrix.target == 'aarch64-unknown-linux-gnu'
-        run: |
-          sudo apt-get update && sudo apt-get install -yq gcc-aarch64-linux-gnu
-          echo "JEMALLOC_SYS_WITH_LG_PAGE=16" >> $GITHUB_ENV
-          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=/usr/bin/aarch64-linux-gnu-gcc" >> $GITHUB_ENV
+        run: sudo apt-get update && sudo apt-get install -yq gcc-aarch64-linux-gnu
 
       - name: Setup Rust toolchain
         run: rustup toolchain install stable --profile minimal --target ${{ matrix.target }}
 
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          prefix-key: rust
-          shared-key: ${{ matrix.target }}@release
-
-      - name: Run sccache-cache
+      - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
       - name: Build
@@ -66,30 +59,23 @@ jobs:
           - os: windows-latest
             target: aarch64-pc-windows-msvc
     runs-on: ${{ matrix.os }}
+    env:
+      YAZI_GEN_COMPLETIONS: true
+      CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER: lld-link.exe
+      CARGO_TARGET_AARCH64_PC_WINDOWS_MSVC_LINKER: lld-link.exe
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup Rust toolchain
         run: rustup toolchain install stable --profile minimal --target ${{ matrix.target }}
 
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          prefix-key: rust
-          shared-key: ${{ matrix.target }}@release
-
-      - name: Run sccache-cache
+      - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
       - name: Build
-        env:
-          YAZI_GEN_COMPLETIONS: true
-        run: |
-          cargo build -p yazi-cli --release --locked --target ${{ matrix.target }}
-          cargo build -p yazi-fm --release --locked --target ${{ matrix.target }}
+        run: cargo build --release --locked --target ${{ matrix.target }}
 
       - name: Pack artifact
-        if: matrix.os == 'windows-latest'
         env:
           TARGET_NAME: yazi-${{ matrix.target }}
         run: |
@@ -123,13 +109,7 @@ jobs:
       - name: Add musl target
         run: rustup target add ${{ matrix.target }}
 
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          prefix-key: rust
-          shared-key: ${{ matrix.target }}@release
-
-      - name: Run sccache-cache
+      - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
       - name: Build
@@ -142,6 +122,7 @@ jobs:
           path: yazi-${{ matrix.target }}.zip
 
   build-snap:
+    if: false # Can't make CI pass, disable for now
     strategy:
       matrix:
         include:
@@ -151,13 +132,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          prefix-key: rust
-          shared-key: ${{ matrix.target }}@release
-
-      - name: Run sccache-cache
+      - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
       - name: Build
@@ -173,6 +148,7 @@ jobs:
           path: yazi-${{ matrix.target }}.snap
 
   draft:
+    if: startsWith(github.ref, 'refs/tags/')
     permissions:
       contents: write
     runs-on: ubuntu-latest
@@ -184,7 +160,6 @@ jobs:
 
       - name: Draft
         uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
         with:
           draft: true
           files: |
@@ -193,6 +168,7 @@ jobs:
           generate_release_notes: true
 
   nightly:
+    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     permissions:
       contents: write
     runs-on: ubuntu-latest
@@ -210,7 +186,6 @@ jobs:
 
       - name: Nightly
         uses: softprops/action-gh-release@v1
-        if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         with:
           tag_name: nightly
           prerelease: true

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,13 +23,7 @@ jobs:
       - name: Setup Rust toolchain
         run: rustup toolchain install stable --profile minimal
 
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          prefix-key: rust
-          shared-key: ${{ matrix.os }}@debug
-
-      - name: Run sccache-cache
+      - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
       - name: Build

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -3,7 +3,6 @@ set -euo pipefail
 
 export ARTIFACT_NAME="yazi-$1"
 export YAZI_GEN_COMPLETIONS=1
-export MACOSX_DEPLOYMENT_TARGET="10.11"
 
 # Build for the target
 cargo build --release --locked --target "$1"

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -23,11 +23,34 @@ parts:
   yazi:
     plugin: rust
     source: https://github.com/sxyazi/yazi.git
+    build-packages:
+      - wget
     override-build: |
       craftctl default
       craftctl set version=$(git describe --tags --abbrev=0)
-      cargo install fd-find --root $CRAFT_PART_INSTALL
-      cargo install ripgrep --root $CRAFT_PART_INSTALL
-      cargo install zoxide --root $CRAFT_PART_INSTALL
-      git clone --depth 1 https://github.com/junegunn/fzf.git fzf
-      fzf/install --bin && mv fzf/bin/fzf $CRAFT_PART_INSTALL/bin/
+
+      wget ripgrep-14.1.1-aarch64-unknown-linux-gnu.tar.gz
+      tar fxz ripgrep-*.tar.gz
+      mv ripgrep-*/rg $CRAFT_PART_INSTALL/bin/
+
+      wget https://github.com/sharkdp/fd/releases/download/v10.2.0/fd-v10.2.0-aarch64-unknown-linux-gnu.tar.gz
+      tar fxz fd-*.tar.gz
+      mv fd-*/fd $CRAFT_PART_INSTALL/bin/
+
+      wget https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64
+      mv jq-linux-amd64 $CRAFT_PART_INSTALL/bin/jq
+
+      wget https://imagemagick.org/archive/binaries/magick
+      mv magick $CRAFT_PART_INSTALL/bin/magick
+
+      wget https://github.com/junegunn/fzf/releases/download/v0.56.2/fzf-0.56.2-linux_amd64.tar.gz
+      tar fxz fzf-*.tar.gz
+      mv fzf $CRAFT_PART_INSTALL/bin/
+
+      wget https://www.7-zip.org/a/7z2408-linux-x64.tar.xz
+      tar fxz 7z*.tar.xz
+      mv 7zz 7zzs $CRAFT_PART_INSTALL/bin/
+
+      wget https://github.com/ajeetdsouza/zoxide/releases/download/v0.9.6/zoxide-0.9.6-x86_64-unknown-linux-musl.tar.gz
+      tar fxz zoxide-*.tar.gz
+      mv zoxide $CRAFT_PART_INSTALL/bin/
diff --git a/yazi-plugin/src/bindings/cha.rs b/yazi-plugin/src/bindings/cha.rs
@@ -1,10 +1,11 @@
 use std::{ops::Deref, time::{Duration, SystemTime, UNIX_EPOCH}};
 
-use mlua::{ExternalError, IntoLua, Lua, Table, UserData, UserDataFields, UserDataMethods};
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, UserData, UserDataFields, UserDataMethods};
 use yazi_shared::fs::ChaKind;
 
 use crate::RtRef;
 
+#[derive(Clone, Copy, FromLua)]
 pub struct Cha(yazi_shared::fs::Cha);
 
 impl Deref for Cha {

diff --git a/yazi-plugin/src/file/file.rs b/yazi-plugin/src/file/file.rs
@@ -1,6 +1,6 @@
 use mlua::{AnyUserData, Lua, Table, UserDataRef};
 
-use crate::{bindings::Cast, impl_file_fields, impl_file_methods};
+use crate::{bindings::{Cast, Cha}, impl_file_fields, impl_file_methods};
 
 pub type FileRef = UserDataRef<yazi_shared::fs::File>;
 
@@ -21,7 +21,7 @@ impl File {
 			lua.create_function(|lua, t: Table| {
 				Self::cast(lua, yazi_shared::fs::File {
 					url: t.raw_get::<AnyUserData>("url")?.take()?,
-					cha: t.raw_get::<AnyUserData>("cha")?.take()?,
+					cha: *t.raw_get::<Cha>("cha")?,
 					..Default::default()
 				})
 			})?,