Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ebf5d6afb5 | |||
| 98c2812ee8 | |||
| 526bc0c2e3 | |||
| 5a5448b87a | |||
| 88569640c9 | |||
| 6f78ec40d7 | |||
| aea40a3f92 |
@@ -12,6 +12,14 @@
|
|||||||
</sup>
|
</sup>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<div align="center">
|
||||||
|
|
||||||
|
[](LICENSE)
|
||||||
|
[](https://github.com/kieraneglin/pinchflat/releases)
|
||||||
|
[](#)
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
# Your next YouTube media manager
|
# Your next YouTube media manager
|
||||||
|
|
||||||
## Table of contents:
|
## Table of contents:
|
||||||
@@ -21,6 +29,7 @@
|
|||||||
- [Screenshots](#screenshots)
|
- [Screenshots](#screenshots)
|
||||||
- [Installation](#installation)
|
- [Installation](#installation)
|
||||||
- [Unraid](#unraid)
|
- [Unraid](#unraid)
|
||||||
|
- [Portainer](#portainer)
|
||||||
- [Docker](#docker)
|
- [Docker](#docker)
|
||||||
- [Username and Password (authentication)](https://github.com/kieraneglin/pinchflat/wiki/Username-and-Password)
|
- [Username and Password (authentication)](https://github.com/kieraneglin/pinchflat/wiki/Username-and-Password)
|
||||||
- [Frequently asked questions](https://github.com/kieraneglin/pinchflat/wiki/Frequently-Asked-Questions)
|
- [Frequently asked questions](https://github.com/kieraneglin/pinchflat/wiki/Frequently-Asked-Questions)
|
||||||
@@ -43,7 +52,7 @@ If it doesn't work for your use case, please make a feature request! You can als
|
|||||||
- Powerful naming system so content is stored where and how you want it
|
- Powerful naming system so content is stored where and how you want it
|
||||||
- Easy-to-use web interface with presets to get you started right away
|
- Easy-to-use web interface with presets to get you started right away
|
||||||
- First-class support for media center apps like Plex, Jellyfin, and Kodi
|
- First-class support for media center apps like Plex, Jellyfin, and Kodi
|
||||||
- Supports serving RSS feeds to your favourite podcast app (beta - [docs](<https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds-(beta)>))
|
- Supports serving RSS feeds to your favourite podcast app ([docs](https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds))
|
||||||
- Automatically downloads new content from channels and playlists
|
- Automatically downloads new content from channels and playlists
|
||||||
- Uses a novel approach to download new content more quickly than other apps
|
- Uses a novel approach to download new content more quickly than other apps
|
||||||
- Supports downloading audio content
|
- Supports downloading audio content
|
||||||
@@ -71,7 +80,8 @@ Simply search for Pinchflat in the Community Apps store!
|
|||||||
|
|
||||||
### Portainer
|
### Portainer
|
||||||
|
|
||||||
Important: See the note below about storing config on a network file share. It's preferred to store the config on a local disk if at all possible.
|
> [!IMPORTANT]
|
||||||
|
> See the note below about storing config on a network file share. It's preferred to store the config on a local disk if at all possible.
|
||||||
|
|
||||||
Docker Compose file:
|
Docker Compose file:
|
||||||
|
|
||||||
@@ -110,13 +120,18 @@ docker run \
|
|||||||
|
|
||||||
You _must_ ensure the host directories you've mounted are writable by the user running the Docker container. If you get a permission error follow the steps it suggests. See [#106](https://github.com/kieraneglin/pinchflat/issues/106) for more.
|
You _must_ ensure the host directories you've mounted are writable by the user running the Docker container. If you get a permission error follow the steps it suggests. See [#106](https://github.com/kieraneglin/pinchflat/issues/106) for more.
|
||||||
|
|
||||||
It's recommended to not run the container as root. Doing so can create permission issues if other apps need to work with the downloaded media. If you need to run any command as root, you can run `su` from the container's shell as there is no password set for the root user.
|
> [!IMPORTANT]
|
||||||
|
> It's not recommended to run the container as root. Doing so can create permission issues if other apps need to work with the downloaded media.
|
||||||
|
|
||||||
### Advanced: storing Pinchflat config directory on a network share
|
> [!TIP]
|
||||||
|
> If you need to run any command as root, you can run `su` from the container's shell as there is no password set for the root user.
|
||||||
|
|
||||||
|
### ADVANCED: Storing Pinchflat config directory on a network share
|
||||||
|
|
||||||
As pointed out in [#137](https://github.com/kieraneglin/pinchflat/issues/137), SQLite doesn't like being run in WAL mode on network shares. If you're running Pinchflat on a network share, you can disable WAL mode by setting the `JOURNAL_MODE` environment variable to `delete`. This will make Pinchflat run in rollback journal mode which is less performant but should work on network shares.
|
As pointed out in [#137](https://github.com/kieraneglin/pinchflat/issues/137), SQLite doesn't like being run in WAL mode on network shares. If you're running Pinchflat on a network share, you can disable WAL mode by setting the `JOURNAL_MODE` environment variable to `delete`. This will make Pinchflat run in rollback journal mode which is less performant but should work on network shares.
|
||||||
|
|
||||||
Changing this setting from WAL to `delete` on an existing Pinchflat instance could, conceivably, result in data loss. Only change this setting if you know what you're doing, why this is important, and are okay with possible data loss or DB corruption. Backup your database first!
|
> [!CAUTION]
|
||||||
|
> Changing this setting from WAL to `delete` on an existing Pinchflat instance could, conceivably, result in data loss. Only change this setting if you know what you're doing, why this is important, and are okay with possible data loss or DB corruption. Backup your database first!
|
||||||
|
|
||||||
If you change this setting and it works well for you, please leave a comment on [#137](https://github.com/kieraneglin/pinchflat/issues/137)! Doubly so if it does _not_ work well.
|
If you change this setting and it works well for you, please leave a comment on [#137](https://github.com/kieraneglin/pinchflat/issues/137)! Doubly so if it does _not_ work well.
|
||||||
|
|
||||||
@@ -131,3 +146,8 @@ This is pre-release software and anything can break at any time. I make not guar
|
|||||||
## License
|
## License
|
||||||
|
|
||||||
See `LICENSE` file
|
See `LICENSE` file
|
||||||
|
|
||||||
|
<!-- Images and links -->
|
||||||
|
|
||||||
|
[license-badge]: https://img.shields.io/github/license/kieraneglin/pinchflat?style=for-the-badge&color=ee512b
|
||||||
|
[license-badge-url]: LICENSE
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
|
|||||||
defp default_options do
|
defp default_options do
|
||||||
[
|
[
|
||||||
:no_progress,
|
:no_progress,
|
||||||
:windows_filenames,
|
|
||||||
# Add force-overwrites to make sure redownloading works
|
# Add force-overwrites to make sure redownloading works
|
||||||
:force_overwrites,
|
:force_overwrites,
|
||||||
# This makes the date metadata conform to what jellyfin expects
|
# This makes the date metadata conform to what jellyfin expects
|
||||||
|
|||||||
@@ -38,9 +38,9 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
|
|||||||
- The NFO file for the source (if specified)
|
- The NFO file for the source (if specified)
|
||||||
- Downloads and stores source images (if specified)
|
- Downloads and stores source images (if specified)
|
||||||
|
|
||||||
The worker is kicked off after a source is inserted/updated - this can
|
The worker is kicked off after a source is inserted or it's original_url
|
||||||
take an unknown amount of time so don't rely on this data being here
|
is updated - this can take an unknown amount of time so don't rely on this
|
||||||
before, say, the first indexing or downloading task is complete.
|
data being here before, say, the first indexing or downloading task is complete.
|
||||||
|
|
||||||
Returns :ok
|
Returns :ok
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -28,8 +28,7 @@ defmodule Pinchflat.Notifications.CommandRunner do
|
|||||||
default_opts = [:verbose]
|
default_opts = [:verbose]
|
||||||
parsed_opts = CliUtils.parse_options(default_opts ++ command_opts)
|
parsed_opts = CliUtils.parse_options(default_opts ++ command_opts)
|
||||||
|
|
||||||
Logger.info("[apprise] called with: #{Enum.join(parsed_opts ++ endpoints, " ")}")
|
{output, return_code} = CliUtils.wrap_cmd(backend_executable(), parsed_opts ++ endpoints)
|
||||||
{output, return_code} = System.cmd(backend_executable(), parsed_opts ++ endpoints)
|
|
||||||
Logger.info("[apprise] response: #{output}")
|
Logger.info("[apprise] response: #{output}")
|
||||||
|
|
||||||
case return_code do
|
case return_code do
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ defmodule Pinchflat.Sources do
|
|||||||
if run_post_commit_tasks do
|
if run_post_commit_tasks do
|
||||||
maybe_handle_media_tasks(changeset, source)
|
maybe_handle_media_tasks(changeset, source)
|
||||||
maybe_run_indexing_task(changeset, source)
|
maybe_run_indexing_task(changeset, source)
|
||||||
run_metadata_storage_task(source)
|
maybe_run_metadata_storage_task(changeset, source)
|
||||||
end
|
end
|
||||||
|
|
||||||
{:ok, source}
|
{:ok, source}
|
||||||
@@ -276,9 +276,20 @@ defmodule Pinchflat.Sources do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# This runs every time to pick up any changes to the metadata
|
defp maybe_run_metadata_storage_task(changeset, source) do
|
||||||
defp run_metadata_storage_task(source) do
|
case {changeset.data, changeset.changes} do
|
||||||
SourceMetadataStorageWorker.kickoff_with_task(source)
|
# If the changeset is new (not persisted), fetch metadata no matter what
|
||||||
|
{%{__meta__: %{state: :built}}, _} ->
|
||||||
|
SourceMetadataStorageWorker.kickoff_with_task(source)
|
||||||
|
|
||||||
|
# If the record has been persisted, only fetch metadata if the
|
||||||
|
# original_url has changed
|
||||||
|
{_, %{original_url: _}} ->
|
||||||
|
SourceMetadataStorageWorker.kickoff_with_task(source)
|
||||||
|
|
||||||
|
_ ->
|
||||||
|
:ok
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp maybe_update_slow_indexing_task(changeset, source) do
|
defp maybe_update_slow_indexing_task(changeset, source) do
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ defmodule Pinchflat.Utils.CliUtils do
|
|||||||
Utility methods for working with CLI executables
|
Utility methods for working with CLI executables
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
require Logger
|
||||||
|
|
||||||
alias Pinchflat.Utils.StringUtils
|
alias Pinchflat.Utils.StringUtils
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
@@ -19,6 +21,8 @@ defmodule Pinchflat.Utils.CliUtils do
|
|||||||
wrapper_command = Path.join(:code.priv_dir(:pinchflat), "cmd_wrapper.sh")
|
wrapper_command = Path.join(:code.priv_dir(:pinchflat), "cmd_wrapper.sh")
|
||||||
actual_command = [command] ++ args
|
actual_command = [command] ++ args
|
||||||
|
|
||||||
|
Logger.info("[command_wrapper]: #{command} called with: #{Enum.join(args, " ")}")
|
||||||
|
|
||||||
System.cmd(wrapper_command, actual_command, opts)
|
System.cmd(wrapper_command, actual_command, opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
defmodule Pinchflat.Utils.NumberUtils do
|
||||||
|
@moduledoc """
|
||||||
|
Utility methods for working with numbers
|
||||||
|
"""
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Clamps a number between a minimum and maximum value
|
||||||
|
|
||||||
|
Returns integer() | float()
|
||||||
|
"""
|
||||||
|
def clamp(num, minimum, maximum) do
|
||||||
|
num
|
||||||
|
|> max(minimum)
|
||||||
|
|> min(maximum)
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -3,8 +3,6 @@ defmodule Pinchflat.YtDlp.CommandRunner do
|
|||||||
Runs yt-dlp commands using the `System.cmd/3` function
|
Runs yt-dlp commands using the `System.cmd/3` function
|
||||||
"""
|
"""
|
||||||
|
|
||||||
require Logger
|
|
||||||
|
|
||||||
alias Pinchflat.Utils.CliUtils
|
alias Pinchflat.Utils.CliUtils
|
||||||
alias Pinchflat.YtDlp.YtDlpCommandRunner
|
alias Pinchflat.YtDlp.YtDlpCommandRunner
|
||||||
alias Pinchflat.Utils.FilesystemUtils, as: FSUtils
|
alias Pinchflat.Utils.FilesystemUtils, as: FSUtils
|
||||||
@@ -30,12 +28,10 @@ defmodule Pinchflat.YtDlp.CommandRunner do
|
|||||||
|
|
||||||
output_filepath = generate_output_filepath(addl_opts)
|
output_filepath = generate_output_filepath(addl_opts)
|
||||||
print_to_file_opts = [{:print_to_file, output_template}, output_filepath]
|
print_to_file_opts = [{:print_to_file, output_template}, output_filepath]
|
||||||
external_file_opts = build_external_file_options()
|
user_configured_opts = cookie_file_options() ++ global_options()
|
||||||
# These must stay in exactly this order, hence why I'm giving it its own variable.
|
# These must stay in exactly this order, hence why I'm giving it its own variable.
|
||||||
all_opts = command_opts ++ print_to_file_opts ++ external_file_opts
|
all_opts = command_opts ++ print_to_file_opts ++ user_configured_opts
|
||||||
|
|
||||||
formatted_command_opts = [url] ++ CliUtils.parse_options(all_opts)
|
formatted_command_opts = [url] ++ CliUtils.parse_options(all_opts)
|
||||||
Logger.info("[yt-dlp] called with: #{Enum.join(formatted_command_opts, " ")}")
|
|
||||||
|
|
||||||
case CliUtils.wrap_cmd(command, formatted_command_opts, stderr_to_stdout: true) do
|
case CliUtils.wrap_cmd(command, formatted_command_opts, stderr_to_stdout: true) do
|
||||||
{_, 0} ->
|
{_, 0} ->
|
||||||
@@ -58,7 +54,7 @@ defmodule Pinchflat.YtDlp.CommandRunner do
|
|||||||
def version do
|
def version do
|
||||||
command = backend_executable()
|
command = backend_executable()
|
||||||
|
|
||||||
case System.cmd(command, ["--version"]) do
|
case CliUtils.wrap_cmd(command, ["--version"]) do
|
||||||
{output, 0} ->
|
{output, 0} ->
|
||||||
{:ok, String.trim(output)}
|
{:ok, String.trim(output)}
|
||||||
|
|
||||||
@@ -74,7 +70,11 @@ defmodule Pinchflat.YtDlp.CommandRunner do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp build_external_file_options do
|
defp global_options do
|
||||||
|
[:windows_filenames]
|
||||||
|
end
|
||||||
|
|
||||||
|
defp cookie_file_options do
|
||||||
base_dir = Application.get_env(:pinchflat, :extras_directory)
|
base_dir = Application.get_env(:pinchflat, :extras_directory)
|
||||||
filename_options_map = %{cookies: "cookies.txt"}
|
filename_options_map = %{cookies: "cookies.txt"}
|
||||||
|
|
||||||
|
|||||||
@@ -63,8 +63,8 @@ defmodule Pinchflat.YtDlp.Media do
|
|||||||
|> response_to_struct()
|
|> response_to_struct()
|
||||||
|> FunctionUtils.wrap_ok()
|
|> FunctionUtils.wrap_ok()
|
||||||
|
|
||||||
res ->
|
err ->
|
||||||
res
|
err
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -50,8 +50,8 @@ defmodule Pinchflat.YtDlp.MediaCollection do
|
|||||||
|
|
||||||
{:ok, Enum.filter(parsed_lines, &(&1 != nil))}
|
{:ok, Enum.filter(parsed_lines, &(&1 != nil))}
|
||||||
|
|
||||||
res ->
|
err ->
|
||||||
res
|
err
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -68,7 +68,14 @@ defmodule Pinchflat.YtDlp.MediaCollection do
|
|||||||
# `ignore_no_formats_error` is necessary because yt-dlp will error out if
|
# `ignore_no_formats_error` is necessary because yt-dlp will error out if
|
||||||
# the first video has not released yet (ie: is a premier). We don't care about
|
# the first video has not released yet (ie: is a premier). We don't care about
|
||||||
# available formats since we're just getting the source details
|
# available formats since we're just getting the source details
|
||||||
command_opts = [:simulate, :skip_download, :ignore_no_formats_error, playlist_end: 1] ++ addl_opts
|
default_opts = [
|
||||||
|
:simulate,
|
||||||
|
:skip_download,
|
||||||
|
:ignore_no_formats_error,
|
||||||
|
playlist_end: 1
|
||||||
|
]
|
||||||
|
|
||||||
|
command_opts = default_opts ++ addl_opts
|
||||||
output_template = "%(.{channel,channel_id,playlist_id,playlist_title,filename})j"
|
output_template = "%(.{channel,channel_id,playlist_id,playlist_title,filename})j"
|
||||||
|
|
||||||
with {:ok, output} <- backend_runner().run(source_url, command_opts, output_template),
|
with {:ok, output} <- backend_runner().run(source_url, command_opts, output_template),
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ defmodule PinchflatWeb.CoreComponents do
|
|||||||
import PinchflatWeb.Gettext
|
import PinchflatWeb.Gettext
|
||||||
|
|
||||||
alias Phoenix.LiveView.JS
|
alias Phoenix.LiveView.JS
|
||||||
alias PinchflatWeb.CustomComponents.TextComponents
|
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
Renders a modal.
|
Renders a modal.
|
||||||
@@ -638,9 +637,11 @@ defmodule PinchflatWeb.CoreComponents do
|
|||||||
|
|
||||||
~H"""
|
~H"""
|
||||||
<ul>
|
<ul>
|
||||||
<li :for={{k, v} <- @iterable_attributes} class="mb-2">
|
<li :for={{k, v} <- @iterable_attributes} class="mb-2 w-2/3">
|
||||||
<strong><%= k %>:</strong>
|
<strong><%= k %>:</strong>
|
||||||
<TextComponents.inline_code><%= v %></TextComponents.inline_code>
|
<code class="inline-block text-sm font-mono text-gray p-0.5 mx-0.5">
|
||||||
|
<%= v %>
|
||||||
|
</code>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ defmodule PinchflatWeb.CustomComponents.TableComponents do
|
|||||||
@moduledoc false
|
@moduledoc false
|
||||||
use Phoenix.Component
|
use Phoenix.Component
|
||||||
|
|
||||||
|
alias PinchflatWeb.CoreComponents
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
Renders a table component with the given rows and columns.
|
Renders a table component with the given rows and columns.
|
||||||
|
|
||||||
@@ -50,4 +52,52 @@ defmodule PinchflatWeb.CustomComponents.TableComponents do
|
|||||||
</table>
|
</table>
|
||||||
"""
|
"""
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Renders simple pagination controls for a table in a liveview.
|
||||||
|
|
||||||
|
## Examples
|
||||||
|
|
||||||
|
<.live_pagination_controls page_number={@page} total_pages={@total_pages} />
|
||||||
|
"""
|
||||||
|
attr :page_number, :integer, default: 1
|
||||||
|
attr :total_pages, :integer, default: 1
|
||||||
|
|
||||||
|
def live_pagination_controls(assigns) do
|
||||||
|
~H"""
|
||||||
|
<nav>
|
||||||
|
<ul class="flex flex-wrap items-center">
|
||||||
|
<li>
|
||||||
|
<span
|
||||||
|
class={[
|
||||||
|
"flex h-8 w-8 items-center justify-center rounded",
|
||||||
|
@page_number != 1 && "cursor-pointer hover:bg-primary hover:text-white",
|
||||||
|
@page_number == 1 && "cursor-not-allowed"
|
||||||
|
]}
|
||||||
|
phx-click={@page_number != 1 && "page_change"}
|
||||||
|
phx-value-direction="dec"
|
||||||
|
>
|
||||||
|
<CoreComponents.icon name="hero-chevron-left" />
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<span class="mx-2">Page <%= @page_number %> of <%= @total_pages %></span>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<span
|
||||||
|
class={[
|
||||||
|
"flex h-8 w-8 items-center justify-center rounded",
|
||||||
|
@page_number != @total_pages && "cursor-pointer hover:bg-primary hover:text-white",
|
||||||
|
@page_number == @total_pages && "cursor-not-allowed"
|
||||||
|
]}
|
||||||
|
phx-click={@page_number != @total_pages && "page_change"}
|
||||||
|
phx-value-direction="inc"
|
||||||
|
>
|
||||||
|
<CoreComponents.icon name="hero-chevron-right" />
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
"""
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -35,11 +35,12 @@ defmodule PinchflatWeb.CustomComponents.TextComponents do
|
|||||||
Renders a subtle link with the given href and content.
|
Renders a subtle link with the given href and content.
|
||||||
"""
|
"""
|
||||||
attr :href, :string, required: true
|
attr :href, :string, required: true
|
||||||
|
attr :target, :string, default: "_self"
|
||||||
slot :inner_block
|
slot :inner_block
|
||||||
|
|
||||||
def subtle_link(assigns) do
|
def subtle_link(assigns) do
|
||||||
~H"""
|
~H"""
|
||||||
<.link href={@href} class="underline decoration-bodydark decoration-1 hover:decoration-white">
|
<.link href={@href} target={@target} class="underline decoration-bodydark decoration-1 hover:decoration-white">
|
||||||
<%= render_slot(@inner_block) %>
|
<%= render_slot(@inner_block) %>
|
||||||
</.link>
|
</.link>
|
||||||
"""
|
"""
|
||||||
@@ -59,4 +60,22 @@ defmodule PinchflatWeb.CustomComponents.TextComponents do
|
|||||||
</.link>
|
</.link>
|
||||||
"""
|
"""
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Renders a block of text with each line broken into a separate span.
|
||||||
|
"""
|
||||||
|
attr :text, :string, required: true
|
||||||
|
|
||||||
|
def break_on_newline(assigns) do
|
||||||
|
broken_text =
|
||||||
|
assigns.text
|
||||||
|
|> String.split("\n", trim: false)
|
||||||
|
|> Enum.intersperse(Phoenix.HTML.Tag.tag(:span, class: "inline-block mt-2"))
|
||||||
|
|
||||||
|
assigns = Map.put(assigns, :text, broken_text)
|
||||||
|
|
||||||
|
~H"""
|
||||||
|
<span><%= @text %></span>
|
||||||
|
"""
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
<%= if media_type(@media_item) == :video do %>
|
<%= if media_type(@media_item) == :video do %>
|
||||||
<video controls class="max-h-96 w-full lg:w-2/3 xl:w-1/2">
|
<video controls class="max-h-96 w-full">
|
||||||
<source src={~p"/media/#{@media_item.uuid}/stream"} type="video/mp4" />
|
<source src={~p"/media/#{@media_item.uuid}/stream"} type="video/mp4" />
|
||||||
Your browser does not support the video element.
|
Your browser does not support the video element.
|
||||||
</video>
|
</video>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= if media_type(@media_item) == :audio do %>
|
<%= if media_type(@media_item) == :audio do %>
|
||||||
<audio controls class="w-full lg:w-2/3 xl:w-1/2">
|
<audio controls class="w-full">
|
||||||
<source src={~p"/media/#{@media_item.uuid}/stream"} type="audio/mpeg" />
|
<source src={~p"/media/#{@media_item.uuid}/stream"} type="audio/mpeg" />
|
||||||
Your browser does not support the audio element.
|
Your browser does not support the audio element.
|
||||||
</audio>
|
</audio>
|
||||||
|
|||||||
@@ -23,23 +23,33 @@
|
|||||||
<.actions_dropdown media_item={@media_item} />
|
<.actions_dropdown media_item={@media_item} />
|
||||||
</:tab_append>
|
</:tab_append>
|
||||||
|
|
||||||
<:tab title="Attributes">
|
<:tab title="Media">
|
||||||
<div class="flex flex-col gap-10 dark:text-white">
|
<div class="flex flex-col gap-10 dark:text-white">
|
||||||
<%= if media_file_exists?(@media_item) do %>
|
<%= if media_file_exists?(@media_item) do %>
|
||||||
<h3 class="font-bold text-xl">Preview</h3>
|
<section class="grid grid-cols-1 xl:grid-cols-2 xl:gap-6 mt-6">
|
||||||
<.media_preview media_item={@media_item} />
|
<div>
|
||||||
|
<.media_preview media_item={@media_item} />
|
||||||
|
</div>
|
||||||
|
<aside class="mt-4 xl:mt-0">
|
||||||
|
<div>Uploaded: <%= @media_item.upload_date %></div>
|
||||||
|
<div>
|
||||||
|
<.subtle_link href={@media_item.original_url} target="_blank">Open Original</.subtle_link>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4 text-bodydark">
|
||||||
|
<.break_on_newline text={@media_item.description} />
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
</section>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<h2 class="font-bold text-2xl"><%= @media_item.title %></h2>
|
<h3 class="font-bold text-xl mt-6">Raw Attributes</h3>
|
||||||
<h3 class="font-bold text-xl">Attributes</h3>
|
|
||||||
<section>
|
<section>
|
||||||
<strong>Source:</strong>
|
<strong>Source:</strong>
|
||||||
<.subtle_link href={~p"/sources/#{@media_item.source_id}"}>
|
<.subtle_link href={~p"/sources/#{@media_item.source_id}"}>
|
||||||
<%= @media_item.source.custom_name %>
|
<%= @media_item.source.custom_name %>
|
||||||
</.subtle_link>
|
</.subtle_link>
|
||||||
|
<.list_items_from_map map={Map.from_struct(@media_item)} />
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<.list_items_from_map map={Map.from_struct(@media_item)} />
|
|
||||||
</div>
|
</div>
|
||||||
</:tab>
|
</:tab>
|
||||||
<:tab title="Tasks">
|
<:tab title="Tasks">
|
||||||
|
|||||||
@@ -43,9 +43,9 @@
|
|||||||
</.button_dropdown>
|
</.button_dropdown>
|
||||||
</:tab_append>
|
</:tab_append>
|
||||||
|
|
||||||
<:tab title="Attributes">
|
<:tab title="Media Profile">
|
||||||
<div class="flex flex-col gap-10 text-white">
|
<div class="flex flex-col gap-10 text-white">
|
||||||
<h3 class="font-bold text-xl">Attributes for "<%= @media_profile.name %>"</h3>
|
<h3 class="font-bold text-xl mt-6">Raw Attributes</h3>
|
||||||
<.list_items_from_map map={Map.from_struct(@media_profile)} />
|
<.list_items_from_map map={Map.from_struct(@media_profile)} />
|
||||||
</div>
|
</div>
|
||||||
</:tab>
|
</:tab>
|
||||||
|
|||||||
@@ -16,12 +16,12 @@
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
|
<div class="rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
|
||||||
<a href="#" class="mt-4 flex flex-col items-center justify-center">
|
<span class="mt-4 flex flex-col items-center justify-center">
|
||||||
<span class="text-md font-medium">Media Item(s)</span>
|
<span class="text-md font-medium">Media Item(s)</span>
|
||||||
<h4 class="text-title-md font-bold text-white">
|
<h4 class="text-title-md font-bold text-white">
|
||||||
<%= @media_item_count %>
|
<%= @media_item_count %>
|
||||||
</h4>
|
</h4>
|
||||||
</a>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<span class="text-strokedark">I know this page isn't super useful yet, but give it time :)</span>
|
<span class="text-strokedark">I know this page isn't super useful yet, but give it time :)</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,12 +6,11 @@ defmodule PinchflatWeb.Sources.SourceController do
|
|||||||
alias Pinchflat.Repo
|
alias Pinchflat.Repo
|
||||||
alias Pinchflat.Tasks
|
alias Pinchflat.Tasks
|
||||||
alias Pinchflat.Sources
|
alias Pinchflat.Sources
|
||||||
alias Pinchflat.MediaQuery
|
|
||||||
alias Pinchflat.Sources.Source
|
alias Pinchflat.Sources.Source
|
||||||
alias Pinchflat.Media.MediaQuery
|
|
||||||
alias Pinchflat.Profiles.MediaProfile
|
alias Pinchflat.Profiles.MediaProfile
|
||||||
alias Pinchflat.Downloading.DownloadingHelpers
|
alias Pinchflat.Downloading.DownloadingHelpers
|
||||||
alias Pinchflat.SlowIndexing.SlowIndexingHelpers
|
alias Pinchflat.SlowIndexing.SlowIndexingHelpers
|
||||||
|
alias Pinchflat.Metadata.SourceMetadataStorageWorker
|
||||||
|
|
||||||
def index(conn, _params) do
|
def index(conn, _params) do
|
||||||
sources =
|
sources =
|
||||||
@@ -60,29 +59,32 @@ defmodule PinchflatWeb.Sources.SourceController do
|
|||||||
|> Tasks.list_tasks_for(nil, [:executing, :available, :scheduled, :retryable])
|
|> Tasks.list_tasks_for(nil, [:executing, :available, :scheduled, :retryable])
|
||||||
|> Repo.preload(:job)
|
|> Repo.preload(:job)
|
||||||
|
|
||||||
pending_media =
|
render(conn, :show, source: source, pending_tasks: pending_tasks)
|
||||||
MediaQuery.new()
|
end
|
||||||
|> MediaQuery.for_source(source)
|
|
||||||
|> MediaQuery.where_pending_download()
|
|
||||||
|> order_by(desc: :id)
|
|
||||||
|> limit(100)
|
|
||||||
|> Repo.all()
|
|
||||||
|
|
||||||
downloaded_media =
|
# TODO: test
|
||||||
MediaQuery.new()
|
# TODO: also do for media items
|
||||||
|> MediaQuery.for_source(source)
|
# TODO: check to see if I've lost the plot here
|
||||||
|> MediaQuery.with_media_filepath()
|
def show_image(conn, %{"source_id" => id, "image_type" => image_type}) do
|
||||||
|> order_by(desc: :id)
|
source = Sources.get_source!(id)
|
||||||
|> limit(100)
|
|
||||||
|> Repo.all()
|
|
||||||
|
|
||||||
render(conn, :show,
|
filepath =
|
||||||
source: source,
|
case image_type do
|
||||||
pending_tasks: pending_tasks,
|
"poster" -> source.poster_filepath
|
||||||
pending_media: pending_media,
|
"fanart" -> source.fanart_filepath
|
||||||
downloaded_media: downloaded_media,
|
"banner" -> source.banner_filepath
|
||||||
total_downloaded: total_downloaded_for(source)
|
_ -> nil
|
||||||
)
|
end
|
||||||
|
|
||||||
|
if filepath && File.exists?(filepath) do
|
||||||
|
conn
|
||||||
|
|> put_resp_content_type(MIME.from_path(filepath))
|
||||||
|
|> send_file(200, filepath)
|
||||||
|
else
|
||||||
|
conn
|
||||||
|
|> put_status(404)
|
||||||
|
|> text("Image not found")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit(conn, %{"id" => id}) do
|
def edit(conn, %{"id" => id}) do
|
||||||
@@ -128,20 +130,38 @@ defmodule PinchflatWeb.Sources.SourceController do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def force_download(conn, %{"source_id" => id}) do
|
def force_download(conn, %{"source_id" => id}) do
|
||||||
source = Sources.get_source!(id)
|
wrap_forced_action(
|
||||||
DownloadingHelpers.enqueue_pending_download_tasks(source)
|
conn,
|
||||||
|
id,
|
||||||
conn
|
"Forcing download of pending media items.",
|
||||||
|> put_flash(:info, "Forced download of pending media items.")
|
&DownloadingHelpers.enqueue_pending_download_tasks/1
|
||||||
|> redirect(to: ~p"/sources/#{source}")
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
def force_index(conn, %{"source_id" => id}) do
|
def force_index(conn, %{"source_id" => id}) do
|
||||||
source = Sources.get_source!(id)
|
wrap_forced_action(
|
||||||
SlowIndexingHelpers.kickoff_indexing_task(source, %{force: true})
|
conn,
|
||||||
|
id,
|
||||||
|
"Index enqueued.",
|
||||||
|
&SlowIndexingHelpers.kickoff_indexing_task(&1, %{force: true})
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def force_metadata_refresh(conn, %{"source_id" => id}) do
|
||||||
|
wrap_forced_action(
|
||||||
|
conn,
|
||||||
|
id,
|
||||||
|
"Metadata refresh enqueued.",
|
||||||
|
&SourceMetadataStorageWorker.kickoff_with_task/1
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
defp wrap_forced_action(conn, source_id, message, fun) do
|
||||||
|
source = Sources.get_source!(source_id)
|
||||||
|
fun.(source)
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|> put_flash(:info, "Index enqueued.")
|
|> put_flash(:info, message)
|
||||||
|> redirect(to: ~p"/sources/#{source}")
|
|> redirect(to: ~p"/sources/#{source}")
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -151,13 +171,6 @@ defmodule PinchflatWeb.Sources.SourceController do
|
|||||||
|> Repo.all()
|
|> Repo.all()
|
||||||
end
|
end
|
||||||
|
|
||||||
defp total_downloaded_for(source) do
|
|
||||||
MediaQuery.new()
|
|
||||||
|> MediaQuery.for_source(source)
|
|
||||||
|> MediaQuery.with_media_filepath()
|
|
||||||
|> Repo.aggregate(:count, :id)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp get_onboarding_layout do
|
defp get_onboarding_layout do
|
||||||
if Settings.get!(:onboarding) do
|
if Settings.get!(:onboarding) do
|
||||||
{Layouts, :onboarding}
|
{Layouts, :onboarding}
|
||||||
|
|||||||
@@ -25,6 +25,16 @@ defmodule PinchflatWeb.Sources.SourceHTML do
|
|||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def source_image_mapping(source) do
|
||||||
|
image_mapping = [
|
||||||
|
{"Poster", source.poster_filepath, "poster"},
|
||||||
|
{"Banner", source.banner_filepath, "banner"},
|
||||||
|
{"Fanart", source.fanart_filepath, "fanart"}
|
||||||
|
]
|
||||||
|
|
||||||
|
Enum.filter(image_mapping, fn {_, filepath, _} -> filepath end)
|
||||||
|
end
|
||||||
|
|
||||||
def rss_feed_url(conn, source) do
|
def rss_feed_url(conn, source) do
|
||||||
url(conn, ~p"/sources/#{source.uuid}/feed") <> ".xml"
|
url(conn, ~p"/sources/#{source.uuid}/feed") <> ".xml"
|
||||||
end
|
end
|
||||||
@@ -36,6 +46,15 @@ defmodule PinchflatWeb.Sources.SourceHTML do
|
|||||||
|> Phoenix.json_library().encode!()
|
|> Phoenix.json_library().encode!()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def title_filter_regex_help do
|
||||||
|
url = "https://github.com/nalgeon/sqlean/blob/main/docs/regexp.md#supported-syntax"
|
||||||
|
classes = "underline decoration-bodydark decoration-1 hover:decoration-white"
|
||||||
|
|
||||||
|
"""
|
||||||
|
A PCRE-compatible regex. Only media with titles that match this regex will be downloaded. <a href="#{url}" class="#{classes}" target="_blank">See here</a> for syntax
|
||||||
|
"""
|
||||||
|
end
|
||||||
|
|
||||||
def output_path_template_override_help do
|
def output_path_template_override_help do
|
||||||
help_button_classes = "underline decoration-bodydark decoration-1 hover:decoration-white cursor-pointer"
|
help_button_classes = "underline decoration-bodydark decoration-1 hover:decoration-white cursor-pointer"
|
||||||
help_button = ~s{<span class="#{help_button_classes}" x-on:click="$dispatch('load-template')">Click here</span>}
|
help_button = ~s{<span class="#{help_button_classes}" x-on:click="$dispatch('load-template')">Click here</span>}
|
||||||
|
|||||||
@@ -30,6 +30,15 @@
|
|||||||
Force Index
|
Force Index
|
||||||
</.link>
|
</.link>
|
||||||
</:option>
|
</:option>
|
||||||
|
<:option>
|
||||||
|
<.link
|
||||||
|
href={~p"/sources/#{@source}/force_metadata_refresh"}
|
||||||
|
method="post"
|
||||||
|
data-confirm="Are you sure you want to refresh this source's metadata?"
|
||||||
|
>
|
||||||
|
Refresh Metadata
|
||||||
|
</.link>
|
||||||
|
</:option>
|
||||||
<:option>
|
<:option>
|
||||||
<div class="h-px w-full bg-bodydark2"></div>
|
<div class="h-px w-full bg-bodydark2"></div>
|
||||||
</:option>
|
</:option>
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
defmodule Pinchflat.Sources.MediaItemTableLive do
|
||||||
|
use PinchflatWeb, :live_view
|
||||||
|
import Ecto.Query, warn: false
|
||||||
|
|
||||||
|
alias Pinchflat.Repo
|
||||||
|
alias Pinchflat.Sources
|
||||||
|
alias Pinchflat.Media.MediaQuery
|
||||||
|
alias Pinchflat.Utils.NumberUtils
|
||||||
|
|
||||||
|
@limit 10
|
||||||
|
|
||||||
|
def render(%{records: []} = assigns) do
|
||||||
|
~H"""
|
||||||
|
<p class="text-black dark:text-white">Nothing Here!</p>
|
||||||
|
"""
|
||||||
|
end
|
||||||
|
|
||||||
|
def render(assigns) do
|
||||||
|
~H"""
|
||||||
|
<div>
|
||||||
|
<span class="mb-4 inline-block">
|
||||||
|
Showing <%= length(@records) %> of <%= @total_record_count %>
|
||||||
|
</span>
|
||||||
|
<.table rows={@records} table_class="text-black dark:text-white">
|
||||||
|
<:col :let={media_item} label="Title">
|
||||||
|
<.subtle_link href={~p"/sources/#{@source.id}/media/#{media_item.id}"}>
|
||||||
|
<%= StringUtils.truncate(media_item.title, 50) %>
|
||||||
|
</.subtle_link>
|
||||||
|
</:col>
|
||||||
|
<:col :let={media_item} label="" class="flex place-content-evenly">
|
||||||
|
<.icon_link href={~p"/sources/#{@source.id}/media/#{media_item.id}"} icon="hero-eye" class="mx-1" />
|
||||||
|
<.icon_link href={~p"/sources/#{@source.id}/media/#{media_item.id}/edit"} icon="hero-pencil-square" class="mx-1" />
|
||||||
|
</:col>
|
||||||
|
</.table>
|
||||||
|
<section class="flex justify-center mt-5">
|
||||||
|
<.live_pagination_controls page_number={@page} total_pages={@total_pages} />
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
"""
|
||||||
|
end
|
||||||
|
|
||||||
|
def mount(_params, session, socket) do
|
||||||
|
page = 1
|
||||||
|
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)
|
||||||
|
|
||||||
|
{:ok, assign(socket, Map.merge(pagination_attrs, %{base_query: base_query, source: source}))}
|
||||||
|
end
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
{: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)
|
||||||
|
|
||||||
|
%{page: page, total_pages: total_pages, records: records, total_record_count: total_record_count}
|
||||||
|
end
|
||||||
|
|
||||||
|
defp fetch_records(base_query, page) do
|
||||||
|
offset = (page - 1) * @limit
|
||||||
|
|
||||||
|
base_query
|
||||||
|
|> limit(^@limit)
|
||||||
|
|> offset(^offset)
|
||||||
|
|> Repo.all()
|
||||||
|
end
|
||||||
|
|
||||||
|
defp generate_base_query(source, "pending") do
|
||||||
|
MediaQuery.new()
|
||||||
|
|> MediaQuery.for_source(source)
|
||||||
|
|> MediaQuery.where_pending_download()
|
||||||
|
|> order_by(desc: :id)
|
||||||
|
end
|
||||||
|
|
||||||
|
defp generate_base_query(source, "downloaded") do
|
||||||
|
MediaQuery.new()
|
||||||
|
|> MediaQuery.for_source(source)
|
||||||
|
|> MediaQuery.with_media_filepath()
|
||||||
|
|> order_by(desc: :id)
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -23,9 +23,9 @@
|
|||||||
<.actions_dropdown source={@source} conn={@conn} />
|
<.actions_dropdown source={@source} conn={@conn} />
|
||||||
</:tab_append>
|
</:tab_append>
|
||||||
|
|
||||||
<:tab title="Attributes">
|
<:tab title="Source">
|
||||||
<div class="flex flex-col gap-10 text-white">
|
<div class="flex flex-col gap-10 text-white">
|
||||||
<h3 class="font-bold text-lg">Attributes</h3>
|
<h3 class="font-bold text-xl mt-6">Raw Attributes</h3>
|
||||||
<section>
|
<section>
|
||||||
<strong>Media Profile:</strong>
|
<strong>Media Profile:</strong>
|
||||||
<.subtle_link href={~p"/media_profiles/#{@source.media_profile_id}"}>
|
<.subtle_link href={~p"/media_profiles/#{@source.media_profile_id}"}>
|
||||||
@@ -36,49 +36,36 @@
|
|||||||
<.list_items_from_map map={Map.from_struct(@source)} />
|
<.list_items_from_map map={Map.from_struct(@source)} />
|
||||||
</div>
|
</div>
|
||||||
</:tab>
|
</:tab>
|
||||||
|
<:tab title="Images">
|
||||||
|
<section>
|
||||||
|
<h3 class="font-bold text-xl mt-6 mb-4">Images</h3>
|
||||||
|
<%= if source_image_mapping(@source) == [] do %>
|
||||||
|
<p class="text-black dark:text-white">Nothing Here!</p>
|
||||||
|
<% else %>
|
||||||
|
<div class="grid grid-cols-1 gap-4 lg:grid-cols-3">
|
||||||
|
<div :for={{name, _, image_type} <- source_image_mapping(@source)}>
|
||||||
|
<span><%= name %></span>
|
||||||
|
<a href={~p"/sources/#{@source}/image/#{image_type}"} target="_blank">
|
||||||
|
<img src={~p"/sources/#{@source}/image/#{image_type}"} alt={name} class="w-full h-auto" />
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</section>
|
||||||
|
</:tab>
|
||||||
<:tab title="Pending Media">
|
<:tab title="Pending Media">
|
||||||
<%= if match?([_|_], @pending_media) do %>
|
<%= live_render(
|
||||||
<h4 class="text-white text-lg mb-6">Shows a maximum of 100 media items</h4>
|
@conn,
|
||||||
<.table rows={@pending_media} table_class="text-black dark:text-white">
|
Pinchflat.Sources.MediaItemTableLive,
|
||||||
<:col :let={media_item} label="Title">
|
session: %{"source_id" => @source.id, "media_state" => "pending"}
|
||||||
<.subtle_link href={~p"/sources/#{@source.id}/media/#{media_item.id}"}>
|
) %>
|
||||||
<%= StringUtils.truncate(media_item.title, 50) %>
|
|
||||||
</.subtle_link>
|
|
||||||
</:col>
|
|
||||||
<:col :let={media_item} label="" class="flex place-content-evenly">
|
|
||||||
<.icon_link href={~p"/sources/#{@source.id}/media/#{media_item.id}"} icon="hero-eye" class="mx-1" />
|
|
||||||
<.icon_link
|
|
||||||
href={~p"/sources/#{@source.id}/media/#{media_item.id}/edit"}
|
|
||||||
icon="hero-pencil-square"
|
|
||||||
class="mx-1"
|
|
||||||
/>
|
|
||||||
</:col>
|
|
||||||
</.table>
|
|
||||||
<% else %>
|
|
||||||
<p class="text-black dark:text-white">Nothing Here!</p>
|
|
||||||
<% end %>
|
|
||||||
</:tab>
|
</:tab>
|
||||||
<:tab title="Downloaded Media">
|
<:tab title="Downloaded Media">
|
||||||
<%= if match?([_|_], @downloaded_media) do %>
|
<%= live_render(
|
||||||
<h4 class="text-white text-lg mb-6">Shows a maximum of 100 media items (<%= @total_downloaded %> total)</h4>
|
@conn,
|
||||||
<.table rows={@downloaded_media} table_class="text-black dark:text-white">
|
Pinchflat.Sources.MediaItemTableLive,
|
||||||
<:col :let={media_item} label="Title">
|
session: %{"source_id" => @source.id, "media_state" => "downloaded"}
|
||||||
<.subtle_link href={~p"/sources/#{@source.id}/media/#{media_item.id}"}>
|
) %>
|
||||||
<%= StringUtils.truncate(media_item.title, 50) %>
|
|
||||||
</.subtle_link>
|
|
||||||
</:col>
|
|
||||||
<:col :let={media_item} label="" class="flex place-content-evenly">
|
|
||||||
<.icon_link href={~p"/sources/#{@source.id}/media/#{media_item.id}"} icon="hero-eye" class="mx-1" />
|
|
||||||
<.icon_link
|
|
||||||
href={~p"/sources/#{@source.id}/media/#{media_item.id}/edit"}
|
|
||||||
icon="hero-pencil-square"
|
|
||||||
class="mx-1"
|
|
||||||
/>
|
|
||||||
</:col>
|
|
||||||
</.table>
|
|
||||||
<% else %>
|
|
||||||
<p class="text-black dark:text-white">Nothing Here!</p>
|
|
||||||
<% end %>
|
|
||||||
</:tab>
|
</:tab>
|
||||||
<:tab title="Pending Tasks">
|
<:tab title="Pending Tasks">
|
||||||
<%= if match?([_|_], @pending_tasks) do %>
|
<%= if match?([_|_], @pending_tasks) do %>
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
field={f[:custom_name]}
|
field={f[:custom_name]}
|
||||||
type="text"
|
type="text"
|
||||||
label="Custom Name"
|
label="Custom Name"
|
||||||
help="Something descriptive. Does not impact indexing or downloading"
|
help="Does not impact indexing or downloading. Will be inferred from the source if left blank"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<.input field={f[:original_url]} type="text" label="Source URL" help="URL of a channel or playlist (required)" />
|
<.input field={f[:original_url]} type="text" label="Source URL" help="URL of a channel or playlist (required)" />
|
||||||
@@ -111,7 +111,8 @@
|
|||||||
type="text"
|
type="text"
|
||||||
label="Title Filter Regex"
|
label="Title Filter Regex"
|
||||||
placeholder="(?i)^How to Bike$"
|
placeholder="(?i)^How to Bike$"
|
||||||
help="A PCRE-compatible regex. Only media with titles that match this regex will be downloaded. Look up 'SQLean Regex docs' for more"
|
help={title_filter_regex_help()}
|
||||||
|
html_help={true}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<section
|
<section
|
||||||
|
|||||||
@@ -33,8 +33,10 @@ defmodule PinchflatWeb.Router do
|
|||||||
resources "/settings", Settings.SettingController, only: [:show, :update], singleton: true
|
resources "/settings", Settings.SettingController, only: [:show, :update], singleton: true
|
||||||
|
|
||||||
resources "/sources", Sources.SourceController do
|
resources "/sources", Sources.SourceController do
|
||||||
|
get "/image/:image_type", Sources.SourceController, :show_image
|
||||||
post "/force_download", Sources.SourceController, :force_download
|
post "/force_download", Sources.SourceController, :force_download
|
||||||
post "/force_index", Sources.SourceController, :force_index
|
post "/force_index", Sources.SourceController, :force_index
|
||||||
|
post "/force_metadata_refresh", Sources.SourceController, :force_metadata_refresh
|
||||||
|
|
||||||
resources "/media", MediaItems.MediaItemController, only: [:show, :edit, :update, :delete] do
|
resources "/media", MediaItems.MediaItemController, only: [:show, :edit, :update, :delete] do
|
||||||
post "/force_download", MediaItems.MediaItemController, :force_download
|
post "/force_download", MediaItems.MediaItemController, :force_download
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
|
|||||||
assert {:ok, res} = DownloadOptionBuilder.build(media_item)
|
assert {:ok, res} = DownloadOptionBuilder.build(media_item)
|
||||||
|
|
||||||
assert :no_progress in res
|
assert :no_progress in res
|
||||||
assert :windows_filenames in res
|
|
||||||
assert :force_overwrites in res
|
assert :force_overwrites in res
|
||||||
assert {:parse_metadata, "%(upload_date>%Y-%m-%d)s:(?P<meta_date>.+)"} in res
|
assert {:parse_metadata, "%(upload_date>%Y-%m-%d)s:(?P<meta_date>.+)"} in res
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -89,5 +89,25 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpersTest do
|
|||||||
|
|
||||||
refute_enqueued(worker: MediaDownloadWorker)
|
refute_enqueued(worker: MediaDownloadWorker)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "does not blow up if a media item cannot be created", %{source: source} do
|
||||||
|
expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
|
||||||
|
|
||||||
|
stub(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
|
||||||
|
{:ok, "{}"}
|
||||||
|
end)
|
||||||
|
|
||||||
|
assert [] = FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed(source)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "does not blow up if a media item causes a yt-dlp error", %{source: source} do
|
||||||
|
expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
|
||||||
|
|
||||||
|
stub(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
|
||||||
|
{:error, "message", 1}
|
||||||
|
end)
|
||||||
|
|
||||||
|
assert [] = FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed(source)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -131,6 +131,18 @@ defmodule Pinchflat.SourcesTest do
|
|||||||
assert String.starts_with?(source.collection_id, "some_playlist_id_")
|
assert String.starts_with?(source.collection_id, "some_playlist_id_")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "adds an error if the runner fails" do
|
||||||
|
expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot -> {:error, "some error", 1} end)
|
||||||
|
|
||||||
|
valid_attrs = %{
|
||||||
|
media_profile_id: media_profile_fixture().id,
|
||||||
|
original_url: "https://www.youtube.com/channel/abc123"
|
||||||
|
}
|
||||||
|
|
||||||
|
assert {:error, %Ecto.Changeset{} = changeset} = Sources.create_source(valid_attrs)
|
||||||
|
assert "could not fetch source details from URL" in errors_on(changeset).original_url
|
||||||
|
end
|
||||||
|
|
||||||
test "you can specify a custom custom_name" do
|
test "you can specify a custom custom_name" do
|
||||||
expect(YtDlpRunnerMock, :run, &channel_mock/3)
|
expect(YtDlpRunnerMock, :run, &channel_mock/3)
|
||||||
|
|
||||||
@@ -502,14 +514,24 @@ defmodule Pinchflat.SourcesTest do
|
|||||||
assert source.index_frequency_minutes == 0
|
assert source.index_frequency_minutes == 0
|
||||||
end
|
end
|
||||||
|
|
||||||
test "updating will kickoff a metadata storage worker" do
|
test "updating will kickoff a metadata storage worker if the original_url changes" do
|
||||||
|
expect(YtDlpRunnerMock, :run, &playlist_mock/3)
|
||||||
source = source_fixture()
|
source = source_fixture()
|
||||||
update_attrs = %{name: "some updated name"}
|
update_attrs = %{original_url: "https://www.youtube.com/channel/cba321"}
|
||||||
|
|
||||||
assert {:ok, %Source{} = source} = Sources.update_source(source, update_attrs)
|
assert {:ok, %Source{} = source} = Sources.update_source(source, update_attrs)
|
||||||
|
|
||||||
assert_enqueued(worker: SourceMetadataStorageWorker, args: %{"id" => source.id})
|
assert_enqueued(worker: SourceMetadataStorageWorker, args: %{"id" => source.id})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "updating will not kickoff a metadata storage worker other attrs change" do
|
||||||
|
source = source_fixture()
|
||||||
|
update_attrs = %{name: "some new name"}
|
||||||
|
|
||||||
|
assert {:ok, %Source{}} = Sources.update_source(source, update_attrs)
|
||||||
|
|
||||||
|
refute_enqueued(worker: SourceMetadataStorageWorker)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "update_source/3 when testing options" do
|
describe "update_source/3 when testing options" do
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
defmodule Pinchflat.Utils.NumberUtilsTest do
|
||||||
|
use ExUnit.Case, async: true
|
||||||
|
|
||||||
|
alias Pinchflat.Utils.NumberUtils
|
||||||
|
|
||||||
|
describe "clamp/3" do
|
||||||
|
test "returns the minimum when the number is less than the minimum" do
|
||||||
|
assert NumberUtils.clamp(1, 2, 3) == 2
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns the maximum when the number is greater than the maximum" do
|
||||||
|
assert NumberUtils.clamp(4, 2, 3) == 3
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns the number when it is between the minimum and maximum" do
|
||||||
|
assert NumberUtils.clamp(2, 1, 3) == 2
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -78,6 +78,14 @@ defmodule Pinchflat.YtDlp.CommandRunnerTest do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "run/4 when testing global options" do
|
||||||
|
test "creates windows-safe filenames" do
|
||||||
|
assert {:ok, output} = Runner.run(@media_url, [], "")
|
||||||
|
|
||||||
|
assert String.contains?(output, "--windows-filenames")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe "version/0" do
|
describe "version/0" do
|
||||||
test "adds the version arg" do
|
test "adds the version arg" do
|
||||||
assert {:ok, output} = Runner.version()
|
assert {:ok, output} = Runner.version()
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ defmodule PinchflatWeb.SourceControllerTest do
|
|||||||
alias Pinchflat.Repo
|
alias Pinchflat.Repo
|
||||||
alias Pinchflat.Settings
|
alias Pinchflat.Settings
|
||||||
alias Pinchflat.Downloading.MediaDownloadWorker
|
alias Pinchflat.Downloading.MediaDownloadWorker
|
||||||
|
alias Pinchflat.Metadata.SourceMetadataStorageWorker
|
||||||
alias Pinchflat.SlowIndexing.MediaCollectionIndexingWorker
|
alias Pinchflat.SlowIndexing.MediaCollectionIndexingWorker
|
||||||
|
|
||||||
setup do
|
setup do
|
||||||
@@ -215,6 +216,23 @@ defmodule PinchflatWeb.SourceControllerTest do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "force_metadata_refresh" do
|
||||||
|
test "forces a metadata refresh", %{conn: conn} do
|
||||||
|
source = source_fixture()
|
||||||
|
|
||||||
|
assert [] = all_enqueued(worker: SourceMetadataStorageWorker)
|
||||||
|
post(conn, ~p"/sources/#{source.id}/force_metadata_refresh")
|
||||||
|
assert [_] = all_enqueued(worker: SourceMetadataStorageWorker)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "redirects to the source page", %{conn: conn} do
|
||||||
|
source = source_fixture()
|
||||||
|
|
||||||
|
conn = post(conn, ~p"/sources/#{source.id}/force_metadata_refresh")
|
||||||
|
assert redirected_to(conn) == ~p"/sources/#{source.id}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp create_source(_) do
|
defp create_source(_) do
|
||||||
source = source_fixture()
|
source = source_fixture()
|
||||||
media_item = media_item_with_attachments(%{source_id: source.id})
|
media_item = media_item_with_attachments(%{source_id: source.id})
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
defmodule PinchflatWeb.Sources.MediaItemTableLiveTest do
|
||||||
|
use PinchflatWeb.ConnCase
|
||||||
|
|
||||||
|
import Phoenix.LiveViewTest
|
||||||
|
import Pinchflat.MediaFixtures
|
||||||
|
import Pinchflat.SourcesFixtures
|
||||||
|
|
||||||
|
alias Pinchflat.Sources.MediaItemTableLive
|
||||||
|
|
||||||
|
setup do
|
||||||
|
source = source_fixture()
|
||||||
|
|
||||||
|
{:ok, source: source}
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "initial rendering" do
|
||||||
|
test "shows message when no records", %{conn: conn, source: source} do
|
||||||
|
{:ok, _view, html} = live_isolated(conn, MediaItemTableLive, session: create_session(source))
|
||||||
|
|
||||||
|
assert html =~ "Nothing Here!"
|
||||||
|
refute html =~ "Showing"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "shows records when present", %{conn: conn, source: source} do
|
||||||
|
media_item = media_item_fixture(source_id: source.id, media_filepath: nil)
|
||||||
|
|
||||||
|
{:ok, _view, html} = live_isolated(conn, MediaItemTableLive, session: create_session(source))
|
||||||
|
|
||||||
|
assert html =~ "Showing 1 of 1"
|
||||||
|
assert html =~ "Title"
|
||||||
|
assert html =~ media_item.title
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "media_state" do
|
||||||
|
test "shows pending media when pending", %{conn: conn, source: source} do
|
||||||
|
downloaded_media_item = media_item_fixture(source_id: source.id)
|
||||||
|
pending_media_item = media_item_fixture(source_id: source.id, media_filepath: nil)
|
||||||
|
|
||||||
|
{:ok, _view, html} = live_isolated(conn, MediaItemTableLive, session: create_session(source, "pending"))
|
||||||
|
|
||||||
|
assert html =~ pending_media_item.title
|
||||||
|
refute html =~ downloaded_media_item.title
|
||||||
|
end
|
||||||
|
|
||||||
|
test "shows downloaded media when downloaded", %{conn: conn, source: source} do
|
||||||
|
downloaded_media_item = media_item_fixture(source_id: source.id)
|
||||||
|
pending_media_item = media_item_fixture(source_id: source.id, media_filepath: nil)
|
||||||
|
|
||||||
|
{:ok, _view, html} = live_isolated(conn, MediaItemTableLive, session: create_session(source, "downloaded"))
|
||||||
|
|
||||||
|
assert html =~ downloaded_media_item.title
|
||||||
|
refute html =~ pending_media_item.title
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp create_session(source, media_state \\ "pending") do
|
||||||
|
%{"source_id" => source.id, "media_state" => media_state}
|
||||||
|
end
|
||||||
|
end
|
||||||
Reference in New Issue
Block a user