tsk-83: Add None value for MusicTypes and CoverArtTypes (#87)

Closes #83

Reviewed-on: #87
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.gitea/workflows/tag_release.yaml

@@ -4,23 +4,20 @@ on:
   push:
     branches:
       - main
-      - devel
-    tags:
-      - 'v*' # Trigger on tags matching v*
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0 # Important for git describe --tags
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.90.0
           components: cargo
 
       - name: Extract Version from Cargo.toml
@@ -28,12 +25,15 @@ jobs:
         run: |
           VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
           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)
-          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 "Hash: $PROJECT_COMMIT_HASH"
+          echo "Branh ref: $BRANCH_REF"
           echo "Branch: $BRANCH_NAME"
           echo "Tag Release: $PROJECT_TAG_RELEASE"
 
@@ -52,6 +52,3 @@ jobs:
           release_name: Release ${{ steps.version.outputs.project_tag_release }}
           body: |
            Release of version ${{ steps.version.outputs.project_tag_release }}
-          # draft: false
-          # prerelease: ${{ startsWith(github.ref, 'v') == false }} # prerelease if not a valid release tag
-

.gitea/workflows/workflow.yaml

@@ -4,63 +4,59 @@ on:
   push:
     branches:
       - main 
-      - devel
   pull_request:
     branches:
       - main 
-      - devel
 
 jobs:
   check:
     name: Check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.90.0
       - run: cargo check
 
   test:
     name: Test Suite
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.90.0
       - run: cargo test
 
   fmt:
     name: Rustfmt
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.90.0
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
 
   clippy:
     name: Clippy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.90.0
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
 
   build:
     name: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.90.0
       - run: cargo build
-
-

.gitignore

@@ -1,2 +1 @@
 /target
-Cargo.lock

Cargo.lock

@@ -0,0 +1,707 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "cc"
+version = "1.2.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
+dependencies = [
+ "powerfmt",
+ "serde_core",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "flate2"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+
+[[package]]
+name = "icarus_models"
+version = "0.8.4"
+dependencies = [
+ "josekit",
+ "rand",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "time",
+ "utoipa",
+ "uuid",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "josekit"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a808e078330e6af222eb0044b71d4b1ff981bfef43e7bc8133a88234e0c86a0c"
+dependencies = [
+ "anyhow",
+ "base64",
+ "flate2",
+ "openssl",
+ "regex",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "openssl"
+version = "0.10.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.110"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "syn"
+version = "2.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+dependencies = [
+ "fastrand",
+ "getrandom",
+ "once_cell",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.3.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+
+[[package]]
+name = "time-macros"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "utoipa"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fcc29c80c21c31608227e0912b2d7fddba57ad76b606890627ba8ee7964e993"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_json",
+ "utoipa-gen",
+]
+
+[[package]]
+name = "utoipa-gen"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d79d08d92ab8af4c5e8a6da20c47ae3f61a0f1dabc1997cdf2d082b757ca08b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "uuid",
+]
+
+[[package]]
+name = "uuid"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+dependencies = [
+ "getrandom",
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

Cargo.toml

@@ -1,12 +1,19 @@
 [package]
-name = "icarus-models"
+name = "icarus_models"
-version = "0.1.14"
+version = "0.8.4"
 edition = "2024"
+rust-version = "1.90"
 description = "models used for the icarus project"
 license = "MIT"
 
 [dependencies]
-serde = { version = "1.0.218", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.139" }
+serde_json = { version = "1.0.145" }
-rand = { version = "0.9" }
+rand = { version = "0.9.2" }
-tempfile = { version = "3.19.1" }
+time = { version = "0.3.44", features = ["formatting", "macros", "parsing", "serde"] }
+uuid = { version = "1.18.1", features = ["v4", "serde"] }
+josekit = { version = "0.10.3" }
+utoipa = { version = "5.4.0", features = ["uuid", "time"] }
+
+[dev-dependencies]
+tempfile = { version = "3.23.0" }

README.md

@@ -0,0 +1,3 @@
+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.

src/access_level.rs

@@ -2,36 +2,36 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct AccessLevel {
-    pub id: i32,
+    pub id: uuid::Uuid,
     pub level: String,
-    pub song_id: i32,
+    pub song_id: uuid::Uuid,
 }
 
 impl Default for AccessLevel {
     fn default() -> Self {
         AccessLevel {
-            id: -1,
+            id: uuid::Uuid::nil(),
             level: String::new(),
-            song_id: -1,
+            song_id: uuid::Uuid::new_v4(),
         }
     }
 }
 
 pub fn default_level() -> AccessLevel {
     AccessLevel {
-        id: -1,
+        id: uuid::Uuid::nil(),
         level: String::from("Public"),
-        song_id: -1,
+        song_id: uuid::Uuid::new_v4(),
     }
 }
 
 pub fn private_level() -> AccessLevel {
     AccessLevel {
-        id: -1,
+        id: uuid::Uuid::new_v4(),
         level: String::from("Private"),
-        song_id: -1,
+        song_id: uuid::Uuid::new_v4(),
     }
 }
 

src/album.rs

@@ -5,9 +5,7 @@ pub mod collection {
     use std::fs::File;
     use std::io::BufReader;
 
-    fn is_set(num: &i32) -> bool {
+    use crate::init;
-        *num >= 0
-    }
 
     pub fn parse_album(filepath: &String) -> Result<Album, serde_json::Error> {
         let file = File::open(filepath).expect("Failed to open file");
@@ -27,7 +25,7 @@ pub mod collection {
         pub genre: String,
         pub year: i32,
         pub track_count: i32,
-        #[serde(skip_serializing_if = "is_set")]
+        #[serde(skip_serializing_if = "init::is_set")]
         pub disc_count: i32,
         #[serde(skip_serializing_if = "Vec::is_empty")]
         pub tracks: Vec<Track>,

src/constants.rs

@@ -1,5 +1,20 @@
+pub mod file_extensions {
+    pub mod audio {
         pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
         pub const FLACEXTENSION: &str = ".flac";
         pub const WAVEXTENSION: &str = ".wav";
         pub const MPTHREEEXTENSION: &str = ".mp3";
+    }
+
+    pub mod image {
         pub const JPGEXTENSION: &str = ".jpg";
+        pub const JPEGEXTENSION: &str = ".jpeg";
+        pub const PNGEXTENSION: &str = ".png";
+    }
+}
+
+pub mod error {
+    pub const DIRECTORY_NOT_INITIALIZED: &str = "Directory has not been initialized";
+    pub const FILENAME_NOT_INITIALIZED: &str = "Filename has not bee initialized";
+    pub const LAST_CHARACTER_IN_DIRECTORY: &str = "Could not access last character of directory";
+}

src/coverart.rs

@@ -1,18 +1,138 @@
-use std::io::Read;
+use std::io::Write;
 
-use serde::{Deserialize, Serialize};
+use rand::Rng;
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+const FILENAME_LENGTH: i32 = 16;
+
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
 pub struct CoverArt {
-    pub id: i32,
+    pub id: uuid::Uuid,
     pub title: String,
-    pub path: String,
+    #[serde(skip)]
+    pub directory: String,
+    pub filename: String,
+    #[serde(skip)]
     pub data: Vec<u8>,
+    pub song_id: uuid::Uuid,
+}
+
+pub mod init {
+    /// Initializes the CoverArt with just the directory and filename
+    pub fn init_coverart_dir_and_filename(directory: &str, filename: &str) -> super::CoverArt {
+        super::CoverArt {
+            directory: String::from(directory),
+            filename: String::from(filename),
+            ..Default::default()
+        }
+    }
 }
 
 impl CoverArt {
-    pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
+    /// Saves the coverart to the filesystem
-        let path: &String = &self.path;
+    pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
+        match self.get_path() {
+            Ok(path) => match std::fs::File::create(&path) {
+                Ok(mut file) => match file.write_all(&self.data) {
+                    Ok(_) => Ok(()),
+                    Err(err) => Err(err),
+                },
+                Err(err) => Err(err),
+            },
+            Err(err) => Err(err),
+        }
+    }
+
+    /// Removes the coverart from the filesystem
+    pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
+        match self.get_path() {
+            Ok(path) => {
+                let p = std::path::Path::new(&path);
+                if p.exists() {
+                    match std::fs::remove_file(p) {
+                        Ok(_) => Ok(()),
+                        Err(err) => Err(err),
+                    }
+                } else {
+                    Err(std::io::Error::other(
+                        "Cannot delete file that does not exist",
+                    ))
+                }
+            }
+            Err(err) => Err(err),
+        }
+    }
+
+    /// Gets the path of the CoverArt
+    pub fn get_path(&self) -> Result<String, std::io::Error> {
+        if self.directory.is_empty() {
+            return Err(std::io::Error::other(
+                crate::constants::error::DIRECTORY_NOT_INITIALIZED,
+            ));
+        } else if self.filename.is_empty() {
+            return Err(std::io::Error::other(
+                crate::constants::error::FILENAME_NOT_INITIALIZED,
+            ));
+        }
+
+        let directory = &self.directory;
+        let last_index = directory.len() - 1;
+
+        match crate::util::concatenate_path(directory, &self.filename, last_index) {
+            Ok(path) => Ok(path),
+            Err(err) => Err(err),
+        }
+    }
+}
+
+/// Generates filename for a CoverArt
+pub fn generate_filename(
+    typ: crate::types::CoverArtTypes,
+    randomize: bool,
+) -> Result<String, std::io::Error> {
+    let file_extension = match typ {
+        crate::types::CoverArtTypes::PngExtension => {
+            String::from(crate::constants::file_extensions::image::PNGEXTENSION)
+        }
+        crate::types::CoverArtTypes::JpegExtension => {
+            String::from(crate::constants::file_extensions::image::JPEGEXTENSION)
+        }
+        crate::types::CoverArtTypes::JpgExtension => {
+            String::from(crate::constants::file_extensions::image::JPGEXTENSION)
+        }
+        crate::types::CoverArtTypes::None => {
+            return Err(std::io::Error::other("Unsupported CoverArtTypes"));
+        }
+    };
+
+    let filename: String = if randomize {
+        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();
+
+        for _ in 0..FILENAME_LENGTH {
+            let index = rng.random_range(0..=some_chars_length);
+            let rando_char = some_chars.chars().nth(index);
+
+            if let Some(c) = rando_char {
+                filename.push(c);
+            }
+        }
+        format!("{filename}{file_extension}")
+    } else {
+        format!("coverart-output{file_extension}")
+    };
+
+    Ok(filename)
+}
+
+pub mod io {
+    use std::io::Read;
+
+    /// Gets the raw data of the cover art
+    pub fn to_data(coverart: &super::CoverArt) -> Result<Vec<u8>, std::io::Error> {
+        match coverart.get_path() {
+            Ok(path) => {
                 let mut file = std::fs::File::open(path)?;
                 let mut buffer = Vec::new();
                 match file.read_to_end(&mut buffer) {
@@ -20,4 +140,22 @@ impl CoverArt {
                     Err(err) => Err(err),
                 }
             }
+            Err(err) => Err(err),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::coverart;
+
+    #[test]
+    fn test_cover_art_image() {
+        let dir = String::from("./");
+        let filename = String::from("CoverArt.png");
+        let coverart = coverart::init::init_coverart_dir_and_filename(&dir, &filename);
+
+        assert_eq!(dir, coverart.directory);
+        assert_eq!(filename, coverart.filename);
+    }
 }

src/lib.rs

@@ -7,3 +7,26 @@ pub mod song;
 pub mod token;
 pub mod types;
 pub mod user;
+pub mod util;
+
+pub mod init {
+    pub fn is_id_valid(num: &i32) -> bool {
+        *num > 0
+    }
+
+    pub fn is_uuid_nil(uuid: &uuid::Uuid) -> bool {
+        uuid.is_nil()
+    }
+
+    pub fn is_zero(num: &i32) -> bool {
+        *num == 0
+    }
+
+    pub fn is_dur_not_set(num: &i32) -> bool {
+        *num == 0
+    }
+
+    pub fn is_set(num: &i32) -> bool {
+        *num >= 0
+    }
+}

src/login_result.rs

@@ -2,30 +2,24 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct LoginResult {
-    pub id: i32,
+    pub id: uuid::Uuid,
     pub username: String,
     pub token: String,
     #[serde(alias = "token_type")]
     pub token_type: String,
-    pub expiration: i32,
+    pub expiration: i64,
-}
-
-impl Default for LoginResult {
-    fn default() -> Self {
-        LoginResult {
-            id: -1,
-            username: String::new(),
-            token: String::new(),
-            token_type: String::new(),
-            expiration: -1,
-        }
-    }
 }
 
 impl LoginResult {
-    pub fn _to_json(&self) -> Result<String, serde_json::Error> {
+    pub fn to_json(&self) -> Result<String, serde_json::Error> {
         serde_json::to_string_pretty(&self)
     }
+
+    pub fn token_expired(&self) -> bool {
+        let current_time = time::OffsetDateTime::now_utc();
+        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
+        current_time > expired
+    }
 }

src/song.rs

@@ -1,16 +1,20 @@
-use std::io::Read;
+use std::io::Write;
-
-use crate::constants;
-use crate::types;
 
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+use crate::constants;
+use crate::init;
+use crate::types;
+
+/// Length of characters of a filename to be generated
+const FILENAME_LENGTH: i32 = 16;
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Song {
-    #[serde(skip_serializing_if = "is_zero")]
+    #[serde(skip_serializing_if = "init::is_uuid_nil")]
     #[serde(alias = "id")]
-    pub id: i32,
+    pub id: uuid::Uuid,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub title: String,
     #[serde(skip_serializing_if = "String::is_empty")]
@@ -21,30 +25,31 @@ pub struct Song {
     pub album_artist: String,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub genre: String,
-    #[serde(skip_serializing_if = "is_zero")]
+    #[serde(skip_serializing_if = "init::is_zero")]
     pub year: i32,
-    #[serde(skip_serializing_if = "is_dur_not_set")]
+    #[serde(skip_serializing_if = "init::is_dur_not_set")]
     pub duration: i32,
-    #[serde(skip_serializing_if = "is_zero")]
+    #[serde(skip_serializing_if = "init::is_zero")]
     pub track: i32,
-    #[serde(skip_serializing_if = "is_zero")]
+    #[serde(skip_serializing_if = "init::is_zero")]
     pub disc: i32,
-    #[serde(skip_serializing_if = "is_zero")]
+    #[serde(skip_serializing_if = "init::is_zero")]
     pub disc_count: i32,
-    #[serde(skip_serializing_if = "is_zero")]
+    #[serde(skip_serializing_if = "init::is_zero")]
     pub track_count: i32,
     #[serde(skip_serializing_if = "String::is_empty")]
     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")]
     pub filename: String,
-    #[serde(skip_serializing_if = "is_zero")]
+    #[serde(skip_serializing_if = "init::is_uuid_nil")]
-    pub user_id: i32,
+    pub user_id: uuid::Uuid,
     #[serde(skip)]
     pub data: Vec<u8>,
     #[serde(skip)]
     pub directory: String,
+    // TODO: Think about what to do with this
     // #[serde(skip)]
     // pub album_id: i32,
     // #[serde(skip)]
@@ -55,14 +60,6 @@ pub struct Song {
     // pub coverart_id: i32,
 }
 
-fn is_zero(num: &i32) -> bool {
-    *num == 0
-}
-
-fn is_dur_not_set(num: &i32) -> bool {
-    *num == 0
-}
-
 impl Song {
     pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
         if pretty {
@@ -72,150 +69,149 @@ impl Song {
         }
     }
 
+    /// Gets the path of a Song
     pub fn song_path(&self) -> Result<String, std::io::Error> {
         if self.directory.is_empty() {
-            return Err(std::io::Error::new(
+            return Err(std::io::Error::other(
-                std::io::ErrorKind::Other,
+                crate::constants::error::DIRECTORY_NOT_INITIALIZED,
-                "Directory does not exist",
+            ));
+        } else if self.filename.is_empty() {
+            return Err(std::io::Error::other(
+                crate::constants::error::FILENAME_NOT_INITIALIZED,
             ));
         }
 
         let directory = &self.directory;
-        let mut buffer: String = directory.clone();
         let last_index = directory.len() - 1;
 
-        if let Some(character) = directory.chars().nth(last_index) {
+        match crate::util::concatenate_path(directory, &self.filename, last_index) {
-            if character != '/' {
+            Ok(path) => Ok(path),
-                buffer += "/";
+            Err(err) => Err(err),
+        }
     }
 
-            buffer += &self.filename.clone();
+    /// Saves the song to the filesystem using the song's data
+    pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
+        match self.song_path() {
+            Ok(song_path) => match std::fs::File::create(&song_path) {
+                Ok(mut file) => match file.write_all(&self.data) {
+                    Ok(_res) => Ok(()),
+                    Err(err) => Err(err),
+                },
+                Err(err) => Err(err),
+            },
+            Err(err) => Err(err),
+        }
+    }
 
-            Ok(buffer)
+    /// Removes the song from the filesystem
+    pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
+        match self.song_path() {
+            Ok(song_path) => {
+                let p = std::path::Path::new(&song_path);
+                if p.exists() {
+                    match std::fs::remove_file(p) {
+                        Ok(_) => Ok(()),
+                        Err(err) => Err(err),
+                    }
                 } else {
-            Err(std::io::Error::new(
+                    Err(std::io::Error::other(
-                std::io::ErrorKind::Other,
+                        "Cannot delete file that does not exist",
-                "Could not access last character of directory",
                     ))
                 }
             }
-
+            Err(err) => Err(err),
-    pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
-        let path_result = self.song_path();
-
-        match path_result {
-            Ok(path) => {
-                let mut file = std::fs::File::open(path)?;
-                let mut buffer: Vec<u8> = Vec::new();
-                file.read_to_end(&mut buffer)?;
-
-                if buffer.is_empty() {
-                    Err(std::io::Error::new(
-                        std::io::ErrorKind::Other,
-                        "File is empty",
-                    ))
-                } else {
-                    Ok(buffer)
         }
     }
-            Err(er) => Err(er),
-        }
 }
 
-    pub fn generate_filename(&self, typ: types::MusicTypes, randomize: bool) -> String {
+/// Generates a filename. In order to save a song to the filesystem
-        let mut filename: String = String::new();
+pub fn generate_filename(
-        let filename_len = 10;
+    typ: types::MusicTypes,
-
+    randomize: bool,
+) -> Result<String, std::io::Error> {
     let file_extension = match typ {
         types::MusicTypes::DefaultMusicExtension => {
-                String::from(constants::DEFAULTMUSICEXTENSION)
+            String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION)
         }
-
+        types::MusicTypes::WavExtension => {
-            types::MusicTypes::WavExtension => String::from(constants::WAVEXTENSION),
+            String::from(constants::file_extensions::audio::WAVEXTENSION)
-            types::MusicTypes::FlacExtension => String::from(constants::FLACEXTENSION),
+        }
-            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)
+        }
+        types::MusicTypes::None => return Err(std::io::Error::other("Unsupported MusicTypes")),
     };
 
-        if randomize {
+    let filename: String = if randomize {
+        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 _i in 0..filename_len {
+        for _ in 0..FILENAME_LENGTH {
-                let random_number: i32 = rng.random_range(0..=19);
+            let index = rng.random_range(0..=some_chars_length);
-                let index = random_number as usize;
             let rando_char = some_chars.chars().nth(index);
 
             if let Some(c) = rando_char {
                 filename.push(c);
             }
         }
+        format!("{filename}{file_extension}")
     } else {
-            filename += "track-output";
+        format!("track-output{file_extension}")
+    };
+
+    Ok(filename)
 }
 
-        filename += &file_extension;
+/// I/O operations for songs
-
+pub mod io {
-        filename
-    }
-}
-
-/*
-mod embedded {
     use std::io::Read;
 
-    use serde::{Deserialize, Serialize};
+    /// Copies a song using the source song's data
-
+    pub fn copy_song(
-    impl Song {
+        song_source: &super::Song,
-        pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
+        song_target: &mut super::Song,
-            if pretty {
+    ) -> Result<(), std::io::Error> {
-                serde_json::to_string_pretty(&self)
+        match song_target.song_path() {
-            } else {
+            Ok(songpath) => {
-                serde_json::to_string(&self)
+                let p = std::path::Path::new(&songpath);
-            }
+                if p.exists() {
-        }
+                    Err(std::io::Error::other(
-
+                        "Cannot copy song over to one that already exists",
-        pub fn song_path(&self) -> Result<String, std::io::Error> {
-            if self.directory.is_empty() {
-                return Err(std::io::Error::new(
-                    std::io::ErrorKind::Other,
-                    "Directory does not exist",
-                ));
-            }
-
-            let directory = &self.directory;
-            let mut buffer: String = directory.clone();
-            let last_index = directory.len() - 1;
-
-            if let Some(character) = directory.chars().nth(last_index) {
-                if character != '/' {
-                    buffer += "/";
-                }
-
-                buffer += &self.filename.clone();
-
-                Ok(buffer)
-            } else {
-                Err(std::io::Error::new(
-                    std::io::ErrorKind::Other,
-                    "Could not access last character of directory",
                     ))
+                } else {
+                    if song_target.data.is_empty() {
+                        song_target.data = song_source.data.clone();
+                    } else {
+                        song_target.data.clear();
+                        song_target.data = song_source.data.clone();
+                    }
+
+                    match song_target.save_to_filesystem() {
+                        Ok(_) => Ok(()),
+                        Err(err) => Err(err),
+                    }
+                }
+            }
+            Err(err) => Err(err),
         }
     }
 
-        pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
+    /// Gets the raw file data of a song from the filesystem
-            let path_result = self.song_path();
+    pub fn to_data(song: &super::Song) -> Result<Vec<u8>, std::io::Error> {
-
+        match song.song_path() {
-            match path_result {
             Ok(path) => {
                 let mut file = std::fs::File::open(path)?;
                 let mut buffer: Vec<u8> = Vec::new();
                 file.read_to_end(&mut buffer)?;
 
                 if buffer.is_empty() {
-                        Err(std::io::Error::new(
+                    Err(std::io::Error::other("File is empty"))
-                            std::io::ErrorKind::Other,
-                            "File is empty",
-                        ))
                 } else {
                     Ok(buffer)
                 }
@@ -224,92 +220,3 @@ mod embedded {
         }
     }
 }
-
-    // The song's duration is a floating point in seconds
-    #[derive(Clone, Debug, Deserialize, Serialize)]
-    pub struct Song {
-        #[serde(skip_serializing_if = "is_embed_zero")]
-        #[serde(alias = "id")]
-        pub id: i32,
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub title: String,
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub artist: String,
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub album: String,
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub album_artist: String,
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub genre: String,
-        #[serde(skip_serializing_if = "is_embed_zero")]
-        pub year: i32,
-        #[serde(skip_serializing_if = "is_embed_dur_not_set")]
-        pub duration: f64,
-        #[serde(skip_serializing_if = "is_embed_zero")]
-        pub track: i32,
-        #[serde(skip_serializing_if = "is_embed_zero")]
-        pub disc: i32,
-        #[serde(skip_serializing_if = "is_embed_zero")]
-        pub disc_count: i32,
-        #[serde(skip_serializing_if = "is_embed_zero")]
-        pub track_count: i32,
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub audio_type: String,
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub date_created: String,
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub filename: String,
-        #[serde(skip_serializing_if = "is_embed_zero")]
-        pub user_id: i32,
-        #[serde(skip)]
-        pub data: Vec<u8>,
-        #[serde(skip)]
-        pub directory: String,
-        // #[serde(skip)]
-        // pub album_id: i32,
-        // #[serde(skip)]
-        // pub artist_id: i32,
-        // #[serde(skip)]
-        // pub genre_id: i32,
-        // #[serde(skip)]
-        // pub coverart_id: i32,
-    }
-
-    fn is_embed_zero(num: &i32) -> bool {
-        *num == 0
-    }
-
-    fn is_embed_dur_not_set(num: &f64) -> bool {
-        *num == 0.0
-    }
-
-    impl Default for Song {
-        fn default() -> Self {
-            Song {
-                id: 0,
-                title: String::new(),
-                artist: String::new(),
-                album: String::new(),
-                album_artist: String::new(),
-                genre: String::new(),
-                year: 0,
-                duration: 0.0,
-                track: 0,
-                disc: 0,
-                disc_count: 0,
-                track_count: 0,
-                audio_type: String::new(),
-                date_created: String::new(),
-                filename: String::new(),
-                user_id: 0,
-                data: Vec::new(),
-                directory: String::new(),
-                // album_id: 0,
-                // artist_id: 0,
-                // genre_id: 0,
-                // coverart_id: 0,
-            }
-        }
-    }
-}
-*/

src/token.rs

@@ -2,19 +2,19 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Token {
     pub scope: String,
-    pub expiration: i32,
+    pub expiration: i64,
     pub audience: String,
     pub issuer: String,
-    pub issued: i32,
+    pub issued: i64,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct AccessToken {
-    #[serde(alias = "user_id")]
+    #[serde(alias = "init::is_uuid_nil")]
-    pub user_id: i32,
+    pub user_id: uuid::Uuid,
     #[serde(alias = "username")]
     pub username: String,
     #[serde(alias = "token")]
@@ -22,28 +22,21 @@ pub struct AccessToken {
     #[serde(alias = "token_type")]
     pub token_type: String,
     #[serde(alias = "expiration")]
-    pub expiration: i32,
+    pub expiration: i64,
     #[serde(alias = "message")]
     pub message: String,
 }
 
-impl Default for Token {
+impl AccessToken {
-    fn default() -> Self {
+    /// Get the token fit for Bearer authentication
-        Token {
+    pub fn bearer_token(&self) -> String {
-            scope: String::new(),
+        format!("Bearer {}", self.token)
-            expiration: -1,
-            audience: String::new(),
-            issuer: String::new(),
-            issued: -1,
-        }
-    }
     }
 
-impl AccessToken {
+    pub fn token_expired(&self) -> bool {
-    pub fn bearer_token(&self) -> String {
+        let current_time = time::OffsetDateTime::now_utc();
-        let mut token: String = String::from("Bearer ");
+        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
-        token += &self.token.clone();
+        current_time > expired
-        token
     }
 }
 
@@ -52,19 +45,151 @@ impl Token {
         serde_json::to_string_pretty(&self)
     }
 
-    // TODO: Implement
     pub fn token_expired(&self) -> bool {
-        false
+        let current_time = time::OffsetDateTime::now_utc();
+        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
+        current_time > expired
     }
 
-    // TODO: Implement
     pub fn contains_scope(&self, des_scope: &String) -> bool {
-        let extracted_token: String = String::from("Token");
+        self.scope.contains(des_scope)
-
+    }
-        if extracted_token == *des_scope {
-            return true;
 }
 
-        false
+pub fn get_issued() -> time::Result<time::OffsetDateTime> {
+    Ok(time::OffsetDateTime::now_utc())
+}
+
+mod util {
+    pub fn time_to_std_time(
+        provided_time: &time::OffsetDateTime,
+    ) -> Result<std::time::SystemTime, std::time::SystemTimeError> {
+        let converted = std::time::SystemTime::from(*provided_time);
+        Ok(converted)
+    }
+}
+
+#[derive(Debug)]
+pub struct TokenResource {
+    pub message: String,
+    pub issuer: String,
+    pub audiences: Vec<String>,
+    pub id: uuid::Uuid,
+}
+
+pub const TOKEN_TYPE: &str = "JWT";
+
+pub fn create_token(
+    key: &String,
+    token_resource: &TokenResource,
+    duration: time::Duration,
+) -> Result<(String, i64), josekit::JoseError> {
+    let mut header = josekit::jws::JwsHeader::new();
+    header.set_token_type(TOKEN_TYPE);
+
+    let mut payload = josekit::jwt::JwtPayload::new();
+    let message = &token_resource.message;
+    let issuer = &token_resource.issuer;
+    let audiences: &Vec<String> = &token_resource.audiences;
+    payload.set_subject(message);
+    payload.set_issuer(issuer);
+    payload.set_audience(audiences.clone());
+    if !token_resource.id.is_nil() {
+        match payload.set_claim("id", Some(serde_json::json!(token_resource.id))) {
+            Ok(_) => {}
+            Err(err) => {
+                return Err(err);
+            }
+        }
+    }
+    match get_issued() {
+        Ok(issued) => {
+            let expire = issued + duration;
+            payload.set_issued_at(&util::time_to_std_time(&issued).unwrap());
+            payload.set_expires_at(&util::time_to_std_time(&expire).unwrap());
+
+            let signer = josekit::jws::alg::hmac::HmacJwsAlgorithm::Hs256
+                .signer_from_bytes(key.as_bytes())
+                .unwrap();
+            Ok((
+                josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(),
+                (expire - time::OffsetDateTime::UNIX_EPOCH).whole_seconds(),
+            ))
+        }
+        Err(e) => Err(josekit::JoseError::InvalidClaim(e.into())),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn test_key() -> String {
+        String::from("c3092urmc2219ix320i40m293ic29IM09IN0u879Y8B98YB8yb86TN7B55R4yv4RCVU6Bi8YO8U")
+    }
+
+    fn test_resource() -> TokenResource {
+        TokenResource {
+            issuer: String::from("icarus_auth_test"),
+            message: String::from("Authorization"),
+            audiences: vec![String::from("icarus_test")],
+            id: uuid::Uuid::nil(),
+        }
+    }
+
+    #[test]
+    fn test_token_scope_check() {
+        let mut token = Token::default();
+        token.scope = String::from("song:read song:upload song:download");
+
+        let check_scope = String::from("song:download");
+        let result = token.contains_scope(&check_scope);
+
+        assert!(
+            result,
+            "Error: The scope {:?} was not found in the token's scope {:?}",
+            check_scope, token.scope
+        );
+    }
+
+    #[test]
+    fn test_token_creation() {
+        let key = test_key();
+        let test_token_resource = test_resource();
+        let token_expiration_duration = time::Duration::hours(2);
+
+        match create_token(&key, &test_token_resource, token_expiration_duration) {
+            Ok((token, expire_duration)) => {
+                assert_eq!(false, token.is_empty(), "Error: Token is empty");
+                assert!(
+                    expire_duration > 0,
+                    "Token expire duration is invalid {expire_duration:?}"
+                );
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+            }
+        }
+    }
+
+    #[test]
+    fn test_token_creation_with_id() {
+        let key = test_key();
+        let mut test_token_resource = test_resource();
+        test_token_resource.id = uuid::Uuid::new_v4();
+        let token_expiration_duration = time::Duration::hours(2);
+
+        match create_token(&key, &test_token_resource, token_expiration_duration) {
+            Ok((token, expire_duration)) => {
+                assert_eq!(false, token.is_empty(), "Error: Token is empty");
+                assert!(
+                    expire_duration > 0,
+                    "Token expire duration is invalid {expire_duration:?}"
+                );
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+            }
+        }
     }
 }

src/types.rs

@@ -1,6 +1,16 @@
+#[derive(Debug)]
 pub enum MusicTypes {
     DefaultMusicExtension,
     WavExtension,
     FlacExtension,
     MPThreeExtension,
+    None,
+}
+
+#[derive(Debug)]
+pub enum CoverArtTypes {
+    PngExtension,
+    JpegExtension,
+    JpgExtension,
+    None,
 }

src/user.rs

@@ -1,11 +1,13 @@
 use std::default::Default;
 
+use crate::init;
+
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct User {
-    #[serde(skip_serializing_if = "is_id_valid")]
+    #[serde(skip_serializing_if = "init::is_uuid_nil")]
-    pub id: i32,
+    pub id: uuid::Uuid,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub username: String,
     #[serde(skip_serializing_if = "String::is_empty")]
@@ -19,22 +21,20 @@ pub struct User {
     #[serde(skip_serializing_if = "String::is_empty")]
     pub lastname: String,
     pub email_verified: bool,
-    #[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")]
     pub status: String,
-    #[serde(skip_serializing_if = "String::is_empty")]
+    #[serde(with = "time::serde::rfc3339::option")]
-    pub last_login: String,
+    pub last_login: Option<time::OffsetDateTime>,
-}
+    #[serde(skip_serializing_if = "init::is_uuid_nil")]
-
+    pub salt_id: uuid::Uuid,
-fn is_id_valid(num: &i32) -> bool {
-    *num > 0
 }
 
 impl Default for User {
     fn default() -> Self {
         User {
-            id: -1,
+            id: uuid::Uuid::new_v4(),
             username: String::new(),
             password: String::new(),
             email: String::new(),
@@ -42,9 +42,10 @@ impl Default for User {
             firstname: String::new(),
             lastname: String::new(),
             email_verified: false,
-            date_created: String::new(),
+            date_created: None,
             status: String::new(),
-            last_login: String::new(),
+            last_login: None,
+            salt_id: uuid::Uuid::nil(),
         }
     }
 }
@@ -58,3 +59,29 @@ impl User {
         }
     }
 }
+
+pub mod salt {
+    use std::default::Default;
+
+    use crate::init;
+
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Clone, Debug, Default, Deserialize, Serialize)]
+    pub struct Salt {
+        #[serde(skip_serializing_if = "init::is_uuid_nil")]
+        pub id: uuid::Uuid,
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub salt: String,
+    }
+
+    impl Salt {
+        pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
+            if output_pretty {
+                serde_json::to_string_pretty(&self)
+            } else {
+                serde_json::to_string(&self)
+            }
+        }
+    }
+}

src/util/mod.rs

@@ -0,0 +1,19 @@
+pub fn concatenate_path(
+    directory: &str,
+    filename: &str,
+    last_index: usize,
+) -> Result<String, std::io::Error> {
+    if let Some(character) = directory.chars().nth(last_index) {
+        let buffer: String = if character != '/' {
+            format!("{directory}/")
+        } else {
+            String::from(directory)
+        };
+
+        Ok(format!("{buffer}{filename}"))
+    } else {
+        Err(std::io::Error::other(
+            crate::constants::error::LAST_CHARACTER_IN_DIRECTORY,
+        ))
+    }
+}

tests/tests.rs

@@ -28,17 +28,14 @@ mod utils {
     }
 }
 
+#[cfg(test)]
 mod song_tests {
-    use std::fs::File;
-    use std::io::Write;
-
     use tempfile::tempdir;
 
+    use crate::utils;
     use icarus_models::song;
     use icarus_models::types;
 
-    use crate::utils;
-
     #[test]
     fn test_song_to_data() {
         println!("Test");
@@ -64,7 +61,7 @@ mod song_tests {
                 Ok(buffer) => {
                     assert_eq!(buffer.is_empty(), false);
 
-                    match song.to_data() {
+                    match song::io::to_data(&song) {
                         Ok(song_data) => {
                             println!("Both files match");
                             assert_eq!(buffer, song_data);
@@ -102,9 +99,6 @@ mod song_tests {
         song.directory = utils::get_tests_directory();
         song.filename = String::from("track01.flac");
 
-        match song.song_path() {
-            Ok(songpath) => match utils::extract_data_from_file(&songpath) {
-                Ok(buffer) => {
         let mut song_cpy = song.clone();
         let temp_dir = tempdir().expect("Failed to create temp dir");
         song_cpy.directory = match temp_dir.path().to_str() {
@@ -113,46 +107,55 @@ mod song_tests {
         };
 
         assert_eq!(song.directory.is_empty(), false);
-                    song_cpy.filename =
+        match song::generate_filename(types::MusicTypes::FlacExtension, true) {
-                        song.generate_filename(types::MusicTypes::FlacExtension, true);
+            Ok(filename) => {
+                song_cpy.filename = filename;
+            }
+            Err(err) => {
+                assert!(false, "Error generatig filename: {err:?}");
+            }
+        };
         println!("Directory: {:?}", song_cpy.directory);
         println!("File to be created: {:?}", song_cpy.filename);
 
-                    let path = match song_cpy.song_path() {
+        match song::io::copy_song(&song, &mut song_cpy) {
-                        Ok(s_path) => s_path,
+            Ok(_) => {
-                        Err(err) => {
+                println!("Song copied");
-                            assert!(false, "Error: {:?}", err);
-                            String::new()
             }
+            Err(err) => {
+                assert!(false, "Error copying song: Error: {err:?}")
+            }
+        }
+    }
+
+    #[test]
+    fn test_save_song_to_filesystem_and_remove() {
+        let mut song = song::Song::default();
+        song.directory = utils::get_tests_directory();
+        song.filename = String::from("track02.flac");
+
+        let mut copied_song = song::Song {
+            directory: utils::get_tests_directory(),
+            filename: String::from("track02-coppied.flac"),
+            ..Default::default()
         };
 
-                    match File::create(path) {
+        match song::io::copy_song(&song, &mut copied_song) {
-                        Ok(mut file_cpy) => match file_cpy.write_all(&buffer) {
+            Ok(_) => match copied_song.remove_from_filesystem() {
-                            Ok(success) => {
+                Ok(_) => {}
-                                println!("Success: {:?}", success);
-                            }
                 Err(err) => {
-                                assert!(false, "Error saving file: {:?}", err);
+                    assert!(false, "Error: {err:?}")
                 }
             },
             Err(err) => {
-                            assert!(false, "Error: {:?}", err);
+                assert!(false, "Error: {err:?}")
-                        }
-                    };
-                }
-                Err(err) => {
-                    assert!(false, "Error: {:?}", err);
-                }
-            },
-            Err(err) => {
-                assert!(false, "Error extracting song data: {:?}", err);
             }
         }
     }
 }
 
+#[cfg(test)]
 mod album_tests {
-
     use crate::utils;
     use icarus_models::album;