commit 0a1d27bf7aca4cacd10a1e574e14b5868c74d333

Author: Julien Blanchard <julien@typed-hole.org>

Date: Mon Apr 27 10:36:52 2020 +0200

Tidy config files

diff --git a/src/bookmarks.rs b/src/bookmarks.rs

index 0515e27..04607b2 100644

--- a/src/bookmarks.rs

+++ b/src/bookmarks.rs

@@ -1,4 +1,6 @@

extern crate dirs;

+

+use std::fs;

use std::fs::File;

use std::fs::OpenOptions;

use std::io::{Read, Write};

@@ -22,7 +24,9 @@ pub fn content() -> String {

fn bookmarks_file() -> File {

let mut bookmarks = dirs::data_local_dir().unwrap();

- bookmarks.push("castor_bookmarks");

+ bookmarks.push("castor");

+ fs::create_dir_all(&bookmarks).unwrap();

+ bookmarks.push("bookmarks");

let file_path = bookmarks.into_os_string();

OpenOptions::new()

diff --git a/src/settings.rs b/src/settings.rs

index aecddac..0372619 100644

--- a/src/settings.rs

+++ b/src/settings.rs

@@ -1,5 +1,6 @@

extern crate dirs;

+use std::fs;

use std::fs::File;

use std::fs::OpenOptions;

use std::io::Read;

@@ -151,9 +152,11 @@ fn read() -> Settings {

}

fn settings_file() -> File {

- let mut bookmarks = dirs::data_local_dir().unwrap();

- bookmarks.push("castor_settings.toml");

- let file_path = bookmarks.into_os_string();

+ let mut settings = dirs::config_dir().unwrap();

+ settings.push("castor");

+ fs::create_dir_all(&settings).unwrap();

+ settings.push("settings.toml");

+ let file_path = settings.into_os_string();

OpenOptions::new()

.create(true)

---

Served by Pollux Gemini Server.