diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2020-06-20 23:49:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-20 23:49:27 -0400 |
commit | 0a81ec6b1e00ef01900393ae0460eaf3a6ec05d6 (patch) | |
tree | 020b1d71aabd8102ae85ae24fc89becb035b4854 /cli/ops/os.rs | |
parent | c0ea9a99c0dc21faf46f73dca481361853e914fa (diff) |
Remove Deno.dir and dirs dependency (#6385)
Diffstat (limited to 'cli/ops/os.rs')
-rw-r--r-- | cli/ops/os.rs | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/cli/ops/os.rs b/cli/ops/os.rs index ab7ed2876..f084f213b 100644 --- a/cli/ops/os.rs +++ b/cli/ops/os.rs @@ -6,7 +6,6 @@ use deno_core::CoreIsolate; use deno_core::ZeroCopyBuf; use std::collections::HashMap; use std::env; -use std::io::{Error, ErrorKind}; use url::Url; pub fn init(i: &mut CoreIsolate, s: &State) { @@ -16,68 +15,11 @@ pub fn init(i: &mut CoreIsolate, s: &State) { i.register_op("op_set_env", s.stateful_json_op(op_set_env)); i.register_op("op_get_env", s.stateful_json_op(op_get_env)); i.register_op("op_delete_env", s.stateful_json_op(op_delete_env)); - i.register_op("op_get_dir", s.stateful_json_op(op_get_dir)); i.register_op("op_hostname", s.stateful_json_op(op_hostname)); i.register_op("op_loadavg", s.stateful_json_op(op_loadavg)); i.register_op("op_os_release", s.stateful_json_op(op_os_release)); } -#[derive(Deserialize)] -struct GetDirArgs { - kind: std::string::String, -} - -fn op_get_dir( - state: &State, - args: Value, - _zero_copy: &mut [ZeroCopyBuf], -) -> Result<JsonOp, OpError> { - state.check_unstable("Deno.dir"); - state.check_env()?; - let args: GetDirArgs = serde_json::from_value(args)?; - - let path = match args.kind.as_str() { - "home" => dirs::home_dir(), - "config" => dirs::config_dir(), - "cache" => dirs::cache_dir(), - "executable" => dirs::executable_dir(), - "data" => dirs::data_dir(), - "data_local" => dirs::data_local_dir(), - "audio" => dirs::audio_dir(), - "desktop" => dirs::desktop_dir(), - "document" => dirs::document_dir(), - "download" => dirs::download_dir(), - "font" => dirs::font_dir(), - "picture" => dirs::picture_dir(), - "public" => dirs::public_dir(), - "template" => dirs::template_dir(), - "tmp" => Some(std::env::temp_dir()), - "video" => dirs::video_dir(), - _ => { - return Err( - Error::new( - ErrorKind::InvalidInput, - format!("Invalid dir type `{}`", args.kind.as_str()), - ) - .into(), - ) - } - }; - - if path == None { - Err(OpError::not_found(format!( - "Could not get user {} directory.", - args.kind.as_str() - ))) - } else { - Ok(JsonOp::Sync(json!(path - .unwrap_or_default() - .into_os_string() - .into_string() - .unwrap_or_default()))) - } -} - fn op_exec_path( state: &State, _args: Value, |