mirror of
https://github.com/sagiegurari/duckscript
synced 2024-10-01 13:44:23 +00:00
Merge branch 'master' of github.com:sagiegurari/duckscript
This commit is contained in:
sagie gur ari
commit
e12df0ac2d
55
Cargo.lock
generated
55
Cargo.lock
generated
|
|
@ -40,9 +40,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "attohttpc"
|
||||
version = "0.24.1"
|
||||
version = "0.25.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2"
|
||||
checksum = "7e57d6e7a84f33ff3316e97af3180fe7f86597a6a60161c0be70c0e45f382620"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"http",
|
||||
|
|
@ -830,9 +830,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
|
|||
|
||||
[[package]]
|
||||
name = "openssl"
|
||||
version = "0.10.45"
|
||||
version = "0.10.48"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
|
||||
checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if",
|
||||
|
|
@ -862,9 +862,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
|||
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.80"
|
||||
version = "0.9.83"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
|
||||
checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cc",
|
||||
|
|
@ -1014,14 +1014,24 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rustls"
|
||||
version = "0.20.8"
|
||||
version = "0.21.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
|
||||
checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d"
|
||||
dependencies = [
|
||||
"log",
|
||||
"ring",
|
||||
"rustls-webpki",
|
||||
"sct",
|
||||
"webpki",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustls-webpki"
|
||||
version = "0.100.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
|
||||
dependencies = [
|
||||
"ring",
|
||||
"untrusted",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1089,9 +1099,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "1.0.16"
|
||||
version = "1.0.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
|
||||
checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
|
|
@ -1101,9 +1111,9 @@ checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
|
|||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.93"
|
||||
version = "1.0.96"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
|
||||
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
|
|
@ -1146,9 +1156,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
|
|||
|
||||
[[package]]
|
||||
name = "suppaftp"
|
||||
version = "4.7.0"
|
||||
version = "5.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d865bcb2d4bfea8c0ab4ca6c3f79d011ad04db5ef1fc693e720299bb60c58018"
|
||||
checksum = "4f82c780764939f31cc9c33cc138583e373acdfe4cc56a38b6798cdc0a42871e"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"lazy-regex",
|
||||
|
|
@ -1334,12 +1344,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
|||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.3.2"
|
||||
version = "2.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
|
||||
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
|
|
@ -1431,11 +1440,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "webpki-roots"
|
||||
version = "0.22.6"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
|
||||
checksum = "aa54963694b65584e170cf5dc46aeb4dcaa5584e652ff5f3952e56d66aff0125"
|
||||
dependencies = [
|
||||
"webpki",
|
||||
"rustls-webpki",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1451,9 +1460,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "whoami"
|
||||
version = "1.3.0"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3"
|
||||
checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68"
|
||||
dependencies = [
|
||||
"wasm-bindgen",
|
||||
"web-sys",
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ include = [
|
|||
]
|
||||
|
||||
[dependencies]
|
||||
attohttpc = { version = "^0.24", default-features = false, features = [
|
||||
attohttpc = { version = "^0.25", default-features = false, features = [
|
||||
"compress",
|
||||
] }
|
||||
base64 = "^0.21"
|
||||
|
|
@ -43,7 +43,7 @@ rand = "^0.8"
|
|||
semver = "^1"
|
||||
serde_json = "^1"
|
||||
sha2 = "^0.10"
|
||||
suppaftp = "^4.7"
|
||||
suppaftp = "^5.1"
|
||||
walkdir = "^2"
|
||||
which = { version = "^4", default-features = false }
|
||||
whoami = "^1"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use crate::utils::pckg;
|
|||
use duckscript::types::command::{Command, CommandResult};
|
||||
use fs_extra::{dir, move_items};
|
||||
use fsio;
|
||||
use std::fs;
|
||||
use fsio::directory::create_parent;
|
||||
use std::path::Path;
|
||||
|
||||
#[cfg(test)]
|
||||
|
|
@ -42,11 +42,23 @@ impl Command for CommandImpl {
|
|||
} else {
|
||||
let target_path = Path::new(&arguments[1]);
|
||||
let source_file = source_path.is_file();
|
||||
let target_file = target_path.is_file();
|
||||
let target_file = if target_path.exists() {
|
||||
target_path.is_file()
|
||||
} else {
|
||||
!target_path.ends_with("/")
|
||||
&& !target_path.ends_with("\\")
|
||||
&& target_path.extension().is_some()
|
||||
};
|
||||
|
||||
if source_file && target_file {
|
||||
match fs::rename(&arguments[0], &arguments[1]) {
|
||||
Ok(_) => CommandResult::Continue(Some("true".to_string())),
|
||||
match create_parent(&target_path) {
|
||||
Ok(_) => {
|
||||
let options = fs_extra::file::CopyOptions::new().overwrite(true);
|
||||
match fs_extra::file::move_file(source_path, &target_path, &options) {
|
||||
Ok(_) => CommandResult::Continue(Some("true".to_string())),
|
||||
Err(error) => CommandResult::Error(error.to_string()),
|
||||
}
|
||||
}
|
||||
Err(error) => CommandResult::Error(error.to_string()),
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in a new issue