Compare commits

..

2 Commits

Author SHA1 Message Date
0a27b8ccb1 filename generation fix (#82)
All checks were successful
Rust Build / Check (push) Successful in 31s
Release Tagging / release (push) Successful in 35s
Rust Build / Test Suite (push) Successful in 42s
Rust Build / Rustfmt (push) Successful in 25s
Rust Build / Clippy (push) Successful in 35s
Rust Build / build (push) Successful in 42s
Reviewed-on: #82
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-10-24 17:21:07 +00:00
afc4ca21a2 tsk-76: Improve getting path of Song or CoverArt (#81)
All checks were successful
Rust Build / Test Suite (push) Successful in 28s
Release Tagging / release (push) Successful in 36s
Rust Build / Check (push) Successful in 43s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / build (push) Successful in 26s
Rust Build / Clippy (push) Successful in 35s
Closes #76

Reviewed-on: #81
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-10-24 16:51:08 +00:00
5 changed files with 12 additions and 10 deletions

2
Cargo.lock generated
View File

@@ -149,7 +149,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
[[package]]
name = "icarus_models"
version = "0.8.2"
version = "0.8.3"
dependencies = [
"josekit",
"rand",

View File

@@ -1,6 +1,6 @@
[package]
name = "icarus_models"
version = "0.8.2"
version = "0.8.3"
edition = "2024"
rust-version = "1.90"
description = "models used for the icarus project"

View File

@@ -1,2 +1,3 @@
A library containing commonly used models and functions that is used throughout
icarus projects. This reduces the amount of duplicated code without a benefit.
A library containing commonly used structs, functions, enums, constants and other code
that is used throughout the icarus projects. Code from this library serves as the model
for other projects in the icarus project.

View File

@@ -80,7 +80,7 @@ impl CoverArt {
let directory = &self.directory;
let last_index = directory.len() - 1;
match crate::util::concatenate_path(&directory, &self.filename, last_index) {
match crate::util::concatenate_path(directory, &self.filename, last_index) {
Ok(path) => Ok(path),
Err(err) => Err(err),
}
@@ -102,7 +102,7 @@ pub fn generate_filename(typ: crate::types::CoverArtTypes, randomize: bool) -> S
};
if randomize {
let mut filename: String = String::new();
let mut filename: String = String::from("coverart-");
let some_chars: String = String::from("abcdefghij0123456789");
let some_chars_length = some_chars.len();
let mut rng = rand::rng();
@@ -117,7 +117,7 @@ pub fn generate_filename(typ: crate::types::CoverArtTypes, randomize: bool) -> S
}
filename + &file_extension
} else {
"track-output".to_string() + &file_extension
"coverart-output".to_string() + &file_extension
}
}

View File

@@ -84,7 +84,7 @@ impl Song {
let directory = &self.directory;
let last_index = directory.len() - 1;
match crate::util::concatenate_path(&directory, &self.filename, last_index) {
match crate::util::concatenate_path(directory, &self.filename, last_index) {
Ok(path) => Ok(path),
Err(err) => Err(err),
}
@@ -143,12 +143,13 @@ pub fn generate_filename(typ: types::MusicTypes, randomize: bool) -> String {
};
if randomize {
let mut filename: String = String::new();
let mut filename: String = String::from("track-");
let some_chars: String = String::from("abcdefghij0123456789");
let some_chars_length = some_chars.len();
let mut rng = rand::rng();
for _ in 0..FILENAME_LENGTH {
let index = rng.random_range(0..=19);
let index = rng.random_range(0..=some_chars_length);
let rando_char = some_chars.chars().nth(index);
if let Some(c) = rando_char {