2ndbeam/squad-quest
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: 2ndbeam:master
Branches Tags
2ndbeam:master
2ndbeam:0.5.1
2ndbeam:0.5.0
2ndbeam:0.4.0
2ndbeam:0.3.0
2ndbeam:0.2.0
2ndbeam:0.1.0
..
compare: 2ndbeam:0.5.0
Branches Tags
2ndbeam:master
2ndbeam:0.5.1
2ndbeam:0.5.0
2ndbeam:0.4.0
2ndbeam:0.3.0
2ndbeam:0.2.0
2ndbeam:0.1.0

No commits in common. "master" and "0.5.0" have entirely different histories.
master ... 0.5.0

5 changed files with 25 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -2,7 +2,7 @@
members = ["cli"]
[workspace.package]
version = "0.5.1"
version = "0.5.0"
edition = "2024"
repository = "https://2ndbeam.ru/git/2ndbeam/squad-quest"
license = "MIT"

14
cfg/config.toml
View file

@ -1,4 +1,10 @@
quests_path = "quests"
accounts_path = "accounts"
map = "map.toml"
verbose = true
# Default config
# Path to quests folder relative to config
quests_path = "./quests"
# Path to accounts folder relative to config
accounts_path = "./accounts"
# Path to map .toml file relative to config
map = "./map.toml"

9
cli/src/cli/mod.rs
View file

@ -1,6 +1,6 @@
use std::path::PathBuf;
use clap::{Args,Parser,Subcommand};
use clap::{Parser,Subcommand};
pub mod account;
pub mod map;
@ -23,8 +23,6 @@ pub struct Cli {
#[derive(Subcommand)]
pub enum Objects {
/// Initialize new SquadQuest in current working directory
Init(InitArgs),
/// Operations on the quests
#[command(subcommand)]
Quest(quest::QuestCommands),
@ -36,8 +34,3 @@ pub enum Objects {
Map(map::MapCommands),
}
#[derive(Args)]
pub struct InitArgs {
#[arg(long,short)]
pub path: Option<PathBuf>,
}

69
cli/src/main.rs
View file

@ -1,4 +1,4 @@
use std::{fs::DirBuilder, path::{Path, PathBuf}};
use std::path::{Path, PathBuf};
use clap::Parser;
use squad_quest_cli::cli::{Cli,Objects,account::*,map::*,quest::*};
@ -25,17 +25,19 @@ fn do_and_log(result: Result<(),Error>, log: bool, ok_text: String) {
}
}
fn load_config_silent(quiet: bool, path: PathBuf) -> Config {
match quiet {
false => Config::load(path.clone()),
fn main() {
let cli = Cli::parse();
let config = match cli.quiet {
false => Config::load(cli.config.clone()),
true => {
match Config::try_load(path.clone()) {
match Config::try_load(cli.config.clone()) {
Ok(mut config) => {
config.verbose = false;
config
},
Err(_) => {
let path = path.clone().parent().unwrap_or(&Path::new(".")).to_owned();
let path = cli.config.clone().parent().unwrap_or(&Path::new(".")).to_owned();
Config {
verbose: false,
path,
@ -44,61 +46,9 @@ fn load_config_silent(quiet: bool, path: PathBuf) -> Config {
}
}
},
}
}
fn main() {
let cli = Cli::parse();
let config = load_config_silent(cli.quiet, cli.config.clone());
let map_save = |map: Map, map_path: PathBuf| { map.save(map_path.parent().unwrap_or(Path::new("")).to_owned()) };
};
match &cli.command {
Objects::Init(args) => {
let path = match args.path.clone() {
Some(path) => path,
None => PathBuf::new(),
};
match DirBuilder::new().recursive(true).create(path.clone()) {
Ok(_) if !cli.quiet => println!("Created directory {:?}", path),
Err(error) => {
if !cli.quiet { eprintln!("Error: {error}"); }
return;
},
_ => {},
}
let config = Config {
path: path.clone(),
..Default::default()
};
do_and_log(config.save(path.clone()), !cli.quiet, format!("Created file {:?}/config.toml", path));
let mut config_path = path.clone();
config_path.push("config.toml");
let mut config = load_config_silent(true, config_path);
config.verbose = Config::default().verbose;
let map = Map::default();
let map_path = config.full_map_path();
do_and_log(map_save(map, map_path.clone()), !cli.quiet, format!("Created file {:?}/map.toml", map_path));
let quests_path = config.full_quests_path();
let accounts_path = config.full_accounts_path();
for path in [quests_path, accounts_path] {
match DirBuilder::new().recursive(true).create(path.clone()) {
Ok(_) if !cli.quiet => println!("Created directory {:?}", path),
Err(error) => {
if !cli.quiet { eprintln!("Error: {error}"); }
return;
},
_ => {},
}
}
},
Objects::Quest(commands) => {
let mut quests = config.load_quests();
let mut path = config.full_quests_path();
@ -339,6 +289,7 @@ fn main() {
}
};
let map_save = |map: Map, map_path: PathBuf| { map.save(map_path.parent().unwrap_or(Path::new("")).to_owned()) };
match commands {
MapCommands::List => {
for room in map.room {

42
src/config/mod.rs
View file

@ -1,12 +1,12 @@
//! Configuration file that handles (de-)serializing other components
use std::{fs::{self, DirEntry}, io::Write, path::{Path, PathBuf}};
use serde::{Deserialize, Serialize};
use std::{fs::{self, DirEntry},path::{Path, PathBuf}};
use serde::Deserialize;
use crate::{SquadObject, account::Account, error::Error, quest::Quest};
/// Struct for containing paths to other (de-)serializable things
#[derive(Serialize, Deserialize)]
#[derive(Deserialize)]
#[serde(default)]
pub struct Config {
/// Path to config directory
@ -112,42 +112,6 @@ impl Config {
}
}
/// Serialize config into TOML.
/// Config will be saved as `path/config.toml`
///
/// # Examples
/// ```rust
/// use squad_quest::config::Config;
///
/// let path = "cfg".into();
///
/// let config = Config::default();
///
/// if let Err(error) = config.save(path) {
/// // handle error
/// }
/// ```
pub fn save(&self, path: PathBuf) -> Result<(), Error> {
let mut path = path;
path.push("config.toml");
let str = match toml::to_string_pretty(&self) {
Ok(string) => string,
Err(error) => return Err(Error::TomlSerializeError(error)),
};
let mut file = match fs::File::create(path) {
Ok(f) => f,
Err(error) => return Err(Error::IoError(error)),
};
if let Err(error) = file.write_all(str.as_bytes()) {
return Err(Error::IoError(error));
}
Ok(())
}
/// Deserialize config from TOML
///
/// # Examples