Skip to content

idea / generate a conf file with --init-config #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fabienjuif wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

idea / generate a conf file with --init-config #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 53 additions & 6 deletions src/configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::{
use clap::Parser;
use hex_color::HexColor;
use relm4::SharedState;
use serde_derive::Deserialize;
use serde_derive::{Deserialize, Serialize};
use thiserror::Error;
use xdg::{BaseDirectories, BaseDirectoriesError};

Expand All @@ -29,6 +29,9 @@ enum ConfigurationFileError {

#[error("Decoding toml failed: {0}")]
TomlDecoding(#[from] toml::de::Error),

#[error("Serializing toml failed: {0}")]
TomlEncoding(#[from] toml::ser::Error),
}

pub struct Configuration {
Expand Down Expand Up @@ -100,7 +103,7 @@ impl ColorPalette {
}
}

#[derive(Debug, Clone, Copy, Deserialize)]
#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)]
#[serde(rename_all = "kebab-case")]
pub enum Action {
SaveToClipboard,
Expand Down Expand Up @@ -149,6 +152,9 @@ impl Configuration {
}
};

if file.is_none() {
ConfigurationFile::create().expect("Failed to create config file");
}
APP_CONFIG.write().merge(file, command_line);
}
fn merge_general(&mut self, general: ConfigurationFileGeneral) {
Expand Down Expand Up @@ -389,22 +395,32 @@ impl Default for ColorPalette {
}
}

#[derive(Deserialize)]
#[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "kebab-case", deny_unknown_fields)]
struct ConfigurationFile {
general: Option<ConfigurationFileGeneral>,
color_palette: Option<ColorPaletteFile>,
font: Option<FontFile>,
}

#[derive(Deserialize)]
impl Default for ConfigurationFile {
fn default() -> Self {
Self {
general: Some(ConfigurationFileGeneral::default()),
color_palette: Default::default(),
font: Default::default(),
}
}
}

#[derive(Deserialize, Serialize, Default, Debug)]
#[serde(rename_all = "kebab-case", deny_unknown_fields)]
struct FontFile {
family: Option<String>,
style: Option<String>,
}

#[derive(Deserialize)]
#[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "kebab-case", deny_unknown_fields)]
struct ConfigurationFileGeneral {
fullscreen: Option<bool>,
Expand All @@ -424,7 +440,29 @@ struct ConfigurationFileGeneral {
no_window_decoration: Option<bool>,
}

#[derive(Deserialize)]
impl Default for ConfigurationFileGeneral {
fn default() -> Self {
Self {
fullscreen: Some(false),
early_exit: Some(false),
corner_roundness: Some(2.),
initial_tool: Some(Tools::Pointer),
copy_command: None,
annotation_size_factor: Some(1.0),
save_after_copy: None,
output_filename: None,
default_hide_toolbars: Some(false),
primary_highlighter: None,
disable_notifications: Some(false),
no_window_decoration: Some(false),
right_click_copy: None,
action_on_enter: None,
action_on_escape: None,
}
}
}

#[derive(Deserialize, Serialize, Default, Debug)]
#[serde(rename_all = "kebab-case", deny_unknown_fields)]
struct ColorPaletteFile {
palette: Option<Vec<HexColor>>,
Expand Down Expand Up @@ -455,4 +493,13 @@ impl ConfigurationFile {
let content = fs::read_to_string(path)?;
Ok(Some(toml::from_str::<ConfigurationFile>(&content)?))
}

fn create() -> Result<(), ConfigurationFileError> {
let def = ConfigurationFile::default();
println!("{:?}", def);
let str = toml::to_string(&def)?;
println!("Creating default config file:\n{}", str);

Ok(())
}
}
4 changes: 2 additions & 2 deletions src/tools/highlight.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use anyhow::Result;
use femtovg::{Paint, Path};

use relm4::gtk::gdk::{Key, ModifierType};
use serde_derive::Deserialize;
use serde_derive::{Deserialize, Serialize};

use crate::{
command_line,
Expand All @@ -19,7 +19,7 @@ use super::{Drawable, Tool, ToolUpdateResult};

const HIGHLIGHT_OPACITY: f64 = 0.4;

#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Deserialize)]
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Deserialize, Serialize)]
#[serde(rename_all = "lowercase")]
pub enum Highlighters {
Block = 0,
Expand Down
4 changes: 2 additions & 2 deletions src/tools/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use gdk_pixbuf::{
};

use glib::variant::FromVariant;
use serde_derive::Deserialize;
use serde_derive::{Deserialize, Serialize};

use crate::{
command_line,
Expand Down Expand Up @@ -143,7 +143,7 @@ pub use text::TextTool;

use self::{brush::BrushTool, marker::MarkerTool, pointer::PointerTool};

#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Deserialize)]
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Deserialize, Serialize)]
#[serde(rename_all = "lowercase")]
pub enum Tools {
Pointer = 0,
Expand Down