t1c.dev
forked from
rocksky.app/rocksky
A decentralized music tracking and discovery platform built on AT Protocol 🎵
refactor: remove unused 'did' parameter from save_album, save_track, and save_user functions
tsiry-sandratraina.com
+2
-22
crates/jetstream/src/repo.rs
+2
-22
crates/jetstream/src/repo.rs
···
44
let scrobble_record: ScrobbleRecord =
45
serde_json::from_value(commit.record.clone())?;
46
47
-
let album_id = save_album(&mut tx, scrobble_record.clone(), did).await?;
48
let artist_id = save_artist(&mut tx, scrobble_record.clone()).await?;
49
-
let track_id = save_track(&mut tx, scrobble_record.clone(), did).await?;
50
51
save_album_track(&mut tx, &album_id, &track_id).await?;
52
save_artist_track(&mut tx, &artist_id, &track_id).await?;
···
224
pub async fn save_track(
225
tx: &mut sqlx::Transaction<'_, Postgres>,
226
scrobble_record: ScrobbleRecord,
227
-
did: &str,
228
) -> Result<String, Error> {
229
let uri: Option<String> = None;
230
let hash = sha256::digest(
···
304
pub async fn save_album(
305
tx: &mut sqlx::Transaction<'_, Postgres>,
306
scrobble_record: ScrobbleRecord,
307
-
did: &str,
308
) -> Result<String, Error> {
309
let hash = sha256::digest(
310
format!(
···
532
.fetch_all(&mut **tx)
533
.await?;
534
535
-
let users: Vec<User> = sqlx::query_as("SELECT * FROM users WHERE xata_id = $1")
536
-
.bind(user_id)
537
-
.fetch_all(&mut **tx)
538
-
.await?;
539
-
540
let artist_id: &str;
541
542
match artists.is_empty() {
543
true => {
544
tracing::info!(name = %record.name, "Artist not found in database, inserting new artist");
545
-
let did = users[0].did.clone();
546
sqlx::query(
547
r#"
548
INSERT INTO artists (
···
627
record: AlbumRecord,
628
uri: &str,
629
) -> Result<(), Error> {
630
-
let users: Vec<User> = sqlx::query_as("SELECT * FROM users WHERE xata_id = $1")
631
-
.bind(user_id)
632
-
.fetch_all(&mut **tx)
633
-
.await?;
634
-
635
let hash = sha256::digest(format!("{} - {}", record.title, record.artist).to_lowercase());
636
let mut albums: Vec<Album> = sqlx::query_as("SELECT * FROM albums WHERE sha256 = $1")
637
.bind(&hash)
···
643
match albums.is_empty() {
644
true => {
645
tracing::info!(title = %record.title, artist = %record.artist, "Album not found in database, inserting new album");
646
-
let did = users[0].did.clone();
647
sqlx::query(
648
r#"
649
INSERT INTO albums (
···
743
.fetch_all(&mut **tx)
744
.await?;
745
746
-
let users: Vec<User> = sqlx::query_as("SELECT * FROM users WHERE xata_id = $1")
747
-
.bind(user_id)
748
-
.fetch_all(&mut **tx)
749
-
.await?;
750
-
751
let track_id: &str;
752
753
match tracks.is_empty() {
754
true => {
755
tracing::info!(title = %record.title, artist = %record.artist, album = %record.album, "Track not found in database, inserting new track");
756
-
let did = users[0].did.clone();
757
sqlx::query(
758
r#"
759
INSERT INTO tracks (
···
44
let scrobble_record: ScrobbleRecord =
45
serde_json::from_value(commit.record.clone())?;
46
47
+
let album_id = save_album(&mut tx, scrobble_record.clone()).await?;
48
let artist_id = save_artist(&mut tx, scrobble_record.clone()).await?;
49
+
let track_id = save_track(&mut tx, scrobble_record.clone()).await?;
50
51
save_album_track(&mut tx, &album_id, &track_id).await?;
52
save_artist_track(&mut tx, &artist_id, &track_id).await?;
···
224
pub async fn save_track(
225
tx: &mut sqlx::Transaction<'_, Postgres>,
226
scrobble_record: ScrobbleRecord,
227
) -> Result<String, Error> {
228
let uri: Option<String> = None;
229
let hash = sha256::digest(
···
303
pub async fn save_album(
304
tx: &mut sqlx::Transaction<'_, Postgres>,
305
scrobble_record: ScrobbleRecord,
306
) -> Result<String, Error> {
307
let hash = sha256::digest(
308
format!(
···
530
.fetch_all(&mut **tx)
531
.await?;
532
533
let artist_id: &str;
534
535
match artists.is_empty() {
536
true => {
537
tracing::info!(name = %record.name, "Artist not found in database, inserting new artist");
538
sqlx::query(
539
r#"
540
INSERT INTO artists (
···
619
record: AlbumRecord,
620
uri: &str,
621
) -> Result<(), Error> {
622
let hash = sha256::digest(format!("{} - {}", record.title, record.artist).to_lowercase());
623
let mut albums: Vec<Album> = sqlx::query_as("SELECT * FROM albums WHERE sha256 = $1")
624
.bind(&hash)
···
630
match albums.is_empty() {
631
true => {
632
tracing::info!(title = %record.title, artist = %record.artist, "Album not found in database, inserting new album");
633
sqlx::query(
634
r#"
635
INSERT INTO albums (
···
729
.fetch_all(&mut **tx)
730
.await?;
731
732
let track_id: &str;
733
734
match tracks.is_empty() {
735
true => {
736
tracing::info!(title = %record.title, artist = %record.artist, album = %record.album, "Track not found in database, inserting new track");
737
sqlx::query(
738
r#"
739
INSERT INTO tracks (