noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable URL-encoding on file paths (#1892)

Browse source
This commit is contained in:
Rushmore Mushambi 2023-04-30 20:34:46 +02:00 committed by GitHub
parent 453d368e69
commit 357a5320ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/src/api/engine/local/native.rs
View file

@ -5,6 +5,7 @@ use crate::api::conn::Param;
use crate::api::conn::Route; use crate::api::conn::Route;
use crate::api::conn::Router; use crate::api::conn::Router;
use crate::api::engine::local::Db; use crate::api::engine::local::Db;
use crate::api::err::Error;
use crate::api::opt::Endpoint; use crate::api::opt::Endpoint;
use crate::api::ExtraFeatures; use crate::api::ExtraFeatures;
use crate::api::Result; use crate::api::Result;
@ -87,19 +88,29 @@ pub(crate) fn router(
tokio::spawn(async move { tokio::spawn(async move {
let url = address.endpoint; let url = address.endpoint;
let path = match url.scheme() { let kvs = {
"mem" => "memory", let path = match url.scheme() {
_ => url.as_str(), "mem" => "memory".to_owned(),
}; "fdb" | "rocksdb" | "file" => match url.to_file_path() {
Ok(path) => format!("{}://{}", url.scheme(), path.display()),
Err(_) => {
let error = Error::InvalidUrl(url.as_str().to_owned());
let _ = conn_tx.into_send_async(Err(error.into())).await;
return;
}
},
_ => url.as_str().to_owned(),
};
let kvs = match Datastore::new(path).await { match Datastore::new(&path).await {
Ok(kvs) => { Ok(kvs) => {
let _ = conn_tx.into_send_async(Ok(())).await; let _ = conn_tx.into_send_async(Ok(())).await;
kvs kvs
} }
Err(error) => { Err(error) => {
let _ = conn_tx.into_send_async(Err(error.into())).await; let _ = conn_tx.into_send_async(Err(error.into())).await;
return; return;
}
} }
}; };