danvics/pinchflat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored media item table live

Browse source
This commit is contained in:
Kieran Eglin 2024-05-28 12:22:33 -07:00
parent e5155c7a83
commit 814f94675f
No known key found for this signature in database
GPG key ID: 193984967FCF432D
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/pinchflat_web/controllers/sources/source_html/media_item_table_live.ex
View file

@ -50,7 +50,7 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
</.subtle_link> </.subtle_link>
</:col> </:col>
<:col :let={media_item} label="Upload Date"> <:col :let={media_item} label="Upload Date">
<%= media_item.upload_date %> <%= media_item.uploaded_at %>
</:col> </:col>
<:col :let={media_item} :if={@media_state == "other"} label="Manually Ignored?"> <:col :let={media_item} :if={@media_state == "other"} label="Manually Ignored?">
<.icon name={if media_item.prevent_download, do: "hero-check", else: "hero-x-mark"} /> <.icon name={if media_item.prevent_download, do: "hero-check", else: "hero-x-mark"} />
@ -66,6 +66,7 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
""" """
end end
# TODO: see how uploaded_at looks in the UI (above)
def mount(_params, session, socket) do def mount(_params, session, socket) do
PinchflatWeb.Endpoint.subscribe("media_table") PinchflatWeb.Endpoint.subscribe("media_table")
@ -150,14 +151,14 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
|> MediaQuery.require_assoc(:media_profile) |> MediaQuery.require_assoc(:media_profile)
|> MediaQuery.require_assoc(:media_items_search_index) |> MediaQuery.require_assoc(:media_items_search_index)
|> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.pending())) |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.pending()))
|> order_by(desc: fragment("rank"), desc: :upload_date) |> order_by(desc: fragment("rank"), desc: :uploaded_at)
end end
defp generate_base_query(source, "downloaded") do defp generate_base_query(source, "downloaded") do
MediaQuery.new() MediaQuery.new()
|> MediaQuery.require_assoc(:media_items_search_index) |> MediaQuery.require_assoc(:media_items_search_index)
|> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.downloaded())) |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.downloaded()))
|> order_by(desc: fragment("rank"), desc: :upload_date) |> order_by(desc: fragment("rank"), desc: :uploaded_at)
end end
defp generate_base_query(source, "other") do defp generate_base_query(source, "other") do
@ -170,7 +171,7 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
(not (^MediaQuery.downloaded()) and not (^MediaQuery.pending())) (not (^MediaQuery.downloaded()) and not (^MediaQuery.pending()))
) )
) )
|> order_by(desc: fragment("rank"), desc: :upload_date) |> order_by(desc: fragment("rank"), desc: :uploaded_at)
end end
defp filter_base_query(base_query, search_term) do defp filter_base_query(base_query, search_term) do

4
test/support/fixtures/media_fixtures.ex
View file

@ -14,7 +14,9 @@ defmodule Pinchflat.MediaFixtures do
media_id = Faker.String.base64(12) media_id = Faker.String.base64(12)
# TODO: remove # TODO: remove
if attrs[:upload_date] || attrs["upload_date"] do attrs2 = Enum.into(attrs, %{})
if attrs2[:upload_date] || attrs2["upload_date"] do
raise "upload_date is not allowed in media_item_fixture. Use uploaded_at instead." raise "upload_date is not allowed in media_item_fixture. Use uploaded_at instead."
end end