Merge pull request Tribler#72 from egbertbouman/fix_search

Fix search result errors

src/tribler/core/database/restapi/database_endpoint.py

@@ -296,7 +296,7 @@ def search_db() -> tuple[list[dict], int, int]:
             if self.download_manager is not None:
                 self.download_manager.notifier.notify(Notification.local_query_results, data={
                     "query": request.query.get("fts_text"),
-                    "results": list(pony_query)
+                    "results": list(search_results)
                 })
             return search_results, total, max_rowid
 

src/tribler/core/user_activity/manager.py

@@ -50,7 +50,7 @@ def on_query_results(self, data: dict) -> None:
         if query is None:
             return
 
-        results = {tmd.infohash for tmd in data["results"]}
+        results = {tmd["infohash"] for tmd in data["results"]}
         for infohash in results:
             self.infohash_to_queries[infohash].append(query)
         self.queries[query] = results | self.queries.get(query, set())

src/tribler/test_unit/core/user_activity/test_manager.py

@@ -1,6 +1,5 @@
 from asyncio import sleep
 from binascii import hexlify
-from dataclasses import dataclass
 from unittest.mock import Mock, call
 
 from ipv8.taskmanager import TaskManager
@@ -11,15 +10,6 @@
 from tribler.core.user_activity.types import InfoHash
 
 
-@dataclass(unsafe_hash=True)
-class TorrentMetadata:
-    """
-    A mocked torrent metadata class.
-    """
-
-    infohash: InfoHash
-
-
 class TestUserActivityManager(TestBase):
     """
     Tests for the UserActivityManager class.
@@ -51,7 +41,7 @@ async def test_notify_local_query_empty(self) -> None:
         Test that local query notifications without a query get ignored.
         """
         fake_infohashes = [InfoHash(bytes([i]) * 20) for i in range(2)]
-        fake_torrent_metadata = [TorrentMetadata(fake_infohashes[i]) for i in range(2)]
+        fake_torrent_metadata = [{"infohash": fake_infohashes[i]} for i in range(2)]
         fake_query = None
 
         self.session.notifier.notify(Notification.local_query_results,
@@ -69,7 +59,7 @@ async def test_notify_remote_query_empty(self) -> None:
         Test that remote query notifications without a query get ignored.
         """
         fake_infohashes = [InfoHash(bytes([i]) * 20) for i in range(2)]
-        fake_torrent_metadata = [TorrentMetadata(fake_infohashes[i]) for i in range(2)]
+        fake_torrent_metadata = [{"infohash": fake_infohashes[i]} for i in range(2)]
         fake_query = None
 
         self.session.notifier.notify(Notification.remote_query_results,
@@ -87,7 +77,7 @@ async def test_notify_local_query_results(self) -> None:
         Test that local query notifications get processed correctly.
         """
         fake_infohashes = [InfoHash(bytes([i]) * 20) for i in range(2)]
-        fake_torrent_metadata = [TorrentMetadata(fake_infohashes[i]) for i in range(2)]
+        fake_torrent_metadata = [{"infohash": fake_infohashes[i]} for i in range(2)]
         fake_query = "test query"
 
         self.session.notifier.notify(Notification.local_query_results,
@@ -105,7 +95,7 @@ async def test_notify_remote_query_results(self) -> None:
         Test that remote query notifications get processed correctly.
         """
         fake_infohashes = [InfoHash(bytes([i]) * 20) for i in range(2)]
-        fake_torrent_metadata = [TorrentMetadata(fake_infohashes[i]) for i in range(2)]
+        fake_torrent_metadata = [{"infohash": fake_infohashes[i]} for i in range(2)]
         fake_query = "test query"
 
         self.session.notifier.notify(Notification.remote_query_results,
@@ -126,7 +116,7 @@ async def test_notify_local_query_results_overflow(self) -> None:
         self.manager.max_query_history = 1
 
         fake_infohashes = [InfoHash(bytes([i]) * 20) for i in range(2)]
-        fake_torrent_metadata = [TorrentMetadata(fake_infohashes[i]) for i in range(2)]
+        fake_torrent_metadata = [{"infohash": fake_infohashes[i]} for i in range(2)]
         fake_query_1 = "test query 1"
         fake_query_2 = "test query 2"
 
@@ -154,7 +144,7 @@ async def test_notify_remote_query_results_overflow(self) -> None:
         self.manager.max_query_history = 1
 
         fake_infohashes = [InfoHash(bytes([i]) * 20) for i in range(2)]
-        fake_torrent_metadata = [TorrentMetadata(fake_infohashes[i]) for i in range(2)]
+        fake_torrent_metadata = [{"infohash": fake_infohashes[i]} for i in range(2)]
         fake_query_1 = "test query 1"
         fake_query_2 = "test query 2"