From c299edd62d1436cf110ecbaccfa388dec9df69fb Mon Sep 17 00:00:00 2001
From: DastInDark <2350416+hitenkoku@users.noreply.github.com>
Date: Sun, 3 Jul 2022 22:56:56 +0900
Subject: [PATCH] fix: used check path func based on current exection path #618

---
 src/afterfact.rs |  4 ++--
 src/main.rs      | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/afterfact.rs b/src/afterfact.rs
index b2cf7f25..f93823cf 100644
--- a/src/afterfact.rs
+++ b/src/afterfact.rs
@@ -65,8 +65,8 @@ lazy_static! {
 /// level_color.txtファイルを読み込み対応する文字色のマッピングを返却する関数
 pub fn set_output_color() -> HashMap<String, Color> {
     let read_result = utils::read_csv(
-        CURRENT_EXE_PATH
-            .join("config/level_color.txt")
+        utils::check_setting_path(&CURRENT_EXE_PATH.to_path_buf(),
+"config/level_color.txt")
             .to_str()
             .unwrap(),
     );
diff --git a/src/main.rs b/src/main.rs
index ee171f4b..7bd2cab2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -79,8 +79,8 @@ impl App {
     fn exec(&mut self) {
         if *PIVOT_KEYWORD_LIST_FLAG {
             load_pivot_keywords(
-                CURRENT_EXE_PATH
-                    .join("config/pivot_keywords.txt")
+                utils::check_setting_path(&CURRENT_EXE_PATH.to_path_buf(),
+"config/pivot_keywords.txt")
                     .to_str()
                     .unwrap(),
             );
@@ -253,8 +253,8 @@ impl App {
                 .unwrap();
             let level_tuning_config_path = match level_tuning_val {
                 Some(path) => path.to_owned(),
-                _ => CURRENT_EXE_PATH
-                    .join("./rules/config/level_tuning.txt")
+                _ => utils::check_setting_path(&CURRENT_EXE_PATH.to_path_buf(),
+                    "./rules/config/level_tuning.txt")
                     .display()
                     .to_string(),
             };
@@ -458,7 +458,7 @@ impl App {
     }
 
     fn print_contributors(&self) {
-        match fs::read_to_string(CURRENT_EXE_PATH.join("contributors.txt")) {
+        match fs::read_to_string(utils::check_setting_path(&CURRENT_EXE_PATH.to_path_buf(), "contributors.txt")) {
             Ok(contents) => {
                 write_color_buffer(
                     &BufferWriter::stdout(ColorChoice::Always),
@@ -707,7 +707,7 @@ impl App {
 
     /// output logo
     fn output_logo(&self) {
-        let fp = CURRENT_EXE_PATH.join("art/logo.txt");
+        let fp = utils::check_setting_path(&CURRENT_EXE_PATH.to_path_buf(), "art/logo.txt");
         let content = fs::read_to_string(fp).unwrap_or_default();
         let output_color = if configs::CONFIG.read().unwrap().args.no_color {
             None
@@ -734,7 +734,7 @@ impl App {
         match eggs.get(exec_datestr) {
             None => {}
             Some(path) => {
-                let egg_path = CURRENT_EXE_PATH.join(path);
+                let egg_path =utils::check_setting_path(&CURRENT_EXE_PATH.to_path_buf(),path);
                 let content = fs::read_to_string(egg_path).unwrap_or_default();
                 write_color_buffer(
                     &BufferWriter::stdout(ColorChoice::Always),