Merge branch 'master' into dependabot/hex/floki-0.36.2

.github/install-sonarr.sh

@@ -1,44 +1,51 @@
 #!/bin/bash
 
-sudo apt install gnupg ca-certificates
+# Install dependencies
+sudo apt update
+sudo apt install -y gnupg ca-certificates curl sqlite3
+
+# Add Mono repository and key
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
 sudo apt update
-sudo apt install mono-devel
+sudo apt install -y mono-devel
 
+# Setup Sonarr user and permissions
 sudo groupadd media
 sudo adduser --system --no-create-home --ingroup media sonarr
 sudo usermod -a -G media sonarr
 
-sudo chown -R sonarr:media /library/series
-sudo chmod 775 /library/series
-
+# Setup directories
 sudo mkdir -p /var/lib/sonarr
-sudo mv ${GITHUB_WORKSPACE}/dev/sonarr/config.xml /var/lib/sonarr
+sudo cp ${GITHUB_WORKSPACE}/dev/sonarr/config.xml /var/lib/sonarr
 sudo chown -R sonarr:media /var/lib/sonarr
 sudo chmod 775 /var/lib/sonarr
 
-sudo apt install curl sqlite3
+# Install Sonarr
 wget --content-disposition "https://download.sonarr.tv/v4/main/4.0.0.748/Sonarr.main.4.0.0.748.linux-x64.tar.gz"
 tar -xvzf Sonarr*.linux*.tar.gz
 sudo mv Sonarr /opt
-sudo chown sonarr:media -R /opt/Sonarr
+sudo chown -R sonarr:media /opt/Sonarr
+
+# Create and enable Sonarr service
 cat << EOF | sudo tee /etc/systemd/system/sonarr.service > /dev/null
 [Unit]
 Description=Sonarr Daemon
-After=syslog.target network.target
+After=network.target
+
 [Service]
 User=sonarr
 Group=media
+UMask=002
 Type=simple
-
-ExecStart=/usr/bin/mono --debug /opt/Sonarr/Sonarr.exe -nobrowser -data=/var/lib/sonarr
+ExecStart=/opt/Sonarr/Sonarr -nobrowser -data=/var/lib/sonarr
 TimeoutStopSec=20
 KillMode=process
 Restart=on-failure
+
 [Install]
 WantedBy=multi-user.target
 EOF
-sudo systemctl -q daemon-reload
-sudo systemctl enable --now -q sonarr
-sudo journalctl --since today -u sonarr
+
+sudo systemctl daemon-reload
+sudo systemctl enable --now sonarr

Dockerfile

@@ -15,20 +15,14 @@ ARG SECRET_KEY_BASE=""
 ENV MIX_ENV="${MIX_ENV}"
 ENV SECRET_KEY_BASE="${SECRET_KEY_BASE}"
 
-RUN MIX_ENV=$MIX_ENV
-RUN SECRET_KEY_BASE=$SECRET_KEY_BASE
-
 WORKDIR /app
 
 COPY . ./
 COPY --from=node /assets/node_modules /app/assets/node_modules/
 
 RUN \
-    echo "@latest https://dl-cdn.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories \
-    &&  echo "https://dl-cdn.alpinelinux.org/alpine/v3.11/main" >> /etc/apk/repositories \
-    &&  echo "https://dl-cdn.alpinelinux.org/alpine/v3.12/community" >> /etc/apk/repositories \
-    && echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \
-    && echo "@edge-community https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+    echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" > /etc/apk/repositories \
+    && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \
     && apk update
 
 RUN \
@@ -42,11 +36,12 @@ RUN \
         curl \
         make \
         g++ \
-        "libva-intel-driver@edge-community=2.4.1-r0" \
-        "shaderc@edge-community=2023.7-r0" \
+        libva-intel-driver \
+        shaderc \
         libdav1d \
         spirv-tools \
-        "ffmpeg@latest=6.1.1-r0" \
+        ffmpeg \
+        git \
     && \
     mix local.hex --force \
     && mix local.rebar --force \

assets/js/app.js

@@ -107,8 +107,6 @@ let liveSocket = new LiveSocket("/live", Socket, {
 
                     delete event["returnValue"]
                 })
-
-                this.pushEvent("video_played")
             },
             destroyed() {
                 window.removeEventListener("beforeunload")

config/config.exs

@@ -64,14 +64,14 @@ config :media_server, MediaServer.Repo,
   database: System.get_env("DB_DATABASE"),
   hostname: System.get_env("DB_HOSTNAME")
 
-config :web_push_elixir,
-  vapid_public_key: System.get_env("VAPID_PUBLIC_KEY"),
-  vapid_private_key: System.get_env("VAPID_PRIVATE_KEY"),
-  vapid_subject: System.get_env("VAPID_SUBJECT")
-
 config :oapi_tmdb,
   api_key: System.get_env("TMDB_API_KEY")
 
+config :media_server, Oban,
+  engine: Oban.Engines.Basic,
+  queues: [default: 10],
+  repo: MediaServer.Repo
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{config_env()}.exs"

config/test.exs

@@ -28,3 +28,5 @@ config :logger, level: :warning
 
 # Initialize plugs at runtime for faster test compilation
 config :phoenix, :plug_init_mode, :runtime
+
+config :media_server, Oban, testing: :inline

dev/sonarr/config.xml

@@ -10,6 +10,6 @@
   <UpdateMechanism>Docker</UpdateMechanism>
   <LaunchBrowser>True</LaunchBrowser>
   <Branch>main</Branch>
-  <SslCertHash></SslCertHash>
   <InstanceName>Sonarr</InstanceName>
+  <AuthenticationRequired>Enabled</AuthenticationRequired>
 </Config>

entry-local.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-curl -d "@dev/radarr/root-folder.json" -H "Content-Type:application/json" -X POST "http://radarr:7878/api/v3/rootfolder?apiKey=d031e8c9b9df4b2fab311d1c3b3fa2c5"
-curl -d "@dev/radarr/movies.json" -H "Content-Type:application/json" -X POST "http://radarr:7878/api/v3/movie/import?apiKey=d031e8c9b9df4b2fab311d1c3b3fa2c5"
+curl -d "@dev/radarr/root-folder.json" -H "Content-Type:application/json" -X POST "http://radarr-dev:7878/api/v3/rootfolder?apiKey=d031e8c9b9df4b2fab311d1c3b3fa2c5"
+curl -d "@dev/radarr/movies.json" -H "Content-Type:application/json" -X POST "http://radarr-dev:7878/api/v3/movie/import?apiKey=d031e8c9b9df4b2fab311d1c3b3fa2c5"
 
-curl -d "@dev/sonarr/root-folder.json" -H "Content-Type:application/json" -X POST "http://sonarr:8989/api/v3/rootfolder?apikey=1accda4476394bfcaddefe8c4fd77d4a"
-curl -d "@dev/sonarr/series.json" -H "Content-Type:application/json" -X POST "http://sonarr:8989/api/v3/series/import?apikey=1accda4476394bfcaddefe8c4fd77d4a"
+curl -d "@dev/sonarr/root-folder.json" -H "Content-Type:application/json" -X POST "http://sonarr-dev:8989/api/v3/rootfolder?apikey=1accda4476394bfcaddefe8c4fd77d4a"
+curl -d "@dev/sonarr/series.json" -H "Content-Type:application/json" -X POST "http://sonarr-dev:8989/api/v3/series/import?apikey=1accda4476394bfcaddefe8c4fd77d4a"
 
 mix deps.get
 

lib/media_server/accounts.ex

@@ -17,7 +17,7 @@ defmodule MediaServer.Accounts do
   def get_user!(id), do: Repo.get!(User, id)
 
   def register_user(attrs) do
-    case %User{} |> User.registration_changeset(attrs) |> Repo.insert() do
+    case %User{} |> User.registration_changeset(attrs) |> Repo.insert(on_conflict: :nothing) do
       {:ok, user} ->
         MediaServer.Accounts.generate_user_api_token(user)
 

lib/media_server/accounts/user.ex

@@ -10,10 +10,6 @@ defmodule MediaServer.Accounts.User do
     field :confirmed_at, :naive_datetime
     field :is_admin, :boolean
 
-    has_many :continues, MediaServer.Continues
-    has_many :media_actions, MediaServer.MediaActions
-    has_many :push_subscriptions, MediaServer.PushSubscriptions
-
     has_one :api_token, MediaServer.Accounts.UserToken, where: [context: "api"]
 
     timestamps()

lib/media_server/actions/add_episode.ex

@@ -0,0 +1,17 @@
+defmodule MediaServer.AddEpisode do
+  use Oban.Worker, queue: :default, max_attempts: 3
+
+  @impl true
+  @spec perform(%{:args => map(), optional(any()) => any()}) :: :ok
+  def perform(%Oban.Job{args: %{"items" => items}}) do
+    items
+    |> Enum.each(fn item ->
+      MediaServer.Episodes.insert(%{
+        series_id: item["series_id"],
+        external_id: item["external_id"]
+      })
+    end)
+
+    :ok
+  end
+end

lib/media_server/actions/add_movies.ex

@@ -0,0 +1,16 @@
+defmodule MediaServer.AddMovies do
+  use Oban.Worker, queue: :default, max_attempts: 3
+
+  @impl true
+  @spec perform(%{:args => map(), optional(any()) => any()}) :: :ok
+  def perform(%Oban.Job{args: %{"items" => items}}) do
+    items
+    |> Enum.each(fn item ->
+      MediaServer.Movies.insert(%{
+        external_id: item["external_id"]
+      })
+    end)
+
+    :ok
+  end
+end

lib/media_server/actions/add_people.ex

@@ -0,0 +1,18 @@
+defmodule MediaServer.AddPeople do
+  use Oban.Worker, queue: :default, max_attempts: 3
+
+  @impl true
+  @spec perform(%{:args => map(), optional(any()) => any()}) :: :ok
+  def perform(%Oban.Job{args: %{"items" => items}}) do
+    items
+    |> Enum.each(fn item ->
+      MediaServer.People.insert(%{
+        tmdb_id: item["tmdb_id"],
+        name: item["name"],
+        image: item["image"]
+      })
+    end)
+
+    :ok
+  end
+end

lib/media_server/actions/add_series.ex

@@ -0,0 +1,16 @@
+defmodule MediaServer.AddSeries do
+  use Oban.Worker, queue: :default, max_attempts: 3
+
+  @impl true
+  @spec perform(%{:args => map(), optional(any()) => any()}) :: :ok
+  def perform(%Oban.Job{args: %{"items" => items}}) do
+    items
+    |> Enum.each(fn item ->
+      MediaServer.Series.insert(%{
+        external_id: item["external_id"]
+      })
+    end)
+
+    :ok
+  end
+end

lib/media_server/application.ex

@@ -20,6 +20,7 @@ defmodule MediaServer.Application do
       # {MediaServer.Worker, arg}
       MediaServerWeb.Presence,
       {DynamicSupervisor, name: MediaServer.DynamicSupervisor},
+      {Oban, Application.fetch_env!(:media_server, Oban)},
       MediaServer.MoviesIndex,
       MediaServer.SeriesIndex
     ]

lib/media_server/episode_continues.ex

@@ -0,0 +1,45 @@
+defmodule MediaServer.EpisodeContinues do
+  use Ecto.Schema
+  import Ecto.Changeset
+
+  alias MediaServer.Repo
+
+  schema "episode_continues" do
+    belongs_to :episode, MediaServer.Episodes, foreign_key: :episodes_id
+    belongs_to :user, MediaServer.Accounts.User
+
+    field :current_time, :integer
+    field :duration, :integer
+
+    timestamps()
+  end
+
+  def changeset(continue, attrs) do
+    continue
+    |> cast(attrs, [:episodes_id, :current_time, :duration, :user_id])
+    |> validate_required([:episodes_id, :current_time, :duration, :user_id])
+  end
+
+  def insert_or_update(attrs) do
+    case Repo.get_by(__MODULE__, episodes_id: attrs.episodes_id, user_id: attrs.user_id) do
+      nil ->
+        %__MODULE__{
+          episodes_id: attrs.episodes_id,
+          user_id: attrs.user_id
+        }
+
+      item ->
+        item
+    end
+    |> changeset(
+      Enum.into(attrs, %{
+        updated_at: DateTime.utc_now()
+      })
+    )
+    |> Repo.insert_or_update()
+  end
+
+  def where(attrs) do
+    Repo.get_by(__MODULE__, attrs)
+  end
+end