feat!: [#115] change endpoint GET /torrent/download/{id} to GET /torr…

…ent/download/{infohash}

BREAKING CHANGE: you can not use the odl endpoint enaymore: `GET /torrent/download/{id}`.

You have to use the torrent infohash.

project-words.txt

@@ -3,6 +3,7 @@ addrs
 AUTOINCREMENT
 bencode
 bencoded
+binascii
 btih
 chrono
 compatiblelicenses
@@ -16,6 +17,7 @@ Dont
 Grünwald
 hasher
 Hasher
+hexlify
 httpseeds
 imagoodboy
 imdl
@@ -27,6 +29,7 @@ LEECHERS
 lettre
 luckythelab
 mailcatcher
+metainfo
 nanos
 NCCA
 nilm
@@ -47,6 +50,7 @@ sublist
 subpoints
 tempdir
 tempfile
+thiserror
 torrust
 Torrust
 upgrader

src/databases/database.rs

@@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::databases::mysql::MysqlDatabase;
 use crate::databases::sqlite::SqliteDatabase;
+use crate::models::info_hash::InfoHash;
 use crate::models::response::TorrentsResponse;
 use crate::models::torrent::TorrentListing;
 use crate::models::torrent_file::{DbTorrentInfo, Torrent, TorrentFile};
@@ -154,12 +155,42 @@ pub trait Database: Sync + Send {
         description: &str,
     ) -> Result<i64, DatabaseError>;
 
+    /// Get `Torrent` from `InfoHash`.
+    async fn get_torrent_from_info_hash(&self, info_hash: &InfoHash) -> Result<Torrent, DatabaseError> {
+        let torrent_info = self.get_torrent_info_from_infohash(*info_hash).await?;
+
+        let torrent_files = self.get_torrent_files_from_id(torrent_info.torrent_id).await?;
+
+        let torrent_announce_urls = self.get_torrent_announce_urls_from_id(torrent_info.torrent_id).await?;
+
+        Ok(Torrent::from_db_info_files_and_announce_urls(
+            torrent_info,
+            torrent_files,
+            torrent_announce_urls,
+        ))
+    }
+
     /// Get `Torrent` from `torrent_id`.
-    async fn get_torrent_from_id(&self, torrent_id: i64) -> Result<Torrent, DatabaseError>;
+    async fn get_torrent_from_id(&self, torrent_id: i64) -> Result<Torrent, DatabaseError> {
+        let torrent_info = self.get_torrent_info_from_id(torrent_id).await?;
+
+        let torrent_files = self.get_torrent_files_from_id(torrent_id).await?;
+
+        let torrent_announce_urls = self.get_torrent_announce_urls_from_id(torrent_id).await?;
+
+        Ok(Torrent::from_db_info_files_and_announce_urls(
+            torrent_info,
+            torrent_files,
+            torrent_announce_urls,
+        ))
+    }
 
     /// Get torrent's info as `DbTorrentInfo` from `torrent_id`.
     async fn get_torrent_info_from_id(&self, torrent_id: i64) -> Result<DbTorrentInfo, DatabaseError>;
 
+    /// Get torrent's info as `DbTorrentInfo` from torrent `InfoHash`.
+    async fn get_torrent_info_from_infohash(&self, info_hash: InfoHash) -> Result<DbTorrentInfo, DatabaseError>;
+
     /// Get all torrent's files as `Vec<TorrentFile>` from `torrent_id`.
     async fn get_torrent_files_from_id(&self, torrent_id: i64) -> Result<Vec<TorrentFile>, DatabaseError>;
 

src/databases/mysql.rs

@@ -4,6 +4,7 @@ use sqlx::mysql::MySqlPoolOptions;
 use sqlx::{query, query_as, Acquire, MySqlPool};
 
 use crate::databases::database::{Category, Database, DatabaseDriver, DatabaseError, Sorting, TorrentCompact};
+use crate::models::info_hash::InfoHash;
 use crate::models::response::TorrentsResponse;
 use crate::models::torrent::TorrentListing;
 use crate::models::torrent_file::{DbTorrentAnnounceUrl, DbTorrentFile, DbTorrentInfo, Torrent, TorrentFile};
@@ -528,30 +529,26 @@ impl Database for MysqlDatabase {
         }
     }
 
-    async fn get_torrent_from_id(&self, torrent_id: i64) -> Result<Torrent, DatabaseError> {
-        let torrent_info = self.get_torrent_info_from_id(torrent_id).await?;
-
-        let torrent_files = self.get_torrent_files_from_id(torrent_id).await?;
-
-        let torrent_announce_urls = self.get_torrent_announce_urls_from_id(torrent_id).await?;
-
-        Ok(Torrent::from_db_info_files_and_announce_urls(
-            torrent_info,
-            torrent_files,
-            torrent_announce_urls,
-        ))
-    }
-
     async fn get_torrent_info_from_id(&self, torrent_id: i64) -> Result<DbTorrentInfo, DatabaseError> {
         query_as::<_, DbTorrentInfo>(
-            "SELECT name, pieces, piece_length, private, root_hash FROM torrust_torrents WHERE torrent_id = ?",
+            "SELECT torrent_id, info_hash, name, pieces, piece_length, private, root_hash FROM torrust_torrents WHERE torrent_id = ?",
         )
         .bind(torrent_id)
         .fetch_one(&self.pool)
         .await
         .map_err(|_| DatabaseError::TorrentNotFound)
     }
 
+    async fn get_torrent_info_from_infohash(&self, info_hash: InfoHash) -> Result<DbTorrentInfo, DatabaseError> {
+        query_as::<_, DbTorrentInfo>(
+            "SELECT torrent_id, info_hash, name, pieces, piece_length, private, root_hash FROM torrust_torrents WHERE torrent_id = ?",
+        )
+        .bind(info_hash.to_string())
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|_| DatabaseError::TorrentNotFound)
+    }
+
     async fn get_torrent_files_from_id(&self, torrent_id: i64) -> Result<Vec<TorrentFile>, DatabaseError> {
         let db_torrent_files =
             query_as::<_, DbTorrentFile>("SELECT md5sum, length, path FROM torrust_torrent_files WHERE torrent_id = ?")

src/databases/sqlite.rs

@@ -4,6 +4,7 @@ use sqlx::sqlite::SqlitePoolOptions;
 use sqlx::{query, query_as, Acquire, SqlitePool};
 
 use crate::databases::database::{Category, Database, DatabaseDriver, DatabaseError, Sorting, TorrentCompact};
+use crate::models::info_hash::InfoHash;
 use crate::models::response::TorrentsResponse;
 use crate::models::torrent::TorrentListing;
 use crate::models::torrent_file::{DbTorrentAnnounceUrl, DbTorrentFile, DbTorrentInfo, Torrent, TorrentFile};
@@ -523,30 +524,26 @@ impl Database for SqliteDatabase {
         }
     }
 
-    async fn get_torrent_from_id(&self, torrent_id: i64) -> Result<Torrent, DatabaseError> {
-        let torrent_info = self.get_torrent_info_from_id(torrent_id).await?;
-
-        let torrent_files = self.get_torrent_files_from_id(torrent_id).await?;
-
-        let torrent_announce_urls = self.get_torrent_announce_urls_from_id(torrent_id).await?;
-
-        Ok(Torrent::from_db_info_files_and_announce_urls(
-            torrent_info,
-            torrent_files,
-            torrent_announce_urls,
-        ))
-    }
-
     async fn get_torrent_info_from_id(&self, torrent_id: i64) -> Result<DbTorrentInfo, DatabaseError> {
         query_as::<_, DbTorrentInfo>(
-            "SELECT name, pieces, piece_length, private, root_hash FROM torrust_torrents WHERE torrent_id = ?",
+            "SELECT torrent_id, info_hash, name, pieces, piece_length, private, root_hash FROM torrust_torrents WHERE torrent_id = ?",
         )
         .bind(torrent_id)
         .fetch_one(&self.pool)
         .await
         .map_err(|_| DatabaseError::TorrentNotFound)
     }
 
+    async fn get_torrent_info_from_infohash(&self, info_hash: InfoHash) -> Result<DbTorrentInfo, DatabaseError> {
+        query_as::<_, DbTorrentInfo>(
+            "SELECT torrent_id, info_hash, name, pieces, piece_length, private, root_hash FROM torrust_torrents WHERE info_hash = ?",
+        )
+        .bind(info_hash.to_string().to_uppercase()) // info_hash is stored as uppercase
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|_| DatabaseError::TorrentNotFound)
+    }
+
     async fn get_torrent_files_from_id(&self, torrent_id: i64) -> Result<Vec<TorrentFile>, DatabaseError> {
         let db_torrent_files =
             query_as::<_, DbTorrentFile>("SELECT md5sum, length, path FROM torrust_torrent_files WHERE torrent_id = ?")