Skip to content

fix: [#79] prioritize announce-list over announce #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2022
Merged

fix: [#79] prioritize announce-list over announce #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/databases/mysql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,17 +446,9 @@ impl Database for MysqlDatabase {
return Err(e)
}

let insert_torrent_announce_urls_result: Result<(), DatabaseError> = if let Some(tracker_url) = &torrent.announce {
query("INSERT INTO torrust_torrent_announce_urls (torrent_id, tracker_url) VALUES (?, ?)")
.bind(torrent_id)
.bind(tracker_url)
.execute(&mut tx)
.await
.map(|_| ())
.map_err(|_| DatabaseError::Error)
} else {
let insert_torrent_announce_urls_result: Result<(), DatabaseError> = if let Some(announce_urls) = &torrent.announce_list {
// flatten the nested vec (this will however remove the)
let announce_urls = torrent.announce_list.clone().unwrap().into_iter().flatten().collect::<Vec<String>>();
let announce_urls = announce_urls.iter().flatten().collect::<Vec<&String>>();

for tracker_url in announce_urls.iter() {
let _ = query("INSERT INTO torrust_torrent_announce_urls (torrent_id, tracker_url) VALUES (?, ?)")
Expand All @@ -469,6 +461,16 @@ impl Database for MysqlDatabase {
}

Ok(())
} else {
let tracker_url = torrent.announce.as_ref().unwrap();

query("INSERT INTO torrust_torrent_announce_urls (torrent_id, tracker_url) VALUES (?, ?)")
.bind(torrent_id)
.bind(tracker_url)
.execute(&mut tx)
.await
.map(|_| ())
.map_err(|_| DatabaseError::Error)
};

// rollback transaction on error
Expand Down
22 changes: 12 additions & 10 deletions src/databases/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,17 +442,9 @@ impl Database for SqliteDatabase {
return Err(e)
}

let insert_torrent_announce_urls_result: Result<(), DatabaseError> = if let Some(tracker_url) = &torrent.announce {
query("INSERT INTO torrust_torrent_announce_urls (torrent_id, tracker_url) VALUES (?, ?)")
.bind(torrent_id)
.bind(tracker_url)
.execute(&mut tx)
.await
.map(|_| ())
.map_err(|_| DatabaseError::Error)
} else {
let insert_torrent_announce_urls_result: Result<(), DatabaseError> = if let Some(announce_urls) = &torrent.announce_list {
// flatten the nested vec (this will however remove the)
let announce_urls = torrent.announce_list.clone().unwrap().into_iter().flatten().collect::<Vec<String>>();
let announce_urls = announce_urls.iter().flatten().collect::<Vec<&String>>();

for tracker_url in announce_urls.iter() {
let _ = query("INSERT INTO torrust_torrent_announce_urls (torrent_id, tracker_url) VALUES (?, ?)")
Expand All @@ -465,6 +457,16 @@ impl Database for SqliteDatabase {
}

Ok(())
} else {
let tracker_url = torrent.announce.as_ref().unwrap();

query("INSERT INTO torrust_torrent_announce_urls (torrent_id, tracker_url) VALUES (?, ?)")
.bind(torrent_id)
.bind(tracker_url)
.execute(&mut tx)
.await
.map(|_| ())
.map_err(|_| DatabaseError::Error)
};

// rollback transaction on error
Expand Down