fix: [#56] announce list has precedence over announce

josecelano · josecelano · commit f620e05393f0 · 2022-11-30T13:57:37.000Z
From BEP-12:

"In addition to the standard "announce" key, in the main area of the metadata file and not part of the "info" section, will be a new key, "announce-list". This key will refer to a list of lists of URLs, and will contain a list of tiers of announces. If the client is compatible with the multitracker specification, and if the "announce-list" key is present, the client will ignore the "announce" key and only use the URLs in "announce-list".
diff --git a/src/upgrades/from_v1_0_0_to_v2_0_0/upgrader.rs b/src/upgrades/from_v1_0_0_to_v2_0_0/upgrader.rs
@@ -289,7 +289,7 @@ async fn transfer_torrents(
             .insert_torrent(&TorrentRecordV2::from_v1_data(
                 torrent,
                 &torrent_from_file.info,
-                &uploader
+                &uploader,
             ))
             .await
             .unwrap();
@@ -378,21 +378,7 @@ async fn transfer_torrents(
             &torrent.torrent_id
         );
 
-        if torrent_from_file.announce.is_some() {
-            println!("[v2][torrust_torrent_announce_urls][announce] adding the torrent announce url for torrent id {:?} ...", &torrent.torrent_id);
-
-            let announce_url_id = dest_database
-                .insert_torrent_announce_url(
-                    torrent.torrent_id,
-                    &torrent_from_file.announce.unwrap(),
-                )
-                .await;
-
-            println!(
-                "[v2][torrust_torrent_announce_urls][announce] torrent announce url insert result {:?} ...",
-                &announce_url_id
-            );
-        } else if torrent_from_file.announce_list.is_some() {
+        if torrent_from_file.announce_list.is_some() {
             // BEP-0012. Multiple trackers.
 
             println!("[v2][torrust_torrent_announce_urls][announce-list] adding the torrent announce url for torrent id {:?} ...", &torrent.torrent_id);
@@ -415,6 +401,20 @@ async fn transfer_torrents(
 
                 println!("[v2][torrust_torrent_announce_urls][announce-list] torrent announce url insert result {:?} ...", &announce_url_id);
             }
+        } else if torrent_from_file.announce.is_some() {
+            println!("[v2][torrust_torrent_announce_urls][announce] adding the torrent announce url for torrent id {:?} ...", &torrent.torrent_id);
+
+            let announce_url_id = dest_database
+                .insert_torrent_announce_url(
+                    torrent.torrent_id,
+                    &torrent_from_file.announce.unwrap(),
+                )
+                .await;
+
+            println!(
+                "[v2][torrust_torrent_announce_urls][announce] torrent announce url insert result {:?} ...",
+                &announce_url_id
+            );
         }
     }
     println!("Torrents transferred");
