Rename media sources (#25)
* Renamed MediaSource to Sources * Renamed MediaItem controller namespace
This commit is contained in:
@@ -8,7 +8,7 @@ defmodule Pinchflat.Media do
|
||||
alias Pinchflat.Repo
|
||||
alias Pinchflat.Tasks
|
||||
alias Pinchflat.Media.MediaItem
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources.Source
|
||||
|
||||
@doc """
|
||||
Returns the list of media_items. Returns [%MediaItem{}, ...].
|
||||
|
||||
@@ -7,7 +7,7 @@ defmodule Pinchflat.Media.MediaItem do
|
||||
import Ecto.Changeset
|
||||
|
||||
alias Pinchflat.Tasks.Task
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources.Source
|
||||
alias Pinchflat.Media.MediaMetadata
|
||||
alias Pinchflat.Media.MediaItemSearchIndex
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ defmodule Pinchflat.MediaClient.SourceDetails do
|
||||
it open-ish for future expansion (just in case).
|
||||
"""
|
||||
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources.Source
|
||||
alias Pinchflat.MediaClient.Backends.YtDlp.VideoCollection, as: YtDlpSource
|
||||
|
||||
@doc """
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
defmodule Pinchflat.MediaSource.Source do
|
||||
defmodule Pinchflat.Sources.Source do
|
||||
@moduledoc """
|
||||
The Source schema.
|
||||
"""
|
||||
|
||||
@@ -6,7 +6,7 @@ defmodule Pinchflat.Profiles.MediaProfile do
|
||||
use Ecto.Schema
|
||||
import Ecto.Changeset
|
||||
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources.Source
|
||||
|
||||
@allowed_fields ~w(
|
||||
name
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
defmodule Pinchflat.MediaSource do
|
||||
defmodule Pinchflat.Sources do
|
||||
@moduledoc """
|
||||
The MediaSource context.
|
||||
The Sources context.
|
||||
"""
|
||||
|
||||
import Ecto.Query, warn: false
|
||||
@@ -8,7 +8,7 @@ defmodule Pinchflat.MediaSource do
|
||||
|
||||
alias Pinchflat.Tasks
|
||||
alias Pinchflat.Tasks.SourceTasks
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources.Source
|
||||
alias Pinchflat.MediaClient.SourceDetails
|
||||
|
||||
@doc """
|
||||
@@ -8,7 +8,7 @@ defmodule Pinchflat.Tasks do
|
||||
|
||||
alias Pinchflat.Tasks.Task
|
||||
alias Pinchflat.Media.MediaItem
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources.Source
|
||||
|
||||
@doc """
|
||||
Returns the list of tasks. Returns [%Task{}, ...]
|
||||
|
||||
@@ -5,8 +5,8 @@ defmodule Pinchflat.Tasks.SourceTasks do
|
||||
|
||||
alias Pinchflat.Media
|
||||
alias Pinchflat.Tasks
|
||||
alias Pinchflat.MediaSource
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources
|
||||
alias Pinchflat.Sources.Source
|
||||
alias Pinchflat.MediaClient.SourceDetails
|
||||
alias Pinchflat.Workers.MediaIndexingWorker
|
||||
alias Pinchflat.Workers.VideoDownloadWorker
|
||||
@@ -43,7 +43,7 @@ defmodule Pinchflat.Tasks.SourceTasks do
|
||||
"""
|
||||
def index_media_items(%Source{} = source) do
|
||||
{:ok, media_attributes} = SourceDetails.get_media_attributes(source.original_url)
|
||||
MediaSource.update_source(source, %{last_indexed_at: DateTime.utc_now()})
|
||||
Sources.update_source(source, %{last_indexed_at: DateTime.utc_now()})
|
||||
|
||||
media_attributes
|
||||
|> Enum.map(fn media_attrs ->
|
||||
|
||||
@@ -7,7 +7,7 @@ defmodule Pinchflat.Tasks.Task do
|
||||
import Ecto.Changeset
|
||||
|
||||
alias Pinchflat.Media.MediaItem
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources.Source
|
||||
|
||||
schema "tasks" do
|
||||
belongs_to :job, Oban.Job
|
||||
|
||||
@@ -8,7 +8,7 @@ defmodule Pinchflat.Workers.MediaIndexingWorker do
|
||||
|
||||
alias __MODULE__
|
||||
alias Pinchflat.Tasks
|
||||
alias Pinchflat.MediaSource
|
||||
alias Pinchflat.Sources
|
||||
alias Pinchflat.Tasks.SourceTasks
|
||||
|
||||
@impl Oban.Worker
|
||||
@@ -37,7 +37,7 @@ defmodule Pinchflat.Workers.MediaIndexingWorker do
|
||||
Returns :ok | {:ok, %Task{}}
|
||||
"""
|
||||
def perform(%Oban.Job{args: %{"id" => source_id}}) do
|
||||
source = MediaSource.get_source!(source_id)
|
||||
source = Sources.get_source!(source_id)
|
||||
|
||||
if source.index_frequency_minutes <= 0 do
|
||||
:ok
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
defmodule PinchflatWeb.Media.MediaItemController do
|
||||
defmodule PinchflatWeb.MediaItems.MediaItemController do
|
||||
use PinchflatWeb, :controller
|
||||
|
||||
alias Pinchflat.Media
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
defmodule PinchflatWeb.Media.MediaItemHTML do
|
||||
defmodule PinchflatWeb.MediaItems.MediaItemHTML do
|
||||
use PinchflatWeb, :html
|
||||
|
||||
embed_templates "media_item_html/*"
|
||||
@@ -2,7 +2,7 @@ defmodule PinchflatWeb.Pages.PageController do
|
||||
use PinchflatWeb, :controller
|
||||
|
||||
alias Pinchflat.Repo
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources.Source
|
||||
alias Pinchflat.Profiles.MediaProfile
|
||||
|
||||
def home(conn, params) do
|
||||
|
||||
+13
-13
@@ -1,20 +1,20 @@
|
||||
defmodule PinchflatWeb.MediaSources.SourceController do
|
||||
defmodule PinchflatWeb.Sources.SourceController do
|
||||
use PinchflatWeb, :controller
|
||||
|
||||
alias Pinchflat.Repo
|
||||
alias Pinchflat.Media
|
||||
alias Pinchflat.Profiles
|
||||
alias Pinchflat.MediaSource
|
||||
alias Pinchflat.MediaSource.Source
|
||||
alias Pinchflat.Sources
|
||||
alias Pinchflat.Sources.Source
|
||||
|
||||
def index(conn, _params) do
|
||||
sources = Repo.preload(MediaSource.list_sources(), :media_profile)
|
||||
sources = Repo.preload(Sources.list_sources(), :media_profile)
|
||||
|
||||
render(conn, :index, sources: sources)
|
||||
end
|
||||
|
||||
def new(conn, _params) do
|
||||
changeset = MediaSource.change_source(%Source{})
|
||||
changeset = Sources.change_source(%Source{})
|
||||
|
||||
if get_session(conn, :onboarding) do
|
||||
render(conn, :new,
|
||||
@@ -28,7 +28,7 @@ defmodule PinchflatWeb.MediaSources.SourceController do
|
||||
end
|
||||
|
||||
def create(conn, %{"source" => source_params}) do
|
||||
case MediaSource.create_source(source_params) do
|
||||
case Sources.create_source(source_params) do
|
||||
{:ok, source} ->
|
||||
redirect_location =
|
||||
if get_session(conn, :onboarding), do: ~p"/?onboarding=1", else: ~p"/sources/#{source}"
|
||||
@@ -53,7 +53,7 @@ defmodule PinchflatWeb.MediaSources.SourceController do
|
||||
def show(conn, %{"id" => id}) do
|
||||
source =
|
||||
id
|
||||
|> MediaSource.get_source!()
|
||||
|> Sources.get_source!()
|
||||
|> Repo.preload(:media_profile)
|
||||
|
||||
pending_media = Media.list_pending_media_items_for(source)
|
||||
@@ -63,16 +63,16 @@ defmodule PinchflatWeb.MediaSources.SourceController do
|
||||
end
|
||||
|
||||
def edit(conn, %{"id" => id}) do
|
||||
source = MediaSource.get_source!(id)
|
||||
changeset = MediaSource.change_source(source)
|
||||
source = Sources.get_source!(id)
|
||||
changeset = Sources.change_source(source)
|
||||
|
||||
render(conn, :edit, source: source, changeset: changeset, media_profiles: media_profiles())
|
||||
end
|
||||
|
||||
def update(conn, %{"id" => id, "source" => source_params}) do
|
||||
source = MediaSource.get_source!(id)
|
||||
source = Sources.get_source!(id)
|
||||
|
||||
case MediaSource.update_source(source, source_params) do
|
||||
case Sources.update_source(source, source_params) do
|
||||
{:ok, source} ->
|
||||
conn
|
||||
|> put_flash(:info, "Source updated successfully.")
|
||||
@@ -88,8 +88,8 @@ defmodule PinchflatWeb.MediaSources.SourceController do
|
||||
end
|
||||
|
||||
def delete(conn, %{"id" => id}) do
|
||||
source = MediaSource.get_source!(id)
|
||||
{:ok, _source} = MediaSource.delete_source(source)
|
||||
source = Sources.get_source!(id)
|
||||
{:ok, _source} = Sources.delete_source(source)
|
||||
|
||||
conn
|
||||
|> put_flash(:info, "Source deleted successfully.")
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
defmodule PinchflatWeb.MediaSources.SourceHTML do
|
||||
defmodule PinchflatWeb.Sources.SourceHTML do
|
||||
use PinchflatWeb, :html
|
||||
|
||||
embed_templates "source_html/*"
|
||||
@@ -22,8 +22,8 @@ defmodule PinchflatWeb.Router do
|
||||
resources "/media_profiles", MediaProfiles.MediaProfileController
|
||||
resources "/search", Searches.SearchController, only: [:show], singleton: true
|
||||
|
||||
resources "/sources", MediaSources.SourceController do
|
||||
resources "/media", Media.MediaItemController, only: [:show, :delete]
|
||||
resources "/sources", Sources.SourceController do
|
||||
resources "/media", MediaItems.MediaItemController, only: [:show, :delete]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user