Compare commits
6 Commits
v0.1.14-ma
...
v0.2.0-dev
Author | SHA1 | Date | |
---|---|---|---|
a64d35d153 | |||
f6fdb717e9 | |||
e5c1eabe8c | |||
a8ffe80297 | |||
56384fb371 | |||
bf5808a06a |
@@ -3,14 +3,13 @@ name: Release Tagging
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
|
||||||
- devel
|
- devel
|
||||||
tags:
|
tags:
|
||||||
- 'v*' # Trigger on tags matching v*
|
- 'v*' # Trigger on tags matching v*
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
@@ -13,7 +13,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
check:
|
check:
|
||||||
name: Check
|
name: Check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
@@ -23,7 +23,7 @@ jobs:
|
|||||||
|
|
||||||
test:
|
test:
|
||||||
name: Test Suite
|
name: Test Suite
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
@@ -33,7 +33,7 @@ jobs:
|
|||||||
|
|
||||||
fmt:
|
fmt:
|
||||||
name: Rustfmt
|
name: Rustfmt
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
@@ -44,7 +44,7 @@ jobs:
|
|||||||
|
|
||||||
clippy:
|
clippy:
|
||||||
name: Clippy
|
name: Clippy
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
@@ -55,7 +55,7 @@ jobs:
|
|||||||
|
|
||||||
build:
|
build:
|
||||||
name: build
|
name: build
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "icarus-models"
|
name = "icarus_models"
|
||||||
version = "0.1.14"
|
version = "0.2.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
description = "models used for the icarus project"
|
description = "models used for the icarus project"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
@@ -1,5 +1,14 @@
|
|||||||
|
pub mod file_extensions {
|
||||||
|
pub mod audio {
|
||||||
pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
|
pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
|
||||||
pub const FLACEXTENSION: &str = ".flac";
|
pub const FLACEXTENSION: &str = ".flac";
|
||||||
pub const WAVEXTENSION: &str = ".wav";
|
pub const WAVEXTENSION: &str = ".wav";
|
||||||
pub const MPTHREEEXTENSION: &str = ".mp3";
|
pub const MPTHREEEXTENSION: &str = ".mp3";
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod image {
|
||||||
pub const JPGEXTENSION: &str = ".jpg";
|
pub const JPGEXTENSION: &str = ".jpg";
|
||||||
|
pub const JPEGEXTENSION: &str = ".jpeg";
|
||||||
|
pub const PNGEXTENSION: &str = ".png";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -2,7 +2,7 @@ use std::io::Read;
|
|||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
||||||
pub struct CoverArt {
|
pub struct CoverArt {
|
||||||
pub id: i32,
|
pub id: i32,
|
||||||
pub title: String,
|
pub title: String,
|
||||||
|
14
src/song.rs
14
src/song.rs
@@ -128,12 +128,18 @@ impl Song {
|
|||||||
|
|
||||||
let file_extension = match typ {
|
let file_extension = match typ {
|
||||||
types::MusicTypes::DefaultMusicExtension => {
|
types::MusicTypes::DefaultMusicExtension => {
|
||||||
String::from(constants::DEFAULTMUSICEXTENSION)
|
String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION)
|
||||||
}
|
}
|
||||||
|
|
||||||
types::MusicTypes::WavExtension => String::from(constants::WAVEXTENSION),
|
types::MusicTypes::WavExtension => {
|
||||||
types::MusicTypes::FlacExtension => String::from(constants::FLACEXTENSION),
|
String::from(constants::file_extensions::audio::WAVEXTENSION)
|
||||||
types::MusicTypes::MPThreeExtension => String::from(constants::MPTHREEEXTENSION),
|
}
|
||||||
|
types::MusicTypes::FlacExtension => {
|
||||||
|
String::from(constants::file_extensions::audio::FLACEXTENSION)
|
||||||
|
}
|
||||||
|
types::MusicTypes::MPThreeExtension => {
|
||||||
|
String::from(constants::file_extensions::audio::MPTHREEEXTENSION)
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if randomize {
|
if randomize {
|
||||||
|
Reference in New Issue
Block a user