Bumped version

* [Housekeeping] Add release workflow (#141)

* add release workflow

This will create tags when a new release is published

* fix(workflows): refactor release workflow

Signed-off-by: Devin Buhl <devin@buhl.casa>

* Update release.yml

---------

Signed-off-by: Devin Buhl <devin@buhl.casa>

* Linting

* Testing changes

---------

Signed-off-by: Devin Buhl <devin@buhl.casa>
Co-authored-by: Devin Buhl <onedr0p@users.noreply.github.com>

.github/workflows/docker_release.yml

@@ -40,7 +40,9 @@ jobs:
             ghcr.io/${{ github.repository }}
           # All non-release actions will be tagged as `dev` (ie: push, workflow_dispatch)
           tags: |
-            type=ref,event=tag
+            type=semver,pattern={{version}},prefix=v
+            type=semver,pattern={{major}}.{{minor}},prefix=v
+            type=semver,pattern={{major}},prefix=v
             type=raw,value=dev,enable=${{ github.event_name != 'release' }}
           flavor: |
             latest=auto
@@ -75,5 +77,3 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.sobelow-conf

@@ -16,8 +16,7 @@
       "Config.HTTPS",
       "Config.CSP",
       "XSS.ContentType",
-      "Traversal.SendFile",
+      "Traversal.SendFile"
-      "Traversal.SendDownload"
     ],
   ignore_files: [],
   version: false

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)
@@ -40,9 +31,9 @@
 
 ## What it does
 
-Pinchflat is a self-hosted app for downloading YouTube content built using [yt-dlp](https://github.com/yt-dlp/yt-dlp). It's designed to be lightweight, self-contained, and easy to use. You set up rules for how to download content from YouTube channels or playlists and it'll do the rest, periodically checking for new content. It's perfect for people who want to download content for use in with a media center app (Plex, Jellyfin, Kodi) or for those who want to archive media!
+Pinchflat is a self-hosted app for downloading YouTube content built using [yt-dlp](https://github.com/yt-dlp/yt-dlp). It's designed to be lightweight, self-contained, and easy to use. You set up rules for how to download content from YouTube channels or playlists and it'll do the rest, checking periodically for new content. It's perfect for people who want to download content for use in with a media center app (Plex, Jellyfin, Kodi) or for those who want to archive media!
 
-While you can [download individual videos](https://github.com/kieraneglin/pinchflat/wiki/Frequently-Asked-Questions#how-do-i-download-one-off-videos), Pinchflat is best suited for downloading content from channels or playlists. It's also not meant for consuming content in-app - Pinchflat downloads content to disk where you can then watch it with a media center app or VLC.
+It's _not_ great for downloading one-off videos - it's built to download large amounts of content and keep it up to date. It's also not meant for consuming content in-app - Pinchflat downloads content to disk where you can then watch it with a media center app or VLC.
 
 If it doesn't work for your use case, please make a feature request! You can also check out these great alternatives: [Tube Archivist](https://github.com/tubearchivist/tubearchivist), [ytdl-sub](https://github.com/jmbannon/ytdl-sub), and [TubeSync](https://github.com/meeb/tubesync)
 
@@ -52,21 +43,14 @@ 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
 - Custom rules for handling YouTube Shorts and livestreams
-- Apprise support for notifications
-- Allows automatically redownloading new media after a set period
-  - This can help improve the download quality of new content or improve SponsorBlock tags
-- Optionally automatically delete old content ([docs](https://github.com/kieraneglin/pinchflat/wiki/Automatically-Delete-Media))
 - Advanced options like setting cutoff dates and filtering by title
 - Reliable hands-off operation
 - Can pass cookies to YouTube to download your private playlists ([docs](https://github.com/kieraneglin/pinchflat/wiki/YouTube-Cookies))
-- Sponsorblock integration
-- \[Advanced\] allows custom `yt-dlp` options ([docs](https://github.com/kieraneglin/pinchflat/wiki/%5BAdvanced%5D-Custom-yt%E2%80%90dlp-options))
-- \[Advanced\] supports running custom scripts when after downloading/deleting media (alpha - [docs](https://github.com/kieraneglin/pinchflat/wiki/%5BAdvanced%5D-Custom-lifecycle-scripts))
 
 ## Screenshots
 
@@ -81,8 +65,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:
 
@@ -91,9 +74,6 @@ version: '3'
 services:
   pinchflat:
     image: keglin/pinchflat:latest
-    environment:
-      # Set the timezone to your local timezone
-      - TZ=America/New_York
     ports:
       - '8945:8945'
     volumes:
@@ -113,9 +93,7 @@ services:
 ```bash
 # Be sure to replace /host/path/to/config and /host/path/to/downloads below with
 # the paths to the directories you created in step 1
-# Be sure to replace America/New_York with your local timezone
 docker run \
-  -e TZ=America/New_York \
   -p 8945:8945 \
   -v /host/path/to/config:/config \
   -v /host/path/to/downloads:/downloads \
@@ -126,26 +104,19 @@ 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
 
-Prior to 2024-05-10, a portion of all donations were given to the [Electronic Frontier Foundation](https://www.eff.org/). Now, the app doesn't accept donations that go to me personally and instead directs you straight to the EFF. [Here](https://github.com/kieraneglin/pinchflat/issues/234) are some people that have generously donated.
+A portion of all donations to Pinchflat will be donated to the [Electronic Frontier Foundation](https://www.eff.org/). The EFF defends your online liberties and [backed](https://github.com/github/dmca/blob/9a85e0f021f7967af80e186b890776a50443f06c/2020/11/2020-11-16-RIAA-reversal-effletter.pdf) `youtube-dl` when Google took them down. [See here](https://github.com/kieraneglin/pinchflat/wiki/EFF-Donation-Receipts) for a list of donation receipts.
-
-The EFF defends your online liberties and [backed](https://github.com/github/dmca/blob/9a85e0f021f7967af80e186b890776a50443f06c/2020/11/2020-11-16-RIAA-reversal-effletter.pdf) `youtube-dl` when Google took them down.
 
 ## Pre-release disclaimer
 
@@ -154,8 +125,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/alpine_helpers.js

@@ -1,37 +0,0 @@
-window.copyTextToClipboard = async (text) => {
-  // Navigator clipboard api needs a secure context (https)
-  if (navigator.clipboard && window.isSecureContext) {
-    await navigator.clipboard.writeText(text)
-  } else {
-    const textArea = document.createElement('textarea')
-    textArea.value = text
-    // Move textarea out of the viewport so it's not visible
-    textArea.style.position = 'absolute'
-    textArea.style.left = '-999999px'
-
-    document.body.prepend(textArea)
-    textArea.select()
-
-    try {
-      document.execCommand('copy')
-    } catch (error) {
-      console.error(error)
-    } finally {
-      textArea.remove()
-    }
-  }
-}
-
-window.copyWithCallbacks = async (text, onCopy, onAfterDelay, delay = 4000) => {
-  await window.copyTextToClipboard(text)
-  onCopy()
-  setTimeout(onAfterDelay, delay)
-}
-
-window.markVersionAsSeen = (versionString) => {
-  localStorage.setItem('seenVersion', versionString)
-}
-
-window.isVersionSeen = (versionString) => {
-  return localStorage.getItem('seenVersion') === versionString
-}

assets/js/app.js

@@ -22,8 +22,6 @@ import { Socket } from 'phoenix'
 import { LiveSocket } from 'phoenix_live_view'
 import topbar from '../vendor/topbar'
 import Alpine from 'alpinejs'
-import './tabs'
-import './alpine_helpers'
 
 window.Alpine = Alpine
 Alpine.start()
@@ -37,20 +35,33 @@ 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()
-          }
-        })
-      }
-    }
   }
 })
 
+window.copyTextToClipboard = async (text) => {
+  // Navigator clipboard api needs a secure context (https)
+  if (navigator.clipboard && window.isSecureContext) {
+    await navigator.clipboard.writeText(text)
+  } else {
+    const textArea = document.createElement('textarea')
+    textArea.value = text
+    // Move textarea out of the viewport so it's not visible
+    textArea.style.position = 'absolute'
+    textArea.style.left = '-999999px'
+
+    document.body.prepend(textArea)
+    textArea.select()
+
+    try {
+      document.execCommand('copy')
+    } catch (error) {
+      console.error(error)
+    } finally {
+      textArea.remove()
+    }
+  }
+}
+
 // Show progress bar on live navigation and form submits
 topbar.config({ barColors: { 0: '#29d' }, shadowColor: 'rgba(0, 0, 0, .3)' })
 window.addEventListener('phx:page-loading-start', (_info) => topbar.show(300))

assets/js/tabs.js

@@ -1,20 +0,0 @@
-window.setTabIndex = (index) => {
-  window.location.hash = `tab-${index}`
-
-  return index
-}
-
-// The conditionals and currIndex stuff ensures that
-// the tab index is always set to 0 if the hash is empty
-// AND other hash values are ignored
-window.getTabIndex = (currIndex) => {
-  if (window.location.hash === '' || window.location.hash === '#') {
-    return 0
-  }
-
-  if (window.location.hash.startsWith('#tab-')) {
-    return parseInt(window.location.hash.replace('#tab-', ''))
-  }
-
-  return currIndex
-}

config/config.exs

@@ -12,9 +12,7 @@ config :pinchflat,
   generators: [timestamp_type: :utc_datetime],
   # Specifying backend data here makes mocking and local testing SUPER easy
   yt_dlp_executable: System.find_executable("yt-dlp"),
-  apprise_executable: System.find_executable("apprise"),
   yt_dlp_runner: Pinchflat.YtDlp.CommandRunner,
-  apprise_runner: Pinchflat.Lifecycle.Notifications.CommandRunner,
   media_directory: "/downloads",
   # The user may or may not store metadata for their needs, but the app will always store its copy
   metadata_directory: "/config/metadata",
@@ -25,8 +23,7 @@ config :pinchflat,
   basic_auth_username: "",
   basic_auth_password: "",
   expose_feed_endpoints: false,
-  file_watcher_poll_interval: 1000,
+  file_watcher_poll_interval: 1000
-  timezone: "UTC"
 
 config :pinchflat, Pinchflat.Repo,
   journal_mode: :wal,
@@ -49,14 +46,7 @@ config :pinchflat, Oban,
   engine: Oban.Engines.Lite,
   repo: Pinchflat.Repo,
   # Keep old jobs for 30 days for display in the UI
-  plugins: [
+  plugins: [{Oban.Plugins.Pruner, max_age: 30 * 24 * 60 * 60}],
-    {Oban.Plugins.Pruner, max_age: 30 * 24 * 60 * 60},
-    {Oban.Plugins.Cron,
-     crontab: [
-       {"0 1 * * *", Pinchflat.Downloading.MediaRetentionWorker},
-       {"0 2 * * *", Pinchflat.Downloading.MediaQualityUpgradeWorker}
-     ]}
-  ],
   # TODO: consider making this an env var or something?
   queues: [
     default: 10,
@@ -89,7 +79,7 @@ config :esbuild,
 
 # Configure tailwind (the version is required)
 config :tailwind,
-  version: "3.4.3",
+  version: "3.3.2",
   default: [
     args: ~w(
       --config=tailwind.config.js

config/runtime.exs

@@ -53,21 +53,16 @@ if config_env() == :prod do
   # For testing alternate journal modes (see issue #137)
   journal_mode = String.to_existing_atom(System.get_env("JOURNAL_MODE", "wal"))
 
-  config :logger, level: String.to_existing_atom(System.get_env("LOG_LEVEL", "debug"))
+  config :logger, level: String.to_existing_atom(System.get_env("LOG_LEVEL", "info"))
 
   config :pinchflat,
     yt_dlp_executable: System.find_executable("yt-dlp"),
-    apprise_executable: System.find_executable("apprise"),
     media_directory: "/downloads",
     metadata_directory: metadata_path,
     extras_directory: extras_path,
     tmpfile_directory: Path.join([System.tmp_dir!(), "pinchflat", "data"]),
     dns_cluster_query: System.get_env("DNS_CLUSTER_QUERY"),
-    expose_feed_endpoints: expose_feed_endpoints,
+    expose_feed_endpoints: expose_feed_endpoints
-    timezone: System.get_env("TIMEZONE") || System.get_env("TZ") || "UTC",
-    log_path: log_path
-
-  config :tzdata, :data_dir, System.get_env("TZ_DATA_DIR", "/etc/elixir_tzdata_data")
 
   config :pinchflat, Pinchflat.Repo,
     database: db_path,

config/test.exs

@@ -3,7 +3,6 @@ import Config
 config :pinchflat,
   # Specifying backend data here makes mocking and local testing SUPER easy
   yt_dlp_executable: Path.join([File.cwd!(), "/test/support/scripts/yt-dlp-mocks/repeater.sh"]),
-  apprise_executable: Path.join([File.cwd!(), "/test/support/scripts/yt-dlp-mocks/repeater.sh"]),
   media_directory: Path.join([System.tmp_dir!(), "test", "media"]),
   metadata_directory: Path.join([System.tmp_dir!(), "test", "metadata"]),
   tmpfile_directory: Path.join([System.tmp_dir!(), "test", "tmpfiles"]),
@@ -33,7 +32,8 @@ config :pinchflat, Pinchflat.Mailer, adapter: Swoosh.Adapters.Test
 # Disable swoosh api client as it is only required for production adapters.
 config :swoosh, :api_client, false
 
-config :logger, level: :critical
+# Print only warnings and errors during test
+config :logger, level: :warning
 
 # Initialize plugs at runtime for faster test compilation
 config :phoenix, :plug_init_mode, :runtime

dev.Dockerfile

@@ -5,23 +5,15 @@ ARG DEV_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEB
 
 FROM ${DEV_IMAGE}
 
-ARG TARGETPLATFORM
+# Set the locale deets
-RUN echo "Building for ${TARGETPLATFORM:?}"
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
 
 # Install debian packages
 RUN apt-get update -qq
-RUN apt-get install -y inotify-tools curl git openssh-client jq \
+RUN apt-get install -y inotify-tools ffmpeg curl git openssh-client \
-  python3 python3-setuptools python3-wheel python3-dev pipx \
+  python3 python3-pip python3-setuptools python3-wheel python3-dev
-  python3-mutagen locales procps build-essential
-
-# Install ffmpeg
-RUN export FFMPEG_DOWNLOAD=$(case ${TARGETPLATFORM:-linux/amd64} in \
-    "linux/amd64")   echo "https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz"   ;; \
-    "linux/arm64")   echo "https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linuxarm64-gpl.tar.xz" ;; \
-    *)               echo ""        ;; esac) && \
-    curl -L ${FFMPEG_DOWNLOAD} --output /tmp/ffmpeg.tar.xz && \
-    tar -xf /tmp/ffmpeg.tar.xz --strip-components=2 --no-anchored -C /usr/bin/ "ffmpeg" && \
-    tar -xf /tmp/ffmpeg.tar.xz --strip-components=2 --no-anchored -C /usr/bin/ "ffprobe"
 
 # Install nodejs
 RUN curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh
@@ -33,21 +25,9 @@ RUN npm install -g yarn
 RUN mix local.hex --force
 RUN mix local.rebar --force
 
-# Download and update YT-DLP
+# Download YT-DLP
-RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp
+# NOTE: If you're seeing weird issues, consider using the FFMPEG released by yt-dlp
-RUN chmod a+rx /usr/local/bin/yt-dlp
+RUN python3 -m pip install -U --pre yt-dlp --break-system-packages
-RUN yt-dlp -U
-
-# Install Apprise
-RUN export PIPX_HOME=/opt/pipx && \
-    export PIPX_BIN_DIR=/usr/local/bin && \
-    pipx install apprise
-
-# Set the locale
-RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
 
 # Create app directory and copy the Elixir projects into it.
 WORKDIR /app

lib/pinchflat/boot/data_backfill_worker.ex

@@ -0,0 +1,62 @@
+defmodule Pinchflat.Boot.DataBackfillWorker do
+  @moduledoc false
+
+  use Oban.Worker,
+    queue: :local_metadata,
+    unique: [period: :infinity, states: [:available, :scheduled, :retryable]],
+    tags: ["media_item", "media_metadata", "local_metadata", "data_backfill"]
+
+  # This one is going to be a little more self-contained
+  # instead of relying on outside modules for the methods.
+  # That's because, for now, these methods are not intended
+  # to be used elsewhere.
+  #
+  # I'm just trying out that pattern and seeing if I like it better
+  # so this may change.
+  import Ecto.Query, warn: false
+  require Logger
+
+  alias __MODULE__
+  alias Pinchflat.Repo
+
+  @doc """
+  Cancels all pending backfill jobs. Useful for ensuring worker runs immediately
+  on app boot.
+
+  Returns {:ok, integer()}
+  """
+  def cancel_pending_backfill_jobs do
+    Oban.Job
+    |> where(worker: "Pinchflat.Boot.DataBackfillWorker")
+    |> Oban.cancel_all_jobs()
+  end
+
+  @impl Oban.Worker
+  @doc """
+  Performs one-off tasks to get data in the right shape.
+  This can be needed when we add new features or change the way
+  we store data. Must be idempotent. All new data should already
+  conform to the expected schema so this should only be needed
+  for existing data. Still runs periodically to be safe.
+
+  Returns :ok
+  """
+  def perform(%Oban.Job{}) do
+    Logger.info("Running data backfill worker")
+    # Nothing to do for now - just reschedule
+    # Keeping in-place because we _will_ need it in the future
+
+    reschedule_backfill()
+
+    :ok
+  end
+
+  defp reschedule_backfill do
+    # Run hourly
+    next_run_in = 60 * 60
+
+    %{}
+    |> DataBackfillWorker.new(schedule_in: next_run_in)
+    |> Repo.insert_unique_job()
+  end
+end

lib/pinchflat/boot/post_job_startup_tasks.ex

@@ -11,6 +11,9 @@ defmodule Pinchflat.Boot.PostJobStartupTasks do
   use GenServer, restart: :temporary
   import Ecto.Query, warn: false
 
+  alias Pinchflat.Repo
+  alias Pinchflat.Boot.DataBackfillWorker
+
   def start_link(opts \\ []) do
     GenServer.start_link(__MODULE__, %{}, opts)
   end
@@ -26,8 +29,16 @@ defmodule Pinchflat.Boot.PostJobStartupTasks do
   """
   @impl true
   def init(state) do
-    # Nothing at the moment!
+    enqueue_backfill_worker()
 
     {:ok, state}
   end
+
+  defp enqueue_backfill_worker do
+    DataBackfillWorker.cancel_pending_backfill_jobs()
+
+    %{}
+    |> DataBackfillWorker.new()
+    |> Repo.insert_unique_job()
+  end
 end

lib/pinchflat/boot/pre_job_startup_tasks.ex

@@ -14,7 +14,7 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
 
   alias Pinchflat.Repo
   alias Pinchflat.Settings
-  alias Pinchflat.Utils.FilesystemUtils
+  alias Pinchflat.Filesystem.FilesystemHelpers
 
   def start_link(opts \\ []) do
     GenServer.start_link(__MODULE__, %{}, opts)
@@ -31,23 +31,13 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
   """
   @impl true
   def init(state) do
-    ensure_tmpfile_directory()
     reset_executing_jobs()
-    create_blank_yt_dlp_files()
+    create_blank_cookie_file()
-    create_blank_user_script_file()
     apply_default_settings()
 
     {:ok, state}
   end
 
-  defp ensure_tmpfile_directory do
-    tmpfile_dir = Application.get_env(:pinchflat, :tmpfile_directory)
-
-    if !File.exists?(tmpfile_dir) do
-      File.mkdir_p!(tmpfile_dir)
-    end
-  end
-
   # If a node cannot gracefully shut down, the currently executing jobs get stuck
   # in the "executing" state. This is a problem because the job runner will not
   # pick them up again
@@ -60,46 +50,19 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
     Logger.info("Reset #{count} executing jobs")
   end
 
-  defp create_blank_yt_dlp_files do
+  defp create_blank_cookie_file do
-    files = ["cookies.txt", "yt-dlp-configs/base-config.txt"]
     base_dir = Application.get_env(:pinchflat, :extras_directory)
-
+    filepath = Path.join(base_dir, "cookies.txt")
-    Enum.each(files, fn file ->
-      filepath = Path.join(base_dir, file)
-
-      if !File.exists?(filepath) do
-        Logger.info("Creating blank file: #{filepath}")
-
-        FilesystemUtils.write_p!(filepath, "")
-      end
-    end)
-  end
-
-  defp create_blank_user_script_file do
-    base_dir = Application.get_env(:pinchflat, :extras_directory)
-    filepath = Path.join([base_dir, "user-scripts", "lifecycle"])
 
     if !File.exists?(filepath) do
-      Logger.info("Creating blank file and making it executable: #{filepath}")
+      Logger.info("Cookies does not exist - creating it")
 
-      FilesystemUtils.write_p!(filepath, "")
+      FilesystemHelpers.write_p!(filepath, "")
-      File.chmod(filepath, 0o755)
     end
   end
 
   defp apply_default_settings do
-    {:ok, yt_dlp_version} = yt_dlp_runner().version()
+    Settings.fetch!(:onboarding, true)
-    {:ok, apprise_version} = apprise_runner().version()
+    Settings.fetch!(:pro_enabled, false)
-
-    Settings.set(yt_dlp_version: yt_dlp_version)
-    Settings.set(apprise_version: apprise_version)
-  end
-
-  defp yt_dlp_runner do
-    Application.get_env(:pinchflat, :yt_dlp_runner)
-  end
-
-  defp apprise_runner do
-    Application.get_env(:pinchflat, :apprise_runner)
   end
 end

lib/pinchflat/downloading/download_option_builder.ex

@@ -3,62 +3,45 @@ 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
 
-  alias Pinchflat.Utils.FilesystemUtils, as: FSUtils
-
   @doc """
   Builds the options for yt-dlp to download media based on the given media's profile.
 
-  Returns {:ok, [Keyword.t()]}
+  IDEA: consider adding the ability to pass in a second argument to override
+        these options
   """
-  def build(%MediaItem{} = media_item_with_preloads, override_opts \\ []) do
+  def build(%MediaItem{} = media_item_with_preloads) do
     media_profile = media_item_with_preloads.source.media_profile
 
     built_options =
-      default_options(override_opts) ++
+      default_options() ++
         subtitle_options(media_profile) ++
         thumbnail_options(media_item_with_preloads) ++
         metadata_options(media_profile) ++
         quality_options(media_profile) ++
         sponsorblock_options(media_profile) ++
-        output_options(media_item_with_preloads) ++
+        output_options(media_item_with_preloads)
-        config_file_options(media_item_with_preloads)
 
     {:ok, built_options}
   end
 
   @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.
-
-  Accepts a %MediaItem{} or %Source{} struct. If a %Source{} struct is passed, it
-  will use a default %MediaItem{} struct with the given source.
 
   Returns binary()
   """
-  def build_output_path_for(%MediaItem{} = media_item_with_preloads) do
-    output_path_template = Sources.output_path_template(media_item_with_preloads.source)
-
-    build_output_path(output_path_template, media_item_with_preloads)
-  end
-
   def build_output_path_for(%Source{} = source_with_preloads) do
-    build_output_path_for(%MediaItem{source: 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(override_opts) do
+  defp default_options do
-    overwrite_behaviour = Keyword.get(override_opts, :overwrite_behaviour, :force_overwrites)
+    [:no_progress, :windows_filenames]
-
-    [
-      :no_progress,
-      overwrite_behaviour,
-      # 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
@@ -121,27 +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
-
-    audio_format_precedence = [
-      "bestaudio[ext=m4a]",
-      "bestaudio[ext=mp3]",
-      "bestaudio",
-      "best[ext=m4a]",
-      "best[ext=mp3]",
-      "best"
-    ]
 
     case media_profile.preferred_resolution do
       # Also be aware that :audio disabled all embedding options for subtitles
-      :audio -> [:extract_audio, format: Enum.join(audio_format_precedence, "/")]
+      :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
 
@@ -156,58 +128,23 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
     end
   end
 
-  # This is put here instead of the CommandRunner module because it should only
-  # be applied to downloading - if it were in CommandRunner it would apply to
-  # all yt-dlp commands (like indexing)
-  defp config_file_options(media_item) do
-    base_dir = Path.join(Application.get_env(:pinchflat, :extras_directory), "yt-dlp-configs")
-    # Ordered by priority - the first file has the highest priority
-    filenames = [
-      "media-item-#{media_item.id}-config.txt",
-      "source-#{media_item.source_id}-config.txt",
-      "media-profile-#{media_item.source.media_profile_id}-config.txt",
-      "base-config.txt"
-    ]
-
-    config_filepaths =
-      Enum.reduce(filenames, [], fn filename, acc ->
-        filepath = Path.join(base_dir, filename)
-
-        if FSUtils.exists_and_nonempty?(filepath) do
-          [filepath | acc]
-        else
-          acc
-        end
-      end)
-
-    Enum.map(config_filepaths, fn filepath -> {:config_locations, filepath} end)
-  end
-
   defp output_options(media_item_with_preloads) do
     [
-      output: build_output_path_for(media_item_with_preloads)
+      output: build_output_path_for(media_item_with_preloads.source)
     ]
   end
 
-  defp build_output_path(string, media_item_with_preloads) do
+  defp build_output_path(string, source) do
-    additional_options_map = output_options_map(media_item_with_preloads)
+    additional_options_map = output_options_map(source)
     {:ok, output_path} = OutputPathBuilder.build(string, additional_options_map)
 
     Path.join(base_directory(), output_path)
   end
 
-  defp output_options_map(media_item_with_preloads) do
+  defp output_options_map(source) do
-    source = media_item_with_preloads.source
-
     %{
       "source_custom_name" => source.custom_name,
-      "source_collection_id" => source.collection_id,
+      "source_collection_type" => source.collection_type
-      "source_collection_name" => source.collection_name,
-      "source_collection_type" => to_string(source.collection_type),
-      "media_upload_date_index" =>
-        media_item_with_preloads.upload_date_index
-        |> to_string()
-        |> String.pad_leading(2, "0")
     }
   end
 
@@ -215,13 +152,13 @@ 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)
     |> List.insert_at(-3, "-thumb")
     |> Enum.join()
-    |> build_output_path(media_item_with_preloads)
+    |> build_output_path(media_item_with_preloads.source)
   end
 
   defp base_directory do

lib/pinchflat/downloading/downloading_helpers.ex

@@ -7,13 +7,9 @@ defmodule Pinchflat.Downloading.DownloadingHelpers do
 
   require Logger
 
-  use Pinchflat.Media.MediaQuery
-
-  alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
-  alias Pinchflat.Media.MediaItem
   alias Pinchflat.Downloading.MediaDownloadWorker
 
   @doc """
@@ -47,49 +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
-
-  @doc """
-  For a given source, enqueues download jobs for all media items _that have already been downloaded_.
-
-  This is useful for when a source's download settings have changed and you want to run through all
-  existing media and retry the download. For instance, if the source didn't originally download thumbnails
-  and you've changed the source to download them, you can use this to download all the thumbnails for
-  existing media items.
-
-  NOTE: does not delete existing files whatsoever. Does not overwrite the existing media file if it exists
-  at the location it expects. Will cause a full redownload of everything if the output template has changed
-
-  NOTE: unrelated to the MediaQualityUpgradeWorker, which is for redownloading media items for quality upgrades
-  or improved sponsorblock segments
-
-  Returns [{:ok, %Task{}} | {:error, any()}]
-  """
-  def kickoff_redownload_for_existing_media(%Source{} = source) do
-    MediaQuery.new()
-    |> MediaQuery.for_source(source)
-    |> MediaQuery.with_media_downloaded_at()
-    |> MediaQuery.where_download_not_prevented()
-    |> MediaQuery.where_not_culled()
-    |> Repo.all()
-    |> Enum.map(&MediaDownloadWorker.kickoff_with_task/1)
-  end
 end

lib/pinchflat/downloading/media_download_worker.ex

@@ -14,46 +14,33 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
   alias Pinchflat.Media
   alias Pinchflat.Downloading.MediaDownloader
 
-  alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
-
   @doc """
   Starts the media_item media download worker and creates a task for the media_item.
 
   Returns {:ok, %Task{}} | {:error, :duplicate_job} | {:error, %Ecto.Changeset{}}
   """
-  def kickoff_with_task(media_item, job_args \\ %{}, job_opts \\ []) do
+  def kickoff_with_task(media_item, opts \\ []) do
     %{id: media_item.id}
-    |> Map.merge(job_args)
+    |> MediaDownloadWorker.new(opts)
-    |> MediaDownloadWorker.new(job_opts)
     |> Tasks.create_job_with_task(media_item)
   end
 
   @doc """
   For a given media item, download the media alongside any options.
-  Does not download media if its source is set to not download media
+  Does not download media if its source is set to not download media.
-  (unless forced).
-
-  Options:
-    - `force`: force download even if the source is set to not download media. Fully
-      re-downloads media, including the video
-    - `quality_upgrade?`: re-downloads media, including the video. Does not force download
-      if the source is set to not download media
 
   Returns :ok | {:ok, %MediaItem{}} | {:error, any, ...any}
   """
   @impl Oban.Worker
-  def perform(%Oban.Job{args: %{"id" => media_item_id} = args}) do
+  def perform(%Oban.Job{args: %{"id" => media_item_id}}) do
-    should_force = Map.get(args, "force", false)
-    is_quality_upgrade = Map.get(args, "quality_upgrade?", false)
-
     media_item =
       media_item_id
       |> Media.get_media_item!()
       |> Repo.preload(:source)
 
-    # If the source or media item is set to not download media, perform a no-op unless forced
+    # If the source is set to not download media, perform a no-op
-    if (media_item.source.download_media && !media_item.prevent_download) || should_force do
+    if media_item.source.download_media do
-      download_media_and_schedule_jobs(media_item, is_quality_upgrade, should_force)
+      download_media_and_schedule_jobs(media_item)
     else
       :ok
     end
@@ -62,59 +49,25 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
     Ecto.StaleEntryError -> Logger.info("#{__MODULE__} discarded: media item #{media_item_id} stale")
   end
 
-  defp download_media_and_schedule_jobs(media_item, is_quality_upgrade, should_force) do
+  defp download_media_and_schedule_jobs(media_item) do
-    overwrite_behaviour = if should_force || is_quality_upgrade, do: :force_overwrites, else: :no_force_overwrites
+    case MediaDownloader.download_for_media_item(media_item) do
-    override_opts = [overwrite_behaviour: overwrite_behaviour]
+      {:ok, updated_media_item} ->
-
+        compute_and_save_media_filesize(updated_media_item)
-    case MediaDownloader.download_for_media_item(media_item, override_opts) do
-      {:ok, downloaded_media_item} ->
-        {:ok, updated_media_item} =
-          Media.update_media_item(downloaded_media_item, %{
-            media_size_bytes: compute_media_filesize(downloaded_media_item),
-            media_redownloaded_at: get_redownloaded_at(is_quality_upgrade)
-          })
-
-        :ok = run_user_script(updated_media_item)
 
         {:ok, updated_media_item}
 
-      {:recovered, _} ->
+      err ->
-        {:error, :retry}
+        err
-
-      {:error, message} ->
-        action_on_error(message)
     end
   end
 
-  defp compute_media_filesize(media_item) do
+  defp compute_and_save_media_filesize(media_item) do
     case File.stat(media_item.media_filepath) do
-      {:ok, %{size: size}} -> size
+      {:ok, %{size: size}} ->
-      _ -> nil
+        Media.update_media_item(media_item, %{media_size_bytes: size})
+
+      _ ->
+        :ok
     end
   end
-
-  defp get_redownloaded_at(true), do: DateTime.utc_now()
-  defp get_redownloaded_at(_), do: nil
-
-  defp action_on_error(message) do
-    # This will attempt re-download at the next indexing, but it won't be retried
-    # immediately as part of job failure logic
-    non_retryable_errors = ["Video unavailable"]
-
-    if String.contains?(to_string(message), non_retryable_errors) do
-      Logger.error("yt-dlp download will not be retried: #{inspect(message)}")
-
-      {:ok, :non_retry}
-    else
-      {:error, :download_failed}
-    end
-  end
-
-  # NOTE: I like this pattern of using the default value so that I don't have to
-  # define it in config.exs (and friends). Consider using this elsewhere.
-  defp run_user_script(media_item) do
-    runner = Application.get_env(:pinchflat, :user_script_runner, UserScriptRunner)
-
-    runner.run(:media_downloaded, media_item)
-  end
 end

lib/pinchflat/downloading/media_downloader.ex

@@ -5,15 +5,12 @@ defmodule Pinchflat.Downloading.MediaDownloader do
   to download the media with the desired options.
   """
 
-  require Logger
-
   alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Media.MediaItem
   alias Pinchflat.Metadata.NfoBuilder
   alias Pinchflat.Metadata.MetadataParser
   alias Pinchflat.Metadata.MetadataFileHelpers
-  alias Pinchflat.Utils.FilesystemUtils
   alias Pinchflat.Downloading.DownloadOptionBuilder
 
   alias Pinchflat.YtDlp.Media, as: YtDlpMedia
@@ -29,70 +26,34 @@ defmodule Pinchflat.Downloading.MediaDownloader do
 
   Returns {:ok, %MediaItem{}} | {:error, any, ...any}
   """
-  def download_for_media_item(%MediaItem{} = media_item, override_opts \\ []) do
+  def download_for_media_item(%MediaItem{} = media_item) do
-    output_filepath = FilesystemUtils.generate_metadata_tmpfile(:json)
+    item_with_preloads = Repo.preload(media_item, [:metadata, source: :media_profile])
-    media_with_preloads = Repo.preload(media_item, [:metadata, source: :media_profile])
 
-    case download_with_options(media_item.original_url, media_with_preloads, output_filepath, override_opts) do
+    case download_with_options(media_item.original_url, item_with_preloads) do
       {:ok, parsed_json} ->
-        update_media_item_from_parsed_json(media_with_preloads, parsed_json)
+        parsed_attrs =
+          parsed_json
+          |> MetadataParser.parse_for_media_item()
+          |> Map.merge(%{
+            media_downloaded_at: DateTime.utc_now(),
+            nfo_filepath: determine_nfo_filepath(item_with_preloads, parsed_json),
+            metadata: %{
+              # IDEA: might be worth kicking off a job for this since thumbnail fetching
+              # could fail and I want to handle that in isolation
+              metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(media_item, parsed_json),
+              thumbnail_filepath: MetadataFileHelpers.download_and_store_thumbnail_for(media_item, parsed_json)
+            }
+          })
 
-      {:error, message, _exit_code} ->
+        # Don't forgor to use preloaded associations or updates to
-        Logger.error("yt-dlp download error for media item ##{media_with_preloads.id}: #{inspect(message)}")
+        # associations won't work!
-
+        Media.update_media_item(item_with_preloads, parsed_attrs)
-        if String.contains?(to_string(message), recoverable_errors()) do
-          attempt_update_media_item(media_with_preloads, output_filepath)
-
-          {:recovered, message}
-        else
-          {:error, message}
-        end
 
       err ->
-        Logger.error("Unknown error downloading media item ##{media_with_preloads.id}: #{inspect(err)}")
+        err
-
-        {:error, "Unknown error: #{inspect(err)}"}
     end
   end
 
-  defp attempt_update_media_item(media_with_preloads, output_filepath) do
-    with {:ok, contents} <- File.read(output_filepath),
-         {:ok, parsed_json} <- Phoenix.json_library().decode(contents) do
-      Logger.info("""
-      Recovery from yt-dlp error seems possible. Updating media item ##{media_with_preloads.id}
-      with parsed JSON from partial download attempt. Full download will be re-attemted in future
-      anyway
-      """)
-
-      update_media_item_from_parsed_json(media_with_preloads, parsed_json)
-    else
-      err ->
-        Logger.error("Unable to recover error for media item ##{media_with_preloads.id}: #{inspect(err)}")
-
-        {:error, :retry_failed}
-    end
-  end
-
-  defp update_media_item_from_parsed_json(media_with_preloads, parsed_json) do
-    parsed_attrs =
-      parsed_json
-      |> MetadataParser.parse_for_media_item()
-      |> Map.merge(%{
-        media_downloaded_at: DateTime.utc_now(),
-        nfo_filepath: determine_nfo_filepath(media_with_preloads, parsed_json),
-        metadata: %{
-          # IDEA: might be worth kicking off a job for this since thumbnail fetching
-          # could fail and I want to handle that in isolation
-          metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(media_with_preloads, parsed_json),
-          thumbnail_filepath: MetadataFileHelpers.download_and_store_thumbnail_for(media_with_preloads, parsed_json)
-        }
-      })
-
-    # Don't forgor to use preloaded associations or updates to
-    # associations won't work!
-    Media.update_media_item(media_with_preloads, parsed_attrs)
-  end
-
   defp determine_nfo_filepath(media_item, parsed_json) do
     if media_item.source.media_profile.download_nfo do
       filepath = Path.rootname(parsed_json["filepath"]) <> ".nfo"
@@ -103,15 +64,9 @@ defmodule Pinchflat.Downloading.MediaDownloader do
     end
   end
 
-  defp download_with_options(url, item_with_preloads, output_filepath, override_opts) do
+  defp download_with_options(url, item_with_preloads) do
-    {:ok, options} = DownloadOptionBuilder.build(item_with_preloads, override_opts)
+    {:ok, options} = DownloadOptionBuilder.build(item_with_preloads)
 
-    YtDlpMedia.download(url, options, output_filepath: output_filepath)
+    YtDlpMedia.download(url, options)
-  end
-
-  defp recoverable_errors do
-    [
-      "Unable to communicate with SponsorBlock"
-    ]
   end
 end

lib/pinchflat/downloading/media_quality_upgrade_worker.ex

@@ -1,33 +0,0 @@
-defmodule Pinchflat.Downloading.MediaQualityUpgradeWorker do
-  @moduledoc false
-
-  use Oban.Worker,
-    queue: :media_fetching,
-    unique: [period: :infinity, states: [:available, :scheduled, :retryable, :executing]],
-    tags: ["media_item", "media_fetching"]
-
-  require Logger
-
-  alias Pinchflat.Media
-  alias Pinchflat.Downloading.MediaDownloadWorker
-
-  @doc """
-  Redownloads media items that are eligible for redownload for the purpose
-  of upgrading the quality of the media or improving things like sponsorblock
-  segments.
-
-  This worker is scheduled to run daily via the Oban Cron plugin
-  and it should run _after_ the retention worker.
-
-  Returns :ok
-  """
-  @impl Oban.Worker
-  def perform(%Oban.Job{}) do
-    redownloadable_media = Media.list_redownloadable_media_items()
-    Logger.info("Redownloading #{length(redownloadable_media)} media items")
-
-    Enum.each(redownloadable_media, fn media_item ->
-      MediaDownloadWorker.kickoff_with_task(media_item, %{quality_upgrade?: true})
-    end)
-  end
-end

lib/pinchflat/downloading/media_retention_worker.ex

@@ -1,33 +0,0 @@
-defmodule Pinchflat.Downloading.MediaRetentionWorker do
-  @moduledoc false
-
-  use Oban.Worker,
-    queue: :local_metadata,
-    unique: [period: :infinity, states: [:available, :scheduled, :retryable, :executing]],
-    tags: ["media_item", "local_metadata"]
-
-  require Logger
-
-  alias Pinchflat.Media
-
-  @doc """
-  Deletes media items that are past their retention date and prevents
-  them from being re-downloaded.
-
-  This worker is scheduled to run daily via the Oban Cron plugin.
-
-  Returns :ok
-  """
-  @impl Oban.Worker
-  def perform(%Oban.Job{}) do
-    cullable_media = Media.list_cullable_media_items()
-    Logger.info("Culling #{length(cullable_media)} media items past their retention date")
-
-    Enum.each(cullable_media, fn media_item ->
-      Media.delete_media_files(media_item, %{
-        prevent_download: true,
-        culled_at: DateTime.utc_now()
-      })
-    end)
-  end
-end

lib/pinchflat/downloading/output_path_builder.ex

@@ -9,23 +9,13 @@ defmodule Pinchflat.Downloading.OutputPathBuilder do
   Builds the actual final filepath from a given template. Optionally, you can pass in
   a map of additional options to be used in the template.
 
-  Custom options are recursively expanded _once_ so you can nest custom options
-  one-deep if needed.
-
   Translates liquid-style templates into yt-dlp-style templates,
   leaving yt-dlp syntax intact.
   """
   def build(template_string, additional_template_options \\ %{}) do
     combined_options = Map.merge(custom_yt_dlp_option_map(), additional_template_options)
 
-    expanded_options =
+    TemplateParser.parse(template_string, combined_options, &identifier_fn/2)
-      Enum.map(combined_options, fn {key, value} ->
-        {:ok, parse_result} = TemplateParser.parse(value, combined_options, &identifier_fn/2)
-
-        {key, parse_result}
-      end)
-
-    TemplateParser.parse(template_string, Map.new(expanded_options), &identifier_fn/2)
   end
 
   # The `nil` case simply wraps the identifier in yt-dlp-style syntax. This assumes that
@@ -53,7 +43,6 @@ defmodule Pinchflat.Downloading.OutputPathBuilder do
       "upload_yyyy_mm_dd" => "%(upload_date>%Y-%m-%d)S",
       "season_from_date" => "%(upload_date>%Y)S",
       "season_episode_from_date" => "s%(upload_date>%Y)Se%(upload_date>%m%d)S",
-      "season_episode_index_from_date" => "s%(upload_date>%Y)Se%(upload_date>%m%d)S{{ media_upload_date_index }}",
       "artist_name" => "%(artist,creator,uploader,uploader_id)S"
     }
   end

lib/pinchflat/fast_indexing/fast_indexing_helpers.ex

@@ -5,46 +5,62 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
   Many of these methods are made to be kickoff or be consumed by workers.
   """
 
-  require Logger
-
-  use Pinchflat.Media.MediaQuery
-
   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 :ok
   """
-  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)}")
+    end)
-            nil
+  end
+
+  @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
-      end)
 
-    DownloadingHelpers.enqueue_pending_download_tasks(source)
+        {:ok, media_item}
 
-    Enum.filter(maybe_new_media_items, & &1)
+      err ->
+        err
+    end
   end
 
   defp list_media_items_by_media_id_for(source, media_ids) do
@@ -54,15 +70,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
+    Media.create_media_item_from_backend_attrs(source, media_attrs)
-      {: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,12 +10,9 @@ defmodule Pinchflat.FastIndexing.FastIndexingWorker do
 
   alias __MODULE__
   alias Pinchflat.Tasks
-  alias Pinchflat.Media
   alias Pinchflat.Sources
-  alias Pinchflat.Settings
   alias Pinchflat.Sources.Source
   alias Pinchflat.FastIndexing.FastIndexingHelpers
-  alias Pinchflat.Lifecycle.Notifications.SourceNotifications
 
   @doc """
   Starts the source fast indexing worker and creates a task for the source.
@@ -29,21 +26,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 +37,8 @@ defmodule Pinchflat.FastIndexing.FastIndexingWorker do
     source = Sources.get_source!(source_id)
 
     if source.fast_index do
-      perform_indexing_and_send_notification(source)
+      FastIndexingHelpers.kickoff_indexing_tasks_from_youtube_rss_feed(source)
+
       reschedule_indexing(source)
     else
       :ok
@@ -62,19 +48,6 @@ defmodule Pinchflat.FastIndexing.FastIndexingWorker do
     Ecto.StaleEntryError -> Logger.info("#{__MODULE__} discarded: source #{source_id} stale")
   end
 
-  defp perform_indexing_and_send_notification(source) do
-    apprise_server = Settings.get!(:apprise_server)
-
-    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/filesystem/filesystem_helpers.ex

@@ -1,25 +1,10 @@
-defmodule Pinchflat.Utils.FilesystemUtils do
+defmodule Pinchflat.Filesystem.FilesystemHelpers do
   @moduledoc """
   Utility methods for working with the filesystem
   """
   alias Pinchflat.Media
   alias Pinchflat.Utils.StringUtils
 
-  @doc """
-  Checks if a file exists and has non-whitespace contents.
-
-  Returns boolean()
-  """
-  def exists_and_nonempty?(filepath) do
-    case File.read(filepath) do
-      {:ok, contents} ->
-        String.trim(contents) != ""
-
-      _ ->
-        false
-    end
-  end
-
   @doc """
   Generates a temporary file and returns its path. The file is empty and has the given type.
   Generates all the directories in the path if they don't exist.

lib/pinchflat/lifecycle/notifications/apprise_command_runner.ex

@@ -1,12 +0,0 @@
-defmodule Pinchflat.Lifecycle.Notifications.AppriseCommandRunner do
-  @moduledoc """
-  A behaviour for running CLI commands against a notification backend (apprise).
-
-  Used so we can implement Mox for testing without actually running the
-  apprise command.
-  """
-
-  @callback run(binary(), keyword()) :: :ok | {:error, binary()}
-  @callback run(List.t(), keyword()) :: :ok | {:error, binary()}
-  @callback version() :: {:ok, binary()} | {:error, binary()}
-end

lib/pinchflat/lifecycle/notifications/command_runner.ex

@@ -1,63 +0,0 @@
-defmodule Pinchflat.Lifecycle.Notifications.CommandRunner do
-  @moduledoc """
-  Runs apprise commands using the `System.cmd/3` function
-  """
-
-  require Logger
-
-  alias Pinchflat.Utils.CliUtils
-  alias Pinchflat.Utils.FunctionUtils
-  alias Pinchflat.Lifecycle.Notifications.AppriseCommandRunner
-
-  @behaviour AppriseCommandRunner
-
-  @doc """
-  Runs an apprise command and returns the string output.
-  Can take a single server string or a list of servers as well as additional
-  arguments to pass to the command.
-
-  Returns {:ok, binary()} | {:error, :no_servers} | {:error, binary()}
-  """
-  @impl AppriseCommandRunner
-  def run(nil, _), do: {:error, :no_servers}
-  def run("", _), do: {:error, :no_servers}
-  def run([], _), do: {:error, :no_servers}
-
-  def run(endpoints, command_opts) do
-    endpoints = List.wrap(endpoints)
-    default_opts = [:verbose]
-    parsed_opts = CliUtils.parse_options(default_opts ++ command_opts)
-
-    {output, exit_code} = CliUtils.wrap_cmd(backend_executable(), parsed_opts ++ endpoints)
-
-    case exit_code do
-      0 -> {:ok, String.trim(output)}
-      _ -> {:error, String.trim(output)}
-    end
-  end
-
-  @doc """
-  Returns the version of apprise as a string.
-
-  Returns {:ok, binary()} | {:error, binary()}
-  """
-  @impl AppriseCommandRunner
-  def version do
-    case CliUtils.wrap_cmd(backend_executable(), ["--version"]) do
-      {output, 0} ->
-        output
-        |> String.split(~r{\r?\n})
-        |> List.first()
-        |> String.replace("Apprise", "")
-        |> String.trim()
-        |> FunctionUtils.wrap_ok()
-
-      {output, _} ->
-        {:error, output}
-    end
-  end
-
-  defp backend_executable do
-    Application.get_env(:pinchflat, :apprise_executable)
-  end
-end

lib/pinchflat/lifecycle/notifications/source_notifications.ex

@@ -1,82 +0,0 @@
-defmodule Pinchflat.Lifecycle.Notifications.SourceNotifications do
-  @moduledoc """
-  Contains utilities for sending notifications about sources
-  """
-
-  require Logger
-
-  use Pinchflat.Media.MediaQuery
-
-  alias Pinchflat.Repo
-
-  @doc """
-  Wraps a function that may change the number of pending  or downloaded
-  media items for a source, sending an apprise notification if
-  the count changes.
-
-  Returns the return value of the provided function
-  """
-  def wrap_new_media_notification(servers, source, func) do
-    before_count = relevant_media_item_count(source)
-    retval = func.()
-    after_count = relevant_media_item_count(source)
-
-    send_new_media_notification(servers, source, after_count - before_count)
-
-    retval
-  end
-
-  @doc """
-  Sends a notification if the count of new media items has changed
-
-  Returns :ok
-  """
-  def send_new_media_notification(_, _, count) when count <= 0, do: :ok
-
-  def send_new_media_notification(servers, source, changed_count) do
-    opts = [
-      title: "[Pinchflat] New media found",
-      body: "Found #{changed_count} new media item(s) for #{source.custom_name}. Downloading them now"
-    ]
-
-    case backend_runner().run(servers, opts) do
-      {:ok, _} ->
-        Logger.info("Sent new media notification for source #{source.id}")
-
-      {:error, :no_servers} ->
-        Logger.info("No notification servers provided for source #{source.id}")
-
-      {:error, err} ->
-        Logger.error("Failed to send new media notification for source #{source.id}: #{err}")
-    end
-
-    :ok
-  end
-
-  defp relevant_media_item_count(source) do
-    if source.download_media do
-      pending_media_item_count(source) + downloaded_media_item_count(source)
-    else
-      0
-    end
-  end
-
-  defp pending_media_item_count(source) do
-    MediaQuery.new()
-    |> MediaQuery.for_source(source)
-    |> MediaQuery.where_pending_download()
-    |> Repo.aggregate(:count)
-  end
-
-  defp downloaded_media_item_count(source) do
-    MediaQuery.new()
-    |> MediaQuery.for_source(source)
-    |> MediaQuery.with_media_filepath()
-    |> Repo.aggregate(:count)
-  end
-
-  defp backend_runner do
-    # This approach lets us mock the command for testing
-    Application.get_env(:pinchflat, :apprise_runner)
-  end
-end

lib/pinchflat/lifecycle/user_scripts/command_runner.ex

@@ -1,70 +0,0 @@
-defmodule Pinchflat.Lifecycle.UserScripts.CommandRunner do
-  @moduledoc """
-  Runs custom user commands commands using the `System.cmd/3` function
-  """
-
-  require Logger
-
-  alias Pinchflat.Utils.CliUtils
-  alias Pinchflat.Utils.FilesystemUtils
-  alias Pinchflat.Lifecycle.UserScripts.UserScriptCommandRunner
-
-  @behaviour UserScriptCommandRunner
-
-  @event_types [
-    :media_downloaded,
-    :media_deleted
-  ]
-
-  @doc """
-  Runs the user script command for the given event type. Passes the event
-  and the encoded data to the user script command.
-
-  This function will succeed in almost all cases, even if the user script command
-  failed - this is because I don't want bad scripts to stop the whole process.
-  If something fails, it'll be logged.
-
-  The only things that can cause a true failure are passing in an invalid event
-  type or if the passed data cannot be encoded into JSON - both indicative of
-  failures in the development process.
-
-  Returns :ok
-  """
-  @impl UserScriptCommandRunner
-  def run(event_type, encodable_data) when event_type in @event_types do
-    case backend_executable() do
-      {:ok, :no_executable} ->
-        :ok
-
-      {:ok, executable_path} ->
-        {:ok, encoded_data} = Phoenix.json_library().encode(encodable_data)
-
-        {_output, _exit_code} =
-          CliUtils.wrap_cmd(
-            executable_path,
-            [to_string(event_type), encoded_data],
-            [],
-            logging_arg_override: "[suppressed]"
-          )
-
-        :ok
-    end
-  end
-
-  def run(event_type, _encodable_data) do
-    raise ArgumentError, "Invalid event type: #{inspect(event_type)}"
-  end
-
-  defp backend_executable do
-    base_dir = Application.get_env(:pinchflat, :extras_directory)
-    filepath = Path.join([base_dir, "user-scripts", "lifecycle"])
-
-    if FilesystemUtils.exists_and_nonempty?(filepath) do
-      {:ok, filepath}
-    else
-      Logger.warning("User scripts lifecyle file either not present or is empty. Skipping.")
-
-      {:ok, :no_executable}
-    end
-  end
-end

lib/pinchflat/lifecycle/user_scripts/user_script_command_runner.ex

@@ -1,10 +0,0 @@
-defmodule Pinchflat.Lifecycle.UserScripts.UserScriptCommandRunner do
-  @moduledoc """
-  A behaviour for running custom user scripts on certain events.
-
-  Used so we can implement Mox for testing without actually running the
-  user's command.
-  """
-
-  @callback run(atom(), map()) :: :ok | {:error, binary()}
-end

lib/pinchflat/media/media.ex

@@ -4,16 +4,14 @@ defmodule Pinchflat.Media do
   """
 
   import Ecto.Query, warn: false
-  use Pinchflat.Media.MediaQuery
 
   alias Pinchflat.Repo
   alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
   alias Pinchflat.Media.MediaItem
-  alias Pinchflat.Utils.FilesystemUtils
+  alias Pinchflat.Media.MediaQuery
   alias Pinchflat.Metadata.MediaMetadata
-
+  alias Pinchflat.Filesystem.FilesystemHelpers
-  alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
 
   @doc """
   Returns the list of media_items.
@@ -24,57 +22,39 @@ defmodule Pinchflat.Media do
     Repo.all(MediaItem)
   end
 
-  @doc """
-  Returns a list of media_items that are cullable based on the retention period
-  of the source they belong to.
-
-  Returns [%MediaItem{}, ...]
-  """
-  def list_cullable_media_items do
-    MediaQuery.new()
-    |> MediaQuery.with_media_filepath()
-    |> MediaQuery.where_past_retention_period()
-    |> MediaQuery.where_culling_not_prevented()
-    |> Repo.all()
-  end
-
-  @doc """
-  Returns a list of media_items that are redownloadable based on the redownload delay
-  of the media_profile their source belongs to.
-
-  The logic is that a media_item is past_redownload_delay if the media_item's
-  upload_date is at least redownload_delay_days ago AND
-  `media_downloaded_at` - `redownload_delay_days` is before the media_item's `upload_date`.
-  This logic grabs media that we've recently downloaded AND is recently uploaded, but
-  doesn't grab media that we've recently downloaded and was uploaded a long time ago.
-  This also makes things work as expected when downloading media from a source for the
-  first time.
-
-  Returns [%MediaItem{}, ...]
-  """
-  def list_redownloadable_media_items do
-    MediaQuery.new()
-    |> MediaQuery.with_media_downloaded_at()
-    |> MediaQuery.where_download_not_prevented()
-    |> MediaQuery.where_not_culled()
-    |> MediaQuery.where_media_not_redownloaded()
-    |> MediaQuery.where_past_redownload_delay()
-    |> Repo.all()
-  end
-
   @doc """
   Returns a list of pending media_items for a given source, where
   pending means the `media_filepath` is `nil` AND the media_item
-  matches satisfies `MediaQuery.where_pending_download`. You
+  matches the format selection rules of the parent media_profile.
-  should really check out that function if you need to know more
+
-  because it has a lot going on.
+  See `build_format_clauses` but tl;dr is it _may_ filter based
+  on shorts or livestreams depending on the media_profile settings.
 
   Returns [%MediaItem{}, ...].
   """
-  def list_pending_media_items_for(%Source{} = source) do
+  def list_pending_media_items_for(%Source{} = source, opts \\ []) do
+    limit = Keyword.get(opts, :limit, nil)
+    source = Repo.preload(source, :media_profile)
+
     MediaQuery.new()
     |> MediaQuery.for_source(source)
-    |> MediaQuery.where_pending_download()
+    |> matching_download_criteria_for(source)
+    |> Repo.maybe_limit(limit)
+    |> Repo.all()
+  end
+
+  @doc """
+  Returns a list of downloaded media_items for a given source.
+
+  Returns [%MediaItem{}, ...].
+  """
+  def list_downloaded_media_items_for(%Source{} = source, opts \\ []) do
+    limit = Keyword.get(opts, :limit, nil)
+
+    MediaQuery.new()
+    |> MediaQuery.for_source(source)
+    |> MediaQuery.with_media_filepath()
+    |> Repo.maybe_limit(limit)
     |> Repo.all()
   end
 
@@ -92,7 +72,7 @@ defmodule Pinchflat.Media do
 
     MediaQuery.new()
     |> MediaQuery.with_id(media_item.id)
-    |> MediaQuery.where_pending_download()
+    |> matching_download_criteria_for(media_item.source)
     |> Repo.exists?()
   end
 
@@ -181,8 +161,7 @@ defmodule Pinchflat.Media do
     Tasks.delete_tasks_for(media_item)
 
     if delete_files do
-      {:ok, _} = do_delete_media_files(media_item)
+      {:ok, _} = delete_media_files(media_item)
-      :ok = run_user_script(:media_deleted, media_item)
     end
 
     # Should delete these no matter what
@@ -190,26 +169,6 @@ defmodule Pinchflat.Media do
     Repo.delete(media_item)
   end
 
-  @doc """
-  Deletes the tasks and media files associated with a media_item but leaves the
-  media_item in the database. Does not delete anything to do with associated metadata.
-
-  Optionally accepts a second argument `addl_attrs` which will be merged into the
-  media_item before it is updated. Useful for setting things like `prevent_download`
-  and `culled_at`, if wanted
-
-  Returns {:ok, %MediaItem{}} | {:error, %Ecto.Changeset{}}
-  """
-  def delete_media_files(%MediaItem{} = media_item, addl_attrs \\ %{}) do
-    filepath_attrs = MediaItem.filepath_attribute_defaults()
-
-    Tasks.delete_tasks_for(media_item)
-    {:ok, _} = do_delete_media_files(media_item)
-    :ok = run_user_script(:media_deleted, media_item)
-
-    update_media_item(media_item, Map.merge(filepath_attrs, addl_attrs))
-  end
-
   @doc """
   Returns an `%Ecto.Changeset{}` for tracking media_item changes.
   """
@@ -217,7 +176,7 @@ defmodule Pinchflat.Media do
     MediaItem.changeset(media_item, attrs)
   end
 
-  defp do_delete_media_files(media_item) do
+  defp delete_media_files(media_item) do
     mapped_struct = Map.from_struct(media_item)
 
     MediaItem.filepath_attributes()
@@ -227,7 +186,7 @@ defmodule Pinchflat.Media do
     end)
     |> List.flatten()
     |> Enum.filter(&is_binary/1)
-    |> Enum.each(&FilesystemUtils.delete_file_and_remove_empty_directories/1)
+    |> Enum.each(&FilesystemHelpers.delete_file_and_remove_empty_directories/1)
 
     {:ok, media_item}
   end
@@ -239,12 +198,14 @@ defmodule Pinchflat.Media do
     MediaMetadata.filepath_attributes()
     |> Enum.map(fn field -> mapped_struct[field] end)
     |> Enum.filter(&is_binary/1)
-    |> Enum.each(&FilesystemUtils.delete_file_and_remove_empty_directories/1)
+    |> Enum.each(&FilesystemHelpers.delete_file_and_remove_empty_directories/1)
   end
 
-  defp run_user_script(event, media_item) do
+  defp matching_download_criteria_for(query, source_with_preloads) do
-    runner = Application.get_env(:pinchflat, :user_script_runner, UserScriptRunner)
+    query
-
+    |> MediaQuery.with_no_media_filepath()
-    runner.run(event, media_item)
+    |> MediaQuery.with_upload_date_after(source_with_preloads.download_cutoff_date)
+    |> MediaQuery.with_format_preference(source_with_preloads.media_profile)
+    |> MediaQuery.matching_title_regex(source_with_preloads.title_filter_regex)
   end
 end

lib/pinchflat/media/media_item.ex

@@ -4,14 +4,9 @@ defmodule Pinchflat.Media.MediaItem do
   """
 
   use Ecto.Schema
-  use Pinchflat.Media.MediaQuery
-
   import Ecto.Changeset
   import Pinchflat.Utils.ChangesetUtils
 
-  alias __MODULE__
-  alias Pinchflat.Repo
-  alias Pinchflat.Sources
   alias Pinchflat.Tasks.Task
   alias Pinchflat.Sources.Source
   alias Pinchflat.Metadata.MediaMetadata
@@ -27,7 +22,6 @@ defmodule Pinchflat.Media.MediaItem do
     :source_id,
     :short_form_content,
     :upload_date,
-    :upload_date_index,
     :duration_seconds,
     # these fields are captured only on download
     :media_downloaded_at,
@@ -36,12 +30,7 @@ defmodule Pinchflat.Media.MediaItem do
     :subtitle_filepaths,
     :thumbnail_filepath,
     :metadata_filepath,
-    :nfo_filepath,
+    :nfo_filepath
-    # These are user or system controlled fields
-    :prevent_download,
-    :prevent_culling,
-    :culled_at,
-    :media_redownloaded_at
   ]
   # Pretty much all the fields captured at index are required.
   @required_fields ~w(
@@ -53,7 +42,7 @@ defmodule Pinchflat.Media.MediaItem do
     source_id
     upload_date
     short_form_content
-  )a
+    )a
 
   schema "media_items" do
     # This is _not_ used as the primary key or internally in the database
@@ -68,9 +57,7 @@ defmodule Pinchflat.Media.MediaItem do
     field :livestream, :boolean, default: false
     field :short_form_content, :boolean, default: false
     field :media_downloaded_at, :utc_datetime
-    field :media_redownloaded_at, :utc_datetime
     field :upload_date, :date
-    field :upload_date_index, :integer, default: 0
     field :duration_seconds, :integer
 
     field :media_filepath, :string
@@ -83,10 +70,6 @@ defmodule Pinchflat.Media.MediaItem do
     # Will very likely revisit because I can't leave well-enough alone.
     field :subtitle_filepaths, {:array, {:array, :string}}, default: []
 
-    field :prevent_download, :boolean, default: false
-    field :prevent_culling, :boolean, default: false
-    field :culled_at, :utc_datetime
-
     field :matching_search_term, :string, virtual: true
 
     belongs_to :source, Source
@@ -105,7 +88,6 @@ defmodule Pinchflat.Media.MediaItem do
     |> cast(attrs, @allowed_fields)
     |> cast_assoc(:metadata, with: &MediaMetadata.changeset/2, required: false)
     |> dynamic_default(:uuid, fn _ -> Ecto.UUID.generate() end)
-    |> update_upload_date_index()
     |> validate_required(@required_fields)
     |> unique_constraint([:media_id, :source_id])
   end
@@ -114,52 +96,4 @@ defmodule Pinchflat.Media.MediaItem do
   def filepath_attributes do
     ~w(media_filepath thumbnail_filepath metadata_filepath subtitle_filepaths nfo_filepath)a
   end
-
-  @doc false
-  def filepath_attribute_defaults do
-    filepath_attributes()
-    |> Enum.map(fn
-      :subtitle_filepaths -> {:subtitle_filepaths, []}
-      field -> {field, nil}
-    end)
-    |> Enum.into(%{})
-  end
-
-  @doc false
-  def json_exluded_fields do
-    ~w(__meta__ __struct__ metadata tasks media_items_search_index)a
-  end
-
-  defp update_upload_date_index(%{changes: changes} = changeset) when is_map_key(changes, :upload_date) do
-    source_id = get_field(changeset, :source_id)
-    source = Sources.get_source!(source_id)
-    # Channels should count down from 99, playlists should count up from 0
-    # This reflects the fact that channels prepend new videos to the top of the list
-    # and playlists append new videos to the bottom of the list.
-    default_index = if source.collection_type == :channel, do: 99, else: 0
-    aggregator = if source.collection_type == :channel, do: :min, else: :max
-    change_direction = if source.collection_type == :channel, do: -1, else: 1
-
-    current_max =
-      MediaQuery.new()
-      |> MediaQuery.for_source(source_id)
-      |> MediaQuery.where_uploaded_on_date(changes.upload_date)
-      |> Repo.aggregate(aggregator, :upload_date_index)
-
-    case current_max do
-      nil -> put_change(changeset, :upload_date_index, default_index)
-      max -> put_change(changeset, :upload_date_index, max + change_direction)
-    end
-  end
-
-  defp update_upload_date_index(changeset), do: changeset
-
-  defimpl Jason.Encoder, for: MediaItem do
-    def encode(value, opts) do
-      value
-      |> Repo.preload(:source)
-      |> Map.drop(MediaItem.json_exluded_fields())
-      |> Jason.Encode.map(opts)
-    end
-  end
 end

lib/pinchflat/media/media_query.ex

@@ -3,93 +3,34 @@ defmodule Pinchflat.Media.MediaQuery do
   Query helpers for the Media context.
 
   These methods are made to be one-ish liners used
-  to compose queries. Each method should strive to do
+  to compose queries for media items. Each method should
-  _one_ thing. These don't need to be tested as
+  strive to do _one_ thing. These don't need to be tested
-  they are just building blocks for other functionality
+  as they are just building blocks for other functionality
   which, itself, will be tested.
+
+  ALSO, this is me trying something new. If I like it,
+  I'll refactor other contexts to use this pattern.
   """
   import Ecto.Query, warn: false
 
   alias Pinchflat.Media.MediaItem
 
-  # This allows the module to be aliased and query methods to be used
-  # all in one go
-  # usage: use Pinchflat.Media.MediaQuery
-  defmacro __using__(_opts) do
-    quote do
-      import Ecto.Query, warn: false
-
-      alias unquote(__MODULE__)
-    end
-  end
-
   # Prefixes:
   # - for_* - belonging to a certain record
-  # - join_* - for joining on a certain record
+  # - with_* - for filtering based on full, concrete attributes
-  # - with_*, where_* - for filtering based on full, concrete attributes
   # - matching_* - for filtering based on partial attributes (e.g. LIKE, regex, full-text search)
   #
   # Suffixes:
   # - _for - the arg passed is an association record
 
-  # NOTE: that dyanmic query approach kinda rocked - should refactor in future
-
   def new do
     MediaItem
   end
 
-  def for_source(query, source_id) when is_integer(source_id) do
-    where(query, [mi], mi.source_id == ^source_id)
-  end
-
   def for_source(query, source) do
     where(query, [mi], mi.source_id == ^source.id)
   end
 
-  def join_sources(query) do
-    from(mi in query, join: s in assoc(mi, :source), as: :sources)
-  end
-
-  def where_past_retention_period(query) do
-    query
-    |> require_assoc(:source)
-    |> where(
-      [mi, source],
-      fragment("""
-      IFNULL(retention_period_days, 0) > 0 AND
-      DATETIME('now', '-' || retention_period_days || ' day') > media_downloaded_at
-      """)
-    )
-  end
-
-  def where_past_redownload_delay(query) do
-    query
-    |> require_assoc(:source)
-    |> require_assoc(:media_profile)
-    |> where(
-      [_mi, _source, _media_profile],
-      # Returns media items where the upload_date is at least redownload_delay_days ago AND
-      # downloaded_at minus the redownload_delay_days is before the upload date
-      fragment("""
-        IFNULL(redownload_delay_days, 0) > 0 AND
-        DATETIME('now', '-' || redownload_delay_days || ' day') > upload_date AND
-        DATETIME(media_downloaded_at, '-' || redownload_delay_days || ' day') < upload_date
-      """)
-    )
-  end
-
-  def where_culling_not_prevented(query) do
-    where(query, [mi], mi.prevent_culling == false)
-  end
-
-  def where_not_culled(query) do
-    where(query, [mi], is_nil(mi.culled_at))
-  end
-
-  def where_media_not_redownloaded(query) do
-    where(query, [mi], is_nil(mi.media_redownloaded_at))
-  end
-
   def with_id(query, id) do
     where(query, [mi], mi.id == ^id)
   end
@@ -98,10 +39,6 @@ defmodule Pinchflat.Media.MediaQuery do
     where(query, [mi], mi.media_id in ^media_ids)
   end
 
-  def with_media_downloaded_at(query) do
-    where(query, [mi], not is_nil(mi.media_downloaded_at))
-  end
-
   def with_media_filepath(query) do
     where(query, [mi], not is_nil(mi.media_filepath))
   end
@@ -110,27 +47,16 @@ defmodule Pinchflat.Media.MediaQuery do
     where(query, [mi], is_nil(mi.media_filepath))
   end
 
-  def with_upload_date_after_source_cutoff(query) do
+  def with_upload_date_after(query, nil), do: query
-    query
+
-    |> require_assoc(:source)
+  def with_upload_date_after(query, date) do
-    |> where([mi, source], is_nil(source.download_cutoff_date) or mi.upload_date >= source.download_cutoff_date)
+    where(query, [mi], mi.upload_date >= ^date)
   end
 
-  def where_uploaded_on_date(query, date) do
+  def matching_title_regex(query, nil), do: query
-    where(query, [mi], mi.upload_date == ^date)
-  end
 
-  def where_download_not_prevented(query) do
+  def matching_title_regex(query, regex) do
-    where(query, [mi], mi.prevent_download == false)
+    where(query, [mi], fragment("regexp_like(?, ?)", mi.title, ^regex))
-  end
-
-  def matching_source_title_regex(query) do
-    query
-    |> require_assoc(:source)
-    |> where(
-      [mi, source],
-      is_nil(source.title_filter_regex) or fragment("regexp_like(?, ?)", mi.title, source.title_filter_regex)
-    )
   end
 
   def matching_search_term(query, nil), do: query
@@ -151,61 +77,44 @@ defmodule Pinchflat.Media.MediaQuery do
     )
   end
 
-  def with_format_matching_profile_preference(query) do
+  # NOTE: this method breaks the contract set by other methods in that it
-    query
+  # takes a media_profile struct instead of taking just the attributes it
-    |> require_assoc(:media_profile)
+  # cares about. Consider refactoring but low priority.
-    |> where(
+  def with_format_preference(query, media_profile) do
-      fragment("""
+    mapped_struct = Map.from_struct(media_profile)
-        CASE
-          WHEN shorts_behaviour = 'only' AND livestream_behaviour = 'only' THEN
-            livestream = true OR short_form_content = true
-          WHEN shorts_behaviour = 'only' THEN
-            short_form_content = true
-          WHEN livestream_behaviour = 'only' THEN
-            livestream = true
-          WHEN shorts_behaviour = 'exclude' AND livestream_behaviour = 'exclude' THEN
-            short_form_content = false AND livestream = false
-          WHEN shorts_behaviour = 'exclude' THEN
-            short_form_content = false
-          WHEN livestream_behaviour = 'exclude' THEN
-            livestream = false
-          ELSE
-            true
-        END
-      """)
-    )
-  end
 
-  def where_pending_download(query) do
+    finders =
-    query
+      Enum.reduce(mapped_struct, dynamic(true), fn attr, dynamic ->
-    |> where_download_not_prevented()
+        case {attr, media_profile} do
-    |> with_no_media_filepath()
+          {{:shorts_behaviour, :only}, %{livestream_behaviour: :only}} ->
-    |> with_upload_date_after_source_cutoff()
+            dynamic(
-    |> with_format_matching_profile_preference()
+              [mi],
-    |> matching_source_title_regex()
+              ^dynamic and (mi.livestream == true or mi.short_form_content == true)
-  end
+            )
 
-  def where_pending_or_downloaded(query) do
+          # Technically redundant, but makes the other clauses easier to parse
-    query
+          # (redundant because this condition is the same as the condition above, just flipped)
-    |> where_pending_download()
+          {{:livestream_behaviour, :only}, %{shorts_behaviour: :only}} ->
-    |> or_where([mi], not is_nil(mi.media_downloaded_at))
+            dynamic
-  end
 
-  defp require_assoc(query, identifier) do
+          {{:shorts_behaviour, :only}, _} ->
-    if has_named_binding?(query, identifier) do
+            dynamic([mi], ^dynamic and mi.short_form_content == true)
-      query
-    else
-      do_require_assoc(query, identifier)
-    end
-  end
 
-  defp do_require_assoc(query, :source) do
+          {{:livestream_behaviour, :only}, _} ->
-    from(mi in query, join: s in assoc(mi, :source), as: :source)
+            dynamic([mi], ^dynamic and mi.livestream == true)
-  end
 
-  defp do_require_assoc(query, :media_profile) do
+          {{:shorts_behaviour, :exclude}, %{livestream_behaviour: lb}} when lb != :only ->
-    query
+            dynamic([mi], ^dynamic and mi.short_form_content == false)
-    |> require_assoc(:source)
+
-    |> join(:inner, [mi, source], mp in assoc(source, :media_profile), as: :media_profile)
+          {{:livestream_behaviour, :exclude}, %{shorts_behaviour: sb}} when sb != :only ->
+            # return records with livestream: false
+            dynamic([mi], ^dynamic and mi.livestream == false)
+
+          _ ->
+            dynamic
+        end
+      end)
+
+    where(query, ^finders)
   end
 end

lib/pinchflat/metadata/metadata_file_helpers.ex

@@ -9,7 +9,7 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
   needed
   """
 
-  alias Pinchflat.Utils.FilesystemUtils
+  alias Pinchflat.Filesystem.FilesystemHelpers
 
   @doc """
   Returns the directory where metadata for a database record should be stored.
@@ -36,7 +36,7 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
     filepath = generate_filepath_for(database_record, "metadata.json.gz")
     {:ok, json} = Phoenix.json_library().encode(metadata_map)
 
-    :ok = FilesystemUtils.write_p!(filepath, json, [:compressed])
+    :ok = FilesystemHelpers.write_p!(filepath, json, [:compressed])
 
     filepath
   end
@@ -54,36 +54,17 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
 
   @doc """
   Downloads and stores a thumbnail for a media item, returning the filepath.
-  Chooses the highest quality thumbnail available (preferring jpg). Returns
-  nil if no thumbnails are available.
 
-  Returns binary() | nil
+  Returns binary()
   """
   def download_and_store_thumbnail_for(database_record, metadata_map) do
-    thumbnails =
+    thumbnail_url = metadata_map["thumbnail"]
-      (metadata_map["thumbnails"] || [])
+    filepath = generate_filepath_for(database_record, Path.basename(thumbnail_url))
-      # Give it a low preference if the `preference` key doesn't exist
+    thumbnail_blob = fetch_thumbnail_from_url(thumbnail_url)
-      |> Enum.map(&Map.put_new(&1, "preference", -1000))
-      # Give it a low preference if image isn't a jpg
-      |> Enum.map(fn t ->
-        preference_weight = if String.ends_with?(t["url"], ".jpg"), do: t["preference"], else: t["preference"] - 1000
 
-        Map.put(t, "preference", preference_weight)
+    :ok = FilesystemHelpers.write_p!(filepath, thumbnail_blob)
-      end)
 
-    case Enum.sort_by(thumbnails, & &1["preference"], :desc) do
+    filepath
-      [thumbnail_map | _] ->
-        thumbnail_url = thumbnail_map["url"]
-        filepath = generate_filepath_for(database_record, Path.basename(thumbnail_url))
-        thumbnail_blob = fetch_thumbnail_from_url(thumbnail_url)
-
-        :ok = FilesystemUtils.write_p!(filepath, thumbnail_blob)
-
-        filepath
-
-      _ ->
-        nil
-    end
   end
 
   @doc """

lib/pinchflat/metadata/metadata_parser.ex

@@ -30,7 +30,7 @@ defmodule Pinchflat.Metadata.MetadataParser do
       original_url: metadata["original_url"],
       description: metadata["description"],
       media_filepath: metadata["filepath"],
-      livestream: !!metadata["was_live"],
+      livestream: metadata["was_live"],
       duration_seconds: metadata["duration"] && round(metadata["duration"])
     }
   end

lib/pinchflat/metadata/nfo_builder.ex

@@ -4,10 +4,8 @@ defmodule Pinchflat.Metadata.NfoBuilder do
   use by Kodi/Jellyfin and other media center software.
   """
 
-  import Pinchflat.Utils.XmlUtils, only: [safe: 1]
-
   alias Pinchflat.Metadata.MetadataFileHelpers
-  alias Pinchflat.Utils.FilesystemUtils
+  alias Pinchflat.Filesystem.FilesystemHelpers
 
   @doc """
   Builds an NFO file for a media item (read: single "episode") and
@@ -18,7 +16,7 @@ defmodule Pinchflat.Metadata.NfoBuilder do
   def build_and_store_for_media_item(filepath, metadata) do
     nfo = build_for_media_item(metadata)
 
-    FilesystemUtils.write_p!(filepath, nfo)
+    FilesystemHelpers.write_p!(filepath, nfo)
 
     filepath
   end
@@ -32,7 +30,7 @@ defmodule Pinchflat.Metadata.NfoBuilder do
   def build_and_store_for_source(filepath, metadata) do
     nfo = build_for_source(metadata)
 
-    FilesystemUtils.write_p!(filepath, nfo)
+    FilesystemHelpers.write_p!(filepath, nfo)
 
     filepath
   end
@@ -44,12 +42,12 @@ defmodule Pinchflat.Metadata.NfoBuilder do
     """
     <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
     <episodedetails>
-      <title>#{safe(metadata["title"])}</title>
+      <title>#{metadata["title"]}</title>
-      <showtitle>#{safe(metadata["uploader"])}</showtitle>
+      <showtitle>#{metadata["uploader"]}</showtitle>
-      <uniqueid type="youtube" default="true">#{safe(metadata["id"])}</uniqueid>
+      <uniqueid type="youtube" default="true">#{metadata["id"]}</uniqueid>
-      <plot>#{safe(metadata["description"])}</plot>
+      <plot>#{metadata["description"]}</plot>
-      <aired>#{safe(upload_date)}</aired>
+      <aired>#{upload_date}</aired>
-      <season>#{safe(upload_date.year)}</season>
+      <season>#{upload_date.year}</season>
       <episode>#{Calendar.strftime(upload_date, "%m%d")}</episode>
       <genre>YouTube</genre>
     </episodedetails>
@@ -60,9 +58,9 @@ defmodule Pinchflat.Metadata.NfoBuilder do
     """
     <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
     <tvshow>
-      <title>#{safe(metadata["title"])}</title>
+      <title>#{metadata["title"]}</title>
-      <plot>#{safe(metadata["description"])}</plot>
+      <plot>#{metadata["description"]}</plot>
-      <uniqueid type="youtube" default="true">#{safe(metadata["id"])}</uniqueid>
+      <uniqueid type="youtube" default="true">#{metadata["id"]}</uniqueid>
       <genre>YouTube</genre>
     </tvshow>
     """

lib/pinchflat/metadata/source_image_parser.ex

@@ -2,7 +2,7 @@ defmodule Pinchflat.Metadata.SourceImageParser do
   @moduledoc """
   Functions for parsing and storing source images.
   """
-  alias Pinchflat.Utils.FilesystemUtils
+  alias Pinchflat.Filesystem.FilesystemHelpers
 
   @doc """
   Given a base directory and source metadata, look for the appropriate images
@@ -62,7 +62,7 @@ defmodule Pinchflat.Metadata.SourceImageParser do
     extension = Path.extname(tmp_filepath)
     final_filepath = Path.join([base_directory, "#{filename}#{extension}"])
 
-    FilesystemUtils.cp_p!(tmp_filepath, final_filepath)
+    FilesystemHelpers.cp_p!(tmp_filepath, final_filepath)
 
     {source_attr_name, final_filepath}
   end

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/podcasts/podcast_helpers.ex

@@ -4,9 +4,8 @@ defmodule Pinchflat.Podcasts.PodcastHelpers do
   or its media items
   """
 
-  use Pinchflat.Media.MediaQuery
-
   alias Pinchflat.Repo
+  alias Pinchflat.Media
   alias Pinchflat.Metadata.MediaMetadata
   alias Pinchflat.Metadata.SourceMetadata
 
@@ -24,14 +23,10 @@ defmodule Pinchflat.Podcasts.PodcastHelpers do
   Returns: [%MediaItem{}]
   """
   def persisted_media_items_for(source, opts \\ []) do
-    limit = Keyword.get(opts, :limit, 1_000)
+    limit = Keyword.get(opts, :limit, 500)
 
-    MediaQuery.new()
+    source
-    |> MediaQuery.for_source(source)
+    |> Media.list_downloaded_media_items_for(limit: limit)
-    |> MediaQuery.with_media_filepath()
-    |> order_by(desc: :upload_date)
-    |> Repo.maybe_limit(limit)
-    |> Repo.all()
     |> Enum.filter(fn media_item -> File.exists?(media_item.media_filepath) end)
   end
 

lib/pinchflat/podcasts/rss_feed_builder.ex

@@ -5,8 +5,6 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
 
   @datetime_format "%a, %d %b %Y %H:%M:%S %z"
 
-  import Pinchflat.Utils.XmlUtils, only: [safe: 1]
-
   alias Pinchflat.Utils.DatetimeUtils
   alias Pinchflat.Podcasts.PodcastHelpers
   alias PinchflatWeb.Router.Helpers, as: Routes
@@ -16,12 +14,12 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
   Only MediaItems that have been persisted will be included in the feed.
 
   ## Options:
-    - `:limit` - The maximum number of media items to include in the feed. Defaults to 2,000.
+    - `:limit` - The maximum number of media items to include in the feed. Defaults to 300.
 
   Returns an XML document as a string.
   """
   def build(source, opts \\ []) do
-    limit = Keyword.get(opts, :limit, 2_000)
+    limit = Keyword.get(opts, :limit, 300)
     url_base = Keyword.get(opts, :url_base, PinchflatWeb.Endpoint.url())
 
     media_items = PodcastHelpers.persisted_media_items_for(source, limit: limit)
@@ -45,25 +43,25 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
       xmlns:atom="http://www.w3.org/2005/Atom">
       <channel>
         <title>#{safe(source.custom_name)}</title>
-        <link>#{safe(source.original_url)}</link>
+        <link>#{source.original_url}</link>
         <description>#{safe(source.description)}</description>
         <category>TV &amp; Film</category>
         <generator>Generated by Pinchflat</generator>
         <language>en-us</language>
         <lastBuildDate>#{Calendar.strftime(source.updated_at, @datetime_format)}</lastBuildDate>
         <pubDate>#{Calendar.strftime(source.inserted_at, @datetime_format)}</pubDate>
-        <atom:link href="#{safe(generate_self_link(url_base, source))}" rel="self" type="application/rss+xml" />
+        <atom:link href="#{generate_self_link(url_base, source)}" rel="self" type="application/rss+xml" />
         <podcast:locked>yes</podcast:locked>
         <podcast:guid>#{source.uuid}</podcast:guid>
         <image>
-          <url>#{safe(feed_image_path)}</url>
+          <url>#{feed_image_path}</url>
           <title>#{safe(source.custom_name)}</title>
-          <link>#{safe(source.original_url)}</link>
+          <link>#{source.original_url}</link>
         </image>
         <itunes:author>#{safe(source.custom_name)}</itunes:author>
         <itunes:subtitle>#{safe(source.custom_name)}</itunes:subtitle>
         <itunes:block>yes</itunes:block>
-        <itunes:image href="#{safe(feed_image_path)}"></itunes:image>
+        <itunes:image href="#{feed_image_path}"></itunes:image>
         <itunes:explicit>false</itunes:explicit>
         <itunes:category text="TV &amp; Film"></itunes:category>
 
@@ -75,13 +73,11 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
   end
 
   defp build_media_item_xml(source, media_item, url_base) do
-    item_image_path = item_image_path(url_base, media_item)
-
     """
     <item>
       <guid isPermaLink="false">#{media_item.uuid}</guid>
       <title>#{safe(media_item.title)}</title>
-      <link>#{safe(media_item.original_url)}</link>
+      <link>#{media_item.original_url}</link>
       <description>#{safe(media_item.description)}</description>
       <pubDate>#{generate_upload_date(media_item)}</pubDate>
       <itunes:duration>#{media_item.duration_seconds}</itunes:duration>
@@ -93,15 +89,19 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
       <itunes:author>#{safe(source.custom_name)}</itunes:author>
       <itunes:subtitle>#{safe(media_item.title)}</itunes:subtitle>
       <itunes:summary><![CDATA[#{media_item.description}]]></itunes:summary>
-
-      #{item_image_path && ~s(<itunes:image href="#{safe(item_image_path)}"></itunes:image>)}
-      #{item_image_path && ~s(<podcast:images srcset="#{safe(item_image_path)}" />)}
-
       <itunes:explicit>false</itunes:explicit>
     </item>
     """
   end
 
+  defp safe(nil), do: ""
+
+  defp safe(value) do
+    value
+    |> Phoenix.HTML.html_escape()
+    |> Phoenix.HTML.safe_to_string()
+  end
+
   defp generate_self_link(url_base, source) do
     Path.join(url_base, "#{podcast_route(:rss_feed, source.uuid)}.xml")
   end
@@ -123,16 +123,6 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
     end
   end
 
-  def item_image_path(url_base, media_item) do
-    if media_item.thumbnail_filepath && File.exists?(media_item.thumbnail_filepath) do
-      extension = Path.extname(media_item.thumbnail_filepath)
-
-      Path.join(url_base, "#{podcast_route(:episode_image, media_item.uuid)}#{extension}")
-    else
-      nil
-    end
-  end
-
   defp generate_upload_date(media_item) do
     media_item.upload_date
     |> DatetimeUtils.date_to_datetime()

lib/pinchflat/profiles/media_profile.ex

@@ -6,7 +6,6 @@ defmodule Pinchflat.Profiles.MediaProfile do
   use Ecto.Schema
   import Ecto.Changeset
 
-  alias __MODULE__
   alias Pinchflat.Sources.Source
 
   @allowed_fields ~w(
@@ -27,14 +26,12 @@ defmodule Pinchflat.Profiles.MediaProfile do
     shorts_behaviour
     livestream_behaviour
     preferred_resolution
-    redownload_delay_days
   )a
 
   @required_fields ~w(name output_path_template)a
 
   schema "media_profiles" do
     field :name, :string
-    field :redownload_delay_days, :integer
 
     field :output_path_template, :string,
       default: "/{{ source_custom_name }}/{{ upload_yyyy_mm_dd }} {{ title }}/{{ title }} [{{ id }}].{{ ext }}"
@@ -63,6 +60,7 @@ defmodule Pinchflat.Profiles.MediaProfile do
     # See `build_format_clauses` in the Media context for more.
     field :shorts_behaviour, Ecto.Enum, values: ~w(include exclude only)a, default: :include
     field :livestream_behaviour, Ecto.Enum, values: ~w(include exclude only)a, default: :include
+
     field :preferred_resolution, Ecto.Enum, values: ~w(2160p 1080p 720p 480p 360p audio)a, default: :"1080p"
 
     has_many :sources, Source
@@ -77,25 +75,10 @@ defmodule Pinchflat.Profiles.MediaProfile do
     |> validate_required(@required_fields)
     # Ensures it ends with `.{{ ext }}` or `.%(ext)s` or similar (with a little wiggle room)
     |> validate_format(:output_path_template, ext_regex(), message: "must end with .{{ ext }}")
-    |> validate_number(:redownload_delay_days, greater_than_or_equal_to: 0)
     |> unique_constraint(:name)
   end
 
-  @doc false
+  defp ext_regex do
-  def ext_regex do
     ~r/\.({{ ?ext ?}}|%\( ?ext ?\)[sS])$/
   end
-
-  @doc false
-  def json_exluded_fields do
-    ~w(__meta__ __struct__ sources)a
-  end
-
-  defimpl Jason.Encoder, for: MediaProfile do
-    def encode(value, opts) do
-      value
-      |> Map.drop(MediaProfile.json_exluded_fields())
-      |> Jason.Encode.map(opts)
-    end
-  end
 end

lib/pinchflat/release.ex

@@ -7,7 +7,7 @@ defmodule Pinchflat.Release do
 
   require Logger
 
-  alias Pinchflat.Utils.FilesystemUtils
+  alias Pinchflat.Filesystem.FilesystemHelpers
 
   def migrate do
     load_app()
@@ -26,23 +26,20 @@ defmodule Pinchflat.Release do
     load_app()
 
     directories =
-      [
+      Enum.uniq([
         "/config",
         "/downloads",
         Application.get_env(:pinchflat, :media_directory),
         Application.get_env(:pinchflat, :tmpfile_directory),
         Application.get_env(:pinchflat, :extras_directory),
-        Application.get_env(:pinchflat, :metadata_directory),
+        Application.get_env(:pinchflat, :metadata_directory)
-        Application.get_env(:tzdata, :data_dir)
+      ])
-      ]
-      |> Enum.uniq()
-      |> Enum.filter(&(&1 != nil))
 
     Enum.each(directories, fn dir ->
       Logger.info("Checking permissions for #{dir}")
       filepath = Path.join([dir, ".keep"])
 
-      case FilesystemUtils.write_p(filepath, "") do
+      case FilesystemHelpers.write_p(filepath, "") do
         :ok ->
           Logger.info("Permissions OK")
 

lib/pinchflat/settings/setting.ex

@@ -1,36 +1,24 @@
 defmodule Pinchflat.Settings.Setting do
   @moduledoc """
-  The Setting schema.
+  A Setting is a key-value pair with a datatype used to track user-level settings.
   """
 
   use Ecto.Schema
   import Ecto.Changeset
 
-  @allowed_fields [
-    :onboarding,
-    :pro_enabled,
-    :yt_dlp_version,
-    :apprise_version,
-    :apprise_server
-  ]
-
-  @required_fields ~w(
-    onboarding
-    pro_enabled
-  )a
-
   schema "settings" do
-    field :onboarding, :boolean, default: true
+    field :name, :string
-    field :pro_enabled, :boolean, default: false
+    field :value, :string
-    field :yt_dlp_version, :string
+    field :datatype, Ecto.Enum, values: ~w(boolean string integer float)a
-    field :apprise_version, :string
+
-    field :apprise_server, :string
+    timestamps(type: :utc_datetime)
   end
 
   @doc false
   def changeset(setting, attrs) do
     setting
-    |> cast(attrs, @allowed_fields)
+    |> cast(attrs, [:name, :value, :datatype])
-    |> validate_required(@required_fields)
+    |> validate_required([:name, :value, :datatype])
+    |> unique_constraint([:name])
   end
 end

lib/pinchflat/settings/settings.ex

@@ -2,80 +2,94 @@ defmodule Pinchflat.Settings do
   @moduledoc """
   The Settings context.
   """
-  import Ecto.Query, warn: false
 
+  import Ecto.Query, warn: false
   alias Pinchflat.Repo
+
   alias Pinchflat.Settings.Setting
 
   @doc """
-  Returns the only setting record. It _should_ be impossible
+  Returns the list of settings.
-  to create or delete this record, so it's assertive about
-  assuming it's the only one.
 
-  Returns %Setting{}
+  Returns [%Setting{}, ...]
   """
-  def record do
+  def list_settings do
-    Setting
+    Repo.all(Setting)
-    |> limit(1)
-    |> Repo.one()
   end
 
   @doc """
-  Updates the setting record.
+  Creates or updates a setting, returning the parsed value.
+  Raises if an unsupported datatype is used. Optionally allows
+  specifying the datatype.
 
-  Returns {:ok, %Setting{}} | {:error, %Ecto.Changeset{}}
+  Returns value in type of `Ecto.Enum.mappings(Setting, :datatype)`
   """
-  def update_setting(%Setting{} = setting, attrs) do
+  def set!(name, value) do
-    setting
+    set!(name, value, infer_datatype(value))
-    |> Setting.changeset(attrs)
-    |> Repo.update()
   end
 
-  @doc """
+  def set!(name, value, datatype) do
-  Updates a setting, returning the new value.
+    # Only create if doesn't exist
-  Is setup to take a keyword list argument so you
+    case Repo.get_by(Setting, name: to_string(name)) do
-  can call it like `Settings.set(onboarding: true)`
+      nil -> create_setting!(name, value, datatype)
-
+      setting -> update_setting!(setting, value, datatype)
-  Returns {:ok, value} | {:error, :invalid_key} | {:error, %Ecto.Changeset{}}
-  """
-  def set([{attr, value}]) do
-    record()
-    |> update_setting(%{attr => value})
-    |> case do
-      {:ok, %{^attr => _}} -> {:ok, value}
-      {:ok, _} -> {:error, :invalid_key}
-      {:error, changeset} -> {:error, changeset}
     end
   end
 
   @doc """
-  Gets the value of a setting.
+  Gets the parsed value of a setting. Raises if the setting does not exist.
 
-  Returns {:ok, value} | {:error, :invalid_key}
+  Returns value in type of `Ecto.Enum.mappings(Setting, :datatype)`
-  """
-  def get(name) do
-    case Map.fetch(record(), name) do
-      {:ok, value} -> {:ok, value}
-      :error -> {:error, :invalid_key}
-    end
-  end
-
-  @doc """
-  Gets the value of a setting, raising if it doesn't exist.
-
-  Returns value
   """
   def get!(name) do
-    case get(name) do
+    Setting
-      {:ok, value} -> value
+    |> Repo.get_by!(name: to_string(name))
-      {:error, _} -> raise "Setting `#{name}` not found"
+    |> read_setting()
-    end
   end
 
   @doc """
-  Returns `%Ecto.Changeset{}`
+  Attempts to find a setting by name or creates a setting with value
+  if one doesn't exist, returning the parsed value. Optionally allows
+  specifying the datatype.
+
+  Returns value in type of `Ecto.Enum.mappings(Setting, :datatype)`
   """
-  def change_setting(%Setting{} = setting, attrs \\ %{}) do
+  def fetch!(name, value) do
+    fetch!(name, value, infer_datatype(value))
+  end
+
+  def fetch!(name, value, datatype) do
+    case Repo.get_by(Setting, name: to_string(name)) do
+      nil -> create_setting!(name, value, datatype)
+      setting -> read_setting(setting)
+    end
+  end
+
+  defp change_setting(setting, attrs) do
     Setting.changeset(setting, attrs)
   end
+
+  defp create_setting!(name, value, datatype) do
+    %Setting{}
+    |> change_setting(%{name: to_string(name), value: to_string(value), datatype: datatype})
+    |> Repo.insert!()
+    |> read_setting()
+  end
+
+  defp update_setting!(setting, value, datatype) do
+    setting
+    |> change_setting(%{value: to_string(value), datatype: datatype})
+    |> Repo.update!()
+    |> read_setting()
+  end
+
+  defp read_setting(%{value: value, datatype: :string}), do: value
+  defp read_setting(%{value: value, datatype: :boolean}), do: value in ["true", "t", "1"]
+  defp read_setting(%{value: value, datatype: :integer}), do: String.to_integer(value)
+  defp read_setting(%{value: value, datatype: :float}), do: String.to_float(value)
+
+  defp infer_datatype(value) when is_boolean(value), do: :boolean
+  defp infer_datatype(value) when is_integer(value), do: :integer
+  defp infer_datatype(value) when is_float(value), do: :float
+  defp infer_datatype(value) when is_binary(value), do: :string
 end

lib/pinchflat/slow_indexing/media_collection_indexing_worker.ex

@@ -11,21 +11,18 @@ defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorker do
   alias __MODULE__
   alias Pinchflat.Tasks
   alias Pinchflat.Sources
-  alias Pinchflat.Settings
   alias Pinchflat.Sources.Source
   alias Pinchflat.FastIndexing.FastIndexingWorker
   alias Pinchflat.SlowIndexing.SlowIndexingHelpers
-  alias Pinchflat.Lifecycle.Notifications.SourceNotifications
 
   @doc """
   Starts the source slow indexing worker and creates a task for the source.
 
   Returns {:ok, %Task{}} | {:error, :duplicate_job} | {:error, %Ecto.Changeset{}}
   """
-  def kickoff_with_task(source, job_args \\ %{}, job_opts \\ []) do
+  def kickoff_with_task(source, opts \\ []) do
     %{id: source.id}
-    |> Map.merge(job_args)
+    |> MediaCollectionIndexingWorker.new(opts)
-    |> MediaCollectionIndexingWorker.new(job_opts)
     |> Tasks.create_job_with_task(source)
   end
 
@@ -33,8 +30,8 @@ defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorker do
   The ID is that of a source _record_, not a YouTube channel/playlist ID. Indexes
   the provided source, kicks off downloads for each new MediaItem, and
   reschedules the job to run again in the future. It will ALWAYS index a source
-  if it's never been indexed before or if `force` is set to `true`, but rescheduling
+  if it's never been indexed before, but rescheduling is determined by the
-  is determined by the `index_frequency_minutes` field.
+  `index_frequency_minutes` field.
 
   README: Re-scheduling here works a little different than you may expect.
   The reschedule time is relative to the time the job has actually _completed_.
@@ -61,8 +58,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
@@ -73,29 +71,25 @@ defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorker do
   Returns :ok | {:ok, %Task{}}
   """
   @impl Oban.Worker
-  def perform(%Oban.Job{args: %{"id" => source_id} = args}) do
+  def perform(%Oban.Job{args: %{"id" => source_id}}) do
     source = Sources.get_source!(source_id)
 
     case {source.index_frequency_minutes, source.last_indexed_at} do
       {index_freq, _} when index_freq > 0 ->
         # If the indexing is on a schedule simply run indexing and reschedule
-        perform_indexing_and_notification(source)
+        SlowIndexingHelpers.index_and_enqueue_download_for_media_items(source)
         maybe_enqueue_fast_indexing_task(source)
         reschedule_indexing(source)
 
       {_, nil} ->
         # If the source has never been indexed, index it once
         # even if it's not meant to reschedule
-        perform_indexing_and_notification(source)
+        SlowIndexingHelpers.index_and_enqueue_download_for_media_items(source)
         :ok
 
       _ ->
         # If the source HAS been indexed and is not meant to reschedule,
-        # perform a no-op (unless forced)
+        # perform a no-op
-        if args["force"] do
-          perform_indexing_and_notification(source)
-        end
-
         :ok
     end
   rescue
@@ -103,14 +97,6 @@ defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorker do
     Ecto.StaleEntryError -> Logger.info("#{__MODULE__} discarded: source #{source_id} stale")
   end
 
-  defp perform_indexing_and_notification(source) do
-    apprise_server = Settings.get!(:apprise_server)
-
-    SourceNotifications.wrap_new_media_notification(apprise_server, source, fn ->
-      SlowIndexingHelpers.index_and_enqueue_download_for_media_items(source)
-    end)
-  end
-
   defp reschedule_indexing(source) do
     next_run_in = source.index_frequency_minutes * 60
 

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
@@ -26,11 +27,12 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
 
   Returns {:ok, %Task{}}.
   """
-  def kickoff_indexing_task(%Source{} = source, job_args \\ %{}, job_opts \\ []) do
+  def kickoff_indexing_task(%Source{} = source) 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)
+    MediaCollectionIndexingWorker.kickoff_with_task(source)
   end
 
   @doc """
@@ -58,7 +60,7 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   def index_and_enqueue_download_for_media_items(%Source{} = source) do
     # See the method definition below for more info on how file watchers work
     # (important reading if you're not familiar with it)
-    {:ok, media_attributes} = setup_file_watcher_and_kickoff_indexing(source)
+    {:ok, media_attributes} = get_media_attributes_for_collection_and_setup_file_watcher(source)
     # Reload because the source may have been updated during the (long-running) indexing process
     # and important settings like `download_media` may have changed.
     source = Repo.reload!(source)
@@ -82,15 +84,15 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   # lines (ie: you should gracefully fail if you can't parse a line).
   #
   # This works in-tandem with the normal (blocking) media indexing behaviour. When
-  # the `setup_file_watcher_and_kickoff_indexing` method completes it'll return the
+  # the `get_media_attributes_for_collection` method completes it'll return the FULL result to
-  # FULL result to the caller for parsing. Ideally, every item in the list will have already
+  # the caller for parsing. Ideally, every item in the list will have already
   # been processed by the file follower, but if not, the caller handles creation
   # of any media items that were missed/initially failed.
   #
   # It attempts a graceful shutdown of the file follower after the indexing is done,
   # but the FileFollowerServer will also stop itself if it doesn't see any activity
   # for a sufficiently long time.
-  defp setup_file_watcher_and_kickoff_indexing(source) do
+  defp get_media_attributes_for_collection_and_setup_file_watcher(source) do
     {:ok, pid} = FileFollowerServer.start_link()
 
     handler = fn filepath -> setup_file_follower_watcher(pid, filepath, source) end
@@ -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

@@ -7,8 +7,6 @@ defmodule Pinchflat.Sources.Source do
   import Ecto.Changeset
   import Pinchflat.Utils.ChangesetUtils
 
-  alias __MODULE__
-  alias Pinchflat.Repo
   alias Pinchflat.Tasks.Task
   alias Pinchflat.Media.MediaItem
   alias Pinchflat.Profiles.MediaProfile
@@ -31,10 +29,8 @@ defmodule Pinchflat.Sources.Source do
     last_indexed_at
     original_url
     download_cutoff_date
-    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
@@ -76,10 +72,8 @@ defmodule Pinchflat.Sources.Source do
     field :last_indexed_at, :utc_datetime
     # Only download media items that were published after this date
     field :download_cutoff_date, :date
-    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
@@ -112,11 +106,7 @@ defmodule Pinchflat.Sources.Source do
     |> dynamic_default(:custom_name, fn cs -> get_field(cs, :collection_name) end)
     |> 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
 
   @doc false
@@ -135,18 +125,4 @@ defmodule Pinchflat.Sources.Source do
   def filepath_attributes do
     ~w(nfo_filepath fanart_filepath poster_filepath banner_filepath)a
   end
-
-  @doc false
-  def json_exluded_fields do
-    ~w(__meta__ __struct__ metadata tasks media_items)a
-  end
-
-  defimpl Jason.Encoder, for: Source do
-    def encode(value, opts) do
-      value
-      |> Repo.preload(:media_profile)
-      |> Map.drop(Source.json_exluded_fields())
-      |> Jason.Encode.map(opts)
-    end
-  end
 end

lib/pinchflat/sources/sources.ex

@@ -4,34 +4,21 @@ defmodule Pinchflat.Sources do
   """
 
   import Ecto.Query, warn: false
-  use Pinchflat.Media.MediaQuery
-
   alias Pinchflat.Repo
+
   alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
+  alias Pinchflat.Media.MediaQuery
   alias Pinchflat.Profiles.MediaProfile
   alias Pinchflat.YtDlp.MediaCollection
   alias Pinchflat.Metadata.SourceMetadata
-  alias Pinchflat.Utils.FilesystemUtils
+  alias Pinchflat.Filesystem.FilesystemHelpers
   alias Pinchflat.Downloading.DownloadingHelpers
   alias Pinchflat.FastIndexing.FastIndexingWorker
   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{}, ...]
   """
@@ -166,7 +153,7 @@ defmodule Pinchflat.Sources do
     Source.filepath_attributes()
     |> Enum.map(fn field -> mapped_struct[field] end)
     |> Enum.filter(&is_binary/1)
-    |> Enum.each(&FilesystemUtils.delete_file_and_remove_empty_directories/1)
+    |> Enum.each(&FilesystemHelpers.delete_file_and_remove_empty_directories/1)
   end
 
   defp delete_internal_metadata_files(source) do
@@ -176,7 +163,7 @@ defmodule Pinchflat.Sources do
     SourceMetadata.filepath_attributes()
     |> Enum.map(fn field -> mapped_struct[field] end)
     |> Enum.filter(&is_binary/1)
-    |> Enum.each(&FilesystemUtils.delete_file_and_remove_empty_directories/1)
+    |> Enum.each(&FilesystemHelpers.delete_file_and_remove_empty_directories/1)
   end
 
   defp add_source_details_to_changeset(source, changeset) do
@@ -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
+    SourceMetadataStorageWorker.kickoff_with_task(source)
-      {%{__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/sources/sources_query.ex

@@ -1,31 +0,0 @@
-defmodule Pinchflat.Sources.SourcesQuery do
-  @moduledoc """
-  Query helpers for the Sources context.
-
-  These methods are made to be one-ish liners used
-  to compose queries. Each method should strive to do
-  _one_ thing. These don't need to be tested as
-  they are just building blocks for other functionality
-  which, itself, will be tested.
-  """
-  import Ecto.Query, warn: false
-
-  alias Pinchflat.Sources.Source
-
-  # Prefixes:
-  # - for_* - belonging to a certain record
-  # - join_* - for joining on a certain record
-  # - with_* - for filtering based on full, concrete attributes
-  # - matching_* - for filtering based on partial attributes (e.g. LIKE, regex, full-text search)
-  #
-  # Suffixes:
-  # - _for - the arg passed is an association record
-
-  def new do
-    Source
-  end
-
-  def for_media_profile(query, media_profile) do
-    where(query, [s], s.media_profile_id == ^media_profile.id)
-  end
-end

lib/pinchflat/utils/cli_utils.ex

@@ -1,94 +0,0 @@
-defmodule Pinchflat.Utils.CliUtils do
-  @moduledoc """
-  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. Custom options can be passed in.
-
-  Custom options:
-    - logging_arg_override: if set, the passed value will be logged in place of
-      the actual arguments passed to the command
-
-  Returns {binary(), integer()}
-  """
-  def wrap_cmd(command, args, passthrough_opts \\ [], opts \\ []) do
-    wrapper_command = Path.join(:code.priv_dir(:pinchflat), "cmd_wrapper.sh")
-    actual_command = [command] ++ args
-    command_opts = set_command_opts() ++ passthrough_opts
-    logging_arg_override = Keyword.get(opts, :logging_arg_override, Enum.join(args, " "))
-
-    Logger.info("[command_wrapper]: #{command} called with: #{logging_arg_override}")
-
-    {output, status} = System.cmd(wrapper_command, actual_command, command_opts)
-    log_cmd_result(command, logging_arg_override, status, output)
-
-    {output, status}
-  end
-
-  @doc """
-  Parses a list of command options into a list of strings suitable for passing to
-  `System.cmd/3`.
-
-  We want to satisfy the following behaviours:
-    1. If the key is an atom, convert it to a string and convert it to kebab case (for convenience)
-    2. If the key is a string, assume we want it as-is and don't convert it
-    3. If the key is accompanied by a value, append the value to the list
-    4. If the key is not accompanied by a value, assume it's a flag and PREpend it to the list
-
-  Returns [binary()]
-  """
-  def parse_options(command_opts) do
-    command_opts
-    |> List.wrap()
-    |> Enum.reduce([], &parse_option/2)
-  end
-
-  defp parse_option({k, v}, acc) when is_atom(k) do
-    stringified_key = StringUtils.to_kebab_case(Atom.to_string(k))
-
-    parse_option({"--#{stringified_key}", v}, acc)
-  end
-
-  defp parse_option({k, v}, acc) when is_binary(k) do
-    acc ++ [k, to_string(v)]
-  end
-
-  defp parse_option(arg, acc) when is_atom(arg) do
-    stringified_arg =
-      arg
-      |> Atom.to_string()
-      |> StringUtils.to_kebab_case()
-
-    parse_option("--#{stringified_arg}", acc)
-  end
-
-  defp parse_option(arg, acc) when is_binary(arg) do
-    acc ++ [arg]
-  end
-
-  defp log_cmd_result(command, logging_arg_override, status, output) do
-    log_message = "[command_wrapper]: #{command} called with: #{logging_arg_override} exited: #{status} with: #{output}"
-    log_level = if status == 0, do: :debug, else: :error
-
-    Logger.log(log_level, log_message)
-  end
-
-  defp set_command_opts do
-    # This resolves an issue where yt-dlp would attempt to write to a read-only directory
-    # if you scanned a new video with `--windows-filenames` enabled. Hopefully can be removed
-    # in the future.
-    [
-      cd: Application.get_env(:pinchflat, :tmpfile_directory)
-    ]
-  end
-end

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/utils/xml_utils.ex

@@ -1,17 +0,0 @@
-defmodule Pinchflat.Utils.XmlUtils do
-  @moduledoc """
-  Utility methods for working with XML documents
-  """
-
-  @doc """
-  Escapes invalid XML characters in a string
-
-  Returns binary()
-  """
-  def safe(value) do
-    value
-    |> to_string()
-    |> Phoenix.HTML.html_escape()
-    |> Phoenix.HTML.safe_to_string()
-  end
-end

lib/pinchflat/yt_dlp/backend_command_runner.ex

@@ -1,4 +1,4 @@
-defmodule Pinchflat.YtDlp.YtDlpCommandRunner do
+defmodule Pinchflat.YtDlp.BackendCommandRunner do
   @moduledoc """
   A behaviour for running CLI commands against a downloader backend (yt-dlp).
 
@@ -8,5 +8,4 @@ defmodule Pinchflat.YtDlp.YtDlpCommandRunner do
 
   @callback run(binary(), keyword(), binary()) :: {:ok, binary()} | {:error, binary(), integer()}
   @callback run(binary(), keyword(), binary(), keyword()) :: {:ok, binary()} | {:error, binary(), integer()}
-  @callback version() :: {:ok, binary()} | {:error, binary()}
 end

lib/pinchflat/yt_dlp/command_runner.ex

@@ -3,11 +3,13 @@ defmodule Pinchflat.YtDlp.CommandRunner do
   Runs yt-dlp commands using the `System.cmd/3` function
   """
 
-  alias Pinchflat.Utils.CliUtils
+  require Logger
-  alias Pinchflat.YtDlp.YtDlpCommandRunner
-  alias Pinchflat.Utils.FilesystemUtils, as: FSUtils
 
-  @behaviour YtDlpCommandRunner
+  alias Pinchflat.Utils.StringUtils
+  alias Pinchflat.Filesystem.FilesystemHelpers, as: FSUtils
+  alias Pinchflat.YtDlp.BackendCommandRunner
+
+  @behaviour BackendCommandRunner
 
   @doc """
   Runs a yt-dlp command and returns the string output. Saves the output to
@@ -21,19 +23,20 @@ defmodule Pinchflat.YtDlp.CommandRunner do
 
   Returns {:ok, binary()} | {:error, output, status}.
   """
-  @impl YtDlpCommandRunner
+  @impl BackendCommandRunner
   def run(url, command_opts, output_template, addl_opts \\ []) do
     # This approach lets us mock the command for testing
     command = backend_executable()
-
-    output_filepath = generate_output_filepath(addl_opts)
-    print_to_file_opts = [{:print_to_file, output_template}, output_filepath]
-    user_configured_opts = cookie_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 ++ global_options()
+    # Also, can't use RAM file since yt-dlp needs a concrete filepath.
-    formatted_command_opts = [url] ++ CliUtils.parse_options(all_opts)
+    output_filepath = Keyword.get(addl_opts, :output_filepath, FSUtils.generate_metadata_tmpfile(:json))
+    print_to_file_opts = [{:print_to_file, output_template}, output_filepath]
+    cookie_opts = build_cookie_options()
+    formatted_command_opts = [url] ++ parse_options(command_opts ++ print_to_file_opts ++ cookie_opts)
 
-    case CliUtils.wrap_cmd(command, formatted_command_opts, stderr_to_stdout: true) do
+    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.
@@ -45,52 +48,47 @@ defmodule Pinchflat.YtDlp.CommandRunner do
     end
   end
 
-  @doc """
+  defp build_cookie_options do
-  Returns the version of yt-dlp as a string
-
-  Returns {:ok, binary()} | {:error, binary()}
-  """
-  @impl YtDlpCommandRunner
-  def version do
-    command = backend_executable()
-
-    case CliUtils.wrap_cmd(command, ["--version"]) do
-      {output, 0} ->
-        {:ok, String.trim(output)}
-
-      {output, _} ->
-        {:error, output}
-    end
-  end
-
-  defp generate_output_filepath(addl_opts) do
-    case Keyword.get(addl_opts, :output_filepath) do
-      nil -> FSUtils.generate_metadata_tmpfile(:json)
-      path -> path
-    end
-  end
-
-  defp global_options do
-    [
-      :windows_filenames,
-      :quiet,
-      cache_dir: Path.join(Application.get_env(:pinchflat, :tmpfile_directory), "yt-dlp-cache")
-    ]
-  end
-
-  defp cookie_file_options do
     base_dir = Application.get_env(:pinchflat, :extras_directory)
-    filename_options_map = %{cookies: "cookies.txt"}
+    cookie_file = Path.join(base_dir, "cookies.txt")
 
-    Enum.reduce(filename_options_map, [], fn {opt_name, filename}, acc ->
+    case File.read(cookie_file) do
-      filepath = Path.join(base_dir, filename)
+      {:ok, cookie_data} ->
+        if String.trim(cookie_data) != "", do: [cookies: cookie_file], else: []
 
-      if FSUtils.exists_and_nonempty?(filepath) do
+      {:error, _} ->
-        [{opt_name, filepath} | acc]
+        []
-      else
+    end
-        acc
+  end
-      end
+
-    end)
+  # We want to satisfy the following behaviours:
+  #
+  # 1. If the key is an atom, convert it to a string and convert it to kebab case (for convenience)
+  # 2. If the key is a string, assume we want it as-is and don't convert it
+  # 3. If the key is accompanied by a value, append the value to the list
+  # 4. If the key is not accompanied by a value, assume it's a flag and PREpend it to the list
+  defp parse_options(command_opts) do
+    Enum.reduce(command_opts, [], &parse_option/2)
+  end
+
+  defp parse_option({k, v}, acc) when is_atom(k) do
+    stringified_key = StringUtils.to_kebab_case(Atom.to_string(k))
+
+    parse_option({"--#{stringified_key}", v}, acc)
+  end
+
+  defp parse_option({k, v}, acc) when is_binary(k) do
+    acc ++ [k, to_string(v)]
+  end
+
+  defp parse_option(arg, acc) when is_atom(arg) do
+    stringified_arg = StringUtils.to_kebab_case(Atom.to_string(arg))
+
+    parse_option("--#{stringified_arg}", acc)
+  end
+
+  defp parse_option(arg, acc) when is_binary(arg) do
+    acc ++ [arg]
   end
 
   defp backend_executable do

lib/pinchflat/yt_dlp/media.ex

@@ -35,10 +35,10 @@ defmodule Pinchflat.YtDlp.Media do
 
   Returns {:ok, map()} | {:error, any, ...}.
   """
-  def download(url, command_opts \\ [], addl_opts \\ []) do
+  def download(url, command_opts \\ []) do
     opts = [:no_simulate] ++ command_opts
 
-    with {:ok, output} <- backend_runner().run(url, opts, "after_move:%()j", addl_opts),
+    with {:ok, output} <- backend_runner().run(url, opts, "after_move:%()j"),
          {:ok, parsed_json} <- Phoenix.json_library().decode(output) do
       {:ok, parsed_json}
     else
@@ -63,8 +63,8 @@ defmodule Pinchflat.YtDlp.Media do
         |> response_to_struct()
         |> FunctionUtils.wrap_ok()
 
-      err ->
+      res ->
-        err
+        res
     end
   end
 
@@ -87,7 +87,7 @@ defmodule Pinchflat.YtDlp.Media do
       title: response["title"],
       description: response["description"],
       original_url: response["webpage_url"],
-      livestream: !!response["was_live"],
+      livestream: response["was_live"],
       duration_seconds: response["duration"] && round(response["duration"]),
       short_form_content: response["webpage_url"] && short_form_content?(response),
       upload_date: response["upload_date"] && MetadataFileHelpers.parse_upload_date(response["upload_date"])

lib/pinchflat/yt_dlp/media_collection.ex

@@ -6,7 +6,7 @@ defmodule Pinchflat.YtDlp.MediaCollection do
 
   require Logger
 
-  alias Pinchflat.Utils.FilesystemUtils
+  alias Pinchflat.Filesystem.FilesystemHelpers
   alias Pinchflat.YtDlp.Media, as: YtDlpMedia
 
   @doc """
@@ -24,9 +24,9 @@ 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 media details
-    command_opts = [:simulate, :skip_download, :ignore_no_formats_error, :no_warnings]
+    command_opts = [:simulate, :skip_download, :ignore_no_formats_error]
     output_template = YtDlpMedia.indexing_output_template()
-    output_filepath = FilesystemUtils.generate_metadata_tmpfile(:json)
+    output_filepath = FilesystemHelpers.generate_metadata_tmpfile(:json)
     file_listener_handler = Keyword.get(addl_opts, :file_listener_handler, false)
 
     if file_listener_handler do
@@ -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.
@@ -246,7 +247,6 @@ defmodule PinchflatWeb.CoreComponents do
   attr :label_suffix, :string, default: nil
   attr :value, :any
   attr :help, :string, default: nil
-  attr :html_help, :boolean, default: false
 
   attr :type, :string,
     default: "text",
@@ -266,7 +266,6 @@ defmodule PinchflatWeb.CoreComponents do
                 multiple pattern placeholder readonly required rows size step)
 
   slot :inner_block
-  slot :input_append
 
   def input(%{field: %Phoenix.HTML.FormField{} = field} = assigns) do
     assigns
@@ -299,7 +298,7 @@ defmodule PinchflatWeb.CoreComponents do
         <%= @label %>
         <span :if={@label_suffix} class="text-xs text-bodydark"><%= @label_suffix %></span>
       </label>
-      <.help :if={@help}><%= if @html_help, do: Phoenix.HTML.raw(@help), else: @help %></.help>
+      <.help :if={@help}><%= @help %></.help>
       <.error :for={msg <- @errors}><%= msg %></.error>
     </div>
     """
@@ -326,7 +325,7 @@ defmodule PinchflatWeb.CoreComponents do
           </label>
         </div>
       </section>
-      <.help :if={@help}><%= if @html_help, do: Phoenix.HTML.raw(@help), else: @help %></.help>
+      <.help :if={@help}><%= @help %></.help>
       <.error :for={msg <- @errors}><%= msg %></.error>
     </div>
     """
@@ -357,7 +356,7 @@ defmodule PinchflatWeb.CoreComponents do
           >
           </div>
         </div>
-        <.help :if={@help}><%= if @html_help, do: Phoenix.HTML.raw(@help), else: @help %></.help>
+        <.help :if={@help}><%= @help %></.help>
         <.error :for={msg <- @errors}><%= msg %></.error>
       </div>
     </div>
@@ -388,7 +387,7 @@ defmodule PinchflatWeb.CoreComponents do
         </select>
         <%= render_slot(@inner_block) %>
       </div>
-      <.help :if={@help}><%= if @html_help, do: Phoenix.HTML.raw(@help), else: @help %></.help>
+      <.help :if={@help}><%= @help %></.help>
       <.error :for={msg <- @errors}><%= msg %></.error>
     </div>
     """
@@ -412,7 +411,7 @@ defmodule PinchflatWeb.CoreComponents do
         ]}
         {@rest}
       ><%= Phoenix.HTML.Form.normalize_value("textarea", @value) %></textarea>
-      <.help :if={@help}><%= if @html_help, do: Phoenix.HTML.raw(@help), else: @help %></.help>
+      <.help :if={@help}><%= @help %></.help>
       <.error :for={msg <- @errors}><%= msg %></.error>
     </div>
     """
@@ -425,24 +424,21 @@ defmodule PinchflatWeb.CoreComponents do
       <.label for={@id}>
         <%= @label %><span :if={@label_suffix} class="text-xs text-bodydark"><%= @label_suffix %></span>
       </.label>
-      <div class="flex items-center">
+      <input
-        <input
+        type={@type}
-          type={@type}
+        name={@name}
-          name={@name}
+        id={@id}
-          id={@id}
+        value={Phoenix.HTML.Form.normalize_value(@type, @value)}
-          value={Phoenix.HTML.Form.normalize_value(@type, @value)}
+        class={[
-          class={[
+          "w-full rounded-lg border-[1.5px] border-stroke bg-transparent px-5 py-3 font-normal text-black",
-            "w-full rounded-lg border-[1.5px] px-5 py-3 font-normal border-form-strokedark bg-form-input",
+          "outline-none transition focus:border-primary active:border-primary disabled:cursor-default disabled:bg-whiter",
-            "outline-none transition active:border-primary disabled:cursor-default disabled:bg-whiter",
+          "dark:border-form-strokedark dark:bg-form-input dark:text-white dark:focus:border-primary",
-            "text-white focus:border-primary",
+          @inputclass,
-            @inputclass,
+          @errors != [] && "border-rose-400 focus:border-rose-400"
-            @errors != [] && "border-rose-400 focus:border-rose-400"
+        ]}
-          ]}
+        {@rest}
-          {@rest}
+      />
-        />
+      <.help :if={@help}><%= @help %></.help>
-        <%= render_slot(@input_append) %>
-      </div>
-      <.help :if={@help}><%= if @html_help, do: Phoenix.HTML.raw(@help), else: @help %></.help>
       <.error :for={msg <- @errors}><%= msg %></.error>
     </div>
     """
@@ -641,11 +637,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/button_components.ex

@@ -89,46 +89,4 @@ defmodule PinchflatWeb.CustomComponents.ButtonComponents do
     </div>
     """
   end
-
-  @doc """
-  Render a button with an icon. Optionally include a tooltip.
-
-  ## Examples
-
-      <.icon_button icon_name="hero-check" tooltip="Complete" />
-  """
-  attr :icon_name, :string, required: true
-  attr :class, :string, default: ""
-  attr :tooltip, :string, default: nil
-  attr :rest, :global
-
-  def icon_button(assigns) do
-    ~H"""
-    <div class="group relative inline-block">
-      <button
-        class={[
-          "flex justify-center items-center rounded-lg ",
-          "bg-form-input border-2 border-strokedark",
-          "hover:bg-meta-4 hover:border-form-strokedark",
-          @class
-        ]}
-        type="button"
-        {@rest}
-      >
-        <CoreComponents.icon name={@icon_name} class="text-stroke" />
-      </button>
-      <div
-        :if={@tooltip}
-        class={[
-          "hidden absolute left-1/2 top-full z-20 mt-3 -translate-x-1/2 whitespace-nowrap rounded-md",
-          "px-4.5 py-1.5 text-sm font-medium opacity-0 drop-shadow-4 group-hover:opacity-100 group-hover:block bg-meta-4"
-        ]}
-      >
-        <span class="border-light absolute -top-1 left-1/2 -z-10 h-2 w-2 -translate-x-1/2 rotate-45 rounded-sm bg-meta-4">
-        </span>
-        <span><%= @tooltip %></span>
-      </div>
-    </div>
-    """
-  end
 end

lib/pinchflat_web/components/custom_components/tab_components.ex

@@ -14,8 +14,7 @@ defmodule PinchflatWeb.CustomComponents.TabComponents do
   def tabbed_layout(assigns) do
     ~H"""
     <div
-      x-data="{ openTab: getTabIndex(0), activeClasses: 'text-meta-5 border-meta-5', inactiveClasses: 'border-transparent' }"
+      x-data="{ openTab: 0, activeClasses: 'text-meta-5 border-meta-5', inactiveClasses: 'border-transparent' }"
-      @hashchange.window="openTab = getTabIndex(openTab)"
       class="w-full"
     >
       <header class="flex flex-col md:flex-row md:justify-between border-b border-strokedark">
@@ -23,7 +22,7 @@ defmodule PinchflatWeb.CustomComponents.TabComponents do
           <a
             :for={{tab, idx} <- Enum.with_index(@tab)}
             href="#"
-            @click.prevent={"openTab = setTabIndex(#{idx})"}
+            @click.prevent={"openTab = #{idx}"}
             x-bind:class={"openTab === #{idx} ? activeClasses : inactiveClasses"}
             class="border-b-2 py-4 w-full sm:w-fit text-sm font-medium hover:text-meta-5 md:text-base"
           >
@@ -34,7 +33,7 @@ defmodule PinchflatWeb.CustomComponents.TabComponents do
           <%= render_slot(@tab_append) %>
         </div>
       </header>
-      <div class="mt-4 min-h-60">
+      <div class="mt-4">
         <div :for={{tab, idx} <- Enum.with_index(@tab)} x-show={"openTab === #{idx}"} class="font-medium leading-relaxed">
           <%= render_slot(tab) %>
         </div>

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.
 
@@ -27,20 +25,21 @@ defmodule PinchflatWeb.CustomComponents.TableComponents do
 
   def table(assigns) do
     ~H"""
-    <table class={["w-full table-auto bg-boxdark", @table_class]}>
+    <table class={["w-full table-auto", @table_class]}>
       <thead>
-        <tr class="text-left bg-meta-4">
+        <tr class="bg-gray-2 text-left dark:bg-meta-4">
-          <th :for={col <- @col} class="px-4 py-4 font-medium text-white xl:pl-11">
+          <th :for={col <- @col} class="px-4 py-4 font-medium text-black dark:text-white xl:pl-11">
             <%= col[:label] %>
           </th>
         </tr>
       </thead>
       <tbody>
-        <tr :for={row <- @rows} class="border-b border-boxdark hover:border-strokedark">
+        <tr :for={{row, i} <- Enum.with_index(@rows)}>
           <td
             :for={col <- @col}
             class={[
-              "px-4 py-5 pl-9 xl:pl-11",
+              "px-4 py-5 pl-9 dark:border-strokedark xl:pl-11",
+              i + 1 > length(@rows) && "border-b border-[#eee] dark:border-π",
               col[:class]
             ]}
           >
@@ -51,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,38 +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
-
-  @doc """
-  Renders a UTC datetime in the specified format and timezone
-  """
-  attr :datetime, :any, required: true
-  attr :format, :string, default: "%Y-%m-%d %H:%M:%S"
-  attr :timezone, :string, default: nil
-
-  def datetime_in_zone(assigns) do
-    timezone = assigns.timezone || Application.get_env(:pinchflat, :timezone)
-    assigns = Map.put(assigns, :timezone, timezone)
-
-    ~H"""
-    <time><%= Calendar.strftime(Timex.Timezone.convert(@datetime, @timezone), @format) %></time>
-    """
-  end
 end

lib/pinchflat_web/components/layouts.ex

@@ -4,107 +4,28 @@ defmodule PinchflatWeb.Layouts do
   embed_templates "layouts/*"
   embed_templates "layouts/partials/*"
 
-  @doc """
-  Renders a sidebar menu item link
-
-  ## Examples
-
-      <.sidebar_link icon="hero-home" text="Home" href="/" />
-  """
   attr :icon, :string, required: true
   attr :text, :string, required: true
   attr :href, :any, required: true
   attr :target, :any, default: "_self"
 
   def sidebar_item(assigns) do
+    # I'm testing out grouping classes here. Tentative order: font, layout, color, animation, state-modifiers
     ~H"""
-    <li class="text-bodydark1">
+    <li>
-      <.sidebar_link icon={@icon} text={@text} href={@href} target={@target} />
+      <.link
-    </li>
+        href={@href}
-    """
+        target={@target}
-  end
-
-  @doc """
-  Renders a sidebar menu item with a submenu
-
-  ## Examples
-
-      <.sidebar_submenu icon="hero-home" text="Home" current_path="/">
-        <:submenu icon="hero-home" text="Home" href="/" />
-      </.sidebar_submenu>
-  """
-
-  attr :icon, :string, required: true
-  attr :text, :string, required: true
-  attr :current_path, :string, required: true
-
-  slot :submenu do
-    attr :icon, :string
-    attr :text, :string
-    attr :href, :any
-    attr :target, :any
-  end
-
-  def sidebar_submenu(assigns) do
-    initially_selected = Enum.any?(assigns[:submenu], &(&1[:href] == assigns[:current_path]))
-    assigns = Map.put(assigns, :initially_selected, initially_selected)
-
-    ~H"""
-    <li class="text-bodydark1" x-data={"{ selected: #{@initially_selected} }"}>
-      <span
         class={[
-          "font-medium cursor-pointer",
+          "font-medium text-bodydark1",
-          "group relative flex items-center justify-between rounded-sm px-4 py-2 duration-300 ease-in-out",
+          "group relative flex items-center gap-2.5 rounded-sm px-4 py-2 duration-300 ease-in-out",
           "duration-300 ease-in-out",
-          "hover:bg-meta-4"
+          "hover:bg-graydark dark:hover:bg-meta-4"
         ]}
-        x-on:click="selected = !selected"
       >
-        <span class="flex items-center gap-2.5">
+        <.icon name={@icon} /> <%= @text %>
-          <.icon name={@icon} /> <%= @text %>
+      </.link>
-        </span>
-        <span class="text-bodydark2">
-          <.icon name="hero-chevron-up" x-bind:class="{ 'rotate-180': selected }" />
-        </span>
-      </span>
-
-      <ul x-bind:class="selected ? 'block' :'hidden'">
-        <li :for={menu <- @submenu} class="text-bodydark2">
-          <.sidebar_link icon={menu[:icon]} text={menu[:text]} href={menu[:href]} target={menu[:target]} class="pl-10" />
-        </li>
-      </ul>
     </li>
     """
   end
-
-  @doc """
-  Renders a sidebar menu item link
-
-  ## Examples
-
-      <.sidebar_link icon="hero-home" text="Home" href="/" />
-  """
-  attr :icon, :string
-  attr :text, :string, required: true
-  attr :href, :any, required: true
-  attr :target, :any, default: "_self"
-  attr :class, :string, default: ""
-
-  def sidebar_link(assigns) do
-    ~H"""
-    <.link
-      href={@href}
-      target={@target}
-      class={[
-        "font-medium",
-        "group relative flex items-center gap-2.5 rounded-sm px-4 py-2 duration-300 ease-in-out",
-        "duration-300 ease-in-out",
-        "hover:bg-meta-4",
-        @class
-      ]}
-    >
-      <.icon :if={@icon} name={@icon} /> <%= @text %>
-    </.link>
-    """
-  end
 end

lib/pinchflat_web/components/layouts/app.html.heex

@@ -1,5 +1,5 @@
 <div class="flex h-screen overflow-hidden">
-  <.sidebar conn={@conn} />
+  <.sidebar />
 
   <div class="relative flex flex-1 flex-col overflow-y-auto overflow-x-hidden">
     <.header params={@conn.params} />

lib/pinchflat_web/components/layouts/onboarding.html.heex

@@ -3,7 +3,7 @@
     <header class="sticky top-0 z-999 flex w-full bg-white drop-shadow-1 dark:bg-boxdark dark:drop-shadow-none">
       <div class="w-65 px-4 py-2 shadow-2 md:px-6">
         <div class="flex items-center gap-2 py-2">
-          <img src={~p"/images/logo-2024-03-20.png"} alt="Pinchflat" class="w-auto" />
+          <img src={~p"/images/logo.png?cachebust=2024-03-20"} alt="Pinchflat" class="w-auto" />
         </div>
       </div>
     </header>

lib/pinchflat_web/components/layouts/partials/donate_modal.heex

@@ -3,22 +3,21 @@
     <h3 class="text-2xl text-white">Donate</h3>
     <p class="text-sm">Thank you for your support :&rpar;</p>
     <p class="mt-4">
-      If you find the project valuable and want to say thanks, a
+      If you find the project valuable and want to support its development, a
-      <.inline_link href="https://supporters.eff.org/donate">
+      <.inline_link href="https://www.paypal.me/kieraneglin">donation</.inline_link>
-        donation to the Electronic Frontier Foundation
+      would be greatly appreciated.
-      </.inline_link>
-      would be greatly appreciated! You can optionally post proof of donation on
-      <.inline_link href="https://github.com/kieraneglin/pinchflat/issues/234">this issue</.inline_link>
-      to hopefully inspire others to donate as well.
     </p>
     <p class="mt-4">
-      The Electronic Frontier Foundation is a nonprofit organization who defend your online liberties and backed
+      Plus, $5 USD from any donation over $10 USD will be donated to
+      <.inline_link href="https://www.eff.org/">The Electronic Frontier Foundation</.inline_link>
+      who defend your online liberties and backed
       <.inline_code>youtube-dl</.inline_code>
       when Google took them down<.inline_link href="https://github.com/github/dmca/blob/9a85e0f021f7967af80e186b890776a50443f06c/2020/11/2020-11-16-RIAA-reversal-effletter.pdf">
         <.icon name="hero-arrow-top-right-on-square" class="h-3 w-3" />
-      </.inline_link>
+      </.inline_link>.
     </p>
-    <.link href="https://supporters.eff.org/donate" target="_blank">
+
+    <.link href="https://www.paypal.me/kieraneglin" target="_blank">
       <.button color="bg-primary" class="w-full mt-8">
         Donate
       </.button>

lib/pinchflat_web/components/layouts/partials/header.html.heex

@@ -2,7 +2,7 @@
   <div class="flex flex-grow items-center justify-between lg:justify-end px-4 py-4 shadow-2 md:px-6 2xl:px-11">
     <div class="flex items-center gap-2 sm:gap-4 lg:hidden w-2/6">
       <section class="pr-1">
-        <img src={~p"/images/icon-2024-03-20.png"} alt="Pinchflat" class="w-10" />
+        <img src={~p"/images/icon.png?cachebust=2024-03-20"} alt="Pinchflat" class="w-10" />
       </section>
 
       <button

lib/pinchflat_web/components/layouts/partials/sidebar.html.heex

@@ -9,7 +9,7 @@
   <section>
     <div class="flex items-center justify-between gap-2 px-6 py-4">
       <a href="/" class="flex items-center">
-        <img src={~p"/images/logo-2024-03-20.png"} alt="Pinchflat" class="w-auto" />
+        <img src={~p"/images/logo.png?cachebust=2024-03-20"} alt="Pinchflat" class="w-auto" />
       </a>
 
       <button class="block mt-3 lg:hidden" @click.stop="sidebarVisible = !sidebarVisible">
@@ -18,22 +18,12 @@
     </div>
     <div class="no-scrollbar flex flex-col overflow-y-auto duration-300 ease-linear">
       <nav class="mt-3 px-4 py-4 lg:px-6">
-        <h3 class="mb-4 ml-4 text-sm font-medium text-bodydark2">
+        <h3 class="mb-4 ml-4 text-sm font-medium text-bodydark2">MENU</h3>
-          <span>MENU</span>
-        </h3>
         <div class="flex flex-col justify-between">
           <ul class="mb-6 flex flex-col gap-1.5">
             <.sidebar_item icon="hero-home" text="Home" href={~p"/"} />
             <.sidebar_item icon="hero-tv" text="Sources" href={~p"/sources"} />
             <.sidebar_item icon="hero-adjustments-vertical" text="Media Profiles" href={~p"/media_profiles"} />
-            <.sidebar_submenu
-              icon="hero-cog-6-tooth"
-              text="Config"
-              current_path={Phoenix.Controller.current_path(@conn)}
-            >
-              <:submenu text="Settings" href={~p"/settings"} />
-              <:submenu text="App Info" href={~p"/app_info"} />
-            </.sidebar_submenu>
           </ul>
         </div>
       </nav>
@@ -48,7 +38,12 @@
           target="_blank"
           href="https://github.com/kieraneglin/pinchflat/wiki"
         />
-        <.sidebar_item icon="hero-cog" text="Github" target="_blank" href="https://github.com/kieraneglin/pinchflat" />
+        <.sidebar_item
+          icon="hero-code-bracket"
+          text="Github"
+          target="_blank"
+          href="https://github.com/kieraneglin/pinchflat"
+        />
         <li>
           <span
             class={[
@@ -63,23 +58,8 @@
           </span>
         </li>
         <li>
-          <span
+          <span class="group relative flex items-center gap-2.5 px-4 py-2 text-sm">
-            class="group relative flex items-center gap-2.5 px-4 pt-2 text-sm"
+            v<%= Application.spec(:pinchflat)[:vsn] %>
-            x-on:click={"markVersionAsSeen('#{Application.spec(:pinchflat)[:vsn]}')"}
-          >
-            <span>Pinchflat <%= Application.spec(:pinchflat)[:vsn] %></span>
-            <a
-              href="https://github.com/kieraneglin/pinchflat/releases"
-              target="_blank"
-              class="bg-meta-2 text-boxdark px-1.5 rounded-full text-xs"
-              x-cloak
-              x-show={"!isVersionSeen('#{Application.spec(:pinchflat)[:vsn]}')"}
-            >
-              NEW
-            </a>
-          </span>
-          <span class="group relative flex items-center gap-2.5 px-4 pt-2 text-sm">
-            yt-dlp <%= Settings.get!(:yt_dlp_version) %>
           </span>
         </li>
       </ul>

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"
@@ -30,8 +29,8 @@ defmodule Pinchflat.UpgradeButtonLive do
       |> String.trim()
       |> String.downcase()
 
-    if normalized_text == "got it" do
+    if normalized_text == "got it!" do
-      Settings.set(pro_enabled: true)
+      Settings.set!(:pro_enabled, true)
 
       {:noreply, update(socket, :button_disabled, fn _ -> false end)}
     else

lib/pinchflat_web/components/layouts/partials/upgrade_modal.heex

@@ -3,25 +3,23 @@
     <h3 class="text-2xl text-white">Pro Mode</h3>
     <p class="text-sm">Don't worry - Pinchflat is completely free :&rpar;</p>
     <p class="mt-4">
-      If you find the project valuable and want to say thanks, a
+      If you find the project valuable and want to support its development, a
-      <.inline_link href="https://supporters.eff.org/donate">
+      <.inline_link href="https://www.paypal.me/kieraneglin">donation</.inline_link>
-        donation to the Electronic Frontier Foundation
+      would be greatly appreciated.
-      </.inline_link>
-      would be greatly appreciated! You can optionally post proof of donation on
-      <.inline_link href="https://github.com/kieraneglin/pinchflat/issues/234">this issue</.inline_link>
-      to hopefully inspire others to donate as well.
     </p>
     <p class="mt-4">
-      The Electronic Frontier Foundation is a nonprofit organization who defend your online liberties and backed
+      Plus, $5 USD from any donation over $10 USD will be donated to
+      <.inline_link href="https://www.eff.org/">The Electronic Frontier Foundation</.inline_link>
+      who defend your online liberties and backed
       <.inline_code>youtube-dl</.inline_code>
       when Google took them down<.inline_link href="https://github.com/github/dmca/blob/9a85e0f021f7967af80e186b890776a50443f06c/2020/11/2020-11-16-RIAA-reversal-effletter.pdf">
         <.icon name="hero-arrow-top-right-on-square" class="h-3 w-3" />
-      </.inline_link>. <strong>You do not need to donate to unlock Pro</strong>. It's just a way to show support!
+      </.inline_link>. <strong>You do not need to donate to unlock Pro</strong>. It's just a way to say thanks!
     </p>
 
     <p class="mt-4">
       To unlock Pro, simply type
-      <.inline_code>got it</.inline_code>
+      <.inline_code>got it!</.inline_code>
       into the text box and press the button.
     </p>
 

lib/pinchflat_web/controllers/health_controller.ex

@@ -1,9 +0,0 @@
-defmodule PinchflatWeb.HealthController do
-  use PinchflatWeb, :controller
-
-  def check(conn, _params) do
-    conn
-    |> put_status(:ok)
-    |> json(%{status: "ok"})
-  end
-end

lib/pinchflat_web/controllers/media_items/media_item_controller.ex

@@ -6,7 +6,6 @@ defmodule PinchflatWeb.MediaItems.MediaItemController do
   alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Media.MediaItem
-  alias Pinchflat.Downloading.MediaDownloadWorker
 
   def show(conn, %{"id" => id}) do
     media_item =
@@ -17,50 +16,21 @@ defmodule PinchflatWeb.MediaItems.MediaItemController do
     render(conn, :show, media_item: media_item)
   end
 
-  def edit(conn, %{"id" => id}) do
-    media_item = Media.get_media_item!(id)
-    changeset = Media.change_media_item(media_item)
-
-    render(conn, :edit, media_item: media_item, changeset: changeset)
-  end
-
-  def update(conn, %{"id" => id, "media_item" => params}) do
-    media_item = Media.get_media_item!(id)
-
-    case Media.update_media_item(media_item, params) do
-      {:ok, media_item} ->
-        conn
-        |> put_flash(:info, "Media Item updated successfully.")
-        |> redirect(to: ~p"/sources/#{media_item.source_id}/media/#{media_item}")
-
-      {:error, %Ecto.Changeset{} = changeset} ->
-        render(conn, :edit, media_item: media_item, changeset: changeset)
-    end
-  end
-
   def delete(conn, %{"id" => id} = params) do
-    prevent_download = Map.get(params, "prevent_download", false)
+    delete_files = Map.get(params, "delete_files", false)
     media_item = Media.get_media_item!(id)
-    {:ok, _} = Media.delete_media_files(media_item, %{prevent_download: prevent_download})
+    {:ok, _} = Media.delete_media_item(media_item, delete_files: delete_files)
 
-    conn
+    flash_message =
-    |> put_flash(:info, "Files deleted successfully.")
+      if delete_files do
-    |> redirect(to: ~p"/sources/#{media_item.source_id}")
+        "Record and files deleted successfully."
-  end
+      else
-
+        "Record deleted successfully. Files were not deleted."
-  def force_download(conn, %{"media_item_id" => id}) do
-    media_item = Media.get_media_item!(id)
-
-    :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.")
+    |> put_flash(:info, flash_message)
-    |> redirect(to: ~p"/sources/#{media_item.source_id}/media/#{media_item}")
+    |> redirect(to: ~p"/sources/#{media_item.source_id}")
   end
 
   # See here for details on streaming files and range requests:

lib/pinchflat_web/controllers/media_items/media_item_html.ex

@@ -3,14 +3,6 @@ defmodule PinchflatWeb.MediaItems.MediaItemHTML do
 
   embed_templates "media_item_html/*"
 
-  @doc """
-  Renders a media item form.
-  """
-  attr :changeset, Ecto.Changeset, required: true
-  attr :action, :string, required: true
-
-  def media_item_form(assigns)
-
   def media_file_exists?(media_item) do
     !!media_item.media_filepath and File.exists?(media_item.media_filepath)
   end

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

@@ -1,47 +0,0 @@
-<.button_dropdown text="Actions" class="justify-center w-full sm:w-50">
-  <:option>
-    <span x-data="{ copied: false }" x-on:click={~s"
-        copyWithCallbacks(
-          `#{Jason.Formatter.pretty_print(Phoenix.json_library().encode!(@media_item))}`, 
-          () => copied = true, 
-          () => copied = false
-        )
-      "}>
-      Copy JSON
-      <span x-show="copied" x-transition.duration.150ms><.icon name="hero-check" class="ml-2 h-4 w-4" /></span>
-    </span>
-  </:option>
-  <:option>
-    <div class="h-px w-full bg-bodydark2"></div>
-  </:option>
-  <:option>
-    <.link
-      href={~p"/sources/#{@media_item.source_id}/media/#{@media_item}/force_download"}
-      method="post"
-      data-confirm="Are you sure you force a download of this media?"
-    >
-      Force Download
-    </.link>
-  </:option>
-  <:option>
-    <div class="h-px w-full bg-bodydark2"></div>
-  </:option>
-  <:option>
-    <.link
-      href={~p"/sources/#{@media_item.source_id}/media/#{@media_item}"}
-      method="delete"
-      data-confirm="Are you sure you want to delete all files for this media item? This cannot be undone."
-    >
-      Delete Files
-    </.link>
-  </:option>
-  <:option>
-    <.link
-      href={~p"/sources/#{@media_item.source_id}/media/#{@media_item}?prevent_download=true"}
-      method="delete"
-      data-confirm="Are you sure you want to delete all files for this media item and prevent it from re-downloading in the future? This cannot be undone."
-    >
-      Delete and Ignore
-    </.link>
-  </:option>
-</.button_dropdown>

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

@@ -1,13 +0,0 @@
-<div class="mb-6 flex gap-3 flex-row items-center">
-  <h2 class="text-title-md2 font-bold text-black dark:text-white ml-4">
-    Editing "<%= StringUtils.truncate(@media_item.title, 35) %>"
-  </h2>
-</div>
-
-<div class="rounded-sm border border-stroke bg-white px-5 pb-2.5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5 xl:pb-1">
-  <div class="max-w-full">
-    <div class="flex flex-col gap-10">
-      <.media_item_form changeset={@changeset} action={~p"/sources/#{@media_item.source_id}/media/#{@media_item}"} />
-    </div>
-  </div>
-</div>

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

@@ -1,31 +0,0 @@
-<.simple_form
-  :let={f}
-  for={@changeset}
-  action={@action}
-  x-data="{ advancedMode: !!JSON.parse(localStorage.getItem('advancedMode')) }"
-  x-init="$watch('advancedMode', value => localStorage.setItem('advancedMode', JSON.stringify(value)))"
->
-  <.error :if={@changeset.action}>
-    Oops, something went wrong! Please check the errors below.
-  </.error>
-
-  <h3 class=" text-2xl text-black dark:text-white">
-    General Options
-  </h3>
-
-  <.input
-    field={f[:prevent_download]}
-    type="toggle"
-    label="Prevent Download"
-    help="Checking excludes this media item from automatic download. Download can still be manually forced"
-  />
-
-  <.input
-    field={f[:prevent_culling]}
-    type="toggle"
-    label="Prevent Automatic Deletion"
-    help="Checking excludes media from being automatically deleted based on media retention rules"
-  />
-
-  <.button class="my-10 sm:mb-7.5 w-full sm:w-auto" rounding="rounded-lg">Save Media Item</.button>
-</.simple_form>

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

@@ -4,52 +4,43 @@
       <.icon name="hero-arrow-left" class="w-10 h-10 hover:dark:text-white" />
     </.link>
     <h2 class="text-title-md2 font-bold text-black dark:text-white ml-4">
-      <%= StringUtils.truncate(@media_item.title, 35) %>
+      Media Item #<%= @media_item.id %>
     </h2>
   </div>
-
-  <nav>
-    <.link href={~p"/sources/#{@media_item.source_id}/media/#{@media_item}/edit"}>
-      <.button color="bg-primary" rounding="rounded-lg">
-        <.icon name="hero-pencil-square" class="mr-2" /> Edit
-      </.button>
-    </.link>
-  </nav>
 </div>
 <div class="rounded-sm border border-stroke bg-white py-5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark px-7.5">
-  <div class="max-w-full">
+  <div class="max-w-full overflow-x-auto">
     <.tabbed_layout>
       <:tab_append>
-        <.actions_dropdown media_item={@media_item} />
+        <.button_dropdown text="Actions" class="justify-center w-full sm:w-50">
+          <:option>
+            <.link
+              href={~p"/sources/#{@media_item.source_id}/media/#{@media_item}?delete_files=true"}
+              method="delete"
+              data-confirm="Are you sure you want to delete this record and all associated files on disk? This cannot be undone."
+            >
+              Delete Files
+            </.link>
+          </:option>
+        </.button_dropdown>
       </: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} />
-                <.media_preview media_item={@media_item} />
-              </div>
-              <aside class="mt-4 xl:mt-0">
-                <div>Uploaded: <%= @media_item.upload_date %></div>
-                <div :if={URI.parse(@media_item.original_url).scheme =~ "http"}>
-                  <.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>
+          <h3 class="font-bold text-xl">Attributes</h3>
           <section>
             <strong>Source:</strong>
-            <.subtle_link href={~p"/sources/#{@media_item.source_id}"}>
+            <.inline_link href={~p"/sources/#{@media_item.source_id}"}>
               <%= @media_item.source.custom_name %>
-            </.subtle_link>
+            </.inline_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_controller.ex

@@ -1,19 +1,12 @@
 defmodule PinchflatWeb.MediaProfiles.MediaProfileController do
   use PinchflatWeb, :controller
 
-  import Ecto.Query, warn: false
-
   alias Pinchflat.Repo
   alias Pinchflat.Profiles
-  alias Pinchflat.Sources.SourcesQuery
   alias Pinchflat.Profiles.MediaProfile
 
   def index(conn, _params) do
-    media_profiles =
+    media_profiles = Profiles.list_media_profiles()
-      MediaProfile
-      |> order_by(asc: :name)
-      |> Repo.all()
-
     render(conn, :index, media_profiles: media_profiles)
   end
 
@@ -39,15 +32,12 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileController do
   end
 
   def show(conn, %{"id" => id}) do
-    media_profile = Profiles.get_media_profile!(id)
+    media_profile =
+      id
+      |> Profiles.get_media_profile!()
+      |> Repo.preload(:sources)
 
-    sources =
+    render(conn, :show, media_profile: media_profile)
-      SourcesQuery.new()
-      |> SourcesQuery.for_media_profile(media_profile)
-      |> order_by(asc: :custom_name)
-      |> Repo.all()
-
-    render(conn, :show, media_profile: media_profile, sources: sources)
   end
 
   def edit(conn, %{"id" => id}) do

lib/pinchflat_web/controllers/media_profiles/media_profile_html.ex

@@ -59,15 +59,8 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
       upload_year: nil,
       upload_yyyy_mm_dd: "the upload date in the format YYYY-MM-DD",
       source_custom_name: "the name of the sources that use this profile",
-      source_collection_id: "the YouTube ID of the sources that use this profile",
-      source_collection_name:
-        "the YouTube name of the sources that use this profile (often the same as source_custom_name)",
       source_collection_type: "the collection type of the sources using this profile. Either 'channel' or 'playlist'",
-      artist_name: "the name of the artist with fallbacks to other uploader fields",
+      artist_name: "the name of the artist with fallbacks to other uploader fields"
-      season_from_date: "alias for upload_year",
-      season_episode_from_date: "the upload date formatted as sYYYYeMMDD",
-      season_episode_index_from_date:
-        "the upload date formatted as sYYYYeMMDDII where II is an index to prevent date collisions"
     }
   end
 
@@ -98,7 +91,7 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
   end
 
   defp media_center_output_template do
-    "/shows/{{ source_custom_name }}/Season {{ season_from_date }}/{{ season_episode_index_from_date }} - {{ title }}.{{ ext }}"
+    "/shows/{{ source_custom_name }}/Season {{ season_from_date }}/{{ season_episode_from_date }} - {{ title }}.{{ ext }}"
   end
 
   defp audio_output_template do

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

@@ -1,36 +0,0 @@
-<.button_dropdown text="Actions" class="justify-center w-full sm:w-50">
-  <:option>
-    <span x-data="{ copied: false }" x-on:click={~s"
-        copyWithCallbacks(
-          `#{Jason.Formatter.pretty_print(Phoenix.json_library().encode!(@media_profile))}`, 
-          () => copied = true, 
-          () => copied = false
-        )
-      "}>
-      Copy JSON
-      <span x-show="copied" x-transition.duration.150ms><.icon name="hero-check" class="ml-2 h-4 w-4" /></span>
-    </span>
-  </:option>
-  <:option>
-    <div class="h-px w-full bg-bodydark2"></div>
-  </:option>
-  <:option>
-    <.link
-      href={~p"/media_profiles/#{@media_profile}"}
-      method="delete"
-      data-confirm="Are you sure you want to delete this profile and all its sources (leaving files in place)? This cannot be undone."
-    >
-      Delete Profile
-    </.link>
-  </:option>
-  <:option>
-    <.link
-      href={~p"/media_profiles/#{@media_profile}?delete_files=true"}
-      method="delete"
-      data-confirm="Are you sure you want to delete this profile, all its sources, and its files on disk? This cannot be undone."
-      class="mt-5 md:mt-0"
-    >
-      Delete Profile + Files
-    </.link>
-  </:option>
-</.button_dropdown>

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

@@ -8,7 +8,7 @@
 </div>
 
 <div class="rounded-sm border border-stroke bg-white px-5 pb-2.5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5 xl:pb-1">
-  <div class="max-w-full">
+  <div class="max-w-full overflow-x-auto">
     <div class="flex flex-col gap-10">
       <.media_profile_form changeset={@changeset} action={~p"/media_profiles/#{@media_profile}"} />
     </div>

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

@@ -203,17 +203,6 @@
       />
     </section>
 
-    <section x-data="{ presets: { default: null, media_center: 1, audio: null, archiving: 1 } }">
-      <.input
-        field={f[:redownload_delay_days]}
-        type="number"
-        label="Redownload Delay (days)"
-        min="0"
-        help="Delay in days until new media is redownloaded. Redownloading new media can improve its quality or SponsorBlock tags. Leave blank to not redownload"
-        x-init="$watch('selectedPreset', p => p && ($el.value = presets[p]))"
-      />
-    </section>
-
     <h3 class="mt-8 text-2xl text-black dark:text-white">
       Media Center Options
     </h3>

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

@@ -6,7 +6,7 @@
 </div>
 
 <div class="rounded-sm border border-stroke bg-white px-5 pb-2.5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5 xl:pb-1">
-  <div class="max-w-full">
+  <div class="max-w-full overflow-x-auto">
     <div class="flex flex-col gap-10">
       <.media_profile_form changeset={@changeset} action={~p"/media_profiles"} />
     </div>

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

@@ -17,24 +17,42 @@
   </nav>
 </div>
 <div class="rounded-sm border border-stroke bg-white px-5 pb-2.5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5 xl:pb-1">
-  <div class="max-w-full">
+  <div class="max-w-full overflow-x-auto">
     <.tabbed_layout>
       <:tab_append>
-        <.actions_dropdown media_profile={@media_profile} />
+        <.button_dropdown text="Actions" class="justify-center w-full sm:w-50">
+          <:option>
+            <.link
+              href={~p"/media_profiles/#{@media_profile}"}
+              method="delete"
+              data-confirm="Are you sure you want to delete this profile and all its sources (leaving files in place)? This cannot be undone."
+            >
+              Delete Profile
+            </.link>
+          </:option>
+          <:option>
+            <.link
+              href={~p"/media_profiles/#{@media_profile}?delete_files=true"}
+              method="delete"
+              data-confirm="Are you sure you want to delete this profile, all its sources, and its files on disk? This cannot be undone."
+              class="mt-5 md:mt-0"
+            >
+              Delete Profile + Files
+            </.link>
+          </:option>
+        </.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>
       <:tab title="Sources">
-        <.table rows={@sources} table_class="text-black dark:text-white">
+        <.table rows={@media_profile.sources} table_class="text-black dark:text-white">
           <:col :let={source} label="Name">
-            <.subtle_link href={~p"/sources/#{source.id}"}>
+            <%= source.custom_name || source.collection_name %>
-              <%= source.custom_name || source.collection_name %>
-            </.subtle_link>
           </:col>
           <:col :let={source} label="Type"><%= source.collection_type %></:col>
           <:col :let={source} label="Should Download?">

lib/pinchflat_web/controllers/pages/page_controller.ex

@@ -1,16 +1,17 @@
 defmodule PinchflatWeb.Pages.PageController do
+  alias Pinchflat.Media.MediaItem
   use PinchflatWeb, :controller
-  use Pinchflat.Media.MediaQuery
 
   alias Pinchflat.Repo
   alias Pinchflat.Sources.Source
+  alias Pinchflat.Media.MediaItem
   alias Pinchflat.Profiles.MediaProfile
 
   def home(conn, params) do
     done_onboarding = params["onboarding"] == "0"
     force_onboarding = params["onboarding"] == "1"
 
-    if done_onboarding, do: Settings.set(onboarding: false)
+    if done_onboarding, do: Settings.set!(:onboarding, false)
 
     if force_onboarding || Settings.get!(:onboarding) do
       render_onboarding_page(conn)
@@ -24,15 +25,12 @@ defmodule PinchflatWeb.Pages.PageController do
     |> render(:home,
       media_profile_count: Repo.aggregate(MediaProfile, :count, :id),
       source_count: Repo.aggregate(Source, :count, :id),
-      media_item_count:
+      media_item_count: Repo.aggregate(MediaItem, :count, :id)
-        MediaQuery.new()
-        |> MediaQuery.with_media_downloaded_at()
-        |> Repo.aggregate(:count, :id)
     )
   end
 
   defp render_onboarding_page(conn) do
-    Settings.set(onboarding: true)
+    Settings.set!(:onboarding, true)
 
     conn
     |> render(:onboarding_checklist,

lib/pinchflat_web/controllers/pages/page_html/history_table_live.ex

@@ -1,109 +0,0 @@
-defmodule Pinchflat.Pages.HistoryTableLive do
-  use PinchflatWeb, :live_view
-  use Pinchflat.Media.MediaQuery
-
-  alias Pinchflat.Repo
-  alias Pinchflat.Utils.NumberUtils
-  alias PinchflatWeb.CustomComponents.TextComponents
-
-  @limit 10
-
-  def render(%{records: []} = assigns) do
-    ~H"""
-    <div class="mb-4 flex items-center">
-      <.icon_button icon_name="hero-arrow-path" class="h-10 w-10" phx-click="reload_page" />
-      <p class="ml-2">Nothing Here!</p>
-    </div>
-    """
-  end
-
-  def render(assigns) do
-    ~H"""
-    <div>
-      <span class="mb-4 flex items-center">
-        <.icon_button icon_name="hero-arrow-path" class="h-10 w-10" phx-click="reload_page" tooltip="Refresh" />
-        <span class="ml-2">Showing <%= length(@records) %> of <%= @total_record_count %></span>
-      </span>
-      <div class="max-w-full overflow-x-auto">
-        <.table rows={@records} table_class="text-white">
-          <:col :let={media_item} label="Title">
-            <.subtle_link href={~p"/sources/#{media_item.source_id}/media/#{media_item}"}>
-              <%= StringUtils.truncate(media_item.title, 35) %>
-            </.subtle_link>
-          </:col>
-          <:col :let={media_item} label="Upload Date">
-            <%= media_item.upload_date %>
-          </:col>
-          <:col :let={media_item} label="Indexed At">
-            <%= format_datetime(media_item.inserted_at) %>
-          </:col>
-          <:col :let={media_item} label="Downloaded At">
-            <%= format_datetime(media_item.media_downloaded_at) %>
-          </:col>
-          <:col :let={media_item} label="Source">
-            <.subtle_link href={~p"/sources/#{media_item.source_id}"}>
-              <%= StringUtils.truncate(media_item.source.custom_name, 35) %>
-            </.subtle_link>
-          </:col>
-        </.table>
-      </div>
-      <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
-    base_query = generate_base_query()
-    pagination_attrs = fetch_pagination_attributes(base_query, page)
-
-    {:ok, assign(socket, Map.merge(pagination_attrs, %{base_query: base_query}))}
-  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
-
-  def handle_event("reload_page", _params, %{assigns: assigns} = socket) do
-    new_assigns = fetch_pagination_attributes(assigns.base_query, assigns.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()
-    |> Repo.preload(:source)
-  end
-
-  defp generate_base_query do
-    MediaQuery.new()
-    |> MediaQuery.where_pending_or_downloaded()
-    |> order_by(desc: :id)
-  end
-
-  defp format_datetime(nil), do: ""
-
-  defp format_datetime(datetime) do
-    TextComponents.datetime_in_zone(%{datetime: datetime, format: "%Y-%m-%d %H:%M"})
-  end
-end

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

@@ -1,33 +1,27 @@
 <div class="grid grid-cols-1 gap-4 md:grid-cols-3">
   <div class="rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
-    <a href={~p"/media_profiles"} class="mt-4 flex flex-col items-center justify-center">
+    <div class="mt-4 flex flex-col items-center justify-center">
       <span class="text-md font-medium">Media Profile(s)</span>
       <h4 class="text-title-md font-bold text-white">
         <%= @media_profile_count %>
       </h4>
-    </a>
+    </div>
   </div>
   <div class="rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
-    <a href={~p"/sources"} class="mt-4 flex flex-col items-center justify-center">
+    <div class="mt-4 flex flex-col items-center justify-center">
       <span class="text-md font-medium">Source(s)</span>
       <h4 class="text-title-md font-bold text-white">
         <%= @source_count %>
       </h4>
-    </a>
+    </div>
   </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">
+    <div class="mt-4 flex flex-col items-center justify-center">
-      <span class="text-md font-medium">Downloaded Media</span>
+      <span class="text-md font-medium">Media Item(s)</span>
       <h4 class="text-title-md font-bold text-white">
         <%= @media_item_count %>
       </h4>
-    </span>
+    </div>
   </div>
-</div>
+  <span class="text-strokedark">I know this page isn't super useful yet, but give it time :&rpar;</span>
-
-<div class="rounded-sm border shadow-default border-strokedark bg-boxdark mt-4 p-5">
-  <span class="text-2xl font-medium mb-4">History</span>
-  <section class="mt-6">
-    <%= live_render(@conn, Pinchflat.Pages.HistoryTableLive) %>
-  </section>
 </div>

lib/pinchflat_web/controllers/podcasts/podcast_controller.ex

@@ -1,17 +1,16 @@
 defmodule PinchflatWeb.Podcasts.PodcastController do
   use PinchflatWeb, :controller
-  use Pinchflat.Media.MediaQuery
 
   alias Pinchflat.Repo
+  alias Pinchflat.Media
   alias Pinchflat.Sources.Source
-  alias Pinchflat.Media.MediaItem
   alias Pinchflat.Podcasts.RssFeedBuilder
   alias Pinchflat.Podcasts.PodcastHelpers
 
   def rss_feed(conn, %{"uuid" => uuid}) do
     source = Repo.get_by!(Source, uuid: uuid)
     url_base = url(conn, ~p"/")
-    xml = RssFeedBuilder.build(source, limit: 2_000, url_base: url_base)
+    xml = RssFeedBuilder.build(source, limit: 300, url_base: url_base)
 
     conn
     |> put_resp_content_type("application/rss+xml")
@@ -21,15 +20,10 @@ defmodule PinchflatWeb.Podcasts.PodcastController do
 
   def feed_image(conn, %{"uuid" => uuid}) do
     source = Repo.get_by!(Source, uuid: uuid)
-
+    # This provides a fallback image if the source has none.
-    # This is used to fetch a fallback cover image
+    # We only need one since we're using the internal metadata image which
-    # if the source doesn't have any usable images
+    # we know exists.
-    media_items =
+    media_items = Media.list_downloaded_media_items_for(source, limit: 1)
-      MediaQuery.new()
-      |> MediaQuery.for_source(source)
-      |> MediaQuery.with_media_filepath()
-      |> Repo.maybe_limit(1)
-      |> Repo.all()
 
     case PodcastHelpers.select_cover_image(source, media_items) do
       {:error, _} ->
@@ -41,16 +35,4 @@ defmodule PinchflatWeb.Podcasts.PodcastController do
         |> send_file(200, filepath)
     end
   end
-
-  def episode_image(conn, %{"uuid" => uuid}) do
-    media_item = Repo.get_by!(MediaItem, uuid: uuid)
-
-    if media_item.thumbnail_filepath && File.exists?(media_item.thumbnail_filepath) do
-      conn
-      |> put_resp_content_type(MIME.from_path(media_item.thumbnail_filepath))
-      |> send_file(200, media_item.thumbnail_filepath)
-    else
-      send_resp(conn, 404, "Image not found")
-    end
-  end
 end

lib/pinchflat_web/controllers/searches/search_html/show.html.heex

@@ -5,7 +5,7 @@
 </div>
 
 <div class="rounded-sm border border-stroke bg-white px-5 py-5 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5">
-  <div class="max-w-full">
+  <div class="max-w-full overflow-x-auto">
     <div class="flex flex-col gap-10 dark:text-white">
       <%= if match?([_|_], @search_results) do %>
         <.table rows={@search_results} table_class="text-black dark:text-white">

lib/pinchflat_web/controllers/settings/setting_controller.ex

@@ -1,42 +0,0 @@
-defmodule PinchflatWeb.Settings.SettingController do
-  use PinchflatWeb, :controller
-
-  alias Pinchflat.Settings
-
-  def show(conn, _params) do
-    setting = Settings.record()
-    changeset = Settings.change_setting(setting)
-
-    render(conn, "show.html", changeset: changeset)
-  end
-
-  def update(conn, %{"setting" => setting_params}) do
-    setting = Settings.record()
-
-    case Settings.update_setting(setting, setting_params) do
-      {:ok, _} ->
-        conn
-        |> put_flash(:info, "Settings updated successfully.")
-        |> redirect(to: ~p"/settings")
-
-      {:error, %Ecto.Changeset{} = changeset} ->
-        render(conn, "show.html", changeset: changeset)
-    end
-  end
-
-  def app_info(conn, _params) do
-    render(conn, "app_info.html")
-  end
-
-  def download_logs(conn, _params) do
-    log_path = Application.get_env(:pinchflat, :log_path)
-
-    if log_path && File.exists?(log_path) do
-      send_download(conn, {:file, log_path}, filename: "pinchflat-logs-#{Date.utc_today()}.txt")
-    else
-      conn
-      |> put_flash(:error, "Log file couldn't be found")
-      |> redirect(to: ~p"/app_info")
-    end
-  end
-end

lib/pinchflat_web/controllers/settings/setting_html.ex

@@ -1,31 +0,0 @@
-defmodule PinchflatWeb.Settings.SettingHTML do
-  use PinchflatWeb, :html
-
-  embed_templates "setting_html/*"
-
-  @doc """
-  Renders a setting form.
-  """
-  attr :conn, Plug.Conn, required: true
-  attr :changeset, Ecto.Changeset, required: true
-  attr :action, :string, required: true
-
-  def setting_form(assigns)
-
-  def apprise_server_help do
-    url = "https://github.com/caronc/apprise/wiki/URLBasics"
-    classes = "underline decoration-bodydark decoration-1 hover:decoration-white"
-
-    ~s(Server endpoint for Apprise notifications when new media is found. See <a href="#{url}" class="#{classes}" target="_blank">Apprise docs</a> for more information)
-  end
-
-  def diagnostic_info_string do
-    """
-    App Version: #{Application.spec(:pinchflat)[:vsn]}
-    yt-dlp Version: #{Settings.get!(:yt_dlp_version)}
-    Apprise Version: #{Settings.get!(:apprise_version)}
-    System Architecture: #{to_string(:erlang.system_info(:system_architecture))}
-    Timezone: #{Application.get_env(:pinchflat, :timezone)}
-    """
-  end
-end

lib/pinchflat_web/controllers/settings/setting_html/app_info.html.heex

@@ -1,26 +0,0 @@
-<div class="mb-6 flex gap-3 flex-row items-center justify-between">
-  <div class="flex gap-3 items-center">
-    <h2 class="text-title-md2 font-bold text-white ml-4">
-      App Info
-    </h2>
-  </div>
-</div>
-<div class="rounded-sm border border-stroke bg-white px-5 py-5 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5">
-  <div class="max-w-full">
-    <.button color="bg-primary" rounding="rounded-lg" x-data="{ copied: false }" x-on:click={~s"
-        copyWithCallbacks(
-          `#{diagnostic_info_string()}`, 
-          () => copied = true, 
-          () => copied = false
-        )
-      "}>
-      Copy Diagnostic Info
-      <span x-show="copied" x-transition.duration.150ms><.icon name="hero-check" class="ml-2 h-4 w-4" /></span>
-    </.button>
-    <.link href={~p"/download_logs"}>
-      <.button color="bg-primary" rounding="rounded-lg" class="ml-4">
-        Download Logs
-      </.button>
-    </.link>
-  </div>
-</div>

lib/pinchflat_web/controllers/settings/setting_html/apprise_server_live.ex

@@ -1,55 +0,0 @@
-defmodule Pinchflat.Settings.AppriseServerLive do
-  use PinchflatWeb, :live_view
-
-  alias PinchflatWeb.Settings.SettingHTML
-
-  def render(assigns) do
-    ~H"""
-    <.input
-      type="text"
-      id="setting_apprise_server"
-      name="setting[apprise_server]"
-      value={@value}
-      label="Apprise Server"
-      help={SettingHTML.apprise_server_help()}
-      html_help={true}
-      inputclass="font-mono text-sm mr-4"
-      placeholder="https://discordapp.com/api/webhooks/{WebhookID}/{WebhookToken}"
-      phx-change="apprise_server_changed"
-    >
-      <:input_append>
-        <.icon_button icon_name={@icon_name} class="h-12 w-12" phx-click="send_apprise_test" tooltip={@tooltip} />
-      </:input_append>
-    </.input>
-    """
-  end
-
-  def mount(_params, session, socket) do
-    new_assigns = %{
-      value: session["value"],
-      icon_name: "hero-paper-airplane",
-      tooltip: "Send Test"
-    }
-
-    {:ok, assign(socket, new_assigns)}
-  end
-
-  def handle_event("send_apprise_test", _params, %{assigns: assigns} = socket) do
-    backend_runner().run([assigns.value], title: "Pinchflat Test", body: "This is a test message from Pinchflat")
-    Process.send_after(self(), :reset_button_icon, 4_000)
-
-    {:noreply, assign(socket, %{icon_name: "hero-check", tooltip: "Sent!"})}
-  end
-
-  def handle_event("apprise_server_changed", %{"setting" => setting}, socket) do
-    {:noreply, assign(socket, %{value: setting["apprise_server"]})}
-  end
-
-  def handle_info(:reset_button_icon, socket) do
-    {:noreply, assign(socket, %{icon_name: "hero-paper-airplane", tooltip: "Send Test"})}
-  end
-
-  defp backend_runner do
-    Application.get_env(:pinchflat, :apprise_runner)
-  end
-end

lib/pinchflat_web/controllers/settings/setting_html/setting_form.html.heex

@@ -1,19 +0,0 @@
-<.simple_form :let={f} for={@changeset} action={@action}>
-  <.error :if={@changeset.action}>
-    Oops, something went wrong! Please check the errors below.
-  </.error>
-
-  <h3 class="mt-2 md:mt-8 text-2xl text-black dark:text-white">
-    Notification Settings
-  </h3>
-
-  <section>
-    <%= live_render(
-      @conn,
-      Pinchflat.Settings.AppriseServerLive,
-      session: %{"value" => f[:apprise_server].value}
-    ) %>
-  </section>
-
-  <.button class="mt-10 mb-4 sm:mb-8 w-full sm:w-auto" rounding="rounded-lg">Save Settings</.button>
-</.simple_form>

lib/pinchflat_web/controllers/settings/setting_html/show.html.heex

@@ -1,12 +0,0 @@
-<div class="mb-6 flex gap-3 flex-row items-center justify-between">
-  <div class="flex gap-3 items-center">
-    <h2 class="text-title-md2 font-bold text-black dark:text-white ml-4">
-      Settings
-    </h2>
-  </div>
-</div>
-<div class="rounded-sm border border-stroke bg-white px-5 py-5 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5">
-  <div class="max-w-full">
-    <.setting_form conn={@conn} changeset={@changeset} action={~p"/settings"} />
-  </div>
-</div>

lib/pinchflat_web/controllers/sources/source_controller.ex

@@ -4,20 +4,15 @@ defmodule PinchflatWeb.Sources.SourceController do
   import Ecto.Query, warn: false
 
   alias Pinchflat.Repo
+  alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources
+  alias Pinchflat.Profiles
   alias Pinchflat.Sources.Source
-  alias Pinchflat.Profiles.MediaProfile
+  alias Pinchflat.Media.MediaQuery
-  alias Pinchflat.Downloading.DownloadingHelpers
-  alias Pinchflat.SlowIndexing.SlowIndexingHelpers
-  alias Pinchflat.Metadata.SourceMetadataStorageWorker
 
   def index(conn, _params) do
-    sources =
+    sources = Repo.preload(Sources.list_sources(), :media_profile)
-      Source
-      |> order_by(asc: :custom_name)
-      |> Repo.all()
-      |> Repo.preload(:media_profile)
 
     render(conn, :index, sources: sources)
   end
@@ -54,12 +49,17 @@ defmodule PinchflatWeb.Sources.SourceController do
   def show(conn, %{"id" => id}) do
     source = Repo.preload(Sources.get_source!(id), :media_profile)
 
-    pending_tasks =
+    pending_tasks = Repo.preload(Tasks.list_pending_tasks_for(source), :job)
-      source
+    pending_media = Media.list_pending_media_items_for(source, limit: 100)
-      |> Tasks.list_tasks_for(nil, [:executing, :available, :scheduled, :retryable])
+    downloaded_media = Media.list_downloaded_media_items_for(source, limit: 100)
-      |> Repo.preload(:job)
 
-    render(conn, :show, source: source, pending_tasks: pending_tasks)
+    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
@@ -104,55 +104,17 @@ defmodule PinchflatWeb.Sources.SourceController do
     |> redirect(to: ~p"/sources")
   end
 
-  def force_download_pending(conn, %{"source_id" => id}) do
-    wrap_forced_action(
-      conn,
-      id,
-      "Forcing download of pending media items.",
-      &DownloadingHelpers.enqueue_pending_download_tasks/1
-    )
-  end
-
-  def force_redownload(conn, %{"source_id" => id}) do
-    wrap_forced_action(
-      conn,
-      id,
-      "Forcing re-download of downloaded media items.",
-      &DownloadingHelpers.kickoff_redownload_for_existing_media/1
-    )
-  end
-
-  def force_index(conn, %{"source_id" => id}) do
-    wrap_forced_action(
-      conn,
-      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)
-    |> redirect(to: ~p"/sources/#{source}")
-  end
-
   defp media_profiles do
-    MediaProfile
+    Profiles.list_media_profiles()
-    |> order_by(asc: :name)
+  end
-    |> Repo.all()
+
+  # NOTE: should move this out of the controller
+  # once I finally add some query fragment layer
+  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

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

@@ -1,90 +0,0 @@
-<.button_dropdown text="Actions" class="justify-center w-full sm:w-50">
-  <:option>
-    <span
-      x-data="{ copied: false }"
-      x-on:click={"
-        copyWithCallbacks(
-          '#{rss_feed_url(@conn, @source)}', 
-          () => copied = true, 
-          () => copied = false
-        )
-      "}
-    >
-      Copy RSS Feed
-      <span x-show="copied" x-transition.duration.150ms><.icon name="hero-check" class="ml-2 h-4 w-4" /></span>
-    </span>
-  </:option>
-  <:option>
-    <span x-data="{ copied: false }" x-on:click={~s"
-        copyWithCallbacks(
-          `#{Jason.Formatter.pretty_print(Phoenix.json_library().encode!(@source))}`, 
-          () => copied = true, 
-          () => copied = false
-        )
-      "}>
-      Copy JSON
-      <span x-show="copied" x-transition.duration.150ms><.icon name="hero-check" class="ml-2 h-4 w-4" /></span>
-    </span>
-  </:option>
-  <:option>
-    <div class="h-px w-full bg-bodydark2"></div>
-  </:option>
-  <:option :if={@source.download_media}>
-    <.link
-      href={~p"/sources/#{@source}/force_download_pending"}
-      method="post"
-      data-confirm="Are you sure you want to force a download of all *pending* media items? This isn't normally needed."
-    >
-      Download Pending
-    </.link>
-  </:option>
-  <:option :if={@source.download_media}>
-    <.link
-      href={~p"/sources/#{@source}/force_redownload"}
-      method="post"
-      data-confirm="Are you sure you want to re-download all currently downloaded media items? This isn't normally needed and won't change anything if the files already exist."
-    >
-      Redownload Existing
-    </.link>
-  </:option>
-  <:option>
-    <.link
-      href={~p"/sources/#{@source}/force_index"}
-      method="post"
-      data-confirm="Are you sure you want to force an index of this source? This isn't normally needed."
-    >
-      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>
-  <:option>
-    <.link
-      href={~p"/sources/#{@source}"}
-      method="delete"
-      data-confirm="Are you sure you want to delete this source (leaving files in place)? This cannot be undone."
-    >
-      Delete Source
-    </.link>
-  </:option>
-  <:option>
-    <.link
-      href={~p"/sources/#{@source}?delete_files=true"}
-      method="delete"
-      data-confirm="Are you sure you want to delete this source and it's files on disk? This cannot be undone."
-      class="mt-5 md:mt-0"
-    >
-      Delete Source + Files
-    </.link>
-  </:option>
-</.button_dropdown>

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

@@ -8,7 +8,7 @@
 </div>
 
 <div class="rounded-sm border border-stroke bg-white px-5 pb-2.5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5 xl:pb-1">
-  <div class="max-w-full">
+  <div class="max-w-full overflow-x-auto">
     <div class="flex flex-col gap-10">
       <.source_form changeset={@changeset} media_profiles={@media_profiles} action={~p"/sources/#{@source}"} />
     </div>

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

@@ -22,13 +22,6 @@
         <:col :let={source} label="Should Download?">
           <.icon name={if source.download_media, do: "hero-check", else: "hero-x-mark"} />
         </:col>
-        <:col :let={source} label="Retention">
-          <%= if source.retention_period_days && source.retention_period_days > 0 do %>
-            <%= source.retention_period_days %> day(s)
-          <% else %>
-            <span class="text-lg">∞</span>
-          <% end %>
-        </:col>
         <:col :let={source} label="Media Profile">
           <.subtle_link href={~p"/media_profiles/#{source.media_profile_id}"}>
             <%= source.media_profile.name %>

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

@@ -1,100 +0,0 @@
-defmodule Pinchflat.Sources.MediaItemTableLive do
-  use PinchflatWeb, :live_view
-  use Pinchflat.Media.MediaQuery
-
-  alias Pinchflat.Repo
-  alias Pinchflat.Sources
-  alias Pinchflat.Utils.NumberUtils
-
-  @limit 10
-
-  def render(%{records: []} = assigns) do
-    ~H"""
-    <div class="mb-4 flex items-center">
-      <.icon_button icon_name="hero-arrow-path" class="h-10 w-10" phx-click="reload_page" />
-      <p class="ml-2">Nothing Here!</p>
-    </div>
-    """
-  end
-
-  def render(assigns) do
-    ~H"""
-    <div>
-      <span class="mb-4 flex items-center">
-        <.icon_button icon_name="hero-arrow-path" class="h-10 w-10" phx-click="reload_page" tooltip="Refresh" />
-        <span class="ml-2">Showing <%= length(@records) %> of <%= @total_record_count %></span>
-      </span>
-      <.table rows={@records} table_class="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
-
-  def handle_event("reload_page", _params, %{assigns: assigns} = socket) do
-    new_assigns = fetch_pagination_attributes(assigns.base_query, assigns.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