[Enhancement] Auto-update yt-dlp (#589)
* Added a command for updating yt-dlp * Added a yt-dlp update worker to run daily * Added a new file that runs post-boot when the app is ready to serve requests; put yt-dlp updater in there * Updated config to expose the current env globally; updated startup tasks to not run in test env * Removes unneeded test code
This commit is contained in:
parent
62214b80a6
commit
6ead29182d
14 changed files with 202 additions and 26 deletions
|
|
@ -10,6 +10,7 @@ import Config
|
||||||
config :pinchflat,
|
config :pinchflat,
|
||||||
ecto_repos: [Pinchflat.Repo],
|
ecto_repos: [Pinchflat.Repo],
|
||||||
generators: [timestamp_type: :utc_datetime],
|
generators: [timestamp_type: :utc_datetime],
|
||||||
|
env: config_env(),
|
||||||
# Specifying backend data here makes mocking and local testing SUPER easy
|
# Specifying backend data here makes mocking and local testing SUPER easy
|
||||||
yt_dlp_executable: System.find_executable("yt-dlp"),
|
yt_dlp_executable: System.find_executable("yt-dlp"),
|
||||||
apprise_executable: System.find_executable("apprise"),
|
apprise_executable: System.find_executable("apprise"),
|
||||||
|
|
@ -49,16 +50,7 @@ config :pinchflat, PinchflatWeb.Endpoint,
|
||||||
|
|
||||||
config :pinchflat, Oban,
|
config :pinchflat, Oban,
|
||||||
engine: Oban.Engines.Lite,
|
engine: Oban.Engines.Lite,
|
||||||
repo: Pinchflat.Repo,
|
repo: Pinchflat.Repo
|
||||||
# Keep old jobs for 30 days for display in the UI
|
|
||||||
plugins: [
|
|
||||||
{Oban.Plugins.Pruner, max_age: 30 * 24 * 60 * 60},
|
|
||||||
{Oban.Plugins.Cron,
|
|
||||||
crontab: [
|
|
||||||
{"0 1 * * *", Pinchflat.Downloading.MediaRetentionWorker},
|
|
||||||
{"0 2 * * *", Pinchflat.Downloading.MediaQualityUpgradeWorker}
|
|
||||||
]}
|
|
||||||
]
|
|
||||||
|
|
||||||
# Configures the mailer
|
# Configures the mailer
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,11 @@ config :pinchflat, Pinchflat.Repo,
|
||||||
# Some users may want to increase the number of workers that use yt-dlp to improve speeds
|
# Some users may want to increase the number of workers that use yt-dlp to improve speeds
|
||||||
# Others may want to decrease the number of these workers to lessen the chance of an IP ban
|
# Others may want to decrease the number of these workers to lessen the chance of an IP ban
|
||||||
{yt_dlp_worker_count, _} = Integer.parse(System.get_env("YT_DLP_WORKER_CONCURRENCY", "2"))
|
{yt_dlp_worker_count, _} = Integer.parse(System.get_env("YT_DLP_WORKER_CONCURRENCY", "2"))
|
||||||
|
# Used to set the cron for the yt-dlp update worker. The reason for this is
|
||||||
|
# to avoid all instances of PF updating yt-dlp at the same time, which 1)
|
||||||
|
# could result in rate limiting and 2) gives me time to react if an update
|
||||||
|
# breaks something
|
||||||
|
%{hour: current_hour, minute: current_minute} = DateTime.utc_now()
|
||||||
|
|
||||||
config :pinchflat, Oban,
|
config :pinchflat, Oban,
|
||||||
queues: [
|
queues: [
|
||||||
|
|
@ -52,6 +57,16 @@ config :pinchflat, Oban,
|
||||||
media_fetching: yt_dlp_worker_count,
|
media_fetching: yt_dlp_worker_count,
|
||||||
remote_metadata: yt_dlp_worker_count,
|
remote_metadata: yt_dlp_worker_count,
|
||||||
local_data: 8
|
local_data: 8
|
||||||
|
],
|
||||||
|
plugins: [
|
||||||
|
# Keep old jobs for 30 days for display in the UI
|
||||||
|
{Oban.Plugins.Pruner, max_age: 30 * 24 * 60 * 60},
|
||||||
|
{Oban.Plugins.Cron,
|
||||||
|
crontab: [
|
||||||
|
{"#{current_minute} #{current_hour} * * *", Pinchflat.YtDlp.UpdateWorker},
|
||||||
|
{"0 1 * * *", Pinchflat.Downloading.MediaRetentionWorker},
|
||||||
|
{"0 2 * * *", Pinchflat.Downloading.MediaQualityUpgradeWorker}
|
||||||
|
]}
|
||||||
]
|
]
|
||||||
|
|
||||||
if config_env() == :prod do
|
if config_env() == :prod do
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,12 @@ defmodule Pinchflat.Application do
|
||||||
@impl true
|
@impl true
|
||||||
def start(_type, _args) do
|
def start(_type, _args) do
|
||||||
check_and_update_timezone()
|
check_and_update_timezone()
|
||||||
|
attach_oban_telemetry()
|
||||||
|
Logger.add_handlers(:pinchflat)
|
||||||
|
|
||||||
children = [
|
# See https://hexdocs.pm/elixir/Supervisor.html
|
||||||
|
# for other strategies and supported options
|
||||||
|
[
|
||||||
Pinchflat.PromEx,
|
Pinchflat.PromEx,
|
||||||
PinchflatWeb.Telemetry,
|
PinchflatWeb.Telemetry,
|
||||||
Pinchflat.Repo,
|
Pinchflat.Repo,
|
||||||
|
|
@ -24,17 +28,11 @@ defmodule Pinchflat.Application do
|
||||||
{Finch, name: Pinchflat.Finch},
|
{Finch, name: Pinchflat.Finch},
|
||||||
# Start a worker by calling: Pinchflat.Worker.start_link(arg)
|
# Start a worker by calling: Pinchflat.Worker.start_link(arg)
|
||||||
# {Pinchflat.Worker, arg},
|
# {Pinchflat.Worker, arg},
|
||||||
# Start to serve requests, typically the last entry
|
# Start to serve requests, typically the last entry (except for the post-boot tasks)
|
||||||
PinchflatWeb.Endpoint
|
PinchflatWeb.Endpoint,
|
||||||
|
Pinchflat.Boot.PostBootStartupTasks
|
||||||
]
|
]
|
||||||
|
|> Supervisor.start_link(strategy: :one_for_one, name: Pinchflat.Supervisor)
|
||||||
attach_oban_telemetry()
|
|
||||||
Logger.add_handlers(:pinchflat)
|
|
||||||
|
|
||||||
# See https://hexdocs.pm/elixir/Supervisor.html
|
|
||||||
# for other strategies and supported options
|
|
||||||
opts = [strategy: :one_for_one, name: Pinchflat.Supervisor]
|
|
||||||
Supervisor.start_link(children, opts)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Tell Phoenix to update the endpoint configuration
|
# Tell Phoenix to update the endpoint configuration
|
||||||
|
|
|
||||||
46
lib/pinchflat/boot/post_boot_startup_tasks.ex
Normal file
46
lib/pinchflat/boot/post_boot_startup_tasks.ex
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
defmodule Pinchflat.Boot.PostBootStartupTasks do
|
||||||
|
@moduledoc """
|
||||||
|
This module is responsible for running startup tasks on app boot
|
||||||
|
AFTER all other boot steps have taken place and the app is ready to serve requests.
|
||||||
|
|
||||||
|
It's a GenServer because that plays REALLY nicely with the existing
|
||||||
|
Phoenix supervision tree.
|
||||||
|
"""
|
||||||
|
|
||||||
|
alias Pinchflat.YtDlp.UpdateWorker, as: YtDlpUpdateWorker
|
||||||
|
|
||||||
|
# restart: :temporary means that this process will never be restarted (ie: will run once and then die)
|
||||||
|
use GenServer, restart: :temporary
|
||||||
|
import Ecto.Query, warn: false
|
||||||
|
|
||||||
|
def start_link(opts \\ []) do
|
||||||
|
GenServer.start_link(__MODULE__, %{env: Application.get_env(:pinchflat, :env)}, opts)
|
||||||
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Runs post-boot application startup tasks.
|
||||||
|
|
||||||
|
Any code defined here will run every time the application starts. You must
|
||||||
|
make sure that the code is idempotent and safe to run multiple times.
|
||||||
|
|
||||||
|
This is a good place to set up default settings, create initial records, stuff like that.
|
||||||
|
Should be fast - anything with the potential to be slow should be kicked off as a job instead.
|
||||||
|
"""
|
||||||
|
@impl true
|
||||||
|
def init(%{env: :test} = state) do
|
||||||
|
# Do nothing _as part of the app bootup process_.
|
||||||
|
# Since bootup calls `start_link` and that's where the `env` state is injected,
|
||||||
|
# you can still call `.init()` manually to run these tasks for testing purposes
|
||||||
|
{:ok, state}
|
||||||
|
end
|
||||||
|
|
||||||
|
def init(state) do
|
||||||
|
update_yt_dlp()
|
||||||
|
|
||||||
|
{:ok, state}
|
||||||
|
end
|
||||||
|
|
||||||
|
defp update_yt_dlp do
|
||||||
|
YtDlpUpdateWorker.kickoff()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
defmodule Pinchflat.Boot.PostJobStartupTasks do
|
defmodule Pinchflat.Boot.PostJobStartupTasks do
|
||||||
@moduledoc """
|
@moduledoc """
|
||||||
This module is responsible for running startup tasks on app boot
|
This module is responsible for running startup tasks on app boot
|
||||||
AFTER the job runner has initiallized.
|
AFTER the job runner has initialized.
|
||||||
|
|
||||||
It's a GenServer because that plays REALLY nicely with the existing
|
It's a GenServer because that plays REALLY nicely with the existing
|
||||||
Phoenix supervision tree.
|
Phoenix supervision tree.
|
||||||
|
|
@ -12,7 +12,7 @@ defmodule Pinchflat.Boot.PostJobStartupTasks do
|
||||||
import Ecto.Query, warn: false
|
import Ecto.Query, warn: false
|
||||||
|
|
||||||
def start_link(opts \\ []) do
|
def start_link(opts \\ []) do
|
||||||
GenServer.start_link(__MODULE__, %{}, opts)
|
GenServer.start_link(__MODULE__, %{env: Application.get_env(:pinchflat, :env)}, opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
|
|
@ -25,6 +25,13 @@ defmodule Pinchflat.Boot.PostJobStartupTasks do
|
||||||
Should be fast - anything with the potential to be slow should be kicked off as a job instead.
|
Should be fast - anything with the potential to be slow should be kicked off as a job instead.
|
||||||
"""
|
"""
|
||||||
@impl true
|
@impl true
|
||||||
|
def init(%{env: :test} = state) do
|
||||||
|
# Do nothing _as part of the app bootup process_.
|
||||||
|
# Since bootup calls `start_link` and that's where the `env` state is injected,
|
||||||
|
# you can still call `.init()` manually to run these tasks for testing purposes
|
||||||
|
{:ok, state}
|
||||||
|
end
|
||||||
|
|
||||||
def init(state) do
|
def init(state) do
|
||||||
# Nothing at the moment!
|
# Nothing at the moment!
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
|
||||||
alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
|
alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
|
||||||
|
|
||||||
def start_link(opts \\ []) do
|
def start_link(opts \\ []) do
|
||||||
GenServer.start_link(__MODULE__, %{}, opts)
|
GenServer.start_link(__MODULE__, %{env: Application.get_env(:pinchflat, :env)}, opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
|
|
@ -32,6 +32,13 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
|
||||||
Should be fast - anything with the potential to be slow should be kicked off as a job instead.
|
Should be fast - anything with the potential to be slow should be kicked off as a job instead.
|
||||||
"""
|
"""
|
||||||
@impl true
|
@impl true
|
||||||
|
def init(%{env: :test} = state) do
|
||||||
|
# Do nothing _as part of the app bootup process_.
|
||||||
|
# Since bootup calls `start_link` and that's where the `env` state is injected,
|
||||||
|
# you can still call `.init()` manually to run these tasks for testing purposes
|
||||||
|
{:ok, state}
|
||||||
|
end
|
||||||
|
|
||||||
def init(state) do
|
def init(state) do
|
||||||
ensure_tmpfile_directory()
|
ensure_tmpfile_directory()
|
||||||
reset_executing_jobs()
|
reset_executing_jobs()
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ defmodule Pinchflat.Profiles.MediaProfileDeletionWorker do
|
||||||
Starts the profile deletion worker. Does not attach it to a task like `kickoff_with_task/2`
|
Starts the profile deletion worker. Does not attach it to a task like `kickoff_with_task/2`
|
||||||
since deletion also cancels all tasks for the profile
|
since deletion also cancels all tasks for the profile
|
||||||
|
|
||||||
Returns {:ok, %Task{}} | {:error, %Ecto.Changeset{}}
|
Returns {:ok, %Oban.Job{}} | {:error, %Ecto.Changeset{}}
|
||||||
"""
|
"""
|
||||||
def kickoff(profile, job_args \\ %{}, job_opts \\ []) do
|
def kickoff(profile, job_args \\ %{}, job_opts \\ []) do
|
||||||
%{id: profile.id}
|
%{id: profile.id}
|
||||||
|
|
|
||||||
|
|
@ -76,6 +76,24 @@ defmodule Pinchflat.YtDlp.CommandRunner do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Updates yt-dlp to the latest version
|
||||||
|
|
||||||
|
Returns {:ok, binary()} | {:error, binary()}
|
||||||
|
"""
|
||||||
|
@impl YtDlpCommandRunner
|
||||||
|
def update do
|
||||||
|
command = backend_executable()
|
||||||
|
|
||||||
|
case CliUtils.wrap_cmd(command, ["--update"]) do
|
||||||
|
{output, 0} ->
|
||||||
|
{:ok, String.trim(output)}
|
||||||
|
|
||||||
|
{output, _} ->
|
||||||
|
{:error, output}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp generate_output_filepath(addl_opts) do
|
defp generate_output_filepath(addl_opts) do
|
||||||
case Keyword.get(addl_opts, :output_filepath) do
|
case Keyword.get(addl_opts, :output_filepath) do
|
||||||
nil -> FSUtils.generate_metadata_tmpfile(:json)
|
nil -> FSUtils.generate_metadata_tmpfile(:json)
|
||||||
|
|
|
||||||
44
lib/pinchflat/yt_dlp/update_worker.ex
Normal file
44
lib/pinchflat/yt_dlp/update_worker.ex
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
defmodule Pinchflat.YtDlp.UpdateWorker do
|
||||||
|
@moduledoc false
|
||||||
|
|
||||||
|
use Oban.Worker,
|
||||||
|
queue: :local_data,
|
||||||
|
tags: ["local_data"]
|
||||||
|
|
||||||
|
require Logger
|
||||||
|
|
||||||
|
alias __MODULE__
|
||||||
|
alias Pinchflat.Settings
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Starts the yt-dlp update worker. Does not attach it to a task like `kickoff_with_task/2`
|
||||||
|
|
||||||
|
Returns {:ok, %Oban.Job{}} | {:error, %Ecto.Changeset{}}
|
||||||
|
"""
|
||||||
|
def kickoff do
|
||||||
|
Oban.insert(UpdateWorker.new(%{}))
|
||||||
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Updates yt-dlp and saves the version to the settings.
|
||||||
|
|
||||||
|
This worker is scheduled to run via the Oban Cron plugin as well as on app boot.
|
||||||
|
|
||||||
|
Returns :ok
|
||||||
|
"""
|
||||||
|
@impl Oban.Worker
|
||||||
|
def perform(%Oban.Job{}) do
|
||||||
|
Logger.info("Updating yt-dlp")
|
||||||
|
|
||||||
|
yt_dlp_runner().update()
|
||||||
|
|
||||||
|
{:ok, yt_dlp_version} = yt_dlp_runner().version()
|
||||||
|
Settings.set(yt_dlp_version: yt_dlp_version)
|
||||||
|
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
|
||||||
|
defp yt_dlp_runner do
|
||||||
|
Application.get_env(:pinchflat, :yt_dlp_runner)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -9,4 +9,5 @@ defmodule Pinchflat.YtDlp.YtDlpCommandRunner do
|
||||||
@callback run(binary(), atom(), keyword(), binary()) :: {:ok, binary()} | {:error, binary(), integer()}
|
@callback run(binary(), atom(), keyword(), binary()) :: {:ok, binary()} | {:error, binary(), integer()}
|
||||||
@callback run(binary(), atom(), keyword(), binary(), keyword()) :: {:ok, binary()} | {:error, binary(), integer()}
|
@callback run(binary(), atom(), keyword(), binary(), keyword()) :: {:ok, binary()} | {:error, binary(), integer()}
|
||||||
@callback version() :: {:ok, binary()} | {:error, binary()}
|
@callback version() :: {:ok, binary()} | {:error, binary()}
|
||||||
|
@callback update() :: {:ok, binary()} | {:error, binary()}
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ defmodule PinchflatWeb.Endpoint do
|
||||||
plug Plug.Static,
|
plug Plug.Static,
|
||||||
at: "/",
|
at: "/",
|
||||||
from: :pinchflat,
|
from: :pinchflat,
|
||||||
gzip: Mix.env() == :prod,
|
gzip: Application.compile_env(:pinchflat, :env) == :prod,
|
||||||
only: PinchflatWeb.static_paths()
|
only: PinchflatWeb.static_paths()
|
||||||
|
|
||||||
# Code reloading can be explicitly enabled under the
|
# Code reloading can be explicitly enabled under the
|
||||||
|
|
|
||||||
16
test/pinchflat/boot/post_boot_startup_tasks_test.exs
Normal file
16
test/pinchflat/boot/post_boot_startup_tasks_test.exs
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
defmodule Pinchflat.Boot.PostBootStartupTasksTest do
|
||||||
|
use Pinchflat.DataCase
|
||||||
|
|
||||||
|
alias Pinchflat.YtDlp.UpdateWorker
|
||||||
|
alias Pinchflat.Boot.PostBootStartupTasks
|
||||||
|
|
||||||
|
describe "update_yt_dlp" do
|
||||||
|
test "enqueues an update job" do
|
||||||
|
assert [] = all_enqueued(worker: UpdateWorker)
|
||||||
|
|
||||||
|
PostBootStartupTasks.init(%{})
|
||||||
|
|
||||||
|
assert [%Oban.Job{}] = all_enqueued(worker: UpdateWorker)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -154,6 +154,14 @@ defmodule Pinchflat.YtDlp.CommandRunnerTest do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "update/0" do
|
||||||
|
test "adds the update arg" do
|
||||||
|
assert {:ok, output} = Runner.update()
|
||||||
|
|
||||||
|
assert String.contains?(output, "--update")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp wrap_executable(new_executable, fun) do
|
defp wrap_executable(new_executable, fun) do
|
||||||
Application.put_env(:pinchflat, :yt_dlp_executable, new_executable)
|
Application.put_env(:pinchflat, :yt_dlp_executable, new_executable)
|
||||||
fun.()
|
fun.()
|
||||||
|
|
|
||||||
24
test/pinchflat/yt_dlp/update_worker_test.exs
Normal file
24
test/pinchflat/yt_dlp/update_worker_test.exs
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
defmodule Pinchflat.YtDlp.UpdateWorkerTest do
|
||||||
|
use Pinchflat.DataCase
|
||||||
|
|
||||||
|
alias Pinchflat.Settings
|
||||||
|
alias Pinchflat.YtDlp.UpdateWorker
|
||||||
|
|
||||||
|
describe "perform/1" do
|
||||||
|
test "calls the yt-dlp runner to update yt-dlp" do
|
||||||
|
expect(YtDlpRunnerMock, :update, fn -> {:ok, ""} end)
|
||||||
|
expect(YtDlpRunnerMock, :version, fn -> {:ok, ""} end)
|
||||||
|
|
||||||
|
perform_job(UpdateWorker, %{})
|
||||||
|
end
|
||||||
|
|
||||||
|
test "saves the new version to the database" do
|
||||||
|
expect(YtDlpRunnerMock, :update, fn -> {:ok, ""} end)
|
||||||
|
expect(YtDlpRunnerMock, :version, fn -> {:ok, "1.2.3"} end)
|
||||||
|
|
||||||
|
perform_job(UpdateWorker, %{})
|
||||||
|
|
||||||
|
assert {:ok, "1.2.3"} = Settings.get(:yt_dlp_version)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Loading…
Reference in a new issue