Compare commits
2 Commits
v0.7.1-74-
...
v0.7.2-75-
Author | SHA1 | Date | |
---|---|---|---|
51c8b5c7b3 | |||
8041dc6ff5 |
@@ -1,10 +1,12 @@
|
|||||||
name: Release Tagging
|
name: Release Tagging
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- next-v0.8
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- next-v0.8
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
@@ -26,12 +28,15 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
|
VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
|
||||||
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
|
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
|
||||||
BRANCH_REF="${GITHUB_REF}"
|
BRANCH_REF="${{ gitea.ref }}"
|
||||||
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
||||||
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
|
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
|
||||||
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-111"
|
|
||||||
|
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
|
||||||
|
|
||||||
echo "Version: $VERSION"
|
echo "Version: $VERSION"
|
||||||
echo "Hash: $PROJECT_COMMIT_HASH"
|
echo "Hash: $PROJECT_COMMIT_HASH"
|
||||||
|
echo "Branh ref: $BRANCH_REF"
|
||||||
echo "Branch: $BRANCH_NAME"
|
echo "Branch: $BRANCH_NAME"
|
||||||
echo "Tag Release: $PROJECT_TAG_RELEASE"
|
echo "Tag Release: $PROJECT_TAG_RELEASE"
|
||||||
|
|
||||||
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -149,7 +149,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "icarus_models"
|
name = "icarus_models"
|
||||||
version = "0.7.1"
|
version = "0.7.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"josekit",
|
"josekit",
|
||||||
"rand",
|
"rand",
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "icarus_models"
|
name = "icarus_models"
|
||||||
version = "0.7.1"
|
version = "0.7.2"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.90"
|
rust-version = "1.90"
|
||||||
description = "models used for the icarus project"
|
description = "models used for the icarus project"
|
||||||
|
@@ -114,9 +114,11 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_cover_art_image() {
|
fn test_cover_art_image() {
|
||||||
let path: String = String::from("somepath");
|
let dir = String::from("./");
|
||||||
let coverart = coverart::init::init_coverart_only_path(path.clone());
|
let filename = String::from("CoverArt.png");
|
||||||
|
let coverart = coverart::init::init_coverart_dir_and_filename(&dir, &filename);
|
||||||
|
|
||||||
assert_eq!(path, coverart.path);
|
assert_eq!(dir, coverart.directory);
|
||||||
|
assert_eq!(filename, coverart.filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
21
src/song.rs
21
src/song.rs
@@ -39,8 +39,8 @@ pub struct Song {
|
|||||||
pub track_count: i32,
|
pub track_count: i32,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub audio_type: String,
|
pub audio_type: String,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(with = "time::serde::rfc3339::option")]
|
||||||
pub date_created: String,
|
pub date_created: Option<time::OffsetDateTime>,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub filename: String,
|
pub filename: String,
|
||||||
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||||
@@ -71,21 +71,22 @@ impl Song {
|
|||||||
|
|
||||||
pub fn song_path(&self) -> Result<String, std::io::Error> {
|
pub fn song_path(&self) -> Result<String, std::io::Error> {
|
||||||
if self.directory.is_empty() {
|
if self.directory.is_empty() {
|
||||||
return Err(std::io::Error::other("Directory does not exist"));
|
return Err(std::io::Error::other("Directory has not been initialized"));
|
||||||
|
} else if self.filename.is_empty() {
|
||||||
|
return Err(std::io::Error::other("Filename has not bee initialized"));
|
||||||
}
|
}
|
||||||
|
|
||||||
let directory = &self.directory;
|
let directory = &self.directory;
|
||||||
let mut buffer: String = directory.clone();
|
|
||||||
let last_index = directory.len() - 1;
|
let last_index = directory.len() - 1;
|
||||||
|
|
||||||
if let Some(character) = directory.chars().nth(last_index) {
|
if let Some(character) = directory.chars().nth(last_index) {
|
||||||
if character != '/' {
|
let buffer: String = if character != '/' {
|
||||||
buffer += "/";
|
directory.clone() + "/"
|
||||||
}
|
} else {
|
||||||
|
directory.clone()
|
||||||
|
};
|
||||||
|
|
||||||
buffer += &self.filename.clone();
|
Ok(buffer + &self.filename.clone())
|
||||||
|
|
||||||
Ok(buffer)
|
|
||||||
} else {
|
} else {
|
||||||
Err(std::io::Error::other(
|
Err(std::io::Error::other(
|
||||||
"Could not access last character of directory",
|
"Could not access last character of directory",
|
||||||
|
Reference in New Issue
Block a user