Put all external paths in one place

Making it easy to modify and to change using conditional compilation
if needed.

Author: brianch

src/config.rs

@@ -13,6 +13,12 @@ pub static SETTINGS: Lazy<OfflinePuzzlesConfig> = Lazy::new(|| {
 pub const CHESS_ALPHA_BYTES: &[u8] = include_bytes!("../font/Alpha.ttf");
 pub const CHESS_ALPHA: Font = iced::Font::with_name("Chess Alpha");
 
+//pub const FONT_DIRECTORY: &str = "font/";
+pub const PUZZLES_DIRECTORY: &str = "puzzles/";
+pub const TRANSLATIONS_DIRECTORY: &str = "./translations/";
+pub const SETTINGS_FILE: &str = "settings.json";
+pub const PIECES_DIRECTORY: &str = "pieces/";
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum GameMode {
     Puzzle,
@@ -53,7 +59,7 @@ impl ::std::default::Default for OfflinePuzzlesConfig {
             window_width: 1010.,
             window_height: 680.,
             maximized: false,
-            puzzle_db_location: String::from("puzzles/lichess_db_puzzle.csv"),
+            puzzle_db_location: String::from(PUZZLES_DIRECTORY) + "lichess_db_puzzle.csv",
             piece_theme: styles::PieceTheme::Cburnett,
             search_results_limit: 20000,
             play_sound: true,
@@ -76,7 +82,7 @@ impl ::std::default::Default for OfflinePuzzlesConfig {
 
 pub fn load_config() -> OfflinePuzzlesConfig {
     let config;
-    let file = std::fs::File::open("settings.json");
+    let file = std::fs::File::open(SETTINGS_FILE);
     match file {
         Ok(file) => {
             let reader = std::io::BufReader::new(file);

src/download_db.rs

@@ -9,8 +9,7 @@ use std::fs::OpenOptions;
 use zstd;
 
 use crate::Message;
-
-pub const LICHESS_ZST_FILE : &str = "puzzles/lichess_db_puzzle.csv.zst";
+use crate::config::PUZZLES_DIRECTORY;
 
 pub enum DownloadState {
     StartDownload {
@@ -31,7 +30,7 @@ pub fn download_lichess_db(url: String, path: String) -> Subscription<Message> {
 }
 
 fn download_stream(url: String, path: String) -> impl Stream<Item = Message> {
-
+    let lichess_zst_file = String::from(PUZZLES_DIRECTORY) + "lichess_db_puzzle.csv.zst";
     stream::channel(100,
         |mut output| async move  {
             let mut state = DownloadState::StartDownload{ url , path: path.clone()};
@@ -43,7 +42,7 @@ fn download_stream(url: String, path: String) -> impl Stream<Item = Message> {
                         match response {
                             Ok(response) => {
                                 if let Some(total) = response.content_length() {
-                                    let file = OpenOptions::new().append(true).read(true).create(true).open(LICHESS_ZST_FILE).expect("Unable to create lichess db archive.");
+                                    let file = OpenOptions::new().append(true).read(true).create(true).open(&lichess_zst_file).expect("Unable to create lichess db archive.");
                                     state = DownloadState::DownloadInProgress {
                                         response,
                                         file,
@@ -80,7 +79,7 @@ fn download_stream(url: String, path: String) -> impl Stream<Item = Message> {
                                 let target = std::fs::File::create(path.clone()).expect(&("Error creating file ".to_owned() + &path));
                                 zstd::stream::copy_decode(file, target).unwrap();
 
-                                let _ = std::fs::remove_file(LICHESS_ZST_FILE);
+                                let _ = std::fs::remove_file(&lichess_zst_file);
                                 let _ = output.send(Message::DBDownloadFinished).await;
 
                                 state = DownloadState::Finished;

src/lang.rs

@@ -4,8 +4,10 @@ use unic_langid::langid;
 use std::io::Read;
 use once_cell::sync::Lazy;
 
+use crate::config::TRANSLATIONS_DIRECTORY;
+
 static BUNDLE_ENUS: Lazy<FluentBundle<FluentResource, intl_memoizer::concurrent::IntlLangMemoizer>> = Lazy::new(|| {
-    let file = std::fs::File::open("./translations/en-US/ocp.ftl").unwrap();
+    let file = std::fs::File::open(TRANSLATIONS_DIRECTORY.to_owned() + "en-US/ocp.ftl").unwrap();
     let mut reader = std::io::BufReader::new(file);
     let mut source = String::new();
     reader.read_to_string(&mut source).expect("Failed to read en-US translation file");
@@ -16,7 +18,7 @@ static BUNDLE_ENUS: Lazy<FluentBundle<FluentResource, intl_memoizer::concurrent:
 });
 
 static BUNDLE_PTBR: Lazy<FluentBundle<FluentResource, intl_memoizer::concurrent::IntlLangMemoizer>> = Lazy::new(|| {
-    let file = std::fs::File::open("./translations/pt-BR/ocp.ftl").unwrap();
+    let file = std::fs::File::open(TRANSLATIONS_DIRECTORY.to_owned() + "pt-BR/ocp.ftl").unwrap();
     let mut reader = std::io::BufReader::new(file);
     let mut source = String::new();
     reader.read_to_string(&mut source).expect("Failed to read pt-BR translation file");
@@ -27,7 +29,7 @@ static BUNDLE_PTBR: Lazy<FluentBundle<FluentResource, intl_memoizer::concurrent:
 });
 
 static BUNDLE_ES: Lazy<FluentBundle<FluentResource, intl_memoizer::concurrent::IntlLangMemoizer>> = Lazy::new(|| {
-    let file = std::fs::File::open("./translations/es/ocp.ftl").unwrap();
+    let file = std::fs::File::open(TRANSLATIONS_DIRECTORY.to_owned() + "es/ocp.ftl").unwrap();
     let mut reader = std::io::BufReader::new(file);
     let mut source = String::new();
     reader.read_to_string(&mut source).expect("Failed to read ES translation file");
@@ -38,7 +40,7 @@ static BUNDLE_ES: Lazy<FluentBundle<FluentResource, intl_memoizer::concurrent::I
 });
 
 static BUNDLE_FR: Lazy<FluentBundle<FluentResource, intl_memoizer::concurrent::IntlLangMemoizer>> = Lazy::new(|| {
-    let file = std::fs::File::open("./translations/fr/ocp.ftl").unwrap();
+    let file = std::fs::File::open(TRANSLATIONS_DIRECTORY.to_owned() + "fr/ocp.ftl").unwrap();
     let mut reader = std::io::BufReader::new(file);
     let mut source = String::new();
     reader.read_to_string(&mut source).expect("Failed to read FR translation file");

src/search_tab.rs

@@ -6,7 +6,7 @@ use std::io::BufReader;
 
 use iced_aw::TabLabel;
 use chess::{Piece, PROMOTION_PIECES};
-use crate::config::load_config;
+use crate::config::{load_config, SETTINGS_FILE, PIECES_DIRECTORY};
 use crate::styles::PieceTheme;
 use crate::{Tab, Message, config, styles, lang, db, openings};
 
@@ -197,11 +197,11 @@ pub fn gen_piece_vec(theme: &PieceTheme) -> Vec<Handle> {
     let mut handles = Vec::<Handle>::with_capacity(5);
     let theme_str = &theme.to_string();
     // this first entry won't be used, it's there just to fill the vec, so we can index by the Piece
-    handles.insert(0, Handle::from_path("pieces/cburnett/wP.svg"));
-    handles.insert(Piece::Knight.to_index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wN.svg"));
-    handles.insert(Piece::Bishop.to_index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wB.svg"));
-    handles.insert(Piece::Rook.to_index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wR.svg"));
-    handles.insert(Piece::Queen.to_index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wQ.svg"));
+    handles.insert(0, Handle::from_path(String::from(PIECES_DIRECTORY) + "cburnett/wP.svg"));
+    handles.insert(Piece::Knight.to_index(), Handle::from_path(String::from(PIECES_DIRECTORY) + &theme_str + "/wN.svg"));
+    handles.insert(Piece::Bishop.to_index(), Handle::from_path(String::from(PIECES_DIRECTORY) + &theme_str + "/wB.svg"));
+    handles.insert(Piece::Rook.to_index(), Handle::from_path(String::from(PIECES_DIRECTORY) + &theme_str + "/wR.svg"));
+    handles.insert(Piece::Queen.to_index(), Handle::from_path(String::from(PIECES_DIRECTORY) + &theme_str + "/wQ.svg"));
     handles
 }
 
@@ -297,7 +297,7 @@ impl SearchTab {
     }
 
     pub fn save_search_settings(min_rating: i32, max_rating: i32, min_popularity: i32, theme: TacticalThemes, opening: Openings, variation: Variation, op_side: Option<OpeningSide>) {
-        let file = std::fs::File::open("settings.json");
+        let file = std::fs::File::open(SETTINGS_FILE);
         if let Ok(file) = file {
             let buf_reader = BufReader::new(file);
             if let Ok(mut config) = serde_json::from_reader::<std::io::BufReader<std::fs::File>, config::OfflinePuzzlesConfig>(buf_reader) {
@@ -309,7 +309,7 @@ impl SearchTab {
                 config.last_variation = variation;
                 config.last_opening_side = op_side;
 
-                let file = std::fs::File::create("settings.json");
+                let file = std::fs::File::create(SETTINGS_FILE);
                 if let Ok(file) = file {
                     if serde_json::to_writer_pretty(file, &config).is_err() {
                         println!("Error saving search options.");

src/settings.rs

@@ -6,6 +6,7 @@ use iced_aw::TabLabel;
 use rfd::AsyncFileDialog;
 
 use crate::{Message, Tab, config, styles, lang, lang::PickListWrapper};
+use crate::config::SETTINGS_FILE;
 
 #[derive(Debug, Clone)]
 pub enum SettingsMessage {
@@ -158,7 +159,7 @@ impl SettingsTab {
                     last_variation: self.saved_configs.last_variation.clone(),
                     last_opening_side: self.saved_configs.last_opening_side,
                 };
-                let file = std::fs::File::create("settings.json");
+                let file = std::fs::File::create(SETTINGS_FILE);
                 match file {
                     Ok(file) => {
                         if serde_json::to_writer_pretty(file, &config).is_ok() {
@@ -183,7 +184,7 @@ impl SettingsTab {
         config.window_width = self.window_width;
         config.window_height = self.window_height;
         config.maximized = self.maximized;
-        let file = std::fs::File::create("settings.json");
+        let file = std::fs::File::create(SETTINGS_FILE);
         match file {
             Ok(file) => {
                 if serde_json::to_writer_pretty(file, &config).is_err() {