mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: account for URL covariance in Url:join()

Browse source
This commit is contained in:
sxyazi 2026-01-06 11:52:02 +08:00
parent 3c39a326ab
commit d131191c13
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yazi-binding/src/url.rs
View file

@ -2,7 +2,7 @@ use std::ops::Deref;
use mlua::{AnyUserData, ExternalError, ExternalResult, FromLua, IntoLua, Lua, MetaMethod, UserData, UserDataFields, UserDataMethods, UserDataRef, Value}; use mlua::{AnyUserData, ExternalError, ExternalResult, FromLua, IntoLua, Lua, MetaMethod, UserData, UserDataFields, UserDataMethods, UserDataRef, Value};
use yazi_fs::{FsHash64, FsHash128, FsUrl}; use yazi_fs::{FsHash64, FsHash128, FsUrl};
use yazi_shared::{path::{PathLike, StripPrefixError}, scheme::SchemeCow, strand::{StrandLike, ToStrand}, url::{AsUrl, UrlCow, UrlLike}}; use yazi_shared::{path::{PathLike, StripPrefixError}, scheme::{SchemeCow, SchemeLike}, strand::{StrandLike, ToStrand}, url::{AsUrl, UrlCow, UrlLike}};
use crate::{Path, Scheme, cached_field, deprecate}; use crate::{Path, Scheme, cached_field, deprecate};
@ -121,7 +121,7 @@ impl Url {
Value::String(s) => { Value::String(s) => {
let b = s.as_bytes(); let b = s.as_bytes();
let (scheme, path) = SchemeCow::parse(&b)?; let (scheme, path) = SchemeCow::parse(&b)?;
if scheme == self.scheme() { if scheme.covariant(self.scheme()) {
Self::new(self.try_join(path).into_lua_err()?).into_lua(lua) Self::new(self.try_join(path).into_lua_err()?).into_lua(lua)
} else { } else {
Self::new(UrlCow::try_from((scheme, path))?).into_lua(lua) Self::new(UrlCow::try_from((scheme, path))?).into_lua(lua)
@ -129,7 +129,7 @@ impl Url {
} }
Value::UserData(ref ud) => { Value::UserData(ref ud) => {
let url = ud.borrow::<Self>()?; let url = ud.borrow::<Self>()?;
if url.scheme() == self.scheme() { if url.scheme().covariant(self.scheme()) {
Self::new(self.try_join(url.loc()).into_lua_err()?).into_lua(lua) Self::new(self.try_join(url.loc()).into_lua_err()?).into_lua(lua)
} else { } else {
Ok(other) Ok(other)