Browse Source

Extract application facts into module

timvisee 7 years ago
parent
commit
57d2e79400
2 changed files with 23 additions and 10 deletions
  1. 11 0
      src/app.rs
  2. 12 10
      src/main.rs

+ 11 - 0
src/app.rs

@@ -0,0 +1,11 @@
+/// The application name.
+pub const APP_NAME: &'static str = "ffsend";
+
+/// The application version.
+pub const APP_VERSION: &'static str = "0.1";
+
+/// The application author.
+pub const APP_AUTHOR: &'static str = "Tim Visee <timvisee@gmail.com>";
+
+/// Application about information.
+pub const APP_ABOUT: &'static str = "A simple Firefox Send CLI client.";

+ 12 - 10
src/main.rs

@@ -8,6 +8,7 @@ extern crate reqwest;
 #[macro_use]
 #[macro_use]
 extern crate serde_derive;
 extern crate serde_derive;
 
 
+mod app;
 mod b64;
 mod b64;
 mod crypto;
 mod crypto;
 mod metadata;
 mod metadata;
@@ -24,23 +25,24 @@ use reqwest::header::Authorization;
 use reqwest::mime::APPLICATION_OCTET_STREAM;
 use reqwest::mime::APPLICATION_OCTET_STREAM;
 use reqwest::multipart::Part;
 use reqwest::multipart::Part;
 
 
+use app::*;
 use crypto::{derive_auth_key, derive_file_key, derive_meta_key};
 use crypto::{derive_auth_key, derive_file_key, derive_meta_key};
 use metadata::{Metadata, XFileMetadata};
 use metadata::{Metadata, XFileMetadata};
 use reader::EncryptedFileReaderTagged;
 use reader::EncryptedFileReaderTagged;
 
 
 fn main() {
 fn main() {
     // Handle CLI arguments
     // Handle CLI arguments
-    let matches = App::new("ffsend")
-        .version("0.1.0")
-        .author("Tim Visee <timvisee@gmail.com>")
-        .about("A simple Firefox Send CLI client")
+    let matches = App::new(APP_NAME)
+            .version(APP_VERSION)
+            .author(APP_AUTHOR)
+            .about(APP_ABOUT)
         .arg(Arg::with_name("file")
         .arg(Arg::with_name("file")
-             .short("f")
-             .long("file")
-             .value_name("PATH")
-             .help("The file to upload")
-             .required(true)
-             .multiple(false))
+            .short("f")
+            .long("file")
+            .value_name("PATH")
+            .help("The file to upload")
+            .required(true)
+            .multiple(false))
         .get_matches();
         .get_matches();
 
 
     // Get the path
     // Get the path