Added some random test coverage for fun
This commit is contained in:
parent
36f576ca93
commit
a0a3c88179
7 changed files with 42 additions and 11 deletions
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
@ -34,7 +32,6 @@ defmodule Pinchflat.YtDlp.CommandRunner do
|
||||||
# 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 ++ user_configured_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} ->
|
||||||
|
|
@ -57,8 +54,7 @@ defmodule Pinchflat.YtDlp.CommandRunner do
|
||||||
def version do
|
def version do
|
||||||
command = backend_executable()
|
command = backend_executable()
|
||||||
|
|
||||||
# TODO: fix to use CliUtils.wrap_cmd (and look at apprise too)
|
case CliUtils.wrap_cmd(command, ["--version"]) do
|
||||||
case System.cmd(command, ["--version"]) do
|
|
||||||
{output, 0} ->
|
{output, 0} ->
|
||||||
{:ok, String.trim(output)}
|
{:ok, String.trim(output)}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue