<.icon_button icon_name="hero-arrow-path" class="h-10 w-10" phx-click="reload_page" />
@@ -20,10 +20,29 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
def render(assigns) do
~H"""
-
- <.icon_button icon_name="hero-arrow-path" class="h-10 w-10" phx-click="reload_page" tooltip="Refresh" />
- Showing <%= length(@records) %> of <%= @total_record_count %>
-
+
<.table rows={@records} table_class="text-white">
<:col :let={media_item} label="Title">
<.subtle_link href={~p"/sources/#{@source.id}/media/#{media_item.id}"}>
@@ -51,7 +70,7 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
media_state = session["media_state"]
source = Sources.get_source!(session["source_id"])
base_query = generate_base_query(source, media_state)
- pagination_attrs = fetch_pagination_attributes(base_query, page)
+ pagination_attrs = fetch_pagination_attributes(base_query, page, nil)
new_assigns =
Map.merge(
@@ -69,7 +88,14 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
def handle_event("page_change", %{"direction" => direction}, %{assigns: assigns} = socket) do
direction = if direction == "inc", do: 1, else: -1
new_page = assigns.page + direction
- new_assigns = fetch_pagination_attributes(assigns.base_query, new_page)
+ new_assigns = fetch_pagination_attributes(assigns.base_query, new_page, assigns.search_term)
+
+ {:noreply, assign(socket, new_assigns)}
+ end
+
+ def handle_event("search_term", params, socket) do
+ search_term = Map.get(params, "q", nil)
+ new_assigns = fetch_pagination_attributes(socket.assigns.base_query, 1, search_term)
{:noreply, assign(socket, new_assigns)}
end
@@ -83,18 +109,28 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
end
def handle_info(%{topic: "media_table", event: "reload"}, %{assigns: assigns} = socket) do
- new_assigns = fetch_pagination_attributes(assigns.base_query, assigns.page)
+ new_assigns = fetch_pagination_attributes(assigns.base_query, assigns.page, assigns.search_term)
{:noreply, assign(socket, new_assigns)}
end
- defp fetch_pagination_attributes(base_query, page) do
- total_record_count = Repo.aggregate(base_query, :count, :id)
- total_pages = max(ceil(total_record_count / @limit), 1)
- page = NumberUtils.clamp(page, 1, total_pages)
- records = fetch_records(base_query, page)
+ defp fetch_pagination_attributes(base_query, page, search_term) do
+ filtered_base_query = filter_base_query(base_query, search_term)
- %{page: page, total_pages: total_pages, records: records, total_record_count: total_record_count}
+ total_record_count = Repo.aggregate(base_query, :count, :id)
+ filtered_record_count = Repo.aggregate(filtered_base_query, :count, :id)
+ total_pages = max(ceil(filtered_record_count / @limit), 1)
+ page = NumberUtils.clamp(page, 1, total_pages)
+ records = fetch_records(filtered_base_query, page)
+
+ %{
+ page: page,
+ total_pages: total_pages,
+ records: records,
+ search_term: search_term,
+ total_record_count: total_record_count,
+ filtered_record_count: filtered_record_count
+ }
end
defp fetch_records(base_query, page) do
@@ -109,25 +145,33 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
defp generate_base_query(source, "pending") do
MediaQuery.new()
|> MediaQuery.require_assoc(:media_profile)
+ |> MediaQuery.require_assoc(:media_items_search_index)
|> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.pending()))
- |> order_by(desc: :id)
+ |> order_by(desc: fragment("rank"), desc: :id)
end
defp generate_base_query(source, "downloaded") do
MediaQuery.new()
+ |> MediaQuery.require_assoc(:media_items_search_index)
|> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.downloaded()))
- |> order_by(desc: :id)
+ |> order_by(desc: fragment("rank"), desc: :id)
end
defp generate_base_query(source, "other") do
MediaQuery.new()
|> MediaQuery.require_assoc(:media_profile)
+ |> MediaQuery.require_assoc(:media_items_search_index)
|> where(
^dynamic(
^MediaQuery.for_source(source) and
(not (^MediaQuery.downloaded()) and not (^MediaQuery.pending()))
)
)
- |> order_by(desc: :id)
+ |> order_by(desc: fragment("rank"), desc: :id)
+ end
+
+ defp filter_base_query(base_query, search_term) do
+ base_query
+ |> where(^MediaQuery.matches_search_term(search_term))
end
end
diff --git a/priv/repo/erd.png b/priv/repo/erd.png
index 4e1e6e6..8ae455e 100644
Binary files a/priv/repo/erd.png and b/priv/repo/erd.png differ
diff --git a/priv/repo/migrations/20240523183003_change_media_items_search_index_tokenizer.exs b/priv/repo/migrations/20240523183003_change_media_items_search_index_tokenizer.exs
new file mode 100644
index 0000000..b254a5d
--- /dev/null
+++ b/priv/repo/migrations/20240523183003_change_media_items_search_index_tokenizer.exs
@@ -0,0 +1,60 @@
+defmodule Pinchflat.Repo.Migrations.ChangeMediaItemsSearchIndexTokenizer do
+ use Ecto.Migration
+
+ def up do
+ # These all need to run as part of separate `execute` blocks. Do NOT ask me why.
+ execute "DROP TRIGGER IF EXISTS media_items_search_index_insert;"
+ execute "DROP TRIGGER IF EXISTS media_items_search_index_update;"
+ execute "DROP TRIGGER IF EXISTS media_items_search_index_delete;"
+ execute "DROP TABLE IF EXISTS media_items_search_index;"
+
+ execute """
+ CREATE VIRTUAL TABLE media_items_search_index USING fts5(
+ title,
+ description,
+ tokenize=trigram
+ );
+ """
+
+ execute """
+ CREATE TRIGGER media_items_search_index_insert AFTER INSERT ON media_items BEGIN
+ INSERT INTO media_items_search_index(
+ rowid,
+ title,
+ description
+ )
+ VALUES(
+ new.id,
+ new.title,
+ new.description
+ );
+ END;
+ """
+
+ execute """
+ CREATE TRIGGER media_items_search_index_update AFTER UPDATE ON media_items BEGIN
+ UPDATE media_items_search_index SET
+ title = new.title,
+ description = new.description
+ WHERE
+ rowid = old.id;
+ END;
+ """
+
+ execute """
+ CREATE TRIGGER media_items_search_index_delete AFTER DELETE ON media_items BEGIN
+ DELETE FROM media_items_search_index WHERE rowid = old.id;
+ END;
+ """
+
+ # Fully re-index the media_items table
+ execute """
+ INSERT INTO media_items_search_index(rowid, title, description)
+ SELECT id, title, description FROM media_items;
+ """
+ end
+
+ def down do
+ execute "DROP TABLE media_items_search_index;"
+ end
+end
diff --git a/test/pinchflat/media_test.exs b/test/pinchflat/media_test.exs
index f98afb1..515b7f9 100644
--- a/test/pinchflat/media_test.exs
+++ b/test/pinchflat/media_test.exs
@@ -727,6 +727,17 @@ defmodule Pinchflat.MediaTest do
test "returns an empty list when the search term is nil" do
assert [] = Media.search(nil)
end
+
+ test "doesn't blow up if there's an apostrophe or quotes in the search term" do
+ assert [] = Media.search("don't expl'ode")
+ assert [] = Media.search(~s(dont expl"o"de))
+ assert [] = Media.search(~s(dont explo"de))
+ end
+
+ test "doesn't blow up if there is a trailing operand" do
+ assert [] = Media.search("foo OR")
+ assert [] = Media.search("foo AND")
+ end
end
describe "get_media_item!/1" do