Bumped version

* Fixed TV show output template

* Discard jobs if record not found; hopefully addressed timing-related source deletion bug

.github/pull_request_template.md

@@ -13,5 +13,3 @@ N/A
 ## Any other comments?
 
 N/A
-
-- [ ] I am the original author of this code and I am giving it freely to the community and Pinchflat project maintainers

.github/workflows/build_and_push_docker.yml

@@ -0,0 +1,32 @@
+name: Build and Push Docker Image
+
+on:
+  workflow_dispatch:
+    inputs:
+      image_tag:
+        description: 'Docker Image Tag'
+        required: true
+        default: 'dev'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          file: ./selfhosted.Dockerfile
+          tags: 'keglin/pinchflat:${{ github.event.inputs.image_tag }}'

.github/workflows/docker_release.yml

@@ -1,79 +0,0 @@
-name: Docker Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      platforms:
-        type: choice
-        description: 'Build Platforms'
-        required: true
-        default: 'linux/amd64'
-        options:
-          - 'linux/amd64'
-          - 'linux/amd64,linux/arm64'
-  push:
-    branches:
-      - master
-  release:
-    types:
-      - published
-
-jobs:
-  build_and_push_docker:
-    runs-on: ubuntu-latest
-    env:
-      dev_arch: 'linux/amd64'
-      release_arch: 'linux/amd64,linux/arm64'
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            docker.io/keglin/pinchflat
-            ghcr.io/${{ github.repository }}
-          # All non-release actions will be tagged as `dev` (ie: push, workflow_dispatch)
-          tags: |
-            type=ref,event=tag
-            type=raw,value=dev,enable=${{ github.event_name != 'release' }}
-          flavor: |
-            latest=auto
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./selfhosted.Dockerfile
-          # If the event is a release, use the release_arch, otherwise use the
-          # platforms input if present, falling back to dev_arch
-          platforms: ${{ github.event_name == 'release' && env.release_arch || (github.event.inputs.platforms || env.dev_arch) }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.iex.exs

@@ -22,4 +22,42 @@ alias Pinchflat.Metadata.MetadataFileHelpers
 
 alias Pinchflat.SlowIndexing.FileFollowerServer
 
-Pinchflat.Release.check_file_permissions()
+defmodule IexHelpers do
+  def playlist_url do
+    "https://www.youtube.com/playlist?list=PLmqC3wPkeL8kSlTCcSMDD63gmSi7evcXS"
+  end
+
+  def channel_url do
+    "https://www.youtube.com/c/TheUselessTrials"
+  end
+
+  def video_url do
+    "https://www.youtube.com/watch?v=bR52O78ZIUw"
+  end
+
+  def last_media_item do
+    Repo.one(from m in MediaItem, limit: 1)
+  end
+
+  def details(type) do
+    source =
+      case type do
+        :playlist -> playlist_url()
+        :channel -> channel_url()
+      end
+
+    YtDlpCollection.get_source_details(source)
+  end
+
+  def ids(type) do
+    source =
+      case type do
+        :playlist -> playlist_url()
+        :channel -> channel_url()
+      end
+
+    YtDlpCollection.get_media_attributes_for_collection(source)
+  end
+end
+
+import IexHelpers

.sobelow-conf

@@ -9,15 +9,7 @@
   threshold: :low,
   # All of these are ignorable because this app is intended to be single-user and self-hosted.
   # There is an expectation that the user won't intentionally run a FS Traversal on themselves
-  ignore:
+  ignore: ["CI.System", "Traversal.FileModule", "Config.HTTPS", "Config.CSP"],
-    [
-      "CI.System",
-      "Traversal.FileModule",
-      "Config.HTTPS",
-      "Config.CSP",
-      "XSS.ContentType",
-      "Traversal.SendFile"
-    ],
   ignore_files: [],
   version: false
 ]

README.md

@@ -1,161 +1,39 @@
-<p align="center">  
+# Pinchflat (Alpha)
-  <img 
-    src="priv/static/images/originals/logo-white-wordmark-with-background.png" 
-    alt="Pinchflat Logo by @hernandito"
-    width="700" 
-  />
-</p>
 
-<p align="center">  
+This is alpha software and anything can break at any time. I make not guarantees about the stability of this software, forward-compatibility of updates, or integrity (both related to and independent of Pinchflat). Essentially, use at your own risk and expect there will be rough edges.
-  <sup>
-    <em>logo by <a href="https://github.com/hernandito" target="_blank">@hernandito</a></em>
-  </sup>
-</p>
 
-<div align="center">
+## What is Pinchflat?
 
-[![](https://img.shields.io/github/license/kieraneglin/pinchflat?style=for-the-badge&color=ee512b)](LICENSE)
+TODO: expand on this.
-[![](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>
+Pinchflat is a lightweight self-contained app for downloading YouTube content. For now, it is not intended as a way to consume content, but instead as a way to download content to disk using specified rules and schedules.
 
-# Your next YouTube media manager
+I have plans for more to come, but for now this is the focus. Think of Pinchflat as nothing more than an automated way to get content from YouTube to your disk.
-
-## Table of contents:
-
-- [What it does](#what-it-does)
-- [Features](#features)
-- [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)
-- [Documentation](https://github.com/kieraneglin/pinchflat/wiki)
-- [EFF donations](#eff-donations)
-- [Pre-release disclaimer](#pre-release-disclaimer)
-- [Development and Contributing](https://github.com/kieraneglin/pinchflat/wiki/Development-and-Contributing)
-
-## 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!
-
-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.
-
-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)
-
-## Features
-
-- Self-contained - just one Docker container with no external dependencies
-- 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))
-- 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
-
-<img src="priv/static/images/app-form-screenshot.png" alt="Pinchflat screenshot" width="700" />
-<img src="priv/static/images/app-screenshot.png" alt="Pinchflat screenshot" width="700" />
 
 ## Installation
 
-### Unraid
+Pinchflat is designed to be self-hosted. I'm building it for my own needs which means it's designed to work well with Unraid, but it should work on any computer/server that can run Docker images.
 
-Simply search for Pinchflat in the Community Apps store!
+I'll update with Unraid instructions once I get something in the Community Apps store. Until then, here's how you build it with Docker:
-
-### Portainer
-
-> [!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.
-
-Docker Compose file:
-
-```yaml
-version: '3'
-services:
-  pinchflat:
-    image: keglin/pinchflat:latest
-    environment:
-      # Set the timezone to your local timezone
-      - TZ=America/New_York
-    ports:
-      - '8945:8945'
-    volumes:
-      - /host/path/to/config:/config
-      - /host/path/to/downloads:/downloads
-```
-
-### Docker
-
-1. Create two directories on your host machine: one for storing config and one for storing downloaded media. Make sure they're both writable by the user running the Docker container.
-2. Prepare the docker image in one of the two ways below:
-   - **From GHCR:** `docker pull ghcr.io/kieraneglin/pinchflat:latest`
-     - NOTE: also available on Docker Hub at `keglin/pinchflat:latest`
-   - **Building locally:** `docker build . --file selfhosted.Dockerfile -t ghcr.io/kieraneglin/pinchflat:latest`
-3. Run the container:
 
 ```bash
-# Be sure to replace /host/path/to/config and /host/path/to/downloads below with
+docker build . --file selfhosted.Dockerfile -t pinchflat:dev
-# 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 /Users/work/Desktop/test_volumes/config:/config \
-  -v /host/path/to/downloads:/downloads \
+  -v /Users/work/Desktop/test_volumes/downloads:/downloads \
-  ghcr.io/kieraneglin/pinchflat:latest
+  pinchflat:dev
 ```
 
-### IMPORTANT: File permissions
+## Authentication
 
-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.
+Currently HTTP basic auth is optionally supported. To use it, set the `BASIC_AUTH_USERNAME` and `BASIC_AUTH_PASSWORD` environment variables when starting the container. If you don't set both of these, no authentication will be required.
-
-> [!IMPORTANT]
-> 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]
-> 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
-
-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.
-
-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
-
-This is pre-release software and anything can break at any time. I make not guarantees about the stability of this software, forward-compatibility of updates, or integrity (both related to and independent of Pinchflat). Essentially, use at your own risk and expect there will be rough edges for now.
 
 ## 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,17 +35,6 @@ let liveSocket = new LiveSocket('/live', Socket, {
         window.Alpine.clone(from, to)
       }
     }
-  },
-  hooks: {
-    supressEnterSubmission: {
-      mounted() {
-        this.el.addEventListener('keypress', (event) => {
-          if (event.key === 'Enter') {
-            event.preventDefault()
-          }
-        })
-      }
-    }
   }
 })
 

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,25 +12,16 @@ 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",
-  extras_directory: "/config/extras",
   tmpfile_directory: Path.join([System.tmp_dir!(), "pinchflat", "data"]),
   # Setting BASIC_AUTH_USERNAME and BASIC_AUTH_PASSWORD implies you want to use basic auth.
   # If either is unset, basic auth will not be used.
-  basic_auth_username: "",
+  basic_auth_username: System.get_env("BASIC_AUTH_USERNAME"),
-  basic_auth_password: "",
+  basic_auth_password: System.get_env("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,
-  pool_size: 5
 
 # Configures the endpoint
 config :pinchflat, PinchflatWeb.Endpoint,
@@ -49,14 +40,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 +73,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/dev.exs

@@ -3,7 +3,6 @@ import Config
 config :pinchflat,
   media_directory: Path.join([File.cwd!(), "tmp", "media"]),
   metadata_directory: Path.join([File.cwd!(), "tmp", "metadata"]),
-  extras_directory: Path.join([File.cwd!(), "tmp", "extras"]),
   tmpfile_directory: Path.join([File.cwd!(), "tmp", "tmpfiles"])
 
 # Configure your database

config/runtime.exs

@@ -25,52 +25,37 @@ config :pinchflat,
   basic_auth_username: System.get_env("BASIC_AUTH_USERNAME"),
   basic_auth_password: System.get_env("BASIC_AUTH_PASSWORD")
 
-arch_string = to_string(:erlang.system_info(:system_architecture))
-
-system_arch =
-  cond do
-    String.contains?(arch_string, "arm") -> "arm"
-    String.contains?(arch_string, "aarch") -> "arm"
-    String.contains?(arch_string, "x86") -> "x86"
-    true -> "unknown"
-  end
-
-config :pinchflat, Pinchflat.Repo,
-  load_extensions: [
-    Path.join([:code.priv_dir(:pinchflat), "repo", "extensions", "sqlean-linux-#{system_arch}", "sqlean"])
-  ]
-
 if config_env() == :prod do
-  config_path = "/config"
+  config_path =
+    System.get_env("CONFIG_PATH") ||
+      raise """
+      environment variable CONFIG_PATH is missing.
+      For example: /etc/pinchflat/config
+      """
+
   db_path = System.get_env("DATABASE_PATH", Path.join([config_path, "db", "pinchflat.db"]))
   log_path = System.get_env("LOG_PATH", Path.join([config_path, "logs", "pinchflat.log"]))
   metadata_path = System.get_env("METADATA_PATH", Path.join([config_path, "metadata"]))
-  extras_path = System.get_env("EXTRAS_PATH", Path.join([config_path, "extras"]))
 
-  # For running PF as a podcast host on self-hosted environments
+  # We want to force _some_ level of useful logging in production
-  expose_feed_endpoints = String.length(System.get_env("EXPOSE_FEED_ENDPOINTS", "")) > 0
+  acceptable_log_levels = ~w(debug info)a
+  log_level = String.to_existing_atom(System.get_env("LOG_LEVEL", "info"))
 
-  # For testing alternate journal modes (see issue #137)
+  if log_level in acceptable_log_levels do
-  journal_mode = String.to_existing_atom(System.get_env("JOURNAL_MODE", "wal"))
+    config :logger, level: log_level
-
+  else
-  config :logger, level: String.to_existing_atom(System.get_env("LOG_LEVEL", "info"))
+    Logger.error("Invalid log level: #{log_level}. Defaulting to info.")
+    config :logger, level: :info
+  end
 
   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,
+    dns_cluster_query: System.get_env("DNS_CLUSTER_QUERY")
-    tmpfile_directory: Path.join([System.tmp_dir!(), "pinchflat", "data"]),
-    dns_cluster_query: System.get_env("DNS_CLUSTER_QUERY"),
-    expose_feed_endpoints: expose_feed_endpoints,
-    timezone: System.get_env("TIMEZONE") || System.get_env("TZ") || "UTC"
-
-  config :tzdata, :data_dir, System.get_env("TZ_DATA_DIR", "/etc/elixir_tzdata_data")
 
   config :pinchflat, Pinchflat.Repo,
     database: db_path,
-    journal_mode: journal_mode
+    pool_size: String.to_integer(System.get_env("POOL_SIZE") || "5")
 
   # The secret key base is used to sign/encrypt cookies and other secrets.
   # A default value is used in config/dev.exs and config/test.exs but you
@@ -104,7 +89,7 @@ if config_env() == :prod do
       # Set it to  {0, 0, 0, 0, 0, 0, 0, 1} for local network only access.
       # See the documentation on https://hexdocs.pm/plug_cowboy/Plug.Cowboy.html
       # for details about using IPv6 vs IPv4 and loopback vs public addresses.
-      ip: {0, 0, 0, 0},
+      ip: {0, 0, 0, 0, 0, 0, 0, 0},
       port: String.to_integer(System.get_env("PORT") || "4000")
     ],
     secret_key_base: secret_key_base
@@ -123,4 +108,54 @@ if config_env() == :prod do
        formatter: Logger.Formatter.new()
      }}
   ]
+
+  # ## SSL Support
+  #
+  # To get SSL working, you will need to add the `https` key
+  # to your endpoint configuration:
+  #
+  #     config :pinchflat, PinchflatWeb.Endpoint,
+  #       https: [
+  #         ...,
+  #         port: 443,
+  #         cipher_suite: :strong,
+  #         keyfile: System.get_env("SOME_APP_SSL_KEY_PATH"),
+  #         certfile: System.get_env("SOME_APP_SSL_CERT_PATH")
+  #       ]
+  #
+  # The `cipher_suite` is set to `:strong` to support only the
+  # latest and more secure SSL ciphers. This means old browsers
+  # and clients may not be supported. You can set it to
+  # `:compatible` for wider support.
+  #
+  # `:keyfile` and `:certfile` expect an absolute path to the key
+  # and cert in disk or a relative path inside priv, for example
+  # "priv/ssl/server.key". For all supported SSL configuration
+  # options, see https://hexdocs.pm/plug/Plug.SSL.html#configure/1
+  #
+  # We also recommend setting `force_ssl` in your endpoint, ensuring
+  # no data is ever sent via http, always redirecting to https:
+  #
+  #     config :pinchflat, PinchflatWeb.Endpoint,
+  #       force_ssl: [hsts: true]
+  #
+  # Check `Plug.SSL` for all available options in `force_ssl`.
+
+  # ## Configuring the mailer
+  #
+  # In production you need to configure the mailer to use a different adapter.
+  # Also, you may need to configure the Swoosh API client of your choice if you
+  # are not using SMTP. Here is an example of the configuration:
+  #
+  #     config :pinchflat, Pinchflat.Mailer,
+  #       adapter: Swoosh.Adapters.Mailgun,
+  #       api_key: System.get_env("MAILGUN_API_KEY"),
+  #       domain: System.get_env("MAILGUN_DOMAIN")
+  #
+  # For this example you need include a HTTP client required by Swoosh API client.
+  # Swoosh supports Hackney and Finch out of the box:
+  #
+  #     config :swoosh, :api_client, Swoosh.ApiClient.Hackney
+  #
+  # See https://hexdocs.pm/swoosh/Swoosh.html#module-installation for details.
 end

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"]),
@@ -18,6 +17,7 @@ config :pinchflat, Oban, testing: :manual
 # Run `mix help test` for more information.
 config :pinchflat, Pinchflat.Repo,
   database: Path.expand("../priv/repo/pinchflat_test.db", Path.dirname(__ENV__.file)),
+  pool_size: 5,
   pool: Ecto.Adapters.SQL.Sandbox
 
 # We don't run a server during test. If one is required,
@@ -33,7 +33,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,75 @@
+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
+  alias Pinchflat.Media.MediaItem
+
+  @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")
+    backfill_shorts_data()
+
+    reschedule_backfill()
+
+    :ok
+  end
+
+  defp backfill_shorts_data do
+    query =
+      from(
+        m in MediaItem,
+        where: fragment("? like ?", m.original_url, "%/shorts/%"),
+        where: m.short_form_content == false
+      )
+
+    {count, _} = Repo.update_all(query, set: [short_form_content: true])
+
+    Logger.info("Backfill worker set short_form_content to true for #{count} media items.")
+  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,66 +31,59 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
   """
   @impl true
   def init(state) do
-    reset_executing_jobs()
-    create_blank_yt_dlp_files()
-    create_blank_user_script_file()
     apply_default_settings()
+    ensure_directories_are_writeable()
+    rename_old_job_workers()
 
     {:ok, state}
   end
 
-  # If a node cannot gracefully shut down, the currently executing jobs get stuck
+  defp apply_default_settings do
-  # in the "executing" state. This is a problem because the job runner will not
+    Settings.fetch!(:onboarding, true)
-  # pick them up again
+    Settings.fetch!(:pro_enabled, false)
-  defp reset_executing_jobs do
-    {count, _} =
-      Oban.Job
-      |> where(state: "executing")
-      |> Repo.update_all(set: [state: "retryable"])
-
-    Logger.info("Reset #{count} executing jobs")
   end
 
-  defp create_blank_yt_dlp_files do
+  defp ensure_directories_are_writeable do
-    files = ["cookies.txt", "yt-dlp-configs/base-config.txt"]
+    directories = [
-    base_dir = Application.get_env(:pinchflat, :extras_directory)
+      Application.get_env(:pinchflat, :media_directory),
+      Application.get_env(:pinchflat, :tmpfile_directory),
+      Application.get_env(:pinchflat, :metadata_directory)
+    ]
 
-    Enum.each(files, fn file ->
+    Enum.each(directories, fn dir ->
-      filepath = Path.join(base_dir, file)
+      file = Path.join([dir, ".keep"])
 
-      if !File.exists?(filepath) do
+      # This will fail if the directory is not writeable, stopping boot
-        Logger.info("Creating blank file: #{filepath}")
+      FilesystemHelpers.write_p!(file, "")
-
-        FilesystemUtils.write_p!(filepath, "")
-      end
     end)
   end
 
-  defp create_blank_user_script_file do
+  # As part of a large refactor, I ended up moving a bunch of workers around. This
-    base_dir = Application.get_env(:pinchflat, :extras_directory)
+  # is a problem because the workers are stored in the database and the runner
-    filepath = Path.join([base_dir, "user-scripts", "lifecycle"])
+  # will try to run the OLD jobs. This is also why these tasks run before the job
+  # runner starts up.
+  #
+  # Can be removed after a few months (created: 2024-03-12)
+  defp rename_old_job_workers do
+    # [ [old_name, new_name], ...]
+    rename_map = [
+      ["Pinchflat.Workers.MediaIndexingWorker", "Pinchflat.FastIndexing.MediaIndexingWorker"],
+      ["Pinchflat.Workers.MediaDownloadWorker", "Pinchflat.Downloading.MediaDownloadWorker"],
+      ["Pinchflat.Workers.FastIndexingWorker", "Pinchflat.FastIndexing.FastIndexingWorker"],
+      ["Pinchflat.Workers.MediaCollectionIndexingWorker", "Pinchflat.SlowIndexing.MediaCollectionIndexingWorker"],
+      ["Pinchflat.Workers.DataBackfillWorker", "Pinchflat.Boot.DataBackfillWorker"]
+    ]
 
-    if !File.exists?(filepath) do
+    jobs_renamed =
-      Logger.info("Creating blank file and making it executable: #{filepath}")
+      Enum.reduce(rename_map, 0, fn [old_name, new_name], acc ->
+        {count, _} =
+          Oban.Job
+          |> where(worker: ^old_name)
+          |> Repo.update_all(set: [worker: new_name])
 
-      FilesystemUtils.write_p!(filepath, "")
+        acc + count
-      File.chmod(filepath, 0o755)
+      end)
-    end
-  end
 
-  defp apply_default_settings do
+    Logger.info("Renamed #{jobs_renamed} old job workers")
-    {:ok, yt_dlp_version} = yt_dlp_runner().version()
-    {:ok, apprise_version} = apprise_runner().version()
-
-    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,31 @@ 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 """
+  defp default_options do
-  Builds the output path for yt-dlp to download media based on the given source's
+    [:no_progress, :windows_filenames]
-  media profile. Uses the source's override output path template if it exists.
-
-  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})
-  end
-
-  defp default_options(override_opts) do
-    overwrite_behaviour = Keyword.get(override_opts, :overwrite_behaviour, :force_overwrites)
-
-    [
-      :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,71 +90,24 @@ 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
 
-  defp sponsorblock_options(media_profile) do
-    categories = media_profile.sponsorblock_categories
-    behaviour = media_profile.sponsorblock_behaviour
-
-    case {behaviour, categories} do
-      {_, []} -> []
-      {:remove, _} -> [sponsorblock_remove: Enum.join(categories, ",")]
-      {:disabled, _} -> []
-    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_path_template = media_item_with_preloads.source.media_profile.output_path_template
+
     [
-      output: build_output_path_for(media_item_with_preloads)
+      output: build_output_path(output_path_template, media_item_with_preloads)
     ]
   end
 
@@ -201,13 +123,7 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
 
     %{
       "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,7 +131,7 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   # It's dependent on the output_path_template being a string ending `.{{ ext }}`
   # (or equivalent), but that's validated by the MediaProfile schema.
   defp determine_thumbnail_location(media_item_with_preloads) do
-    output_path_template = Sources.output_path_template(media_item_with_preloads.source)
+    output_path_template = media_item_with_preloads.source.media_profile.output_path_template
 
     output_path_template
     |> String.split(~r{\.}, include_captures: true)

lib/pinchflat/downloading/downloading_helpers.ex

@@ -7,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,89 +26,45 @@ 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)
-
-      {:error, message, _exit_code} ->
-        Logger.error("yt-dlp download error for media item ##{media_with_preloads.id}: #{inspect(message)}")
-
-        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)}")
-
-        {: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),
+            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_with_preloads, parsed_json),
+              metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(media_item, parsed_json),
-          thumbnail_filepath: MetadataFileHelpers.download_and_store_thumbnail_for(media_with_preloads, parsed_json)
+              thumbnail_filepath: MetadataFileHelpers.download_and_store_thumbnail_for(media_item, 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)
+        Media.update_media_item(item_with_preloads, parsed_attrs)
+
+      err ->
+        err
+    end
   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"
+      NfoBuilder.build_and_store_for_media_item(parsed_json)
-
-      NfoBuilder.build_and_store_for_media_item(filepath, parsed_json)
     else
       nil
     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
@@ -52,9 +42,7 @@ defmodule Pinchflat.Downloading.OutputPathBuilder do
       "upload_day" => "%(upload_date>%d)S",
       "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_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
 end

lib/pinchflat/fast_indexing/fast_indexing_helpers.ex

@@ -5,64 +5,65 @@ 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.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)
+    existing_media_items = Media.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 ->
-        case create_media_item_from_media_id(source, media_id) do
-          {:ok, media_item} ->
-            media_item
-
-          err ->
-            Logger.error("Error creating media item '#{media_id}' from URL: #{inspect(err)}")
-            nil
-        end
-      end)
-
-    DownloadingHelpers.enqueue_pending_download_tasks(source)
-
-    Enum.filter(maybe_new_media_items, & &1)
-  end
-
-  defp list_media_items_by_media_id_for(source, media_ids) do
-    MediaQuery.new()
-    |> MediaQuery.for_source(source)
-    |> MediaQuery.with_media_ids(media_ids)
-    |> Repo.all()
-  end
-
-  defp create_media_item_from_media_id(source, media_id) do
       url = "https://www.youtube.com/watch?v=#{media_id}"
 
-    case YtDlpMedia.get_media_attributes(url) do
+      MediaIndexingWorker.kickoff_with_task(source, url)
-      {:ok, media_attrs} ->
+    end)
-        Media.create_media_item_from_backend_attrs(source, media_attrs)
+  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
+
+        {:ok, media_item}
 
       err ->
         err
     end
   end
+
+  defp create_media_item_from_url(source, url) do
+    {:ok, media_attrs} = YtDlpMedia.get_media_attributes(url)
+
+    Media.create_media_item_from_backend_attrs(source, media_attrs)
+  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.
@@ -35,21 +20,6 @@ defmodule Pinchflat.Utils.FilesystemUtils do
     filepath
   end
 
-  @doc """
-  Writes content to a file, creating directories as needed.
-  Takes the same args as File.write/3.
-
-  Returns :ok | {:error, any()}
-  """
-  def write_p(file, content, modes \\ []) do
-    dirname = Path.dirname(file)
-
-    case File.mkdir_p(dirname) do
-      :ok -> File.write(file, content, modes)
-      err -> err
-    end
-  end
-
   @doc """
   Writes content to a file, creating directories as needed.
   Takes the same args as File.write!/3.
@@ -57,20 +27,11 @@ defmodule Pinchflat.Utils.FilesystemUtils do
   Returns :ok | raises on error
   """
   def write_p!(filepath, content, modes \\ []) do
-    :ok = write_p(filepath, content, modes)
+    filepath
-  end
-
-  @doc """
-  Copies a file from source to destination, creating directories as needed.
-
-  Returns :ok | raises on error
-  """
-  def cp_p!(source, destination) do
-    destination
     |> Path.dirname()
     |> File.mkdir_p!()
 
-    File.cp!(source, destination)
+    File.write!(filepath, content, modes)
   end
 
   @doc """

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,64 +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)
-    Logger.info("[apprise] response: #{output}")
-
-    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,76 +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]"
-          )
-
-        handle_output(output, exit_code)
-    end
-  end
-
-  def run(event_type, _encodable_data) do
-    raise ArgumentError, "Invalid event type: #{inspect(event_type)}"
-  end
-
-  defp handle_output(output, exit_code) do
-    Logger.debug("Custom lifecycle script exit code: #{exit_code} with output: #{output}")
-
-    :ok
-  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,13 @@ 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.Metadata.MediaMetadata
-
+  alias Pinchflat.Filesystem.FilesystemHelpers
-  alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
 
   @doc """
   Returns the list of media_items.
@@ -25,56 +22,65 @@ defmodule Pinchflat.Media do
   end
 
   @doc """
-  Returns a list of media_items that are cullable based on the retention period
+  Returns a list of media_items for a given source.
-  of the source they belong to.
 
-  Returns [%MediaItem{}, ...]
+  Returns [%MediaItem{}, ...].
   """
-  def list_cullable_media_items do
+  def list_media_items_for(%Source{} = source) do
-    MediaQuery.new()
+    MediaItem
-    |> MediaQuery.with_media_filepath()
+    |> where([mi], mi.source_id == ^source.id)
-    |> 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
+  Fetches all media items belonging to a given source that have a media_id in the given list.
-  of the media_profile their source belongs to.
+  Useful for determining the what media items we DON'T already have for fast indexing.
 
-  The logic is that a media_item is past_redownload_delay if the media_item's
+  NOTE: These queries are getting a little tedious. When I have the time, I should see about
-  upload_date is at least redownload_delay_days ago AND
+  implementing a query pattern and having these compose queries from a common base. This would
-  `media_downloaded_at` - `redownload_delay_days` is before the media_item's `upload_date`.
+  also let me compose simple queries in the module using them for one-off methods
-  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{}, ...]
+  Returns [%MediaItem{}, ...].
   """
-  def list_redownloadable_media_items do
+  def list_media_items_by_media_id_for(%Source{} = source, media_ids) do
-    MediaQuery.new()
+    MediaItem
-    |> MediaQuery.with_media_downloaded_at()
+    |> where([mi], mi.source_id == ^source.id and mi.media_id in ^media_ids)
-    |> 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
-    MediaQuery.new()
+    limit = Keyword.get(opts, :limit, nil)
-    |> MediaQuery.for_source(source)
+    media_profile = Repo.preload(source, :media_profile).media_profile
-    |> MediaQuery.where_pending_download()
+
+    MediaItem
+    |> where([mi], mi.source_id == ^source.id and is_nil(mi.media_filepath))
+    |> where(^build_format_clauses(media_profile))
+    |> where(^maybe_apply_cutoff_date(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)
+
+    MediaItem
+    |> where([mi], mi.source_id == ^source.id and not is_nil(mi.media_filepath))
+    |> Repo.maybe_limit(limit)
     |> Repo.all()
   end
 
@@ -90,9 +96,10 @@ defmodule Pinchflat.Media do
   def pending_download?(%MediaItem{} = media_item) do
     media_item = Repo.preload(media_item, source: :media_profile)
 
-    MediaQuery.new()
+    MediaItem
-    |> MediaQuery.with_id(media_item.id)
+    |> where([mi], mi.id == ^media_item.id and is_nil(mi.media_filepath))
-    |> MediaQuery.where_pending_download()
+    |> where(^build_format_clauses(media_item.source.media_profile))
+    |> where(^maybe_apply_cutoff_date(media_item.source))
     |> Repo.exists?()
   end
 
@@ -111,9 +118,20 @@ defmodule Pinchflat.Media do
   def search(search_term, opts) do
     limit = Keyword.get(opts, :limit, 50)
 
-    MediaQuery.new()
+    from(mi in MediaItem,
-    |> MediaQuery.matching_search_term(search_term)
+      join: mi_search_index in assoc(mi, :media_items_search_index),
-    |> Repo.maybe_limit(limit)
+      where: fragment("media_items_search_index MATCH ?", ^search_term),
+      select_merge: %{
+        matching_search_term:
+          fragment("""
+            coalesce(snippet(media_items_search_index, 0, '[PF_HIGHLIGHT]', '[/PF_HIGHLIGHT]', '...', 20), '') ||
+            ' ' ||
+            coalesce(snippet(media_items_search_index, 1, '[PF_HIGHLIGHT]', '[/PF_HIGHLIGHT]', '...', 20), '')
+          """)
+      },
+      order_by: [desc: fragment("rank")],
+      limit: ^limit
+    )
     |> Repo.all()
   end
 
@@ -181,8 +199,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 +207,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 +214,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 +224,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 +236,49 @@ 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 maybe_apply_cutoff_date(source) do
-    runner = Application.get_env(:pinchflat, :user_script_runner, UserScriptRunner)
+    if source.download_cutoff_date do
+      dynamic([mi], mi.upload_date >= ^source.download_cutoff_date)
+    else
+      dynamic(true)
+    end
+  end
 
-    runner.run(event, media_item)
+  defp build_format_clauses(media_profile) do
+    mapped_struct = Map.from_struct(media_profile)
+
+    Enum.reduce(mapped_struct, dynamic(true), fn attr, dynamic ->
+      case {attr, media_profile} do
+        {{:shorts_behaviour, :only}, %{livestream_behaviour: :only}} ->
+          dynamic(
+            [mi],
+            ^dynamic and (mi.livestream == true or mi.short_form_content == true)
+          )
+
+        # Technically redundant, but makes the other clauses easier to parse
+        # (redundant because this condition is the same as the condition above, just flipped)
+        {{:livestream_behaviour, :only}, %{shorts_behaviour: :only}} ->
+          dynamic
+
+        {{:shorts_behaviour, :only}, _} ->
+          dynamic([mi], ^dynamic and mi.short_form_content == true)
+
+        {{:livestream_behaviour, :only}, _} ->
+          dynamic([mi], ^dynamic and mi.livestream == true)
+
+        {{:shorts_behaviour, :exclude}, %{livestream_behaviour: lb}} when lb != :only ->
+          dynamic([mi], ^dynamic and mi.short_form_content == false)
+
+        {{:livestream_behaviour, :exclude}, %{shorts_behaviour: sb}} when sb != :only ->
+          # return records with livestream: false
+          dynamic([mi], ^dynamic and mi.livestream == false)
+
+        _ ->
+          dynamic
+      end
+    end)
   end
 end

lib/pinchflat/media/media_item.ex

@@ -4,14 +4,8 @@ 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,8 +21,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,
     :media_filepath,
@@ -36,16 +28,10 @@ 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(
-    uuid
     title
     original_url
     livestream
@@ -56,11 +42,6 @@ defmodule Pinchflat.Media.MediaItem do
     )a
 
   schema "media_items" do
-    # This is _not_ used as the primary key or internally in the database
-    # relations. This is only used to prevent an enumeration attack on the streaming
-    # and RSS feed endpoints since those _must_ be public (ie: no basic auth)
-    field :uuid, Ecto.UUID
-
     field :title, :string
     field :media_id, :string
     field :description, :string
@@ -68,10 +49,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
     field :media_size_bytes, :integer
@@ -83,10 +61,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
@@ -104,8 +78,6 @@ defmodule Pinchflat.Media.MediaItem do
     media_item
     |> 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 +86,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

@@ -1,211 +0,0 @@
-defmodule Pinchflat.Media.MediaQuery do
-  @moduledoc """
-  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
-  _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.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_*, 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
-
-  def with_media_ids(query, media_ids) 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
-
-  def with_no_media_filepath(query) do
-    where(query, [mi], is_nil(mi.media_filepath))
-  end
-
-  def with_upload_date_after_source_cutoff(query) do
-    query
-    |> require_assoc(:source)
-    |> where([mi, source], is_nil(source.download_cutoff_date) or mi.upload_date >= source.download_cutoff_date)
-  end
-
-  def where_uploaded_on_date(query, date) do
-    where(query, [mi], mi.upload_date == ^date)
-  end
-
-  def where_download_not_prevented(query) do
-    where(query, [mi], mi.prevent_download == false)
-  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
-
-  def matching_search_term(query, term) do
-    from(mi in query,
-      join: mi_search_index in assoc(mi, :media_items_search_index),
-      where: fragment("media_items_search_index MATCH ?", ^term),
-      select_merge: %{
-        matching_search_term:
-          fragment("""
-            coalesce(snippet(media_items_search_index, 0, '[PF_HIGHLIGHT]', '[/PF_HIGHLIGHT]', '...', 20), '') ||
-            ' ' ||
-            coalesce(snippet(media_items_search_index, 1, '[PF_HIGHLIGHT]', '[/PF_HIGHLIGHT]', '...', 20), '')
-          """)
-      },
-      order_by: [desc: fragment("rank")]
-    )
-  end
-
-  def with_format_matching_profile_preference(query) do
-    query
-    |> require_assoc(:media_profile)
-    |> where(
-      fragment("""
-        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
-    query
-    |> where_download_not_prevented()
-    |> with_no_media_filepath()
-    |> with_upload_date_after_source_cutoff()
-    |> with_format_matching_profile_preference()
-    |> matching_source_title_regex()
-  end
-
-  def where_pending_or_downloaded(query) do
-    query
-    |> where_pending_download()
-    |> or_where([mi], not is_nil(mi.media_downloaded_at))
-  end
-
-  defp require_assoc(query, identifier) do
-    if has_named_binding?(query, identifier) do
-      query
-    else
-      do_require_assoc(query, identifier)
-    end
-  end
-
-  defp do_require_assoc(query, :source) do
-    from(mi in query, join: s in assoc(mi, :source), as: :source)
-  end
-
-  defp do_require_assoc(query, :media_profile) do
-    query
-    |> require_assoc(:source)
-    |> join(:inner, [mi, source], mp in assoc(source, :media_profile), as: :media_profile)
-  end
-end

lib/pinchflat/metadata/metadata_file_helpers.ex

@@ -9,23 +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.
-
-  Returns binary()
-  """
-  def metadata_directory_for(database_record) do
-    metadata_directory = Application.get_env(:pinchflat, :metadata_directory)
-    record_table_name = database_record.__meta__.source
-
-    Path.join([
-      metadata_directory,
-      record_table_name,
-      to_string(database_record.id)
-    ])
-  end
 
   @doc """
   Compresses and stores metadata for a media item, returning the filepath.
@@ -36,7 +20,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 +38,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"] || [])
-      # Give it a low preference if the `preference` key doesn't exist
-      |> 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)
-      end)
-
-    case Enum.sort_by(thumbnails, & &1["preference"], :desc) do
-      [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)
+    :ok = FilesystemHelpers.write_p!(filepath, thumbnail_blob)
 
     filepath
-
-      _ ->
-        nil
-    end
   end
 
   @doc """
@@ -98,43 +63,6 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
     Date.from_iso8601!("#{year}-#{month}-#{day}")
   end
 
-  @doc """
-  Attempts to determine the series directory from a media filepath.
-  The series directory is the "root" directory for a given source
-  which should contain all the season-level folders of that source.
-
-  Used for determining where to store things like NFO data and banners
-  for media center apps. Not useful without a media center app.
-
-  Returns {:ok, binary()} | {:error, :indeterminable}
-  """
-  def series_directory_from_media_filepath(media_filepath) do
-    # Matches "s" or "season" (case-insensitive)
-    # followed by an optional non-word character (. or _ or <space>, etc)
-    # followed by at least one digit
-    # followed immediately by the end of the string
-    # Example matches: s1, s.1, s01 season 1, Season.01, Season_1, Season 1, Season1
-    # Example non-matches: s01e01, season, series 1,
-    season_regex = ~r/^s(eason)?(\W|_)?\d{1,}$/i
-
-    {series_directory, found_series_directory} =
-      media_filepath
-      |> Path.split()
-      |> Enum.reduce_while({[], false}, fn part, {directory_acc, _} ->
-        if String.match?(part, season_regex) do
-          {:halt, {directory_acc, true}}
-        else
-          {:cont, {directory_acc ++ [part], false}}
-        end
-      end)
-
-    if found_series_directory do
-      {:ok, Path.join(series_directory)}
-    else
-      {:error, :indeterminable}
-    end
-  end
-
   defp fetch_thumbnail_from_url(url) do
     http_client = Application.get_env(:pinchflat, :http_client, Pinchflat.HTTP.HTTPClient)
     {:ok, body} = http_client.get(url, [], body_format: :binary)
@@ -143,8 +71,13 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
   end
 
   defp generate_filepath_for(database_record, filename) do
+    metadata_directory = Application.get_env(:pinchflat, :metadata_directory)
+    record_table_name = database_record.__meta__.source
+
     Path.join([
-      metadata_directory_for(database_record),
+      metadata_directory,
+      record_table_name,
+      to_string(database_record.id),
       filename
     ])
   end

lib/pinchflat/metadata/metadata_parser.ex

@@ -30,8 +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
 
@@ -59,38 +58,23 @@ defmodule Pinchflat.Metadata.MetadataParser do
       # NOTE: whole ordeal needed due to a bug I found in yt-dlp
       # https://github.com/yt-dlp/yt-dlp/issues/9445
       # Can be reverted to remove this entire conditional once fixed
-      filepath =
+      %{
+        thumbnail_filepath:
           thumbnail_filepath
           |> String.split(~r{\.}, include_captures: true)
           |> List.insert_at(-3, "-thumb")
           |> Enum.join()
-
-      %{
-        thumbnail_filepath: filepath_if_exists(filepath)
       }
     else
       %{
-        thumbnail_filepath: nil
+        thumbnail_filepath: thumbnail_filepath
       }
     end
   end
 
   defp parse_infojson_metadata(metadata) do
     %{
-      metadata_filepath: filepath_if_exists(metadata["infojson_filename"])
+      metadata_filepath: metadata["infojson_filename"]
     }
   end
-
-  # NOTE: this should not be needed, but it is due to a bug in yt-dlp.
-  # Can remove once this is resolved:
-  # https://github.com/yt-dlp/yt-dlp/issues/9445#issuecomment-2018724344
-  defp filepath_if_exists(nil), do: nil
-
-  defp filepath_if_exists(filepath) do
-    if File.exists?(filepath) do
-      filepath
-    else
-      nil
-    end
-  end
 end

lib/pinchflat/metadata/nfo_builder.ex

@@ -4,35 +4,21 @@ 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
-  stores it at the specified location.
+  stores it in the same directory as the media file. Has the same name
+  as the media file, but with a .nfo extension.
 
   Returns the filepath of the NFO file.
   """
-  def build_and_store_for_media_item(filepath, metadata) do
+  def build_and_store_for_media_item(metadata) do
+    filepath = Path.rootname(metadata["filepath"]) <> ".nfo"
     nfo = build_for_media_item(metadata)
 
-    FilesystemUtils.write_p!(filepath, nfo)
+    FilesystemHelpers.write_p!(filepath, nfo)
-
-    filepath
-  end
-
-  @doc """
-  Builds an NFO file for a souce and stores it at the specified location.
-  Technically works for playlists, but it's really made for channels.
-
-  Returns the filepath of the NFO file.
-  """
-  def build_and_store_for_source(filepath, metadata) do
-    nfo = build_for_source(metadata)
-
-    FilesystemUtils.write_p!(filepath, nfo)
 
     filepath
   end
@@ -44,27 +30,15 @@ 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>
+      <premiered>#{upload_date}</premiered>
-      <season>#{safe(upload_date.year)}</season>
+      <season>#{upload_date.year}</season>
       <episode>#{Calendar.strftime(upload_date, "%m%d")}</episode>
       <genre>YouTube</genre>
     </episodedetails>
     """
   end
-
-  defp build_for_source(metadata) do
-    """
-    <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-    <tvshow>
-      <title>#{safe(metadata["title"])}</title>
-      <plot>#{safe(metadata["description"])}</plot>
-      <uniqueid type="youtube" default="true">#{safe(metadata["id"])}</uniqueid>
-      <genre>YouTube</genre>
-    </tvshow>
-    """
-  end
 end

lib/pinchflat/metadata/source_image_parser.ex

@@ -1,69 +0,0 @@
-defmodule Pinchflat.Metadata.SourceImageParser do
-  @moduledoc """
-  Functions for parsing and storing source images.
-  """
-  alias Pinchflat.Utils.FilesystemUtils
-
-  @doc """
-  Given a base directory and source metadata, look for the appropriate images
-  and move them to the base directory. Returns a map of image types and their
-  filepaths (specifically for a source). If a given image type is not found,
-  the key will not be present in the map.
-
-  The metadata is expected to contain the `filepath` key for images, implying
-  that the images have already been downloaded by yt-dlp. This method will NOT
-  download images from the internet - it just copys them around.
-
-  Returns a map with the possible keys :poster_filepath, :fanart_filepath, and
-  :banner_filepath.
-  """
-  def store_source_images(base_directory, source_metadata) do
-    (source_metadata["thumbnails"] || [])
-    |> Enum.filter(&(&1["filepath"] != nil))
-    |> select_useful_images()
-    |> Enum.map(&move_image(&1, base_directory))
-    |> Enum.into(%{})
-  end
-
-  defp select_useful_images(images) do
-    labelled_images =
-      Enum.reduce(images, [], fn image_map, acc ->
-        case image_map do
-          %{"id" => "avatar_uncropped"} ->
-            acc ++ [{:poster, :poster_filepath, image_map["filepath"]}]
-
-          %{"id" => "banner_uncropped"} ->
-            acc ++ [{:fanart, :fanart_filepath, image_map["filepath"]}]
-
-          _ ->
-            acc
-        end
-      end)
-
-    labelled_images
-    |> Enum.concat([{:banner, :banner_filepath, determine_best_banner(images)}])
-    |> Enum.filter(fn {_, _, tmp_filepath} -> tmp_filepath end)
-  end
-
-  defp determine_best_banner(images) do
-    best_candidate =
-      images
-      # Filter out images that don't have a width and height attribute
-      |> Enum.filter(&(&1["width"] && &1["height"]))
-      # Sort images with the highest width first
-      |> Enum.sort(&(&1["width"] >= &2["width"]))
-      # Find the first image where the ratio of width to height is greater than 3
-      |> Enum.find(&(&1["width"] / &1["height"] > 3))
-
-    Map.get(best_candidate || %{}, "filepath")
-  end
-
-  defp move_image({filename, source_attr_name, tmp_filepath}, base_directory) do
-    extension = Path.extname(tmp_filepath)
-    final_filepath = Path.join([base_directory, "#{filename}#{extension}"])
-
-    FilesystemUtils.cp_p!(tmp_filepath, final_filepath)
-
-    {source_attr_name, final_filepath}
-  end
-end

lib/pinchflat/metadata/source_metadata.ex

@@ -10,20 +10,11 @@ defmodule Pinchflat.Metadata.SourceMetadata do
 
   alias Pinchflat.Sources.Source
 
-  @allowed_fields ~w(
+  @allowed_fields ~w(metadata_filepath)a
-    metadata_filepath
-    fanart_filepath
-    poster_filepath
-    banner_filepath
-  )a
-
   @required_fields ~w(metadata_filepath)a
 
   schema "source_metadata" do
     field :metadata_filepath, :string
-    field :fanart_filepath, :string
-    field :poster_filepath, :string
-    field :banner_filepath, :string
 
     belongs_to :source, Source
 
@@ -40,11 +31,6 @@ defmodule Pinchflat.Metadata.SourceMetadata do
 
   @doc false
   def filepath_attributes do
-    ~w(
+    ~w(metadata_filepath)a
-      metadata_filepath
-      fanart_filepath
-      poster_filepath
-      banner_filepath
-    )a
   end
 end

lib/pinchflat/metadata/source_metadata_storage_worker.ex

@@ -4,7 +4,10 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
   use Oban.Worker,
     queue: :remote_metadata,
     tags: ["media_source", "source_metadata", "remote_metadata"],
-    max_attempts: 3
+    max_attempts: 1,
+    # This is the only thing stopping this job from calling itself
+    # in an infinite loop.
+    unique: [period: 600]
 
   require Logger
 
@@ -12,12 +15,8 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
   alias Pinchflat.Repo
   alias Pinchflat.Tasks
   alias Pinchflat.Sources
-  alias Pinchflat.Utils.StringUtils
-  alias Pinchflat.Metadata.NfoBuilder
   alias Pinchflat.YtDlp.MediaCollection
-  alias Pinchflat.Metadata.SourceImageParser
   alias Pinchflat.Metadata.MetadataFileHelpers
-  alias Pinchflat.Downloading.DownloadOptionBuilder
 
   @doc """
   Starts the source metadata storage worker and creates a task for the source.
@@ -31,86 +30,27 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
   end
 
   @doc """
-  Fetches and stores various forms of metadata for a source:
+  Fetches and stores metadata for a source in the secret metadata location.
-    - Attributes like `description`
-    - JSON metadata for internal use
-    - The series directory for the source
-    - 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
-  is updated - this can take an unknown amount of time so don't rely on this
-  data being here before, say, the first indexing or downloading task is complete.
 
   Returns :ok
   """
   @impl Oban.Worker
   def perform(%Oban.Job{args: %{"id" => source_id}}) do
-    source = Repo.preload(Sources.get_source!(source_id), [:metadata, :media_profile])
+    source = Repo.preload(Sources.get_source!(source_id), :metadata)
-    series_directory = determine_series_directory(source)
+    {:ok, metadata} = MediaCollection.get_source_metadata(source.original_url)
 
-    {source_metadata, source_image_attrs, metadata_image_attrs} =
+    # Since updating a source kicks this job off again, we enforce job uniqueness (above)
-      fetch_source_metadata_and_images(series_directory, source)
+    # to once, per source, per x minutes. This is to prevent a job from calling itself
-
+    # in an infinite loop.
-    source_metadata_filepath = MetadataFileHelpers.compress_and_store_metadata_for(source, source_metadata)
+    Sources.update_source(source, %{
-
+      metadata: %{
-    Sources.update_source(
+        metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(source, metadata)
-      source,
+      }
-      Map.merge(
+    })
-        %{
-          series_directory: series_directory,
-          nfo_filepath: store_source_nfo(source, series_directory, source_metadata),
-          description: source_metadata["description"],
-          metadata: Map.merge(%{metadata_filepath: source_metadata_filepath}, metadata_image_attrs)
-        },
-        source_image_attrs
-      ),
-      # `run_post_commit_tasks: false` prevents this from running in an infinite loop
-      run_post_commit_tasks: false
-    )
 
     :ok
   rescue
     Ecto.NoResultsError -> Logger.info("#{__MODULE__} discarded: source #{source_id} not found")
     Ecto.StaleEntryError -> Logger.info("#{__MODULE__} discarded: source #{source_id} stale")
   end
-
-  defp fetch_source_metadata_and_images(series_directory, source) do
-    metadata_directory = MetadataFileHelpers.metadata_directory_for(source)
-    tmp_output_path = "#{tmp_directory()}/#{StringUtils.random_string(16)}/source_image.%(ext)S"
-    opts = [:write_all_thumbnails, convert_thumbnails: "jpg", output: tmp_output_path]
-
-    {:ok, metadata} = MediaCollection.get_source_metadata(source.original_url, opts)
-    metadata_image_attrs = SourceImageParser.store_source_images(metadata_directory, metadata)
-
-    if source.media_profile.download_source_images && series_directory do
-      source_image_attrs = SourceImageParser.store_source_images(series_directory, metadata)
-
-      {metadata, source_image_attrs, metadata_image_attrs}
-    else
-      {metadata, %{}, metadata_image_attrs}
-    end
-  end
-
-  defp determine_series_directory(source) do
-    output_path = DownloadOptionBuilder.build_output_path_for(source)
-    {:ok, %{filepath: filepath}} = MediaCollection.get_source_details(source.original_url, output: output_path)
-
-    case MetadataFileHelpers.series_directory_from_media_filepath(filepath) do
-      {:ok, series_directory} -> series_directory
-      {:error, _} -> nil
-    end
-  end
-
-  defp store_source_nfo(source, series_directory, metadata) do
-    if source.media_profile.download_nfo && series_directory do
-      nfo_filepath = Path.join(series_directory, "tvshow.nfo")
-
-      NfoBuilder.build_and_store_for_source(nfo_filepath, metadata)
-    end
-  end
-
-  defp tmp_directory do
-    Application.get_env(:pinchflat, :tmpfile_directory)
-  end
 end

lib/pinchflat/podcasts/podcast_helpers.ex

@@ -1,79 +0,0 @@
-defmodule Pinchflat.Podcasts.PodcastHelpers do
-  @moduledoc """
-  Methods for fetching postcast-related data from a source
-  or its media items
-  """
-
-  use Pinchflat.Media.MediaQuery
-
-  alias Pinchflat.Repo
-  alias Pinchflat.Metadata.MediaMetadata
-  alias Pinchflat.Metadata.SourceMetadata
-
-  @doc """
-  Returns a list of media items that have been downloaded to disk
-  and have been proven to still exist there.
-
-  Useful for podcasts since we don't want to serve media that
-  has been deleted or moved, but it's also fairly generally useful
-  so I could see this being moved in the future.
-
-  Options:
-    - limit: integer - the maximum number of media items to return
-
-  Returns: [%MediaItem{}]
-  """
-  def persisted_media_items_for(source, opts \\ []) do
-    limit = Keyword.get(opts, :limit, 500)
-
-    MediaQuery.new()
-    |> MediaQuery.for_source(source)
-    |> MediaQuery.with_media_filepath()
-    |> Repo.maybe_limit(limit)
-    |> Repo.all()
-    |> Enum.filter(fn media_item -> File.exists?(media_item.media_filepath) end)
-  end
-
-  @doc """
-  Selects a cover image for a source based on the source's metadata
-  and the metadata of the media items associated with the source. Also
-  ensures images exist on disk.
-
-  Only one media item should need to be returned since this is using the
-  internal metadata which, so long as the media_item was _downloaded_, should
-  be guaranteed to exist.
-
-  Prefers the source's poster, then fanart, then the media item's thumbnail.
-
-  Returns: {:ok, filepath} | {:error, :no_suitable_image}
-  """
-  def select_cover_image(source, media_items) do
-    source_with_preloads = Repo.preload(source, :metadata)
-
-    source_with_preloads
-    |> get_images_by_preference(media_items)
-    |> Enum.reject(&is_nil(&1))
-    |> Enum.find(&File.exists?/1)
-    |> case do
-      nil -> {:error, :no_suitable_image}
-      filepath -> {:ok, filepath}
-    end
-  end
-
-  defp get_images_by_preference(source_with_preloads, []) do
-    source_metadata = source_with_preloads.metadata || %SourceMetadata{}
-
-    [
-      source_metadata.poster_filepath,
-      source_metadata.fanart_filepath
-    ]
-  end
-
-  defp get_images_by_preference(source_with_preloads, [media_item | _]) do
-    media_item_with_preloads = Repo.preload(media_item, :metadata)
-    media_item_metadata = media_item_with_preloads.metadata || %MediaMetadata{}
-    source_images = get_images_by_preference(source_with_preloads, [])
-
-    source_images ++ [media_item_metadata.thumbnail_filepath]
-  end
-end

lib/pinchflat/podcasts/rss_feed_builder.ex

@@ -1,149 +0,0 @@
-defmodule Pinchflat.Podcasts.RssFeedBuilder do
-  @moduledoc """
-  Methods for building an RSS feed for a source and its media items.
-  """
-
-  @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
-
-  @doc """
-  Builds an RSS feed for a given source and its media items.
-  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 300.
-
-  Returns an XML document as a string.
-  """
-  def build(source, opts \\ []) do
-    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)
-    build_source_xml(source, media_items, url_base)
-  end
-
-  defp build_source_xml(source, media_items, url_base) do
-    media_item_xml = Enum.map(media_items, &build_media_item_xml(source, &1, url_base))
-    # "caching" the image path since it requires some DB calls and is used twice
-    feed_image_path = feed_image_path(url_base, source, media_items)
-
-    # Useful: resources:
-    #   - https://validator.w3.org/feed/#validate_by_input
-    #   - https://github.com/Podcastindex-org/podcast-namespace/blob/main/docs/1.0.md
-    #   - https://podba.se/validate
-    """
-    <?xml version="1.0" encoding="UTF-8"?>
-    <rss version="2.0"
-      xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
-      xmlns:podcast="https://podcastindex.org/namespace/1.0"
-      xmlns:atom="http://www.w3.org/2005/Atom">
-      <channel>
-        <title>#{safe(source.custom_name)}</title>
-        <link>#{safe(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" />
-        <podcast:locked>yes</podcast:locked>
-        <podcast:guid>#{source.uuid}</podcast:guid>
-        <image>
-          <url>#{safe(feed_image_path)}</url>
-          <title>#{safe(source.custom_name)}</title>
-          <link>#{safe(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:explicit>false</itunes:explicit>
-        <itunes:category text="TV &amp; Film"></itunes:category>
-
-        #{Enum.join(media_item_xml, "\n")}
-
-      </channel>
-    </rss>
-    """
-  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>
-      <description>#{safe(media_item.description)}</description>
-      <pubDate>#{generate_upload_date(media_item)}</pubDate>
-      <itunes:duration>#{media_item.duration_seconds}</itunes:duration>
-      <enclosure
-        url="#{media_stream_path(url_base, media_item)}"
-        length="#{media_item.media_size_bytes}"
-        type="#{MIME.from_path(media_item.media_filepath)}"
-      />
-      <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 generate_self_link(url_base, source) do
-    Path.join(url_base, "#{podcast_route(:rss_feed, source.uuid)}.xml")
-  end
-
-  defp media_stream_path(url_base, media_item) do
-    extension = Path.extname(media_item.media_filepath)
-
-    Path.join(url_base, "#{media_route(:stream, media_item.uuid)}#{extension}")
-  end
-
-  defp feed_image_path(url_base, source, media_items) do
-    case PodcastHelpers.select_cover_image(source, media_items) do
-      {:error, _} ->
-        ""
-
-      {:ok, filepath} ->
-        extension = Path.extname(filepath)
-        Path.join(url_base, "#{podcast_route(:feed_image, source.uuid)}#{extension}")
-    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()
-    |> Calendar.strftime(@datetime_format)
-  end
-
-  defp podcast_route(action, params) do
-    Routes.podcast_path(PinchflatWeb.Endpoint, action, params)
-  end
-
-  defp media_route(action, params) do
-    Routes.media_item_path(PinchflatWeb.Endpoint, action, params)
-  end
-end

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(
@@ -18,23 +17,18 @@ defmodule Pinchflat.Profiles.MediaProfile do
     sub_langs
     download_thumbnail
     embed_thumbnail
-    download_source_images
     download_metadata
     embed_metadata
     download_nfo
-    sponsorblock_behaviour
-    sponsorblock_categories
     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 }}"
@@ -46,14 +40,11 @@ defmodule Pinchflat.Profiles.MediaProfile do
 
     field :download_thumbnail, :boolean, default: false
     field :embed_thumbnail, :boolean, default: false
-    field :download_source_images, :boolean, default: false
 
     field :download_metadata, :boolean, default: false
     field :embed_metadata, :boolean, default: false
 
     field :download_nfo, :boolean, default: false
-    field :sponsorblock_behaviour, Ecto.Enum, values: [:disabled, :remove], default: :disabled
-    field :sponsorblock_categories, {:array, :string}, default: []
     # NOTE: these do NOT speed up indexing - the indexer still has to go
     # through the entire collection to determine if a media is a short or
     # a livestream.
@@ -63,6 +54,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 +69,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

@@ -5,10 +5,6 @@ defmodule Pinchflat.Release do
   """
   @app :pinchflat
 
-  require Logger
-
-  alias Pinchflat.Utils.FilesystemUtils
-
   def migrate do
     load_app()
 
@@ -22,41 +18,6 @@ defmodule Pinchflat.Release do
     {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
   end
 
-  def check_file_permissions do
-    load_app()
-
-    directories =
-      [
-        "/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(: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
-        :ok ->
-          Logger.info("Permissions OK")
-
-        {:error, :eacces} ->
-          Logger.error(permission_denied_screed(dir))
-          raise "Permission denied"
-
-        err ->
-          Logger.error("Permissions check failed: #{inspect(err)}")
-          raise "Unknown error"
-      end
-    end)
-  end
-
   defp repos do
     Application.fetch_env!(@app, :ecto_repos)
   end
@@ -64,31 +25,4 @@ defmodule Pinchflat.Release do
   defp load_app do
     Application.load(@app)
   end
-
-  defp permission_denied_screed(dir) do
-    """
-    The directory "#{dir}" is not writeable by the Docker container.
-
-    Please ensure that the directory exists and is writeable by the Docker
-    container. All setups are different, but you may be able to run something
-    like this on the *host*:
-
-      chown nobody -R <host path that maps to #{dir}>
-      chmod 755 -R <host path that maps to #{dir}>
-
-    Swapping in your real host path. Then, you should set the user running
-    this container by editing your `docker run` command like so:
-
-        docker run --user 99:100 <rest of the command>
-
-    Or adding `user: '99:100'` to the Pinchflat service of your Docker Compose
-    file. Again, there are many ways to do this depending on your setup and
-    this is just one example. See issue #106 in the Pinchflat Github for more.
-
-    No matter the case, this _is_ a permissions error and allowing the container
-    to write to the directory is the only way to fix it. It is not recommended
-    to run the container as `root` because files created by Pinchflat may not
-    be accessible to other apps that want to modify them.
-    """
-  end
 end

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/file_follower_server.ex

@@ -9,7 +9,7 @@ defmodule Pinchflat.SlowIndexing.FileFollowerServer do
   require Logger
 
   @poll_interval_ms Application.compile_env(:pinchflat, :file_watcher_poll_interval)
-  @activity_timeout_ms 600_000
+  @activity_timeout_ms 60_000
 
   # Client API
   @doc """

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

@@ -7,7 +7,6 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
 
   require Logger
 
-  alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources
@@ -16,6 +15,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 +26,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,10 +59,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)
 
     result =
       Enum.map(media_attributes, fn media_attrs ->
@@ -82,15 +80,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
@@ -119,13 +117,13 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   end
 
   defp create_media_item_and_enqueue_download(source, media_attrs) do
-    # 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)
-
     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
@@ -19,22 +17,13 @@ defmodule Pinchflat.Sources.Source do
     collection_id
     collection_type
     custom_name
-    description
-    nfo_filepath
-    poster_filepath
-    fanart_filepath
-    banner_filepath
-    series_directory
     index_frequency_minutes
     fast_index
     download_media
     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
@@ -52,7 +41,6 @@ defmodule Pinchflat.Sources.Source do
 
   @pre_insert_required_fields @initially_required_fields ++
                                 ~w(
-                                  uuid
                                   custom_name
                                   collection_name
                                   collection_id
@@ -60,13 +48,7 @@ defmodule Pinchflat.Sources.Source do
                                 )a
 
   schema "sources" do
-    # This is _not_ used as the primary key or internally in the database
-    # relations. This is only used to prevent an enumeration attack on the streaming
-    # and RSS feed endpoints since those _must_ be public (ie: no basic auth)
-    field :uuid, Ecto.UUID
-
     field :custom_name, :string
-    field :description, :string
     field :collection_name, :string
     field :collection_id, :string
     field :collection_type, Ecto.Enum, values: [:channel, :playlist]
@@ -76,16 +58,7 @@ 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
-    field :poster_filepath, :string
-    field :fanart_filepath, :string
-    field :banner_filepath, :string
 
     belongs_to :media_profile, MediaProfile
 
@@ -110,13 +83,9 @@ defmodule Pinchflat.Sources.Source do
     source
     |> cast(attrs, @allowed_fields)
     |> 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)
+    |> unique_constraint([:collection_id, :media_profile_id])
   end
 
   @doc false
@@ -130,23 +99,4 @@ defmodule Pinchflat.Sources.Source do
     # minutes
     15
   end
-
-  @doc false
-  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,20 @@ 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.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{}, ...]
   """
@@ -65,19 +51,15 @@ defmodule Pinchflat.Sources do
   though we know it's going to fail so it picks up any addl. database errors
   and fulfills our return contract.
 
-  You can pass options to control the behavior of the function:
-    - `run_post_commit_tasks` (default: true) - If false, the function will not
-      enqueue any tasks in `commit_and_handle_tasks`.
-
   Returns {:ok, %Source{}} | {:error, %Ecto.Changeset{}}
   """
-  def create_source(attrs, opts \\ []) do
+  def create_source(attrs) do
     case change_source(%Source{}, attrs, :initial) do
       %Ecto.Changeset{valid?: true} ->
         %Source{}
         |> maybe_change_source_from_url(attrs)
         |> maybe_change_indexing_frequency()
-        |> commit_and_handle_tasks(opts)
+        |> commit_and_handle_tasks()
 
       changeset ->
         Repo.insert(changeset)
@@ -97,19 +79,15 @@ defmodule Pinchflat.Sources do
   though we know it's going to fail so it picks up any addl. database errors
   and fulfills our return contract.
 
-  You can pass options to control the behavior of the function:
-    - `run_post_commit_tasks` (default: true) - If false, the function will not
-      enqueue any tasks in `commit_and_handle_tasks`.
-
   Returns {:ok, %Source{}} | {:error, %Ecto.Changeset{}}
   """
-  def update_source(%Source{} = source, attrs, opts \\ []) do
+  def update_source(%Source{} = source, attrs) do
     case change_source(source, attrs, :initial) do
       %Ecto.Changeset{valid?: true} ->
         source
         |> maybe_change_source_from_url(attrs)
         |> maybe_change_indexing_frequency()
-        |> commit_and_handle_tasks(opts)
+        |> commit_and_handle_tasks()
 
       changeset ->
         Repo.update(changeset)
@@ -124,20 +102,16 @@ defmodule Pinchflat.Sources do
   """
   def delete_source(%Source{} = source, opts \\ []) do
     delete_files = Keyword.get(opts, :delete_files, false)
+
     Tasks.delete_tasks_for(source)
 
-    MediaQuery.new()
+    source
-    |> MediaQuery.for_source(source)
+    |> Media.list_media_items_for()
-    |> Repo.all()
     |> Enum.each(fn media_item ->
       Media.delete_media_item(media_item, delete_files: delete_files)
     end)
 
-    if delete_files do
+    delete_source_metadata_files(source)
-      delete_source_files(source)
-    end
-
-    delete_internal_metadata_files(source)
     Repo.delete(source)
   end
 
@@ -160,27 +134,22 @@ defmodule Pinchflat.Sources do
     end
   end
 
-  defp delete_source_files(source) do
+  defp delete_source_metadata_files(source) do
-    mapped_struct = Map.from_struct(source)
-
-    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)
-  end
-
-  defp delete_internal_metadata_files(source) do
     metadata = Repo.preload(source, :metadata).metadata || %SourceMetadata{}
     mapped_struct = Map.from_struct(metadata)
 
+    filepaths =
       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(filepaths, &FilesystemHelpers.delete_file_and_remove_empty_directories/1)
   end
 
   defp add_source_details_to_changeset(source, changeset) do
-    case MediaCollection.get_source_details(changeset.changes.original_url) do
+    %Ecto.Changeset{changes: changes} = changeset
+
+    case MediaCollection.get_source_details(changes.original_url) do
       {:ok, source_details} ->
         add_source_details_by_collection_type(source, changeset, source_details)
 
@@ -229,16 +198,12 @@ defmodule Pinchflat.Sources do
     end
   end
 
-  defp commit_and_handle_tasks(changeset, opts) do
+  defp commit_and_handle_tasks(changeset) do
-    run_post_commit_tasks = Keyword.get(opts, :run_post_commit_tasks, true)
-
     case Repo.insert_or_update(changeset) do
       {:ok, %Source{} = source} ->
-        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 +241,9 @@ defmodule Pinchflat.Sources do
     end
   end
 
-  defp maybe_run_metadata_storage_task(changeset, source) do
+  # This runs every time to pick up any changes to the metadata
-    case {changeset.data, changeset.changes} do
+  defp run_metadata_storage_task(source) do
-      # If the changeset is new (not persisted), fetch metadata no matter what
-      {%{__meta__: %{state: :built}}, _} ->
     SourceMetadataStorageWorker.kickoff_with_task(source)
-
-      # If the record has been persisted, only fetch metadata if the
-      # original_url has changed
-      {_, %{original_url: _}} ->
-        SourceMetadataStorageWorker.kickoff_with_task(source)
-
-      _ ->
-        :ok
-    end
   end
 
   defp maybe_update_slow_indexing_task(changeset, source) do
@@ -299,6 +253,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,74 +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
-    logging_arg_override = Keyword.get(opts, :logging_arg_override, Enum.join(args, " "))
-
-    Logger.info("[command_wrapper]: #{command} called with: #{logging_arg_override}")
-
-    System.cmd(wrapper_command, actual_command, passthrough_opts)
-  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
-end

lib/pinchflat/utils/datetime_utils.ex

@@ -1,17 +0,0 @@
-defmodule Pinchflat.Utils.DatetimeUtils do
-  @moduledoc """
-  Utility methods for working with dates and datetimes
-  """
-
-  @doc """
-  Converts a Date to a DateTime
-
-  Returns %DateTime{}
-  """
-  def date_to_datetime(date) do
-    date
-    |> Date.to_gregorian_days()
-    |> Kernel.*(86_400)
-    |> DateTime.from_gregorian_seconds()
-  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,19 @@ 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() ++ global_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
+    # 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]
+    formatted_command_opts = [url] ++ parse_options(command_opts ++ print_to_file_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,48 +47,34 @@ defmodule Pinchflat.YtDlp.CommandRunner do
     end
   end
 
-  @doc """
+  # We want to satisfy the following behaviours:
-  Returns the version of yt-dlp as a string
+  #
-
+  # 1. If the key is an atom, convert it to a string and convert it to kebab case (for convenience)
-  Returns {:ok, binary()} | {:error, binary()}
+  # 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
-  @impl YtDlpCommandRunner
+  # 4. If the key is not accompanied by a value, assume it's a flag and PREpend it to the list
-  def version do
+  defp parse_options(command_opts) do
-    command = backend_executable()
+    Enum.reduce(command_opts, [], &parse_option/2)
-
-    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
+  defp parse_option({k, v}, acc) when is_atom(k) do
-    case Keyword.get(addl_opts, :output_filepath) do
+    stringified_key = StringUtils.to_kebab_case(Atom.to_string(k))
-      nil -> FSUtils.generate_metadata_tmpfile(:json)
+
-      path -> path
+    parse_option({"--#{stringified_key}", v}, acc)
-    end
   end
 
-  defp global_options do
+  defp parse_option({k, v}, acc) when is_binary(k) do
-    [:windows_filenames]
+    acc ++ [k, to_string(v)]
   end
 
-  defp cookie_file_options do
+  defp parse_option(arg, acc) when is_atom(arg) do
-    base_dir = Application.get_env(:pinchflat, :extras_directory)
+    stringified_arg = StringUtils.to_kebab_case(Atom.to_string(arg))
-    filename_options_map = %{cookies: "cookies.txt"}
 
-    Enum.reduce(filename_options_map, [], fn {opt_name, filename}, acc ->
+    parse_option("--#{stringified_arg}", acc)
-      filepath = Path.join(base_dir, filename)
-
-      if FSUtils.exists_and_nonempty?(filepath) do
-        [{opt_name, filepath} | acc]
-      else
-        acc
   end
-    end)
+
+  defp parse_option(arg, acc) when is_binary(arg) do
+    acc ++ [arg]
   end
 
   defp backend_executable do

lib/pinchflat/yt_dlp/media.ex

@@ -10,8 +10,7 @@ defmodule Pinchflat.YtDlp.Media do
     :original_url,
     :livestream,
     :short_form_content,
-    :upload_date,
+    :upload_date
-    :duration_seconds
   ]
 
   defstruct [
@@ -21,8 +20,7 @@ defmodule Pinchflat.YtDlp.Media do
     :original_url,
     :livestream,
     :short_form_content,
-    :upload_date,
+    :upload_date
-    :duration_seconds
   ]
 
   alias __MODULE__
@@ -35,10 +33,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 +61,8 @@ defmodule Pinchflat.YtDlp.Media do
         |> response_to_struct()
         |> FunctionUtils.wrap_ok()
 
-      err ->
+      res ->
-        err
+        res
     end
   end
 
@@ -87,8 +85,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 """
@@ -26,7 +26,7 @@ defmodule Pinchflat.YtDlp.MediaCollection do
     # available formats since we're just getting the media details
     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
 
@@ -64,21 +64,14 @@ defmodule Pinchflat.YtDlp.MediaCollection do
 
   Returns {:ok, map()} | {:error, any, ...}.
   """
-  def get_source_details(source_url, addl_opts \\ []) do
+  def get_source_details(source_url) 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 = [
+    opts = [:simulate, :skip_download, :ignore_no_formats_error, playlist_end: 1]
-      :simulate,
+    output_template = "%(.{channel,channel_id,playlist_id,playlist_title})j"
-      :skip_download,
-      :ignore_no_formats_error,
-      playlist_end: 1
-    ]
 
-    command_opts = default_opts ++ addl_opts
+    with {:ok, output} <- backend_runner().run(source_url, opts, output_template),
-    output_template = "%(.{channel,channel_id,playlist_id,playlist_title,filename})j"
-
-    with {:ok, output} <- backend_runner().run(source_url, command_opts, output_template),
          {:ok, parsed_json} <- Phoenix.json_library().decode(output) do
       {:ok, format_source_details(parsed_json)}
     else
@@ -101,8 +94,8 @@ defmodule Pinchflat.YtDlp.MediaCollection do
 
   Returns {:ok, map()} | {:error, any, ...}.
   """
-  def get_source_metadata(source_url, addl_opts \\ []) do
+  def get_source_metadata(source_url) do
-    opts = [playlist_items: 0] ++ addl_opts
+    opts = [playlist_items: 0]
     output_template = "playlist:%()j"
 
     with {:ok, output} <- backend_runner().run(source_url, opts, output_template),
@@ -119,11 +112,7 @@ defmodule Pinchflat.YtDlp.MediaCollection do
       channel_id: response["channel_id"],
       channel_name: response["channel"],
       playlist_id: response["playlist_id"],
-      playlist_name: response["playlist_title"],
+      playlist_name: response["playlist_title"]
-      # It's not a name, it's a path dammit!
-      # This actually isn't used for the inital response - it's
-      # used later to update a source's metadata
-      filepath: response["filename"]
     }
   end
 

lib/pinchflat_web.ex

@@ -21,7 +21,7 @@ defmodule PinchflatWeb do
 
   def router do
     quote do
-      use Phoenix.Router, helpers: true
+      use Phoenix.Router, helpers: false
 
       # Import common connection and controller functions to use in pipelines
       import Plug.Conn

lib/pinchflat_web/components/core_components.ex

@@ -14,11 +14,12 @@ defmodule PinchflatWeb.CoreComponents do
 
   Icons are provided by [heroicons](https://heroicons.com). See `icon/1` for usage.
   """
-  use Phoenix.Component, global_prefixes: ~w(x-)
+  use Phoenix.Component
 
   import PinchflatWeb.Gettext
 
   alias Phoenix.LiveView.JS
+  alias PinchflatWeb.CustomComponents.TextComponents
 
   @doc """
   Renders a modal.
@@ -246,12 +247,11 @@ 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",
     values: ~w(checkbox color date datetime-local email file hidden month number password
-            checkbox_group toggle range radio search select tel text textarea time url week)
+               toggle range radio search select tel text textarea time url week)
 
   attr :field, Phoenix.HTML.FormField, doc: "a form field struct retrieved from the form, for example: @form[:email]"
 
@@ -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,34 +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>
-    """
-  end
-
-  def input(%{type: "checkbox_group"} = assigns) do
-    ~H"""
-    <div phx-feedback-for={@name}>
-      <.label for={@id}>
-        <%= @label %><span :if={@label_suffix} class="text-xs text-bodydark"><%= @label_suffix %></span>
-      </.label>
-      <section class="grid grid-cols-1 gap-2 md:grid-cols-2 max-w-prose mb-4 ml-1">
-        <div :for={{option_name, option_value} <- @options} class="flex items-center">
-          <input
-            type="checkbox"
-            id={"#{@id}-#{option_value}"}
-            name={"#{@name}[]"}
-            value={option_value}
-            checked={option_value in @value}
-            class={["rounded focus:ring-offset-0 ring-offset-0 focus:ring-0 h-5 w-5 ", @inputclass]}
-          />
-          <label for={"#{@id}-#{option_value}"} class="ml-2 cursor-pointer select-none">
-            <%= option_name %>
-          </label>
-        </div>
-      </section>
-      <.help :if={@help}><%= if @html_help, do: Phoenix.HTML.raw(@help), else: @help %></.help>
       <.error :for={msg <- @errors}><%= msg %></.error>
     </div>
     """
@@ -357,7 +329,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>
@@ -375,9 +347,8 @@ defmodule PinchflatWeb.CoreComponents do
           id={@id}
           name={@name}
           class={[
-            "relative z-20 w-full appearance-none rounded border border-form-strokedark py-3 pl-5 pr-12 outline-none transition",
+            "relative z-20 w-full appearance-none rounded border border-stroke bg-transparent py-3 pl-5 pr-12 outline-none transition",
-            "focus:border-primary active:border-primary bg-form-input text-black text-white",
+            "focus:border-primary active:border-primary dark:border-form-strokedark dark:bg-form-input text-black dark:text-white",
-            "disabled:text-opacity-50 disabled:cursor-not-allowed disabled:border-black",
             @inputclass
           ]}
           multiple={@multiple}
@@ -388,7 +359,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 +383,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 +396,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
         type={@type}
         name={@name}
         id={@id}
         value={Phoenix.HTML.Form.normalize_value(@type, @value)}
         class={[
-            "w-full rounded-lg border-[1.5px] px-5 py-3 font-normal border-form-strokedark bg-form-input",
+          "w-full rounded-lg border-[1.5px] border-stroke bg-transparent px-5 py-3 font-normal text-black",
-            "outline-none transition active:border-primary disabled:cursor-default disabled:bg-whiter",
+          "outline-none transition focus:border-primary active:border-primary disabled:cursor-default disabled:bg-whiter",
-            "text-white focus:border-primary",
+          "dark:border-form-strokedark dark:bg-form-input dark:text-white dark:focus:border-primary",
           @inputclass,
           @errors != [] && "border-rose-400 focus:border-rose-400"
         ]}
         {@rest}
       />
-        <%= render_slot(@input_append) %>
+      <.help :if={@help}><%= @help %></.help>
-      </div>
-      <.help :if={@help}><%= if @html_help, do: Phoenix.HTML.raw(@help), else: @help %></.help>
       <.error :for={msg <- @errors}><%= msg %></.error>
     </div>
     """
@@ -632,20 +600,14 @@ defmodule PinchflatWeb.CoreComponents do
         _ ->
           true
       end)
-      |> Enum.map(fn
-        {k, v} when is_list(v) -> {k, Enum.join(v, ", ")}
-        rest -> rest
-      end)
 
     assigns = assign(assigns, iterable_attributes: attrs)
 
     ~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>
     """
@@ -692,11 +654,10 @@ defmodule PinchflatWeb.CoreComponents do
   """
   attr :name, :string, required: true
   attr :class, :string, default: nil
-  attr :rest, :global
 
   def icon(%{name: "hero-" <> _} = assigns) do
     ~H"""
-    <span class={[@name, @class]} {@rest} />
+    <span class={[@name, @class]} />
     """
   end
 

lib/pinchflat_web/components/custom_components/button_components.ex

@@ -1,8 +1,6 @@
 defmodule PinchflatWeb.CustomComponents.ButtonComponents do
   @moduledoc false
-  use Phoenix.Component, global_prefixes: ~w(x-)
+  use Phoenix.Component
-
-  alias PinchflatWeb.CoreComponents
 
   @doc """
   Render a button
@@ -41,94 +39,4 @@ defmodule PinchflatWeb.CustomComponents.ButtonComponents do
     </button>
     """
   end
-
-  @doc """
-  Render a dropdown based off a button
-
-  ## Examples
-
-      <.button_dropdown text="Actions">
-        <:option>TEST</:option>
-      </.button_dropdown>
-  """
-  attr :text, :string, required: true
-  attr :class, :string, default: ""
-
-  slot :option, required: true
-
-  def button_dropdown(assigns) do
-    ~H"""
-    <div x-data="{ dropdownOpen: false }" class={["relative flex", @class]}>
-      <span
-        x-on:click.prevent="dropdownOpen = !dropdownOpen"
-        class={[
-          "cursor-pointer inline-flex gap-2.5 rounded-md bg-primary px-5.5 py-3",
-          "font-medium text-white hover:bg-opacity-95"
-        ]}
-      >
-        <%= @text %>
-        <CoreComponents.icon
-          name="hero-chevron-down"
-          class="fill-current duration-200 ease-linear mt-1"
-          x-bind:class="dropdownOpen && 'rotate-180'"
-        />
-      </span>
-      <div
-        x-show="dropdownOpen"
-        x-on:click.outside="dropdownOpen = false"
-        class="absolute left-0 top-full z-40 mt-2 w-full rounded-md bg-black py-3 shadow-card"
-      >
-        <ul class="flex flex-col">
-          <li :for={option <- @option}>
-            <span class="flex px-5 py-2 font-medium text-bodydark2 hover:text-white cursor-pointer">
-              <%= render_slot(option) %>
-            </span>
-          </li>
-        </ul>
-      </div>
-    </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

@@ -9,32 +9,24 @@ defmodule PinchflatWeb.CustomComponents.TabComponents do
     attr :title, :string, required: true
   end
 
-  slot :tab_append, required: false
-
   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">
+      <div class="mb-6 flex flex-wrap gap-5 border-b border-strokedark sm:gap-10">
-        <div class="flex flex-wrap gap-5 sm:gap-10">
         <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"
+          class="border-b-2 py-4 text-sm font-medium hover:text-meta-5 md:text-base"
         >
           <span class="text-xl"><%= tab.title %></span>
         </a>
       </div>
-        <div class="mx-4 my-4 lg:my-0 flex gap-5 sm:gap-10 items-center">
+      <div>
-          <%= render_slot(@tab_append) %>
-        </div>
-      </header>
-      <div class="mt-4 min-h-60">
         <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

@@ -31,21 +31,6 @@ defmodule PinchflatWeb.CustomComponents.TextComponents do
     """
   end
 
-  @doc """
-  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">
-      <%= render_slot(@inner_block) %>
-    </.link>
-    """
-  end
-
   @doc """
   Renders an icon as a link with the given href.
   """
@@ -60,38 +45,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/onboarding.html.heex

@@ -1,9 +1,10 @@
 <div class="flex h-screen overflow-hidden">
   <div class="relative flex flex-1 flex-col overflow-y-auto overflow-x-hidden">
     <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 flex-grow items-center px-4 py-4 shadow-2 md:px-6 2xl:px-11">
-        <div class="flex items-center gap-2 py-2">
+        <div 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-02-29"} alt="Pinchflat" class="w-9 h-9" />
+          <h2 class="text-xl font-bold text-white pl-2">Pinchflat</h2>
         </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

@@ -1,18 +1,18 @@
-<header class="sticky top-0 z-999 flex h-20 w-full bg-white drop-shadow-1 dark:bg-boxdark dark:drop-shadow-none">
+<header class="sticky top-0 z-999 flex w-full bg-white drop-shadow-1 dark:bg-boxdark dark:drop-shadow-none">
   <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">
+    <div class="flex items-center gap-2 sm:gap-4 lg:hidden">
-      <section class="pr-1">
-        <img src={~p"/images/icon-2024-03-20.png"} alt="Pinchflat" class="w-10" />
-      </section>
-
       <button
-        class="z-99999 block mx-2 rounded-sm border border-stroke bg-white p-1.5 shadow-sm dark:border-strokedark dark:bg-boxdark lg:hidden"
+        class="z-99999 block rounded-sm border border-stroke bg-white p-1.5 shadow-sm dark:border-strokedark dark:bg-boxdark lg:hidden"
         @click.stop="sidebarVisible = !sidebarVisible"
       >
         <.icon name="hero-bars-3" />
       </button>
+      <a class="hidden sm:flex items-center lg:hidden" href="/">
+        <img src={~p"/images/logo.png?cachebust=2024-02-29"} alt="Pinchflat" class="w-9 h-9" />
+        <h2 class="text-xl font-bold text-white pl-2">Pinchflat</h2>
+      </a>
     </div>
-    <div class="bg-meta-4 rounded-md w-4/6 lg:w-3/6 xl:w-2/6">
+    <div class="bg-meta-4 rounded-md">
       <div class="relative">
         <span class="absolute left-2 top-1/2 -translate-y-1/2 flex">
           <.icon name="hero-magnifying-glass" />
@@ -23,7 +23,7 @@
             name="q"
             value={@params["q"]}
             placeholder="Type to search..."
-            class="w-full bg-transparent pl-9 pr-4 border-0 focus:ring-0 focus:outline-none"
+            class="w-full bg-transparent pl-9 pr-4 border-0 focus:ring-0 focus:outline-none lg:w-125"
           />
         </form>
       </div>

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

@@ -1,47 +1,44 @@
 <aside
   x-bind:class="sidebarVisible ? 'translate-x-0' : '-translate-x-full'"
   class={[
-    "-translate-x-full absolute left-0 top-0 z-9999 flex h-screen w-65 flex-col overflow-y-hidden justify-between",
+    "-translate-x-full absolute left-0 top-0 z-9999 flex h-screen w-60 flex-col overflow-y-hidden justify-between",
     "bg-black duration-300 ease-linear shadow-lg sm:shadow-none dark:bg-boxdark lg:static lg:translate-x-0"
   ]}
   @click.outside="sidebarVisible = false"
 >
   <section>
-    <div class="flex items-center justify-between gap-2 px-6 py-4">
+    <div class="flex items-center justify-between gap-2 px-6 py-5.5 lg:py-6.5">
       <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-02-29"} alt="Pinchflat" class="w-9 h-9" />
+        <h2 class="text-xl font-bold text-white pl-2">Pinchflat</h2>
       </a>
 
-      <button class="block mt-3 lg:hidden" @click.stop="sidebarVisible = !sidebarVisible">
+      <button class="block lg:hidden" @click.stop="sidebarVisible = !sidebarVisible">
         <.icon name="hero-arrow-left" class="fill-current" />
       </button>
     </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">
+      <nav class="mt-5 px-4 py-4 lg:mt-9 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_item icon="hero-cog-6-tooth" text="Settings" href={~p"/settings"} />
           </ul>
         </div>
       </nav>
     </div>
   </section>
   <section>
-    <nav class="px-4 py-4 lg:px-6">
+    <nav class="mt-5 px-4 py-4 lg:mt-9 lg:px-6">
       <ul class="mb-6 flex flex-col gap-1.5">
         <.sidebar_item
-          icon="hero-book-open"
+          icon="hero-code-bracket"
-          text="Docs"
+          text="Github"
           target="_blank"
-          href="https://github.com/kieraneglin/pinchflat/wiki"
+          href="https://github.com/kieraneglin/pinchflat"
         />
-        <.sidebar_item icon="hero-cog" text="Github" target="_blank" href="https://github.com/kieraneglin/pinchflat" />
         <li>
           <span
             class={[
@@ -55,26 +52,6 @@
             <.icon name="hero-currency-dollar" /> Donate
           </span>
         </li>
-        <li>
-          <span
-            class="group relative flex items-center gap-2.5 px-4 pt-2 text-sm"
-            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>
     </nav>
   </section>

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,20 +3,18 @@
     <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">

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

@@ -8,7 +8,7 @@
       <%= assigns[:page_title] || "Pinchflat" %>
     </.live_title>
     <link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />
-    <link rel="icon" type="image/x-icon" href={~p"/favicon.ico?cachebust=2024-03-20"} />
+    <link rel="icon" type="image/x-icon" href={~p"/favicon.ico?cachebust=2024-02-29"} />
     <script defer phx-track-static type="text/javascript" src={~p"/assets/app.js"}>
     </script>
   </head>

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

@@ -1,12 +1,8 @@
 defmodule PinchflatWeb.MediaItems.MediaItemController do
   use PinchflatWeb, :controller
 
-  require Logger
-
   alias Pinchflat.Repo
   alias Pinchflat.Media
-  alias Pinchflat.Media.MediaItem
-  alias Pinchflat.Downloading.MediaDownloadWorker
 
   def show(conn, %{"id" => id}) do
     media_item =
@@ -17,114 +13,20 @@ 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)
+
+    flash_message =
+      if delete_files do
+        "Record and files deleted successfully."
+      else
+        "Record deleted successfully. Files were not deleted."
+      end
 
     conn
-    |> put_flash(:info, "Files deleted successfully.")
+    |> put_flash(:info, flash_message)
     |> redirect(to: ~p"/sources/#{media_item.source_id}")
   end
-
-  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.")
-    |> redirect(to: ~p"/sources/#{media_item.source_id}/media/#{media_item}")
-  end
-
-  # See here for details on streaming files and range requests:
-  # https://www.zeng.dev/post/2023-http-range-and-play-mp4-in-browser/
-  #
-  # Uses the UUID instead of the ID to avoid enumeration attacks
-  # since streaming is a public endpoint (ie: no auth required)
-  def stream(conn, %{"uuid" => uuid}) do
-    media_item = Repo.get_by!(MediaItem, uuid: uuid)
-
-    if File.exists?(media_item.media_filepath) do
-      file_size = File.stat!(media_item.media_filepath).size
-      mime_type = MIME.from_path(media_item.media_filepath)
-
-      case parse_range(conn, file_size) do
-        {:ok, {start_pos, end_pos}} ->
-          Logger.debug("Streaming media item: #{media_item.uuid} from #{start_pos} to #{end_pos}")
-          length = end_pos - start_pos + 1
-
-          conn
-          |> put_resp_content_type(mime_type)
-          |> put_resp_header("accept-ranges", "bytes")
-          |> put_resp_header("content-range", "bytes #{start_pos}-#{end_pos}/#{file_size}")
-          |> put_resp_header("content-length", to_string(length))
-          |> send_file(206, media_item.media_filepath, start_pos, length)
-
-        {:error, :invalid_range} ->
-          Logger.debug("Invalid range request for media item: #{media_item.uuid} - serving full file")
-
-          conn
-          |> put_resp_content_type(mime_type)
-          |> put_resp_header("content-length", to_string(file_size))
-          |> put_resp_header("accept-ranges", "bytes")
-          |> send_file(200, media_item.media_filepath)
-      end
-    else
-      send_resp(conn, 404, "File not found")
-    end
-  end
-
-  defp parse_range(conn, file_size) do
-    with [range_header | _] <- get_req_header(conn, "range"),
-         ["bytes", range] <- String.split(range_header, "="),
-         [start_pos, end_pos] <- String.split(range, "-") do
-      validate_range(start_pos, end_pos, file_size)
-    else
-      _ -> {:error, :invalid_range}
-    end
-  end
-
-  defp validate_range(start_pos, end_pos, file_size) do
-    case {Integer.parse(start_pos), Integer.parse(end_pos)} do
-      {:error, :error} ->
-        {:error, :invalid_range}
-
-      {{start_pos, _}, :error} ->
-        {:ok, {start_pos, file_size - 1}}
-
-      # See RFC7233
-      {{start_pos, _}, {end_pos, _}} when end_pos >= file_size ->
-        {:ok, {start_pos, file_size - 1}}
-
-      {{start_pos, _}, {end_pos, _}} ->
-        {:ok, {start_pos, end_pos}}
-    end
-  end
 end

lib/pinchflat_web/controllers/media_items/media_item_html.ex

@@ -2,24 +2,4 @@ defmodule PinchflatWeb.MediaItems.MediaItemHTML do
   use PinchflatWeb, :html
 
   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
-
-  def media_type(media_item) do
-    case Path.extname(media_item.media_filepath) do
-      ext when ext in [".mp4", ".webm", ".mkv"] -> :video
-      ext when ext in [".mp3", ".m4a"] -> :audio
-      _ -> :unknown
-    end
-  end
 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,13 +0,0 @@
-<%= if media_type(@media_item) == :video do %>
-  <video controls class="max-h-96 w-full">
-    <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">
-    <source src={~p"/media/#{@media_item.uuid}/stream"} type="audio/mpeg" />
-    Your browser does not support the audio element.
-  </audio>
-<% end %>

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

@@ -4,53 +4,37 @@
       <.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="rounded-sm border border-stroke bg-white py-5 pt-6 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">
     <.tabbed_layout>
-      <:tab_append>
+      <:tab title="Attributes">
-        <.actions_dropdown media_item={@media_item} />
-      </:tab_append>
-
-      <:tab title="Media">
         <div class="flex flex-col gap-10 dark:text-white">
-          <%= if media_file_exists?(@media_item) do %>
+          <h3 class="font-bold text-xl">Attributes</h3>
-            <section class="grid grid-cols-1 xl:grid-cols-2 xl:gap-6 mt-6">
-              <div>
-                <.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>
           <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>
+
+        <section class="flex justify-center my-10">
+          <.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."
+          >
+            <.button color="bg-meta-1" rounding="rounded-full">
+              Delete Files
+            </.button>
+          </.link>
+        </section>
       </:tab>
       <:tab title="Tasks">
         <%= if match?([_|_], @media_item.tasks) do %>

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

@@ -32,26 +32,6 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
     ]
   end
 
-  def friendly_sponsorblock_options do
-    [
-      {"Disabled (default)", "disabled"},
-      {"Remove Segments", "remove"}
-    ]
-  end
-
-  def frieldly_sponsorblock_categories do
-    [
-      {"Sponsor", "sponsor"},
-      {"Intro/Intermission", "intro"},
-      {"Outro/Credits", "outro"},
-      {"Self Promotion", "selfpromo"},
-      {"Preview/Recap", "preview"},
-      {"Filler Tangent", "filler"},
-      {"Interaction Reminder", "interaction"},
-      {"Non-music Section", "music_offtopic"}
-    ]
-  end
-
   def custom_output_template_options do
     %{
       upload_day: nil,
@@ -59,15 +39,7 @@ 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_type: "the collection type of the sources that use this profile. Either 'channel' or 'playlist'"
-      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",
-      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,10 +70,10 @@ 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
-    "/music/{{ artist_name }}/{{ title }}.{{ ext }}"
+    "/music/{{ source_custom_name }}/{{ title }}.{{ ext }}"
   end
 end

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

@@ -2,13 +2,11 @@
   <.link href={~p"/media_profiles"}>
     <.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">
+  <h2 class="text-title-md2 font-bold text-black dark:text-white ml-4">Edit Media Profile</h2>
-    Editing "<%= @media_profile.name %>"
-  </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="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/index.html.heex

@@ -4,7 +4,7 @@
   </h2>
   <nav>
     <.link href={~p"/media_profiles/new"}>
-      <.button color="bg-primary" rounding="rounded-lg">
+      <.button color="bg-primary" rounding="rounded-full">
         <span class="font-bold text-xl mx-2">+</span> New <span class="hidden sm:inline pl-1">Media Profile</span>
       </.button>
     </.link>
@@ -16,9 +16,10 @@
     <div class="flex flex-col gap-10 min-w-max">
       <.table rows={@media_profiles} table_class="text-black dark:text-white">
         <:col :let={media_profile} label="Name">
-          <.subtle_link href={~p"/media_profiles/#{media_profile.id}"}>
           <%= media_profile.name %>
-          </.subtle_link>
+        </:col>
+        <:col :let={media_profile} label="Output Template">
+          <code class="text-sm"><%= media_profile.output_path_template %></code>
         </:col>
         <:col :let={media_profile} label="Preferred Resolution">
           <%= media_profile.preferred_resolution %>

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

@@ -38,7 +38,7 @@
         presets: { 
           default: 'Default',
           media_center: 'TV Shows',
-          audio: 'Music',
+          audio: 'Audio',
           archiving: 'Archiving'
         }
     }">
@@ -162,6 +162,16 @@
       />
     </section>
 
+    <section x-data="{ presets: { default: false, media_center: true, audio: false, archiving: true } }">
+      <.input
+        field={f[:download_nfo]}
+        type="toggle"
+        label="Download NFO data"
+        help="Downloads NFO data alongside media file for use with Jellyfin, Kodi, etc."
+        x-init="$watch('selectedPreset', p => p && (enabled = presets[p]))"
+      />
+    </section>
+
     <h3 class="mt-10 text-2xl text-black dark:text-white">
       Release Format Options
     </h3>
@@ -171,7 +181,7 @@
         field={f[:shorts_behaviour]}
         options={friendly_format_type_options()}
         type="select"
-        label="Include Shorts"
+        label="Include Shorts?"
         help="Experimental. Please report any issues on GitHub"
         x-init="$watch('selectedPreset', p => p && ($el.value = presets[p]))"
       />
@@ -182,7 +192,7 @@
         field={f[:livestream_behaviour]}
         options={friendly_format_type_options()}
         type="select"
-        label="Include Livestreams"
+        label="Include Livestreams?"
         help="Excludes media that comes from a past livestream"
         x-init="$watch('selectedPreset', p => p && ($el.value = presets[p]))"
       />
@@ -203,83 +213,7 @@
       />
     </section>
 
-    <section x-data="{ presets: { default: null, media_center: 1, audio: null, archiving: 1 } }">
+    <.button class="my-10 sm:mb-7.5 w-full sm:w-auto">Save Media profile</.button>
-      <.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>
-    <p class="text-sm mt-2 max-w-prose">
-      Everything in this section is experimental - please open a GitHub issue if you see something odd.
-      <strong>
-        These options only work if this Media Profile's output template is set to split media into seasons.
-      </strong>
-      Try the "Media Center" preset if you're not sure.
-    </p>
-
-    <section
-      phx-click={show_modal("upgrade-modal")}
-      x-data="{ presets: { default: false, media_center: true, audio: false, archiving: false } }"
-    >
-      <.input
-        field={f[:download_nfo]}
-        type="toggle"
-        label="Download NFO data"
-        label_suffix="(pro)"
-        help="Downloads NFO data alongside media file for use with Jellyfin, Kodi, etc."
-        x-init="$watch('selectedPreset', p => p && (enabled = presets[p]))"
-      />
-    </section>
-
-    <section x-data="{ presets: { default: false, media_center: true, audio: false, archiving: true } }">
-      <.input
-        field={f[:download_source_images]}
-        type="toggle"
-        label="Download Series Images"
-        help="Downloads poster and banner images for use with Plex, Jellyfin, Kodi, etc. Only works for full channels (not playlists)"
-        x-init="$watch('selectedPreset', p => p && (enabled = presets[p]))"
-      />
-    </section>
-
-    <h3 class="mt-10 text-2xl text-black dark:text-white">
-      SponsorBlock Options
-    </h3>
-
-    <section x-data="{ sponsorblockBehaviour: null }">
-      <section x-data="{ presets: { default: 'disabled', media_center: 'disabled', audio: 'disabled', archiving: 'disabled' } }">
-        <.input
-          field={f[:sponsorblock_behaviour]}
-          options={friendly_sponsorblock_options()}
-          type="select"
-          label="SponsorBlock Behaviour"
-          help="Action to take when SponsorBlock segments are found. 'Disabled' won't take any action"
-          x-model="sponsorblockBehaviour"
-          x-init="
-            sponsorblockBehaviour = $el.value
-            $watch('selectedPreset', p => p && ($el.value = presets[p]))
-          "
-        />
-      </section>
-
-      <section x-show="sponsorblockBehaviour !== 'disabled'" x-transition>
-        <.input
-          field={f[:sponsorblock_categories]}
-          options={frieldly_sponsorblock_categories()}
-          type="checkbox_group"
-          label="SponsorBlock Categories"
-        />
-      </section>
-    </section>
-
-    <.button class="my-10 sm:mb-7.5 w-full sm:w-auto" rounding="rounded-lg">Save Media profile</.button>
   </section>
 
   <div class="rounded-sm dark:bg-meta-4 p-4 md:p-6 mb-5">

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

@@ -4,37 +4,53 @@
       <.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-2">
-      <%= @media_profile.name %>
+      Media Profile <span class="hidden sm:inline">#<%= @media_profile.id %></span>
     </h2>
   </div>
 
   <nav>
     <.link href={~p"/media_profiles/#{@media_profile}/edit"}>
-      <.button color="bg-primary" rounding="rounded-lg">
+      <.button color="bg-primary" rounding="rounded-full">
         <.icon name="hero-pencil-square" class="mr-2" />Edit <span class="hidden sm:inline pl-1">Media Profile</span>
       </.button>
     </.link>
   </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>
+      <:tab title="Attributes">
-        <.actions_dropdown media_profile={@media_profile} />
-      </:tab_append>
-
-      <:tab title="Media Profile">
         <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>
+
+        <section class="flex flex-col md:flex-row items-center md:justify-around my-10">
+          <.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."
+          >
+            <.button color="bg-meta-1" rounding="rounded-full">
+              Delete Profile and its Sources
+            </.button>
+          </.link>
+          <.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"
+          >
+            <.button color="bg-meta-1" rounding="rounded-full">
+              Delete Profile, Sources, and Files
+            </.button>
+          </.link>
+        </section>
       </: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 %>
-            </.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/pages/page_html/onboarding_checklist.html.heex

@@ -11,7 +11,7 @@
         <p class="text-md text-bodydark">Don't worry, you can create more Media Profiles later!</p>
         <div class="mt-8">
           <.link href={~p"/media_profiles/new"}>
-            <.button color="bg-primary" rounding="rounded-lg" disabled={@media_profiles_exist}>
+            <.button color="bg-primary" rounding="rounded-full" disabled={@media_profiles_exist}>
               <span class="font-bold mx-2">+</span> New Media Profile
             </.button>
           </.link>
@@ -25,7 +25,7 @@
         </p>
         <div class="mt-8">
           <.link href={~p"/sources/new"}>
-            <.button color="bg-primary" rounding="rounded-lg" disabled={not @media_profiles_exist}>
+            <.button color="bg-primary" rounding="rounded-full" disabled={not @media_profiles_exist}>
               <span class="font-bold mx-2">+</span> New Source
             </.button>
           </.link>
@@ -40,7 +40,7 @@
         <p class="text-md text-bodydark">Feel free to add more Media Profiles or Sources in the meantime!</p>
         <div class="mt-8">
           <.link href={~p"/?onboarding=0"}>
-            <.button color="bg-primary" rounding="rounded-lg" disabled={not @sources_exist}>
+            <.button color="bg-primary" rounding="rounded-full" disabled={not @sources_exist}>
               Let's Go <span class="font-bold mx-2">🚀</span>
             </.button>
           </.link>

lib/pinchflat_web/controllers/podcasts/podcast_controller.ex

@@ -1,56 +0,0 @@
-defmodule PinchflatWeb.Podcasts.PodcastController do
-  use PinchflatWeb, :controller
-  use Pinchflat.Media.MediaQuery
-
-  alias Pinchflat.Repo
-  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: 300, url_base: url_base)
-
-    conn
-    |> put_resp_content_type("application/rss+xml")
-    |> put_resp_header("content-disposition", "inline")
-    |> send_resp(200, xml)
-  end
-
-  def feed_image(conn, %{"uuid" => uuid}) do
-    source = Repo.get_by!(Source, uuid: uuid)
-
-    # This is used to fetch a fallback cover image
-    # if the source doesn't have any usable images
-    media_items =
-      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, _} ->
-        send_resp(conn, 404, "Image not found")
-
-      {:ok, filepath} ->
-        conn
-        |> put_resp_content_type(MIME.from_path(filepath))
-        |> 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

@@ -1,16 +1,16 @@
 <div class="mb-6 flex gap-3 flex-row items-center justify-between">
   <h2 class="text-title-md2 font-bold text-black dark:text-white">
-    Results for "<%= StringUtils.truncate(@search_term, 50) %>"
+    <span class="hidden sm:inline">Search </span>Results for "<%= StringUtils.truncate(@search_term, 50) %>"
   </h2>
 </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">
           <:col :let={result} label="Title">
-            <%= result.title %>
+            <%= StringUtils.truncate(result.title, 40) %>
           </:col>
           <:col :let={result} label="Excerpt">
             <.highlight_search_terms text={result.matching_search_term} />

lib/pinchflat_web/controllers/settings/setting_controller.ex

@@ -1,26 +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
-end

lib/pinchflat_web/controllers/settings/setting_html.ex

@@ -1,21 +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
-end

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