Bumped version

* Added option for yt-dlp config file usage

* renamed yt-dlp config file

* refactored to use a precedence-based approach

* Updated README

.check.exs

@@ -16,7 +16,7 @@
     {:compiler, env: %{"MIX_ENV" => "test"}},
     {:formatter, env: %{"MIX_ENV" => "test"}},
     {:sobelow, "mix sobelow --config"},
-    {:prettier_formatting, "yarn run lint:check", fix: "yarn run lint:fix"},
+    {:prettier_formatting, "yarn run prettier . --check", fix: "yarn run prettier . --write"},
     {:npm_test, false}
 
     ## curated tools may be disabled (e.g. the check for compilation warnings)

.formatter.exs

@@ -1,5 +1,3 @@
-# TODO: figure out why my vscode extension doesn't respect the formatter.exs file
-# if it's in a subdirectory
 [
   import_deps: [:ecto, :ecto_sql, :phoenix],
   subdirectories: ["priv/*/migrations"],

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,34 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: '[Triage] <your title here> '
-labels: triage
-assignees: kieraneglin
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Diagnostic info**
-
-<!-- Go to Config > App Info > Copy Diagnostic Info and paste that here -->
-
-**Additional context**
-
-<!-- Go to Config > App Info > Download Logs and attach them, if applicable -->
-
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,19 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: '[FR] <your title here>'
-labels: feature request
-assignees: kieraneglin
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. It's too complicated to [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/other.md

@@ -1,7 +0,0 @@
----
-name: Other
-about: For everything else
-title: ''
-labels: ''
-assignees: kieraneglin
----

.github/workflows/docker_release.yml

@@ -11,12 +11,6 @@ on:
         options:
           - 'linux/amd64'
           - 'linux/amd64,linux/arm64'
-      docker_tags:
-        type: string
-        description: 'Docker Tags'
-        required: true
-        default: 'dev'
-
   push:
     branches:
       - master
@@ -46,9 +40,10 @@ jobs:
             ghcr.io/${{ github.repository }}
           # All non-release actions will be tagged as `dev` (ie: push, workflow_dispatch)
           tags: |
-            type=ref,event=tag
+            type=semver,pattern={{version}},prefix=v
-            type=raw,value=dev,enable=${{ github.event_name != 'release' && github.event_name != 'workflow_dispatch' }}
+            type=semver,pattern={{major}}.{{minor}},prefix=v
-            type=raw,value=${{ inputs.docker_tags }},enable=${{ github.event_name == 'workflow_dispatch' }}
+            type=semver,pattern={{major}},prefix=v
+            type=raw,value=dev,enable=${{ github.event_name != 'release' }}
           flavor: |
             latest=auto
 
@@ -75,7 +70,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./docker/selfhosted.Dockerfile
+          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) }}

.github/workflows/lint_and_test.yml

@@ -16,28 +16,24 @@ jobs:
     if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
     env:
       COMPOSE_FILE: ./docker-compose.ci.yml
-      MIX_ENV: test
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Pull prebuilt images
         run: docker compose pull
 
-      - name: Set up Docker Buildx
+      - name: Setup Docker layer caching
-        uses: docker/setup-buildx-action@v3
+        uses: jpribyl/action-docker-layer-caching@v0.1.1
-
+        continue-on-error: true
-      - name: Build docker image
-        uses: docker/build-push-action@v5
         with:
-          context: .
+          key: ci-docker-cache-{hash}
-          file: ./docker/dev.Dockerfile
+          restore-keys: |
-          load: true
+            ci-docker-cache-
-          cache-from: type=gha
+            layer-ci-docker-cache-
-          cache-to: type=gha,mode=max
 
-      - name: Run Docker image
+      - name: Build and Run Docker image
         run: docker compose up --detach
 
       # NOTE: All exec commands use the -T flag to compensate for
@@ -47,7 +43,8 @@ jobs:
       # See https://github.com/actions/runner/issues/241 and https://github.com/docker/compose/issues/8537
       - name: Install Elixir and JS deps
         run: |
-          docker compose exec -T phx mix deps.get && yarn install && cd assets && yarn install && cd ..
+          docker compose exec -T phx yarn install && cd assets && yarn install && cd ..
+          docker compose exec -T phx mix deps.get
 
       - name: Create and Migrate database
         run: |

.prettierignore

@@ -0,0 +1,3 @@
+assets/vendor/
+deps/
+_build/

.sobelow-conf

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

README.md

@@ -12,14 +12,6 @@
   </sup>
 </p>
 
-<div align="center">
-
-[![](https://img.shields.io/github/license/kieraneglin/pinchflat?style=for-the-badge&color=ee512b)](LICENSE)
-[![](https://img.shields.io/github/v/release/kieraneglin/pinchflat?style=for-the-badge)](https://github.com/kieraneglin/pinchflat/releases)
-[![](https://img.shields.io/github/actions/workflow/status/kieraneglin/pinchflat/lint_and_test.yml?style=for-the-badge)](#)
-
-</div>
-
 # Your next YouTube media manager
 
 ## Table of contents:
@@ -29,9 +21,7 @@
 - [Screenshots](#screenshots)
 - [Installation](#installation)
   - [Unraid](#unraid)
-  - [Portainer](#portainer)
   - [Docker](#docker)
-  - [Environment Variables](#environment-variables)
 - [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)
@@ -41,9 +31,9 @@
 
 ## What it does
 
-Pinchflat is a self-hosted app for downloading YouTube content built using [yt-dlp](https://github.com/yt-dlp/yt-dlp). It's designed to be lightweight, self-contained, and easy to use. You set up rules for how to download content from YouTube channels or playlists and it'll do the rest, periodically checking for new content. It's perfect for people who want to download content for use in with a media center app (Plex, Jellyfin, Kodi) or for those who want to archive media!
+Pinchflat is a self-hosted app for downloading YouTube content built using [yt-dlp](https://github.com/yt-dlp/yt-dlp). It's designed to be lightweight, self-contained, and easy to use. You set up rules for how to download content from YouTube channels or playlists and it'll do the rest, checking periodically for new content. It's perfect for people who want to download content for use in with a media center app (Plex, Jellyfin, Kodi) or for those who want to archive media!
 
-While you can [download individual videos](https://github.com/kieraneglin/pinchflat/wiki/Frequently-Asked-Questions#how-do-i-download-one-off-videos), Pinchflat is best suited for downloading content from channels or playlists. It's also not meant for consuming content in-app - Pinchflat downloads content to disk where you can then watch it with a media center app or VLC.
+It's _not_ great for downloading one-off videos - it's built to download large amounts of content and keep it up to date. It's also not meant for consuming content in-app - Pinchflat downloads content to disk where you can then watch it with a media center app or VLC.
 
 If it doesn't work for your use case, please make a feature request! You can also check out these great alternatives: [Tube Archivist](https://github.com/tubearchivist/tubearchivist), [ytdl-sub](https://github.com/jmbannon/ytdl-sub), and [TubeSync](https://github.com/meeb/tubesync)
 
@@ -53,7 +43,7 @@ If it doesn't work for your use case, please make a feature request! You can als
 - Powerful naming system so content is stored where and how you want it
 - Easy-to-use web interface with presets to get you started right away
 - First-class support for media center apps like Plex, Jellyfin, and Kodi
-- Supports serving RSS feeds to your favourite podcast app ([docs](https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds))
+- Supports serving RSS feeds to your favourite podcast app (beta - [docs](<https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds-(beta)>))
 - Automatically downloads new content from channels and playlists
   - Uses a novel approach to download new content more quickly than other apps
 - Supports downloading audio content
@@ -67,12 +57,11 @@ If it doesn't work for your use case, please make a feature request! You can als
 - 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.jpg" alt="Pinchflat screenshot" width="700" />
+<img src="priv/static/images/app-form-screenshot.png" alt="Pinchflat screenshot" width="700" />
-<img src="priv/static/images/app-screenshot.jpg" alt="Pinchflat screenshot" width="700" />
+<img src="priv/static/images/app-screenshot.png" alt="Pinchflat screenshot" width="700" />
 
 ## Installation
 
@@ -82,8 +71,7 @@ Simply search for Pinchflat in the Community Apps store!
 
 ### Portainer
 
-> [!IMPORTANT]  
+Important: See the note below about storing config on a network file share. It's preferred to store the config on a local disk if at all possible.
-> See the note below about storing config on a network file share. It's preferred to store the config on a local disk if at all possible.
 
 Docker Compose file:
 
@@ -91,10 +79,7 @@ Docker Compose file:
 version: '3'
 services:
   pinchflat:
-    image: ghcr.io/kieraneglin/pinchflat:latest
+    image: keglin/pinchflat:latest
-    environment:
-      # Set the timezone to your local timezone
-      - TZ=America/New_York
     ports:
       - '8945:8945'
     volumes:
@@ -108,15 +93,13 @@ services:
 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 docker/selfhosted.Dockerfile -t ghcr.io/kieraneglin/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
 # the paths to the directories you created in step 1
-# Be sure to replace America/New_York with your local timezone
 docker run \
-  -e TZ=America/New_York \
   -p 8945:8945 \
   -v /host/path/to/config:/config \
   -v /host/path/to/downloads:/downloads \
@@ -127,39 +110,19 @@ docker run \
 
 You _must_ ensure the host directories you've mounted are writable by the user running the Docker container. If you get a permission error follow the steps it suggests. See [#106](https://github.com/kieraneglin/pinchflat/issues/106) for more.
 
-> [!IMPORTANT]
+It's recommended to not run the container as root. Doing so can create permission issues if other apps need to work with the downloaded media. If you need to run any command as root, you can run `su` from the container's shell as there is no password set for the root user.
-> It's not recommended to run the container as root. Doing so can create permission issues if other apps need to work with the downloaded media.
 
-> [!TIP]
+### Advanced: storing Pinchflat config directory on a network share
-> If you need to run any command as root, you can run `su` from the container's shell as there is no password set for the root user.
 
-### ADVANCED: Storing Pinchflat config directory on a network share
+README: This is currently in the testing phase and not a recommended option (yet). The implications of changing this setting isn't clear and this could, conceivably, result in data loss. Only change this setting if you know what you're doing, why this is important, and are okay with possible data loss or DB corruption. This may become the default in the future once it's been tested more thoroughly.
 
 As pointed out in [#137](https://github.com/kieraneglin/pinchflat/issues/137), SQLite doesn't like being run in WAL mode on network shares. If you're running Pinchflat on a network share, you can disable WAL mode by setting the `JOURNAL_MODE` environment variable to `delete`. This will make Pinchflat run in rollback journal mode which is less performant but should work on network shares.
 
-> [!CAUTION]
-> Changing this setting from WAL to `delete` on an existing Pinchflat instance could, conceivably, result in data loss. Only change this setting if you know what you're doing, why this is important, and are okay with possible data loss or DB corruption. Backup your database first!
-
 If you change this setting and it works well for you, please leave a comment on [#137](https://github.com/kieraneglin/pinchflat/issues/137)! Doubly so if it does _not_ work well.
 
-### Environment variables
-
-| Name                  | Required? | Default                   | Notes                                                                                          |
-| --------------------- | --------- | ------------------------- | ---------------------------------------------------------------------------------------------- |
-| TZ                    | No        | `UTC`                     | Must follow IANA TZ format                                                                     |
-| LOG_LEVEL             | No        | `debug`                   | Can be set to `info`                                                                           |
-| BASIC_AUTH_USERNAME   | No        |                           | See [authentication docs](https://github.com/kieraneglin/pinchflat/wiki/Username-and-Password) |
-| BASIC_AUTH_PASSWORD   | No        |                           | See [authentication docs](https://github.com/kieraneglin/pinchflat/wiki/Username-and-Password) |
-| EXPOSE_FEED_ENDPOINTS | No        |                           | See [RSS feed docs](https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds)           |
-| JOURNAL_MODE          | No        | `wal`                     | Set to `delete` if your config directory is stored on a network share (not recommended)        |
-| TZ_DATA_DIR           | No        | `/etc/elixir_tzdata_data` | The container path where the timezone database is stored                                       |
-| BASE_ROUTE_PATH       | No        | `/`                       | The base path for route generation. Useful when running behind certain reverse proxies         |
-
 ## EFF donations
 
-Prior to 2024-05-10, a portion of all donations were given to the [Electronic Frontier Foundation](https://www.eff.org/). Now, the app doesn't accept donations that go to me personally and instead directs you straight to the EFF. [Here](https://github.com/kieraneglin/pinchflat/issues/234) are some people that have generously donated.
+A portion of all donations to Pinchflat will be donated to the [Electronic Frontier Foundation](https://www.eff.org/). The EFF defends your online liberties and [backed](https://github.com/github/dmca/blob/9a85e0f021f7967af80e186b890776a50443f06c/2020/11/2020-11-16-RIAA-reversal-effletter.pdf) `youtube-dl` when Google took them down. [See here](https://github.com/kieraneglin/pinchflat/wiki/EFF-Donation-Receipts) for a list of donation receipts.
-
-The EFF defends your online liberties and [backed](https://github.com/github/dmca/blob/9a85e0f021f7967af80e186b890776a50443f06c/2020/11/2020-11-16-RIAA-reversal-effletter.pdf) `youtube-dl` when Google took them down.
 
 ## Pre-release disclaimer
 
@@ -168,8 +131,3 @@ This is pre-release software and anything can break at any time. I make not guar
 ## License
 
 See `LICENSE` file
-
-<!-- Images and links -->
-
-[license-badge]: https://img.shields.io/github/license/kieraneglin/pinchflat?style=for-the-badge&color=ee512b
-[license-badge-url]: LICENSE

assets/css/satoshi.css

@@ -22,8 +22,8 @@
 
 @font-face {
   font-family: 'Satoshi';
-  src: url('../fonts/satoshi/Satoshi-Light.woff2'), url('../fonts/satoshi/Satoshi-Light.woff'),
+  src: url('/fonts/satoshi/Satoshi-Light.woff2'), url('/fonts/satoshi/Satoshi-Light.woff'),
-    url('../fonts/satoshi/Satoshi-Light.ttf');
+    url('/fonts/satoshi/Satoshi-Light.ttf');
   font-weight: 300;
   font-display: swap;
   font-style: normal;
@@ -31,9 +31,8 @@
 
 @font-face {
   font-family: 'Satoshi';
-  src: url('../fonts/satoshi/Satoshi-LightItalic.woff2'),
+  src: url('/fonts/satoshi/Satoshi-LightItalic.woff2'),
-    url('../fonts/satoshi/Satoshi-LightItalic.woff'),
+    url('/fonts/satoshi/Satoshi-LightItalic.woff'), url('/fonts/satoshi/Satoshi-LightItalic.ttf');
-    url('../fonts/satoshi/Satoshi-LightItalic.ttf');
   font-weight: 300;
   font-display: swap;
   font-style: italic;
@@ -41,8 +40,8 @@
 
 @font-face {
   font-family: 'Satoshi';
-  src: url('../fonts/satoshi/Satoshi-Regular.woff2'), url('../fonts/satoshi/Satoshi-Regular.woff'),
+  src: url('/fonts/satoshi/Satoshi-Regular.woff2'), url('/fonts/satoshi/Satoshi-Regular.woff'),
-    url('../fonts/satoshi/Satoshi-Regular.ttf');
+    url('/fonts/satoshi/Satoshi-Regular.ttf');
   font-weight: 400;
   font-display: swap;
   font-style: normal;
@@ -50,8 +49,8 @@
 
 @font-face {
   font-family: 'Satoshi';
-  src: url('../fonts/satoshi/Satoshi-Italic.woff2'), url('../fonts/satoshi/Satoshi-Italic.woff'),
+  src: url('/fonts/satoshi/Satoshi-Italic.woff2'), url('/fonts/satoshi/Satoshi-Italic.woff'),
-    url('../fonts/satoshi/Satoshi-Italic.ttf');
+    url('/fonts/satoshi/Satoshi-Italic.ttf');
   font-weight: 400;
   font-display: swap;
   font-style: italic;
@@ -59,8 +58,8 @@
 
 @font-face {
   font-family: 'Satoshi';
-  src: url('../fonts/satoshi/Satoshi-Medium.woff2'), url('../fonts/satoshi/Satoshi-Medium.woff'),
+  src: url('/fonts/satoshi/Satoshi-Medium.woff2'), url('/fonts/satoshi/Satoshi-Medium.woff'),
-    url('../fonts/satoshi/Satoshi-Medium.ttf');
+    url('/fonts/satoshi/Satoshi-Medium.ttf');
   font-weight: 500;
   font-display: swap;
   font-style: normal;
@@ -68,9 +67,8 @@
 
 @font-face {
   font-family: 'Satoshi';
-  src: url('../fonts/satoshi/Satoshi-MediumItalic.woff2'),
+  src: url('/fonts/satoshi/Satoshi-MediumItalic.woff2'),
-    url('../fonts/satoshi/Satoshi-MediumItalic.woff'),
+    url('/fonts/satoshi/Satoshi-MediumItalic.woff'), url('/fonts/satoshi/Satoshi-MediumItalic.ttf');
-    url('../fonts/satoshi/Satoshi-MediumItalic.ttf');
   font-weight: 500;
   font-display: swap;
   font-style: italic;
@@ -78,8 +76,8 @@
 
 @font-face {
   font-family: 'Satoshi';
-  src: url('../fonts/satoshi/Satoshi-Bold.woff2'), url('../fonts/satoshi/Satoshi-Bold.woff'),
+  src: url('/fonts/satoshi/Satoshi-Bold.woff2'), url('/fonts/satoshi/Satoshi-Bold.woff'),
-    url('../fonts/satoshi/Satoshi-Bold.ttf');
+    url('/fonts/satoshi/Satoshi-Bold.ttf');
   font-weight: 700;
   font-display: swap;
   font-style: normal;
@@ -87,8 +85,8 @@
 
 @font-face {
   font-family: 'Satoshi';
-  src: url('../fonts/satoshi/Satoshi-BoldItalic.woff2'),
+  src: url('/fonts/satoshi/Satoshi-BoldItalic.woff2'), url('/fonts/satoshi/Satoshi-BoldItalic.woff'),
-    url('../fonts/satoshi/Satoshi-BoldItalic.woff'), url('../fonts/satoshi/Satoshi-BoldItalic.ttf');
+    url('/fonts/satoshi/Satoshi-BoldItalic.ttf');
   font-weight: 700;
   font-display: swap;
   font-style: italic;
@@ -96,9 +94,8 @@
 
 @font-face {
   font-family: 'Satoshi';
-  src: url('../fonts/satoshi/Satoshi-BlackItalic.woff2'),
+  src: url('/fonts/satoshi/Satoshi-BlackItalic.woff2'),
-    url('../fonts/satoshi/Satoshi-BlackItalic.woff'),
+    url('/fonts/satoshi/Satoshi-BlackItalic.woff'), url('/fonts/satoshi/Satoshi-BlackItalic.ttf');
-    url('../fonts/satoshi/Satoshi-BlackItalic.ttf');
   font-weight: 900;
   font-display: swap;
   font-style: italic;

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

@@ -23,13 +23,12 @@ 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()
 
 let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute('content')
-let liveSocket = new LiveSocket(document.body.dataset.socketPath, Socket, {
+let liveSocket = new LiveSocket('/live', Socket, {
   params: { _csrf_token: csrfToken },
   dom: {
     onBeforeElUpdated(from, to) {
@@ -37,19 +36,32 @@ let liveSocket = new LiveSocket(document.body.dataset.socketPath, Socket, {
         window.Alpine.clone(from, to)
       }
     }
-  },
-  hooks: {
-    supressEnterSubmission: {
-      mounted() {
-        this.el.addEventListener('keypress', (event) => {
-          if (event.key === 'Enter') {
-            event.preventDefault()
   }
 })
+
+window.copyTextToClipboard = async (text) => {
+  // Navigator clipboard api needs a secure context (https)
+  if (navigator.clipboard && window.isSecureContext) {
+    await navigator.clipboard.writeText(text)
+  } else {
+    const textArea = document.createElement('textarea')
+    textArea.value = text
+    // Move textarea out of the viewport so it's not visible
+    textArea.style.position = 'absolute'
+    textArea.style.left = '-999999px'
+
+    document.body.prepend(textArea)
+    textArea.select()
+
+    try {
+      document.execCommand('copy')
+    } catch (error) {
+      console.error(error)
+    } finally {
+      textArea.remove()
     }
   }
 }
-})
 
 // Show progress bar on live navigation and form submits
 topbar.config({ barColors: { 0: '#29d' }, shadowColor: 'rgba(0, 0, 0, .3)' })

assets/js/tabs.js

@@ -1,20 +1,20 @@
-window.setTabByName = (tabName) => {
+window.setTabIndex = (index) => {
-  window.location.hash = `tab-${tabName}`
+  window.location.hash = `tab-${index}`
 
-  return tabName
+  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.getTabFromHash = (currentTabName, defaultTabName) => {
+window.getTabIndex = (currIndex) => {
   if (window.location.hash === '' || window.location.hash === '#') {
-    return defaultTabName
+    return 0
   }
 
   if (window.location.hash.startsWith('#tab-')) {
-    return window.location.hash.replace('#tab-', '')
+    return parseInt(window.location.hash.replace('#tab-', ''))
   }
 
-  return currentTabName
+  return currIndex
 }

config/config.exs

@@ -14,7 +14,7 @@ config :pinchflat,
   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,
+  apprise_runner: Pinchflat.Notifications.CommandRunner,
   media_directory: "/downloads",
   # The user may or may not store metadata for their needs, but the app will always store its copy
   metadata_directory: "/config/metadata",
@@ -25,9 +25,7 @@ config :pinchflat,
   basic_auth_username: "",
   basic_auth_password: "",
   expose_feed_endpoints: false,
-  file_watcher_poll_interval: 1000,
+  file_watcher_poll_interval: 1000
-  timezone: "UTC",
-  base_route_path: "/"
 
 config :pinchflat, Pinchflat.Repo,
   journal_mode: :wal,
@@ -55,7 +53,7 @@ config :pinchflat, Oban,
     {Oban.Plugins.Cron,
      crontab: [
        {"0 1 * * *", Pinchflat.Downloading.MediaRetentionWorker},
-       {"0 2 * * *", Pinchflat.Downloading.MediaQualityUpgradeWorker}
+       {"0 2 * * *", Pinchflat.Downloading.MediaRedownloadWorker}
      ]}
   ],
   # TODO: consider making this an env var or something?
@@ -102,7 +100,7 @@ config :tailwind,
 
 # Configures Elixir's Logger
 config :logger, :console,
-  format: "$date $time $metadata[$level] | $message\n",
+  format: "$time $metadata[$level] $message\n",
   metadata: [:request_id]
 
 # Use Jason for JSON parsing in Phoenix

config/runtime.exs

@@ -46,14 +46,14 @@ if config_env() == :prod do
   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
   expose_feed_endpoints = String.length(System.get_env("EXPOSE_FEED_ENDPOINTS", "")) > 0
+
   # For testing alternate journal modes (see issue #137)
   journal_mode = String.to_existing_atom(System.get_env("JOURNAL_MODE", "wal"))
-  # For running PF in a subdirectory via a reverse proxy
-  base_route_path = System.get_env("BASE_ROUTE_PATH", "/")
 
-  config :logger, level: String.to_existing_atom(System.get_env("LOG_LEVEL", "debug"))
+  config :logger, level: String.to_existing_atom(System.get_env("LOG_LEVEL", "info"))
 
   config :pinchflat,
     yt_dlp_executable: System.find_executable("yt-dlp"),
@@ -63,12 +63,7 @@ if config_env() == :prod do
     extras_directory: extras_path,
     tmpfile_directory: Path.join([System.tmp_dir!(), "pinchflat", "data"]),
     dns_cluster_query: System.get_env("DNS_CLUSTER_QUERY"),
-    expose_feed_endpoints: expose_feed_endpoints,
+    expose_feed_endpoints: expose_feed_endpoints
-    timezone: System.get_env("TIMEZONE") || System.get_env("TZ") || "UTC",
-    log_path: log_path,
-    base_route_path: base_route_path
-
-  config :tzdata, :data_dir, System.get_env("TZ_DATA_DIR", "/etc/elixir_tzdata_data")
 
   config :pinchflat, Pinchflat.Repo,
     database: db_path,
@@ -109,7 +104,6 @@ if config_env() == :prod do
       ip: {0, 0, 0, 0},
       port: String.to_integer(System.get_env("PORT") || "4000")
     ],
-    url: [path: base_route_path],
     secret_key_base: secret_key_base
 
   config :pinchflat, :logger, [

dev.Dockerfile

@@ -0,0 +1,51 @@
+ARG ELIXIR_VERSION=1.16.2
+ARG OTP_VERSION=26.2.2
+ARG DEBIAN_VERSION=bookworm-20240130
+ARG DEV_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
+
+FROM ${DEV_IMAGE}
+
+# Install debian packages
+RUN apt-get update -qq
+RUN apt-get install -y inotify-tools ffmpeg curl git openssh-client \
+  python3 python3-pip python3-setuptools python3-wheel python3-dev locales
+
+# Install nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh
+RUN bash nodesource_setup.sh
+RUN apt-get install nodejs
+RUN npm install -g yarn
+
+# Install baseline Elixir packages
+RUN mix local.hex --force
+RUN mix local.rebar --force
+
+# Download and update YT-DLP
+# NOTE: If you're seeing weird issues, consider using the FFMPEG released by yt-dlp
+RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp
+RUN chmod a+rx /usr/local/bin/yt-dlp
+RUN yt-dlp -U
+
+# Download Apprise
+RUN python3 -m pip install -U apprise --break-system-packages
+
+# Set the locale
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+# Create app directory and copy the Elixir projects into it.
+WORKDIR /app
+COPY . ./
+
+# Needs permissions to be updated AFTER the copy step
+RUN chmod +x ./docker-run.dev.sh
+
+# Install Elixir deps
+# RUN mix archive.install github hexpm/hex branch latest
+RUN mix deps.get
+# Gives us iex shell history
+ENV ERL_AFLAGS="-kernel shell_history enabled"
+
+EXPOSE 4008

docker-compose.ci.yml

@@ -1,15 +1,13 @@
+version: '3'
 services:
   phx:
     build:
       context: .
-      dockerfile: ./docker/dev.Dockerfile
+      dockerfile: dev.Dockerfile
     environment:
       - MIX_ENV=test
     volumes:
       - '.:/app'
-      # These lines ensure the deps can be saved as build artifacts for caching
-      - '/app/deps'
-      - '/app/_build'
     ports:
       - '4008:4008'
     command: tail -F /dev/null

docker-compose.yml

@@ -1,14 +1,14 @@
+version: '3'
 services:
   phx:
     build:
       context: .
-      dockerfile: ./docker/dev.Dockerfile
+      dockerfile: dev.Dockerfile
     volumes:
       - '.:/app'
     ports:
       - '4008:4008'
-    command: bash -c "chmod +x docker/docker-run.dev.sh && docker/docker-run.dev.sh"
+    command:
+      - ./docker-run.dev.sh
     stdin_open: true
     tty: true
-    env_file:
-      - .env

docker-run.dev.sh

@@ -2,12 +2,12 @@
 
 set -e
 
-echo "\nInstalling Elixir deps..."
+# Ensure the app's deps are installed
 mix deps.get
 
-# Install both project-level and assets-level JS dependencies
+# Install JS deps
-echo "\nInstalling JS deps..."
+echo "\nInstalling JS..."
-yarn install && cd assets && yarn install
+cd assets && yarn install
 cd ..
 
 # Potentially Set up the database

docker/dev.Dockerfile

@@ -1,60 +0,0 @@
-ARG ELIXIR_VERSION=1.17.0
-ARG OTP_VERSION=26.2.5
-ARG DEBIAN_VERSION=bookworm-20240612-slim
-ARG DEV_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
-
-FROM ${DEV_IMAGE}
-
-ARG TARGETPLATFORM
-RUN echo "Building for ${TARGETPLATFORM:?}"
-
-# Install debian packages
-RUN apt-get update -qq && \
-  apt-get install -y inotify-tools curl git openssh-client jq \
-    python3 python3-setuptools python3-wheel python3-dev pipx \
-    python3-mutagen locales procps build-essential graphviz
-
-# 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 and Yarn
-RUN curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh && \
-  bash nodesource_setup.sh && \
-  apt-get install -y nodejs && \
-  npm install -g yarn && \
-  # Install baseline Elixir packages
-  mix local.hex --force && \
-  mix local.rebar --force && \
-  # Download and update YT-DLP
-  curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp && \
-  chmod a+rx /usr/local/bin/yt-dlp && \
-  yt-dlp -U && \
-  # Install Apprise
-  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
-COPY . ./
-
-# Install Elixir deps
-# RUN mix archive.install github hexpm/hex branch latest
-RUN MIX_ENV=dev mix deps.get && MIX_ENV=dev mix deps.compile
-RUN MIX_ENV=test mix deps.get && MIX_ENV=test mix deps.compile
-# Gives us iex shell history
-ENV ERL_AFLAGS="-kernel shell_history enabled"
-
-EXPOSE 4008

docker/selfhosted.Dockerfile

@@ -1,145 +0,0 @@
-# Find eligible builder and runner images on Docker Hub. We use Ubuntu/Debian
-# instead of Alpine to avoid DNS resolution issues in production.
-ARG ELIXIR_VERSION=1.17.0
-ARG OTP_VERSION=26.2.5
-ARG DEBIAN_VERSION=bookworm-20240612-slim
-
-ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
-ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}"
-
-FROM ${BUILDER_IMAGE} as builder
-
-ARG TARGETPLATFORM
-RUN echo "Building for ${TARGETPLATFORM:?}"
-
-# install build dependencies
-RUN apt-get update -y && \
-    # System packages
-    apt-get install -y \
-      build-essential \
-      git \
-      curl && \
-    # Node.js and Yarn
-    curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh && \
-    bash nodesource_setup.sh && \
-    apt-get install -y nodejs && \
-    npm install -g yarn && \
-    # Hex and Rebar
-    mix local.hex --force && \
-    mix local.rebar --force && \
-    # FFmpeg
-    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/local/bin/ "ffmpeg" && \
-    tar -xf /tmp/ffmpeg.tar.xz --strip-components=2 --no-anchored -C /usr/local/bin/ "ffprobe" && \
-    # Cleanup
-    apt-get clean && \
-    rm -f /var/lib/apt/lists/*_*
-
-# prepare build dir
-WORKDIR /app
-
-# set build ENV
-ENV MIX_ENV="prod"
-ENV ERL_FLAGS="+JPperf true"
-
-# install mix dependencies
-COPY mix.exs mix.lock ./
-RUN mix deps.get --only $MIX_ENV && mkdir config
-
-# copy compile-time config files before we compile dependencies
-# to ensure any relevant config change will trigger the dependencies
-# to be re-compiled.
-COPY config/config.exs config/${MIX_ENV}.exs config/
-RUN mix deps.compile
-
-COPY priv priv
-COPY lib lib
-COPY assets assets
-
-# Compile assets
-RUN yarn --cwd assets install && mix assets.deploy && mix compile
-
-# Changes to config/runtime.exs don't require recompiling the code
-COPY config/runtime.exs config/
-
-COPY rel rel
-RUN mix release
-
-## -- Release Stage --
-
-FROM ${RUNNER_IMAGE}
-
-ARG PORT=8945
-
-COPY --from=builder ./usr/local/bin/ffmpeg /usr/bin/ffmpeg
-COPY --from=builder ./usr/local/bin/ffprobe /usr/bin/ffprobe
-
-RUN apt-get update -y && \
-    # System packages
-    apt-get install -y \
-      libstdc++6 \
-      openssl \
-      libncurses5 \
-      locales \
-      ca-certificates \
-      python3-mutagen \
-      curl \
-      openssh-client \
-      nano \
-      python3 \
-      pipx \
-      jq \
-      procps && \
-    # Apprise
-    export PIPX_HOME=/opt/pipx && \
-    export PIPX_BIN_DIR=/usr/local/bin && \
-    pipx install apprise && \
-    # yt-dlp
-    curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp && \
-    chmod a+rx /usr/local/bin/yt-dlp && \
-    yt-dlp -U && \
-    # Set the locale
-    sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen && \
-    # Clean up
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# More locale setup
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-WORKDIR "/app"
-
-# Set up data volumes
-RUN mkdir /config /downloads /etc/elixir_tzdata_data && chmod ugo+rw /etc/elixir_tzdata_data
-
-# set runner ENV
-ENV MIX_ENV="prod"
-ENV PORT=${PORT}
-ENV RUN_CONTEXT="selfhosted"
-EXPOSE ${PORT}
-
-# Only copy the final release from the build stage
-COPY --from=builder /app/_build/${MIX_ENV}/rel/pinchflat ./
-
-# NEVER do this if you're running in an environment where you don't trust the user
-# (ie: most environments). This is only acceptable in a self-hosted environment.
-# The user could just run the whole container as root and bypass this anyway so
-# it's not a huge deal.
-# This removes the root password to allow users to assume root if needed. This is
-# preferrable to running the whole container as root so that the files/directories
-# created by the app aren't owned by root and are therefore easier for other users
-# and processes to interact with. If you want to just run the whole container as
-# root, use --user 0:0 or something.
-RUN passwd -d root
-
-HEALTHCHECK --interval=120s --start-period=10s \
-  CMD curl --fail http://localhost:${PORT}/healthcheck || exit 1
-
-# Start the app
-CMD ["/app/bin/docker_start"]

ideas.md

@@ -0,0 +1,4 @@
+- Write media datbase ID as metadata/to file/whatever so it gives us an option to retroactively match media to the DB down the line. Useful if someone moves the media without informing the UI
+  - Use a UUID for the media database ID (or at least alongside it)
+- Look into this and its recommended plugins https://hexdocs.pm/ex_check/readme.html
+- Add output template option for the source's friendly name

lib/pinchflat/application.ex

@@ -24,7 +24,7 @@ defmodule Pinchflat.Application do
       PinchflatWeb.Endpoint
     ]
 
-    attach_oban_telemetry()
+    :ok = Oban.Telemetry.attach_default_logger()
     Logger.add_handlers(:pinchflat)
 
     # See https://hexdocs.pm/elixir/Supervisor.html
@@ -40,11 +40,4 @@ defmodule Pinchflat.Application do
     PinchflatWeb.Endpoint.config_change(changed, removed)
     :ok
   end
-
-  defp attach_oban_telemetry do
-    events = [[:oban, :job, :start], [:oban, :job, :stop], [:oban, :job, :exception]]
-
-    :ok = Oban.Telemetry.attach_default_logger()
-    :telemetry.attach_many("job-telemetry-broadcast", events, &PinchflatWeb.Telemetry.job_state_change_broadcast/4, [])
-  end
 end

lib/pinchflat/boot/nfo_backfill_worker.ex

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

lib/pinchflat/boot/post_job_startup_tasks.ex

@@ -7,6 +7,9 @@ defmodule Pinchflat.Boot.PostJobStartupTasks do
   Phoenix supervision tree.
   """
 
+  alias Pinchflat.Repo
+  alias Pinchflat.Boot.NfoBackfillWorker
+
   # restart: :temporary means that this process will never be restarted (ie: will run once and then die)
   use GenServer, restart: :temporary
   import Ecto.Query, warn: false
@@ -26,7 +29,7 @@ defmodule Pinchflat.Boot.PostJobStartupTasks do
   """
   @impl true
   def init(state) do
-    # Nothing at the moment!
+    Repo.insert_unique_job(NfoBackfillWorker.new(%{}))
 
     {:ok, state}
   end

lib/pinchflat/boot/pre_job_startup_tasks.ex

@@ -31,23 +31,13 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
   """
   @impl true
   def init(state) do
-    ensure_tmpfile_directory()
     reset_executing_jobs()
     create_blank_yt_dlp_files()
-    create_blank_user_script_file()
     apply_default_settings()
 
     {:ok, state}
   end
 
-  defp ensure_tmpfile_directory do
-    tmpfile_dir = Application.get_env(:pinchflat, :tmpfile_directory)
-
-    if !File.exists?(tmpfile_dir) do
-      File.mkdir_p!(tmpfile_dir)
-    end
-  end
-
   # If a node cannot gracefully shut down, the currently executing jobs get stuck
   # in the "executing" state. This is a problem because the job runner will not
   # pick them up again
@@ -75,18 +65,6 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
     end)
   end
 
-  defp create_blank_user_script_file do
-    base_dir = Application.get_env(:pinchflat, :extras_directory)
-    filepath = Path.join([base_dir, "user-scripts", "lifecycle"])
-
-    if !File.exists?(filepath) do
-      Logger.info("Creating blank file and making it executable: #{filepath}")
-
-      FilesystemUtils.write_p!(filepath, "")
-      File.chmod(filepath, 0o755)
-    end
-  end
-
   defp apply_default_settings do
     {:ok, yt_dlp_version} = yt_dlp_runner().version()
     {:ok, apprise_version} = apprise_runner().version()

lib/pinchflat/downloading/download_option_builder.ex

@@ -3,24 +3,20 @@ 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.Settings
   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()]}
   """
-  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) ++
@@ -34,32 +30,18 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
 
   @doc """
   Builds the output path for yt-dlp to download media based on the given source's
-  media profile. Uses the source's override output path template if it exists.
+  media profile.
-
-  Accepts a %MediaItem{} or %Source{} struct. If a %Source{} struct is passed, it
-  will use a default %MediaItem{} struct with the given source.
 
   Returns binary()
   """
-  def build_output_path_for(%MediaItem{} = media_item_with_preloads) do
-    output_path_template = Sources.output_path_template(media_item_with_preloads.source)
-
-    build_output_path(output_path_template, media_item_with_preloads)
-  end
-
   def build_output_path_for(%Source{} = source_with_preloads) do
-    build_output_path_for(%MediaItem{source: source_with_preloads})
+    output_path_template = source_with_preloads.media_profile.output_path_template
+
+    build_output_path(output_path_template, source_with_preloads)
   end
 
-  defp default_options(override_opts) do
+  defp default_options do
-    overwrite_behaviour = Keyword.get(override_opts, :overwrite_behaviour, :force_overwrites)
+    [:no_progress, :windows_filenames]
-
-    [
-      :no_progress,
-      overwrite_behaviour,
-      # This makes the date metadata conform to what jellyfin expects
-      parse_metadata: "%(upload_date>%Y-%m-%d)s:(?P<meta_date>.+)"
-    ]
   end
 
   defp subtitle_options(media_profile) do
@@ -74,9 +56,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
         {{:download_auto_subs, true}, %{download_subs: true}} ->
           acc ++ [:write_auto_subs]
 
-        {{:download_auto_subs, true}, %{embed_subs: true}} ->
-          acc ++ [:write_auto_subs]
-
         {{:embed_subs, true}, %{preferred_resolution: pr}} when pr != :audio ->
           acc ++ [:embed_subs]
 
@@ -125,25 +104,16 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   end
 
   defp quality_options(media_profile) do
-    vcodec = Settings.get!(:video_codec_preference)
+    video_codec_options = "+codec:avc:m4a"
-    acodec = Settings.get!(:audio_codec_preference)
 
     case media_profile.preferred_resolution do
       # Also be aware that :audio disabled all embedding options for subtitles
-      :audio ->
+      :audio -> [:extract_audio, format: "bestaudio[ext=m4a]"]
-        [:extract_audio, format_sort: "+acodec:#{acodec}"]
+      :"360p" -> [format_sort: "res:360,#{video_codec_options}"]
-
+      :"480p" -> [format_sort: "res:480,#{video_codec_options}"]
-      resolution_atom ->
+      :"720p" -> [format_sort: "res:720,#{video_codec_options}"]
-        {resolution_string, _} =
+      :"1080p" -> [format_sort: "res:1080,#{video_codec_options}"]
-          resolution_atom
+      :"2160p" -> [format_sort: "res:2160,#{video_codec_options}"]
-          |> Atom.to_string()
-          |> Integer.parse()
-
-        [
-          # Since Plex doesn't support reading metadata from MKV
-          remux_video: "mp4",
-          format_sort: "res:#{resolution_string},+codec:#{vcodec}:#{acodec}"
-        ]
     end
   end
 
@@ -175,9 +145,11 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
       Enum.reduce(filenames, [], fn filename, acc ->
         filepath = Path.join(base_dir, filename)
 
-        if FSUtils.exists_and_nonempty?(filepath) do
+        case File.read(filepath) do
-          [filepath | acc]
+          {:ok, file_data} ->
-        else
+            if String.trim(file_data) != "", do: [filepath | acc], else: acc
+
+          {:error, _} ->
             acc
         end
       end)
@@ -187,27 +159,23 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
 
   defp output_options(media_item_with_preloads) do
     [
-      output: build_output_path_for(media_item_with_preloads)
+      output: build_output_path_for(media_item_with_preloads.source)
     ]
   end
 
-  defp build_output_path(string, media_item_with_preloads) do
+  defp build_output_path(string, source) do
-    additional_options_map = output_options_map(media_item_with_preloads)
+    additional_options_map = output_options_map(source)
     {:ok, output_path} = OutputPathBuilder.build(string, additional_options_map)
 
     Path.join(base_directory(), output_path)
   end
 
-  defp output_options_map(media_item_with_preloads) do
+  defp output_options_map(source) do
-    source = media_item_with_preloads.source
-
     %{
       "source_custom_name" => source.custom_name,
       "source_collection_id" => source.collection_id,
       "source_collection_name" => source.collection_name,
-      "source_collection_type" => to_string(source.collection_type),
+      "source_collection_type" => source.collection_type
-      "media_playlist_index" => pad_int(media_item_with_preloads.playlist_index),
-      "media_upload_date_index" => pad_int(media_item_with_preloads.upload_date_index)
     }
   end
 
@@ -215,19 +183,13 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   # It's dependent on the output_path_template being a string ending `.{{ ext }}`
   # (or equivalent), but that's validated by the MediaProfile schema.
   defp determine_thumbnail_location(media_item_with_preloads) do
-    output_path_template = Sources.output_path_template(media_item_with_preloads.source)
+    output_path_template = media_item_with_preloads.source.media_profile.output_path_template
 
     output_path_template
     |> String.split(~r{\.}, include_captures: true)
     |> List.insert_at(-3, "-thumb")
     |> Enum.join()
-    |> build_output_path(media_item_with_preloads)
+    |> build_output_path(media_item_with_preloads.source)
-  end
-
-  defp pad_int(integer, count \\ 2, padding \\ "0") do
-    integer
-    |> to_string()
-    |> String.pad_leading(count, padding)
   end
 
   defp base_directory do

lib/pinchflat/downloading/downloading_helpers.ex

@@ -7,13 +7,9 @@ defmodule Pinchflat.Downloading.DownloadingHelpers do
 
   require Logger
 
-  use Pinchflat.Media.MediaQuery
-
-  alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
-  alias Pinchflat.Media.MediaItem
   alias Pinchflat.Downloading.MediaDownloadWorker
 
   @doc """
@@ -47,55 +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.require_assoc(:media_profile)
-    |> where(
-      ^dynamic(
-        [m, s, mp],
-        ^MediaQuery.for_source(source) and
-          ^MediaQuery.downloaded() and
-          not (^MediaQuery.download_prevented()) and
-          not (^MediaQuery.culled())
-      )
-    )
-    |> Repo.all()
-    |> Enum.map(&MediaDownloadWorker.kickoff_with_task/1)
-  end
 end

lib/pinchflat/downloading/media_download_worker.ex

@@ -4,7 +4,7 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
   use Oban.Worker,
     queue: :media_fetching,
     unique: [period: :infinity, states: [:available, :scheduled, :retryable, :executing]],
-    tags: ["media_item", "media_fetching", "show_in_dashboard"]
+    tags: ["media_item", "media_fetching"]
 
   require Logger
 
@@ -14,8 +14,6 @@ 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.
 
@@ -33,18 +31,12 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
   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
     should_force = Map.get(args, "force", false)
-    is_quality_upgrade = Map.get(args, "quality_upgrade?", false)
+    is_redownload = Map.get(args, "redownload?", false)
 
     media_item =
       media_item_id
@@ -53,7 +45,7 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
 
     # If the source or media item is set to not download media, perform a no-op unless forced
     if (media_item.source.download_media && !media_item.prevent_download) || should_force do
-      download_media_and_schedule_jobs(media_item, is_quality_upgrade, should_force)
+      download_media_and_schedule_jobs(media_item, is_redownload)
     else
       :ok
     end
@@ -62,59 +54,39 @@ 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, is_redownload) 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} ->
-
+        Media.update_media_item(updated_media_item, %{
-    case MediaDownloader.download_for_media_item(media_item, override_opts) do
+          media_size_bytes: compute_media_filesize(updated_media_item),
-      {:ok, downloaded_media_item} ->
+          media_redownloaded_at: get_redownloaded_at(is_redownload)
-        {: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, _} ->
         {:error, :retry}
 
-      {:error, message} ->
+      {:error, _message} ->
-        action_on_error(message)
+        {:error, :download_failed}
     end
   end
 
   defp compute_media_filesize(media_item) do
     case File.stat(media_item.media_filepath) do
-      {:ok, %{size: size}} -> size
+      {:ok, %{size: size}} ->
-      _ -> nil
+        size
+
+      _ ->
+        nil
     end
   end
 
-  defp get_redownloaded_at(true), do: DateTime.utc_now()
+  defp get_redownloaded_at(is_redownload) do
-  defp get_redownloaded_at(_), do: nil
+    if is_redownload do
-
+      DateTime.utc_now()
-  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}
+      nil
     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

@@ -29,11 +29,11 @@ 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)
     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, media_with_preloads, output_filepath) do
       {:ok, parsed_json} ->
         update_media_item_from_parsed_json(media_with_preloads, parsed_json)
 
@@ -84,7 +84,7 @@ defmodule Pinchflat.Downloading.MediaDownloader do
           # IDEA: might be worth kicking off a job for this since thumbnail fetching
           # could fail and I want to handle that in isolation
           metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(media_with_preloads, parsed_json),
-          thumbnail_filepath: MetadataFileHelpers.download_and_store_thumbnail_for(media_with_preloads)
+          thumbnail_filepath: MetadataFileHelpers.download_and_store_thumbnail_for(media_with_preloads, parsed_json)
         }
       })
 
@@ -103,8 +103,8 @@ defmodule Pinchflat.Downloading.MediaDownloader do
     end
   end
 
-  defp download_with_options(url, item_with_preloads, output_filepath, override_opts) do
+  defp download_with_options(url, item_with_preloads, output_filepath) 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)
   end

lib/pinchflat/downloading/media_redownload_worker.ex

@@ -1,10 +1,10 @@
-defmodule Pinchflat.Downloading.MediaQualityUpgradeWorker do
+defmodule Pinchflat.Downloading.MediaRedownloadWorker do
   @moduledoc false
 
   use Oban.Worker,
     queue: :media_fetching,
     unique: [period: :infinity, states: [:available, :scheduled, :retryable, :executing]],
-    tags: ["media_item", "media_fetching", "show_in_dashboard"]
+    tags: ["media_item", "media_fetching"]
 
   require Logger
 
@@ -12,9 +12,7 @@ defmodule Pinchflat.Downloading.MediaQualityUpgradeWorker do
   alias Pinchflat.Downloading.MediaDownloadWorker
 
   @doc """
-  Redownloads media items that are eligible for redownload for the purpose
+  Redownloads media items that are eligible for redownload.
-  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.
@@ -27,7 +25,7 @@ defmodule Pinchflat.Downloading.MediaQualityUpgradeWorker do
     Logger.info("Redownloading #{length(redownloadable_media)} media items")
 
     Enum.each(redownloadable_media, fn media_item ->
-      MediaDownloadWorker.kickoff_with_task(media_item, %{quality_upgrade?: true})
+      MediaDownloadWorker.kickoff_with_task(media_item, %{redownload?: true})
     end)
   end
 end

lib/pinchflat/downloading/output_path_builder.ex

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

lib/pinchflat/fast_indexing/fast_indexing_helpers.ex

@@ -5,75 +5,76 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
   Many of these methods are made to be kickoff or be consumed by workers.
   """
 
-  require Logger
-
-  use Pinchflat.Media.MediaQuery
-
   alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Sources.Source
+  alias Pinchflat.Media.MediaQuery
   alias Pinchflat.FastIndexing.YoutubeRss
-  alias Pinchflat.FastIndexing.YoutubeApi
+  alias Pinchflat.Downloading.MediaDownloadWorker
-  alias Pinchflat.Downloading.DownloadingHelpers
+  alias Pinchflat.FastIndexing.MediaIndexingWorker
 
   alias Pinchflat.YtDlp.Media, as: YtDlpMedia
 
   @doc """
-  Fetches new media IDs for a source from YT's API or RSS, indexes them, and kicks off downloading
+  Fetches new media IDs from a source's YouTube RSS feed and kicks off indexing tasks
-  tasks for any pending media items. See comments in `FastIndexingWorker` for more info on the
+  for any new media items. See comments in `MediaIndexingWorker` for more info on the
   order of operations and how this fits into the indexing process.
 
-  Returns [%MediaItem{}] where each item is a new media item that was created _but not necessarily
+  Despite the similar name to `kickoff_fast_indexing_task`, this does work differently.
-  downloaded_.
+  `kickoff_fast_indexing_task` starts a task that _calls_ this function whereas this
+  function starts individual indexing tasks for each new media item. I think it does
+  make sense grammatically, but I could see how that's confusing.
+
+  Returns [binary()] where each binary is the media ID of a new media item.
   """
-  def kickoff_download_tasks_from_youtube_rss_feed(%Source{} = source) do
+  def kickoff_indexing_tasks_from_youtube_rss_feed(%Source{} = source) do
-    {:ok, media_ids} = get_recent_media_ids(source)
+    {:ok, media_ids} = YoutubeRss.get_recent_media_ids_from_rss(source)
     existing_media_items = list_media_items_by_media_id_for(source, media_ids)
     new_media_ids = media_ids -- Enum.map(existing_media_items, & &1.media_id)
 
-    maybe_new_media_items =
+    Enum.each(new_media_ids, fn media_id ->
-      Enum.map(new_media_ids, fn media_id ->
-        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
-
-  # If possible, use the YouTube API to fetch media IDs. If that fails, fall back to the RSS feed.
-  # If the YouTube API isn't set up, just use the RSS feed.
-  defp get_recent_media_ids(source) do
-    with true <- YoutubeApi.enabled?(),
-         {:ok, media_ids} <- YoutubeApi.get_recent_media_ids(source) do
-      {:ok, media_ids}
-    else
-      _ -> YoutubeRss.get_recent_media_ids(source)
-    end
-  end
-
-  defp list_media_items_by_media_id_for(source, media_ids) do
-    MediaQuery.new()
-    |> where(^dynamic([mi], ^MediaQuery.for_source(source) and mi.media_id in ^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)
+
+    new_media_ids
+  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 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_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

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

lib/pinchflat/fast_indexing/media_indexing_worker.ex

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

lib/pinchflat/fast_indexing/youtube_api.ex

@@ -1,92 +0,0 @@
-defmodule Pinchflat.FastIndexing.YoutubeApi do
-  @moduledoc """
-  Methods for interacting with the YouTube API for fast indexing
-  """
-
-  require Logger
-
-  alias Pinchflat.Settings
-  alias Pinchflat.Sources.Source
-  alias Pinchflat.Utils.FunctionUtils
-  alias Pinchflat.FastIndexing.YoutubeBehaviour
-
-  @behaviour YoutubeBehaviour
-
-  @doc """
-  Determines if the YouTube API is enabled for fast indexing by checking
-  if the user has an API key set
-
-  Returns boolean()
-  """
-  @impl YoutubeBehaviour
-  def enabled?(), do: is_binary(api_key())
-
-  @doc """
-  Fetches the recent media IDs from the YouTube API for a given source.
-
-  Returns {:ok, [binary()]} | {:error, binary()}
-  """
-  @impl YoutubeBehaviour
-  def get_recent_media_ids(%Source{} = source) do
-    api_response =
-      source
-      |> determine_playlist_id()
-      |> do_api_request()
-
-    case api_response do
-      {:ok, parsed_json} -> get_media_ids_from_response(parsed_json)
-      {:error, reason} -> {:error, reason}
-    end
-  end
-
-  # The UC prefix is for channels which won't work with this API endpoint. Swapping
-  # the prefix to UU will get us the playlist that represents the channel's uploads
-  defp determine_playlist_id(%{collection_id: c_id}) do
-    String.replace_prefix(c_id, "UC", "UU")
-  end
-
-  defp do_api_request(playlist_id) do
-    Logger.debug("Fetching recent media IDs from YouTube API for playlist: #{playlist_id}")
-
-    playlist_id
-    |> construct_api_endpoint()
-    |> http_client().get(accept: "application/json")
-    |> case do
-      {:ok, response} ->
-        Phoenix.json_library().decode(response)
-
-      {:error, reason} ->
-        Logger.error("Failed to fetch YouTube API: #{inspect(reason)}")
-        {:error, reason}
-    end
-  end
-
-  defp get_media_ids_from_response(parsed_json) do
-    parsed_json
-    |> Map.get("items", [])
-    |> Enum.map(fn item ->
-      item
-      |> Map.get("contentDetails", %{})
-      |> Map.get("videoId", nil)
-    end)
-    |> Enum.reject(&is_nil/1)
-    |> Enum.uniq()
-    |> FunctionUtils.wrap_ok()
-  end
-
-  defp api_key do
-    Settings.get!(:youtube_api_key)
-  end
-
-  defp construct_api_endpoint(playlist_id) do
-    api_base = "https://youtube.googleapis.com/youtube/v3/playlistItems"
-    property_type = "contentDetails"
-    max_results = 50
-
-    "#{api_base}?part=#{property_type}&maxResults=#{max_results}&playlistId=#{playlist_id}&key=#{api_key()}"
-  end
-
-  defp http_client do
-    Application.get_env(:pinchflat, :http_client, Pinchflat.HTTP.HTTPClient)
-  end
-end

lib/pinchflat/fast_indexing/youtube_behaviour.ex

@@ -1,11 +0,0 @@
-defmodule Pinchflat.FastIndexing.YoutubeBehaviour do
-  @moduledoc """
-  This module defines the behaviour for clients that interface with YouTube
-  for the purpose of fast indexing.
-  """
-
-  alias Pinchflat.Sources.Source
-
-  @callback enabled?() :: boolean()
-  @callback get_recent_media_ids(%Source{}) :: {:ok, [String.t()]} | {:error, String.t()}
-end

lib/pinchflat/fast_indexing/youtube_rss.ex

@@ -1,31 +1,18 @@
 defmodule Pinchflat.FastIndexing.YoutubeRss do
   @moduledoc """
-  Methods for interacting with YouTube RSS feeds for fast indexing
+  Methods for interacting with YouTube RSS feeds
   """
 
   require Logger
 
   alias Pinchflat.Sources.Source
-  alias Pinchflat.FastIndexing.YoutubeBehaviour
-
-  @behaviour YoutubeBehaviour
-
-  @doc """
-  Determines if the YouTube RSS feed is enabled for fast indexing. Used to satisfy
-  the `YoutubeBehaviour` behaviour.
-
-  Returns true
-  """
-  @impl YoutubeBehaviour
-  def enabled?(), do: true
 
   @doc """
   Fetches the recent media IDs from a YouTube RSS feed for a given source.
 
   Returns {:ok, [binary()]} | {:error, binary()}
   """
-  @impl YoutubeBehaviour
+  def get_recent_media_ids_from_rss(%Source{} = source) do
-  def get_recent_media_ids(%Source{} = source) do
     Logger.debug("Fetching recent media IDs from YouTube RSS feed for source: #{source.collection_id}")
 
     case http_client().get(rss_url_for_source(source)) do

lib/pinchflat/http/http_client.ex

@@ -21,11 +21,9 @@ defmodule Pinchflat.HTTP.HTTPClient do
   """
   @impl HTTPBehaviour
   def get(url, headers \\ [], opts \\ []) do
-    headers = parse_headers(headers)
-
     case :httpc.request(:get, {url, headers}, [], opts) do
       {:ok, {{_version, 200, _reason_phrase}, _headers, body}} ->
-        {:ok, to_string(body)}
+        {:ok, body}
 
       {:ok, {{_version, status_code, reason_phrase}, _headers, _body}} ->
         {:error, "HTTP request failed with status code #{status_code}: #{reason_phrase}"}
@@ -34,8 +32,4 @@ defmodule Pinchflat.HTTP.HTTPClient do
         {:error, "HTTP request failed: #{reason}"}
     end
   end
-
-  defp parse_headers(headers) do
-    Enum.map(headers, fn {k, v} -> {to_charlist(k), to_charlist(v)} end)
-  end
 end

lib/pinchflat/lifecycle/user_scripts/command_runner.ex

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

lib/pinchflat/lifecycle/user_scripts/user_script_command_runner.ex

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

lib/pinchflat/media/media.ex

@@ -4,16 +4,14 @@ defmodule Pinchflat.Media do
   """
 
   import Ecto.Query, warn: false
-  use Pinchflat.Media.MediaQuery
 
   alias Pinchflat.Repo
   alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
   alias Pinchflat.Media.MediaItem
-  alias Pinchflat.Utils.FilesystemUtils
+  alias Pinchflat.Media.MediaQuery
   alias Pinchflat.Metadata.MediaMetadata
-
+  alias Pinchflat.Utils.FilesystemUtils
-  alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
 
   @doc """
   Returns the list of media_items.
@@ -32,8 +30,9 @@ defmodule Pinchflat.Media do
   """
   def list_cullable_media_items do
     MediaQuery.new()
-    |> MediaQuery.require_assoc(:source)
+    |> MediaQuery.with_media_filepath()
-    |> where(^MediaQuery.cullable())
+    |> MediaQuery.where_past_retention_period()
+    |> MediaQuery.where_culling_not_prevented()
     |> Repo.all()
   end
 
@@ -41,10 +40,9 @@ defmodule Pinchflat.Media do
   Returns a list of media_items that are redownloadable based on the redownload delay
   of the media_profile their source belongs to.
 
-  The logic is that a media_item is past_redownload_delay if the media_item's uploaded_at is
+  The logic is that a media_item is past_redownload_delay if the media_item's
-  at least redownload_delay_days ago AND `media_downloaded_at` - `redownload_delay_days`
+  upload_date is at least redownload_delay_days ago AND
-  is before the media_item's `uploaded_at`.
+  `media_downloaded_at` - `redownload_delay_days` is before the media_item's `upload_date`.
-
   This logic grabs media that we've recently downloaded AND is recently uploaded, but
   doesn't grab media that we've recently downloaded and was uploaded a long time ago.
   This also makes things work as expected when downloading media from a source for the
@@ -54,14 +52,18 @@ defmodule Pinchflat.Media do
   """
   def list_redownloadable_media_items do
     MediaQuery.new()
-    |> MediaQuery.require_assoc(:media_profile)
+    |> MediaQuery.with_media_downloaded_at()
-    |> where(^MediaQuery.redownloadable())
+    |> 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_item satisfies `MediaQuery.pending`. You
+  pending means the `media_filepath` is `nil` AND the media_item
+  matches satisfies `MediaQuery.where_pending_download`. You
   should really check out that function if you need to know more
   because it has a lot going on.
 
@@ -69,14 +71,15 @@ defmodule Pinchflat.Media do
   """
   def list_pending_media_items_for(%Source{} = source) do
     MediaQuery.new()
-    |> MediaQuery.require_assoc(:media_profile)
+    |> MediaQuery.for_source(source)
-    |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.pending()))
+    |> MediaQuery.where_pending_download()
     |> Repo.all()
   end
 
   @doc """
   For a given media_item, tells you if it is pending download. This is defined as
-  the media_item satisfying `MediaQuery.pending` which you should really check out.
+  the media_item having a `media_filepath` of `nil` and matching the format selection
+  rules of the parent media_profile.
 
   Intentionally does not take the `download_media` setting of the source into account.
 
@@ -86,8 +89,8 @@ defmodule Pinchflat.Media do
     media_item = Repo.preload(media_item, source: :media_profile)
 
     MediaQuery.new()
-    |> MediaQuery.require_assoc(:media_profile)
+    |> MediaQuery.with_id(media_item.id)
-    |> where(^dynamic([m, s, mp], m.id == ^media_item.id and ^MediaQuery.pending()))
+    |> MediaQuery.where_pending_download()
     |> Repo.exists?()
   end
 
@@ -136,23 +139,18 @@ defmodule Pinchflat.Media do
 
   Unlike `create_media_item`, this will attempt an update if the media_item
   already exists. This is so that future indexing can pick up attributes that
-  we may not have asked for in the past (eg: uploaded_at)
+  we may not have asked for in the past (eg: upload_date)
 
   Returns {:ok, %MediaItem{}} | {:error, %Ecto.Changeset{}}
   """
   def create_media_item_from_backend_attrs(source, media_attrs_struct) do
     attrs = Map.merge(%{source_id: source.id}, Map.from_struct(media_attrs_struct))
-    # Some fields should only be set on insert and not on update.
-    fields_to_drop_on_update = [:playlist_index]
 
     %MediaItem{}
     |> MediaItem.changeset(attrs)
     |> Repo.insert(
       on_conflict: [
-        set:
+        set: Map.to_list(attrs)
-          attrs
-          |> Map.drop(fields_to_drop_on_update)
-          |> Map.to_list()
       ],
       conflict_target: [:source_id, :media_id]
     )
@@ -182,7 +180,6 @@ defmodule Pinchflat.Media do
 
     if delete_files do
       {:ok, _} = do_delete_media_files(media_item)
-      :ok = run_user_script(:media_deleted, media_item)
     end
 
     # Should delete these no matter what
@@ -205,7 +202,6 @@ defmodule Pinchflat.Media do
 
     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
@@ -241,10 +237,4 @@ defmodule Pinchflat.Media do
     |> Enum.filter(&is_binary/1)
     |> Enum.each(&FilesystemUtils.delete_file_and_remove_empty_directories/1)
   end
-
-  defp run_user_script(event, media_item) do
-    runner = Application.get_env(:pinchflat, :user_script_runner, UserScriptRunner)
-
-    runner.run(event, media_item)
-  end
 end

lib/pinchflat/media/media_item.ex

@@ -4,22 +4,15 @@ 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
   alias Pinchflat.Media.MediaItemsSearchIndex
 
   @allowed_fields [
-    # these fields are only captured on index
-    :playlist_index,
     # these fields are captured on indexing (and again on download)
     :title,
     :media_id,
@@ -28,8 +21,7 @@ defmodule Pinchflat.Media.MediaItem do
     :livestream,
     :source_id,
     :short_form_content,
-    :uploaded_at,
+    :upload_date,
-    :upload_date_index,
     :duration_seconds,
     # these fields are captured only on download
     :media_downloaded_at,
@@ -53,7 +45,7 @@ defmodule Pinchflat.Media.MediaItem do
     livestream
     media_id
     source_id
-    uploaded_at
+    upload_date
     short_form_content
   )a
 
@@ -71,10 +63,8 @@ defmodule Pinchflat.Media.MediaItem do
     field :short_form_content, :boolean, default: false
     field :media_downloaded_at, :utc_datetime
     field :media_redownloaded_at, :utc_datetime
-    field :uploaded_at, :utc_datetime
+    field :upload_date, :date
-    field :upload_date_index, :integer, default: 0
     field :duration_seconds, :integer
-    field :playlist_index, :integer, default: 0
 
     field :media_filepath, :string
     field :media_size_bytes, :integer
@@ -108,7 +98,6 @@ defmodule Pinchflat.Media.MediaItem do
     |> cast(attrs, @allowed_fields)
     |> cast_assoc(:metadata, with: &MediaMetadata.changeset/2, required: false)
     |> dynamic_default(:uuid, fn _ -> Ecto.UUID.generate() end)
-    |> update_upload_date_index()
     |> validate_required(@required_fields)
     |> unique_constraint([:media_id, :source_id])
   end
@@ -127,65 +116,4 @@ defmodule Pinchflat.Media.MediaItem do
     end)
     |> Enum.into(%{})
   end
-
-  @doc false
-  def json_exluded_fields do
-    ~w(__meta__ __struct__ metadata tasks media_items_search_index)a
-  end
-
-  # Run it on new records no matter what. The method we delegate to
-  # will handle the case where `uploaded_at` is `nil`
-  defp update_upload_date_index(%{data: %{id: nil}} = changeset) do
-    do_update_upload_date_index(changeset)
-  end
-
-  # For the update case, we only want to recalculate if the day itself has changed.
-  # For instance, this is useful in the migration from `upload_date` to `uploaded_at`
-  defp update_upload_date_index(%{changes: changes} = changeset) when is_map_key(changes, :uploaded_at) do
-    old_uploaded_at = changeset.data.uploaded_at
-    new_uploaded_at = get_change(changeset, :uploaded_at)
-    upload_dates_match = DateTime.to_date(old_uploaded_at) == DateTime.to_date(new_uploaded_at)
-
-    if upload_dates_match do
-      changeset
-    else
-      do_update_upload_date_index(changeset)
-    end
-  end
-
-  # If the record is persisted and the `uploaded_at` field is not being changed,
-  # we don't need to recalculate the index.
-  defp update_upload_date_index(changeset), do: changeset
-
-  defp do_update_upload_date_index(%{changes: changes} = changeset) when is_map_key(changes, :uploaded_at) 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()
-      |> where(^dynamic([mi], ^MediaQuery.upload_date_matches(changes.uploaded_at) and ^MediaQuery.for_source(source)))
-      |> 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 do_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

@@ -12,42 +12,128 @@ defmodule Pinchflat.Media.MediaQuery do
 
   alias Pinchflat.Media.MediaItem
 
-  # This allows the module to be aliased and query methods to be used
+  # Prefixes:
-  # all in one go
+  # - for_* - belonging to a certain record
-  # usage: use Pinchflat.Media.MediaQuery
+  # - join_* - for joining on a certain record
-  defmacro __using__(_opts) do
+  # - with_*, where_* - for filtering based on full, concrete attributes
-    quote do
+  # - matching_* - for filtering based on partial attributes (e.g. LIKE, regex, full-text search)
-      import Ecto.Query, warn: false
+  #
-
+  # Suffixes:
-      alias unquote(__MODULE__)
+  # - _for - the arg passed is an association record
-    end
-  end
 
   def new do
     MediaItem
   end
 
-  def for_source(source_id) when is_integer(source_id), do: dynamic([mi], mi.source_id == ^source_id)
+  def for_source(query, source) do
-  def for_source(source), do: dynamic([mi], mi.source_id == ^source.id)
+    where(query, [mi], mi.source_id == ^source.id)
+  end
 
-  def downloaded, do: dynamic([mi], not is_nil(mi.media_filepath))
+  def join_sources(query) do
-  def download_prevented, do: dynamic([mi], mi.prevent_download == true)
+    from(mi in query, join: s in assoc(mi, :source), as: :sources)
-  def culling_prevented, do: dynamic([mi], mi.prevent_culling == true)
+  end
-  def culled, do: dynamic([mi], not is_nil(mi.culled_at))
-  def redownloaded, do: dynamic([mi], not is_nil(mi.media_redownloaded_at))
-  def upload_date_matches(other_date), do: dynamic([mi], fragment("date(?) = date(?)", mi.uploaded_at, ^other_date))
 
-  def upload_date_after_source_cutoff do
+  def where_past_retention_period(query) do
-    dynamic(
+    query
+    |> require_assoc(:source)
+    |> where(
       [mi, source],
-      is_nil(source.download_cutoff_date) or
+      fragment("""
-        fragment("date(?) >= ?", mi.uploaded_at, source.download_cutoff_date)
+      IFNULL(retention_period_days, 0) > 0 AND
+      DATETIME('now', '-' || retention_period_days || ' day') > media_downloaded_at
+      """)
     )
   end
 
-  def format_matching_profile_preference do
+  def where_past_redownload_delay(query) do
-    dynamic(
+    query
-      [mi, source, media_profile],
+    |> 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_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
@@ -69,80 +155,16 @@ defmodule Pinchflat.Media.MediaQuery do
     )
   end
 
-  def matches_source_title_regex do
+  def where_pending_download(query) do
-    dynamic(
+    query
-      [mi, source],
+    |> where_download_not_prevented()
-      is_nil(source.title_filter_regex) or fragment("regexp_like(?, ?)", mi.title, source.title_filter_regex)
+    |> with_no_media_filepath()
-    )
+    |> with_upload_date_after_source_cutoff()
+    |> with_format_matching_profile_preference()
+    |> matching_source_title_regex()
   end
 
-  def past_retention_period do
+  defp require_assoc(query, identifier) do
-    dynamic(
-      [mi, source],
-      fragment("""
-        IFNULL(retention_period_days, 0) > 0 AND
-        DATETIME('now', '-' || retention_period_days || ' day') > media_downloaded_at
-      """)
-    )
-  end
-
-  def past_redownload_delay do
-    dynamic(
-      [mi, source, media_profile],
-      # Returns media items where the uploaded_at 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') > uploaded_at AND
-        DATETIME(media_downloaded_at, '-' || redownload_delay_days || ' day') < uploaded_at
-      """)
-    )
-  end
-
-  def cullable do
-    dynamic(
-      [mi, source],
-      ^downloaded() and
-        ^past_retention_period() and
-        not (^culling_prevented())
-    )
-  end
-
-  def pending do
-    dynamic(
-      [mi],
-      not (^downloaded()) and
-        not (^download_prevented()) and
-        ^upload_date_after_source_cutoff() and
-        ^format_matching_profile_preference() and
-        ^matches_source_title_regex()
-    )
-  end
-
-  def redownloadable do
-    dynamic(
-      [mi, source],
-      ^downloaded() and
-        not (^download_prevented()) and
-        not (^culled()) and
-        not (^redownloaded()) and
-        ^past_redownload_delay()
-    )
-  end
-
-  def matches_search_term(nil), do: dynamic([mi], true)
-
-  def matches_search_term(term) do
-    escaped_term = clean_search_term(term)
-
-    # Matching on `term` instead of `escaped_term` because the latter can mangle empty strings
-    case String.trim(term) do
-      "" -> dynamic([mi], true)
-      _ -> dynamic([mi], fragment("media_items_search_index MATCH ?", ^escaped_term))
-    end
-  end
-
-  def require_assoc(query, identifier) do
     if has_named_binding?(query, identifier) do
       query
     else
@@ -150,10 +172,6 @@ defmodule Pinchflat.Media.MediaQuery do
     end
   end
 
-  defp do_require_assoc(query, :media_items_search_index) do
-    from(mi in query, join: s in assoc(mi, :media_items_search_index), as: :media_items_search_index)
-  end
-
   defp do_require_assoc(query, :source) do
     from(mi in query, join: s in assoc(mi, :source), as: :source)
   end
@@ -163,48 +181,4 @@ defmodule Pinchflat.Media.MediaQuery do
     |> require_assoc(:source)
     |> join(:inner, [mi, source], mp in assoc(source, :media_profile), as: :media_profile)
   end
-
-  # This needs to be a non-dynamic query because it alone should control things like
-  # ordering and `snippets` for full-text search
-  def matching_search_term(query, nil), do: query
-
-  def matching_search_term(query, term) do
-    escaped_term = clean_search_term(term)
-
-    from(mi in query,
-      join: mi_search_index in assoc(mi, :media_items_search_index),
-      where: fragment("media_items_search_index MATCH ?", ^escaped_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
-
-  # SQLite's FTS5 is very picky about what it will accept as a search term.
-  # To that end, we need to clean up the search term before passing it to the
-  # MATCH clause.
-  # This method:
-  #   - Trims leading and trailing whitespace
-  #   - Collapses multiple spaces into a single space
-  #   - Removes quote characters
-  #   - Wraps any word in quotes (must happen after the double quote replacement)
-  #
-  # This allows for works with apostrophes and quotes to be searched for correctly
-  defp clean_search_term(nil), do: ""
-  defp clean_search_term(""), do: ""
-
-  defp clean_search_term(term) do
-    term
-    |> String.trim()
-    |> String.replace(~r/\s+/, " ")
-    |> String.split(~r/\s+/)
-    |> Enum.map(fn str -> String.replace(str, ~s("), "") end)
-    |> Enum.map_join(" ", fn str -> ~s("#{str}") end)
-  end
 end

lib/pinchflat/metadata/metadata_file_helpers.ex

@@ -11,8 +11,6 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
 
   alias Pinchflat.Utils.FilesystemUtils
 
-  alias Pinchflat.YtDlp.Media, as: YtDlpMedia
-
   @doc """
   Returns the directory where metadata for a database record should be stored.
 
@@ -49,42 +47,36 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
   Returns {:ok, map()} | {:error, any}
   """
   def read_compressed_metadata(filepath) do
-    {:ok, json} = File.open(filepath, [:read, :compressed], &IO.read(&1, :eof))
+    {:ok, json} = File.open(filepath, [:read, :compressed], &IO.read(&1, :all))
 
     Phoenix.json_library().decode(json)
   end
 
   @doc """
   Downloads and stores a thumbnail for a media item, returning the filepath.
-  Chooses the highest quality thumbnail available and converts it to a JPG
 
-  Returns nil if no thumbnail is available or if yt-dlp encounters an error
+  Returns binary()
-
-  Returns binary() | nil
   """
-  def download_and_store_thumbnail_for(database_record) do
+  def download_and_store_thumbnail_for(database_record, metadata_map) do
-    yt_dlp_filepath = generate_filepath_for(database_record, "thumbnail.%(ext)s")
+    thumbnail_url = metadata_map["thumbnail"]
-    real_filepath = generate_filepath_for(database_record, "thumbnail.jpg")
+    filepath = generate_filepath_for(database_record, Path.basename(thumbnail_url))
+    thumbnail_blob = fetch_thumbnail_from_url(thumbnail_url)
 
-    case YtDlpMedia.download_thumbnail(database_record.original_url, output: yt_dlp_filepath) do
+    :ok = FilesystemUtils.write_p!(filepath, thumbnail_blob)
-      {:ok, _} -> real_filepath
+
-      _ -> nil
+    filepath
-    end
   end
 
   @doc """
   Parses an upload date from the YYYYMMDD string returned in yt-dlp metadata
-  and returns a DateTime struct, appending a time of 00:00:00Z.
+  and returns a Date struct.
 
-  Returns DateTime.t()
+  Returns Date.t()
   """
   def parse_upload_date(upload_date) do
     <<year::binary-size(4)>> <> <<month::binary-size(2)>> <> <<day::binary-size(2)>> = upload_date
 
-    case DateTime.from_iso8601("#{year}-#{month}-#{day}T00:00:00Z") do
+    Date.from_iso8601!("#{year}-#{month}-#{day}")
-      {:ok, datetime, _} -> datetime
-      _ -> raise "Invalid upload date: #{upload_date}"
-    end
   end
 
   @doc """
@@ -124,19 +116,11 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
     end
   end
 
-  @doc """
+  defp fetch_thumbnail_from_url(url) do
-  Attempts to determine the season and episode number from a media filepath.
+    http_client = Application.get_env(:pinchflat, :http_client, Pinchflat.HTTP.HTTPClient)
+    {:ok, body} = http_client.get(url, [], body_format: :binary)
 
-  Returns {:ok, {binary(), binary()}} | {:error, :indeterminable}
+    body
-  """
-  def season_and_episode_from_media_filepath(media_filepath) do
-    # matches s + 1 or more digits + e + 1 or more digits (case-insensitive)
-    season_episode_regex = ~r/s(\d+)e(\d+)/i
-
-    case Regex.scan(season_episode_regex, media_filepath) do
-      [[_, season, episode] | _] -> {:ok, {season, episode}}
-      _ -> {:error, :indeterminable}
-    end
   end
 
   defp generate_filepath_for(database_record, filename) do

lib/pinchflat/metadata/metadata_parser.ex

@@ -8,8 +8,6 @@ defmodule Pinchflat.Metadata.MetadataParser do
   and not have it, ya know?
   """
 
-  alias Pinchflat.YtDlp.Media, as: YtDlpMedia
-
   @doc """
   Parses the given JSON response from yt-dlp and returns a map of
   the needful media_item attributes, along with anything needed for
@@ -26,12 +24,15 @@ defmodule Pinchflat.Metadata.MetadataParser do
   end
 
   defp parse_media_metadata(metadata) do
-    Map.merge(
-      Map.from_struct(YtDlpMedia.response_to_struct(metadata)),
     %{
-        media_filepath: metadata["filepath"]
+      media_id: metadata["id"],
+      title: metadata["title"],
+      original_url: metadata["original_url"],
+      description: metadata["description"],
+      media_filepath: metadata["filepath"],
+      livestream: metadata["was_live"],
+      duration_seconds: metadata["duration"] && round(metadata["duration"])
     }
-    )
   end
 
   defp parse_subtitle_metadata(metadata) do

lib/pinchflat/metadata/nfo_builder.ex

@@ -6,8 +6,8 @@ defmodule Pinchflat.Metadata.NfoBuilder do
 
   import Pinchflat.Utils.XmlUtils, only: [safe: 1]
 
-  alias Pinchflat.Utils.FilesystemUtils
   alias Pinchflat.Metadata.MetadataFileHelpers
+  alias Pinchflat.Utils.FilesystemUtils
 
   @doc """
   Builds an NFO file for a media item (read: single "episode") and
@@ -15,12 +15,12 @@ defmodule Pinchflat.Metadata.NfoBuilder do
 
   Returns the filepath of the NFO file.
   """
-  def build_and_store_for_media_item(nfo_filepath, metadata) do
+  def build_and_store_for_media_item(filepath, metadata) do
-    nfo = build_for_media_item(nfo_filepath, metadata)
+    nfo = build_for_media_item(metadata)
 
-    FilesystemUtils.write_p!(nfo_filepath, nfo)
+    FilesystemUtils.write_p!(filepath, nfo)
 
-    nfo_filepath
+    filepath
   end
 
   @doc """
@@ -37,15 +37,10 @@ defmodule Pinchflat.Metadata.NfoBuilder do
     filepath
   end
 
-  defp build_for_media_item(nfo_filepath, metadata) do
+  defp build_for_media_item(metadata) do
     upload_date = MetadataFileHelpers.parse_upload_date(metadata["upload_date"])
-    # NOTE: the filepath here isn't the path of the media item, it's the path that
-    # the NFO should be saved to. This works because the NFO's path is the same as
-    # the media's path, just with a different extension. If this ever changes I'll
-    # need to pass in the media item's path as well.
-    {season, episode} = determine_season_and_episode_number(nfo_filepath, upload_date)
-
     # Cribbed from a combination of the Kodi wiki, ytdl-nfo, and ytdl-sub.
+    # WHO NEEDS A FANCY XML PARSER ANYWAY?!
     """
     <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
     <episodedetails>
@@ -54,8 +49,8 @@ defmodule Pinchflat.Metadata.NfoBuilder do
       <uniqueid type="youtube" default="true">#{safe(metadata["id"])}</uniqueid>
       <plot>#{safe(metadata["description"])}</plot>
       <aired>#{safe(upload_date)}</aired>
-      <season>#{safe(season)}</season>
+      <season>#{safe(upload_date.year)}</season>
-      <episode>#{episode}</episode>
+      <episode>#{Calendar.strftime(upload_date, "%m%d")}</episode>
       <genre>YouTube</genre>
     </episodedetails>
     """
@@ -72,11 +67,4 @@ defmodule Pinchflat.Metadata.NfoBuilder do
     </tvshow>
     """
   end
-
-  defp determine_season_and_episode_number(filepath, upload_date) do
-    case MetadataFileHelpers.season_and_episode_from_media_filepath(filepath) do
-      {:ok, {season, episode}} -> {season, episode}
-      {:error, _} -> {upload_date.year, Calendar.strftime(upload_date, "%m%d")}
-    end
-  end
 end

lib/pinchflat/metadata/source_image_parser.ex

@@ -20,49 +20,29 @@ defmodule Pinchflat.Metadata.SourceImageParser do
   def store_source_images(base_directory, source_metadata) do
     (source_metadata["thumbnails"] || [])
     |> Enum.filter(&(&1["filepath"] != nil))
-    |> select_useful_images(source_metadata)
+    |> select_useful_images()
     |> Enum.map(&move_image(&1, base_directory))
     |> Enum.into(%{})
   end
 
-  defp select_useful_images(images, source_metadata) do
+  defp select_useful_images(images) do
     labelled_images =
-      Enum.reduce(images, %{}, fn image_map, acc ->
+      Enum.reduce(images, [], fn image_map, acc ->
         case image_map do
-          %{"id" => "avatar_uncropped"} -> put_image_key(acc, :poster, image_map["filepath"])
+          %{"id" => "avatar_uncropped"} ->
-          %{"id" => "banner_uncropped"} -> put_image_key(acc, :fanart, image_map["filepath"])
+            acc ++ [{:poster, :poster_filepath, image_map["filepath"]}]
-          _ -> acc
+
+          %{"id" => "banner_uncropped"} ->
+            acc ++ [{:fanart, :fanart_filepath, image_map["filepath"]}]
+
+          _ ->
+            acc
         end
       end)
 
     labelled_images
-    |> add_fallback_poster(source_metadata)
+    |> Enum.concat([{:banner, :banner_filepath, determine_best_banner(images)}])
-    |> put_image_key(:banner, determine_best_banner(images))
+    |> Enum.filter(fn {_, _, tmp_filepath} -> tmp_filepath end)
-    |> Enum.filter(fn {_key, attrs} -> attrs.current_filepath end)
-  end
-
-  # If a poster is set, short-circuit and return the images as-is
-  defp add_fallback_poster(%{poster: _} = images, _), do: images
-
-  # If a poster is NOT set, see if we can find a suitable image to use as a fallback
-  defp add_fallback_poster(images, source_metadata) do
-    case source_metadata["entries"] do
-      nil -> images
-      [] -> images
-      [first_entry | _] -> add_poster_from_entry_thumbnail(images, first_entry)
-    end
-  end
-
-  defp add_poster_from_entry_thumbnail(images, entry) do
-    thumbnail =
-      (entry["thumbnails"] || [])
-      |> Enum.reverse()
-      |> Enum.find(& &1["filepath"])
-
-    case thumbnail do
-      nil -> images
-      _ -> put_image_key(images, :poster, thumbnail["filepath"])
-    end
   end
 
   defp determine_best_banner(images) do
@@ -78,22 +58,12 @@ defmodule Pinchflat.Metadata.SourceImageParser do
     Map.get(best_candidate || %{}, "filepath")
   end
 
-  defp move_image({_key, attrs}, base_directory) do
+  defp move_image({filename, source_attr_name, tmp_filepath}, base_directory) do
-    extension = Path.extname(attrs.current_filepath)
+    extension = Path.extname(tmp_filepath)
-    final_filepath = Path.join([base_directory, "#{attrs.final_filename}#{extension}"])
+    final_filepath = Path.join([base_directory, "#{filename}#{extension}"])
 
-    FilesystemUtils.cp_p!(attrs.current_filepath, final_filepath)
+    FilesystemUtils.cp_p!(tmp_filepath, final_filepath)
 
-    {attrs.attribute_name, final_filepath}
+    {source_attr_name, final_filepath}
-  end
-
-  defp put_image_key(map, key, image) do
-    attribute_atom = String.to_existing_atom("#{key}_filepath")
-
-    Map.put(map, key, %{
-      attribute_name: attribute_atom,
-      final_filename: to_string(key),
-      current_filepath: image
-    })
   end
 end

lib/pinchflat/metadata/source_metadata_storage_worker.ex

@@ -3,7 +3,7 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
 
   use Oban.Worker,
     queue: :remote_metadata,
-    tags: ["media_source", "source_metadata", "remote_metadata", "show_in_dashboard"],
+    tags: ["media_source", "source_metadata", "remote_metadata"],
     max_attempts: 3
 
   require Logger
@@ -38,9 +38,9 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
     - The NFO file for the source (if specified)
     - Downloads and stores source images (if specified)
 
-  The worker is kicked off after a source is inserted or it's original_url
+  The worker is kicked off after a source is inserted/updated - this can
-  is updated - this can take an unknown amount of time so don't rely on this
+  take an unknown amount of time so don't rely on this data being here
-  data being here before, say, the first indexing or downloading task is complete.
+  before, say, the first indexing or downloading task is complete.
 
   Returns :ok
   """
@@ -77,8 +77,10 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
 
   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} = fetch_metadata_for_source(source)
+    {: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
@@ -108,20 +110,6 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
     end
   end
 
-  defp fetch_metadata_for_source(source) do
-    tmp_output_path = "#{tmp_directory()}/#{StringUtils.random_string(16)}/source_image.%(ext)S"
-    base_opts = [convert_thumbnails: "jpg", output: tmp_output_path]
-
-    opts =
-      if source.collection_type == :channel do
-        base_opts ++ [:write_all_thumbnails, playlist_items: 0]
-      else
-        base_opts ++ [:write_thumbnail, playlist_items: 1]
-      end
-
-    MediaCollection.get_source_metadata(source.original_url, opts)
-  end
-
   defp tmp_directory do
     Application.get_env(:pinchflat, :tmpfile_directory)
   end

lib/pinchflat/notifications/apprise_command_runner.ex

@@ -1,4 +1,4 @@
-defmodule Pinchflat.Lifecycle.Notifications.AppriseCommandRunner do
+defmodule Pinchflat.Notifications.AppriseCommandRunner do
   @moduledoc """
   A behaviour for running CLI commands against a notification backend (apprise).
 

lib/pinchflat/notifications/command_runner.ex

@@ -1,4 +1,4 @@
-defmodule Pinchflat.Lifecycle.Notifications.CommandRunner do
+defmodule Pinchflat.Notifications.CommandRunner do
   @moduledoc """
   Runs apprise commands using the `System.cmd/3` function
   """
@@ -7,7 +7,7 @@ defmodule Pinchflat.Lifecycle.Notifications.CommandRunner do
 
   alias Pinchflat.Utils.CliUtils
   alias Pinchflat.Utils.FunctionUtils
-  alias Pinchflat.Lifecycle.Notifications.AppriseCommandRunner
+  alias Pinchflat.Notifications.AppriseCommandRunner
 
   @behaviour AppriseCommandRunner
 
@@ -28,9 +28,11 @@ defmodule Pinchflat.Lifecycle.Notifications.CommandRunner do
     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] called with: #{Enum.join(parsed_opts ++ endpoints, " ")}")
+    {output, return_code} = System.cmd(backend_executable(), parsed_opts ++ endpoints)
+    Logger.info("[apprise] response: #{output}")
 
-    case exit_code do
+    case return_code do
       0 -> {:ok, String.trim(output)}
       _ -> {:error, String.trim(output)}
     end
@@ -43,7 +45,7 @@ defmodule Pinchflat.Lifecycle.Notifications.CommandRunner do
   """
   @impl AppriseCommandRunner
   def version do
-    case CliUtils.wrap_cmd(backend_executable(), ["--version"]) do
+    case System.cmd(backend_executable(), ["--version"]) do
       {output, 0} ->
         output
         |> String.split(~r{\r?\n})

lib/pinchflat/notifications/source_notifications.ex

@@ -1,13 +1,12 @@
-defmodule Pinchflat.Lifecycle.Notifications.SourceNotifications do
+defmodule Pinchflat.Notifications.SourceNotifications do
   @moduledoc """
   Contains utilities for sending notifications about sources
   """
 
   require Logger
 
-  use Pinchflat.Media.MediaQuery
-
   alias Pinchflat.Repo
+  alias Pinchflat.Media.MediaQuery
 
   @doc """
   Wraps a function that may change the number of pending  or downloaded
@@ -54,23 +53,20 @@ defmodule Pinchflat.Lifecycle.Notifications.SourceNotifications do
   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.require_assoc(:media_profile)
+    |> MediaQuery.for_source(source)
-    |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.pending()))
+    |> MediaQuery.where_pending_download()
     |> Repo.aggregate(:count)
   end
 
   defp downloaded_media_item_count(source) do
     MediaQuery.new()
-    |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.downloaded()))
+    |> MediaQuery.for_source(source)
+    |> MediaQuery.with_media_filepath()
     |> Repo.aggregate(:count)
   end
 

lib/pinchflat/podcasts/podcast_helpers.ex

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

lib/pinchflat/podcasts/rss_feed_builder.ex

@@ -7,6 +7,7 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
 
   import Pinchflat.Utils.XmlUtils, only: [safe: 1]
 
+  alias Pinchflat.Utils.DatetimeUtils
   alias Pinchflat.Podcasts.PodcastHelpers
   alias PinchflatWeb.Router.Helpers, as: Routes
 
@@ -15,12 +16,12 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
   Only MediaItems that have been persisted will be included in the feed.
 
   ## Options:
-    - `:limit` - The maximum number of media items to include in the feed. Defaults to 2,000.
+    - `:limit` - The maximum number of media items to include in the feed. Defaults to 300.
 
   Returns an XML document as a string.
   """
   def build(source, opts \\ []) do
-    limit = Keyword.get(opts, :limit, 2_000)
+    limit = Keyword.get(opts, :limit, 300)
     url_base = Keyword.get(opts, :url_base, PinchflatWeb.Endpoint.url())
 
     media_items = PodcastHelpers.persisted_media_items_for(source, limit: limit)
@@ -74,15 +75,13 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
   end
 
   defp build_media_item_xml(source, media_item, url_base) do
-    item_image_path = item_image_path(url_base, media_item)
-
     """
     <item>
       <guid isPermaLink="false">#{media_item.uuid}</guid>
       <title>#{safe(media_item.title)}</title>
       <link>#{safe(media_item.original_url)}</link>
       <description>#{safe(media_item.description)}</description>
-      <pubDate>#{Calendar.strftime(media_item.uploaded_at, @datetime_format)}</pubDate>
+      <pubDate>#{generate_upload_date(media_item)}</pubDate>
       <itunes:duration>#{media_item.duration_seconds}</itunes:duration>
       <enclosure
         url="#{media_stream_path(url_base, media_item)}"
@@ -92,10 +91,6 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
       <itunes:author>#{safe(source.custom_name)}</itunes:author>
       <itunes:subtitle>#{safe(media_item.title)}</itunes:subtitle>
       <itunes:summary><![CDATA[#{media_item.description}]]></itunes:summary>
-
-      #{item_image_path && ~s(<itunes:image href="#{safe(item_image_path)}"></itunes:image>)}
-      #{item_image_path && ~s(<podcast:images srcset="#{safe(item_image_path)}" />)}
-
       <itunes:explicit>false</itunes:explicit>
     </item>
     """
@@ -122,14 +117,10 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
     end
   end
 
-  def item_image_path(url_base, media_item) do
+  defp generate_upload_date(media_item) do
-    if media_item.thumbnail_filepath && File.exists?(media_item.thumbnail_filepath) do
+    media_item.upload_date
-      extension = Path.extname(media_item.thumbnail_filepath)
+    |> DatetimeUtils.date_to_datetime()
-
+    |> Calendar.strftime(@datetime_format)
-      Path.join(url_base, "#{podcast_route(:episode_image, media_item.uuid)}#{extension}")
-    else
-      nil
-    end
   end
 
   defp podcast_route(action, params) do

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(
@@ -63,7 +62,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(4320p 2160p 1080p 720p 480p 360p audio)a, default: :"1080p"
+    field :preferred_resolution, Ecto.Enum, values: ~w(2160p 1080p 720p 480p 360p audio)a, default: :"1080p"
 
     has_many :sources, Source
 
@@ -81,21 +80,7 @@ defmodule Pinchflat.Profiles.MediaProfile do
     |> unique_constraint(:name)
   end
 
-  @doc false
+  defp ext_regex do
-  def ext_regex do
     ~r/\.({{ ?ext ?}}|%\( ?ext ?\)[sS])$/
   end
-
-  @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

@@ -26,17 +26,14 @@ defmodule Pinchflat.Release do
     load_app()
 
     directories =
-      [
+      Enum.uniq([
         "/config",
         "/downloads",
         Application.get_env(:pinchflat, :media_directory),
         Application.get_env(:pinchflat, :tmpfile_directory),
         Application.get_env(:pinchflat, :extras_directory),
-        Application.get_env(:pinchflat, :metadata_directory),
+        Application.get_env(:pinchflat, :metadata_directory)
-        Application.get_env(:tzdata, :data_dir)
+      ])
-      ]
-      |> Enum.uniq()
-      |> Enum.filter(&(&1 != nil))
 
     Enum.each(directories, fn dir ->
       Logger.info("Checking permissions for #{dir}")

lib/pinchflat/settings/setting.ex

@@ -11,17 +11,12 @@ defmodule Pinchflat.Settings.Setting do
     :pro_enabled,
     :yt_dlp_version,
     :apprise_version,
-    :apprise_server,
+    :apprise_server
-    :video_codec_preference,
-    :audio_codec_preference,
-    :youtube_api_key
   ]
 
   @required_fields ~w(
     onboarding
     pro_enabled
-    video_codec_preference
-    audio_codec_preference
   )a
 
   schema "settings" do
@@ -30,10 +25,6 @@ defmodule Pinchflat.Settings.Setting do
     field :yt_dlp_version, :string
     field :apprise_version, :string
     field :apprise_server, :string
-    field :youtube_api_key, :string
-
-    field :video_codec_preference, :string
-    field :audio_codec_preference, :string
   end
 
   @doc false

lib/pinchflat/slow_indexing/media_collection_indexing_worker.ex

@@ -4,7 +4,7 @@ defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorker do
   use Oban.Worker,
     queue: :media_collection_indexing,
     unique: [period: :infinity, states: [:available, :scheduled, :retryable]],
-    tags: ["media_source", "media_collection_indexing", "show_in_dashboard"]
+    tags: ["media_source", "media_collection_indexing"]
 
   require Logger
 
@@ -15,7 +15,7 @@ defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorker do
   alias Pinchflat.Sources.Source
   alias Pinchflat.FastIndexing.FastIndexingWorker
   alias Pinchflat.SlowIndexing.SlowIndexingHelpers
-  alias Pinchflat.Lifecycle.Notifications.SourceNotifications
+  alias Pinchflat.Notifications.SourceNotifications
 
   @doc """
   Starts the source slow indexing worker and creates a task for the source.
@@ -61,8 +61,9 @@ defmodule Pinchflat.SlowIndexing.MediaCollectionIndexingWorker do
     5. If the source uses fast indexing, that job is kicked off as well. It
        uses RSS to run a smaller, faster, and more frequent index. That job
        handles rescheduling itself but largely has a similar behaviour to this
-       job in that it runs and index and maybe kicks off media download jobs.
+       job in that it kicks off index and maybe download jobs. The biggest difference
-       Check out `FastIndexingWorker` comments for more.
+       is that an index job is kicked off _for each new media item_ as opposed
+       to one larger index job. Check out `MediaIndexingWorker` comments for more.
     6. If the job reschedules, the cycle from step 3 repeats until the heat death
        of the universe. The user changing things like the index frequency can
        dequeue or reschedule jobs as well

lib/pinchflat/slow_indexing/slow_indexing_helpers.ex

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

lib/pinchflat/sources/source.ex

@@ -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
@@ -34,7 +32,6 @@ defmodule Pinchflat.Sources.Source do
     retention_period_days
     title_filter_regex
     media_profile_id
-    output_path_template_override
   )a
 
   # Expensive API calls are made when a source is inserted/updated so
@@ -79,7 +76,6 @@ defmodule Pinchflat.Sources.Source do
     field :retention_period_days, :integer
     field :original_url, :string
     field :title_filter_regex, :string
-    field :output_path_template_override, :string
 
     field :series_directory, :string
     field :nfo_filepath, :string
@@ -112,11 +108,7 @@ defmodule Pinchflat.Sources.Source do
     |> dynamic_default(:custom_name, fn cs -> get_field(cs, :collection_name) end)
     |> dynamic_default(:uuid, fn _ -> Ecto.UUID.generate() end)
     |> validate_required(required_fields)
-    |> validate_title_regex()
     |> 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 }}")
-    |> validate_format(:original_url, youtube_channel_or_playlist_regex(), message: "must be a channel or playlist URL")
     |> cast_assoc(:metadata, with: &SourceMetadata.changeset/2, required: false)
     |> unique_constraint([:collection_id, :media_profile_id, :title_filter_regex], error_key: :original_url)
   end
@@ -130,41 +122,11 @@ defmodule Pinchflat.Sources.Source do
   @doc false
   def fast_index_frequency do
     # minutes
-    10
+    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
-
-  def youtube_channel_or_playlist_regex do
-    # Validate that the original URL is not a video URL
-    # Also matches if the string does NOT contain youtube.com or youtu.be. This preserves my tenuous support
-    # for non-youtube sources.
-    ~r<^(?:(?!youtube\.com/(watch|shorts|embed)|youtu\.be).)*$>
-  end
-
-  defp validate_title_regex(%{changes: %{title_filter_regex: regex}} = changeset) when is_binary(regex) do
-    case Ecto.Adapters.SQL.query(Repo, "SELECT regexp_like('', ?)", [regex]) do
-      {:ok, _} -> changeset
-      _ -> add_error(changeset, :title_filter_regex, "is invalid")
-    end
-  end
-
-  defp validate_title_regex(changeset), do: changeset
-
-  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,12 +4,12 @@ defmodule Pinchflat.Sources do
   """
 
   import Ecto.Query, warn: false
-  use Pinchflat.Media.MediaQuery
-
   alias Pinchflat.Repo
+
   alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
+  alias Pinchflat.Media.MediaQuery
   alias Pinchflat.Profiles.MediaProfile
   alias Pinchflat.YtDlp.MediaCollection
   alias Pinchflat.Metadata.SourceMetadata
@@ -19,19 +19,6 @@ defmodule Pinchflat.Sources do
   alias Pinchflat.SlowIndexing.SlowIndexingHelpers
   alias Pinchflat.Metadata.SourceMetadataStorageWorker
 
-  @doc """
-  Returns the relevant output path template for a source.
-  Pulls from the source's override if present, otherwise uses the media profile's.
-
-  Returns binary()
-  """
-  def output_path_template(source) do
-    source = Repo.preload(source, :media_profile)
-    media_profile = source.media_profile
-
-    source.output_path_template_override || media_profile.output_path_template
-  end
-
   @doc """
   Returns the list of sources. Returns [%Source{}, ...]
   """
@@ -127,7 +114,7 @@ defmodule Pinchflat.Sources do
     Tasks.delete_tasks_for(source)
 
     MediaQuery.new()
-    |> where(^MediaQuery.for_source(source))
+    |> MediaQuery.for_source(source)
     |> Repo.all()
     |> Enum.each(fn media_item ->
       Media.delete_media_item(media_item, delete_files: delete_files)
@@ -237,7 +224,7 @@ defmodule Pinchflat.Sources do
         if run_post_commit_tasks do
           maybe_handle_media_tasks(changeset, source)
           maybe_run_indexing_task(changeset, source)
-          maybe_run_metadata_storage_task(changeset, source)
+          run_metadata_storage_task(source)
         end
 
         {:ok, source}
@@ -276,20 +263,9 @@ defmodule Pinchflat.Sources do
     end
   end
 
-  defp maybe_run_metadata_storage_task(changeset, source) do
+  # This runs every time to pick up any changes to the metadata
-    case {changeset.data, changeset.changes} do
+  defp run_metadata_storage_task(source) do
-      # If the changeset is new (not persisted), fetch metadata no matter what
-      {%{__meta__: %{state: :built}}, _} ->
     SourceMetadataStorageWorker.kickoff_with_task(source)
-
-      # If the record has been persisted, only fetch metadata if the
-      # original_url has changed
-      {_, %{original_url: _}} ->
-        SourceMetadataStorageWorker.kickoff_with_task(source)
-
-      _ ->
-        :ok
-    end
   end
 
   defp maybe_update_slow_indexing_task(changeset, source) do
@@ -299,6 +275,7 @@ defmodule Pinchflat.Sources do
 
       %{index_frequency_minutes: _} ->
         Tasks.delete_pending_tasks_for(source, "FastIndexingWorker")
+        Tasks.delete_pending_tasks_for(source, "MediaIndexingWorker")
         Tasks.delete_pending_tasks_for(source, "MediaCollectionIndexingWorker")
 
       _ ->

lib/pinchflat/sources/sources_query.ex

@@ -12,26 +12,20 @@ defmodule Pinchflat.Sources.SourcesQuery do
 
   alias Pinchflat.Sources.Source
 
-  # This allows the module to be aliased and query methods to be used
+  # Prefixes:
-  # all in one go
+  # - for_* - belonging to a certain record
-  # usage: use Pinchflat.Sources.SourcesQuery
+  # - join_* - for joining on a certain record
-  defmacro __using__(_opts) do
+  # - with_* - for filtering based on full, concrete attributes
-    quote do
+  # - matching_* - for filtering based on partial attributes (e.g. LIKE, regex, full-text search)
-      import Ecto.Query, warn: false
+  #
-
+  # Suffixes:
-      alias unquote(__MODULE__)
+  # - _for - the arg passed is an association record
-    end
-  end
 
   def new do
     Source
   end
 
-  def for_media_profile(media_profile_id) when is_integer(media_profile_id) do
+  def for_media_profile(query, media_profile) do
-    dynamic([s], s.media_profile_id == ^media_profile_id)
+    where(query, [s], s.media_profile_id == ^media_profile.id)
-  end
-
-  def for_media_profile(media_profile) do
-    dynamic([s], s.media_profile_id == ^media_profile.id)
   end
 end

lib/pinchflat/tasks/tasks_query.ex

@@ -1,45 +0,0 @@
-defmodule Pinchflat.Tasks.TasksQuery do
-  @moduledoc """
-  Query helpers for the Tasks 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.Tasks.Task
-
-  # This allows the module to be aliased and query methods to be used
-  # all in one go
-  # usage: use Pinchflat.Tasks.TasksQuery
-  defmacro __using__(_opts) do
-    quote do
-      import Ecto.Query, warn: false
-
-      alias unquote(__MODULE__)
-    end
-  end
-
-  def new do
-    Task
-  end
-
-  def join_job(query) do
-    query
-    |> join(:left, [t], j in assoc(t, :job))
-    |> preload([t, j], job: j)
-  end
-
-  def in_state(states) when is_list(states) do
-    dynamic([t, j], j.state in ^states)
-  end
-
-  def in_state(state), do: in_state([state])
-
-  def has_tag(tag) do
-    dynamic([t, j], ^tag in j.tags)
-  end
-end

lib/pinchflat/utils/cli_utils.ex

@@ -3,38 +3,8 @@ defmodule Pinchflat.Utils.CliUtils do
   Utility methods for working with CLI executables
   """
 
-  require Logger
-
   alias Pinchflat.Utils.StringUtils
 
-  @doc """
-  Wraps a command in a shell script that will terminate
-  the command if stdin is closed. Useful for stopping
-  commands if the job runner is cancelled.
-
-  Delegates to `System.cmd/3` and any options/output
-  are passed through. Custom options can be passed in.
-
-  Custom options:
-    - logging_arg_override: if set, the passed value will be logged in place of
-      the actual arguments passed to the command
-
-  Returns {binary(), integer()}
-  """
-  def wrap_cmd(command, args, passthrough_opts \\ [], opts \\ []) do
-    wrapper_command = Path.join(:code.priv_dir(:pinchflat), "cmd_wrapper.sh")
-    actual_command = [command] ++ args
-    command_opts = set_command_opts() ++ passthrough_opts
-    logging_arg_override = Keyword.get(opts, :logging_arg_override, Enum.join(args, " "))
-
-    Logger.info("[command_wrapper]: #{command} called with: #{logging_arg_override}")
-
-    {output, status} = System.cmd(wrapper_command, actual_command, command_opts)
-    log_cmd_result(command, logging_arg_override, status, output)
-
-    {output, status}
-  end
-
   @doc """
   Parses a list of command options into a list of strings suitable for passing to
   `System.cmd/3`.
@@ -75,20 +45,4 @@ defmodule Pinchflat.Utils.CliUtils do
   defp parse_option(arg, acc) when is_binary(arg) do
     acc ++ [arg]
   end
-
-  defp log_cmd_result(command, logging_arg_override, status, output) do
-    log_message = "[command_wrapper]: #{command} called with: #{logging_arg_override} exited: #{status} with: #{output}"
-    log_level = if status == 0, do: :debug, else: :error
-
-    Logger.log(log_level, log_message)
-  end
-
-  defp set_command_opts do
-    # This resolves an issue where yt-dlp would attempt to write to a read-only directory
-    # if you scanned a new video with `--windows-filenames` enabled. Hopefully can be removed
-    # in the future.
-    [
-      cd: Application.get_env(:pinchflat, :tmpfile_directory)
-    ]
-  end
 end

lib/pinchflat/utils/datetime_utils.ex

@@ -0,0 +1,17 @@
+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/filesystem_utils.ex

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

lib/pinchflat/utils/number_utils.ex

@@ -1,39 +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
-
-  @doc """
-  Converts a number to a human readable byte size. Can take a precision
-  option to specify the number of decimal places to round to.
-
-  Returns {integer(), String.t()}
-  """
-  def human_byte_size(number, opts \\ [])
-  def human_byte_size(nil, opts), do: human_byte_size(0, opts)
-
-  def human_byte_size(number, opts) do
-    precision = Keyword.get(opts, :precision, 2)
-    suffixes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
-    base = 1024
-
-    Enum.reduce_while(suffixes, {number / 1.0, "B"}, fn suffix, {value, _} ->
-      if value < base do
-        {:halt, {Float.round(value, precision), suffix}}
-      else
-        {:cont, {value / base, suffix}}
-      end
-    end)
-  end
-end

lib/pinchflat/yt_dlp/command_runner.ex

@@ -3,6 +3,8 @@ defmodule Pinchflat.YtDlp.CommandRunner do
   Runs yt-dlp commands using the `System.cmd/3` function
   """
 
+  require Logger
+
   alias Pinchflat.Utils.CliUtils
   alias Pinchflat.YtDlp.YtDlpCommandRunner
   alias Pinchflat.Utils.FilesystemUtils, as: FSUtils
@@ -28,12 +30,14 @@ defmodule Pinchflat.YtDlp.CommandRunner do
 
     output_filepath = generate_output_filepath(addl_opts)
     print_to_file_opts = [{:print_to_file, output_template}, output_filepath]
-    user_configured_opts = cookie_file_options()
+    external_file_opts = build_external_file_options()
     # These must stay in exactly this order, hence why I'm giving it its own variable.
-    all_opts = command_opts ++ print_to_file_opts ++ user_configured_opts ++ global_options()
+    all_opts = command_opts ++ print_to_file_opts ++ external_file_opts
-    formatted_command_opts = [url] ++ CliUtils.parse_options(all_opts)
 
-    case CliUtils.wrap_cmd(command, formatted_command_opts, stderr_to_stdout: true) do
+    formatted_command_opts = [url] ++ CliUtils.parse_options(all_opts)
+    Logger.info("[yt-dlp] called with: #{Enum.join(formatted_command_opts, " ")}")
+
+    case System.cmd(command, formatted_command_opts, stderr_to_stdout: true) do
       {_, 0} ->
         # IDEA: consider deleting the file after reading it. It's in the tmp dir, so it's not
         # a huge deal, but it's still a good idea to clean up after ourselves.
@@ -54,7 +58,7 @@ defmodule Pinchflat.YtDlp.CommandRunner do
   def version do
     command = backend_executable()
 
-    case CliUtils.wrap_cmd(command, ["--version"]) do
+    case System.cmd(command, ["--version"]) do
       {output, 0} ->
         {:ok, String.trim(output)}
 
@@ -70,26 +74,24 @@ defmodule Pinchflat.YtDlp.CommandRunner do
     end
   end
 
-  defp global_options do
+  defp build_external_file_options do
-    [
-      :windows_filenames,
-      :quiet,
-      cache_dir: Path.join(Application.get_env(:pinchflat, :tmpfile_directory), "yt-dlp-cache")
-    ]
-  end
-
-  defp cookie_file_options do
     base_dir = Application.get_env(:pinchflat, :extras_directory)
     filename_options_map = %{cookies: "cookies.txt"}
 
     Enum.reduce(filename_options_map, [], fn {opt_name, filename}, acc ->
       filepath = Path.join(base_dir, filename)
 
-      if FSUtils.exists_and_nonempty?(filepath) do
+      case File.read(filepath) do
+        {:ok, file_data} ->
+          if String.trim(file_data) != "" do
             [{opt_name, filepath} | acc]
           else
             acc
           end
+
+        {:error, _} ->
+          acc
+      end
     end)
   end
 

lib/pinchflat/yt_dlp/media.ex

@@ -10,7 +10,7 @@ defmodule Pinchflat.YtDlp.Media do
     :original_url,
     :livestream,
     :short_form_content,
-    :uploaded_at,
+    :upload_date,
     :duration_seconds
   ]
 
@@ -21,9 +21,8 @@ defmodule Pinchflat.YtDlp.Media do
     :original_url,
     :livestream,
     :short_form_content,
-    :uploaded_at,
+    :upload_date,
-    :duration_seconds,
+    :duration_seconds
-    :playlist_index
   ]
 
   alias __MODULE__
@@ -47,24 +46,10 @@ defmodule Pinchflat.YtDlp.Media do
     end
   end
 
-  @doc """
-  Downloads a thumbnail for a single piece of media. Usually used for
-  downloading thumbnails for internal use
-
-  Returns {:ok, ""} | {:error, any, ...}.
-  """
-  def download_thumbnail(url, command_opts \\ []) do
-    opts = [:no_simulate, :skip_download, :write_thumbnail, convert_thumbnail: "jpg"] ++ command_opts
-
-    # NOTE: it doesn't seem like this command actually returns anything in `after_move` since
-    # we aren't downloading the main media file
-    backend_runner().run(url, opts, "after_move:%()j")
-  end
-
   @doc """
   Returns a map representing the media at the given URL.
 
-  Returns {:ok, %Media{}} | {:error, any, ...}.
+  Returns {:ok, [map()]} | {:error, any, ...}.
   """
   def get_media_attributes(url) do
     runner = Application.get_env(:pinchflat, :yt_dlp_runner)
@@ -78,18 +63,16 @@ defmodule Pinchflat.YtDlp.Media do
         |> response_to_struct()
         |> FunctionUtils.wrap_ok()
 
-      err ->
+      res ->
-        err
+        res
     end
   end
 
   @doc """
   Returns the output template for yt-dlp's indexing command.
-
-  NOTE: playlist_index is really only useful for playlists that will never change their order.
   """
   def indexing_output_template do
-    "%(.{id,title,was_live,webpage_url,description,aspect_ratio,duration,upload_date,timestamp,playlist_index})j"
+    "%(.{id,title,was_live,webpage_url,description,aspect_ratio,duration,upload_date})j"
   end
 
   @doc """
@@ -104,11 +87,10 @@ 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),
-      uploaded_at: response["upload_date"] && parse_uploaded_at(response),
+      upload_date: response["upload_date"] && MetadataFileHelpers.parse_upload_date(response["upload_date"])
-      playlist_index: response["playlist_index"] || 0
     }
   end
 
@@ -128,18 +110,6 @@ defmodule Pinchflat.YtDlp.Media do
     end
   end
 
-  defp parse_uploaded_at(%{"timestamp" => ts} = response) when is_number(ts) do
-    case DateTime.from_unix(ts) do
-      {:ok, datetime} -> datetime
-      _ -> MetadataFileHelpers.parse_upload_date(response["upload_date"])
-    end
-  end
-
-  # This field is needed before inserting into the database, but absence
-  # of this field should fail at insert-time rather than here
-  defp parse_uploaded_at(%{"upload_date" => nil}), do: nil
-  defp parse_uploaded_at(response), do: MetadataFileHelpers.parse_upload_date(response["upload_date"])
-
   defp backend_runner do
     # This approach lets us mock the command for testing
     Application.get_env(:pinchflat, :yt_dlp_runner)

lib/pinchflat/yt_dlp/media_collection.ex

@@ -24,7 +24,7 @@ defmodule Pinchflat.YtDlp.MediaCollection do
     # `ignore_no_formats_error` is necessary because yt-dlp will error out if
     # the first video has not released yet (ie: is a premier). We don't care about
     # available formats since we're just getting the media details
-    command_opts = [:simulate, :skip_download, :ignore_no_formats_error, :no_warnings]
+    command_opts = [:simulate, :skip_download, :ignore_no_formats_error]
     output_template = YtDlpMedia.indexing_output_template()
     output_filepath = FilesystemUtils.generate_metadata_tmpfile(:json)
     file_listener_handler = Keyword.get(addl_opts, :file_listener_handler, false)
@@ -50,8 +50,8 @@ defmodule Pinchflat.YtDlp.MediaCollection do
 
         {:ok, Enum.filter(parsed_lines, &(&1 != nil))}
 
-      err ->
+      res ->
-        err
+        res
     end
   end
 
@@ -68,14 +68,7 @@ defmodule Pinchflat.YtDlp.MediaCollection do
     # `ignore_no_formats_error` is necessary because yt-dlp will error out if
     # the first video has not released yet (ie: is a premier). We don't care about
     # available formats since we're just getting the source details
-    default_opts = [
+    command_opts = [:simulate, :skip_download, :ignore_no_formats_error, playlist_end: 1] ++ addl_opts
-      :simulate,
-      :skip_download,
-      :ignore_no_formats_error,
-      playlist_end: 1
-    ]
-
-    command_opts = default_opts ++ addl_opts
     output_template = "%(.{channel,channel_id,playlist_id,playlist_title,filename})j"
 
     with {:ok, output} <- backend_runner().run(source_url, command_opts, output_template),
@@ -99,21 +92,10 @@ defmodule Pinchflat.YtDlp.MediaCollection do
   as a compressed blob for possible future use. That's why it's not getting formatted like
   `get_source_details/1`
 
-  ! IMPORTANT ! - you'll always want to set `playlist_items: int` in `addl_opts.
-  This is great if you want to also return details about the videos in the playlists,
-  but it should be set in all cases to not over-fetch data.
-  For channels you should usually set this to 0 since channels return all the
-  metadata we need without needing to fetch the videos. On the other hand, playlists
-  don't return very useful images so you can set this to 1 to get the first video's
-  images, for instance.
-
   Returns {:ok, map()} | {:error, any, ...}.
   """
-  def get_source_metadata(source_url, addl_opts \\ [playlist_items: 0]) do
+  def get_source_metadata(source_url, addl_opts \\ []) do
-    # This only validates that the `playlist_items` key is present. It's otherwise unused
+    opts = [playlist_items: 0] ++ addl_opts
-    _playlist_items = Keyword.fetch!(addl_opts, :playlist_items)
-
-    opts = [:skip_download] ++ addl_opts
     output_template = "playlist:%()j"
 
     with {:ok, output} <- backend_runner().run(source_url, opts, output_template),

lib/pinchflat_web/components/core_components.ex

@@ -267,7 +267,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
@@ -426,23 +425,20 @@ 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) %>
-      </div>
       <.help :if={@help}><%= if @html_help, do: Phoenix.HTML.raw(@help), else: @help %></.help>
       <.error :for={msg <- @errors}><%= msg %></.error>
     </div>
@@ -642,15 +638,9 @@ defmodule PinchflatWeb.CoreComponents do
 
     ~H"""
     <ul>
-      <li :for={{k, v} <- @iterable_attributes} class="mb-2 w-2/3">
+      <li :for={{k, v} <- @iterable_attributes} class="mb-2">
         <strong><%= k %>:</strong>
-        <code class="inline-block text-sm font-mono text-gray p-0.5 mx-0.5">
+        <TextComponents.inline_code><%= v %></TextComponents.inline_code>
-          <%= if is_binary(v) && URI.parse(v).scheme && URI.parse(v).scheme =~ "http" do %>
-            <TextComponents.inline_link href={v}><%= v %></TextComponents.inline_link>
-          <% else %>
-            <%= v %>
-          <% end %>
-        </code>
       </li>
     </ul>
     """

lib/pinchflat_web/components/custom_components/button_components.ex

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

lib/pinchflat_web/components/custom_components/tab_components.ex

@@ -6,32 +6,25 @@ defmodule PinchflatWeb.CustomComponents.TabComponents do
   Takes a list of tabs and renders them in a tabbed layout.
   """
   slot :tab, required: true do
-    attr :id, :string, required: true
     attr :title, :string, required: true
   end
 
   slot :tab_append, required: false
 
   def tabbed_layout(assigns) do
-    assigns = Map.put(assigns, :first_tab_id, hd(assigns.tab).id)
-
     ~H"""
     <div
-      x-data={"{
+      x-data="{ openTab: getTabIndex(0), activeClasses: 'text-meta-5 border-meta-5', inactiveClasses: 'border-transparent' }"
-        openTab: getTabFromHash('#{@first_tab_id}', '#{@first_tab_id}'),
+      @hashchange.window="openTab = getTabIndex(openTab)"
-        activeClasses: 'text-meta-5 border-meta-5',
-        inactiveClasses: 'border-transparent'
-      }"}
-      @hashchange.window={"openTab = getTabFromHash(openTab, '#{@first_tab_id}')"}
       class="w-full"
     >
       <header class="flex flex-col md:flex-row md:justify-between border-b border-strokedark">
         <div class="flex flex-wrap gap-5 sm:gap-10">
           <a
-            :for={tab <- @tab}
+            :for={{tab, idx} <- Enum.with_index(@tab)}
             href="#"
-            @click.prevent={"openTab = setTabByName('#{tab.id}')"}
+            @click.prevent={"openTab = setTabIndex(#{idx})"}
-            x-bind:class={"openTab === '#{tab.id}' ? activeClasses : inactiveClasses"}
+            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"
           >
             <span class="text-xl"><%= tab.title %></span>
@@ -42,7 +35,7 @@ defmodule PinchflatWeb.CustomComponents.TabComponents do
         </div>
       </header>
       <div class="mt-4 min-h-60">
-        <div :for={tab <- @tab} x-show={"openTab === '#{tab.id}'"} class="font-medium leading-relaxed">
+        <div :for={{tab, idx} <- Enum.with_index(@tab)} x-show={"openTab === #{idx}"} class="font-medium leading-relaxed">
           <%= render_slot(tab) %>
         </div>
       </div>

lib/pinchflat_web/components/custom_components/table_components.ex

@@ -2,9 +2,6 @@ defmodule PinchflatWeb.CustomComponents.TableComponents do
   @moduledoc false
   use Phoenix.Component
 
-  import PinchflatWeb.CoreComponents
-  import PinchflatWeb.CustomComponents.TextComponents
-
   @doc """
   Renders a table component with the given rows and columns.
 
@@ -28,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="hover:bg-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]
             ]}
           >
@@ -52,54 +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"
-          >
-            <.icon name="hero-chevron-left" />
-          </span>
-        </li>
-        <li>
-          <span class="mx-2">
-            Page <.localized_number number={@page_number} /> of <.localized_number number={@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"
-          >
-            <.icon name="hero-chevron-right" />
-          </span>
-        </li>
-      </ul>
-    </nav>
-    """
-  end
 end

lib/pinchflat_web/components/custom_components/text_components.ex

@@ -35,12 +35,11 @@ defmodule PinchflatWeb.CustomComponents.TextComponents do
   Renders a subtle link with the given href and content.
   """
   attr :href, :string, required: true
-  attr :target, :string, default: "_self"
   slot :inner_block
 
   def subtle_link(assigns) do
     ~H"""
-    <.link href={@href} target={@target} class="underline decoration-bodydark decoration-1 hover:decoration-white">
+    <.link href={@href} class="underline decoration-bodydark decoration-1 hover:decoration-white">
       <%= render_slot(@inner_block) %>
     </.link>
     """
@@ -60,62 +59,4 @@ defmodule PinchflatWeb.CustomComponents.TextComponents do
     </.link>
     """
   end
-
-  @doc """
-  Renders a block of text with each line broken into a separate span.
-  """
-  attr :text, :string, required: true
-
-  def break_on_newline(assigns) do
-    broken_text =
-      assigns.text
-      |> String.split("\n", trim: false)
-      |> Enum.intersperse(Phoenix.HTML.Tag.tag(:span, class: "inline-block mt-2"))
-
-    assigns = Map.put(assigns, :text, broken_text)
-
-    ~H"""
-    <span><%= @text %></span>
-    """
-  end
-
-  @doc """
-  Renders a UTC datetime in the specified format and timezone
-  """
-  attr :datetime, :any, required: true
-  attr :format, :string, default: "%Y-%m-%d %H:%M:%S"
-  attr :timezone, :string, default: nil
-
-  def datetime_in_zone(assigns) do
-    timezone = assigns.timezone || Application.get_env(:pinchflat, :timezone)
-    assigns = Map.put(assigns, :timezone, timezone)
-
-    ~H"""
-    <time><%= Calendar.strftime(Timex.Timezone.convert(@datetime, @timezone), @format) %></time>
-    """
-  end
-
-  @doc """
-  Renders a localized number using the Intl.NumberFormat API, falling back to the raw number if needed
-  """
-  attr :number, :any, required: true
-
-  def localized_number(assigns) do
-    ~H"""
-    <span x-data x-text={"Intl.NumberFormat().format(#{@number})"}><%= @number %></span>
-    """
-  end
-
-  @doc """
-  Renders a word with a suffix if the count is not 1
-  """
-  attr :word, :string, required: true
-  attr :count, :integer, required: true
-  attr :suffix, :string, default: "s"
-
-  def pluralize(assigns) do
-    ~H"""
-    <%= @word %><%= if @count == 1, do: "", else: @suffix %>
-    """
-  end
 end

lib/pinchflat_web/components/layouts.ex

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-<header class="sticky top-0 z-999 flex min-h-20 w-full bg-white drop-shadow-1 dark:bg-boxdark dark:drop-shadow-none">
+<header class="sticky top-0 z-999 flex h-20 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">
       <section class="pr-1">
-        <img src={~p"/images/icon-2024-03-20.png"} alt="Pinchflat" class="w-10" />
+        <img src={~p"/images/icon.png?cachebust=2024-03-20"} alt="Pinchflat" class="w-10" />
       </section>
 
       <button
@@ -22,7 +22,7 @@
             type="text"
             name="q"
             value={@params["q"]}
-            placeholder="Search all media..."
+            placeholder="Type to search..."
             class="w-full bg-transparent pl-9 pr-4 border-0 focus:ring-0 focus:outline-none"
           />
         </form>

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

@@ -9,7 +9,7 @@
   <section>
     <div class="flex items-center justify-between gap-2 px-6 py-4">
       <a href="/" class="flex items-center">
-        <img src={~p"/images/logo-2024-03-20.png"} alt="Pinchflat" class="w-auto" />
+        <img src={~p"/images/logo.png?cachebust=2024-03-20"} alt="Pinchflat" class="w-auto" />
       </a>
 
       <button class="block mt-3 lg:hidden" @click.stop="sidebarVisible = !sidebarVisible">
@@ -18,22 +18,13 @@
     </div>
     <div class="no-scrollbar flex flex-col overflow-y-auto duration-300 ease-linear">
       <nav class="mt-3 px-4 py-4 lg:px-6">
-        <h3 class="mb-4 ml-4 text-sm font-medium text-bodydark2">
+        <h3 class="mb-4 ml-4 text-sm font-medium text-bodydark2">MENU</h3>
-          <span>MENU</span>
-        </h3>
         <div class="flex flex-col justify-between">
           <ul class="mb-6 flex flex-col gap-1.5">
             <.sidebar_item icon="hero-home" text="Home" href={~p"/"} />
             <.sidebar_item icon="hero-tv" text="Sources" href={~p"/sources"} />
             <.sidebar_item icon="hero-adjustments-vertical" text="Media Profiles" href={~p"/media_profiles"} />
-            <.sidebar_submenu
+            <.sidebar_item icon="hero-cog-6-tooth" text="Settings" href={~p"/settings"} />
-              icon="hero-cog-6-tooth"
-              text="Config"
-              current_path={Phoenix.Controller.current_path(@conn)}
-            >
-              <:submenu text="Settings" href={~p"/settings"} />
-              <:submenu text="App Info" href={~p"/app_info"} />
-            </.sidebar_submenu>
           </ul>
         </div>
       </nav>
@@ -63,22 +54,10 @@
           </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">
+            Pinchflat v<%= Application.spec(:pinchflat)[:vsn] %>
+          </span>
+          <span class="group relative flex items-center gap-2.5 px-4 text-sm">
             yt-dlp <%= Settings.get!(:yt_dlp_version) %>
           </span>
         </li>

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,7 +29,7 @@ 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)
 
       {:noreply, update(socket, :button_disabled, fn _ -> false end)}

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

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

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

@@ -19,7 +19,6 @@
       onboarding: #{Settings.get!(:onboarding)}
     }"}
     class="dark text-bodydark bg-boxdark-2"
-    data-socket-path={Path.join(Application.get_env(:pinchflat, :base_route_path), "/live")}
   >
     <%= @inner_content %>
 

lib/pinchflat_web/controllers/media_items/media_item_controller.ex

@@ -50,13 +50,7 @@ defmodule PinchflatWeb.MediaItems.MediaItemController do
 
   def force_download(conn, %{"media_item_id" => id}) do
     media_item = Media.get_media_item!(id)
-
+    {:ok, _} = MediaDownloadWorker.kickoff_with_task(media_item, %{force: true})
-    :ok =
-      case MediaDownloadWorker.kickoff_with_task(media_item, %{force: true}) do
-        {:ok, _} -> :ok
-        {:error, :duplicate_job} -> :ok
-        err -> err
-      end
 
     conn
     |> put_flash(:info, "Download task enqueued.")
@@ -85,7 +79,6 @@ defmodule PinchflatWeb.MediaItems.MediaItemController do
           |> 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))
-          |> put_resp_header("content-disposition", "inline; filename=\"#{media_item.title}\"")
           |> send_file(206, media_item.media_filepath, start_pos, length)
 
         {:error, :invalid_range} ->
@@ -93,10 +86,8 @@ defmodule PinchflatWeb.MediaItems.MediaItemController do
 
           conn
           |> put_resp_content_type(mime_type)
-          |> put_resp_header("accept-ranges", "bytes")
-          |> put_resp_header("content-range", "bytes 0-#{file_size - 1}/#{file_size}")
           |> put_resp_header("content-length", to_string(file_size))
-          |> put_resp_header("content-disposition", "inline; filename=\"#{media_item.title}\"")
+          |> put_resp_header("accept-ranges", "bytes")
           |> send_file(200, media_item.media_filepath)
       end
     else

lib/pinchflat_web/controllers/media_items/media_item_html.ex

@@ -18,7 +18,7 @@ defmodule PinchflatWeb.MediaItems.MediaItemHTML do
   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", ".opus"] -> :audio
+      ext when ext in [".mp3", ".m4a"] -> :audio
       _ -> :unknown
     end
   end

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

@@ -1,19 +1,4 @@
 <.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"}

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

@@ -5,7 +5,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_item_form changeset={@changeset} action={~p"/sources/#{@media_item.source_id}/media/#{@media_item}"} />
     </div>

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

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

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

@@ -17,50 +17,32 @@
   </nav>
 </div>
 <div class="rounded-sm border border-stroke bg-white py-5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark px-7.5">
-  <div class="max-w-full">
+  <div class="max-w-full overflow-x-auto">
     <.tabbed_layout>
       <:tab_append>
         <.actions_dropdown media_item={@media_item} />
       </:tab_append>
 
-      <:tab title="Media" id="media">
+      <:tab title="Attributes">
         <div class="flex flex-col gap-10 dark:text-white">
           <%= if media_file_exists?(@media_item) do %>
-            <section class="grid grid-cols-1 xl:grid-cols-2 xl:gap-6 mt-6">
+            <h3 class="font-bold text-xl">Preview</h3>
-              <div>
             <.media_preview media_item={@media_item} />
-              </div>
-              <aside class="mt-4 xl:mt-0">
-                <div>Uploaded: <%= DateTime.to_date(@media_item.uploaded_at) %></div>
-                <div>
-                  <span :if={URI.parse(@media_item.original_url).scheme =~ "http"}>
-                    <.subtle_link href={@media_item.original_url} target="_blank">Open Original</.subtle_link>
-                    <span class="mx-2">or</span>
-                  </span>
-                  <span>
-                    <.subtle_link href={~p"/media/#{@media_item.uuid}/stream"} target="_blank">
-                      Open Local Stream
-                    </.subtle_link>
-                  </span>
-                </div>
-                <div :if={@media_item.description} class="mt-4 text-bodydark">
-                  <.break_on_newline text={@media_item.description} />
-                </div>
-              </aside>
-            </section>
           <% end %>
 
-          <h3 class="font-bold text-xl mt-6">Raw Attributes</h3>
+          <h2 class="font-bold text-2xl"><%= @media_item.title %></h2>
+          <h3 class="font-bold text-xl">Attributes</h3>
           <section>
             <strong>Source:</strong>
             <.subtle_link href={~p"/sources/#{@media_item.source_id}"}>
               <%= @media_item.source.custom_name %>
             </.subtle_link>
-            <.list_items_from_map map={Map.from_struct(@media_item)} />
           </section>
+
+          <.list_items_from_map map={Map.from_struct(@media_item)} />
         </div>
       </:tab>
-      <:tab title="Tasks" id="tasks">
+      <:tab title="Tasks">
         <%= if match?([_|_], @media_item.tasks) do %>
           <.table rows={@media_item.tasks} table_class="text-black dark:text-white">
             <:col :let={task} label="Worker">

lib/pinchflat_web/controllers/media_profiles/media_profile_controller.ex

@@ -1,9 +1,11 @@
 defmodule PinchflatWeb.MediaProfiles.MediaProfileController do
   use PinchflatWeb, :controller
-  use Pinchflat.Sources.SourcesQuery
+
+  import Ecto.Query, warn: false
 
   alias Pinchflat.Repo
   alias Pinchflat.Profiles
+  alias Pinchflat.Sources.SourcesQuery
   alias Pinchflat.Profiles.MediaProfile
 
   def index(conn, _params) do
@@ -41,7 +43,7 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileController do
 
     sources =
       SourcesQuery.new()
-      |> where(^SourcesQuery.for_media_profile(media_profile))
+      |> SourcesQuery.for_media_profile(media_profile)
       |> order_by(asc: :custom_name)
       |> Repo.all()
 

lib/pinchflat_web/controllers/media_profiles/media_profile_html.ex

@@ -23,7 +23,6 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
 
   def friendly_resolution_options do
     [
-      {"8k", "4320p"},
       {"4k", "2160p"},
       {"1080p", "1080p"},
       {"720p", "720p"},
@@ -53,36 +52,18 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
     ]
   end
 
-  def media_center_custom_output_template_options do
+  def custom_output_template_options do
-    %{
-      season_by_year__episode_by_date: "<code>Season YYYY/sYYYYeMMDD</code>",
-      season_by_year__episode_by_date_and_index:
-        "same as the above but it handles dates better. <strong>This is the recommended option</strong>",
-      static_season__episode_by_index:
-        "<code>Season 1/s01eXX</code> where <code>XX</code> is the video's position in the playlist. Only recommended for playlists (not channels) that don't change",
-      static_season__episode_by_date:
-        "<code>Season 1/s01eYYMMDD</code>. Recommended for playlists that might change or where order isn't important"
-    }
-  end
-
-  def other_custom_output_template_options do
     %{
       upload_day: nil,
       upload_month: nil,
       upload_year: nil,
-      upload_yyyy_mm_dd: "the upload date in the format <code>YYYY-MM-DD</code>",
+      upload_yyyy_mm_dd: "the upload date in the format YYYY-MM-DD",
       source_custom_name: "the name of the sources that use this profile",
       source_collection_id: "the YouTube ID of the sources that use this profile",
       source_collection_name:
         "the YouTube name of the sources that use this profile (often the same as source_custom_name)",
       source_collection_type: "the collection type of the sources using this profile. Either 'channel' or 'playlist'",
-      artist_name: "the name of the artist with fallbacks to other uploader fields",
+      artist_name: "the name of the artist with fallbacks to other uploader fields"
-      season_from_date: "alias for upload_year",
-      season_episode_from_date: "the upload date formatted as <code>sYYYYeMMDD</code>",
-      season_episode_index_from_date:
-        "the upload date formatted as <code>sYYYYeMMDDII</code> where <code>II</code> is an index to prevent date collisions",
-      media_playlist_index:
-        "the place of the media item in the playlist. Do not use with channels. May not work if the playlist is updated"
     }
   end
 
@@ -91,6 +72,7 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
       id
       ext
       title
+      fulltitle
       uploader
       channel
       upload_date
@@ -112,7 +94,7 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
   end
 
   defp media_center_output_template do
-    "/shows/{{ source_custom_name }}/{{ season_by_year__episode_by_date_and_index }} - {{ title }}.{{ ext }}"
+    "/shows/{{ source_custom_name }}/Season {{ season_from_date }}/{{ season_episode_from_date }} - {{ title }}.{{ ext }}"
   end
 
   defp audio_output_template do

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

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

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

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

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

@@ -23,8 +23,9 @@
         <:col :let={media_profile} label="Preferred Resolution">
           <%= media_profile.preferred_resolution %>
         </:col>
-        <:col :let={media_profile} label="" class="flex justify-end">
+        <:col :let={media_profile} label="" class="flex place-content-evenly">
-          <.icon_link href={~p"/media_profiles/#{media_profile.id}/edit"} icon="hero-pencil-square" class="mr-4" />
+          <.icon_link href={~p"/media_profiles/#{media_profile.id}"} icon="hero-eye" class="mx-1" />
+          <.icon_link href={~p"/media_profiles/#{media_profile.id}/edit"} icon="hero-pencil-square" class="mx-1" />
         </:col>
       </.table>
     </div>

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

@@ -84,22 +84,22 @@
       />
     </section>
 
+    <section x-data="{ presets: { default: false, media_center: false, audio: false, archiving: false } }">
+      <.input
+        field={f[:download_auto_subs]}
+        type="toggle"
+        label="Download Autogenerated Subtitles"
+        help="Prefers normal subs but will download autogenerated if needed. Requires 'Download Subtitles' to be enabled"
+        x-init="$watch('selectedPreset', p => p && (enabled = presets[p]))"
+      />
+    </section>
+
     <section x-data="{ presets: { default: true, media_center: true, audio: false, archiving: true } }">
       <.input
         field={f[:embed_subs]}
         type="toggle"
         label="Embed Subtitles"
-        help="Downloads and embeds subtitles in the media file itself, if supported. Uneffected by 'Download Subtitles'"
+        help="Downloads and embeds subtitles in the media file itself, if supported. Uneffected by 'Download Subtitles' (recommended)"
-        x-init="$watch('selectedPreset', p => p && (enabled = presets[p]))"
-      />
-    </section>
-
-    <section x-data="{ presets: { default: false, media_center: false, audio: false, archiving: false } }">
-      <.input
-        field={f[:download_auto_subs]}
-        type="toggle"
-        label="Use Autogenerated Subtitles"
-        help="Prefers normal subs with 'Download Subtitles' or 'Embed Subtitles' but will use autogenerated subs if needed."
         x-init="$watch('selectedPreset', p => p && (enabled = presets[p]))"
       />
     </section>
@@ -183,7 +183,7 @@
         options={friendly_format_type_options()}
         type="select"
         label="Include Livestreams"
-        help="How to handle past livestreams"
+        help="Excludes media that comes from a past livestream"
         x-init="$watch('selectedPreset', p => p && ($el.value = presets[p]))"
       />
     </section>

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>