Moving saved state to a more sensible location

Author: norru

src/app/main.rs

@@ -1,5 +1,4 @@
 use std::path;
-
 use frontend::render;
 use frontend::input::EventMapper;
 use frontend::input::GamepadEventLoop;
@@ -11,6 +10,7 @@ use frontend::gfx_window_glutin;
 use conrod;
 
 use core::resource::filesystem::ResourceLoaderBuilder;
+use core::resource::filesystem::ResourceLoader;
 use core::math::Directional;
 use core::clock::{seconds, SecondsValue, Hourglass, SystemTimer};
 use ctrlc;
@@ -22,7 +22,19 @@ use winit::{self, WindowEvent, VirtualKeyCode, KeyboardInput};
 use glutin;
 use glutin::GlContext;
 
-pub fn main_loop(minion_gene_pool: &str, world_file: Option<String>, fullscreen: Option<usize>, width: Option<u32>, height: Option<u32>, audio_device: Option<usize>) {
+pub fn make_resource_loader(config_home: &path::Path) -> ResourceLoader {
+	let res = ResourceLoaderBuilder::new()
+		.add(path::Path::new("./resources"))
+		.add(config_home.join("resources").as_path())
+		.add(config_home.join("saved_state").as_path())
+		.add(path::Path::new("/usr/local/share/rust-oids/resources"))
+		.add(path::Path::new("/usr/share/rust-oids/resources"))
+		.build();
+
+	res
+}
+
+pub fn main_loop(minion_gene_pool: &str, config_home: path::PathBuf, world_file: Option<String>, fullscreen: Option<usize>, width: Option<u32>, height: Option<u32>, audio_device: Option<usize>) {
 	const WIDTH: u32 = 1280;
 	const HEIGHT: u32 = 1024;
 
@@ -56,15 +68,13 @@ pub fn main_loop(minion_gene_pool: &str, world_file: Option<String>, fullscreen:
 
 	let mut encoder = factory.create_command_buffer().into();
 
-	let res = ResourceLoaderBuilder::new()
-		.add(path::Path::new("resources"))
-		.build();
+	let res = make_resource_loader(&config_home);
 
 	let renderer = &mut render::ForwardRenderer::new(&mut factory, &mut encoder, &res, &frame_buffer).unwrap();
 	let mapper = app::WinitEventMapper::new();
 
 	// Create a new game and run it.
-	let mut app = app::App::new(w as u32, h as u32, 100.0, &res, minion_gene_pool, world_file);
+	let mut app = app::App::new(w as u32, h as u32, 100.0, config_home, &res, minion_gene_pool, world_file);
 
 	let mut ui = ui::conrod_ui::Ui::new(&res,
 										&mut factory,
@@ -163,14 +173,12 @@ pub fn main_loop(minion_gene_pool: &str, world_file: Option<String>, fullscreen:
 	};
 }
 
-pub fn main_loop_headless(minion_gene_pool: &str, world_file: Option<String>) {
+pub fn main_loop_headless(minion_gene_pool: &str, config_home: path::PathBuf, world_file: Option<String>) {
 	const WIDTH: u32 = 1024;
 	const HEIGHT: u32 = 1024;
-	let res = ResourceLoaderBuilder::new()
-		.add(path::Path::new("resources"))
-		.build();
+	let res = make_resource_loader(&config_home);
 
-	let mut app = app::App::new(WIDTH, HEIGHT, 100.0, &res, minion_gene_pool, world_file);
+	let mut app = app::App::new(WIDTH, HEIGHT, 100.0, config_home, &res, minion_gene_pool, world_file);
 	let mut no_audio = ui::NullAlertPlayer::new();
 	app.init(app::SystemMode::Batch);
 

src/app/mod.rs

@@ -22,6 +22,8 @@ use core::view::WorldTransform;
 use frontend::input;
 use frontend::ui;
 use std::fs;
+use std::env;
+use std::path;
 use getopts::Options;
 use num;
 use rayon::prelude::*;
@@ -51,7 +53,7 @@ pub fn run(args: &[OsString]) {
 	let mut opt = Options::new();
 	opt.optflag("t", "terminal", "Headless mode");
 	opt.optopt("f", "fullscreen", "Fullscreen mode on monitor X", "0");
-	opt.optopt("i", "initial", "Start from specific snapshot", "resources/20180423_234300.json");
+	opt.optopt("i", "initial", "Start from specific snapshot", ".config/rust-oids/saved_state/20180423_234300.json");
 	opt.optflag("n", "new", "Ignore last snapshot, start from new population");
 	opt.optopt("w", "width", "Window width", "1024");
 	opt.optopt("h", "height", "Window height", "1024");
@@ -63,10 +65,13 @@ pub fn run(args: &[OsString]) {
 			);
 			let mut world_file = options.opt_str("i");
 
+			let user_home = env::home_dir().unwrap_or(path::PathBuf::from("."));
+			let config_home = user_home.join(".config/rust-oids");
+
 			// TODO: tidy up
 			if !options.opt_present("n") && world_file.is_none() {
 				let mut max_path = "".to_owned();
-				if let Ok(dir) = fs::read_dir("resources") {
+				if let Ok(dir) = fs::read_dir(config_home.join("saved_state")) {
 					for entry in dir {
 						let path_name = entry
 							.unwrap().path()
@@ -85,14 +90,14 @@ pub fn run(args: &[OsString]) {
 			}
 
 			if options.opt_present("t") {
-				main::main_loop_headless(pool_file_name, world_file);
+				main::main_loop_headless(pool_file_name, config_home, world_file);
 			} else {
 				let fullscreen = options.opt_default("f", "0").and_then(|v| v.parse::<usize>().ok());
 				let width = options.opt_default("w", "1024").and_then(|v| v.parse::<u32>().ok());
 				let height = options.opt_default("h", "1024").and_then(|v| v.parse::<u32>().ok());
 				let audio_device = options.opt_default("a", "0").and_then(|v| v.parse::<usize>().ok());
 
-				main::main_loop(pool_file_name, world_file, fullscreen, width, height, audio_device);
+				main::main_loop(pool_file_name, config_home, world_file, fullscreen, width, height, audio_device);
 			}
 		}
 		Err(message) => {
@@ -297,7 +302,7 @@ pub struct FrameUpdate {
 }
 
 impl App {
-	pub fn new<R>(w: u32, h: u32, scale: f32, resource_loader: &R, minion_gene_pool: &str, world_file: Option<String>) -> Self
+	pub fn new<R>(w: u32, h: u32, scale: f32, config_home: path::PathBuf, resource_loader: &R, minion_gene_pool: &str, world_file: Option<String>) -> Self
 		where
 			R: ResourceLoader<u8>, {
 		let system_timer = SystemTimer::new();