fix: streamline module functionality

MaaAssistantArknights · Dec 6, 2023 · 468797f · 468797f
1 parent 3dd2307
commit 468797f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 106 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/maa-cli/Cargo.toml b/maa-cli/Cargo.toml
@@ -46,7 +46,6 @@ semver = { version = "1.0.19", features = ["serde"] }
 flate2 = { version = "1", optional = true }
 tar = { version = "0.4.40", optional = true }
 prettytable = "0.10.0"
-clipboard = "0.5.0"
 
 [dependencies.chrono]
 version = "0.4.31"

diff --git a/maa-cli/src/main.rs b/maa-cli/src/main.rs
@@ -140,10 +140,7 @@ enum SubCommand {
     Copilot {
         /// A code copied from "https://prts.plus" or a json file,
         /// such as "maa://12345" or "/your/json/path.json".
-        uri: Option<String>,
-        #[arg(short, long)]
-        /// Allow maa to read the clipboard
-        paste: bool,
+        uri: String,
         #[command(flatten)]
         common: run::CommonArgs,
     },
@@ -307,7 +304,7 @@ fn main() -> Result<()> {
         SubCommand::Complete { shell } => {
             generate(shell, &mut CLI::command(), "maa", &mut std::io::stdout());
         }
-        SubCommand::Copilot { uri, paste, common } => run::copilot(uri, paste, common)?,
+        SubCommand::Copilot { uri, common } => run::copilot(uri, common)?,
     }
 
     Ok(())

diff --git a/maa-cli/src/run/copilot.rs b/maa-cli/src/run/copilot.rs
@@ -12,7 +12,6 @@ use crate::{
 use anyhow::Result;
 use anyhow::{anyhow, Error};
 use anyhow::{Context, Ok};
-use clipboard::{ClipboardContext, ClipboardProvider};
 use prettytable::{format, row, Table};
 use reqwest::blocking::Client;
 use serde_json::{from_str, Value as JsonValue};
@@ -22,12 +21,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-pub fn copilot(uri_opt: Option<String>, paste: bool, common: CommonArgs) -> Result<()> {
-    let uri = if paste {
-        clipboard_reader()?
-    } else {
-        uri_opt.ok_or_else(|| anyhow!("No input"))?
-    };
+pub fn copilot(uri: String, common: CommonArgs) -> Result<()> {
     debug!("uri: ", uri);
     let jpr = "JSON Prase Error";
     let results = json_reader(&uri)?;
@@ -187,10 +181,3 @@ fn find_json(json_file_name: &str, mut dir_path: PathBuf) -> Result<JsonValue> {
 
     Ok(json_value)
 }
-
-fn clipboard_reader() -> Result<String> {
-    let mut ctx: ClipboardContext = ClipboardProvider::new().map_err(|err| anyhow!("{}", err))?;
-    let content = ctx.get_contents().map_err(|err| anyhow!("{}", err))?;
-
-    Ok(content)
-}