diff --git a/Cargo.toml b/Cargo.toml index 0851f7f1..1c15398e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,17 @@ [workspace] -resolver = "2" +resolver = "3" members = [ "yazi-*" ] default-members = [ "yazi-fm", "yazi-cli" ] +[workspace.package] +edition = "2024" +version = "26.2.2" +license = "MIT" +authors = [ "sxyazi " ] +homepage = "https://yazi-rs.github.io" +repository = "https://github.com/sxyazi/yazi" +rust-version = "1.92.0" + [profile.dev] debug = "line-tables-only" diff --git a/flake.nix b/flake.nix index 7c10f7c7..9fab2c75 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ rev = self.shortRev or self.dirtyShortRev or "dirty"; date = self.lastModifiedDate or self.lastModified or "19700101"; version = - (builtins.fromTOML (builtins.readFile ./yazi-fm/Cargo.toml)).package.version + (builtins.fromTOML (builtins.readFile ./Cargo.toml)).workspace.package.version + "pre${builtins.substring 0 8 date}_${rev}"; in { diff --git a/yazi-actor/Cargo.toml b/yazi-actor/Cargo.toml index c036360a..41b869fe 100644 --- a/yazi-actor/Cargo.toml +++ b/yazi-actor/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-actor" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi actor model" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-actor" +description = "Yazi actor model" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-adapter/Cargo.toml b/yazi-adapter/Cargo.toml index bb306d8c..0072760a 100644 --- a/yazi-adapter/Cargo.toml +++ b/yazi-adapter/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-adapter" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi image adapter" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-adapter" +description = "Yazi image adapter" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-binding/Cargo.toml b/yazi-binding/Cargo.toml index 3c17fee0..0ab4ddcd 100644 --- a/yazi-binding/Cargo.toml +++ b/yazi-binding/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-binding" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi Lua bindings" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-binding" +description = "Yazi Lua bindings" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-boot/Cargo.toml b/yazi-boot/Cargo.toml index d9974b07..23b3fafd 100644 --- a/yazi-boot/Cargo.toml +++ b/yazi-boot/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-boot" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi bootstrapper" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-boot" +description = "Yazi bootstrapper" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-build/Cargo.toml b/yazi-build/Cargo.toml index 6d36e203..0070fdad 100644 --- a/yazi-build/Cargo.toml +++ b/yazi-build/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-build" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi build system" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-build" +description = "Yazi build system" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-cli/Cargo.toml b/yazi-cli/Cargo.toml index 26940b91..f98e7a08 100644 --- a/yazi-cli/Cargo.toml +++ b/yazi-cli/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-cli" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi command-line interface" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-cli" +description = "Yazi command-line interface" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-codegen/Cargo.toml b/yazi-codegen/Cargo.toml index 252088de..400bfddc 100644 --- a/yazi-codegen/Cargo.toml +++ b/yazi-codegen/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-codegen" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi code generator" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-codegen" +description = "Yazi code generator" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-config/Cargo.toml b/yazi-config/Cargo.toml index 7d35ff4c..e728cac6 100644 --- a/yazi-config/Cargo.toml +++ b/yazi-config/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-config" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi configuration file parser" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-config" +description = "Yazi configuration file parser" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-core/Cargo.toml b/yazi-core/Cargo.toml index 47d7ec8b..2a5f8ccc 100644 --- a/yazi-core/Cargo.toml +++ b/yazi-core/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-core" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi core logic" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-core" +description = "Yazi core logic" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-dds/Cargo.toml b/yazi-dds/Cargo.toml index 8d01109a..14792f01 100644 --- a/yazi-dds/Cargo.toml +++ b/yazi-dds/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-dds" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi data distribution service" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-dds" +description = "Yazi data distribution service" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-emulator/Cargo.toml b/yazi-emulator/Cargo.toml index 6b1d4a52..978f8a9a 100644 --- a/yazi-emulator/Cargo.toml +++ b/yazi-emulator/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-emulator" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi terminal emulator database" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-emulator" +description = "Yazi terminal emulator database" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-ffi/Cargo.toml b/yazi-ffi/Cargo.toml index 51721812..4cdc2130 100644 --- a/yazi-ffi/Cargo.toml +++ b/yazi-ffi/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-ffi" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi foreign function interface" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-ffi" +description = "Yazi foreign function interface" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-fm/Cargo.toml b/yazi-fm/Cargo.toml index 9d7236b6..fd49971c 100644 --- a/yazi-fm/Cargo.toml +++ b/yazi-fm/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-fm" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi file manager" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-fm" +description = "Yazi file manager" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-fm/src/mgr/preview.rs b/yazi-fm/src/mgr/preview.rs index c3ee313a..1d2b51d7 100644 --- a/yazi-fm/src/mgr/preview.rs +++ b/yazi-fm/src/mgr/preview.rs @@ -23,7 +23,7 @@ impl Widget for Preview<'_> { for w in &lock.data { let rect = w.area().transform(|p| self.core.mgr.area(p)); - if win.intersects(rect) { + if rect.intersection(win) == rect { w.clone().render(rect, buf); } } diff --git a/yazi-fm/src/spot/spot.rs b/yazi-fm/src/spot/spot.rs index 2b4b2436..355a9ca1 100644 --- a/yazi-fm/src/spot/spot.rs +++ b/yazi-fm/src/spot/spot.rs @@ -17,7 +17,7 @@ impl Widget for Spot<'_> { for w in &lock.data { let rect = w.area().transform(|p| self.core.mgr.area(p)); - if win.intersects(rect) { + if rect.intersection(win) == rect { w.clone().render(rect, buf); } } diff --git a/yazi-fs/Cargo.toml b/yazi-fs/Cargo.toml index bff6581b..276af823 100644 --- a/yazi-fs/Cargo.toml +++ b/yazi-fs/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-fs" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi file system" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-fs" +description = "Yazi file system" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-macro/Cargo.toml b/yazi-macro/Cargo.toml index 0f5e586f..11d19d07 100644 --- a/yazi-macro/Cargo.toml +++ b/yazi-macro/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-macro" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi macros" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-macro" +description = "Yazi macros" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-packing/Cargo.toml b/yazi-packing/Cargo.toml index 5d6dc1c3..bf78c928 100644 --- a/yazi-packing/Cargo.toml +++ b/yazi-packing/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-packing" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi packing" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-packing" +description = "Yazi packing" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-parser/Cargo.toml b/yazi-parser/Cargo.toml index ab9e8d2f..d23b520e 100644 --- a/yazi-parser/Cargo.toml +++ b/yazi-parser/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-parser" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi command parser" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-parser" +description = "Yazi command parser" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-plugin/Cargo.toml b/yazi-plugin/Cargo.toml index c9079352..17a851dd 100644 --- a/yazi-plugin/Cargo.toml +++ b/yazi-plugin/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-plugin" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi plugin system" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-plugin" +description = "Yazi plugin system" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-proxy/Cargo.toml b/yazi-proxy/Cargo.toml index 6d6081da..dd3a7690 100644 --- a/yazi-proxy/Cargo.toml +++ b/yazi-proxy/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-proxy" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi event proxy" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-proxy" +description = "Yazi event proxy" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-scheduler/Cargo.toml b/yazi-scheduler/Cargo.toml index a19c3022..edb68f76 100644 --- a/yazi-scheduler/Cargo.toml +++ b/yazi-scheduler/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-scheduler" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi task scheduler" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-scheduler" +description = "Yazi task scheduler" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-sftp/Cargo.toml b/yazi-sftp/Cargo.toml index 2d995027..aa01cb52 100644 --- a/yazi-sftp/Cargo.toml +++ b/yazi-sftp/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-sftp" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "AspectUnk", "sxyazi " ] -description = "Yazi SFTP client" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-sftp" +description = "Yazi SFTP client" +authors = [ "AspectUnk", "sxyazi " ] +version.workspace = true +edition.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-shared/Cargo.toml b/yazi-shared/Cargo.toml index f610fcdd..889e4299 100644 --- a/yazi-shared/Cargo.toml +++ b/yazi-shared/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "yazi-shared" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi shared library" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" -rust-version = "1.92.0" +name = "yazi-shared" +description = "Yazi shared library" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-shim/Cargo.toml b/yazi-shim/Cargo.toml index 4b03e3d2..5be68be0 100644 --- a/yazi-shim/Cargo.toml +++ b/yazi-shim/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-shim" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi crate shims" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-shim" +description = "Yazi crate shims" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-term/Cargo.toml b/yazi-term/Cargo.toml index 2bd40cde..e97b8382 100644 --- a/yazi-term/Cargo.toml +++ b/yazi-term/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-term" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi terminal extensions" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-term" +description = "Yazi terminal extensions" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-tty/Cargo.toml b/yazi-tty/Cargo.toml index 25bb4dec..d8f1c7db 100644 --- a/yazi-tty/Cargo.toml +++ b/yazi-tty/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-tty" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi TTY access layer" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-tty" +description = "Yazi TTY access layer" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-vfs/Cargo.toml b/yazi-vfs/Cargo.toml index e98d1009..21a0782b 100644 --- a/yazi-vfs/Cargo.toml +++ b/yazi-vfs/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-vfs" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi virtual file system" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-vfs" +description = "Yazi virtual file system" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-watcher/Cargo.toml b/yazi-watcher/Cargo.toml index 4e651399..1f0e0bfa 100644 --- a/yazi-watcher/Cargo.toml +++ b/yazi-watcher/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-watcher" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi file watcher" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-watcher" +description = "Yazi file watcher" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true diff --git a/yazi-widgets/Cargo.toml b/yazi-widgets/Cargo.toml index 1a7aa823..669de788 100644 --- a/yazi-widgets/Cargo.toml +++ b/yazi-widgets/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "yazi-widgets" -version = "26.2.2" -edition = "2024" -license = "MIT" -authors = [ "sxyazi " ] -description = "Yazi user interface widgets" -homepage = "https://yazi-rs.github.io" -repository = "https://github.com/sxyazi/yazi" +name = "yazi-widgets" +description = "Yazi user interface widgets" +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +rust-version.workspace = true [lints] workspace = true