Merge pull request #10 from Lurk/config_path

proper config path

Author: Serhiy Barhamon

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "clink"
-version = "0.4.1"
+version = "0.5.0"
 authors = ["Sergey Bargamon <sergey@bargamon.ru>"]
 edition = "2018"
 
@@ -14,4 +14,5 @@ rustop = "1.1.1"
 rand = "0.8.3"
 confy="0.4.0"
 serde = { version = "1.0", features = ["derive"] }
-chrono = "0.4"
+chrono = "0.4"
+dirs = "3.0.1"

Cargo.toml

@@ -5,7 +5,17 @@ It sits quietly in the background, and if you copy a link to the clipboard, Clin
 
 ## Config
 
-In 0.4.0, we introduced the toml config. Clink will create a "clink.toml" file in a directory where the executable is located on a first-run. In this file, you will find the default config for Clink.
+Path for config file can be altered by -c, --config option.
+Default path:
+* Mac: /Users/Alice/Library/Application Support\clink\config.toml
+* Lin: /home/alice/.config/clink/config.toml
+* Win: C:\Users\Alice\AppData\Roaming\clink\config.toml
+* fallback: current directory/config.toml
+
+
+On the first run, clink will create the default config in the path.
+
+Default config:
 
 ```
 # You can find detail description of modes bellow
@@ -28,7 +38,7 @@ params = [
     'utm_campaign', # Identifies a specific product promotion or strategic campaign
     'utm_medium', # Identifies what type of link was used
     'utm_term', # Identifies search terms
-    'utm_content', Identifies what specifically was clicked to bring the user to the site
+    'utm_content', # Identifies what specifically was clicked to bring the user to the site
 ]
 ```
 

readme.md

@@ -4,13 +4,14 @@ mod utils;
 
 use mode::Mode;
 use params::{create_index, get_default_params};
-use utils::find_and_replace;
+use utils::{fallback_config_path, find_and_replace};
 
 use clipboard::{ClipboardContext, ClipboardProvider};
+use dirs::config_dir;
 use rustop::opts;
 use serde::{Deserialize, Serialize};
-use std::thread;
 use std::time::Duration;
+use std::{path::PathBuf, thread};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ClinkConfig {
@@ -39,14 +40,11 @@ fn main() -> Result<(), confy::ConfyError> {
         synopsis "Clink automatically cleans url in your clipboard";
         version env!("CARGO_PKG_VERSION");
         opt verbose:bool, desc:"Be verbose.";
+        opt config:String = fallback_config_path(config_dir()).into_os_string().into_string().unwrap(), desc: "config path";
     }
     .parse_or_exit();
 
-    let config_path = std::env::current_exe()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .join("clink.toml");
+    let config_path = PathBuf::from(args.config);
     let cfg: ClinkConfig = confy::load_path(&config_path)?;
 
     if !config_path.is_file() {

src/main.rs

@@ -4,7 +4,7 @@ use crate::ClinkConfig;
 use chrono::prelude::*;
 use linkify::{LinkFinder, LinkKind};
 use rand::Rng;
-use std::collections::HashMap;
+use std::{collections::HashMap, path::PathBuf};
 use url::Url;
 
 #[cfg(test)]
@@ -323,3 +323,16 @@ fn your_mom(
         })
         .collect()
 }
+
+pub fn fallback_config_path(path: Option<PathBuf>) -> PathBuf {
+    let p = match path {
+        Some(p) => p.join("clink"),
+        None => std::env::current_exe()
+            .unwrap()
+            .parent()
+            .unwrap()
+            .to_path_buf(),
+    };
+
+    p.join("config.toml")
+}