Merge pull request #80 from torrust/79-while-uploading-a-torrent-the-…

…announce_list-should-be-prioritized-over-the-announce-field fix: [#79] prioritize `announce-list` over `announce`
torrust · Nov 9, 2022 · 29e2621 · 29e2621
2 parents f3d272f + 4e72995
commit 29e2621
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/src/databases/mysql.rs b/src/databases/mysql.rs
@@ -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 (?, ?)")
@@ -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

diff --git a/src/databases/sqlite.rs b/src/databases/sqlite.rs
@@ -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 (?, ?)")
@@ -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