JustSoup321/dtmp - Change NG6IT3HBFFLWYWWIBPY3X2UX5CJ5E7TY26W52XGAT3G5C4KAWR3AC

create: further clean-up error handling, sanity checking, and warnings

Created by JustSoup321 on August 30, 2025

NG6IT3HBFFLWYWWIBPY3X2UX5CJ5E7TY26W52XGAT3G5C4KAWR3AC

Dependencies

In channels

main

Change contents

Replacement in src/main.rs at line 30 [5.442]

B:BD[4.132] → [4.132:163]

		dtmp_lib::actions::create();

[4.132]

[4.163]

		match dtmp_lib::actions::create() {
			Ok(()) => (),
			Err(e) => anyhow::bail!("Create failed with error:\n{}", e),
		}

Insertion in lib/parser.rs at line 18 [5.3485]
[5.3723]
[5.3723]
```
use anyhow;
```

Replacement in lib/parser.rs at line 37 [5.3485]

B:BD[5.3998] → [5.3998:4083]

pub fn parse(config_path: &std::path::Path) -> Result<Vec<Config>, std::io::Error> {

[5.3998]

[4.1309]

pub fn parse(config_path: &std::path::Path) -> Result<Vec<Config>, anyhow::Error> {

Replacement in lib/parser.rs at line 62 [5.3485]

B:BD[4.1960] → [4.1960:1978]

			return Err(e);

[4.1960]

[4.1978]

			anyhow::bail!("Parsing failed with error:\n{}", e);
		}
	}
	for config in &return_config {
		match sanity_check(config) {
			Ok(..) => (),
			Err(e) => anyhow::bail!("Parser sanity check failed with error:\n{}", e),

Deletion in lib/parser.rs at line 71 [5.3485]

B:BD[4.1985] → [4.1985:2104]

	// for line in return_config {
	//     match sanity_check(line) {
	//         Err(e) => return Err(e)
	//     }
	// }

Replacement in lib/parser.rs at line 74 [5.3485]

B:BD[5.5117] → [5.5117:5209]

fn read_config(config_path: &std::path::Path) -> Result<Vec<Vec<String>>, std::io::Error> {

[5.5117]

[4.2124]

fn read_config(config_path: &std::path::Path) -> Result<Vec<Vec<String>>, anyhow::Error> {

Insertion in lib/fields.rs at line 16 [5.5879]
[2.3032]
[5.6083]
```
use crate::parser::Config;
```

Replacement in lib/fields.rs at line 37 [5.5879]

B:BD[5.7021] → [3.51:127]

pub fn sanity_check(config_line: &Vec<&str>) -> Result<(), anyhow::Error> {

[5.7021]

[4.2707]

pub fn sanity_check(config: &Config) -> Result<(), anyhow::Error> {
	let mut specifier_prefix: bool = false;
	if VALID_SPECIFIERS.contains(
		&config
			.file_type
			.as_str()) == true {
		specifier_prefix = true;
	}

Replacement in lib/fields.rs at line 46 [5.5879]
B:BD[4.2733] → [4.2733:2765]
```
		&String::from(config_line[0])
```
[4.2733]
[4.2765]
```
		&config
			.file_type
```
Replacement in lib/fields.rs at line 53 [5.5879]
B:BD[4.2831] → [4.2831:2843]
```
	) == false
```
[4.2831]
[4.2843]
```
	) == false && specifier_prefix == false
```
Replacement in lib/fields.rs at line 55 [5.5879]
B:BD[4.2846] → [3.128:162]
```
		anyhow::bail!("Invalid type.");
```
[4.2846]
[4.2865]
```
		anyhow::bail!("Invalid file type!");
```

Replacement in lib/fields.rs at line 57 [5.5879]

B:BD[4.2868] → [4.2868:2961]

	if String::from(config_line[1])
		.chars()
		.next()
		.unwrap()
		.to_string()
		!= "/"
	{

[4.2868]

[3.163]

	if config.file_type.len() > 1 {
		if VALID_TYPE_MODIFIERS.contains(
			&config
				.file_type
				.chars()
				.nth(1)
				.unwrap()
				.to_string()
				.as_str(),
		) == false && specifier_prefix == false
		{
			anyhow::bail!("Invalid file type!")
		}
	}
	if !config.path.is_absolute() {

Replacement in lib/fields.rs at line 74 [5.5879]

B:BD[4.2983] → [4.2983:3057]

	if config_line[2].parse::<i32>().is_err() {
		if config_line[2] != "-" {

[4.2983]

[3.219]

	if config.mode.parse::<i32>().is_err() {
		if config.mode != "-" {

Replacement in lib/actions.rs at line 17 [5.7663]
B:BD[5.7868] → [6.985:998]
B:BD[6.998] → [4.3094:3135]
∅:D[4.3135] → [6.1059:1062]
B:BD[6.1059] → [6.1059:1062]
```
use crate::{
	fs::build_dir,
	parser::{self, Config},
};
```
[5.7868]
[5.7903]
```
use crate::{fs::build_dir, parser};
```
Replacement in lib/actions.rs at line 19 [5.7663]
B:BD[5.7904] → [6.1063:1074]
B:BD[6.1074] → [4.3136:3228]
∅:D[4.3228] → [6.1160:1163]
B:BD[6.1160] → [6.1160:1163]
```
use std::{
	fs::{DirBuilder, OpenOptions},
	io::Write,
	os::unix::fs::{DirBuilderExt, OpenOptionsExt},
};
```
[5.7904]
[5.7960]
```
use std::{fs::OpenOptions, io::Write, os::unix::fs::OpenOptionsExt};
```

Replacement in lib/actions.rs at line 23 [5.7663]

B:BD[4.3260] → [4.3260:3502]

B:BD[4.3502] → [3.309:390]

∅:D[3.390] → [4.3533:3541]

B:BD[4.3533] → [4.3533:3541]

B:BD[4.3541] → [3.391:471]

∅:D[3.471] → [4.3571:3582]

B:BD[4.3571] → [4.3571:3582]

	let config_files = std::fs::read_dir("/usr/lib/tmpfiles.d");
	match config_files {
		Ok(config_list) => {
			for file in config_list {
				match file {
					Ok(f) => match parser::parse(&f.path()) {
						Ok(config) => configs.push(config),
						Err(e) => anyhow::bail!("ERROR: Config parsing failed with error {}!", e),
					},
					Err(e) => anyhow::bail!("ERROR: Config parsing failed with error {}!", e),
				}
			}

[4.3260]

[4.3582]

	let config_files = std::fs::read_dir("/usr/lib/tmpfiles.d")?;
	for file in config_files {
		match file {
			Ok(f) => match parser::parse(&f.path()) {
				Ok(config) => configs.push(config),
				Err(e) => anyhow::bail!("Config parsing failed with error:\n{}", e),
			},
			Err(e) => anyhow::bail!("Config parsing failed with error:\n{}", e),

Deletion in lib/actions.rs at line 32 [5.7663]

B:BD[4.3586] → [3.472:542]

		Err(e) => anyhow::bail!("Config parsing failed with error {}!", e),

Replacement in lib/actions.rs at line 44 [5.7663]

B:BD[4.3884] → [4.3884:3927]

B:BD[4.3927] → [3.543:614]

∅:D[3.614] → [4.3994:4046]

B:BD[4.3994] → [4.3994:4046]

B:BD[4.4109] → [4.4109:4117]

						Ok(k) => continue,
						Err(e) => {
							anyhow::bail!(
								"Failed to create {:#?} with error {}!",
								&line.path.as_os_str(),
								e
							);
						}

[4.3884]

[4.4117]

						Ok(..) => continue,
						Err(e) => anyhow::bail!("File creation failed with error:\n{}", e),

Replacement in lib/actions.rs at line 56 [5.7663]

B:BD[4.4336] → [4.4336:4379]

B:BD[4.4379] → [3.615:705]

∅:D[3.705] → [4.4469:4477]

B:BD[4.4469] → [4.4469:4477]

						Ok(k) => continue,
						Err(e) => {
							anyhow::bail!("Failed to create {:#?} with error {}!", &line.path.as_os_str(), e);
						}

[4.4336]

[4.4477]

						Ok(..) => continue,
						Err(e) => anyhow::bail!("File creation failed with error:\n{}", e),

Replacement in lib/actions.rs at line 65 [5.7663]

B:BD[4.4717] → [4.4717:4762]

B:BD[4.4762] → [3.706:799]

∅:D[3.799] → [4.4856:4865]

B:BD[4.4856] → [4.4856:4865]

							Ok(k) => continue,
							Err(e) => {
								anyhow::bail!("Failed to write to {:#?} with error {}!", &line.path.as_os_str(), e);
							}

[4.4717]

[4.4865]

							Ok(..) => continue,
							Err(e) => anyhow::bail!("File creation failed with error:\n{}", e),

Replacement in lib/actions.rs at line 75 [5.7663]

B:BD[4.5117] → [4.5117:5162]

B:BD[4.5162] → [3.800:893]

∅:D[3.893] → [4.5256:5265]

B:BD[4.5256] → [4.5256:5265]

							Ok(k) => continue,
							Err(e) => {
								anyhow::bail!("Failed to write to {:#?} with error {}!", &line.path.as_os_str(), e);
							}

[4.5117]

[4.5265]

							Ok(..) => continue,
							Err(e) => anyhow::bail!("File creation failed with error:\n{}", e),

Replacement in lib/actions.rs at line 81 [5.7663]

B:BD[4.5372] → [4.5372:5413]

B:BD[4.5413] → [3.894:963]

∅:D[3.963] → [4.5490:5521]

B:BD[4.5490] → [4.5490:5521]

B:BD[4.5540] → [4.5540:5558]

B:BD[4.5586] → [4.5586:5593]

					Ok(k) => continue,
					Err(e) => {
						anyhow::bail!(
							"Failed to create {:#?} with error {}!",
							&line.path.as_os_str(),
							e
						);
					}

[4.5372]

[4.5593]

					Ok(..) => continue,
					Err(e) => anyhow::bail!("Directory creation failed with error:\n{}", e),

Replacement in lib/actions.rs at line 86 [5.7663]

B:BD[4.5734] → [4.5734:5775]

B:BD[4.5775] → [3.964:1033]

∅:D[3.1033] → [4.5852:5883]

B:BD[4.5852] → [4.5852:5883]

B:BD[4.5902] → [4.5902:5920]

B:BD[4.5948] → [4.5948:5955]

					Ok(k) => continue,
					Err(e) => {
						anyhow::bail!(
							"Failed to create {:#?} with error {}!",
							&line.path.as_os_str(),
							e
						);
					}

[4.5734]

[4.5955]

					Ok(..) => continue,
					Err(e) => anyhow::bail!("Directory creation failed with error:\n{}", e),

Replacement in lib/actions.rs at line 119 [5.7663]
∅:D[3.1110] → [4.6649:6654]
B:BD[4.6649] → [4.6649:6654]
```
			}
```
[3.1110]
[4.6654]
```
			};
```