api/src/main.rs

@@ -4,7 +4,7 @@
 #[macro_use] extern crate rocket_contrib;
 
 use std::{env, str, fs::{self, File}, time::{SystemTime, UNIX_EPOCH}, io::Write, collections::HashSet};
-use rocket::{self, routes, get, post, put, catch, config::{Config, Limits}, response::Responder, request::{self, Request, FromRequest}, Outcome, http::Status};
+use rocket::{self, routes, get, post, put, config::{Config, Limits}, response::Responder, request::{self, Request, FromRequest}, Outcome, http::Status};
 use rocket_contrib::json::{Json, JsonValue};
 use serde::{Serialize, Deserialize};
 use jsonwebtoken::{self, encode, decode, Header, Validation, EncodingKey, DecodingKey, Algorithm};
@@ -14,7 +14,7 @@ use tar::Archive;
 use base64::{Engine as _, engine::general_purpose};
 use uuid::Uuid;
 
-const DB_FILE: &str = "/usr/local/var/capsules_db/db.db3";
+const DB_FILE: &str = "db.db3";///usr/local/var/capsules_db/db.db3";
 const CAPSULE_DIR: &str = "/usr/local/var/capsules";
 const TMP_FILE: &str = "/tmp/capsulearchive.tar.gz"; // TODO: use tempfile https://docs.rs/tempfile/3.2.0/tempfile/index.html
 const BLOCKLIST: [&str; 9] = ["gemini", "capsule", "root", "webmaster", "admin", "www", "mail", "email", "api"];
@@ -104,11 +104,6 @@ enum Resp {
     NotFound(JsonValue),
 }
 
-#[catch(400)]
-fn bad_request(_: &Request) -> Resp {
-  return Resp::BadRequest(json!({"message": "There was a problem with your request"}));
-}
-
 #[get("/")]
 fn index() -> Resp {
     return Resp::NotFound(json!({"message": "There is no resource available at this path."}));

cli/Cargo.toml

@@ -17,5 +17,3 @@ reqwest = { version = "0.11", features = ["json", "blocking"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.8"
-chrono = "0.4.24"
-prettytable = "0.10.0"

cli/src/main.rs

@@ -5,8 +5,6 @@ use clap::{Arg, App, SubCommand};
 use flate2::{Compression, write::GzEncoder};
 use serde::{Serialize, Deserialize};
 use tempfile::tempdir;
-use chrono::prelude::*;
-use prettytable::{Table, row};
 use dirs;
 use base64;
 use reqwest;
@@ -207,59 +205,6 @@ fn create_capsule() -> Result<bool>{
     }
 }
 
-#[derive(Deserialize, Debug)]
-struct LogsResponse {
-  logs: Option<Vec<Log>>,
-  message: Option<String>,
-}
-#[derive(Deserialize, Debug)]
-struct Log {
-  path: String,
-  timestamp: i64,
-}
-impl Log {
-  fn time(&self) -> String {
-    let naive = NaiveDateTime::from_timestamp_opt(self.timestamp, 0).unwrap();    
-    let datetime: DateTime<Utc> = DateTime::from_utc(naive, Utc);    
-    let newdate = format!("{}", datetime.format("%Y-%m-%d %H:%M:%S"));
-    return newdate;
-  }
-}
-// PUTs the base64-encoded capsule tarball to the server.
-fn capsule_logs(flag_capsule_name: Option<&str>) -> Result<bool>{
-    let capsule_name: String = match flag_capsule_name {
-        Some(x) => String::from(x),
-        None => prompt_for("Which capsule do you want to view logs for?"),
-    };
-    let capsule_config = read_config_capsule(&capsule_name).expect("The configuration for your specified capsule could not be found.");
-
-    let client = reqwest::blocking::Client::new();
-    let res = client.get(&format!("{}/logs", get_api_url()))
-        .header("api-key", &capsule_config.access_token).send()?;
-    let status = res.status();
-    let response_data = res.json::<LogsResponse>()?;
-    if status.is_success() {
-      match response_data.logs {
-          None => println!("No logs found"),
-          Some(logs) => {
-            let mut table = Table::new();
-            table.add_row(row!["TIME", "CAPSULE", "PATH"]);
-            for log in logs {
-              table.add_row(row![log.time(), capsule_name, log.path]);
-            }
-            table.printstd();
-          },
-      }
-      return Ok(true);
-    } else {
-      let error_message = match response_data.message {
-        None => String::from("Unknown error"),
-        Some(message) => message,
-      };
-      println!("Unable to get the logs for your capsule: {}", &error_message);
-      return Err(Box::from("Unable to get logs"));
-    }
-}
 
 fn main() {
     // Setup config
@@ -269,7 +214,7 @@ fn main() {
 
     // Read command-line commands/args
     let app_args = App::new("Capsule.Town")
-        .version("0.2")
+        .version("0.1")
         .author("Will W. (wilw.dev)")
         .about("Publishes your capsule to capsule.town")
         .subcommand(SubCommand::with_name("create")
@@ -280,14 +225,7 @@ fn main() {
                 .short("c")
                 .long("capsule")
                 .takes_value(true)
-                .help("Name of the capsule to be published")))
+                .help("Name of the capsule to be published")));
-        .subcommand(SubCommand::with_name("logs")
-          .about("View access logs for your capsule")
-          .arg(Arg::with_name("capsule")
-              .short("c")
-              .long("capsule")
-              .takes_value(true)
-              .help("Name of the capsule to view logs for")));
     let matches = app_args.get_matches();
 
     // Handle commands
@@ -297,12 +235,8 @@ fn main() {
             let capsule_name = sub_match.value_of("capsule");
             publish_capsule(capsule_name)
         },
-        ("logs", Some(sub_match)) => {
-            let capsule_name = sub_match.value_of("capsule");
-            capsule_logs(capsule_name)
-        },
         _ => {
-            println!("Unknown command. Available commands: create, publish, logs");
+            println!("Unknown command. Available commands: create, publish");
             Err(Box::from("Unable to continue"))
         },
     } {