Bumped version

* Added option for yt-dlp config file usage

* renamed yt-dlp config file

* refactored to use a precedence-based approach

* Updated README

README.md

@@ -12,14 +12,6 @@
   </sup>
 </p>
 
-<div align="center">
-
-[![](https://img.shields.io/github/license/kieraneglin/pinchflat?style=for-the-badge&color=ee512b)](LICENSE)
-[![](https://img.shields.io/github/v/release/kieraneglin/pinchflat?style=for-the-badge)](https://github.com/kieraneglin/pinchflat/releases)
-[![](https://img.shields.io/github/actions/workflow/status/kieraneglin/pinchflat/lint_and_test.yml?style=for-the-badge)](#)
-
-</div>
-
 # Your next YouTube media manager
 
 ## Table of contents:
@@ -29,7 +21,6 @@
 - [Screenshots](#screenshots)
 - [Installation](#installation)
   - [Unraid](#unraid)
-  - [Portainer](#portainer)
   - [Docker](#docker)
 - [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)
@@ -52,7 +43,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
 - 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
-- Supports serving RSS feeds to your favourite podcast app ([docs](https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds))
+- Supports serving RSS feeds to your favourite podcast app (beta - [docs](<https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds-(beta)>))
 - Automatically downloads new content from channels and playlists
   - Uses a novel approach to download new content more quickly than other apps
 - Supports downloading audio content
@@ -80,8 +71,7 @@ Simply search for Pinchflat in the Community Apps store!
 
 ### Portainer
 
-> [!IMPORTANT]  
+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.
-> 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:
 
@@ -120,19 +110,14 @@ 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.
 
-> [!IMPORTANT]
+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.
-> 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.
 
-> [!TIP]
+### Advanced: storing Pinchflat config directory on a network share
-> 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
+README: This is currently in the testing phase and not a recommended option (yet). The implications of changing this setting isn't clear and this 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. This may become the default in the future once it's been tested more thoroughly.
 
 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.
 
-> [!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.
 
 ## EFF donations
@@ -146,8 +131,3 @@ This is pre-release software and anything can break at any time. I make not guar
 ## License
 
 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

assets/js/app.js

@@ -36,17 +36,6 @@ let liveSocket = new LiveSocket('/live', Socket, {
         window.Alpine.clone(from, to)
       }
     }
-  },
-  hooks: {
-    supressEnterSubmission: {
-      mounted() {
-        this.el.addEventListener('keypress', (event) => {
-          if (event.key === 'Enter') {
-            event.preventDefault()
-          }
-        })
-      }
-    }
   }
 })
 

dev.Dockerfile

@@ -8,7 +8,7 @@ FROM ${DEV_IMAGE}
 # Install debian packages
 RUN apt-get update -qq
 RUN apt-get install -y inotify-tools ffmpeg curl git openssh-client \
-  python3 python3-pip python3-setuptools python3-wheel python3-dev locales procps
+  python3 python3-pip python3-setuptools python3-wheel python3-dev locales
 
 # Install nodejs
 RUN curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh
@@ -29,9 +29,6 @@ RUN yt-dlp -U
 # Download Apprise
 RUN python3 -m pip install -U apprise --break-system-packages
 
-# Download Mutagen for music thumbnail generation
-RUN python3 -m pip install -U mutagen --break-system-packages
-
 # Set the locale
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8

lib/pinchflat/boot/nfo_backfill_worker.ex

@@ -0,0 +1,70 @@
+defmodule Pinchflat.Boot.NfoBackfillWorker do
+  @moduledoc false
+
+  use Oban.Worker,
+    queue: :local_metadata,
+    # This should have it running once _ever_ (until the job is pruned, anyway)
+    # NOTE: remove within the next month
+    unique: [period: :infinity, states: Oban.Job.states()],
+    tags: ["media_item", "media_metadata", "local_metadata", "data_backfill"]
+
+  import Ecto.Query, warn: false
+  require Logger
+
+  alias Pinchflat.Repo
+  alias Pinchflat.Media
+  alias Pinchflat.Media.MediaItem
+  alias Pinchflat.Metadata.NfoBuilder
+  alias Pinchflat.Metadata.MetadataFileHelpers
+
+  @doc """
+  Runs a one-off backfill job to regenerate NFO files for media items that have
+  both an NFO file and a metadata file. This is needed because NFO files weren't
+  escaping characters properly so we need to regenerate them.
+
+  This job will only run once as long as I remove it before the jobs are pruned in a month.
+
+  Returns :ok
+  """
+  @impl Oban.Worker
+  def perform(%Oban.Job{}) do
+    Logger.info("Running NFO backfill worker")
+
+    media_items = get_media_items_to_backfill()
+
+    Enum.each(media_items, fn media_item ->
+      nfo_exists = File.exists?(media_item.nfo_filepath)
+      metadata_exists = File.exists?(media_item.metadata.metadata_filepath)
+
+      if nfo_exists && metadata_exists do
+        Logger.info("NFO and metadata exist for media item #{media_item.id} - proceeding")
+
+        regenerate_nfo_for_media_item(media_item)
+      end
+    end)
+
+    :ok
+  end
+
+  defp get_media_items_to_backfill do
+    from(m in MediaItem, where: not is_nil(m.nfo_filepath))
+    |> Repo.all()
+    |> Repo.preload([:metadata, source: :media_profile])
+  end
+
+  defp regenerate_nfo_for_media_item(media_item) do
+    try do
+      case MetadataFileHelpers.read_compressed_metadata(media_item.metadata.metadata_filepath) do
+        {:ok, metadata} ->
+          Media.update_media_item(media_item, %{
+            nfo_filepath: NfoBuilder.build_and_store_for_media_item(media_item.nfo_filepath, metadata)
+          })
+
+        _err ->
+          Logger.error("Failed to read metadata for media item #{media_item.id}")
+      end
+    rescue
+      e -> Logger.error("Unknown error regenerating NFO file for MI ##{media_item.id}: #{inspect(e)}")
+    end
+  end
+end

lib/pinchflat/boot/post_job_startup_tasks.ex

@@ -7,6 +7,9 @@ defmodule Pinchflat.Boot.PostJobStartupTasks do
   Phoenix supervision tree.
   """
 
+  alias Pinchflat.Repo
+  alias Pinchflat.Boot.NfoBackfillWorker
+
   # 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
@@ -26,7 +29,7 @@ defmodule Pinchflat.Boot.PostJobStartupTasks do
   """
   @impl true
   def init(state) do
-    # Nothing at the moment!
+    Repo.insert_unique_job(NfoBackfillWorker.new(%{}))
 
     {:ok, state}
   end

lib/pinchflat/downloading/download_option_builder.ex

@@ -3,7 +3,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   Builds the options for yt-dlp to download media based on the given media profile.
   """
 
-  alias Pinchflat.Sources
   alias Pinchflat.Sources.Source
   alias Pinchflat.Media.MediaItem
   alias Pinchflat.Downloading.OutputPathBuilder
@@ -31,24 +30,18 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
 
   @doc """
   Builds the output path for yt-dlp to download media based on the given source's
-  media profile. Uses the source's override output path template if it exists.
+  media profile.
 
   Returns binary()
   """
   def build_output_path_for(%Source{} = source_with_preloads) do
-    output_path_template = Sources.output_path_template(source_with_preloads)
+    output_path_template = source_with_preloads.media_profile.output_path_template
 
     build_output_path(output_path_template, source_with_preloads)
   end
 
   defp default_options do
-    [
+    [:no_progress, :windows_filenames]
-      :no_progress,
-      # Add force-overwrites to make sure redownloading works
-      :force_overwrites,
-      # This makes the date metadata conform to what jellyfin expects
-      parse_metadata: "%(upload_date>%Y-%m-%d)s:(?P<meta_date>.+)"
-    ]
   end
 
   defp subtitle_options(media_profile) do
@@ -111,18 +104,16 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   end
 
   defp quality_options(media_profile) do
-    video_codec_option = fn res ->
+    video_codec_options = "+codec:avc:m4a"
-      [format_sort: "res:#{res},+codec:avc:m4a", remux_video: "mp4"]
-    end
 
     case media_profile.preferred_resolution do
       # Also be aware that :audio disabled all embedding options for subtitles
       :audio -> [:extract_audio, format: "bestaudio[ext=m4a]"]
-      :"360p" -> video_codec_option.("360")
+      :"360p" -> [format_sort: "res:360,#{video_codec_options}"]
-      :"480p" -> video_codec_option.("480")
+      :"480p" -> [format_sort: "res:480,#{video_codec_options}"]
-      :"720p" -> video_codec_option.("720")
+      :"720p" -> [format_sort: "res:720,#{video_codec_options}"]
-      :"1080p" -> video_codec_option.("1080")
+      :"1080p" -> [format_sort: "res:1080,#{video_codec_options}"]
-      :"2160p" -> video_codec_option.("2160")
+      :"2160p" -> [format_sort: "res:2160,#{video_codec_options}"]
     end
   end
 
@@ -192,7 +183,7 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   # It's dependent on the output_path_template being a string ending `.{{ ext }}`
   # (or equivalent), but that's validated by the MediaProfile schema.
   defp determine_thumbnail_location(media_item_with_preloads) do
-    output_path_template = Sources.output_path_template(media_item_with_preloads.source)
+    output_path_template = media_item_with_preloads.source.media_profile.output_path_template
 
     output_path_template
     |> String.split(~r{\.}, include_captures: true)

lib/pinchflat/downloading/downloading_helpers.ex

@@ -7,11 +7,9 @@ defmodule Pinchflat.Downloading.DownloadingHelpers do
 
   require Logger
 
-  alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
-  alias Pinchflat.Media.MediaItem
   alias Pinchflat.Downloading.MediaDownloadWorker
 
   @doc """
@@ -45,23 +43,4 @@ defmodule Pinchflat.Downloading.DownloadingHelpers do
     |> Media.list_pending_media_items_for()
     |> Enum.each(&Tasks.delete_pending_tasks_for/1)
   end
-
-  @doc """
-  Takes a single media item and enqueues a download job if the media should be
-  downloaded, based on the source's download settings and whether media is
-  considered pending.
-
-  Returns {:ok, %Task{}} | {:error, :should_not_download} | {:error, any()}
-  """
-  def kickoff_download_if_pending(%MediaItem{} = media_item) do
-    media_item = Repo.preload(media_item, :source)
-
-    if media_item.source.download_media && Media.pending_download?(media_item) do
-      Logger.info("Kicking off download for media item ##{media_item.id} (#{media_item.media_id})")
-
-      MediaDownloadWorker.kickoff_with_task(media_item)
-    else
-      {:error, :should_not_download}
-    end
-  end
 end

lib/pinchflat/fast_indexing/fast_indexing_helpers.ex

@@ -5,45 +5,64 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
   Many of these methods are made to be kickoff or be consumed by workers.
   """
 
-  require Logger
-
   alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Sources.Source
   alias Pinchflat.Media.MediaQuery
   alias Pinchflat.FastIndexing.YoutubeRss
-  alias Pinchflat.Downloading.DownloadingHelpers
+  alias Pinchflat.Downloading.MediaDownloadWorker
+  alias Pinchflat.FastIndexing.MediaIndexingWorker
 
   alias Pinchflat.YtDlp.Media, as: YtDlpMedia
 
   @doc """
-  Fetches new media IDs from a source's YouTube RSS feed, indexes them, and kicks off downloading
+  Fetches new media IDs from a source's YouTube RSS feed and kicks off indexing tasks
-  tasks for any pending media items. See comments in `FastIndexingWorker` for more info on the
+  for any new media items. See comments in `MediaIndexingWorker` for more info on the
   order of operations and how this fits into the indexing process.
 
-  Returns [%MediaItem{}] where each item is a new media item that was created _but not necessarily
+  Despite the similar name to `kickoff_fast_indexing_task`, this does work differently.
-  downloaded_.
+  `kickoff_fast_indexing_task` starts a task that _calls_ this function whereas this
+  function starts individual indexing tasks for each new media item. I think it does
+  make sense grammatically, but I could see how that's confusing.
+
+  Returns [binary()] where each binary is the media ID of a new media item.
   """
-  def kickoff_download_tasks_from_youtube_rss_feed(%Source{} = source) do
+  def kickoff_indexing_tasks_from_youtube_rss_feed(%Source{} = source) do
     {:ok, media_ids} = YoutubeRss.get_recent_media_ids_from_rss(source)
     existing_media_items = list_media_items_by_media_id_for(source, media_ids)
     new_media_ids = media_ids -- Enum.map(existing_media_items, & &1.media_id)
 
-    maybe_new_media_items =
+    Enum.each(new_media_ids, fn media_id ->
-      Enum.map(new_media_ids, fn media_id ->
+      url = "https://www.youtube.com/watch?v=#{media_id}"
-        case create_media_item_from_media_id(source, media_id) do
-          {:ok, media_item} ->
-            media_item
 
-          err ->
+      MediaIndexingWorker.kickoff_with_task(source, url)
-            Logger.error("Error creating media item '#{media_id}' from URL: #{inspect(err)}")
-            nil
-        end
     end)
 
-    DownloadingHelpers.enqueue_pending_download_tasks(source)
+    new_media_ids
+  end
 
-    Enum.filter(maybe_new_media_items, & &1)
+  @doc """
+  Indexes a single media item for a source and enqueues a download job if the
+  media should be downloaded. This method creates the media item record so it's
+  the one-stop-shop for adding a media item (and possibly downloading it) just
+  by a URL and source.
+
+  Returns {:ok, media_item} | {:error, any()}
+  """
+  def index_and_enqueue_download_for_media_item(%Source{} = source, url) do
+    maybe_media_item = create_media_item_from_url(source, url)
+
+    case maybe_media_item do
+      {:ok, media_item} ->
+        if source.download_media && Media.pending_download?(media_item) do
+          MediaDownloadWorker.kickoff_with_task(media_item)
+        end
+
+        {:ok, media_item}
+
+      err ->
+        err
+    end
   end
 
   defp list_media_items_by_media_id_for(source, media_ids) do
@@ -53,15 +72,9 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
     |> Repo.all()
   end
 
-  defp create_media_item_from_media_id(source, media_id) do
+  defp create_media_item_from_url(source, url) do
-    url = "https://www.youtube.com/watch?v=#{media_id}"
+    {:ok, media_attrs} = YtDlpMedia.get_media_attributes(url)
 
-    case YtDlpMedia.get_media_attributes(url) do
-      {:ok, media_attrs} ->
     Media.create_media_item_from_backend_attrs(source, media_attrs)
-
-      err ->
-        err
-    end
   end
 end

lib/pinchflat/fast_indexing/fast_indexing_worker.ex

@@ -10,7 +10,6 @@ defmodule Pinchflat.FastIndexing.FastIndexingWorker do
 
   alias __MODULE__
   alias Pinchflat.Tasks
-  alias Pinchflat.Media
   alias Pinchflat.Sources
   alias Pinchflat.Settings
   alias Pinchflat.Sources.Source
@@ -29,21 +28,9 @@ defmodule Pinchflat.FastIndexing.FastIndexingWorker do
   end
 
   @doc """
-  Similar to `MediaCollectionIndexingWorker`, but for working with RSS feeds.
+  Kicks off the fast indexing process for a source, reschedules the job to run again
-  `MediaCollectionIndexingWorker` should be preferred in general, but this is
+  once complete. See `MediaCollectionIndexingWorker` and `MediaIndexingWorker` comments
-  useful for downloading small batches of media items via fast indexing.
+  for more
-
-  Only kicks off downloads for media that _should_ be downloaded
-  (ie: the source is set to download and the media matches the profile's format preferences)
-
-  Order of operations:
-    1. FastIndexingWorker (this module) periodically checks the YouTube RSS feed for new media.
-       with `FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed`
-    2. If the above `kickoff_download_tasks_from_youtube_rss_feed` finds new media items in the RSS feed,
-       it indexes them with a yt-dlp call to create the media item records then kicks off downloading
-       tasks (MediaDownloadWorker) for any new media items _that should be downloaded_.
-    3. Once downloads are kicked off, this worker sends a notification to the apprise server if applicable
-       then reschedules itself to run again in the future.
 
   Returns :ok | {:ok, :job_exists} | {:ok, %Task{}}
   """
@@ -52,7 +39,7 @@ defmodule Pinchflat.FastIndexing.FastIndexingWorker do
     source = Sources.get_source!(source_id)
 
     if source.fast_index do
-      perform_indexing_and_send_notification(source)
+      perform_indexing_and_notification(source)
       reschedule_indexing(source)
     else
       :ok
@@ -62,18 +49,12 @@ defmodule Pinchflat.FastIndexing.FastIndexingWorker do
     Ecto.StaleEntryError -> Logger.info("#{__MODULE__} discarded: source #{source_id} stale")
   end
 
-  defp perform_indexing_and_send_notification(source) do
+  defp perform_indexing_and_notification(source) do
     apprise_server = Settings.get!(:apprise_server)
+    new_media_items = FastIndexingHelpers.kickoff_indexing_tasks_from_youtube_rss_feed(source)
 
-    new_media_items =
-      source
-      |> FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed()
-      |> Enum.filter(&Media.pending_download?(&1))
-
-    if source.download_media do
     SourceNotifications.send_new_media_notification(apprise_server, source, length(new_media_items))
   end
-  end
 
   defp reschedule_indexing(source) do
     next_run_in = Source.fast_index_frequency() * 60

lib/pinchflat/fast_indexing/media_indexing_worker.ex

@@ -0,0 +1,69 @@
+defmodule Pinchflat.FastIndexing.MediaIndexingWorker do
+  @moduledoc false
+
+  use Oban.Worker,
+    queue: :media_indexing,
+    unique: [period: :infinity, states: [:available, :scheduled, :retryable]],
+    tags: ["media_source", "media_indexing"]
+
+  require Logger
+
+  alias __MODULE__
+  alias Pinchflat.Tasks
+  alias Pinchflat.Sources
+  alias Pinchflat.FastIndexing.FastIndexingHelpers
+
+  @doc """
+  Starts the fast media indexing worker and creates a task for the source.
+
+  Returns {:ok, %Task{}} | {:error, :duplicate_job} | {:error, %Ecto.Changeset{}}
+  """
+  def kickoff_with_task(source, media_url, opts \\ []) do
+    %{id: source.id, media_url: media_url}
+    |> MediaIndexingWorker.new(opts)
+    |> Tasks.create_job_with_task(source)
+  end
+
+  @doc """
+  Similar to `MediaCollectionIndexingWorker`, but for individual media items.
+  Does not reschedule or check anything to do with a source's indexing
+  frequency - only collects initial metadata then kicks off a download.
+  `MediaCollectionIndexingWorker` should be preferred in general, but this is
+  useful for downloading one-off media items based on a URL (like for fast indexing).
+
+  Only downloads media that _should_ be downloaded (ie: the source is set to download
+  and the media matches the profile's format preferences)
+
+  Order of operations:
+    1. FastIndexingHelpers.kickoff_indexing_tasks_from_youtube_rss_feed/1 (which is running
+       in its own worker) periodically checks the YouTube RSS feed for new media
+    2. If new media is found, it enqueues a MediaIndexingWorker (this module) for each new media
+       item
+    3. This worker fetches the media metadata and uses that to determine if it should be
+       downloaded. If so, it enqueues a MediaDownloadWorker
+
+  Each is a worker because they all either need to be scheduled periodically or call out to
+  an external service and will be long-running. They're split into different jobs to separate
+  retry logic for each step and allow us to better optimize various queues (eg: the indexing
+  steps can keep running while the slow download steps are worked through).
+
+  Returns :ok
+  """
+  @impl Oban.Worker
+  def perform(%Oban.Job{args: %{"id" => source_id, "media_url" => media_url}}) do
+    source = Sources.get_source!(source_id)
+
+    case FastIndexingHelpers.index_and_enqueue_download_for_media_item(source, media_url) do
+      {:ok, media_item} ->
+        Logger.debug("Indexed and enqueued download for url: #{media_url} (media item: #{media_item.id})")
+
+      {:error, reason} ->
+        Logger.debug("Failed to index and enqueue download for url: #{media_url} (reason: #{inspect(reason)})")
+    end
+
+    :ok
+  rescue
+    Ecto.NoResultsError -> Logger.info("#{__MODULE__} discarded: source #{source_id} not found")
+    Ecto.StaleEntryError -> Logger.info("#{__MODULE__} discarded: source #{source_id} stale")
+  end
+end

lib/pinchflat/metadata/metadata_file_helpers.ex

@@ -54,18 +54,11 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
 
   @doc """
   Downloads and stores a thumbnail for a media item, returning the filepath.
-  Chooses the highest quality jpg thumbnail available.
 
   Returns binary()
   """
   def download_and_store_thumbnail_for(database_record, metadata_map) do
-    thumbnail_url =
+    thumbnail_url = metadata_map["thumbnail"]
-      metadata_map["thumbnails"]
-      |> Enum.filter(&(&1["preference"] && String.ends_with?(&1["url"], ".jpg")))
-      |> Enum.sort(&(&1["preference"] >= &2["preference"]))
-      |> List.first()
-      |> Map.get("url")
-
     filepath = generate_filepath_for(database_record, Path.basename(thumbnail_url))
     thumbnail_blob = fetch_thumbnail_from_url(thumbnail_url)
 

lib/pinchflat/metadata/source_metadata_storage_worker.ex

@@ -38,9 +38,9 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
     - The NFO file for the source (if specified)
     - Downloads and stores source images (if specified)
 
-  The worker is kicked off after a source is inserted or it's original_url
+  The worker is kicked off after a source is inserted/updated - this can
-  is updated - this can take an unknown amount of time so don't rely on this
+  take an unknown amount of time so don't rely on this data being here
-  data being here before, say, the first indexing or downloading task is complete.
+  before, say, the first indexing or downloading task is complete.
 
   Returns :ok
   """

lib/pinchflat/notifications/command_runner.ex

@@ -28,7 +28,8 @@ defmodule Pinchflat.Notifications.CommandRunner do
     default_opts = [:verbose]
     parsed_opts = CliUtils.parse_options(default_opts ++ command_opts)
 
-    {output, return_code} = CliUtils.wrap_cmd(backend_executable(), parsed_opts ++ endpoints)
+    Logger.info("[apprise] called with: #{Enum.join(parsed_opts ++ endpoints, " ")}")
+    {output, return_code} = System.cmd(backend_executable(), parsed_opts ++ endpoints)
     Logger.info("[apprise] response: #{output}")
 
     case return_code do
@@ -44,7 +45,7 @@ defmodule Pinchflat.Notifications.CommandRunner do
   """
   @impl AppriseCommandRunner
   def version do
-    case CliUtils.wrap_cmd(backend_executable(), ["--version"]) do
+    case System.cmd(backend_executable(), ["--version"]) do
       {output, 0} ->
         output
         |> String.split(~r{\r?\n})

lib/pinchflat/profiles/media_profile.ex

@@ -80,8 +80,7 @@ defmodule Pinchflat.Profiles.MediaProfile do
     |> unique_constraint(:name)
   end
 
-  @doc false
+  defp ext_regex do
-  def ext_regex do
     ~r/\.({{ ?ext ?}}|%\( ?ext ?\)[sS])$/
   end
 end

lib/pinchflat/slow_indexing/media_collection_indexing_worker.ex

@@ -61,8 +61,9 @@ defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorker do
     5. If the source uses fast indexing, that job is kicked off as well. It
        uses RSS to run a smaller, faster, and more frequent index. That job
        handles rescheduling itself but largely has a similar behaviour to this
-       job in that it runs and index and maybe kicks off media download jobs.
+       job in that it kicks off index and maybe download jobs. The biggest difference
-       Check out `FastIndexingWorker` comments for more.
+       is that an index job is kicked off _for each new media item_ as opposed
+       to one larger index job. Check out `MediaIndexingWorker` comments for more.
     6. If the job reschedules, the cycle from step 3 repeats until the heat death
        of the universe. The user changing things like the index frequency can
        dequeue or reschedule jobs as well

lib/pinchflat/slow_indexing/slow_indexing_helpers.ex

@@ -16,6 +16,7 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   alias Pinchflat.YtDlp.MediaCollection
   alias Pinchflat.Downloading.DownloadingHelpers
   alias Pinchflat.SlowIndexing.FileFollowerServer
+  alias Pinchflat.Downloading.MediaDownloadWorker
   alias Pinchflat.SlowIndexing.MediaCollectionIndexingWorker
 
   alias Pinchflat.YtDlp.Media, as: YtDlpMedia
@@ -28,6 +29,7 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   """
   def kickoff_indexing_task(%Source{} = source, job_args \\ %{}, job_opts \\ []) do
     Tasks.delete_pending_tasks_for(source, "FastIndexingWorker")
+    Tasks.delete_pending_tasks_for(source, "MediaIndexingWorker")
     Tasks.delete_pending_tasks_for(source, "MediaCollectionIndexingWorker")
 
     MediaCollectionIndexingWorker.kickoff_with_task(source, job_args, job_opts)
@@ -125,7 +127,11 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
 
     case Media.create_media_item_from_backend_attrs(source, media_attrs) do
       {:ok, %MediaItem{} = media_item} ->
-        DownloadingHelpers.kickoff_download_if_pending(media_item)
+        if source.download_media && Media.pending_download?(media_item) do
+          Logger.debug("FileFollowerServer Handler: Enqueuing download task for #{inspect(media_attrs)}")
+
+          MediaDownloadWorker.kickoff_with_task(media_item)
+        end
 
       {:error, changeset} ->
         changeset

lib/pinchflat/sources/source.ex

@@ -32,7 +32,6 @@ defmodule Pinchflat.Sources.Source do
     retention_period_days
     title_filter_regex
     media_profile_id
-    output_path_template_override
   )a
 
   # Expensive API calls are made when a source is inserted/updated so
@@ -77,7 +76,6 @@ defmodule Pinchflat.Sources.Source do
     field :retention_period_days, :integer
     field :original_url, :string
     field :title_filter_regex, :string
-    field :output_path_template_override, :string
 
     field :series_directory, :string
     field :nfo_filepath, :string
@@ -111,8 +109,6 @@ defmodule Pinchflat.Sources.Source do
     |> dynamic_default(:uuid, fn _ -> Ecto.UUID.generate() end)
     |> validate_required(required_fields)
     |> validate_number(:retention_period_days, greater_than_or_equal_to: 0)
-    # Ensures it ends with `.{{ ext }}` or `.%(ext)s` or similar (with a little wiggle room)
-    |> validate_format(:output_path_template_override, MediaProfile.ext_regex(), message: "must end with .{{ ext }}")
     |> cast_assoc(:metadata, with: &SourceMetadata.changeset/2, required: false)
     |> unique_constraint([:collection_id, :media_profile_id, :title_filter_regex], error_key: :original_url)
   end

lib/pinchflat/sources/sources.ex

@@ -19,19 +19,6 @@ defmodule Pinchflat.Sources do
   alias Pinchflat.SlowIndexing.SlowIndexingHelpers
   alias Pinchflat.Metadata.SourceMetadataStorageWorker
 
-  @doc """
-  Returns the relevant output path template for a source.
-  Pulls from the source's override if present, otherwise uses the media profile's.
-
-  Returns binary()
-  """
-  def output_path_template(source) do
-    source = Repo.preload(source, :media_profile)
-    media_profile = source.media_profile
-
-    source.output_path_template_override || media_profile.output_path_template
-  end
-
   @doc """
   Returns the list of sources. Returns [%Source{}, ...]
   """
@@ -237,7 +224,7 @@ defmodule Pinchflat.Sources do
         if run_post_commit_tasks do
           maybe_handle_media_tasks(changeset, source)
           maybe_run_indexing_task(changeset, source)
-          maybe_run_metadata_storage_task(changeset, source)
+          run_metadata_storage_task(source)
         end
 
         {:ok, source}
@@ -276,20 +263,9 @@ defmodule Pinchflat.Sources do
     end
   end
 
-  defp maybe_run_metadata_storage_task(changeset, source) do
+  # This runs every time to pick up any changes to the metadata
-    case {changeset.data, changeset.changes} do
+  defp run_metadata_storage_task(source) do
-      # 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
 
   defp maybe_update_slow_indexing_task(changeset, source) do
@@ -299,6 +275,7 @@ defmodule Pinchflat.Sources do
 
       %{index_frequency_minutes: _} ->
         Tasks.delete_pending_tasks_for(source, "FastIndexingWorker")
+        Tasks.delete_pending_tasks_for(source, "MediaIndexingWorker")
         Tasks.delete_pending_tasks_for(source, "MediaCollectionIndexingWorker")
 
       _ ->

lib/pinchflat/utils/cli_utils.ex

@@ -3,29 +3,8 @@ defmodule Pinchflat.Utils.CliUtils do
   Utility methods for working with CLI executables
   """
 
-  require Logger
-
   alias Pinchflat.Utils.StringUtils
 
-  @doc """
-  Wraps a command in a shell script that will terminate
-  the command if stdin is closed. Useful for stopping
-  commands if the job runner is cancelled.
-
-  Delegates to `System.cmd/3` and any options/output
-  are passed through.
-
-  Returns {binary(), integer()}
-  """
-  def wrap_cmd(command, args, opts \\ []) do
-    wrapper_command = Path.join(:code.priv_dir(:pinchflat), "cmd_wrapper.sh")
-    actual_command = [command] ++ args
-
-    Logger.info("[command_wrapper]: #{command} called with: #{Enum.join(args, " ")}")
-
-    System.cmd(wrapper_command, actual_command, opts)
-  end
-
   @doc """
   Parses a list of command options into a list of strings suitable for passing to
   `System.cmd/3`.

lib/pinchflat/utils/number_utils.ex

@@ -1,16 +0,0 @@
-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

lib/pinchflat/yt_dlp/command_runner.ex

@@ -3,6 +3,8 @@ defmodule Pinchflat.YtDlp.CommandRunner do
   Runs yt-dlp commands using the `System.cmd/3` function
   """
 
+  require Logger
+
   alias Pinchflat.Utils.CliUtils
   alias Pinchflat.YtDlp.YtDlpCommandRunner
   alias Pinchflat.Utils.FilesystemUtils, as: FSUtils
@@ -28,12 +30,14 @@ defmodule Pinchflat.YtDlp.CommandRunner do
 
     output_filepath = generate_output_filepath(addl_opts)
     print_to_file_opts = [{:print_to_file, output_template}, output_filepath]
-    user_configured_opts = cookie_file_options() ++ global_options()
+    external_file_opts = build_external_file_options()
     # 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 ++ external_file_opts
-    formatted_command_opts = [url] ++ CliUtils.parse_options(all_opts)
 
-    case CliUtils.wrap_cmd(command, formatted_command_opts, stderr_to_stdout: true) do
+    formatted_command_opts = [url] ++ CliUtils.parse_options(all_opts)
+    Logger.info("[yt-dlp] called with: #{Enum.join(formatted_command_opts, " ")}")
+
+    case System.cmd(command, formatted_command_opts, stderr_to_stdout: true) do
       {_, 0} ->
         # IDEA: consider deleting the file after reading it. It's in the tmp dir, so it's not
         # a huge deal, but it's still a good idea to clean up after ourselves.
@@ -54,7 +58,7 @@ defmodule Pinchflat.YtDlp.CommandRunner do
   def version do
     command = backend_executable()
 
-    case CliUtils.wrap_cmd(command, ["--version"]) do
+    case System.cmd(command, ["--version"]) do
       {output, 0} ->
         {:ok, String.trim(output)}
 
@@ -70,11 +74,7 @@ defmodule Pinchflat.YtDlp.CommandRunner do
     end
   end
 
-  defp global_options do
+  defp build_external_file_options do
-    [:windows_filenames]
-  end
-
-  defp cookie_file_options do
     base_dir = Application.get_env(:pinchflat, :extras_directory)
     filename_options_map = %{cookies: "cookies.txt"}
 

lib/pinchflat/yt_dlp/media.ex

@@ -63,8 +63,8 @@ defmodule Pinchflat.YtDlp.Media do
         |> response_to_struct()
         |> FunctionUtils.wrap_ok()
 
-      err ->
+      res ->
-        err
+        res
     end
   end
 

lib/pinchflat/yt_dlp/media_collection.ex

@@ -50,8 +50,8 @@ defmodule Pinchflat.YtDlp.MediaCollection do
 
         {:ok, Enum.filter(parsed_lines, &(&1 != nil))}
 
-      err ->
+      res ->
-        err
+        res
     end
   end
 
@@ -68,14 +68,7 @@ defmodule Pinchflat.YtDlp.MediaCollection do
     # `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
     # available formats since we're just getting the source details
-    default_opts = [
+    command_opts = [:simulate, :skip_download, :ignore_no_formats_error, playlist_end: 1] ++ addl_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"
 
     with {:ok, output} <- backend_runner().run(source_url, command_opts, output_template),

lib/pinchflat_web/components/core_components.ex

@@ -19,6 +19,7 @@ defmodule PinchflatWeb.CoreComponents do
   import PinchflatWeb.Gettext
 
   alias Phoenix.LiveView.JS
+  alias PinchflatWeb.CustomComponents.TextComponents
 
   @doc """
   Renders a modal.
@@ -637,11 +638,9 @@ defmodule PinchflatWeb.CoreComponents do
 
     ~H"""
     <ul>
-      <li :for={{k, v} <- @iterable_attributes} class="mb-2 w-2/3">
+      <li :for={{k, v} <- @iterable_attributes} class="mb-2">
         <strong><%= k %>:</strong>
-        <code class="inline-block text-sm font-mono text-gray p-0.5 mx-0.5">
+        <TextComponents.inline_code><%= v %></TextComponents.inline_code>
-          <%= v %>
-        </code>
       </li>
     </ul>
     """

lib/pinchflat_web/components/custom_components/table_components.ex

@@ -2,8 +2,6 @@ defmodule PinchflatWeb.CustomComponents.TableComponents do
   @moduledoc false
   use Phoenix.Component
 
-  alias PinchflatWeb.CoreComponents
-
   @doc """
   Renders a table component with the given rows and columns.
 
@@ -52,52 +50,4 @@ defmodule PinchflatWeb.CustomComponents.TableComponents do
     </table>
     """
   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

lib/pinchflat_web/components/custom_components/text_components.ex

@@ -35,12 +35,11 @@ defmodule PinchflatWeb.CustomComponents.TextComponents do
   Renders a subtle link with the given href and content.
   """
   attr :href, :string, required: true
-  attr :target, :string, default: "_self"
   slot :inner_block
 
   def subtle_link(assigns) do
     ~H"""
-    <.link href={@href} target={@target} class="underline decoration-bodydark decoration-1 hover:decoration-white">
+    <.link href={@href} class="underline decoration-bodydark decoration-1 hover:decoration-white">
       <%= render_slot(@inner_block) %>
     </.link>
     """
@@ -60,22 +59,4 @@ defmodule PinchflatWeb.CustomComponents.TextComponents do
     </.link>
     """
   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

lib/pinchflat_web/components/layouts/partials/upgrade_button_live.ex

@@ -3,11 +3,10 @@ defmodule Pinchflat.UpgradeButtonLive do
 
   def render(assigns) do
     ~H"""
-    <form id="upgradeForm" phx-change="check_matching_text" phx-hook="supressEnterSubmission">
+    <form phx-change="check_matching_text">
       <.input type="text" name="unlock-pro-textbox" value="" />
     </form>
 
-    <%!-- The setTimeout is so the modal has time to disappear before it's removed --%>
     <.button
       class="w-full mt-4"
       type="button"

lib/pinchflat_web/controllers/media_items/media_item_controller.ex

@@ -50,13 +50,7 @@ defmodule PinchflatWeb.MediaItems.MediaItemController do
 
   def force_download(conn, %{"media_item_id" => id}) do
     media_item = Media.get_media_item!(id)
-
+    {:ok, _} = MediaDownloadWorker.kickoff_with_task(media_item, %{force: true})
-    :ok =
-      case MediaDownloadWorker.kickoff_with_task(media_item, %{force: true}) do
-        {:ok, _} -> :ok
-        {:error, :duplicate_job} -> :ok
-        err -> err
-      end
 
     conn
     |> put_flash(:info, "Download task enqueued.")

lib/pinchflat_web/controllers/media_items/media_item_html/media_preview.heex

@@ -1,12 +1,12 @@
 <%= if media_type(@media_item) == :video do %>
-  <video controls class="max-h-96 w-full">
+  <video controls class="max-h-96 w-full lg:w-2/3 xl:w-1/2">
     <source src={~p"/media/#{@media_item.uuid}/stream"} type="video/mp4" />
     Your browser does not support the video element.
   </video>
 <% end %>
 
 <%= if media_type(@media_item) == :audio do %>
-  <audio controls class="w-full">
+  <audio controls class="w-full lg:w-2/3 xl:w-1/2">
     <source src={~p"/media/#{@media_item.uuid}/stream"} type="audio/mpeg" />
     Your browser does not support the audio element.
   </audio>

lib/pinchflat_web/controllers/media_items/media_item_html/show.html.heex

@@ -23,33 +23,23 @@
         <.actions_dropdown media_item={@media_item} />
       </:tab_append>
 
-      <:tab title="Media">
+      <:tab title="Attributes">
         <div class="flex flex-col gap-10 dark:text-white">
           <%= if media_file_exists?(@media_item) do %>
-            <section class="grid grid-cols-1 xl:grid-cols-2 xl:gap-6 mt-6">
+            <h3 class="font-bold text-xl">Preview</h3>
-              <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 %>
 
-          <h3 class="font-bold text-xl mt-6">Raw Attributes</h3>
+          <h2 class="font-bold text-2xl"><%= @media_item.title %></h2>
+          <h3 class="font-bold text-xl">Attributes</h3>
           <section>
             <strong>Source:</strong>
             <.subtle_link href={~p"/sources/#{@media_item.source_id}"}>
               <%= @media_item.source.custom_name %>
             </.subtle_link>
-            <.list_items_from_map map={Map.from_struct(@media_item)} />
           </section>
+
+          <.list_items_from_map map={Map.from_struct(@media_item)} />
         </div>
       </:tab>
       <:tab title="Tasks">

lib/pinchflat_web/controllers/media_profiles/media_profile_html/show.html.heex

@@ -43,9 +43,9 @@
         </.button_dropdown>
       </:tab_append>
 
-      <:tab title="Media Profile">
+      <:tab title="Attributes">
         <div class="flex flex-col gap-10 text-white">
-          <h3 class="font-bold text-xl mt-6">Raw Attributes</h3>
+          <h3 class="font-bold text-xl">Attributes for "<%= @media_profile.name %>"</h3>
           <.list_items_from_map map={Map.from_struct(@media_profile)} />
         </div>
       </:tab>

lib/pinchflat_web/controllers/pages/page_html/home.html.heex

@@ -16,12 +16,12 @@
     </a>
   </div>
   <div class="rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
-    <span class="mt-4 flex flex-col items-center justify-center">
+    <a href="#" class="mt-4 flex flex-col items-center justify-center">
       <span class="text-md font-medium">Media Item(s)</span>
       <h4 class="text-title-md font-bold text-white">
         <%= @media_item_count %>
       </h4>
-    </span>
+    </a>
   </div>
   <span class="text-strokedark">I know this page isn't super useful yet, but give it time :&rpar;</span>
 </div>

lib/pinchflat_web/controllers/sources/source_controller.ex

@@ -6,11 +6,12 @@ defmodule PinchflatWeb.Sources.SourceController do
   alias Pinchflat.Repo
   alias Pinchflat.Tasks
   alias Pinchflat.Sources
+  alias Pinchflat.MediaQuery
   alias Pinchflat.Sources.Source
+  alias Pinchflat.Media.MediaQuery
   alias Pinchflat.Profiles.MediaProfile
   alias Pinchflat.Downloading.DownloadingHelpers
   alias Pinchflat.SlowIndexing.SlowIndexingHelpers
-  alias Pinchflat.Metadata.SourceMetadataStorageWorker
 
   def index(conn, _params) do
     sources =
@@ -59,7 +60,29 @@ defmodule PinchflatWeb.Sources.SourceController do
       |> Tasks.list_tasks_for(nil, [:executing, :available, :scheduled, :retryable])
       |> Repo.preload(:job)
 
-    render(conn, :show, source: source, pending_tasks: pending_tasks)
+    pending_media =
+      MediaQuery.new()
+      |> MediaQuery.for_source(source)
+      |> MediaQuery.where_pending_download()
+      |> order_by(desc: :id)
+      |> limit(100)
+      |> Repo.all()
+
+    downloaded_media =
+      MediaQuery.new()
+      |> MediaQuery.for_source(source)
+      |> MediaQuery.with_media_filepath()
+      |> order_by(desc: :id)
+      |> limit(100)
+      |> Repo.all()
+
+    render(conn, :show,
+      source: source,
+      pending_tasks: pending_tasks,
+      pending_media: pending_media,
+      downloaded_media: downloaded_media,
+      total_downloaded: total_downloaded_for(source)
+    )
   end
 
   def edit(conn, %{"id" => id}) do
@@ -105,38 +128,20 @@ defmodule PinchflatWeb.Sources.SourceController do
   end
 
   def force_download(conn, %{"source_id" => id}) do
-    wrap_forced_action(
+    source = Sources.get_source!(id)
-      conn,
+    DownloadingHelpers.enqueue_pending_download_tasks(source)
-      id,
+
-      "Forcing download of pending media items.",
+    conn
-      &DownloadingHelpers.enqueue_pending_download_tasks/1
+    |> put_flash(:info, "Forced download of pending media items.")
-    )
+    |> redirect(to: ~p"/sources/#{source}")
   end
 
   def force_index(conn, %{"source_id" => id}) do
-    wrap_forced_action(
+    source = Sources.get_source!(id)
-      conn,
+    SlowIndexingHelpers.kickoff_indexing_task(source, %{force: true})
-      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
-    |> put_flash(:info, message)
+    |> put_flash(:info, "Index enqueued.")
     |> redirect(to: ~p"/sources/#{source}")
   end
 
@@ -146,6 +151,13 @@ defmodule PinchflatWeb.Sources.SourceController do
     |> Repo.all()
   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
     if Settings.get!(:onboarding) do
       {Layouts, :onboarding}

lib/pinchflat_web/controllers/sources/source_html.ex

@@ -28,29 +28,4 @@ defmodule PinchflatWeb.Sources.SourceHTML do
   def rss_feed_url(conn, source) do
     url(conn, ~p"/sources/#{source.uuid}/feed") <> ".xml"
   end
-
-  def output_path_template_override_placeholders(media_profiles) do
-    media_profiles
-    |> Enum.map(&{&1.id, &1.output_path_template})
-    |> Map.new()
-    |> Phoenix.json_library().encode!()
-  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
-    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>}
-
-    """
-    Must end with .{{ ext }}. Same rules as Media Profile output path templates. #{help_button} to load your media profile's output template
-    """
-  end
 end

lib/pinchflat_web/controllers/sources/source_html/actions_dropdown.html.heex

@@ -30,15 +30,6 @@
       Force Index
     </.link>
   </: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>
     <div class="h-px w-full bg-bodydark2"></div>
   </:option>

lib/pinchflat_web/controllers/sources/source_html/media_item_table_live.ex

@@ -1,91 +0,0 @@
-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

lib/pinchflat_web/controllers/sources/source_html/show.html.heex

@@ -23,9 +23,9 @@
         <.actions_dropdown source={@source} conn={@conn} />
       </:tab_append>
 
-      <:tab title="Source">
+      <:tab title="Attributes">
         <div class="flex flex-col gap-10 text-white">
-          <h3 class="font-bold text-xl mt-6">Raw Attributes</h3>
+          <h3 class="font-bold text-lg">Attributes</h3>
           <section>
             <strong>Media Profile:</strong>
             <.subtle_link href={~p"/media_profiles/#{@source.media_profile_id}"}>
@@ -37,18 +37,48 @@
         </div>
       </:tab>
       <:tab title="Pending Media">
-        <%= live_render(
+        <%= if match?([_|_], @pending_media) do %>
-          @conn,
+          <h4 class="text-white text-lg mb-6">Shows a maximum of 100 media items</h4>
-          Pinchflat.Sources.MediaItemTableLive,
+          <.table rows={@pending_media} table_class="text-black dark:text-white">
-          session: %{"source_id" => @source.id, "media_state" => "pending"}
+            <: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>
+        <% else %>
+          <p class="text-black dark:text-white">Nothing Here!</p>
+        <% end %>
       </:tab>
       <:tab title="Downloaded Media">
-        <%= live_render(
+        <%= if match?([_|_], @downloaded_media) do %>
-          @conn,
+          <h4 class="text-white text-lg mb-6">Shows a maximum of 100 media items (<%= @total_downloaded %> total)</h4>
-          Pinchflat.Sources.MediaItemTableLive,
+          <.table rows={@downloaded_media} table_class="text-black dark:text-white">
-          session: %{"source_id" => @source.id, "media_state" => "downloaded"}
+            <: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>
+        <% else %>
+          <p class="text-black dark:text-white">Nothing Here!</p>
+        <% end %>
       </:tab>
       <:tab title="Pending Tasks">
         <%= if match?([_|_], @pending_tasks) do %>

lib/pinchflat_web/controllers/sources/source_html/source_form.html.heex

@@ -9,7 +9,6 @@
     Oops, something went wrong! Please check the errors below.
   </.error>
 
-  <section x-data="{ mediaProfileId: null }">
   <section class="flex justify-between items-center mt-8">
     <h3 class=" text-2xl text-black dark:text-white">
       General Options
@@ -23,7 +22,7 @@
     field={f[:custom_name]}
     type="text"
     label="Custom Name"
-      help="Does not impact indexing or downloading. Will be inferred from the source if left blank"
+    help="Something descriptive. Does not impact indexing or downloading"
   />
 
   <.input field={f[:original_url]} type="text" label="Source URL" help="URL of a channel or playlist (required)" />
@@ -34,7 +33,6 @@
     type="select"
     label="Media Profile"
     help="Sets your preferences for what media to look for and how to store it"
-      x-model.fill="mediaProfileId"
   />
 
   <h3 class="mt-8 text-2xl text-black dark:text-white">
@@ -111,32 +109,8 @@
       type="text"
       label="Title Filter Regex"
       placeholder="(?i)^How to Bike$"
-        help={title_filter_regex_help()}
+      help="A PCRE-compatible regex. Only media with titles that match this regex will be downloaded. Look up 'SQLean Regex docs' for more"
-        html_help={true}
     />
-
-      <section
-        x-data={
-          """
-          { 
-            placeholders: JSON.parse('#{output_path_template_override_placeholders(@media_profiles)}'),
-            inputValue: null
-          }
-          """
-        }
-        x-on:load-template="inputValue = placeholders[mediaProfileId]"
-      >
-        <.input
-          field={f[:output_path_template_override]}
-          type="text"
-          inputclass="font-mono"
-          label="Output path template override"
-          help={output_path_template_override_help()}
-          html_help={true}
-          x-bind:placeholder="placeholders[mediaProfileId]"
-          x-model.fill="inputValue"
-        />
-      </section>
   </section>
 
   <.button class="my-10 sm:mb-7.5 w-full sm:w-auto" rounding="rounded-lg">Save Source</.button>
@@ -144,5 +118,4 @@
   <div class="rounded-sm dark:bg-meta-4 p-4 md:p-6 mb-5">
     <.fast_indexing_help />
   </div>
-  </section>
 </.simple_form>

lib/pinchflat_web/router.ex

@@ -35,7 +35,6 @@ defmodule PinchflatWeb.Router do
     resources "/sources", Sources.SourceController do
       post "/force_download", Sources.SourceController, :force_download
       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
         post "/force_download", MediaItems.MediaItemController, :force_download

mix.exs

@@ -4,7 +4,7 @@ defmodule Pinchflat.MixProject do
   def project do
     [
       app: :pinchflat,
-      version: "0.1.15",
+      version: "0.1.11",
       elixir: "~> 1.16",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,

priv/cmd_wrapper.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-# This script is a wrapper for other programs
-# that ensures they are killed when stdin closes
-# (eg: a job terminates)
-
-# Start the program in the background
-exec "$@" &
-pid1=$!
-
-# Silence warnings from here on
-exec >/dev/null 2>&1
-
-# Read from stdin in the background and
-# kill running program when stdin closes
-exec 0<&0 $(
-  while read; do :; done
-  kill -KILL $pid1
-) &
-pid2=$!
-
-# Clean up
-wait $pid1
-ret=$?
-kill -KILL $pid2
-exit $ret

priv/repo/migrations/20240411154245_add_output_template_to_sources.exs

@@ -1,9 +0,0 @@
-defmodule Pinchflat.Repo.Migrations.AddOutputTemplateToSources do
-  use Ecto.Migration
-
-  def change do
-    alter table(:sources) do
-      add :output_path_template_override, :string
-    end
-  end
-end

selfhosted.Dockerfile

@@ -90,9 +90,6 @@ RUN yt-dlp -U
 # Download Apprise
 RUN python3 -m pip install -U apprise --break-system-packages
 
-# Download Mutagen for music thumbnail generation
-RUN python3 -m pip install -U mutagen --break-system-packages
-
 # Set the locale
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8

test/pinchflat/downloading/download_option_builder_test.exs

@@ -4,7 +4,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
   import Pinchflat.SourcesFixtures
   import Pinchflat.ProfilesFixtures
 
-  alias Pinchflat.Sources
   alias Pinchflat.Profiles
   alias Pinchflat.Utils.FilesystemUtils
   alias Pinchflat.Downloading.DownloadOptionBuilder
@@ -32,20 +31,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
 
       assert {:output, "/tmp/test/media/#{media_item.source.custom_name}.%(ext)s"} in res
     end
-
-    test "uses source's output override if present", %{media_item: media_item} do
-      source = media_item.source
-      {:ok, _} = Sources.update_source(source, %{output_path_template_override: "override.%(ext)s"})
-
-      media_item =
-        media_item
-        |> Repo.reload()
-        |> Repo.preload(source: :media_profile)
-
-      assert {:ok, res} = DownloadOptionBuilder.build(media_item)
-
-      assert {:output, "/tmp/test/media/override.%(ext)s"} in res
-    end
   end
 
   describe "build/1 when testing default options" do
@@ -53,8 +38,7 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
       assert {:ok, res} = DownloadOptionBuilder.build(media_item)
 
       assert :no_progress in res
-      assert :force_overwrites in res
+      assert :windows_filenames in res
-      assert {:parse_metadata, "%(upload_date>%Y-%m-%d)s:(?P<meta_date>.+)"} in res
     end
   end
 
@@ -150,20 +134,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
       assert {:output, "thumbnail:/tmp/test/media/%(title)S-thumb.%(ext)s"} in res
     end
 
-    test "appends -thumb to source's output path override, if present", %{media_item: media_item} do
-      media_item = update_media_profile_attribute(media_item, %{download_thumbnail: true})
-      {:ok, _} = Sources.update_source(media_item.source, %{output_path_template_override: "override.%(ext)s"})
-
-      media_item =
-        media_item
-        |> Repo.reload()
-        |> Repo.preload(source: :media_profile)
-
-      assert {:ok, res} = DownloadOptionBuilder.build(media_item)
-
-      assert {:output, "thumbnail:/tmp/test/media/override-thumb.%(ext)s"} in res
-    end
-
     test "converts thumbnail to jpg when download_thumbnail is true", %{media_item: media_item} do
       media_item = update_media_profile_attribute(media_item, %{download_thumbnail: true})
 
@@ -240,7 +210,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
 
         assert {:ok, res} = DownloadOptionBuilder.build(media_item)
         assert {:format_sort, "res:#{resolution},+codec:avc:m4a"} in res
-        assert {:remux_video, "mp4"} in res
       end)
     end
 
@@ -251,8 +220,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
 
       assert :extract_audio in res
       assert {:format, "bestaudio[ext=m4a]"} in res
-
-      refute {:remux_video, "mp4"} in res
     end
   end
 
@@ -391,15 +358,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
 
       assert path == "/tmp/test/media/%(title)S.%(ext)s"
     end
-
-    test "uses source's output override if present", %{media_item: media_item} do
-      source = media_item.source
-      {:ok, source} = Sources.update_source(source, %{output_path_template_override: "override.%(ext)s"})
-
-      path = DownloadOptionBuilder.build_output_path_for(source)
-
-      assert path == "/tmp/test/media/override.%(ext)s"
-    end
   end
 
   defp update_media_profile_attribute(media_item_with_preloads, attrs) do

test/pinchflat/downloading/downloading_helpers_test.exs

@@ -4,7 +4,6 @@ defmodule Pinchflat.Downloading.DownloadingHelpersTest do
   import Mox
   import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
-  import Pinchflat.ProfilesFixtures
 
   alias Pinchflat.Tasks
   alias Pinchflat.Downloading.DownloadingHelpers
@@ -73,44 +72,4 @@ defmodule Pinchflat.Downloading.DownloadingHelpersTest do
       assert [] = Tasks.list_tasks_for(media_item)
     end
   end
-
-  describe "kickoff_download_if_pending/1" do
-    setup do
-      media_item = media_item_fixture(media_filepath: nil)
-
-      {:ok, media_item: media_item}
-    end
-
-    test "enqueues a download job", %{media_item: media_item} do
-      assert {:ok, _} = DownloadingHelpers.kickoff_download_if_pending(media_item)
-
-      assert_enqueued(worker: MediaDownloadWorker, args: %{"id" => media_item.id})
-    end
-
-    test "creates and returns a download task record", %{media_item: media_item} do
-      assert {:ok, task} = DownloadingHelpers.kickoff_download_if_pending(media_item)
-
-      assert [found_task] = Tasks.list_tasks_for(media_item, "MediaDownloadWorker")
-      assert task.id == found_task.id
-    end
-
-    test "does not enqueue a download job if the source does not allow it" do
-      source = source_fixture(%{download_media: false})
-      media_item = media_item_fixture(source_id: source.id, media_filepath: nil)
-
-      assert {:error, :should_not_download} = DownloadingHelpers.kickoff_download_if_pending(media_item)
-
-      refute_enqueued(worker: MediaDownloadWorker)
-    end
-
-    test "does not enqueue a download job if the media item does not match the format rules" do
-      profile = media_profile_fixture(%{livestream_behaviour: :exclude})
-      source = source_fixture(%{media_profile_id: profile.id})
-      media_item = media_item_fixture(source_id: source.id, media_filepath: nil, livestream: true)
-
-      assert {:error, :should_not_download} = DownloadingHelpers.kickoff_download_if_pending(media_item)
-
-      refute_enqueued(worker: MediaDownloadWorker)
-    end
-  end
 end

test/pinchflat/fast_indexing/fast_indexing_helpers_test.exs

@@ -9,11 +9,45 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpersTest do
   alias Pinchflat.Tasks
   alias Pinchflat.Media.MediaItem
   alias Pinchflat.Downloading.MediaDownloadWorker
+  alias Pinchflat.FastIndexing.MediaIndexingWorker
   alias Pinchflat.FastIndexing.FastIndexingHelpers
 
   setup :verify_on_exit!
 
-  describe "kickoff_download_tasks_from_youtube_rss_feed/1" do
+  @media_url "https://www.youtube.com/watch?v=test_1"
+
+  describe "kickoff_indexing_tasks_from_youtube_rss_feed/1" do
+    setup do
+      {:ok, [source: source_fixture()]}
+    end
+
+    test "enqueues a new worker for each new media_id in the source's RSS feed", %{source: source} do
+      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
+
+      assert [_] = FastIndexingHelpers.kickoff_indexing_tasks_from_youtube_rss_feed(source)
+
+      assert [worker] = all_enqueued(worker: MediaIndexingWorker)
+      assert worker.args["id"] == source.id
+      assert worker.args["media_url"] == "https://www.youtube.com/watch?v=test_1"
+    end
+
+    test "does not enqueue a new worker for the source's media IDs we already know about", %{source: source} do
+      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
+      media_item_fixture(source_id: source.id, media_id: "test_1")
+
+      assert [] = FastIndexingHelpers.kickoff_indexing_tasks_from_youtube_rss_feed(source)
+
+      refute_enqueued(worker: MediaIndexingWorker)
+    end
+
+    test "returns the IDs of the found media items", %{source: source} do
+      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
+
+      assert ["test_1"] = FastIndexingHelpers.kickoff_indexing_tasks_from_youtube_rss_feed(source)
+    end
+  end
+
+  describe "index_and_enqueue_download_for_media_item/2" do
     setup do
       stub(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
         {:ok, media_attributes_return_fixture()}
@@ -22,50 +56,41 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpersTest do
       {:ok, [source: source_fixture()]}
     end
 
-    test "enqueues a new worker for each new media_id in the source's RSS feed", %{source: source} do
+    test "creates a new media item based on the URL", %{source: source} do
-      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
+      assert Repo.aggregate(MediaItem, :count) == 0
-
+      assert {:ok, _} = FastIndexingHelpers.index_and_enqueue_download_for_media_item(source, @media_url)
-      assert [media_item] = FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed(source)
+      assert Repo.aggregate(MediaItem, :count) == 1
-
-      assert [worker] = all_enqueued(worker: MediaDownloadWorker)
-      assert worker.args["id"] == media_item.id
     end
 
-    test "does not enqueue a new worker for the source's media IDs we already know about", %{source: source} do
+    test "won't duplicate media_items based on media_id and source", %{source: source} do
-      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
+      assert {:ok, mi_1} = FastIndexingHelpers.index_and_enqueue_download_for_media_item(source, @media_url)
-      media_item_fixture(source_id: source.id, media_id: "test_1")
+      assert {:ok, mi_2} = FastIndexingHelpers.index_and_enqueue_download_for_media_item(source, @media_url)
 
-      assert [] = FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed(source)
+      assert Repo.aggregate(MediaItem, :count) == 1
-
+      assert mi_1.id == mi_2.id
-      refute_enqueued(worker: MediaDownloadWorker)
     end
 
-    test "returns the found media items", %{source: source} do
+    test "enqueues a download job", %{source: source} do
-      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
+      assert {:ok, media_item} = FastIndexingHelpers.index_and_enqueue_download_for_media_item(source, @media_url)
 
-      assert [%MediaItem{}] = FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed(source)
+      assert_enqueued(worker: MediaDownloadWorker, args: %{"id" => media_item.id})
-    end
-
-    test "does not enqueue a download job if the source does not allow it" do
-      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
-      source = source_fixture(%{download_media: false})
-
-      assert [%MediaItem{}] = FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed(source)
-
-      refute_enqueued(worker: MediaDownloadWorker)
     end
 
     test "creates a download task record", %{source: source} do
-      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
+      assert {:ok, media_item} = FastIndexingHelpers.index_and_enqueue_download_for_media_item(source, @media_url)
-
-      assert [media_item] = FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed(source)
 
       assert [_] = Tasks.list_tasks_for(media_item, "MediaDownloadWorker")
     end
 
-    test "does not enqueue a download job if the media item does not match the format rules" do
+    test "does not enqueue a download job if the source does not allow it" do
-      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
+      source = source_fixture(%{download_media: false})
 
+      assert {:ok, _} = FastIndexingHelpers.index_and_enqueue_download_for_media_item(source, @media_url)
+
+      refute_enqueued(worker: MediaDownloadWorker)
+    end
+
+    test "does not enqueue a download job if the media item does not match the format rules" do
       profile = media_profile_fixture(%{shorts_behaviour: :exclude})
       source = source_fixture(%{media_profile_id: profile.id})
 
@@ -85,29 +110,8 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpersTest do
         {:ok, output}
       end)
 
-      assert [%MediaItem{}] = FastIndexingHelpers.kickoff_download_tasks_from_youtube_rss_feed(source)
+      assert {:ok, _media_item} = FastIndexingHelpers.index_and_enqueue_download_for_media_item(source, @media_url)
-
       refute_enqueued(worker: MediaDownloadWorker)
     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

test/pinchflat/fast_indexing/fast_indexing_worker_test.exs

@@ -87,7 +87,6 @@ defmodule Pinchflat.FastIndexing.FastIndexingWorkerTest do
       source = source_fixture(fast_index: true)
 
       expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
-      expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot -> {:ok, render_metadata(:media_metadata)} end)
 
       expect(AppriseRunnerMock, :run, fn servers, opts ->
         assert "server_1" = servers
@@ -99,34 +98,5 @@ defmodule Pinchflat.FastIndexing.FastIndexingWorkerTest do
 
       perform_job(FastIndexingWorker, %{id: source.id})
     end
-
-    test "doesn't send a notification if new media is not found" do
-      source = source_fixture(fast_index: true)
-
-      expect(HTTPClientMock, :get, fn _url -> {:ok, ""} end)
-      expect(AppriseRunnerMock, :run, 0, fn _servers, _opts -> {:ok, ""} end)
-
-      perform_job(FastIndexingWorker, %{id: source.id})
-    end
-
-    test "doesn't send a notification if the source doesn't download media" do
-      source = source_fixture(fast_index: true, download_media: false)
-
-      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
-      expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot -> {:ok, render_metadata(:media_metadata)} end)
-      expect(AppriseRunnerMock, :run, 0, fn _servers, _opts -> {:ok, ""} end)
-
-      perform_job(FastIndexingWorker, %{id: source.id})
-    end
-
-    test "doesn't send a notification if the media isn't pending download" do
-      source = source_fixture(fast_index: true, title_filter_regex: "foobar")
-
-      expect(HTTPClientMock, :get, fn _url -> {:ok, "<yt:videoId>test_1</yt:videoId>"} end)
-      expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot -> {:ok, render_metadata(:media_metadata)} end)
-      expect(AppriseRunnerMock, :run, 0, fn _servers, _opts -> {:ok, ""} end)
-
-      perform_job(FastIndexingWorker, %{id: source.id})
-    end
   end
 end

test/pinchflat/fast_indexing/media_indexing_worker_test.exs

@@ -0,0 +1,61 @@
+defmodule Pinchflat.FastIndexing.MediaIndexingWorkerTest do
+  use Pinchflat.DataCase
+
+  import Mox
+  import Pinchflat.MediaFixtures
+  import Pinchflat.SourcesFixtures
+
+  alias Pinchflat.Media.MediaItem
+  alias Pinchflat.Downloading.MediaDownloadWorker
+  alias Pinchflat.FastIndexing.MediaIndexingWorker
+
+  @media_url "https://www.youtube.com/watch?v=1234567890"
+
+  setup :verify_on_exit!
+
+  setup do
+    source = source_fixture()
+
+    {:ok, source: source}
+  end
+
+  describe "kickoff_with_task/2" do
+    test "starts the worker", %{source: source} do
+      assert [] = all_enqueued(worker: MediaIndexingWorker)
+      assert {:ok, _} = MediaIndexingWorker.kickoff_with_task(source, @media_url)
+      assert [_] = all_enqueued(worker: MediaIndexingWorker)
+    end
+
+    test "attaches a task", %{source: source} do
+      assert {:ok, task} = MediaIndexingWorker.kickoff_with_task(source, @media_url)
+      assert task.source_id == source.id
+    end
+  end
+
+  describe "perform/1" do
+    test "indexes the media item and saves it to the database", %{source: source} do
+      expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
+        {:ok, media_attributes_return_fixture()}
+      end)
+
+      before = Repo.aggregate(MediaItem, :count, :id)
+      perform_job(MediaIndexingWorker, %{id: source.id, media_url: @media_url})
+
+      assert Repo.aggregate(MediaItem, :count, :id) == before + 1
+    end
+
+    test "enqueues a download job for the media item", %{source: source} do
+      expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
+        {:ok, media_attributes_return_fixture()}
+      end)
+
+      perform_job(MediaIndexingWorker, %{id: source.id, media_url: @media_url})
+
+      assert [_] = all_enqueued(worker: MediaDownloadWorker)
+    end
+
+    test "does not blow up if the record doesn't exist" do
+      assert :ok = perform_job(MediaDownloadWorker, %{id: 0, media_url: @media_url})
+    end
+  end
+end

test/pinchflat/media_test.exs

@@ -731,7 +731,9 @@ defmodule Pinchflat.MediaTest do
         metadata: %{
           metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(media_item, %{}),
           thumbnail_filepath:
-            MetadataFileHelpers.download_and_store_thumbnail_for(media_item, render_parsed_metadata(:media_metadata))
+            MetadataFileHelpers.download_and_store_thumbnail_for(media_item, %{
+              "thumbnail" => "https://example.com/thumbnail.jpg"
+            })
         }
       }
 
@@ -758,7 +760,9 @@ defmodule Pinchflat.MediaTest do
         metadata: %{
           metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(media_item, %{}),
           thumbnail_filepath:
-            MetadataFileHelpers.download_and_store_thumbnail_for(media_item, render_parsed_metadata(:media_metadata))
+            MetadataFileHelpers.download_and_store_thumbnail_for(media_item, %{
+              "thumbnail" => "https://example.com/thumbnail.jpg"
+            })
         }
       }
 
@@ -827,7 +831,9 @@ defmodule Pinchflat.MediaTest do
         metadata: %{
           metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(media_item, %{}),
           thumbnail_filepath:
-            MetadataFileHelpers.download_and_store_thumbnail_for(media_item, render_parsed_metadata(:media_metadata))
+            MetadataFileHelpers.download_and_store_thumbnail_for(media_item, %{
+              "thumbnail" => "https://example.com/thumbnail.jpg"
+            })
         }
       }
 

test/pinchflat/metadata/metadata_file_helpers_test.exs

@@ -54,11 +54,13 @@ defmodule Pinchflat.Metadata.MetadataFileHelpersTest do
   describe "download_and_store_thumbnail_for/2" do
     setup do
       # This tests that the HTTP endpoint is being called with every test
-      expect(HTTPClientMock, :get, fn _url, _headers, _opts ->
+      expect(HTTPClientMock, :get, fn url, _headers, _opts ->
+        assert url =~ "example.com"
+
         {:ok, "thumbnail data"}
       end)
 
-      metadata = render_parsed_metadata(:media_metadata)
+      metadata = %{"thumbnail" => "example.com/thumbnail.jpg"}
 
       {:ok, %{metadata: metadata}}
     end
@@ -66,7 +68,7 @@ defmodule Pinchflat.Metadata.MetadataFileHelpersTest do
     test "returns the filepath", %{media_item: media_item, metadata: metadata} do
       filepath = Helpers.download_and_store_thumbnail_for(media_item, metadata)
 
-      assert filepath =~ ~r{/media_items/#{media_item.id}/maxresdefault.jpg}
+      assert filepath =~ ~r{/media_items/#{media_item.id}/thumbnail.jpg}
     end
 
     test "creates folder structure based on passed record", %{media_item: media_item, metadata: metadata} do
@@ -75,19 +77,11 @@ defmodule Pinchflat.Metadata.MetadataFileHelpersTest do
       assert File.exists?(Path.dirname(filepath))
     end
 
-    test "chooses the highest preference jpg thumbnail available", %{media_item: media_item} do
+    test "the filename and extension is based on the URL", %{media_item: media_item} do
-      metadata = %{
+      metadata = %{"thumbnail" => "example.com/maxres.webp"}
-        "thumbnails" => [
-          %{"url" => "https://i.ytimg.com/vi/ABC123/img_1.jpg", "preference" => -1},
-          %{"url" => "https://i.ytimg.com/vi/ABC123/img_2.jpg", "preference" => 1},
-          %{"url" => "https://i.ytimg.com/vi/ABC123/img_3.jpg", "preference" => -10},
-          %{"url" => "https://i.ytimg.com/vi/ABC123/img_4.webp", "preference" => 10}
-        ]
-      }
-
       filepath = Helpers.download_and_store_thumbnail_for(media_item, metadata)
 
-      assert filepath =~ ~r{/media_items/#{media_item.id}/img_2.jpg}
+      assert Path.basename(filepath) == "maxres.webp"
     end
   end
 

test/pinchflat/slow_indexing/slow_indexing_helpers_test.exs

@@ -12,6 +12,7 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpersTest do
   alias Pinchflat.Media.MediaItem
   alias Pinchflat.FastIndexing.FastIndexingWorker
   alias Pinchflat.Downloading.MediaDownloadWorker
+  alias Pinchflat.FastIndexing.MediaIndexingWorker
   alias Pinchflat.SlowIndexing.SlowIndexingHelpers
   alias Pinchflat.SlowIndexing.MediaCollectionIndexingWorker
 
@@ -46,7 +47,7 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpersTest do
 
     test "it deletes any pending media tasks for the source" do
       source = source_fixture()
-      {:ok, job} = Oban.insert(FastIndexingWorker.new(%{"id" => source.id}))
+      {:ok, job} = Oban.insert(MediaIndexingWorker.new(%{"id" => source.id}))
       task = task_fixture(source_id: source.id, job_id: job.id)
 
       assert {:ok, _} = SlowIndexingHelpers.kickoff_indexing_task(source)

test/pinchflat/sources_test.exs

@@ -13,6 +13,7 @@ defmodule Pinchflat.SourcesTest do
   alias Pinchflat.Downloading.DownloadingHelpers
   alias Pinchflat.FastIndexing.FastIndexingWorker
   alias Pinchflat.Downloading.MediaDownloadWorker
+  alias Pinchflat.FastIndexing.MediaIndexingWorker
   alias Pinchflat.Metadata.SourceMetadataStorageWorker
   alias Pinchflat.SlowIndexing.MediaCollectionIndexingWorker
 
@@ -34,28 +35,6 @@ defmodule Pinchflat.SourcesTest do
     end
   end
 
-  describe "output_path_template/1" do
-    test "returns the source's override if present" do
-      source = source_fixture(%{output_path_template_override: "/override/{{ title }}.{{ ext }}"})
-
-      assert Sources.output_path_template(source) == "/override/{{ title }}.{{ ext }}"
-    end
-
-    test "returns the media profile's template if no override is present" do
-      media_profile = media_profile_fixture(%{output_path_template: "/profile/{{ title }}.{{ ext }}"})
-      source = source_fixture(%{media_profile_id: media_profile.id})
-
-      assert Sources.output_path_template(source) == "/profile/{{ title }}.{{ ext }}"
-    end
-
-    test "Treats empty strings as being blank" do
-      media_profile = media_profile_fixture(%{output_path_template: "/profile/{{ title }}.{{ ext }}"})
-      source = source_fixture(%{media_profile_id: media_profile.id, output_path_template_override: "  "})
-
-      assert Sources.output_path_template(source) == "/profile/{{ title }}.{{ ext }}"
-    end
-  end
-
   describe "list_sources/0" do
     test "it returns all sources" do
       source = source_fixture()
@@ -131,18 +110,6 @@ defmodule Pinchflat.SourcesTest do
       assert String.starts_with?(source.collection_id, "some_playlist_id_")
     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
       expect(YtDlpRunnerMock, :run, &channel_mock/3)
 
@@ -426,13 +393,16 @@ defmodule Pinchflat.SourcesTest do
 
       {:ok, job_1} = Oban.insert(FastIndexingWorker.new(%{"id" => source.id}))
       task_1 = task_fixture(source_id: source.id, job_id: job_1.id)
-      {:ok, job_2} = Oban.insert(MediaCollectionIndexingWorker.new(%{"id" => source.id}))
+      {:ok, job_2} = Oban.insert(MediaIndexingWorker.new(%{"id" => source.id}))
       task_2 = task_fixture(source_id: source.id, job_id: job_2.id)
+      {:ok, job_3} = Oban.insert(MediaCollectionIndexingWorker.new(%{"id" => source.id}))
+      task_3 = task_fixture(source_id: source.id, job_id: job_3.id)
 
       assert {:ok, %Source{}} = Sources.update_source(source, update_attrs)
 
       assert_raise Ecto.NoResultsError, fn -> Repo.reload!(task_1) end
       assert_raise Ecto.NoResultsError, fn -> Repo.reload!(task_2) end
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(task_3) end
     end
 
     test "not updating the index frequency will not re-schedule the indexing task or delete tasks" do
@@ -514,24 +484,14 @@ defmodule Pinchflat.SourcesTest do
       assert source.index_frequency_minutes == 0
     end
 
-    test "updating will kickoff a metadata storage worker if the original_url changes" do
+    test "updating will kickoff a metadata storage worker" do
-      expect(YtDlpRunnerMock, :run, &playlist_mock/3)
       source = source_fixture()
-      update_attrs = %{original_url: "https://www.youtube.com/channel/cba321"}
+      update_attrs = %{name: "some updated name"}
 
       assert {:ok, %Source{} = source} = Sources.update_source(source, update_attrs)
 
       assert_enqueued(worker: SourceMetadataStorageWorker, args: %{"id" => source.id})
     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
 
   describe "update_source/3 when testing options" do

test/pinchflat/utils/cli_utils_test.exs

@@ -3,12 +3,6 @@ defmodule Pinchflat.Utils.CliUtilsTest do
 
   alias Pinchflat.Utils.CliUtils
 
-  describe "wrap_cmd/3" do
-    test "delegates to System.cmd/3" do
-      assert {"output\n", 0} = CliUtils.wrap_cmd("echo", ["output"])
-    end
-  end
-
   describe "parse_options/1" do
     test "it converts symbol k-v arg keys to kebab case" do
       assert ["--buffer-size", "1024"] = CliUtils.parse_options(buffer_size: 1024)

test/pinchflat/utils/number_utils_test.exs

@@ -1,19 +0,0 @@
-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

test/pinchflat/yt_dlp/command_runner_test.exs

@@ -78,14 +78,6 @@ defmodule Pinchflat.YtDlp.CommandRunnerTest do
     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
     test "adds the version arg" do
       assert {:ok, output} = Runner.version()

test/pinchflat_web/controllers/media_item_controller_test.exs

@@ -97,15 +97,6 @@ defmodule PinchflatWeb.MediaItemControllerTest do
       assert [_] = all_enqueued(worker: MediaDownloadWorker)
     end
 
-    test "doesn't freak out if the task is a duplicate", %{conn: conn} do
-      media_item = media_item_fixture()
-
-      MediaDownloadWorker.kickoff_with_task(media_item, %{force: true})
-
-      post(conn, ~p"/sources/#{media_item.source_id}/media/#{media_item.id}/force_download")
-      assert [_] = all_enqueued(worker: MediaDownloadWorker)
-    end
-
     test "forces a download even if one wouldn't normally run", %{conn: conn} do
       media_item = media_item_fixture(%{media_filepath: nil})
 

test/pinchflat_web/controllers/source_controller_test.exs

@@ -9,7 +9,6 @@ defmodule PinchflatWeb.SourceControllerTest do
   alias Pinchflat.Repo
   alias Pinchflat.Settings
   alias Pinchflat.Downloading.MediaDownloadWorker
-  alias Pinchflat.Metadata.SourceMetadataStorageWorker
   alias Pinchflat.SlowIndexing.MediaCollectionIndexingWorker
 
   setup do
@@ -216,23 +215,6 @@ defmodule PinchflatWeb.SourceControllerTest do
     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
     source = source_fixture()
     media_item = media_item_with_attachments(%{source_id: source.id})

test/pinchflat_web/controllers/sources/media_item_table_live_test.exs

@@ -1,60 +0,0 @@
-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