Skip to content

(Add) Scout prefix option for Meilisearch #4402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Console/Commands/AutoSyncPeopleToMeilisearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function handle(): void
$start = now();

$client = new Client(config('scout.meilisearch.host'), config('scout.meilisearch.key'));
$index = $client->index('people');
$index = $client->index(config('scout.prefix').'people');

$people = Person::all(['id', 'name', 'birthday', 'still']);

Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/AutoSyncTorrentsToMeilisearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function handle(): void

$client = new Client(config('scout.meilisearch.host'), config('scout.meilisearch.key'));

$index = $client->getIndex('torrents');
$index = $client->getIndex(config('scout.prefix').'torrents');

$index->updatePagination([
'maxTotalHits' => max(1, Torrent::query()->count()) + 1000,
Expand Down
8 changes: 4 additions & 4 deletions app/Http/Controllers/API/QuickSearchController.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function index(Request $request): \Illuminate\Http\JsonResponse
// Prepare the search queries
$searchQueries = [
(new SearchQuery())
->setIndexUid('torrents')
->setIndexUid(config('scout.prefix').'torrents')
->setQuery($searchById ? '' : $query)
->setFilter($filters)
->setDistinct('imdb')
Expand All @@ -68,7 +68,7 @@ public function index(Request $request): \Illuminate\Http\JsonResponse
// Add the people search query only if it's not an ID search
if (!$searchById) {
$searchQueries[] = (new SearchQuery())
->setIndexUid('people')
->setIndexUid(config('scout.prefix').'people')
->setQuery($query);
//->setFederationOptions((new FederationOptions())->setWeight(0.9));
}
Expand All @@ -80,7 +80,7 @@ public function index(Request $request): \Illuminate\Http\JsonResponse

// Process the hits from the multiSearchResults
foreach ($multiSearchResults['hits'] as $hit) {
if ($hit['_federation']['indexUid'] === 'torrents') {
if ($hit['_federation']['indexUid'] === config('scout.prefix').'torrents') {
$type = $hit['category']['movie_meta'] === true ? 'movie' : 'tv';

$results[] = [
Expand All @@ -91,7 +91,7 @@ public function index(Request $request): \Illuminate\Http\JsonResponse
'url' => route('torrents.similar', ['category_id' => $hit['category']['id'], 'tmdb' => $hit['tmdb']]),
'type' => $type === 'movie' ? 'Movie' : 'TV Series',
];
} elseif ($hit['_federation']['indexUid'] === 'people') {
} elseif ($hit['_federation']['indexUid'] === config('scout.prefix').'people') {
$results[] = [
'id' => $hit['id'],
'name' => $hit['name'],
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Livewire/TorrentSearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ final public function torrents(): \Illuminate\Contracts\Pagination\LengthAwarePa
$torrents = $torrents->paginate(min($this->perPage, 100));
} else {
$client = new Client(config('scout.meilisearch.host'), config('scout.meilisearch.key'));
$index = $client->getIndex('torrents');
$index = $client->getIndex(config('scout.prefix').'torrents');

$results = $index->search($this->name, [
'sort' => [
Expand Down