From ac38f2d6ebf276b4f644c895cd882abd58c07764 Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Sun, 9 Jun 2024 19:22:24 +0930 Subject: [PATCH] fix linting --- .../Kyoo.Core/Views/Resources/SearchApi.cs | 8 ++++-- .../FilterExtensionMethods.cs | 9 ++++--- back/src/Kyoo.Meilisearch/SearchManager.cs | 27 ++++++++++++++++--- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/back/src/Kyoo.Core/Views/Resources/SearchApi.cs b/back/src/Kyoo.Core/Views/Resources/SearchApi.cs index 323efd07..d34af5ef 100644 --- a/back/src/Kyoo.Core/Views/Resources/SearchApi.cs +++ b/back/src/Kyoo.Core/Views/Resources/SearchApi.cs @@ -175,7 +175,9 @@ public class SearchApi : BaseApi [FromQuery] Include fields ) { - return SearchPage(await _searchManager.SearchEpisodes(q, sortBy, filter, pagination, fields)); + return SearchPage( + await _searchManager.SearchEpisodes(q, sortBy, filter, pagination, fields) + ); } /// @@ -202,6 +204,8 @@ public class SearchApi : BaseApi [FromQuery] Include fields ) { - return SearchPage(await _searchManager.SearchStudios(q, sortBy, filter, pagination, fields)); + return SearchPage( + await _searchManager.SearchStudios(q, sortBy, filter, pagination, fields) + ); } } diff --git a/back/src/Kyoo.Meilisearch/FilterExtensionMethods.cs b/back/src/Kyoo.Meilisearch/FilterExtensionMethods.cs index caa36f6a..50940668 100644 --- a/back/src/Kyoo.Meilisearch/FilterExtensionMethods.cs +++ b/back/src/Kyoo.Meilisearch/FilterExtensionMethods.cs @@ -9,8 +9,10 @@ public static class FilterExtensionMethods { return filter switch { - Filter.And and => $"({and.First.CreateMeilisearchFilter()}) AND ({and.Second.CreateMeilisearchFilter()})", - Filter.Or or => $"({or.First.CreateMeilisearchFilter()}) OR ({or.Second.CreateMeilisearchFilter()})", + Filter.And and + => $"({and.First.CreateMeilisearchFilter()}) AND ({and.Second.CreateMeilisearchFilter()})", + Filter.Or or + => $"({or.First.CreateMeilisearchFilter()}) OR ({or.Second.CreateMeilisearchFilter()})", Filter.Gt gt => $"{gt.Property} > {gt.Value}", Filter.Lt lt => $"{lt.Property} < {lt.Value}", Filter.Ge ge => $"{ge.Property} >= {ge.Value}", @@ -19,7 +21,8 @@ public static class FilterExtensionMethods Filter.Has has => $"{has.Property} = {has.Value}", Filter.Ne ne => $"{ne.Property} != {ne.Value}", Filter.Not not => $"NOT ({not.Filter.CreateMeilisearchFilter()})", - Filter.CmpRandom => throw new ValidationException("Random comparison is not supported."), + Filter.CmpRandom + => throw new ValidationException("Random comparison is not supported."), _ => null }; } diff --git a/back/src/Kyoo.Meilisearch/SearchManager.cs b/back/src/Kyoo.Meilisearch/SearchManager.cs index cb7c8235..ae7fc133 100644 --- a/back/src/Kyoo.Meilisearch/SearchManager.cs +++ b/back/src/Kyoo.Meilisearch/SearchManager.cs @@ -104,7 +104,14 @@ public class SearchManager : ISearchManager Include? include = default ) { - return _Search("items", query, filter.CreateMeilisearchFilter(), sortBy, pagination, include); + return _Search( + "items", + query, + filter.CreateMeilisearchFilter(), + sortBy, + pagination, + include + ); } /// @@ -149,7 +156,14 @@ public class SearchManager : ISearchManager Include? include = default ) { - return _Search(nameof(Episode), query, filter.CreateMeilisearchFilter(), sortBy, pagination, include); + return _Search( + nameof(Episode), + query, + filter.CreateMeilisearchFilter(), + sortBy, + pagination, + include + ); } /// @@ -161,7 +175,14 @@ public class SearchManager : ISearchManager Include? include = default ) { - return _Search(nameof(Studio), query, filter.CreateMeilisearchFilter(), sortBy, pagination, include); + return _Search( + nameof(Studio), + query, + filter.CreateMeilisearchFilter(), + sortBy, + pagination, + include + ); } private class IdResource