tsk-45: Added macros of FileType

tsk-45: Workflow change
tsk-45: Code formatting
2025-10-21 21:43:55 -04:00 · 2025-10-21 21:28:41 -04:00 · 2025-10-21 21:08:57 -04:00 · 2025-10-21 21:08:14 -04:00 · 2025-10-21 21:02:11 -04:00 · 2025-10-21 21:00:06 -04:00
12 changed files with 236 additions and 391 deletions
@@ -13,15 +13,14 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
        with:
          fetch-depth: 0 # Important for git describe --tags

      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-      - uses: Swatinem/rust-cache@v2
+        uses: actions-rs/toolchain@v1
        with:
-          toolchain: 1.97
+          toolchain: 1.90.0
          components: cargo

      - name: Extract Version from Cargo.toml
@@ -32,7 +31,6 @@ jobs:
          BRANCH_REF="${GITHUB_REF}"
          BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
-
          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-680"
          echo "Version: $VERSION"
          echo "Hash: $PROJECT_COMMIT_HASH"
@@ -1,4 +1,4 @@
-name: simeta Build
+name: Rust Build

 on:
  push:
@@ -13,11 +13,10 @@ jobs:
    name: Check
    runs-on: ubuntu-24.04
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
-          toolchain: 1.97
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.90.0
      - run: |
          mkdir -p ~/.ssh
          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
@@ -32,11 +31,10 @@ jobs:
    runs-on: ubuntu-24.04
    needs: setup_ssh
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
-          toolchain: 1.97
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.90.0
      - run: |
          mkdir -p ~/.ssh
          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
@@ -51,12 +49,11 @@ jobs:
    runs-on: ubuntu-24.04
    needs: setup_ssh
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
-          toolchain: 1.97
+          toolchain: 1.90.0
      - run: rustup component add rustfmt
-      - uses: Swatinem/rust-cache@v2
      - run: |
          mkdir -p ~/.ssh
          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
@@ -71,11 +68,10 @@ jobs:
    runs-on: ubuntu-24.04
    needs: setup_ssh
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
-          toolchain: 1.97
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.90.0
      - run: rustup component add clippy
      - run: |
          mkdir -p ~/.ssh
@@ -91,11 +87,10 @@ jobs:
    runs-on: ubuntu-24.04
    needs: setup_ssh
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
-          toolchain: 1.97
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.90.0
      - run: |
          mkdir -p ~/.ssh
          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
@@ -10,15 +10,15 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"

 [[package]]
 name = "bitflags"
-version = "2.13.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"

 [[package]]
 name = "bumpalo"
-version = "3.20.3"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"

 [[package]]
 name = "byteorder"
@@ -43,26 +43,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"

-[[package]]
-name = "chacha20"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "rand_core",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -74,9 +54,9 @@ dependencies = [

 [[package]]
 name = "data-encoding"
-version = "2.11.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"

 [[package]]
 name = "errno"
@@ -90,15 +70,15 @@ dependencies = [

 [[package]]
 name = "fastrand"
-version = "2.4.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"

 [[package]]
 name = "flate2"
-version = "1.1.9"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
 dependencies = [
 "crc32fast",
 "miniz_oxide",
@@ -110,40 +90,27 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

-[[package]]
-name = "futures-core"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
-
-[[package]]
-name = "futures-task"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
-
-[[package]]
-name = "futures-util"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
-dependencies = [
- "futures-core",
- "futures-task",
- "pin-project-lite",
- "slab",
-]
-
 [[package]]
 name = "getrandom"
-version = "0.4.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
 "cfg-if",
 "libc",
 "r-efi",
- "rand_core",
+ "wasip2",
+]
+
+[[package]]
+name = "icarus_meta"
+version = "0.4.3"
+dependencies = [
+ "imghdr",
+ "infer",
+ "lofty",
+ "rand",
+ "tempfile",
 ]

 [[package]]
@@ -163,32 +130,31 @@ dependencies = [

 [[package]]
 name = "js-sys"
-version = "0.3.103"
+version = "0.3.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
 dependencies = [
- "cfg-if",
- "futures-util",
+ "once_cell",
 "wasm-bindgen",
 ]

 [[package]]
 name = "libc"
-version = "0.2.186"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"

 [[package]]
 name = "linux-raw-sys"
-version = "0.12.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"

 [[package]]
 name = "lofty"
-version = "0.24.0"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec4feeff6c7d75093278133a06e827d7af6d2bfe20b0f331f9d10338a5ec7ca"
+checksum = "ca260c51a9c71f823fbfd2e6fbc8eb2ee09834b98c00763d877ca8bfa85cde3e"
 dependencies = [
 "byteorder",
 "data-encoding",
@@ -201,9 +167,9 @@ dependencies = [

 [[package]]
 name = "lofty_attr"
-version = "0.12.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458ace39169e4b83c4f77ae3d42d5d1d11c422feef590219a97c973d3b524557"
+checksum = "ed9983e64b2358522f745c1251924e3ab7252d55637e80f6a0a3de642d6a9efc"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -212,9 +178,9 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.33"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"

 [[package]]
 name = "miniz_oxide"
@@ -228,18 +194,18 @@ dependencies = [

 [[package]]
 name = "ogg_pager"
-version = "0.7.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d36b1d6964c3ac92b7aea701057e02b6b91143d70d83b20abf75a231a3c0216"
+checksum = "e034c10fb5c1c012c1b327b85df89fb0ef98ae66ec28af30f0d1eed804a40c19"
 dependencies = [
 "byteorder",
 ]

 [[package]]
 name = "once_cell"
-version = "1.21.4"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"

 [[package]]
 name = "paste"
@@ -248,57 +214,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"

 [[package]]
-name = "pin-project-lite"
-version = "0.2.17"
+name = "ppv-lite86"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]

 [[package]]
 name = "proc-macro2"
-version = "1.0.106"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.46"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
 "proc-macro2",
 ]

 [[package]]
 name = "r-efi"
-version = "6.0.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"

 [[package]]
 name = "rand"
-version = "0.10.2"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
- "chacha20",
- "getrandom",
+ "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.10.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom",
+]

 [[package]]
 name = "rustix"
-version = "1.1.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
 "bitflags",
 "errno",
@@ -309,38 +290,21 @@ dependencies = [

 [[package]]
 name = "rustversion"
-version = "1.0.23"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"

 [[package]]
 name = "simd-adler32"
-version = "0.3.10"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
-
-[[package]]
-name = "simeta"
-version = "0.6.1"
-dependencies = [
- "imghdr",
- "infer",
- "lofty",
- "rand",
- "tempfile",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"

 [[package]]
 name = "syn"
-version = "2.0.118"
+version = "2.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
+checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -349,9 +313,9 @@ dependencies = [

 [[package]]
 name = "tempfile"
-version = "3.27.0"
+version = "3.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
 "fastrand",
 "getrandom",
@@ -362,25 +326,34 @@ dependencies = [

 [[package]]
 name = "unicode-ident"
-version = "1.0.24"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"

 [[package]]
 name = "uuid"
-version = "1.23.5"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5fab0d6c3c01ae70085a09cb03d4c7a1d6314e2b3e075392783396d724ca0a"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
 ]

 [[package]]
-name = "wasm-bindgen"
-version = "0.2.126"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
+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",
@@ -390,22 +363,13 @@ dependencies = [
 ]

 [[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.126"
+name = "wasm-bindgen-backend"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.126"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
 dependencies = [
 "bumpalo",
+ "log",
 "proc-macro2",
 "quote",
 "syn",
@@ -413,10 +377,33 @@ dependencies = [
 ]

 [[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.126"
+name = "wasm-bindgen-macro"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
+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",
 ]
@@ -435,3 +422,29 @@ 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",
+]
@@ -1,14 +1,14 @@
 [package]
-name = "simeta"
-version = "0.6.1"
+name = "icarus_meta"
+version = "0.4.3"
 edition = "2024"
-rust-version = "1.95"
+rust-version = "1.90"

 [dependencies]
-lofty = { version = "0.24.0" }
+lofty = { version = "0.22.4" }
 imghdr = { version = "0.7.0" }
 infer = { version = "0.19.0" }
-rand = { version = "0.10.2" }
+rand = { version = "0.9.2" }

 [dev-dependencies]
-tempfile = { version = "3.27.0" }
+tempfile = { version = "3.23.0" }
@@ -1,22 +0,0 @@
-Copyright (c) 2026 Kun Deng.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
@@ -1,3 +1,2 @@
-# simeta
-Library to manage metadata of flac files, used in various soaricarus-related software
+Library to manage metadata of flac files, used in various icarus-related software
 projects.
@@ -6,29 +6,3 @@ pub struct FileType {
    pub mime: String,
    pub file_type: String,
 }
-
-/// Initializes a FileType given a filetype passed.
-pub fn init_filetype(filetype: &str) -> Result<FileType, std::io::Error> {
-    if filetype == song::constants::FLAC_TYPE {
-        Ok(FileType {
-            mime: String::from(song::constants::mime::FLAC),
-            file_type: String::from(song::constants::FLAC_TYPE),
-        })
-    } else if filetype == coverart::constants::PNG_TYPE {
-        Ok(FileType {
-            mime: String::from(coverart::constants::mime::PNG),
-            file_type: String::from(coverart::constants::PNG_TYPE),
-        })
-    } else if filetype == coverart::constants::JPEG_TYPE
-        || filetype == coverart::constants::JPG_TYPE
-    {
-        Ok(FileType {
-            mime: String::from(coverart::constants::mime::JPEG),
-            file_type: String::from(coverart::constants::JPEG_TYPE),
-        })
-    } else {
-        Err(std::io::Error::other(format!(
-            "Unsupported FileType: {filetype:?}"
-        )))
-    }
-}
@@ -20,7 +20,7 @@ pub fn file_type_from_filepath(
 }

 /// Gets the file type of a Song given it's data
-pub fn file_type_from_data(data: &[u8]) -> Result<crate::detection::FileType, std::io::Error> {
+pub fn file_type_from_data(data: &Vec<u8>) -> Result<crate::detection::FileType, std::io::Error> {
    match infer::get(data) {
        Some(kind) => {
            let mime = kind.mime_type();
@@ -7,7 +7,7 @@ pub mod test_util {
    pub mod util {
        use std::io::{self, Read, Write};

-        use rand::RngExt;
+        use rand::Rng;

        // Function to save a Vec<u8> to a file
        pub fn save_bytes_to_file(bytes: &[u8], file_path: &String) -> io::Result<()> {
@@ -19,7 +19,10 @@ pub mod test_util {
                Err(err) => Err(err),
            }
        }
-        pub fn get_full_path(directory: &str, filename: &str) -> Result<String, std::io::Error> {
+        pub fn get_full_path(
+            directory: &String,
+            filename: &String,
+        ) -> Result<String, std::io::Error> {
            match path_buf(directory, filename) {
                Ok(pf) => Ok(pf.display().to_string()),
                Err(err) => Err(err),
@@ -36,12 +39,6 @@ pub mod test_util {
            std::fs::copy(src_path, dest_path)
        }

-        pub fn remove_file(filepath: &str) -> Result<(), std::io::Error> {
-            let f_path = std::path::Path::new(filepath);
-
-            std::fs::remove_file(f_path)
-        }
-
        pub fn get_data_from_file(source_path: &str) -> Result<Vec<u8>, std::io::Error> {
            match std::fs::File::open(source_path) {
                Ok(mut file) => {
@@ -55,23 +52,13 @@ pub mod test_util {
            }
        }

-        pub fn file_exists(directory: &str, filename: &str) -> Result<bool, std::io::Error> {
+        pub fn file_exists(directory: &String, filename: &String) -> Result<bool, std::io::Error> {
            match path_buf(directory, filename) {
                Ok(pf) => Ok(pf.exists()),
                Err(err) => Err(err),
            }
        }

-        pub fn generate_newfilepath(directory: &str) -> Result<String, std::io::Error> {
-            match generate_filename() {
-                Ok(filename) => match get_full_path(directory, &filename) {
-                    Ok(filepath) => Ok(filepath),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            }
-        }
-
        pub fn generate_filename() -> Result<String, std::io::Error> {
            let mut filename = String::from("track-");
            let length = 20;
@@ -91,7 +78,10 @@ pub mod test_util {
            Ok(format!("{filename}.flac"))
        }

-        fn path_buf(directory: &str, filename: &str) -> Result<std::path::PathBuf, std::io::Error> {
+        fn path_buf(
+            directory: &String,
+            filename: &String,
+        ) -> Result<std::path::PathBuf, std::io::Error> {
            let dir_path = std::path::Path::new(&directory);
            Ok(dir_path.join(filename))
        }
@@ -0,0 +1,51 @@
+use lofty::file::AudioFile;
+
+pub fn get_duration(song_path: &String) -> Result<std::time::Duration, std::io::Error> {
+    match std::fs::File::open(song_path) {
+        Ok(mut content) => {
+            match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new())
+            {
+                Ok(flac_file) => {
+                    let properties = flac_file.properties();
+                    Ok(properties.duration())
+                }
+                Err(err) => Err(std::io::Error::other(err.to_string())),
+            }
+        }
+        Err(err) => Err(err),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::test_util;
+
+    #[test]
+    fn test_get_duration() {
+        let filename = test_util::util::get_filename(1);
+        let dir = String::from(test_util::util::TESTFILEDIRECTORY);
+
+        match test_util::util::file_exists(&dir, &filename) {
+            Ok(_) => {
+                let filepath = test_util::util::get_full_path(&dir, &filename).unwrap();
+                match super::get_duration(&filepath) {
+                    Ok(duration) => {
+                        let song_duration: u64 = 41;
+                        let fetched_song_duration = duration.as_secs();
+
+                        assert_eq!(
+                            song_duration, fetched_song_duration,
+                            "Durations should match, but they don't {song_duration} {fetched_song_duration} ({duration:?})"
+                        );
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {err:?}");
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+            }
+        }
+    }
+}
@@ -1,14 +0,0 @@
-use lofty::file::AudioFile;
-
-pub fn get_properties(songpath: &str) -> Result<lofty::flac::FlacProperties, std::io::Error> {
-    match std::fs::File::open(songpath) {
-        Ok(mut content) => {
-            match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new())
-            {
-                Ok(flac_file) => Ok(*flac_file.properties()),
-                Err(err) => Err(std::io::Error::other(err.to_string())),
-            }
-        }
-        Err(err) => Err(err),
-    }
-}
@@ -1,139 +0,0 @@
-pub mod audio;
-
-#[derive(Clone, Debug, Default)]
-pub struct SongProperties {
-    pub duration: std::time::Duration,
-    pub sample_rate: u32,
-    pub bitrate: u32,
-    pub overall_bitrate: u32,
-    pub bit_depth: u8,
-    pub channels: u8,
-}
-
-pub fn get_song_properties(song_path: &str) -> Result<SongProperties, std::io::Error> {
-    match audio::get_properties(song_path) {
-        Ok(flac_properties) => Ok(SongProperties {
-            duration: flac_properties.duration(),
-            sample_rate: flac_properties.sample_rate(),
-            bitrate: flac_properties.audio_bitrate(),
-            overall_bitrate: flac_properties.overall_bitrate(),
-            bit_depth: flac_properties.bit_depth(),
-            channels: flac_properties.channels(),
-        }),
-        Err(err) => Err(err),
-    }
-}
-
-pub fn get_duration(song_path: &str) -> Result<std::time::Duration, std::io::Error> {
-    match get_song_properties(song_path) {
-        Ok(song_properties) => Ok(song_properties.duration),
-        Err(err) => Err(err),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::test_util;
-
-    #[test]
-    fn test_get_duration() {
-        let filename = test_util::util::get_filename(1);
-        let dir = String::from(test_util::util::TESTFILEDIRECTORY);
-
-        match test_util::util::file_exists(&dir, &filename) {
-            Ok(_) => {
-                let filepath = test_util::util::get_full_path(&dir, &filename).unwrap();
-                let new_filepath = test_util::util::generate_newfilepath(&dir).unwrap();
-
-                match test_util::util::copy_file(&filepath, &new_filepath) {
-                    Ok(_) => match super::get_duration(&new_filepath) {
-                        Ok(duration) => {
-                            test_util::util::remove_file(&new_filepath).unwrap();
-
-                            let song_duration: u64 = 41;
-                            let fetched_song_duration = duration.as_secs();
-
-                            assert_eq!(
-                                song_duration, fetched_song_duration,
-                                "Durations should match, but they don't {song_duration} {fetched_song_duration} ({duration:?})"
-                            );
-                        }
-                        Err(err) => {
-                            assert!(false, "Error: {err:?}");
-                        }
-                    },
-                    Err(err) => {
-                        assert!(false, "Error: {err:?}");
-                    }
-                }
-            }
-            Err(err) => {
-                assert!(false, "Error: {err:?}");
-            }
-        }
-    }
-
-    #[test]
-    fn test_song_properties() {
-        let filename = test_util::util::get_filename(1);
-        let dir = String::from(test_util::util::TESTFILEDIRECTORY);
-
-        match test_util::util::file_exists(&dir, &filename) {
-            Ok(_) => {
-                let filepath = test_util::util::get_full_path(&dir, &filename).unwrap();
-                let new_filepath = test_util::util::generate_newfilepath(&dir).unwrap();
-
-                match test_util::util::copy_file(&filepath, &new_filepath) {
-                    Ok(_) => match super::get_song_properties(&new_filepath) {
-                        Ok(song_properties) => {
-                            test_util::util::remove_file(&new_filepath).unwrap();
-
-                            let song_duration: u64 = 41;
-                            let bitrate: u32 = 1;
-                            let overall_bitrate: u32 = 3;
-                            let bit_depth: u8 = 24;
-                            let channels: u8 = 2;
-
-                            let fetched_song_duration = song_properties.duration.as_secs();
-                            let fetched_bitrate = song_properties.bitrate;
-                            let fetched_overall_bitrate = song_properties.overall_bitrate;
-                            let fetched_bit_depth = song_properties.bit_depth;
-                            let fetched_channels = song_properties.channels;
-
-                            assert_eq!(
-                                song_duration, fetched_song_duration,
-                                "Durations should match, but they don't {song_duration} {fetched_song_duration} ({song_properties:?})"
-                            );
-
-                            assert_eq!(
-                                bitrate, fetched_bitrate,
-                                "Bitrates do not match {bitrate:?} {fetched_bitrate:?} {song_properties:?}"
-                            );
-                            assert_eq!(
-                                overall_bitrate, fetched_overall_bitrate,
-                                "Overall bitrates do not match {overall_bitrate:?} {fetched_overall_bitrate:?} {song_properties:?}"
-                            );
-                            assert_eq!(
-                                bit_depth, fetched_bit_depth,
-                                "Bit depth do not match {bit_depth:?} {fetched_bit_depth:?} {song_properties:?}"
-                            );
-                            assert_eq!(
-                                channels, fetched_channels,
-                                "Channels do not match {channels:?} {fetched_channels:?} {song_properties:?}"
-                            );
-                        }
-                        Err(err) => {
-                            assert!(false, "Error: {err:?}");
-                        }
-                    },
-                    Err(err) => {
-                        assert!(false, "Error: {err:?}");
-                    }
-                }
-            }
-            Err(err) => {
-                assert!(false, "Error: {err:?}");
-            }
-        }
-    }
-}
Author	SHA1	Message	Date
phoenix	8acf220fc4	tsk-45: Added macros of FileType	2025-10-21 21:43:55 -04:00
phoenix	561d740120	tsk-45: Workflow change	2025-10-21 21:28:41 -04:00
phoenix	80e2864312	tsk-45: Code formatting	2025-10-21 21:08:57 -04:00
phoenix	290cd4eaa8	tsk-45: Making use of constants	2025-10-21 21:08:14 -04:00
phoenix	0c3e4bf82a	tsk-45: Added test	2025-10-21 21:02:11 -04:00
phoenix	82fe3ae8e8	tsk-45: Added another function	2025-10-21 21:00:06 -04:00
phoenix	233bbdeaa1	tsk-45: Added test	2025-10-21 20:53:09 -04:00
phoenix	a7ad40478c	tsk-45: Version bump	2025-10-21 20:37:36 -04:00
phoenix	02631fc14c	tsk-45: Code formatting	2025-10-21 20:29:13 -04:00
phoenix	25c85212ca	tsk-45: Changed types of functions	2025-10-21 20:28:50 -04:00
phoenix	250a009fad	tsk-45: More changes	2025-10-21 20:21:07 -04:00
phoenix	fef43b9799	tsk-45: Some changes	2025-10-21 20:08:41 -04:00
phoenix	fa5203013c	tsk-45: Adding functionality for itdentifying Song	2025-10-21 20:02:19 -04:00
phoenix	13bc89cd98	tsk-45: Added infer crate	2025-10-21 19:48:41 -04:00