Explorar el Código

[Main] Fix build

Signed-off-by: Slava Barinov <rayslava@gmail.com>
Slava Barinov hace 4 años
padre
commit
4c244fb12f
Se han modificado 3 ficheros con 31 adiciones y 8 borrados
  1. 21 0
      Cargo.lock
  2. 1 0
      Cargo.toml
  3. 9 8
      src/main.rs

+ 21 - 0
Cargo.lock

@@ -137,6 +137,26 @@ dependencies = [
  "vec_map",
 ]
 
+[[package]]
+name = "const_format"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ea7d6aeb2ebd1ee24f7b7e1b23242ef5a56b3a693733b99bfbe5ef31d0306"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c36c619c422113552db4eb28cddba8faa757e33f758cc3415bd2885977b591"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -995,6 +1015,7 @@ version = "0.1.0"
 dependencies = [
  "cc",
  "chrono",
+ "const_format",
  "csv",
  "derive_more",
  "libc",

+ 1 - 0
Cargo.toml

@@ -15,6 +15,7 @@ structopt = "0.3"
 shellexpand = "2.1"
 radix_trie = { version = "0.2", features = ["serde"] }
 libc = { version = "0.2" }
+const_format = "0.2"
 
 teloxide = { version = "0.4.0", features = ["auto-send", "macros"], optional = true }
 log = { version = "0.4.8", optional = true }

+ 9 - 8
src/main.rs

@@ -15,6 +15,7 @@ use structopt::StructOpt;
 mod categories;
 use categories::get_category;
 use categories::CatStats;
+use const_format::concatcp;
 
 mod import;
 mod receipt;
@@ -95,11 +96,11 @@ struct User {
     accounts: Vec<String>,
 }
 
-const default_db_path: &str = "~/.config/receqif/";
+const DEFAULT_DB_PATH: &str = "~/.config/receqif/";
 
 fn prep_user(uid: i128) -> User {
     let ten_sec = Duration::from_secs(10);
-    let path = default_db_path.to_owned() + &uid.to_string() + ".db";
+    let path = DEFAULT_DB_PATH.to_owned() + &uid.to_string() + ".db";
 
     let confpath: &str = &tilde(&path);
 
@@ -111,7 +112,7 @@ fn prep_user(uid: i128) -> User {
         SerializationMethod::Json,
     );
 
-    let mut db = match db {
+    let db = match db {
         Ok(db) => db,
         Err(_) => PickleDb::new(
             &confpath,
@@ -120,7 +121,7 @@ fn prep_user(uid: i128) -> User {
         ),
     };
 
-    let mut catmap: CatStats = match db.get("catmap") {
+    let catmap: CatStats = match db.get("catmap") {
         Some(v) => v,
         None => Trie::new(),
     };
@@ -131,9 +132,9 @@ fn prep_user(uid: i128) -> User {
     };
 
     User {
-        uid: uid,
-        catmap: catmap,
-        accounts: accounts,
+        uid,
+        catmap,
+        accounts,
     }
 }
 
@@ -146,7 +147,7 @@ struct Cli {
     #[structopt(parse(from_os_str), long, help = "Accounts csv file")]
     accounts: Option<PathBuf>,
 
-    #[structopt(short, long, default_value = &(default_db_path.to_owned() + "rc.db"))]
+    #[structopt(short, long, default_value = concatcp!(DEFAULT_DB_PATH,"rc.db"))]
     database: String,
 }