Renamed talpid_cli to mullvad_cli

3 files changed, 0 insertions, 116 deletions

diff --git a/talpid_cli/Cargo.toml b/talpid_cli/Cargo.toml
deleted file mode 100644
index f6b563ae9c..0000000000
--- a/talpid_cli/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "talpid_cli"
-version = "0.0.0"
-authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"]
-description = "Run Talpid easily from the command line"
-
-[[bin]]
-name = "mullvad"
-
-[dependencies]
-clap = "2.20"
-error-chain = "0.10"
-log = "0.3"
-env_logger = "0.4"
-talpid_ipc = { path = "../talpid_ipc" }
-serde = "1.0"
-serde_json = "1.0"
diff --git a/talpid_cli/src/cli.rs b/talpid_cli/src/cli.rs
deleted file mode 100644
index be2f4c3ef4..0000000000
--- a/talpid_cli/src/cli.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use clap::{App, Arg, ArgMatches, SubCommand, AppSettings};
-
-pub fn get_matches() -> ArgMatches<'static> {
-    let app = create_app();
-    app.clone().get_matches()
-}
-
-fn create_app() -> App<'static, 'static> {
-    App::new(crate_name!())
-        .version(crate_version!())
-        .author(crate_authors!())
-        .about(crate_description!())
-        .setting(AppSettings::SubcommandRequired)
-        .subcommand(SubCommand::with_name("account")
-            .about("Control and display information about the configured Mullvad account")
-            .setting(AppSettings::SubcommandRequired)
-            .subcommand(SubCommand::with_name("set")
-                .about("Change the Mullvad account")
-                .arg(Arg::with_name("token")
-                    .help("The Mullvad account token to configure the daemon with")
-                    .required(true)))
-            .subcommand(SubCommand::with_name("get")
-                .about("Display information about the currently configured account")))
-}
diff --git a/talpid_cli/src/main.rs b/talpid_cli/src/main.rs
deleted file mode 100644
index 0d87173418..0000000000
--- a/talpid_cli/src/main.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-// `error_chain!` can recurse deeply
-#![recursion_limit = "1024"]
-
-extern crate talpid_ipc;
-#[macro_use]
-extern crate clap;
-#[macro_use]
-extern crate error_chain;
-#[macro_use]
-extern crate log;
-extern crate env_logger;
-extern crate serde;
-extern crate serde_json;
-
-use std::fs::File;
-use std::io::Read;
-
-mod cli;
-
-
-error_chain!{}
-
-quick_main!(run);
-
-fn run() -> Result<()> {
-    env_logger::init().chain_err(|| "Failed to bootstrap logging system")?;
-
-    let matches = cli::get_matches();
-    if let Some(matches) = matches.subcommand_matches("account") {
-        cmd_account(matches)
-    } else {
-        unreachable!("No subcommand matches.")
-    }
-}
-
-fn cmd_account(matches: &clap::ArgMatches) -> Result<()> {
-    if let Some(matches) = matches.subcommand_matches("set") {
-        let token = matches.value_of("token").unwrap();
-        call_rpc("set_account", &[token]).map(
-            |_| {
-                println!("Mullvad account {} set", token);
-            },
-        )
-    } else if let Some(_matches) = matches.subcommand_matches("get") {
-        match call_rpc("get_account", &[] as &[u8; 0])? {
-            serde_json::Value::String(token) => println!("Mullvad account: {:?}", token),
-            serde_json::Value::Null => println!("No account configured"),
-            _ => bail!("Unable to fetch account token"),
-        }
-        Ok(())
-    } else {
-        unreachable!("No account command given");
-    }
-}
-
-fn call_rpc<T>(method: &str, args: &T) -> Result<serde_json::Value>
-    where T: serde::Serialize
-{
-    let address = read_rpc_address()?;
-    info!("Using RPC address {}", address);
-    let mut rpc_client = talpid_ipc::WsIpcClient::new(address)
-        .chain_err(|| "Unable to create RPC client")?;
-    rpc_client.call(method, args).chain_err(|| "Unable to call RPC method")
-}
-
-fn read_rpc_address() -> Result<String> {
-    for path in &["./.mullvad_rpc_address", "../.mullvad_rpc_address"] {
-        debug!("Trying to read RPC address at {}", path);
-        let mut address = String::new();
-        if let Ok(_) = File::open(path).and_then(|mut file| file.read_to_string(&mut address)) {
-            return Ok(address);
-        }
-    }
-    bail!("Unable to read RPC address");
-}