Compare commits

...

55 Commits

Author SHA1 Message Date
0b8ae56eb4 tsk-41: Version bump
All checks were successful
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Rustfmt (pull_request) Successful in 32s
Rust Build / Clippy (pull_request) Successful in 38s
Rust Build / build (pull_request) Successful in 34s
Rust Build / Test Suite (pull_request) Successful in 1m13s
2025-08-14 19:08:35 -04:00
af67d5bea0 tsk-41: Lingering cleanup 2025-08-14 19:08:24 -04:00
99cb6318d6 tsk-41: Removing unused env variable 2025-08-14 19:06:25 -04:00
67d2729c46 tsk-41: Code cleanup
All checks were successful
Rust Build / Check (pull_request) Successful in 38s
Rust Build / Clippy (pull_request) Successful in 34s
Rust Build / Rustfmt (pull_request) Successful in 38s
Rust Build / Test Suite (pull_request) Successful in 38s
Rust Build / build (pull_request) Successful in 35s
2025-08-14 19:04:34 -04:00
b8bbd66fd3 tsk-41: Service now works
Some checks failed
Rust Build / Check (pull_request) Successful in 33s
Rust Build / Rustfmt (pull_request) Failing after 33s
Rust Build / Test Suite (pull_request) Successful in 36s
Rust Build / Clippy (pull_request) Successful in 1m12s
Rust Build / build (pull_request) Successful in 46s
2025-08-14 18:57:28 -04:00
aa93e6cc4a tsk-41: Added auth header to the appropriate request calls 2025-08-14 18:48:33 -04:00
7e9392ef1f tsk-41: Updated env files 2025-08-14 18:23:56 -04:00
88ae596ae1 tsk-41: icarus_envy version bump 2025-08-14 18:20:28 -04:00
b5f7943938 tsk-41: Starting work to add auth to the requests
Some checks failed
Rust Build / Check (pull_request) Failing after 28s
Rust Build / Rustfmt (pull_request) Failing after 32s
Rust Build / Test Suite (pull_request) Failing after 37s
Rust Build / Clippy (pull_request) Failing after 35s
Rust Build / build (pull_request) Failing after 39s
2025-08-13 17:55:30 -04:00
62a1f8a003 tsk-41: Token expiration check 2025-08-13 17:03:48 -04:00
80c4c7950b tsk-41: Can fetch the token now 2025-08-13 16:56:30 -04:00
6fafb93aaf tsk-41: Adding env variables used to get service token 2025-08-13 16:50:24 -04:00
0695df3f72 tsk-41: Added TODOs
Some checks failed
Rust Build / Check (pull_request) Failing after 1m4s
Rust Build / Rustfmt (pull_request) Failing after 33s
Rust Build / Clippy (pull_request) Failing after 32s
Rust Build / Test Suite (pull_request) Failing after 1m13s
Rust Build / build (pull_request) Failing after 1m51s
2025-08-12 18:43:27 -04:00
3ea008868a tsk-41: Refactored code to prepare for auth implementation 2025-08-12 18:40:11 -04:00
ce2e4feb02 tsk-41: Dependencies version bump
All checks were successful
Rust Build / Check (pull_request) Successful in 1m15s
Rust Build / Rustfmt (pull_request) Successful in 27s
Rust Build / Test Suite (pull_request) Successful in 1m29s
Rust Build / Clippy (pull_request) Successful in 58s
Rust Build / build (pull_request) Successful in 1m19s
Includes icarus_meta, icarus_models, and icarus_envy
2025-08-12 17:41:30 -04:00
002de87f5e tsk-41: Added SECRET_KEY env variable
All checks were successful
Rust Build / Check (pull_request) Successful in 57s
Rust Build / Rustfmt (pull_request) Successful in 36s
Rust Build / Clippy (pull_request) Successful in 1m6s
Rust Build / Test Suite (pull_request) Successful in 1m9s
Rust Build / build (pull_request) Successful in 2m15s
2025-08-12 17:32:42 -04:00
09a129abc8 tsk-41: Updated gitignore 2025-08-12 17:31:54 -04:00
80762b81ae Next release (#13)
All checks were successful
Rust Build / Check (push) Successful in 32s
Rust Build / Rustfmt (push) Successful in 26s
Rust Build / Test Suite (push) Successful in 35s
Rust Build / Clippy (push) Successful in 27s
Rust Build / build (push) Successful in 41s
Reviewed-on: #13
2025-07-23 21:05:30 +00:00
af4f1acb87 Reverting change (#40)
All checks were successful
Rust Build / Check (push) Successful in 32s
Release Tagging / release (push) Successful in 34s
Rust Build / Check (pull_request) Successful in 31s
Rust Build / Test Suite (push) Successful in 35s
Rust Build / Rustfmt (push) Successful in 30s
Rust Build / Clippy (push) Successful in 35s
Rust Build / build (push) Successful in 40s
Rust Build / Test Suite (pull_request) Successful in 35s
Rust Build / Rustfmt (pull_request) Successful in 31s
Rust Build / Clippy (pull_request) Successful in 35s
Rust Build / build (pull_request) Successful in 42s
Reviewed-on: #40
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-07-23 21:01:36 +00:00
d5e24f9114 Minor changes (#39)
All checks were successful
Rust Build / Check (push) Successful in 28s
Release Tagging / release (push) Successful in 32s
Rust Build / Check (pull_request) Successful in 28s
Rust Build / Test Suite (push) Successful in 35s
Rust Build / Rustfmt (push) Successful in 25s
Rust Build / build (push) Successful in 34s
Rust Build / Test Suite (pull_request) Successful in 34s
Rust Build / Rustfmt (pull_request) Successful in 26s
Rust Build / Clippy (pull_request) Successful in 34s
Rust Build / Clippy (push) Successful in 36s
Rust Build / build (pull_request) Successful in 40s
Reviewed-on: #39
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-07-23 20:50:40 +00:00
27e4b30d21 File cleanup post-parsing (#37)
All checks were successful
Rust Build / Check (push) Successful in 34s
Rust Build / Test Suite (push) Successful in 30s
Rust Build / Rustfmt (push) Successful in 27s
Rust Build / Clippy (push) Successful in 28s
Release Tagging / release (push) Successful in 29s
Rust Build / build (push) Successful in 43s
Rust Build / Check (pull_request) Successful in 33s
Rust Build / Rustfmt (pull_request) Successful in 27s
Rust Build / Test Suite (pull_request) Successful in 36s
Rust Build / Clippy (pull_request) Successful in 34s
Rust Build / build (pull_request) Successful in 37s
Reviewed-on: #37
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-07-23 20:25:05 +00:00
99bb72ffb2 Removing hard coded user_id (#38)
Some checks failed
Rust Build / Check (push) Failing after 39s
Release Tagging / release (push) Successful in 43s
Rust Build / Test Suite (push) Failing after 36s
Rust Build / Rustfmt (push) Successful in 30s
Rust Build / Clippy (push) Failing after 35s
Rust Build / build (push) Failing after 1m28s
Rust Build / Check (pull_request) Failing after 32s
Rust Build / Rustfmt (pull_request) Successful in 28s
Rust Build / Clippy (pull_request) Failing after 35s
Rust Build / Test Suite (pull_request) Failing after 1m10s
Rust Build / build (pull_request) Failing after 35s
Reviewed-on: #38
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-07-23 01:18:35 +00:00
111d16515f Wipe data from CoverArt queue (#36)
Some checks failed
Release Tagging / release (push) Successful in 32s
Rust Build / Check (push) Failing after 34s
Rust Build / Test Suite (push) Failing after 37s
Rust Build / Rustfmt (push) Successful in 29s
Rust Build / Clippy (push) Failing after 36s
Rust Build / build (push) Failing after 37s
Rust Build / Check (pull_request) Failing after 1m58s
Rust Build / Test Suite (pull_request) Failing after 1m21s
Rust Build / Rustfmt (pull_request) Successful in 29s
Rust Build / Clippy (pull_request) Failing after 1m7s
Rust Build / build (pull_request) Failing after 2m5s
Reviewed-on: #36
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-07-15 20:10:12 +00:00
47bf24180b Wipe data from song queue (#35)
Some checks failed
Release Tagging / release (push) Successful in 33s
Rust Build / Check (push) Failing after 35s
Rust Build / Test Suite (push) Failing after 41s
Rust Build / Rustfmt (push) Successful in 30s
Rust Build / Clippy (push) Failing after 41s
Rust Build / build (push) Failing after 40s
Rust Build / Check (pull_request) Failing after 36s
Rust Build / Test Suite (pull_request) Failing after 37s
Rust Build / Rustfmt (pull_request) Successful in 28s
Rust Build / Clippy (pull_request) Failing after 34s
Rust Build / build (pull_request) Failing after 35s
Reviewed-on: #35
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-07-15 19:49:24 +00:00
c16ad062d4 Create coverArt (#34)
Some checks failed
Release Tagging / release (push) Successful in 30s
Rust Build / Check (push) Failing after 32s
Rust Build / Check (pull_request) Failing after 33s
Rust Build / Test Suite (push) Failing after 34s
Rust Build / Rustfmt (push) Successful in 28s
Rust Build / Clippy (push) Failing after 37s
Rust Build / build (push) Failing after 36s
Rust Build / Test Suite (pull_request) Failing after 38s
Rust Build / Rustfmt (pull_request) Successful in 30s
Rust Build / Clippy (pull_request) Failing after 38s
Rust Build / build (pull_request) Failing after 38s
Reviewed-on: #34
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-07-15 19:15:26 +00:00
a779e13a77 Create song (#33)
All checks were successful
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 32s
Rust Build / Test Suite (push) Successful in 33s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 33s
Rust Build / build (push) Successful in 38s
Rust Build / Check (pull_request) Successful in 37s
Rust Build / Test Suite (pull_request) Successful in 38s
Rust Build / Rustfmt (pull_request) Successful in 30s
Rust Build / Clippy (pull_request) Successful in 35s
Rust Build / build (pull_request) Successful in 44s
Reviewed-on: #33
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-07-15 00:53:12 +00:00
fe61fe3efb Tag release change (#32)
All checks were successful
Release Tagging / release (push) Successful in 31s
Rust Build / Check (push) Successful in 29s
Rust Build / Test Suite (push) Successful in 32s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 31s
Rust Build / build (push) Successful in 37s
Rust Build / Check (pull_request) Successful in 1m17s
Rust Build / Test Suite (pull_request) Successful in 1m35s
Rust Build / Rustfmt (pull_request) Successful in 25s
Rust Build / Clippy (pull_request) Successful in 1m23s
Rust Build / build (pull_request) Successful in 2m53s
Reviewed-on: #32
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-06-29 22:20:40 +00:00
f9f3dbda36 Refactoring (#31)
All checks were successful
Rust Build / Check (push) Successful in 33s
Rust Build / Check (pull_request) Successful in 35s
Rust Build / build (push) Successful in 41s
Release Tagging / release (push) Successful in 32s
Rust Build / Test Suite (push) Successful in 37s
Rust Build / Rustfmt (push) Successful in 26s
Rust Build / Clippy (push) Successful in 33s
Rust Build / Test Suite (pull_request) Successful in 35s
Rust Build / Rustfmt (pull_request) Successful in 27s
Rust Build / Clippy (pull_request) Successful in 31s
Rust Build / build (pull_request) Successful in 37s
Reviewed-on: #31
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-06-29 22:08:23 +00:00
59ce1c294c Update dependencies (#30)
Some checks failed
Release Tagging / release (push) Successful in 31s
Rust Build / Check (pull_request) Successful in 33s
Rust Build / Check (push) Successful in 33s
Rust Build / Test Suite (pull_request) Successful in 35s
Rust Build / Rustfmt (pull_request) Successful in 24s
Rust Build / Clippy (pull_request) Failing after 32s
Rust Build / build (pull_request) Successful in 54s
Rust Build / Test Suite (push) Successful in 30s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Failing after 29s
Rust Build / build (push) Successful in 34s
Reviewed-on: #30
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-06-29 21:50:34 +00:00
cd1be017e5 rust std change (#29)
Some checks failed
Rust Build / Check (push) Has been cancelled
Release Tagging / release (push) Has been cancelled
Rust Build / Test Suite (push) Has been cancelled
Rust Build / Rustfmt (push) Has been cancelled
Rust Build / Clippy (push) Has been cancelled
Rust Build / build (push) Has been cancelled
Rust Build / Check (pull_request) Successful in 33s
Rust Build / Test Suite (pull_request) Successful in 37s
Rust Build / Rustfmt (pull_request) Successful in 25s
Rust Build / Clippy (pull_request) Failing after 32s
Rust Build / build (pull_request) Successful in 38s
Reviewed-on: #29
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-06-29 21:50:04 +00:00
2f05c20d4e update queued song (#28)
All checks were successful
Rust Build / build (push) Successful in 41s
Rust Build / Check (push) Successful in 33s
Rust Build / Check (pull_request) Successful in 35s
Rust Build / Test Suite (push) Successful in 36s
Rust Build / Rustfmt (push) Successful in 25s
Rust Build / Clippy (push) Successful in 33s
Rust Build / Test Suite (pull_request) Successful in 38s
Rust Build / Clippy (pull_request) Successful in 34s
Rust Build / build (pull_request) Successful in 45s
Release Tagging / release (push) Successful in 31s
Rust Build / Rustfmt (pull_request) Successful in 25s
Reviewed-on: #28
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-06-28 23:23:41 +00:00
e138bf7a2e Apply metadata to queued song (#27)
All checks were successful
Rust Build / Clippy (push) Successful in 35s
Rust Build / build (push) Successful in 41s
Rust Build / Test Suite (pull_request) Successful in 35s
Release Tagging / release (push) Successful in 31s
Rust Build / Check (push) Successful in 33s
Rust Build / Check (pull_request) Successful in 33s
Rust Build / Test Suite (push) Successful in 37s
Rust Build / Rustfmt (push) Successful in 25s
Rust Build / Rustfmt (pull_request) Successful in 28s
Rust Build / Clippy (pull_request) Successful in 36s
Rust Build / build (pull_request) Successful in 44s
Reviewed-on: #27
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-06-26 22:40:04 +00:00
29b806fd02 Get queued coverart data (#26)
All checks were successful
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 31s
Rust Build / Test Suite (push) Successful in 33s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 31s
Rust Build / build (push) Successful in 37s
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Test Suite (pull_request) Successful in 32s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Successful in 31s
Rust Build / build (pull_request) Successful in 37s
Reviewed-on: #26
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-19 00:54:13 +00:00
557264482f Get queued coverart (#25)
All checks were successful
Rust Build / Check (push) Successful in 31s
Rust Build / Test Suite (push) Successful in 35s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 31s
Rust Build / build (push) Successful in 39s
Release Tagging / release (push) Successful in 43s
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Test Suite (pull_request) Successful in 46s
Rust Build / Rustfmt (pull_request) Successful in 25s
Rust Build / Clippy (pull_request) Successful in 36s
Rust Build / build (pull_request) Successful in 37s
Reviewed-on: #25
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-18 01:07:03 +00:00
4e07ee5d0f Refactoring (#24)
All checks were successful
Release Tagging / release (push) Successful in 30s
Rust Build / Check (push) Successful in 32s
Rust Build / Test Suite (push) Successful in 37s
Rust Build / Rustfmt (push) Successful in 40s
Rust Build / Clippy (push) Successful in 36s
Rust Build / build (push) Successful in 43s
Rust Build / Check (pull_request) Successful in 43s
Rust Build / Test Suite (pull_request) Successful in 35s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Successful in 46s
Rust Build / build (pull_request) Successful in 56s
Reviewed-on: #24
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-14 01:30:49 +00:00
eaa3c6f40e Get Metadata queue (#23)
All checks were successful
Release Tagging / release (push) Successful in 31s
Rust Build / Check (push) Successful in 32s
Rust Build / Test Suite (push) Successful in 35s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 33s
Rust Build / build (push) Successful in 38s
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Test Suite (pull_request) Successful in 37s
Rust Build / Rustfmt (pull_request) Successful in 25s
Rust Build / Clippy (pull_request) Successful in 34s
Rust Build / build (pull_request) Successful in 39s
Reviewed-on: #23
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-14 00:30:25 +00:00
79eea81e28 Updated icarus_envy (#22)
All checks were successful
Release Tagging / release (push) Successful in 31s
Rust Build / Check (push) Successful in 46s
Rust Build / Test Suite (push) Successful in 38s
Rust Build / Rustfmt (push) Successful in 28s
Rust Build / Clippy (push) Successful in 35s
Rust Build / build (push) Successful in 40s
Rust Build / Check (pull_request) Successful in 35s
Rust Build / Test Suite (pull_request) Successful in 37s
Rust Build / Rustfmt (pull_request) Successful in 25s
Rust Build / Clippy (pull_request) Successful in 33s
Rust Build / build (pull_request) Successful in 39s
Reviewed-on: #22
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-12 23:59:24 +00:00
006fa3a2d8 fetch song queue data (#21)
All checks were successful
Release Tagging / release (push) Successful in 32s
Rust Build / Check (push) Successful in 34s
Rust Build / Test Suite (push) Successful in 35s
Rust Build / Rustfmt (push) Successful in 25s
Rust Build / Clippy (push) Successful in 37s
Rust Build / build (push) Successful in 45s
Rust Build / Check (pull_request) Successful in 36s
Rust Build / Test Suite (pull_request) Successful in 37s
Rust Build / Rustfmt (pull_request) Successful in 28s
Rust Build / Clippy (pull_request) Successful in 35s
Rust Build / build (pull_request) Successful in 40s
Reviewed-on: #21
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-12 18:57:02 +00:00
2f11ff9e89 Fetch queue item (#20)
All checks were successful
Rust Build / Check (push) Successful in 35s
Rust Build / Check (pull_request) Successful in 33s
Rust Build / Test Suite (push) Successful in 38s
Rust Build / Rustfmt (push) Successful in 28s
Rust Build / Clippy (push) Successful in 36s
Release Tagging / release (push) Successful in 35s
Rust Build / build (push) Successful in 40s
Rust Build / Test Suite (pull_request) Successful in 37s
Rust Build / Rustfmt (pull_request) Successful in 28s
Rust Build / Clippy (pull_request) Successful in 37s
Rust Build / build (pull_request) Successful in 41s
Reviewed-on: #20
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-10 22:44:38 +00:00
5ced62ec7a Modify application structure (#19)
All checks were successful
Release Tagging / release (push) Successful in 37s
Rust Build / Check (push) Successful in 50s
Rust Build / Test Suite (push) Successful in 39s
Rust Build / Rustfmt (push) Successful in 28s
Rust Build / Clippy (push) Successful in 50s
Rust Build / build (push) Successful in 44s
Rust Build / Check (pull_request) Successful in 33s
Rust Build / Test Suite (pull_request) Successful in 37s
Rust Build / Rustfmt (pull_request) Successful in 26s
Rust Build / Clippy (pull_request) Successful in 32s
Rust Build / build (pull_request) Successful in 37s
Reviewed-on: #19
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-10 21:50:00 +00:00
817ea9fed2 Add env (#18)
All checks were successful
Rust Build / Clippy (push) Successful in 27s
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 26s
Rust Build / Check (pull_request) Successful in 26s
Rust Build / Test Suite (push) Successful in 27s
Rust Build / Rustfmt (push) Successful in 23s
Rust Build / build (push) Successful in 28s
Rust Build / Test Suite (pull_request) Successful in 27s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Successful in 26s
Rust Build / build (pull_request) Successful in 27s
Reviewed-on: #18
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-03 00:31:45 +00:00
ce1d522814 Including Cargo.lock in source control (#17)
All checks were successful
Release Tagging / release (push) Successful in 30s
Rust Build / Check (push) Successful in 28s
Rust Build / Test Suite (push) Successful in 30s
Rust Build / Rustfmt (push) Successful in 25s
Rust Build / Clippy (push) Successful in 29s
Rust Build / build (push) Successful in 31s
Rust Build / Check (pull_request) Successful in 25s
Rust Build / Test Suite (pull_request) Successful in 28s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Successful in 28s
Rust Build / build (pull_request) Successful in 28s
Reviewed-on: #17
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-03 00:18:18 +00:00
c04c6cdd6c Updated rust version in gitea workflow (#16)
All checks were successful
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 25s
Rust Build / Test Suite (push) Successful in 25s
Rust Build / Rustfmt (push) Successful in 23s
Rust Build / Clippy (push) Successful in 27s
Rust Build / build (push) Successful in 27s
Rust Build / Check (pull_request) Successful in 34s
Rust Build / Test Suite (pull_request) Successful in 38s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Successful in 33s
Rust Build / build (pull_request) Successful in 42s
Reviewed-on: #16
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-05-29 00:01:54 +00:00
f1375f5639 Update icarus_models (#15)
Some checks failed
Release Tagging / release (push) Successful in 25s
Rust Build / Check (push) Failing after 24s
Rust Build / Check (pull_request) Failing after 21s
Rust Build / Test Suite (push) Failing after 22s
Rust Build / Rustfmt (push) Successful in 21s
Rust Build / Clippy (push) Failing after 24s
Rust Build / build (push) Failing after 24s
Rust Build / Test Suite (pull_request) Failing after 24s
Rust Build / Rustfmt (pull_request) Successful in 22s
Rust Build / Clippy (pull_request) Failing after 25s
Rust Build / build (pull_request) Failing after 22s
Reviewed-on: #15
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-05-28 23:44:20 +00:00
b41933e05e Stamped rust version (#14)
Some checks failed
Release Tagging / release (push) Successful in 27s
Rust Build / Check (push) Failing after 25s
Rust Build / Check (pull_request) Failing after 24s
Rust Build / Test Suite (push) Failing after 23s
Rust Build / Rustfmt (push) Successful in 22s
Rust Build / Clippy (push) Failing after 24s
Rust Build / build (push) Failing after 26s
Rust Build / Test Suite (pull_request) Failing after 25s
Rust Build / Rustfmt (pull_request) Successful in 20s
Rust Build / Clippy (pull_request) Failing after 24s
Rust Build / build (pull_request) Failing after 23s
Reviewed-on: #14
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-05-28 23:28:28 +00:00
d1610d1331 service (#11)
All checks were successful
Release Tagging / release (push) Successful in 43s
Rust Build / Check (pull_request) Successful in 36s
Rust Build / Check (push) Successful in 44s
Rust Build / Test Suite (push) Successful in 40s
Rust Build / Rustfmt (push) Successful in 34s
Rust Build / Clippy (push) Successful in 37s
Rust Build / build (push) Successful in 1m11s
Rust Build / Test Suite (pull_request) Successful in 37s
Rust Build / Rustfmt (pull_request) Successful in 30s
Rust Build / Clippy (pull_request) Successful in 36s
Rust Build / build (pull_request) Successful in 38s
Reviewed-on: #11
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-04-12 17:28:03 +00:00
83eafd0005 Workflow changes (#9) (#10)
All checks were successful
Release Tagging / release (push) Successful in 40s
Rust Build / Check (push) Successful in 42s
Rust Build / Test Suite (push) Successful in 38s
Rust Build / Rustfmt (push) Successful in 29s
Rust Build / Clippy (push) Successful in 38s
Rust Build / build (push) Successful in 55s
Reviewed-on: #9
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
Reviewed-on: #10
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-04-12 17:27:06 +00:00
8bc49e781b Correcting action workflow (#12)
All checks were successful
Release Tagging / release (push) Successful in 37s
Rust Build / Check (push) Successful in 32s
Rust Build / Test Suite (push) Successful in 34s
Rust Build / Rustfmt (push) Successful in 29s
Rust Build / Clippy (push) Successful in 31s
Rust Build / build (push) Successful in 34s
Rust Build / Check (pull_request) Successful in 34s
Rust Build / Test Suite (pull_request) Successful in 43s
Rust Build / Rustfmt (pull_request) Successful in 31s
Rust Build / Clippy (pull_request) Successful in 41s
Rust Build / build (pull_request) Successful in 40s
Reviewed-on: #12
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-04-05 22:00:41 +00:00
f68d01d50f Workflow changes (#9)
All checks were successful
Rust Build / Check (pull_request) Successful in 28s
Rust Build / Clippy (push) Successful in 34s
Rust Build / build (push) Successful in 31s
Rust Build / Test Suite (pull_request) Successful in 28s
Rust Build / Rustfmt (pull_request) Successful in 27s
Rust Build / Clippy (pull_request) Successful in 30s
Rust Build / build (pull_request) Successful in 30s
Release Tagging / release (push) Successful in 36s
Rust Build / Check (push) Successful in 30s
Rust Build / Test Suite (push) Successful in 30s
Rust Build / Rustfmt (push) Successful in 26s
Reviewed-on: #9
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-04-05 21:26:05 +00:00
e3895b6d1a devel (#7)
All checks were successful
Release Tagging / release (push) Successful in 29s
Rust Build / Check (push) Successful in 28s
Rust Build / Test Suite (push) Successful in 28s
Rust Build / Rustfmt (push) Successful in 29s
Rust Build / Clippy (push) Successful in 29s
Rust Build / build (push) Successful in 27s
Reviewed-on: #7
2025-03-30 18:01:52 +00:00
41001ec926 Updated icarus_models (#8)
All checks were successful
Release Tagging / release (push) Successful in 33s
Rust Build / Check (push) Successful in 34s
Rust Build / Check (pull_request) Successful in 29s
Rust Build / build (push) Successful in 27s
Rust Build / Test Suite (pull_request) Successful in 28s
Rust Build / Clippy (pull_request) Successful in 28s
Rust Build / build (pull_request) Successful in 38s
Rust Build / Test Suite (push) Successful in 28s
Rust Build / Rustfmt (push) Successful in 27s
Rust Build / Clippy (push) Successful in 32s
Rust Build / Rustfmt (pull_request) Successful in 25s
Reviewed-on: #8
2025-03-30 17:48:57 +00:00
KD
775a62d9cc Updated icarus_models
All checks were successful
Rust Build / Check (pull_request) Successful in 30s
Rust Build / Test Suite (pull_request) Successful in 29s
Rust Build / Rustfmt (pull_request) Successful in 30s
Rust Build / Clippy (pull_request) Successful in 33s
Rust Build / build (pull_request) Successful in 33s
2025-03-30 13:42:29 -04:00
a24dd6aba0 Fixing workflow (#6)
All checks were successful
Release Tagging / release (push) Successful in 33s
Rust Build / Check (push) Successful in 27s
Rust Build / Check (pull_request) Successful in 28s
Rust Build / Test Suite (push) Successful in 28s
Rust Build / Rustfmt (push) Successful in 27s
Rust Build / Clippy (push) Successful in 28s
Rust Build / build (push) Successful in 27s
Rust Build / Test Suite (pull_request) Successful in 32s
Rust Build / Rustfmt (pull_request) Successful in 26s
Rust Build / Clippy (pull_request) Successful in 29s
Rust Build / build (pull_request) Successful in 28s
Reviewed-on: #6
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-03-30 02:48:44 +00:00
522395f0ad Updated tag release stamp (#5)
Some checks failed
Rust Build / Check (push) Successful in 24s
Rust Build / Check (pull_request) Successful in 25s
Release Tagging / release (push) Failing after 33s
Rust Build / Test Suite (push) Successful in 25s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 24s
Rust Build / build (push) Successful in 24s
Rust Build / Test Suite (pull_request) Successful in 24s
Rust Build / Rustfmt (pull_request) Successful in 24s
Rust Build / Clippy (pull_request) Successful in 24s
Rust Build / build (pull_request) Successful in 24s
Reviewed-on: #5
2025-03-30 02:37:20 +00:00
9bfc0a10ea Updated tag release stamp
All checks were successful
Rust Build / Check (pull_request) Successful in 34s
Rust Build / Test Suite (pull_request) Successful in 24s
Rust Build / Rustfmt (pull_request) Successful in 25s
Rust Build / Clippy (pull_request) Successful in 26s
Rust Build / build (pull_request) Successful in 23s
2025-03-29 22:30:03 -04:00
14 changed files with 3139 additions and 27 deletions

4
.env.docker.sample Normal file
View File

@@ -0,0 +1,4 @@
ROOT_DIRECTORY=/home/songparser/mydata
ICARUS_BASE_API_URL=http://localhost:3000
ICARUS_AUTH_BASE_API_URL=http://localhost:3001
SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH

4
.env.sample Normal file
View File

@@ -0,0 +1,4 @@
ROOT_DIRECTORY=/home/songparser/mydata
ICARUS_BASE_API_URL=http://localhost:3000
ICARUS_AUTH_BASE_API_URL=http://localhost:3001
SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH

View File

@@ -3,10 +3,7 @@ name: Release Tagging
on:
push:
branches:
- main
- devel
tags:
- 'v*' # Trigger on tags matching v*
jobs:
release:
@@ -20,7 +17,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.86.0
components: cargo
- name: Extract Version from Cargo.toml
@@ -31,7 +28,7 @@ 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-111"
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-372"
echo "Version: $VERSION"
echo "Hash: $PROJECT_COMMIT_HASH"
echo "Branch: $BRANCH_NAME"
@@ -52,6 +49,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

View File

@@ -18,10 +18,10 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.88.0
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
chmod 600 ~/.ssh/gitlab_deploy_key
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
@@ -36,12 +36,12 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.88.0
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
chmod 600 ~/.ssh/gitlab_deploy_key
ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
ssh-add -v ~/.ssh/gitlab_deploy_key
cargo test
@@ -54,13 +54,13 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.88.0
- run: rustup component add rustfmt
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
chmod 600 ~/.ssh/gitlab_deploy_key
ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
ssh-add -v ~/.ssh/gitlab_deploy_key
cargo fmt --all -- --check
@@ -73,13 +73,13 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.88.0
- run: rustup component add clippy
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
chmod 600 ~/.ssh/gitlab_deploy_key
ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
ssh-add -v ~/.ssh/gitlab_deploy_key
cargo clippy -- -D warnings
@@ -92,12 +92,12 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.88.0
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
chmod 600 ~/.ssh/gitlab_deploy_key
ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
ssh-add -v ~/.ssh/gitlab_deploy_key
cargo build --release

4
.gitignore vendored
View File

@@ -1,2 +1,4 @@
/target
Cargo.lock
.env
.env.local
.env.docker

2081
Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,18 @@
[package]
name = "songparser"
version = "0.1.0"
version = "0.2.5"
edition = "2024"
rust-version = "1.88"
[dependencies]
icarus-models = { git = "ssh://git@git.kundeng.us/phoenix/icarus-models.git", tag = "v0.1.14" }
tokio = { version = "1.45.1", features = ["full"] }
futures = { version = "0.3.31" }
reqwest = { version = "0.12.20", features = ["json", "stream", "multipart"] }
serde = { version = "1.0.219", features = ["derive"] }
serde_json = { version = "1.0.140" }
time = { version = "0.3.41", features = ["macros", "serde"] }
uuid = { version = "1.17.0", features = ["v4", "serde"] }
rand = { version = "0.9.1" }
icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.3.0" }
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.5.5-devel-bd793db08e-111" }
icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.3.2-18-d498f60046-006" }

169
src/api.rs Normal file
View File

@@ -0,0 +1,169 @@
pub async fn fetch_next_queue_item(
app: &crate::config::App,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let fetch_endpoint = String::from("api/v2/song/queue/next");
let api_url = format!("{}/{fetch_endpoint}", app.uri);
let (key, header) = auth_header(app).await;
client.get(api_url).header(key, header).send().await
}
pub async fn auth_header(
app: &crate::config::App,
) -> (reqwest::header::HeaderName, reqwest::header::HeaderValue) {
let bearer = format!("Bearer {}", app.token.token);
let header_value = reqwest::header::HeaderValue::from_str(&bearer).unwrap();
(reqwest::header::AUTHORIZATION, header_value)
}
pub mod parsing {
use futures::StreamExt;
pub async fn parse_response_into_bytes(
response: reqwest::Response,
) -> Result<Vec<u8>, reqwest::Error> {
// TODO: At some point, handle the flow if the size is small or
// large
let mut byte_stream = response.bytes_stream();
let mut all_bytes = Vec::new();
while let Some(chunk) = byte_stream.next().await {
let chunk = chunk?;
all_bytes.extend_from_slice(&chunk);
}
Ok(all_bytes)
}
}
pub mod fetch_song_queue_data {
pub async fn get_data(
app: &crate::config::App,
id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/song/queue");
let api_url = format!("{}/{endpoint}/{id}", app.uri);
let (key, header) = super::auth_header(app).await;
client.get(api_url).header(key, header).send().await
}
}
pub mod get_metadata_queue {
pub async fn get(
app: &crate::config::App,
song_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/song/metadata/queue");
let api_url = format!("{}/{endpoint}", app.uri);
let (key, header) = super::auth_header(app).await;
client
.get(api_url)
.query(&[("song_queue_id", song_queue_id)])
.header(key, header)
.send()
.await
}
pub mod response {
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Metadata {
pub song_queue_id: uuid::Uuid,
pub album: String,
pub album_artist: String,
pub artist: String,
pub disc: i32,
pub disc_count: i32,
pub duration: i64,
pub genre: String,
pub title: String,
pub track: i32,
pub track_count: i32,
pub year: i32,
}
#[derive(Debug, Deserialize, Serialize)]
pub struct QueueItem {
pub id: uuid::Uuid,
pub metadata: Metadata,
#[serde(with = "time::serde::rfc3339")]
pub created_at: time::OffsetDateTime,
pub song_queue_id: uuid::Uuid,
}
#[derive(Debug, Deserialize, Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<QueueItem>,
}
}
}
pub mod get_coverart_queue {
pub async fn get(
app: &crate::config::App,
song_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/coverart/queue");
let api_url = format!("{}/{endpoint}", app.uri);
let (key, header) = super::auth_header(app).await;
client
.get(api_url)
.query(&[("song_queue_id", song_queue_id)])
.header(key, header)
.send()
.await
}
pub async fn get_data(
app: &crate::config::App,
coverart_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/coverart/queue/data");
let api_url = format!("{}/{endpoint}/{coverart_queue_id}", app.uri);
let (key, header) = super::auth_header(app).await;
client.get(api_url).header(key, header).send().await
}
pub mod response {
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize)]
pub struct CoverArtQueue {
pub id: uuid::Uuid,
pub song_queue_id: uuid::Uuid,
}
#[derive(Debug, Deserialize, Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<CoverArtQueue>,
}
}
}
pub mod service_token {
pub mod response {
#[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<icarus_models::login_result::LoginResult>,
}
}
}
pub mod refresh_token {
pub mod response {
#[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<icarus_models::login_result::LoginResult>,
}
}
}

6
src/config.rs Normal file
View File

@@ -0,0 +1,6 @@
#[derive(Default, Debug)]
pub struct App {
pub uri: String,
pub auth_uri: String,
pub token: icarus_models::login_result::LoginResult,
}

View File

@@ -1,3 +1,606 @@
fn main() {
println!("Hello, world!");
pub mod api;
pub mod config;
pub mod responses;
pub mod the_rest;
pub mod update_queued_song;
pub mod util;
use std::io::Write;
pub const SECONDS_TO_SLEEP: u64 = 5;
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut app = config::App {
uri: icarus_envy::environment::get_icarus_base_api_url().await,
auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url().await,
..Default::default()
};
match auth::get_token(&app).await {
Ok(login_result) => {
app.token = login_result;
}
Err(err) => {
eprintln!("Error: {err:?}");
std::process::exit(-1);
}
};
loop {
println!("Base URL: {:?}", app.uri);
println!("Auth URL: {:?}", app.auth_uri);
println!("Token: {:?}", app.token);
if auth::did_token_expire(&app.token).await {
println!("Token expired");
app.token = match auth::get_refresh_token(&app).await {
Ok(login_result) => login_result,
Err(err) => {
eprintln!("Error: {err:?}");
continue;
}
};
println!("Token refreshed");
println!("Refreshed token: {:?}", app.token);
} else {
println!("Token did not expire");
}
match is_queue_empty(&app).await {
Ok((empty, song_queue_item)) => {
if !empty {
println!("Queue is not empty");
println!("SongQueueItem: {song_queue_item:?}");
let song_queue_id = song_queue_item.data[0].id;
let user_id = song_queue_item.data[0].user_id;
// TODO: Do something with the result later
match some_work(&app, &song_queue_id, &user_id).await {
Ok((
_song,
_coverart,
(song_queue_id, song_queue_path),
(coverart_queue_id, coverart_queue_path),
)) => {
match wipe_data_from_queues(&app, &song_queue_id, &coverart_queue_id)
.await
{
Ok(_) => {
match cleanup(&song_queue_path, &coverart_queue_path).await {
Ok(_) => {
println!("Successful cleanup");
}
Err(err) => {
eprintln!("Error: {err:?}");
}
}
}
Err(err) => {
eprintln!("Error: {err:?}");
}
}
}
Err(err) => {
eprintln!("Error: {err:?}");
}
}
} else {
println!("Queue is empty");
}
}
Err(err) => {
eprintln!("Error checking if queue is empty: {err:?}");
}
}
println!("Sleeping");
tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await;
}
}
mod auth {
pub async fn get_token(
app: &crate::config::App,
) -> Result<icarus_models::login_result::LoginResult, std::io::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/service/login");
let api_url = format!("{}/{endpoint}", app.auth_uri);
let payload = serde_json::json!({
"passphrase": icarus_envy::environment::get_service_passphrase().await,
});
match client.post(api_url).json(&payload).send().await {
Ok(response) => match response
.json::<crate::api::service_token::response::Response>()
.await
{
Ok(resp) => {
if resp.data.is_empty() {
Err(std::io::Error::other(String::from("No token returned")))
} else {
Ok(resp.data[0].clone())
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
},
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
// TODO: Might want to put the functionality within icarus_models at some point
pub async fn did_token_expire(login_result: &icarus_models::login_result::LoginResult) -> bool {
let current_time = time::OffsetDateTime::now_utc();
let expire_time =
time::OffsetDateTime::from_unix_timestamp(login_result.expiration).unwrap();
current_time > expire_time
}
pub async fn get_refresh_token(
app: &crate::config::App,
) -> Result<icarus_models::login_result::LoginResult, std::io::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/token/refresh");
let api_url = format!("{}/{endpoint}", app.auth_uri);
let payload = serde_json::json!({
"access_token": app.token.token
});
match client.post(api_url).json(&payload).send().await {
Ok(response) => match response
.json::<crate::api::refresh_token::response::Response>()
.await
{
Ok(resp) => {
if resp.data.is_empty() {
Err(std::io::Error::other(String::from("No token returned")))
} else {
Ok(resp.data[0].clone())
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
},
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
}
async fn wipe_data_from_queues(
app: &config::App,
song_queue_id: &uuid::Uuid,
coverart_queue_id: &uuid::Uuid,
) -> Result<(), std::io::Error> {
match the_rest::wipe_data::song_queue::wipe_data(app, song_queue_id).await {
Ok(response) => match response
.json::<the_rest::wipe_data::song_queue::response::Response>()
.await
{
Ok(_resp) => {
match the_rest::wipe_data::coverart_queue::wipe_data(app, coverart_queue_id).await {
Ok(inner_response) => match inner_response
.json::<the_rest::wipe_data::coverart_queue::response::Response>()
.await
{
Ok(_inner_resp) => {
println!("Wiped data from CoverArt queue");
println!("Resp: {_inner_resp:?}");
Ok(())
}
Err(err) => Err(std::io::Error::other(err.to_string())),
},
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
},
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
async fn cleanup(
song_queue_path: &String,
coverart_queue_path: &String,
) -> Result<(), std::io::Error> {
match the_rest::cleanup::clean_song_queue(song_queue_path) {
Ok(_) => {}
Err(err) => {
eprintln!("Error: Problem cleaning up SongQueue files {err:?}");
}
}
match the_rest::cleanup::clean_coverart_queue(coverart_queue_path) {
Ok(_) => Ok(()),
Err(err) => Err(err),
}
}
async fn is_queue_empty(
app: &config::App,
) -> Result<(bool, responses::fetch_next_queue_item::SongQueueItem), reqwest::Error> {
match api::fetch_next_queue_item(app).await {
Ok(response) => {
match response
.json::<responses::fetch_next_queue_item::SongQueueItem>()
.await
{
Ok(response) => {
if response.data.is_empty() {
Ok((true, response))
} else {
Ok((false, response))
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(err),
}
}
async fn some_work(
app: &crate::config::App,
song_queue_id: &uuid::Uuid,
user_id: &uuid::Uuid,
) -> Result<
(
icarus_models::song::Song,
icarus_models::coverart::CoverArt,
(uuid::Uuid, String),
(uuid::Uuid, String),
),
std::io::Error,
> {
match prep_song(app, song_queue_id).await {
Ok((song_queue_path, coverart_queue_path, metadata, coverart_queue_id)) => {
match apply_metadata(&song_queue_path, &coverart_queue_path, &metadata).await {
Ok(_applied) => {
match update_queued_song::update_queued_song(
app,
&song_queue_path,
song_queue_id,
)
.await
{
Ok(response) => {
match response
.json::<update_queued_song::response::Response>()
.await
{
Ok(_inner_response) => {
println!("Response: {_inner_response:?}");
// TODO: Place this somewhere else
let song_type = String::from("flac");
match the_rest::create_song::create(
app, &metadata, user_id, &song_type,
)
.await
{
Ok(response) => match response
.json::<the_rest::create_song::response::Response>()
.await
{
Ok(resp) => {
println!("Response: {resp:?}");
let song = &resp.data[0];
match the_rest::create_coverart::create(app, &song.id, &coverart_queue_id).await {
Ok(response) => match response.json::<the_rest::create_coverart::response::Response>().await {
Ok(resp) => {
println!("CoverArt sent and successfully parsed response");
println!("json: {resp:?}");
let coverart = &resp.data[0];
Ok((song.clone(), coverart.clone(), (metadata.song_queue_id, song_queue_path), (coverart_queue_id, coverart_queue_path)))
}
Err(err) => {
Err(std::io::Error::other(err.to_string()))
}
}
Err(err) => {
Err(std::io::Error::other(err.to_string()))
}
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
},
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
async fn prep_song(
app: &crate::config::App,
song_queue_id: &uuid::Uuid,
) -> Result<
(
String,
String,
api::get_metadata_queue::response::Metadata,
uuid::Uuid,
),
reqwest::Error,
> {
match api::fetch_song_queue_data::get_data(app, song_queue_id).await {
Ok(response) => {
// Process data here...
match api::parsing::parse_response_into_bytes(response).await {
Ok(song_bytes) => {
let (directory, filename) = generate_song_queue_dir_and_filename().await;
let song_queue_path = save_file_to_fs(&directory, &filename, &song_bytes).await;
println!("Saved at: {song_queue_path:?}");
match api::get_metadata_queue::get(app, song_queue_id).await {
Ok(response) => {
match response
.json::<api::get_metadata_queue::response::Response>()
.await
{
Ok(response) => {
let id = &response.data[0].id;
let created_at = &response.data[0].created_at;
let metadata = &response.data[0].metadata;
println!("Id: {id:?}");
println!("Metadata: {metadata:?}");
println!("Created at: {created_at:?}");
println!("Getting coverart queue");
match api::get_coverart_queue::get(app, song_queue_id).await {
Ok(response) => {
match response.json::<api::get_coverart_queue::response::Response>().await {
Ok(response) => {
let coverart_queue_id = &response.data[0].id;
println!("Coverart queue Id: {coverart_queue_id:?}");
match api::get_coverart_queue::get_data(app, coverart_queue_id).await {
Ok(response) => match api::parsing::parse_response_into_bytes(response).await {
Ok(coverart_queue_bytes) => {
let (directory, filename) = generate_coverart_queue_dir_and_filename().await;
let coverart_queue_path = save_file_to_fs(&directory, &filename, &coverart_queue_bytes).await;
println!("Saved coverart queue file at: {coverart_queue_path:?}");
let c_path = util::path_buf_to_string(&coverart_queue_path);
let s_path = util::path_buf_to_string(&song_queue_path);
Ok((s_path, c_path, metadata.clone(), *coverart_queue_id))
}
Err(err) => {
Err(err)
}
}
Err(err) => {
Err(err)
}
}
}
Err(err) => {
Err(err)
}
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(err),
}
}
// TODO: Consider having something like this in icarus_models
pub async fn generate_song_queue_dir_and_filename() -> (String, String) {
let mut song = icarus_models::song::Song::default();
song.filename = song.generate_filename(icarus_models::types::MusicTypes::FlacExtension, true);
song.directory = icarus_envy::environment::get_root_directory().await;
(song.directory, song.filename)
}
// TODO: Consider having something like this in icarus_models
pub async fn generate_coverart_queue_dir_and_filename() -> (String, String) {
use rand::Rng;
let mut filename: String = String::new();
let filename_len = 10;
let some_chars: String = String::from("abcdefghij0123456789");
let mut rng = rand::rng();
for _i in 0..filename_len {
let random_number: i32 = rng.random_range(0..=19);
let index = random_number as usize;
let rando_char = some_chars.chars().nth(index);
if let Some(c) = rando_char {
filename.push(c);
}
}
// TODO: Do not hard code the file extension
filename += ".jpeg";
// TODO: Consider separating song and coverart when saving to the filesystem
let directory = icarus_envy::environment::get_root_directory().await;
(directory, filename)
}
// TODO: Check to see if this is available in icarus_models
pub async fn save_file_to_fs(
directory: &String,
filename: &String,
data: &[u8],
) -> std::path::PathBuf {
// TODO: Add function to save bytes to a file in icarus_models
// repo
let dir = std::path::Path::new(directory);
let save_path = dir.join(filename);
let mut file = std::fs::File::create(&save_path).unwrap();
file.write_all(data).unwrap();
save_path
}
pub async fn apply_metadata(
song_queue_path: &String,
coverart_queue_path: &String,
metadata: &api::get_metadata_queue::response::Metadata,
) -> Result<bool, std::io::Error> {
// Apply metadata fields
let types = icarus_meta::types::all_metadata_types();
for t in types {
match t {
icarus_meta::types::Type::Album => {
let meta_type =
icarus_meta::types::MetadataType::from_string(metadata.album.clone());
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
icarus_meta::types::Type::AlbumArtist => {
let meta_type =
icarus_meta::types::MetadataType::from_string(metadata.album_artist.clone());
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
icarus_meta::types::Type::Artist => {
let meta_type =
icarus_meta::types::MetadataType::from_string(metadata.artist.clone());
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
icarus_meta::types::Type::Date => {
// TODO: Do something about this discrepancy
let meta_type =
icarus_meta::types::MetadataType::from_string(metadata.year.to_string());
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
icarus_meta::types::Type::Disc => {
let meta_type = icarus_meta::types::MetadataType::from_int(metadata.disc);
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
icarus_meta::types::Type::Genre => {
let meta_type =
icarus_meta::types::MetadataType::from_string(metadata.genre.clone());
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
icarus_meta::types::Type::Title => {
let meta_type =
icarus_meta::types::MetadataType::from_string(metadata.title.clone());
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
icarus_meta::types::Type::Track => {
let meta_type = icarus_meta::types::MetadataType::from_int(metadata.track);
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
icarus_meta::types::Type::TrackCount => {
let meta_type = icarus_meta::types::MetadataType::from_int(metadata.track_count);
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
icarus_meta::types::Type::DiscCount => {
let meta_type = icarus_meta::types::MetadataType::from_int(metadata.disc_count);
match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
}
}
}
}
}
// Apply coverart
match icarus_meta::meta::coverart::contains_coverart(song_queue_path) {
Ok((exists, size)) => {
if exists {
println!("Coverart exists: {size:?} size");
match icarus_meta::meta::coverart::remove_coverart(song_queue_path) {
Ok(_data) => {}
Err(err) => {
return Err(err);
}
}
}
match icarus_meta::meta::coverart::set_coverart(song_queue_path, coverart_queue_path) {
Ok(_data) => {
if _data.is_empty() {
println!("There was an issue");
Ok(false)
} else {
println!("Success in applying coverart to song");
Ok(true)
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(err),
}
}

17
src/responses.rs Normal file
View File

@@ -0,0 +1,17 @@
pub mod fetch_next_queue_item {
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize)]
pub struct QueueItem {
pub id: uuid::Uuid,
pub filename: String,
pub status: String,
pub user_id: uuid::Uuid,
}
#[derive(Debug, Deserialize, Serialize)]
pub struct SongQueueItem {
pub message: String,
pub data: Vec<QueueItem>,
}
}

179
src/the_rest.rs Normal file
View File

@@ -0,0 +1,179 @@
// TODO: Refactor this file when this app is functional
pub mod create_song {
pub async fn create(
app: &crate::config::App,
metadata_queue: &crate::api::get_metadata_queue::response::Metadata,
user_id: &uuid::Uuid,
song_type: &String,
) -> Result<reqwest::Response, reqwest::Error> {
let payload = serde_json::json!(
{
"album": &metadata_queue.album,
"album_artist": &metadata_queue.album_artist,
"artist": &metadata_queue.artist,
"disc": metadata_queue.disc,
"disc_count": metadata_queue.disc_count,
"duration": metadata_queue.duration,
"genre": &metadata_queue.genre,
"title": &metadata_queue.title,
"track": metadata_queue.track,
"track_count": metadata_queue.track_count,
"date": metadata_queue.year.to_string(),
"audio_type": &song_type,
"user_id": &user_id,
"song_queue_id": &metadata_queue.song_queue_id,
}
);
let client = reqwest::Client::builder().build()?;
let url = format!("{}/api/v2/song", app.uri);
let (key, header) = crate::api::auth_header(app).await;
let request = client.post(url).json(&payload).header(key, header);
request.send().await
}
pub mod response {
#[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<icarus_models::song::Song>,
}
}
}
pub mod create_coverart {
pub async fn create(
app: &crate::config::App,
song_id: &uuid::Uuid,
coverart_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::builder().build()?;
let url = format!("{}/api/v2/coverart", app.uri);
let payload = get_payload(song_id, coverart_queue_id);
let (key, header) = crate::api::auth_header(app).await;
let request = client.post(url).json(&payload).header(key, header);
request.send().await
}
fn get_payload(song_id: &uuid::Uuid, coverart_queue_id: &uuid::Uuid) -> serde_json::Value {
serde_json::json!({
"song_id": &song_id,
"coverart_queue_id": &coverart_queue_id,
})
}
pub mod response {
#[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<icarus_models::coverart::CoverArt>,
}
}
}
pub mod wipe_data {
pub mod song_queue {
pub async fn wipe_data(
app: &crate::config::App,
song_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::builder().build()?;
let url = format!("{}/api/v2/song/queue/data/wipe", app.uri);
let payload = serde_json::json!({
"song_queue_id": song_queue_id
});
let (key, header) = crate::api::auth_header(app).await;
let request = client.patch(url).json(&payload).header(key, header);
request.send().await
}
pub mod response {
#[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<uuid::Uuid>,
}
}
}
pub mod coverart_queue {
pub async fn wipe_data(
app: &crate::config::App,
coverart_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::builder().build()?;
let url = format!("{}/api/v2/coverart/queue/data/wipe", app.uri);
let payload = serde_json::json!({
"coverart_queue_id": coverart_queue_id
});
let (key, header) = crate::api::auth_header(app).await;
let request = client.patch(url).json(&payload).header(key, header);
request.send().await
}
pub mod response {
#[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<uuid::Uuid>,
}
}
}
}
pub mod cleanup {
pub fn clean_song_queue(song_queue_path: &String) -> Result<(), std::io::Error> {
let file_path = std::path::Path::new(song_queue_path);
if file_path.exists() {
match std::fs::remove_file(file_path) {
Ok(_) => {
if check_file_existence(song_queue_path) {
Err(std::io::Error::other(String::from(
"SongQueue file exists after a deletion",
)))
} else {
Ok(())
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
} else {
Err(std::io::Error::other(String::from(
"SongQueue file path does not exists",
)))
}
}
pub fn clean_coverart_queue(coverart_queue_path: &String) -> Result<(), std::io::Error> {
let coverart_file_path = std::path::Path::new(coverart_queue_path);
if coverart_file_path.exists() {
match std::fs::remove_file(coverart_file_path) {
Ok(_) => {
if !check_file_existence(coverart_queue_path) {
Ok(())
} else {
Err(std::io::Error::other(String::from(
"CoverArt file stil exists",
)))
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
} else {
Err(std::io::Error::other(String::from(
"CoverArt file does not exists",
)))
}
}
fn check_file_existence(file_path: &String) -> bool {
let path = std::path::Path::new(file_path);
path.exists()
}
}

36
src/update_queued_song.rs Normal file
View File

@@ -0,0 +1,36 @@
pub async fn update_queued_song(
app: &crate::config::App,
song_path: &String,
song_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::builder().build()?;
println!("Song path: {song_path:?}");
// TODO: Make the filename random
let form = reqwest::multipart::Form::new().part(
"file",
reqwest::multipart::Part::bytes(std::fs::read(song_path).unwrap())
.file_name("track01.flac"),
);
let url = format!("{}/api/v2/song/queue/{song_queue_id}", app.uri);
println!("Url: {url:?}");
let (key, header) = crate::api::auth_header(app).await;
let request = client.patch(url).multipart(form).header(key, header);
let response = request.send().await?;
Ok(response)
}
pub mod response {
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<uuid::Uuid>,
}
}

6
src/util.rs Normal file
View File

@@ -0,0 +1,6 @@
pub fn path_buf_to_string(path: &std::path::Path) -> String {
match path.to_str() {
Some(val) => String::from(val),
None => String::new(),
}
}