refactor: extract fn is_info_hash_whitelisted

josecelano · josecelano · commit ed5c1edaaaed · 2022-11-25T09:15:22.000Z
diff --git a/src/databases/database.rs b/src/databases/database.rs
@@ -53,6 +53,17 @@ pub trait Database: Sync + Send {
     async fn add_key_to_keys(&self, auth_key: &AuthKey) -> Result<usize, Error>;
 
     async fn remove_key_from_keys(&self, key: &str) -> Result<usize, Error>;
+
+    async fn is_info_hash_whitelisted(&self, info_hash: &InfoHash) -> Result<bool, Error> {
+        if let Err(e) = self.get_info_hash_from_whitelist(&info_hash.to_owned().to_string()).await {
+            if let Error::QueryReturnedNoRows = e {
+                return Ok(false);
+            } else {
+                return Err(e);
+            }
+        }
+        Ok(true)
+    }
 }
 
 #[derive(Debug, Display, PartialEq, Eq, Error)]
diff --git a/src/tracker/mod.rs b/src/tracker/mod.rs
@@ -108,18 +108,12 @@ impl TorrentTracker {
 
     /// It adds a torrent to the whitelist if it has not been whitelisted previously
     async fn add_torrent_to_database_whitelist(&self, info_hash: &InfoHash) -> Result<(), database::Error> {
-        if let Err(e) = self
-            .database
-            .get_info_hash_from_whitelist(&info_hash.to_owned().to_string())
-            .await
-        {
-            if let database::Error::QueryReturnedNoRows = e {
-                self.database.add_info_hash_to_whitelist(*info_hash).await?;
-            } else {
-                eprintln!("{e}");
-                return Err(e);
-            }
+        if self.database.is_info_hash_whitelisted(info_hash).await.unwrap() {
+            return Ok(());
         }
+
+        self.database.add_info_hash_to_whitelist(*info_hash).await?;
+
         Ok(())
     }
 
