diff --git a/upload/src/auth.rs b/upload/src/auth.rs deleted file mode 100644 index e5d21f5..0000000 --- a/upload/src/auth.rs +++ /dev/null @@ -1,4 +0,0 @@ -pub struct Session { - pds: String, - id: crate::config::Id, -} diff --git a/upload/src/main.rs b/upload/src/main.rs index 29ce57a..5fcd88d 100644 --- a/upload/src/main.rs +++ b/upload/src/main.rs @@ -1,18 +1,36 @@ -mod auth; mod config; -mod types; fn main() -> Result<(), ()> { - let config = config::extract(); - if let Err(err) = config { - match err { - config::ConfigErr::TooManyDirectories => println!("Too many directories"), - config::ConfigErr::NotEnoughArgs(args) => println!("Missing {}", args), - config::ConfigErr::UnknownArg(arg) => println!("Unknown arg {}", arg), - config::ConfigErr::NotADirectory => println!("Not a directory"), + // get config items + let config = match config::extract() { + Ok(v) => v, + Err(err) => { + match err { + config::ConfigErr::TooManyDirectories => println!("Too many directories"), + config::ConfigErr::NotEnoughArgs(args) => println!("Missing {}", args), + config::ConfigErr::UnknownArg(arg) => println!("Unknown arg {}", arg), + config::ConfigErr::NotADirectory => println!("Not a directory"), + } + return Err(()); } - return Err(()); - } + }; + + println!( + "user: {} +pword: {} +dir: {}", + config.user, config.pword, config.dir + ); + + // create session + + // get local site info + + // upload local site blobs + + // find live site records + + // batch delete/upload records Ok(()) } diff --git a/upload/src/types.rs b/upload/src/types.rs deleted file mode 100644 index f7ddaad..0000000 --- a/upload/src/types.rs +++ /dev/null @@ -1,44 +0,0 @@ -pub enum Did { - Web(String), - Plc(String), -} - -enum DidError { - UnknownMethod, - MalformedDid, -} - -impl Did { - fn from(did: String) -> Result { - if did.starts_with("did:plc:") { - return Ok(Did::Plc(String::from(did[8..]))); - } else if did.starts_with("did:web:") { - return Ok(Did::Plc(String::from(did[8..]))); - } else if did.starts_with("did:") { - return Err(DidError::UnknownMethod); - } else { - return Err(DidError::MalformedDid); - } - } -} - -pub struct User { - handle: Option, - did: Did, - pds: String, -} - -enum UserFromErr { - InvalidHandle, - NoDidForHandle, - HandleNotBidirectional, - DidParseError(DidError), - DidNotBidirectional, - NoPds, -} - -impl User { - fn fromHandle(handle: String) -> Result {} - - fn fromDid(did: String) -> Result {} -}