Hooked up script runner for indexing

.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)

.devcontainer/devcontainer.json

@@ -1,12 +0,0 @@
-{
-  "name": "Pinchflat Dev",
-  "dockerComposeFile": "../docker-compose.yml",
-  "service": "phx",
-  "workspaceFolder": "/app",
-  "shutdownAction": "stopCompose",
-  "customizations": {
-    "vscode": {
-      "extensions": ["phoenixframework.phoenix", "JakeBecker.elixir-ls", "esbenp.prettier-vscode"]
-    }
-  }
-}

.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/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
@@ -47,8 +41,7 @@ jobs:
           # All non-release actions will be tagged as `dev` (ie: push, workflow_dispatch)
           tags: |
             type=ref,event=tag
-            type=raw,value=dev,enable=${{ github.event_name != 'release' && github.event_name != 'workflow_dispatch' }}
+            type=raw,value=dev,enable=${{ github.event_name != 'release' }}
-            type=raw,value=${{ inputs.docker_tags }},enable=${{ github.event_name == 'workflow_dispatch' }}
           flavor: |
             latest=auto
 
@@ -72,10 +65,10 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and Push
-        uses: docker/build-push-action@v6
+        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@v6
         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: |

.iex.exs

@@ -23,11 +23,3 @@ alias Pinchflat.Metadata.MetadataFileHelpers
 alias Pinchflat.SlowIndexing.FileFollowerServer
 
 Pinchflat.Release.check_file_permissions()
-
-defmodule IexHelpers do
-  def restart do
-    :init.restart()
-  end
-end
-
-import IexHelpers

.prettierignore

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

README.md

@@ -17,7 +17,6 @@
 [![](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)](#)
-[![](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode&style=for-the-badge)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/kieraneglin/pinchflat)
 
 </div>
 
@@ -53,7 +52,7 @@ If it doesn't work for your use case, please make a feature request! You can als
 - Self-contained - just one Docker container with no external dependencies
 - Powerful naming system so content is stored where and how you want it
 - Easy-to-use web interface with presets to get you started right away
-- First-class support for media center apps like Plex, Jellyfin, and Kodi ([docs](https://github.com/kieraneglin/pinchflat/wiki/Frequently-Asked-Questions#how-do-i-get-media-into-plexjellyfinkodi))
+- First-class support for media center apps like Plex, Jellyfin, and Kodi
 - Supports serving RSS feeds to your favourite podcast app ([docs](https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds))
 - Automatically downloads new content from channels and playlists
   - Uses a novel approach to download new content more quickly than other apps
@@ -63,7 +62,7 @@ If it doesn't work for your use case, please make a feature request! You can als
 - Allows automatically redownloading new media after a set period
   - This can help improve the download quality of new content or improve SponsorBlock tags
 - Optionally automatically delete old content ([docs](https://github.com/kieraneglin/pinchflat/wiki/Automatically-Delete-Media))
-- Advanced options like setting cutoff dates and filtering by title ([docs](https://github.com/kieraneglin/pinchflat/wiki/Frequently-Asked-Questions#i-only-want-certain-videos-from-a-source---how-can-i-only-download-those))
+- Advanced options like setting cutoff dates and filtering by title
 - Reliable hands-off operation
 - Can pass cookies to YouTube to download your private playlists ([docs](https://github.com/kieraneglin/pinchflat/wiki/YouTube-Cookies))
 - Sponsorblock integration
@@ -72,8 +71,8 @@ If it doesn't work for your use case, please make a feature request! You can als
 
 ## 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
 
@@ -92,7 +91,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
@@ -109,7 +108,7 @@ 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
@@ -131,6 +130,9 @@ You _must_ ensure the host directories you've mounted are writable by the user r
 > [!IMPORTANT]
 > It's not recommended to run the container as root. Doing so can create permission issues if other apps need to work with the downloaded media.
 
+> [!TIP]
+> If you need to run any command as root, you can run `su` from the container's shell as there is no password set for the root user.
+
 ### ADVANCED: Storing Pinchflat config directory on a network share
 
 As pointed out in [#137](https://github.com/kieraneglin/pinchflat/issues/137), SQLite doesn't like being run in WAL mode on network shares. If you're running Pinchflat on a network share, you can disable WAL mode by setting the `JOURNAL_MODE` environment variable to `delete`. This will make Pinchflat run in rollback journal mode which is less performant but should work on network shares.
@@ -143,17 +145,14 @@ If you change this setting and it works well for you, please leave a comment on
 ### Environment variables
 
 | Name                  | Required? | Default                   | Notes                                                                                          |
-| --------------------------- | --------- | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| --------------------- | --------- | ------------------------- | ---------------------------------------------------------------------------------------------- |
-| `TZ`                        | No        | `UTC`                     | Must follow IANA TZ format                                                                                                      |
+| TZ                    | No        | `UTC`                     | Must follow IANA TZ format                                                                     |
-| `LOG_LEVEL`                 | No        | `debug`                   | Can be set to `info` but `debug` is strongly recommended                                                                        |
+| 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_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)                                  |
+| BASIC_AUTH_PASSWORD   | No        |                           | See [authentication docs](https://github.com/kieraneglin/pinchflat/wiki/Username-and-Password) |
-| `EXPOSE_FEED_ENDPOINTS`     | No        | `false`                   | See [RSS feed docs](https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds)                                            |
+| EXPOSE_FEED_ENDPOINTS | No        |                           | See [RSS feed docs](https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds)           |
-| `ENABLE_IPV6`               | No        | `false`                   | Setting to _any_ non-blank value will enable IPv6                                                                               |
+| JOURNAL_MODE          | No        | `wal`                     | Set to `delete` if your config directory is stored on a network share (not recommended)        |
-| `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                                       |
-| `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, but prefix must be stripped.            |
-| `YT_DLP_WORKER_CONCURRENCY` | No        | `2`                       | The number of concurrent workers that use `yt-dlp` _per queue_. Set to 1 if you're getting IP limited, otherwise don't touch it |
 
 ## EFF donations
 
@@ -161,9 +160,9 @@ Prior to 2024-05-10, a portion of all donations were given to the [Electronic Fr
 
 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.
 
-## Stability disclaimer
+## Pre-release disclaimer
 
-This software is in active development and anything can break at any time. I make no guarantees about the stability of this software, forward-compatibility of updates, or integrity (both related to and independent of Pinchflat).
+This is pre-release software and anything can break at any time. I make not guarantees about the stability of this software, forward-compatibility of updates, or integrity (both related to and independent of Pinchflat). Essentially, use at your own risk and expect there will be rough edges for now.
 
 ## License
 

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

@@ -35,10 +35,3 @@ window.markVersionAsSeen = (versionString) => {
 window.isVersionSeen = (versionString) => {
   return localStorage.getItem('seenVersion') === versionString
 }
-
-window.dispatchFor = (elementOrId, eventName, detail = {}) => {
-  const element =
-    typeof elementOrId === 'string' ? document.getElementById(elementOrId) : elementOrId
-
-  element.dispatchEvent(new CustomEvent(eventName, { detail }))
-}

assets/js/app.js

@@ -29,7 +29,7 @@ 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) {
@@ -39,7 +39,7 @@ let liveSocket = new LiveSocket(document.body.dataset.socketPath, Socket, {
     }
   },
   hooks: {
-    'supress-enter-submission': {
+    supressEnterSubmission: {
       mounted() {
         this.el.addEventListener('keypress', (event) => {
           if (event.key === 'Enter') {
@@ -47,29 +47,6 @@ let liveSocket = new LiveSocket(document.body.dataset.socketPath, Socket, {
           }
         })
       }
-    },
-    'formless-input': {
-      mounted() {
-        const subscribedEvents = this.el.dataset.subscribe.split(' ')
-        const eventName = this.el.dataset.eventName || ''
-        const identifier = this.el.dataset.identifier || ''
-
-        subscribedEvents.forEach((domEvent) => {
-          this.el.addEventListener(domEvent, () => {
-            // This ensures that the event is pushed to the server after the input value has been updated
-            // so that the server has the most up-to-date value
-            setTimeout(() => {
-              this.pushEvent('formless-input', {
-                value: this.el.value,
-                id: identifier,
-                event: eventName,
-                dom_id: this.el.id,
-                dom_event: domEvent
-              })
-            }, 0)
-          })
-        })
-      }
     }
   }
 })

config/config.exs

@@ -26,8 +26,7 @@ config :pinchflat,
   basic_auth_password: "",
   expose_feed_endpoints: false,
   file_watcher_poll_interval: 1000,
-  timezone: "UTC",
+  timezone: "UTC"
-  base_route_path: "/"
 
 config :pinchflat, Pinchflat.Repo,
   journal_mode: :wal,
@@ -41,8 +40,7 @@ config :pinchflat, PinchflatWeb.Endpoint,
   adapter: Phoenix.Endpoint.Cowboy2Adapter,
   render_errors: [
     formats: [html: PinchflatWeb.ErrorHTML, json: PinchflatWeb.ErrorJSON],
-    root_layout: {PinchflatWeb.Layouts, :root},
+    layout: false
-    layout: {PinchflatWeb.Layouts, :app}
   ],
   pubsub_server: Pinchflat.PubSub,
   live_view: [signing_salt: "/t5878kO"]
@@ -58,6 +56,16 @@ config :pinchflat, Oban,
        {"0 1 * * *", Pinchflat.Downloading.MediaRetentionWorker},
        {"0 2 * * *", Pinchflat.Downloading.MediaQualityUpgradeWorker}
      ]}
+  ],
+  # TODO: consider making this an env var or something?
+  queues: [
+    default: 10,
+    fast_indexing: 6,
+    media_indexing: 2,
+    media_collection_indexing: 2,
+    media_fetching: 2,
+    local_metadata: 8,
+    remote_metadata: 4
   ]
 
 # Configures the mailer
@@ -92,8 +100,8 @@ config :tailwind,
   ]
 
 # Configures Elixir's Logger
-config :logger, :default_formatter,
+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/dev.exs

@@ -67,7 +67,7 @@ config :pinchflat, PinchflatWeb.Endpoint,
 config :pinchflat, dev_routes: true
 
 # Do not include metadata nor timestamps in development logs
-config :logger, :default_formatter, format: "[$level] $message\n"
+config :logger, :console, format: "[$level] $message\n"
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.

config/runtime.exs

@@ -40,33 +40,18 @@ config :pinchflat, Pinchflat.Repo,
     Path.join([:code.priv_dir(:pinchflat), "repo", "extensions", "sqlean-linux-#{system_arch}", "sqlean"])
   ]
 
-# Some users may want to increase the number of workers that use yt-dlp to improve speeds
-# Others may want to decrease the number of these workers to lessen the chance of an IP ban
-{yt_dlp_worker_count, _} = Integer.parse(System.get_env("YT_DLP_WORKER_CONCURRENCY", "2"))
-
-config :pinchflat, Oban,
-  queues: [
-    default: 10,
-    fast_indexing: 6,
-    media_collection_indexing: yt_dlp_worker_count,
-    media_fetching: yt_dlp_worker_count,
-    remote_metadata: yt_dlp_worker_count,
-    local_data: 8
-  ]
-
 if config_env() == :prod do
   config_path = "/config"
   db_path = System.get_env("DATABASE_PATH", Path.join([config_path, "db", "pinchflat.db"]))
   log_path = System.get_env("LOG_PATH", Path.join([config_path, "logs", "pinchflat.log"]))
   metadata_path = System.get_env("METADATA_PATH", Path.join([config_path, "metadata"]))
   extras_path = System.get_env("EXTRAS_PATH", Path.join([config_path, "extras"]))
+
   # For running PF as a podcast host on self-hosted environments
   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", "/")
-  enable_ipv6 = String.length(System.get_env("ENABLE_IPV6", "")) > 0
 
   config :logger, level: String.to_existing_atom(System.get_env("LOG_LEVEL", "debug"))
 
@@ -79,12 +64,10 @@ if config_env() == :prod do
     tmpfile_directory: Path.join([System.tmp_dir!(), "pinchflat", "data"]),
     dns_cluster_query: System.get_env("DNS_CLUSTER_QUERY"),
     expose_feed_endpoints: expose_feed_endpoints,
-    # This is configured in application.ex
+    timezone: System.get_env("TIMEZONE") || System.get_env("TZ") || "UTC",
-    timezone: "UTC",
+    log_path: log_path
-    log_path: log_path,
-    base_route_path: base_route_path
 
-  config :tzdata, :data_dir, System.get_env("TZ_DATA_DIR", "/config/extras/elixir_tz_data")
+  config :tzdata, :data_dir, System.get_env("TZ_DATA_DIR", "/etc/elixir_tzdata_data")
 
   config :pinchflat, Pinchflat.Repo,
     database: db_path,
@@ -122,10 +105,9 @@ if config_env() == :prod do
       # Set it to  {0, 0, 0, 0, 0, 0, 0, 1} for local network only access.
       # See the documentation on https://hexdocs.pm/plug_cowboy/Plug.Cowboy.html
       # for details about using IPv6 vs IPv4 and loopback vs public addresses.
-      ip: if(enable_ipv6, do: {0, 0, 0, 0, 0, 0, 0, 0}, else: {0, 0, 0, 0}),
+      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,65 @@
+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}
+
+ARG TARGETPLATFORM
+RUN echo "Building for ${TARGETPLATFORM:?}"
+
+# Install debian packages
+RUN apt-get update -qq
+RUN 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
+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
+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
+
+# Install Apprise
+RUN export PIPX_HOME=/opt/pipx && \
+    export PIPX_BIN_DIR=/usr/local/bin && \
+    pipx install apprise
+
+# Set the locale
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+# Create app directory and copy the Elixir projects into it.
+WORKDIR /app
+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,12 +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

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,65 +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 zsh
-
-# 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 up ZSH tools
-  chsh -s $(which zsh) && \
-  sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-
-# 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
-
-WORKDIR /app
-
-COPY mix.exs mix.lock ./
-# Install Elixir deps
-# NOTE: this has to be before the bulk copy to ensure that deps are cached
-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
-
-COPY . ./
-
-# Gives us iex shell history
-ENV ERL_AFLAGS="-kernel shell_history enabled"
-
-EXPOSE 4008

lib/pinchflat/application.ex

@@ -4,12 +4,9 @@ defmodule Pinchflat.Application do
   @moduledoc false
 
   use Application
-  require Logger
 
   @impl true
   def start(_type, _args) do
-    check_and_update_timezone()
-
     children = [
       PinchflatWeb.Telemetry,
       Pinchflat.Repo,
@@ -50,20 +47,4 @@ defmodule Pinchflat.Application do
     :ok = Oban.Telemetry.attach_default_logger()
     :telemetry.attach_many("job-telemetry-broadcast", events, &PinchflatWeb.Telemetry.job_state_change_broadcast/4, [])
   end
-
-  # This has to be here (rather than runtime.exs) since the `tzdata` application
-  # has to be started before we can check the timezone
-  defp check_and_update_timezone do
-    attempted_timezone = System.get_env("TIMEZONE") || System.get_env("TZ") || "UTC"
-
-    valid_timezone =
-      if Tzdata.zone_exists?(attempted_timezone) do
-        attempted_timezone
-      else
-        Logger.warning("Invalid timezone #{attempted_timezone}, defaulting to UTC")
-        "UTC"
-      end
-
-    Application.put_env(:pinchflat, :timezone, valid_timezone)
-  end
 end

lib/pinchflat/boot/pre_job_startup_tasks.ex

@@ -16,8 +16,6 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
   alias Pinchflat.Settings
   alias Pinchflat.Utils.FilesystemUtils
 
-  alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
-
   def start_link(opts \\ []) do
     GenServer.start_link(__MODULE__, %{}, opts)
   end
@@ -38,7 +36,6 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
     create_blank_yt_dlp_files()
     create_blank_user_script_file()
     apply_default_settings()
-    run_app_init_script()
 
     {:ok, state}
   end
@@ -98,12 +95,6 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
     Settings.set(apprise_version: apprise_version)
   end
 
-  defp run_app_init_script do
-    runner = Application.get_env(:pinchflat, :user_script_runner, UserScriptRunner)
-
-    runner.run(:app_init, %{})
-  end
-
   defp yt_dlp_runner do
     Application.get_env(:pinchflat, :yt_dlp_runner)
   end

lib/pinchflat/downloading/codec_parser.ex

@@ -0,0 +1,82 @@
+defmodule Pinchflat.Downloading.CodecParser do
+  @moduledoc """
+  Functions for generating yt-dlp codec strings
+  """
+
+  alias Pinchflat.Settings
+
+  @doc """
+  Generate a video codec string based on the value of the video_codec_preference setting.
+
+  Returns binary()
+  """
+  def generate_vcodec_string_from_settings do
+    generate_vcodec_string(Settings.get!(:video_codec_preference))
+  end
+
+  @doc """
+  Generate an audio codec string based on the value of the audio_codec_preference setting.
+
+  Returns binary()
+  """
+  def generate_acodec_string_from_settings do
+    generate_acodec_string(Settings.get!(:audio_codec_preference))
+  end
+
+  @doc """
+  Generate a video codec string from a list of video codecs.
+
+  If the list is nil or empty, the default video codec is AVC.
+
+  Returns binary()
+  """
+  def generate_vcodec_string(nil), do: "bestvideo[vcodec~='^avc']/bestvideo"
+  def generate_vcodec_string([]), do: generate_vcodec_string(nil)
+
+  def generate_vcodec_string(video_codecs) do
+    video_codecs
+    |> Enum.map(&video_codec_map()[&1])
+    |> Enum.reject(&is_nil/1)
+    |> Enum.map(&"bestvideo[vcodec~='^#{&1}']")
+    |> Enum.concat(["bestvideo"])
+    |> Enum.join("/")
+  end
+
+  @doc """
+  Generate an audio codec string from a list of audio codecs.
+
+  If the list is nil or empty, the default audio codec is MP4A.
+
+  Returns binary()
+  """
+  def generate_acodec_string(nil), do: "bestaudio[acodec~='^mp4a']/bestaudio"
+  def generate_acodec_string([]), do: generate_acodec_string(nil)
+
+  def generate_acodec_string(audio_codecs) do
+    audio_codecs
+    |> Enum.map(&audio_codec_map()[&1])
+    |> Enum.reject(&is_nil/1)
+    |> Enum.map(&"bestaudio[acodec~='^#{&1}']")
+    |> Enum.concat(["bestaudio"])
+    |> Enum.join("/")
+  end
+
+  @doc false
+  def video_codec_map do
+    %{
+      "av01" => "av01",
+      "avc" => "avc",
+      "vp9" => "vp0?9"
+    }
+  end
+
+  @doc false
+  def audio_codec_map do
+    %{
+      "aac" => "aac",
+      "mp4a" => "mp4a",
+      "mp3" => "mp3",
+      "opus" => "opus"
+    }
+  end
+end

lib/pinchflat/downloading/download_option_builder.ex

@@ -6,8 +6,8 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   alias Pinchflat.Sources
   alias Pinchflat.Sources.Source
   alias Pinchflat.Media.MediaItem
+  alias Pinchflat.Downloading.CodecParser
   alias Pinchflat.Downloading.OutputPathBuilder
-  alias Pinchflat.Downloading.QualityOptionBuilder
 
   alias Pinchflat.Utils.FilesystemUtils, as: FSUtils
 
@@ -34,38 +34,21 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
 
   @doc """
   Builds the output path for yt-dlp to download media based on the given source's
-  or media_item's media profile. Uses the source's override output path template if it exists.
+  media profile. Uses the source's override output path template if it exists.
 
   Accepts a %MediaItem{} or %Source{} struct. If a %Source{} struct is passed, it
   will use a default %MediaItem{} struct with the given source.
 
   Returns binary()
   """
-  def build_output_path_for(%Source{} = source_with_preloads) do
-    build_output_path_for(%MediaItem{source: source_with_preloads})
-  end
-
   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
 
-  @doc """
+  def build_output_path_for(%Source{} = source_with_preloads) do
-  Builds the quality options for yt-dlp to download media based on the given source's
+    build_output_path_for(%MediaItem{source: source_with_preloads})
-  or media_item's media profile. Useful for helping predict final filepath of downloaded
-  media.
-
-  returns [Keyword.t()]
-  """
-  def build_quality_options_for(%Source{} = source_with_preloads) do
-    build_quality_options_for(%MediaItem{source: source_with_preloads})
-  end
-
-  def build_quality_options_for(%MediaItem{} = media_item_with_preloads) do
-    media_profile = media_item_with_preloads.source.media_profile
-
-    quality_options(media_profile)
   end
 
   defp default_options(override_opts) do
@@ -91,9 +74,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]
 
@@ -142,7 +122,27 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   end
 
   defp quality_options(media_profile) do
-    QualityOptionBuilder.build(media_profile)
+    vcodec_string = CodecParser.generate_vcodec_string_from_settings()
+    acodec_string = CodecParser.generate_acodec_string_from_settings()
+
+    case media_profile.preferred_resolution do
+      # Also be aware that :audio disabled all embedding options for subtitles
+      :audio ->
+        [:extract_audio, format: "#{acodec_string}/best"]
+
+      resolution_atom ->
+        {resolution_string, _} =
+          resolution_atom
+          |> Atom.to_string()
+          |> Integer.parse()
+
+        [
+          format_sort: "res:#{resolution_string}",
+          # Since Plex doesn't support reading metadata from MKV
+          remux_video: "mp4",
+          format: "((#{vcodec_string})+(#{acodec_string}))/best"
+        ]
+    end
   end
 
   defp sponsorblock_options(media_profile) do
@@ -204,8 +204,10 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
       "source_collection_id" => source.collection_id,
       "source_collection_name" => source.collection_name,
       "source_collection_type" => to_string(source.collection_type),
-      "media_playlist_index" => pad_int(media_item_with_preloads.playlist_index),
+      "media_upload_date_index" =>
-      "media_upload_date_index" => pad_int(media_item_with_preloads.upload_date_index)
+        media_item_with_preloads.upload_date_index
+        |> to_string()
+        |> String.pad_leading(2, "0")
     }
   end
 
@@ -222,12 +224,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
     |> build_output_path(media_item_with_preloads)
   end
 
-  defp pad_int(integer, count \\ 2, padding \\ "0") do
-    integer
-    |> to_string()
-    |> String.pad_leading(count, padding)
-  end
-
   defp base_directory do
     Application.get_env(:pinchflat, :media_directory)
   end

lib/pinchflat/downloading/downloading_helpers.ex

@@ -16,10 +16,14 @@ defmodule Pinchflat.Downloading.DownloadingHelpers do
   alias Pinchflat.Media.MediaItem
   alias Pinchflat.Downloading.MediaDownloadWorker
 
+  alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
+
   @doc """
   Starts tasks for downloading media for any of a sources _pending_ media items.
   Jobs are not enqueued if the source is set to not download media. This will return :ok.
 
+  You can optionally set the `kickoff_delay` option to delay when the jobs are enqueued.
+
   NOTE: this starts a download for each media item that is pending,
   not just the ones that were indexed in this job run. This should ensure
   that any stragglers are caught if, for some reason, they weren't enqueued
@@ -27,13 +31,17 @@ defmodule Pinchflat.Downloading.DownloadingHelpers do
 
   Returns :ok
   """
-  def enqueue_pending_download_tasks(%Source{download_media: true} = source) do
+  def enqueue_pending_download_tasks(source, opts \\ [])
+
+  def enqueue_pending_download_tasks(%Source{download_media: true} = source, opts) do
+    kickoff_delay = Keyword.get(opts, :kickoff_delay, 0)
+
     source
     |> Media.list_pending_media_items_for()
-    |> Enum.each(&MediaDownloadWorker.kickoff_with_task/1)
+    |> Enum.each(&MediaDownloadWorker.kickoff_with_task(&1, %{}, schedule_in: kickoff_delay))
   end
 
-  def enqueue_pending_download_tasks(%Source{download_media: false}) do
+  def enqueue_pending_download_tasks(%Source{download_media: false}, _opts) do
     :ok
   end
 
@@ -53,15 +61,18 @@ defmodule Pinchflat.Downloading.DownloadingHelpers do
   downloaded, based on the source's download settings and whether media is
   considered pending.
 
+  You can optionally set the `kickoff_delay` option to delay when the jobs are enqueued.
+
   Returns {:ok, %Task{}} | {:error, :should_not_download} | {:error, any()}
   """
-  def kickoff_download_if_pending(%MediaItem{} = media_item) do
+  def kickoff_download_if_pending(%MediaItem{} = media_item, opts \\ []) do
+    kickoff_delay = Keyword.get(opts, :kickoff_delay, 0)
     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)
+      MediaDownloadWorker.kickoff_with_task(media_item, %{}, schedule_in: kickoff_delay)
     else
       {:error, :should_not_download}
     end
@@ -91,10 +102,39 @@ defmodule Pinchflat.Downloading.DownloadingHelpers do
         [m, s, mp],
         ^MediaQuery.for_source(source) and
           ^MediaQuery.downloaded() and
-          not (^MediaQuery.download_prevented())
+          not (^MediaQuery.download_prevented()) and
+          not (^MediaQuery.culled())
       )
     )
     |> Repo.all()
     |> Enum.map(&MediaDownloadWorker.kickoff_with_task/1)
   end
+
+  @doc """
+  Creates a media item from the attributes returned by the video backend
+  (read: yt-dlp) and runs the user script with a `media_indexed` event type.
+
+  Only runs the user script if the media item was created successfully and the media item
+  doesn't already exist in the database.
+
+  Returns {:ok, %MediaItem{}} | {:error, any()}
+  """
+  def create_media_item_and_run_script(%Source{} = source, media_attrs_struct) do
+    media_already_exists =
+      MediaQuery.new()
+      |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.media_id(media_attrs_struct.media_id)))
+      |> Repo.exists?()
+
+    case Media.create_media_item_from_backend_attrs(source, media_attrs_struct) do
+      {:ok, media_item} ->
+        if !media_already_exists do
+          UserScriptRunner.run(:media_indexed, media_item)
+        end
+
+        {:ok, media_item}
+
+      err ->
+        err
+    end
+  end
 end

lib/pinchflat/downloading/media_download_worker.ex

@@ -12,7 +12,6 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
   alias Pinchflat.Tasks
   alias Pinchflat.Repo
   alias Pinchflat.Media
-  alias Pinchflat.Media.FileSyncing
   alias Pinchflat.Downloading.MediaDownloader
 
   alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
@@ -40,14 +39,17 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
     - `quality_upgrade?`: re-downloads media, including the video. Does not force download
       if the source is set to not download media
 
-  Returns :ok | {:error, any, ...any}
+  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)
 
-    media_item = fetch_and_run_prevent_download_user_script(media_item_id)
+    media_item =
+      media_item_id
+      |> Media.get_media_item!()
+      |> Repo.preload(:source)
 
     # If the source or media item is set to not download media, perform a no-op unless forced
     if (media_item.source.download_media && !media_item.prevent_download) || should_force do
@@ -60,20 +62,6 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
     Ecto.StaleEntryError -> Logger.info("#{__MODULE__} discarded: media item #{media_item_id} stale")
   end
 
-  # If a user script exists and, when run, returns a non-zero exit code, prevent this and all future downloads
-  # of the media item.
-  defp fetch_and_run_prevent_download_user_script(media_item_id) do
-    media_item = Media.get_media_item!(media_item_id)
-
-    {:ok, media_item} =
-      case run_user_script(:media_pre_download, media_item) do
-        {:ok, _, exit_code} when exit_code != 0 -> Media.update_media_item(media_item, %{prevent_download: true})
-        _ -> {:ok, media_item}
-      end
-
-    Repo.preload(media_item, :source)
-  end
-
   defp download_media_and_schedule_jobs(media_item, is_quality_upgrade, should_force) do
     overwrite_behaviour = if should_force || is_quality_upgrade, do: :force_overwrites, else: :no_force_overwrites
     override_opts = [overwrite_behaviour: overwrite_behaviour]
@@ -86,17 +74,13 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
             media_redownloaded_at: get_redownloaded_at(is_quality_upgrade)
           })
 
-        :ok = FileSyncing.delete_outdated_files(media_item, updated_media_item)
+        :ok = run_user_script(updated_media_item)
-        run_user_script(:media_downloaded, updated_media_item)
 
-        :ok
+        {:ok, updated_media_item}
 
       {:recovered, _} ->
         {:error, :retry}
 
-      {:error, :unsuitable_for_download} ->
-        {:ok, :non_retry}
-
       {:error, message} ->
         action_on_error(message)
     end
@@ -128,9 +112,9 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
 
   # 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(event, media_item) do
+  defp run_user_script(media_item) do
     runner = Application.get_env(:pinchflat, :user_script_runner, UserScriptRunner)
 
-    runner.run(event, media_item)
+    runner.run(:media_downloaded, media_item)
   end
 end

lib/pinchflat/downloading/media_downloader.ex

@@ -37,13 +37,6 @@ defmodule Pinchflat.Downloading.MediaDownloader do
       {:ok, parsed_json} ->
         update_media_item_from_parsed_json(media_with_preloads, parsed_json)
 
-      {:error, :unsuitable_for_download} ->
-        Logger.warning(
-          "Media item ##{media_with_preloads.id} isn't suitable for download yet. May be an active or processing live stream"
-        )
-
-        {:error, :unsuitable_for_download}
-
       {:error, message, _exit_code} ->
         Logger.error("yt-dlp download error for media item ##{media_with_preloads.id}: #{inspect(message)}")
 
@@ -86,13 +79,12 @@ defmodule Pinchflat.Downloading.MediaDownloader do
       |> MetadataParser.parse_for_media_item()
       |> Map.merge(%{
         media_downloaded_at: DateTime.utc_now(),
-        culled_at: nil,
         nfo_filepath: determine_nfo_filepath(media_with_preloads, parsed_json),
         metadata: %{
           # IDEA: might be worth kicking off a job for this since thumbnail fetching
           # could fail and I want to handle that in isolation
           metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(media_with_preloads, parsed_json),
-          thumbnail_filepath: MetadataFileHelpers.download_and_store_thumbnail_for(media_with_preloads)
+          thumbnail_filepath: MetadataFileHelpers.download_and_store_thumbnail_for(media_with_preloads, parsed_json)
         }
       })
 
@@ -113,13 +105,8 @@ defmodule Pinchflat.Downloading.MediaDownloader do
 
   defp download_with_options(url, item_with_preloads, output_filepath, override_opts) do
     {:ok, options} = DownloadOptionBuilder.build(item_with_preloads, override_opts)
-    runner_opts = [output_filepath: output_filepath, use_cookies: item_with_preloads.source.use_cookies]
 
-    case YtDlpMedia.get_downloadable_status(url) do
+    YtDlpMedia.download(url, options, output_filepath: output_filepath)
-      {:ok, :downloadable} -> YtDlpMedia.download(url, options, runner_opts)
-      {:ok, :ignorable} -> {:error, :unsuitable_for_download}
-      err -> err
-    end
   end
 
   defp recoverable_errors do

lib/pinchflat/downloading/media_quality_upgrade_worker.ex

@@ -23,10 +23,10 @@ defmodule Pinchflat.Downloading.MediaQualityUpgradeWorker do
   """
   @impl Oban.Worker
   def perform(%Oban.Job{}) do
-    upgradable_media = Media.list_upgradeable_media_items()
+    redownloadable_media = Media.list_redownloadable_media_items()
-    Logger.info("Redownloading #{length(upgradable_media)} media items")
+    Logger.info("Redownloading #{length(redownloadable_media)} media items")
 
-    Enum.each(upgradable_media, fn media_item ->
+    Enum.each(redownloadable_media, fn media_item ->
       MediaDownloadWorker.kickoff_with_task(media_item, %{quality_upgrade?: true})
     end)
   end

lib/pinchflat/downloading/media_retention_worker.ex

@@ -2,15 +2,12 @@ defmodule Pinchflat.Downloading.MediaRetentionWorker do
   @moduledoc false
 
   use Oban.Worker,
-    queue: :local_data,
+    queue: :local_metadata,
     unique: [period: :infinity, states: [:available, :scheduled, :retryable, :executing]],
-    tags: ["media_item", "local_data"]
+    tags: ["media_item", "local_metadata"]
-
-  use Pinchflat.Media.MediaQuery
 
   require Logger
 
-  alias Pinchflat.Repo
   alias Pinchflat.Media
 
   @doc """
@@ -23,53 +20,14 @@ defmodule Pinchflat.Downloading.MediaRetentionWorker do
   """
   @impl Oban.Worker
   def perform(%Oban.Job{}) do
-    cull_cullable_media_items()
+    cullable_media = Media.list_cullable_media_items()
-    delete_media_items_from_before_cutoff()
-
-    :ok
-  end
-
-  defp cull_cullable_media_items do
-    cullable_media =
-      MediaQuery.new()
-      |> MediaQuery.require_assoc(:source)
-      |> where(^MediaQuery.cullable())
-      |> Repo.all()
-
     Logger.info("Culling #{length(cullable_media)} media items past their retention date")
 
     Enum.each(cullable_media, fn media_item ->
-      # Setting `prevent_download` does what it says on the tin, but `culled_at` is purely informational.
-      # We don't actually do anything with that in terms of queries and it gets set to nil if the media item
-      # gets re-downloaded.
       Media.delete_media_files(media_item, %{
         prevent_download: true,
         culled_at: DateTime.utc_now()
       })
     end)
   end
-
-  # NOTE: Since this is a date and not a datetime, we can't add logic to have to-the-minute
-  # comparison like we can with retention periods. We can only compare to the day.
-  defp delete_media_items_from_before_cutoff do
-    deletable_media =
-      MediaQuery.new()
-      |> MediaQuery.require_assoc(:source)
-      |> where(^MediaQuery.deletable_based_on_source_cutoff())
-      |> Repo.all()
-
-    Logger.info("Deleting #{length(deletable_media)} media items that are from before the source cutoff")
-
-    Enum.each(deletable_media, fn media_item ->
-      # Note that I'm not setting `prevent_download` on the media_item here.
-      # That's because cutoff_date can easily change and it's a valid behavior to re-download older
-      # media items if the cutoff_date changes.
-      # Download is ultimately prevented because `MediaQuery.pending()` only returns media items
-      # from after the cutoff date (among other things), so it's not like the media will just immediately
-      # be re-downloaded.
-      Media.delete_media_files(media_item, %{
-        culled_at: DateTime.utc_now()
-      })
-    end)
-  end
 end

lib/pinchflat/downloading/output_path_builder.ex

@@ -54,12 +54,7 @@ defmodule Pinchflat.Downloading.OutputPathBuilder do
       "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/downloading/quality_option_builder.ex

@@ -1,66 +0,0 @@
-defmodule Pinchflat.Downloading.QualityOptionBuilder do
-  @moduledoc """
-  A standalone builder module for building quality-related options for yt-dlp to download media.
-
-  Currently exclusively used in DownloadOptionBuilder since this logic is too complex to just
-  place in the main module.
-  """
-
-  alias Pinchflat.Settings
-  alias Pinchflat.Profiles.MediaProfile
-
-  @doc """
-  Builds the quality-related options for yt-dlp to download media based on the given media profile
-
-  Includes things like container, preferred format/codec, and audio track options.
-  """
-  def build(%MediaProfile{preferred_resolution: :audio, media_container: container} = media_profile) do
-    acodec = Settings.get!(:audio_codec_preference)
-
-    [
-      :extract_audio,
-      format_sort: "+acodec:#{acodec}",
-      audio_format: container || "best",
-      format: build_format_string(media_profile)
-    ]
-  end
-
-  def build(%MediaProfile{preferred_resolution: resolution_atom, media_container: container} = media_profile) do
-    vcodec = Settings.get!(:video_codec_preference)
-    acodec = Settings.get!(:audio_codec_preference)
-    {resolution_string, _} = resolution_atom |> Atom.to_string() |> Integer.parse()
-
-    [
-      # Since Plex doesn't support reading metadata from MKV
-      remux_video: container || "mp4",
-      format_sort: "res:#{resolution_string},+codec:#{vcodec}:#{acodec}",
-      format: build_format_string(media_profile)
-    ]
-  end
-
-  defp build_format_string(%MediaProfile{preferred_resolution: :audio, audio_track: audio_track}) do
-    if audio_track do
-      "bestaudio[#{build_format_modifier(audio_track)}]/bestaudio/best"
-    else
-      "bestaudio/best"
-    end
-  end
-
-  defp build_format_string(%MediaProfile{audio_track: audio_track}) do
-    if audio_track do
-      "bestvideo+bestaudio[#{build_format_modifier(audio_track)}]/bestvideo*+bestaudio/best"
-    else
-      "bestvideo*+bestaudio/best"
-    end
-  end
-
-  # Reminder to self: this conflicts with `--extractor-args "youtube:lang=<LANG>"`
-  # since that will translate the format_notes as well, which means they may not match.
-  # At least that's what happens now - worth a re-check if I have to come back to this
-  defp build_format_modifier("original"), do: "format_note*=original"
-  defp build_format_modifier("default"), do: "format_note*='(default)'"
-  # This uses the carat to anchor the language to the beginning of the string
-  # since that's what's needed to match `en` to `en-US` and `en-GB`, etc. The user
-  # can always specify the full language code if they want.
-  defp build_format_modifier(language_code), do: "language^=#{language_code}"
-end

lib/pinchflat/fast_indexing/fast_indexing_helpers.ex

@@ -10,30 +10,14 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
   use Pinchflat.Media.MediaQuery
 
   alias Pinchflat.Repo
-  alias Pinchflat.Media
-  alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
   alias Pinchflat.FastIndexing.YoutubeRss
-  alias Pinchflat.FastIndexing.YoutubeApi
   alias Pinchflat.Downloading.DownloadingHelpers
-  alias Pinchflat.FastIndexing.FastIndexingWorker
-  alias Pinchflat.Downloading.DownloadOptionBuilder
 
   alias Pinchflat.YtDlp.Media, as: YtDlpMedia
 
   @doc """
-  Kicks off a new fast indexing task for a source. This will delete any existing fast indexing
+  Fetches new media IDs from a source's YouTube RSS feed, indexes them, and kicks off downloading
-  tasks for the source before starting a new one.
-
-  Returns {:ok, %Task{}}
-  """
-  def kickoff_indexing_task(%Source{} = source) do
-    Tasks.delete_pending_tasks_for(source, "FastIndexingWorker", include_executing: true)
-    FastIndexingWorker.kickoff_with_task(source)
-  end
-
-  @doc """
-  Fetches new media IDs for a source from YT's API or RSS, indexes them, and kicks off downloading
   tasks for any pending media items. See comments in `FastIndexingWorker` for more info on the
   order of operations and how this fits into the indexing process.
 
@@ -41,11 +25,7 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
   downloaded_.
   """
   def kickoff_download_tasks_from_youtube_rss_feed(%Source{} = source) do
-    # The media_profile is needed to determine the quality options to _then_ determine a more
+    {:ok, media_ids} = YoutubeRss.get_recent_media_ids_from_rss(source)
-    # accurate predicted filepath
-    source = Repo.preload(source, [:media_profile])
-
-    {:ok, media_ids} = get_recent_media_ids(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)
 
@@ -61,22 +41,12 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
         end
       end)
 
-    DownloadingHelpers.enqueue_pending_download_tasks(source)
+    # Wait 5s before enqueuing downloads to give the post-indexing user script a chance to run
+    DownloadingHelpers.enqueue_pending_download_tasks(source, kickoff_delay: 5)
 
     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))
@@ -86,13 +56,9 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
   defp create_media_item_from_media_id(source, media_id) do
     url = "https://www.youtube.com/watch?v=#{media_id}"
 
-    command_opts =
+    case YtDlpMedia.get_media_attributes(url) do
-      [output: DownloadOptionBuilder.build_output_path_for(source)] ++
+      {:ok, media_attrs_struct} ->
-        DownloadOptionBuilder.build_quality_options_for(source)
+        DownloadingHelpers.create_media_item_and_run_script(source, media_attrs_struct)
-
-    case YtDlpMedia.get_media_attributes(url, command_opts, use_cookies: source.use_cookies) do
-      {:ok, media_attrs} ->
-        Media.create_media_item_from_backend_attrs(source, media_attrs)
 
       err ->
         err

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

@@ -12,8 +12,7 @@ defmodule Pinchflat.Lifecycle.UserScripts.CommandRunner do
   @behaviour UserScriptCommandRunner
 
   @event_types [
-    :app_init,
+    :media_indexed,
-    :media_pre_download,
     :media_downloaded,
     :media_deleted
   ]
@@ -24,25 +23,24 @@ defmodule Pinchflat.Lifecycle.UserScripts.CommandRunner do
 
   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 and returned BUT the tuple will always
+  If something fails, it'll be logged.
-  start with {:ok, ...}.
 
   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, :no_executable} | {:ok, output, exit_code}
+  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, :no_executable}
+        :ok
 
       {:ok, executable_path} ->
         {:ok, encoded_data} = Phoenix.json_library().encode(encodable_data)
 
-        {output, exit_code} =
+        {_output, _exit_code} =
           CliUtils.wrap_cmd(
             executable_path,
             [to_string(event_type), encoded_data],
@@ -50,7 +48,7 @@ defmodule Pinchflat.Lifecycle.UserScripts.CommandRunner do
             logging_arg_override: "[suppressed]"
           )
 
-        {:ok, output, exit_code}
+        :ok
     end
   end
 
@@ -65,7 +63,7 @@ defmodule Pinchflat.Lifecycle.UserScripts.CommandRunner do
     if FilesystemUtils.exists_and_nonempty?(filepath) do
       {:ok, filepath}
     else
-      Logger.info("User scripts lifecyle file either not present or is empty. Skipping.")
+      Logger.warning("User scripts lifecyle file either not present or is empty. Skipping.")
 
       {:ok, :no_executable}
     end

lib/pinchflat/media/file_syncing.ex

@@ -1,93 +0,0 @@
-defmodule Pinchflat.Media.FileSyncing do
-  @moduledoc """
-  Functions for ensuring file state is accurately reflected in the database.
-  """
-
-  alias Pinchflat.Media
-  alias Pinchflat.Utils.MapUtils
-  alias Pinchflat.Media.MediaItem
-  alias Pinchflat.Utils.FilesystemUtils, as: FSUtils
-
-  @doc """
-  Deletes files that are no longer needed by a media item.
-
-  This means that if a media item has been updated, the old and new versions
-  can be passed and any files that are no longer needed will be deleted.
-
-  An example is a video that gets its quality upgraded and its name changes
-  between original download and re-download. The old file will exist on-disk
-  with the old name but the database entry will point to the new file. This
-  function can be used to delete the old file in this case.
-
-  Returns :ok
-  """
-  def delete_outdated_files(old_media_item, new_media_item) do
-    non_subtitle_keys = MediaItem.filepath_attributes() -- [:subtitle_filepaths]
-
-    old_non_subtitles = Map.take(old_media_item, non_subtitle_keys)
-    old_subtitles = MapUtils.from_nested_list(old_media_item.subtitle_filepaths)
-    new_non_subtitles = Map.take(new_media_item, non_subtitle_keys)
-    new_subtitles = MapUtils.from_nested_list(new_media_item.subtitle_filepaths)
-
-    handle_file_deletion(old_non_subtitles, new_non_subtitles)
-    handle_file_deletion(old_subtitles, new_subtitles)
-
-    :ok
-  end
-
-  @doc """
-  Nillifies any media item filepaths that don't exist on disk for a list of media items
-
-  returns [%MediaItem{}]
-  """
-  def sync_file_presence_on_disk(media_items) do
-    Enum.map(media_items, fn media_item ->
-      new_attributes = sync_media_item_files(media_item)
-      # Doing this one-by-one instead of batching since this process
-      # can take time and a batch could let MediaItem state get out of sync
-      {:ok, updated_media_item} = Media.update_media_item(media_item, new_attributes)
-
-      updated_media_item
-    end)
-  end
-
-  defp handle_file_deletion(old_attributes, new_attributes) do
-    # The logic:
-    #   - A file should only be deleted if it exists and the new file is different
-    #   - The new attributes are the ones we're interested in keeping
-    #   - If the old attributes have a key that doesn't exist in the new attributes, don't touch it.
-    #     This is good for archiving but may be unpopular for other users so this may change.
-
-    Enum.each(new_attributes, fn {key, new_filepath} ->
-      old_filepath = Map.get(old_attributes, key)
-      files_have_changed = old_filepath && new_filepath && old_filepath != new_filepath
-      files_exist_on_disk = files_have_changed && File.exists?(old_filepath) && File.exists?(new_filepath)
-
-      if files_exist_on_disk && !FSUtils.filepaths_reference_same_file?(old_filepath, new_filepath) do
-        FSUtils.delete_file_and_remove_empty_directories(old_filepath)
-      end
-    end)
-  end
-
-  defp sync_media_item_files(media_item) do
-    non_subtitle_keys = MediaItem.filepath_attributes() -- [:subtitle_filepaths]
-    subtitle_keys = MapUtils.from_nested_list(media_item.subtitle_filepaths)
-    non_subtitles = Map.take(media_item, non_subtitle_keys)
-
-    # This one is checking for the negative (ie: only update if the file doesn't exist)
-    new_non_subtitle_attrs =
-      Enum.reduce(non_subtitles, %{}, fn {key, filepath}, acc ->
-        if filepath && File.exists?(filepath), do: acc, else: Map.put(acc, key, nil)
-      end)
-
-    # This one is checking for the positive (ie: only update if the file exists)
-    # This is because subtitles, being an array type in the DB, are most easily updated
-    # by a full replacement rather than finding the actual diff
-    new_subtitle_attrs =
-      Enum.reduce(subtitle_keys, [], fn {key, filepath}, acc ->
-        if filepath && File.exists?(filepath), do: acc ++ [[key, filepath]], else: acc
-      end)
-
-    Map.put(new_non_subtitle_attrs, :subtitle_filepaths, new_subtitle_attrs)
-  end
-end

lib/pinchflat/media/file_syncing_worker.ex

@@ -1,38 +0,0 @@
-defmodule Pinchflat.Media.FileSyncingWorker do
-  @moduledoc false
-
-  use Oban.Worker,
-    queue: :local_data,
-    tags: ["sources", "local_data"]
-
-  alias __MODULE__
-  alias Pinchflat.Repo
-  alias Pinchflat.Tasks
-  alias Pinchflat.Sources
-  alias Pinchflat.Media.FileSyncing
-
-  @doc """
-  Starts the source file syncing worker.
-
-  Returns {:ok, %Task{}} | {:error, %Ecto.Changeset{}}
-  """
-  def kickoff_with_task(source, opts \\ []) do
-    %{id: source.id}
-    |> FileSyncingWorker.new(opts)
-    |> Tasks.create_job_with_task(source)
-  end
-
-  @doc """
-  Deletes a profile and optionally deletes its files
-
-  Returns :ok
-  """
-  @impl Oban.Worker
-  def perform(%Oban.Job{args: %{"id" => source_id}}) do
-    source = Repo.preload(Sources.get_source!(source_id), :media_items)
-
-    FileSyncing.sync_file_presence_on_disk(source.media_items)
-
-    :ok
-  end
-end

lib/pinchflat/media/media.ex

@@ -15,9 +15,6 @@ defmodule Pinchflat.Media do
 
   alias Pinchflat.Lifecycle.UserScripts.CommandRunner, as: UserScriptRunner
 
-  # Some fields should only be set on insert and not on update.
-  @fields_to_drop_on_update [:playlist_index]
-
   @doc """
   Returns the list of media_items.
 
@@ -28,15 +25,25 @@ defmodule Pinchflat.Media do
   end
 
   @doc """
-  Returns a list of media_items that are upgradeable based on the redownload delay
+  Returns a list of media_items that are cullable based on the retention period
-  of the media_profile their source belongs to. In this context, upgradeable means
+  of the source they belong to.
-  that it's been long enough since upload that the video may be in a higher quality
-  or have better sponsorblock segments (or similar).
 
-  The logic is that a media_item is past_redownload_delay if the media_item's uploaded_at is
+  Returns [%MediaItem{}, ...]
-  at least redownload_delay_days ago AND `media_downloaded_at` - `redownload_delay_days`
+  """
-  is before the media_item's `uploaded_at`.
+  def list_cullable_media_items do
+    MediaQuery.new()
+    |> MediaQuery.require_assoc(:source)
+    |> where(^MediaQuery.cullable())
+    |> Repo.all()
+  end
 
+  @doc """
+  Returns a list of media_items that are redownloadable based on the redownload delay
+  of the media_profile their source belongs to.
+
+  The logic is that a media_item is past_redownload_delay if the media_item's
+  upload_date is at least redownload_delay_days ago AND
+  `media_downloaded_at` - `redownload_delay_days` is before the media_item's `upload_date`.
   This logic grabs media that we've recently downloaded AND is recently uploaded, but
   doesn't grab media that we've recently downloaded and was uploaded a long time ago.
   This also makes things work as expected when downloading media from a source for the
@@ -44,10 +51,10 @@ defmodule Pinchflat.Media do
 
   Returns [%MediaItem{}, ...]
   """
-  def list_upgradeable_media_items do
+  def list_redownloadable_media_items do
     MediaQuery.new()
     |> MediaQuery.require_assoc(:media_profile)
-    |> where(^MediaQuery.upgradeable())
+    |> where(^MediaQuery.redownloadable())
     |> Repo.all()
   end
 
@@ -128,7 +135,7 @@ 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{}}
   """
@@ -139,10 +146,7 @@ defmodule Pinchflat.Media do
     |> 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]
     )
@@ -154,10 +158,8 @@ defmodule Pinchflat.Media do
   Returns {:ok, %MediaItem{}} | {:error, %Ecto.Changeset{}}
   """
   def update_media_item(%MediaItem{} = media_item, attrs) do
-    update_attrs = Map.drop(attrs, @fields_to_drop_on_update)
-
     media_item
-    |> MediaItem.changeset(update_attrs)
+    |> MediaItem.changeset(attrs)
     |> Repo.update()
   end
 
@@ -174,7 +176,7 @@ defmodule Pinchflat.Media do
 
     if delete_files do
       {:ok, _} = do_delete_media_files(media_item)
-      run_user_script(:media_deleted, media_item)
+      :ok = run_user_script(:media_deleted, media_item)
     end
 
     # Should delete these no matter what
@@ -197,7 +199,7 @@ defmodule Pinchflat.Media do
 
     Tasks.delete_tasks_for(media_item)
     {:ok, _} = do_delete_media_files(media_item)
-    run_user_script(:media_deleted, media_item)
+    :ok = run_user_script(:media_deleted, media_item)
 
     update_media_item(media_item, Map.merge(filepath_attrs, addl_attrs))
   end

lib/pinchflat/media/media_item.ex

@@ -18,8 +18,6 @@ defmodule Pinchflat.Media.MediaItem do
   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,10 +26,9 @@ defmodule Pinchflat.Media.MediaItem do
     :livestream,
     :source_id,
     :short_form_content,
-    :uploaded_at,
+    :upload_date,
     :upload_date_index,
     :duration_seconds,
-    :predicted_media_filepath,
     # these fields are captured only on download
     :media_downloaded_at,
     :media_filepath,
@@ -54,7 +51,7 @@ defmodule Pinchflat.Media.MediaItem do
     livestream
     media_id
     source_id
-    uploaded_at
+    upload_date
     short_form_content
   )a
 
@@ -72,12 +69,10 @@ 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 :predicted_media_filepath, :string
     field :media_filepath, :string
     field :media_size_bytes, :integer
     field :thumbnail_filepath, :string
@@ -135,31 +130,7 @@ defmodule Pinchflat.Media.MediaItem 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
+  defp update_upload_date_index(%{changes: changes} = changeset) when is_map_key(changes, :upload_date) do
-  # 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
@@ -171,7 +142,7 @@ defmodule Pinchflat.Media.MediaItem do
 
     current_max =
       MediaQuery.new()
-      |> where(^dynamic([mi], ^MediaQuery.upload_date_matches(changes.uploaded_at) and ^MediaQuery.for_source(source)))
+      |> where(^dynamic([mi], mi.upload_date == ^changes.upload_date and ^MediaQuery.for_source(source)))
       |> Repo.aggregate(aggregator, :upload_date_index)
 
     case current_max do
@@ -180,7 +151,7 @@ defmodule Pinchflat.Media.MediaItem do
     end
   end
 
-  defp do_update_upload_date_index(changeset), do: changeset
+  defp update_upload_date_index(changeset), do: changeset
 
   defimpl Jason.Encoder, for: MediaItem do
     def encode(value, opts) do

lib/pinchflat/media/media_query.ex

@@ -33,15 +33,13 @@ defmodule Pinchflat.Media.MediaQuery do
   def downloaded, do: dynamic([mi], not is_nil(mi.media_filepath))
   def download_prevented, do: dynamic([mi], mi.prevent_download == true)
   def culling_prevented, do: dynamic([mi], mi.prevent_culling == true)
+  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 media_id(nil), do: dynamic(false)
+  def media_id(media_id), do: dynamic([mi], mi.media_id == ^media_id)
 
   def upload_date_after_source_cutoff do
-    dynamic(
+    dynamic([mi, source], is_nil(source.download_cutoff_date) or mi.upload_date >= source.download_cutoff_date)
-      [mi, source],
-      is_nil(source.download_cutoff_date) or
-        fragment("date(?) >= ?", mi.uploaded_at, source.download_cutoff_date)
-    )
   end
 
   def format_matching_profile_preference do
@@ -75,20 +73,12 @@ defmodule Pinchflat.Media.MediaQuery do
     )
   end
 
-  def meets_min_and_max_duration do
-    dynamic(
-      [mi, source],
-      (is_nil(source.min_duration_seconds) or fragment("duration_seconds >= ?", source.min_duration_seconds)) and
-        (is_nil(source.max_duration_seconds) or fragment("duration_seconds <= ?", source.max_duration_seconds))
-    )
-  end
-
   def past_retention_period do
     dynamic(
       [mi, source],
       fragment("""
         IFNULL(retention_period_days, 0) > 0 AND
-        DATETIME(media_downloaded_at, '+' || retention_period_days || ' day') < DATETIME('now')
+        DATETIME('now', '-' || retention_period_days || ' day') > media_downloaded_at
       """)
     )
   end
@@ -96,12 +86,12 @@ defmodule Pinchflat.Media.MediaQuery do
   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
+      # 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
-        DATE('now', '-' || redownload_delay_days || ' day') > DATE(uploaded_at) AND
+        DATETIME('now', '-' || redownload_delay_days || ' day') > upload_date AND
-        DATE(media_downloaded_at, '-' || redownload_delay_days || ' day') < DATE(uploaded_at)
+        DATETIME(media_downloaded_at, '-' || redownload_delay_days || ' day') < upload_date
       """)
     )
   end
@@ -115,15 +105,6 @@ defmodule Pinchflat.Media.MediaQuery do
     )
   end
 
-  def deletable_based_on_source_cutoff do
-    dynamic(
-      [mi, source],
-      ^downloaded() and
-        not (^upload_date_after_source_cutoff()) and
-        not (^culling_prevented())
-    )
-  end
-
   def pending do
     dynamic(
       [mi],
@@ -131,16 +112,16 @@ defmodule Pinchflat.Media.MediaQuery do
         not (^download_prevented()) and
         ^upload_date_after_source_cutoff() and
         ^format_matching_profile_preference() and
-        ^matches_source_title_regex() and
+        ^matches_source_title_regex()
-        ^meets_min_and_max_duration()
     )
   end
 
-  def upgradeable do
+  def redownloadable do
     dynamic(
       [mi, source],
       ^downloaded() and
         not (^download_prevented()) and
+        not (^culled()) and
         not (^redownloaded()) and
         ^past_redownload_delay()
     )

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,44 +47,55 @@ 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
+  Chooses the highest quality thumbnail available (preferring jpg). Returns
-
+  nil if no thumbnails are available.
-  Returns nil if no thumbnail is available or if yt-dlp encounters an error
 
   Returns binary() | nil
   """
-  def download_and_store_thumbnail_for(media_item_with_preloads) do
+  def download_and_store_thumbnail_for(database_record, metadata_map) do
-    yt_dlp_filepath = generate_filepath_for(media_item_with_preloads, "thumbnail.%(ext)s")
+    thumbnails =
-    real_filepath = generate_filepath_for(media_item_with_preloads, "thumbnail.jpg")
+      (metadata_map["thumbnails"] || [])
-    command_opts = [output: yt_dlp_filepath]
+      # Give it a low preference if the `preference` key doesn't exist
-    addl_opts = [use_cookies: media_item_with_preloads.source.use_cookies]
+      |> Enum.map(&Map.put_new(&1, "preference", -1000))
+      # Give it a low preference if image isn't a jpg
+      |> Enum.map(fn t ->
+        preference_weight = if String.ends_with?(t["url"], ".jpg"), do: t["preference"], else: t["preference"] - 1000
 
-    case YtDlpMedia.download_thumbnail(media_item_with_preloads.original_url, command_opts, addl_opts) do
+        Map.put(t, "preference", preference_weight)
-      {:ok, _} -> real_filepath
+      end)
-      _ -> nil
+
+    case Enum.sort_by(thumbnails, & &1["preference"], :desc) do
+      [thumbnail_map | _] ->
+        thumbnail_url = thumbnail_map["url"]
+        filepath = generate_filepath_for(database_record, Path.basename(thumbnail_url))
+        thumbnail_blob = fetch_thumbnail_from_url(thumbnail_url)
+
+        :ok = FilesystemUtils.write_p!(filepath, thumbnail_blob)
+
+        filepath
+
+      _ ->
+        nil
     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 """
@@ -126,19 +135,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

@@ -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
@@ -92,9 +94,7 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
 
   defp determine_series_directory(source) do
     output_path = DownloadOptionBuilder.build_output_path_for(source)
-    runner_opts = [output: output_path]
+    {:ok, %{filepath: filepath}} = MediaCollection.get_source_details(source.original_url, output: output_path)
-    addl_opts = [use_cookies: source.use_cookies]
-    {:ok, %{filepath: filepath}} = MediaCollection.get_source_details(source.original_url, runner_opts, addl_opts)
 
     case MetadataFileHelpers.series_directory_from_media_filepath(filepath) do
       {:ok, series_directory} -> series_directory
@@ -110,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, use_cookies: source.use_cookies)
-  end
-
   defp tmp_directory do
     Application.get_env(:pinchflat, :tmpfile_directory)
   end

lib/pinchflat/podcasts/podcast_helpers.ex

@@ -28,7 +28,7 @@ defmodule Pinchflat.Podcasts.PodcastHelpers do
 
     MediaQuery.new()
     |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.downloaded()))
-    |> order_by(desc: :uploaded_at)
+    |> order_by(desc: :upload_date)
     |> 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
 
@@ -82,7 +83,7 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
       <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)}"
@@ -132,6 +133,12 @@ defmodule Pinchflat.Podcasts.RssFeedBuilder do
     end
   end
 
+  defp generate_upload_date(media_item) do
+    media_item.upload_date
+    |> DatetimeUtils.date_to_datetime()
+    |> Calendar.strftime(@datetime_format)
+  end
+
   defp podcast_route(action, params) do
     Routes.podcast_path(PinchflatWeb.Endpoint, action, params)
   end

lib/pinchflat/profiles/media_profile.ex

@@ -26,11 +26,8 @@ defmodule Pinchflat.Profiles.MediaProfile do
     sponsorblock_categories
     shorts_behaviour
     livestream_behaviour
-    audio_track
     preferred_resolution
-    media_container
     redownload_delay_days
-    marked_for_deletion_at
   )a
 
   @required_fields ~w(name output_path_template)a
@@ -66,11 +63,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 :audio_track, :string
     field :preferred_resolution, Ecto.Enum, values: ~w(4320p 2160p 1080p 720p 480p 360p audio)a, default: :"1080p"
-    field :media_container, :string, default: nil
-
-    field :marked_for_deletion_at, :utc_datetime
 
     has_many :sources, Source
 

lib/pinchflat/profiles/media_profile_deletion_worker.ex

@@ -1,38 +0,0 @@
-defmodule Pinchflat.Profiles.MediaProfileDeletionWorker do
-  @moduledoc false
-
-  use Oban.Worker,
-    queue: :local_data,
-    tags: ["media_profiles", "local_data"]
-
-  require Logger
-
-  alias __MODULE__
-  alias Pinchflat.Profiles
-
-  @doc """
-  Starts the profile deletion worker. Does not attach it to a task like `kickoff_with_task/2`
-  since deletion also cancels all tasks for the profile
-
-  Returns {:ok, %Task{}} | {:error, %Ecto.Changeset{}}
-  """
-  def kickoff(profile, job_args \\ %{}, job_opts \\ []) do
-    %{id: profile.id}
-    |> Map.merge(job_args)
-    |> MediaProfileDeletionWorker.new(job_opts)
-    |> Oban.insert()
-  end
-
-  @doc """
-  Deletes a profile and optionally deletes its files
-
-  Returns :ok
-  """
-  @impl Oban.Worker
-  def perform(%Oban.Job{args: %{"id" => profile_id} = args}) do
-    delete_files = Map.get(args, "delete_files", false)
-    profile = Profiles.get_media_profile!(profile_id)
-
-    Profiles.delete_media_profile(profile, delete_files: delete_files)
-  end
-end

lib/pinchflat/profiles/profiles_query.ex

@@ -1,29 +0,0 @@
-defmodule Pinchflat.Profiles.ProfilesQuery do
-  @moduledoc """
-  Query helpers for the Profiles 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.Profiles.MediaProfile
-
-  # This allows the module to be aliased and query methods to be used
-  # all in one go
-  # usage: use Pinchflat.Profiles.ProfilesQuery
-  defmacro __using__(_opts) do
-    quote do
-      import Ecto.Query, warn: false
-
-      alias unquote(__MODULE__)
-    end
-  end
-
-  def new do
-    MediaProfile
-  end
-end

lib/pinchflat/release.ex

@@ -29,8 +29,6 @@ defmodule Pinchflat.Release do
       [
         "/config",
         "/downloads",
-        "/etc/yt-dlp",
-        "/etc/yt-dlp/plugins",
         Application.get_env(:pinchflat, :media_directory),
         Application.get_env(:pinchflat, :tmpfile_directory),
         Application.get_env(:pinchflat, :extras_directory),

lib/pinchflat/settings/setting.ex

@@ -13,15 +13,17 @@ defmodule Pinchflat.Settings.Setting do
     :apprise_version,
     :apprise_server,
     :video_codec_preference,
-    :audio_codec_preference,
+    :audio_codec_preference
-    :youtube_api_key
+  ]
+
+  @virtual_fields [
+    :video_codec_preference_string,
+    :audio_codec_preference_string
   ]
 
   @required_fields ~w(
     onboarding
     pro_enabled
-    video_codec_preference
-    audio_codec_preference
   )a
 
   schema "settings" do
@@ -30,16 +32,43 @@ 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 :video_codec_preference, {:array, :string}, default: []
-    field :audio_codec_preference, :string
+    field :audio_codec_preference, {:array, :string}, default: []
+    field :video_codec_preference_string, :string, default: nil, virtual: true
+    field :audio_codec_preference_string, :string, default: nil, virtual: true
   end
 
   @doc false
   def changeset(setting, attrs) do
     setting
     |> cast(attrs, @allowed_fields)
+    |> cast(attrs, @virtual_fields, empty_values: [])
+    |> convert_codec_preference_strings()
     |> validate_required(@required_fields)
   end
+
+  defp convert_codec_preference_strings(changeset) do
+    fields = [
+      video_codec_preference_string: :video_codec_preference,
+      audio_codec_preference_string: :audio_codec_preference
+    ]
+
+    Enum.reduce(fields, changeset, fn {virtual_field, actual_field}, changeset ->
+      case get_change(changeset, virtual_field) do
+        nil ->
+          changeset
+
+        value ->
+          new_value =
+            value
+            |> String.split(">")
+            |> Enum.map(&String.trim/1)
+            |> Enum.reject(&(String.trim(&1) == ""))
+            |> Enum.map(&String.downcase/1)
+
+          put_change(changeset, actual_field, new_value)
+      end
+    end)
+  end
 end

lib/pinchflat/slow_indexing/slow_indexing_helpers.ex

@@ -8,7 +8,6 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   require Logger
 
   alias Pinchflat.Repo
-  alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources
   alias Pinchflat.Sources.Source
@@ -16,7 +15,6 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   alias Pinchflat.YtDlp.MediaCollection
   alias Pinchflat.Downloading.DownloadingHelpers
   alias Pinchflat.SlowIndexing.FileFollowerServer
-  alias Pinchflat.Downloading.DownloadOptionBuilder
   alias Pinchflat.SlowIndexing.MediaCollectionIndexingWorker
 
   alias Pinchflat.YtDlp.Media, as: YtDlpMedia
@@ -25,28 +23,13 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   Starts tasks for indexing a source's media regardless of the source's indexing
   frequency. It's assumed the caller will check for indexing frequency.
 
-  Returns {:ok, %Task{}}
+  Returns {:ok, %Task{}}.
   """
   def kickoff_indexing_task(%Source{} = source, job_args \\ %{}, job_opts \\ []) do
-    job_offset_seconds = calculate_job_offset_seconds(source)
-
     Tasks.delete_pending_tasks_for(source, "FastIndexingWorker")
-    Tasks.delete_pending_tasks_for(source, "MediaCollectionIndexingWorker", include_executing: true)
+    Tasks.delete_pending_tasks_for(source, "MediaCollectionIndexingWorker")
 
-    MediaCollectionIndexingWorker.kickoff_with_task(source, job_args, job_opts ++ [schedule_in: job_offset_seconds])
+    MediaCollectionIndexingWorker.kickoff_with_task(source, job_args, job_opts)
-  end
-
-  @doc """
-  A helper method to delete all indexing-related tasks for a source.
-  Optionally, you can include executing tasks in the deletion process.
-
-  Returns :ok
-  """
-  def delete_indexing_tasks(%Source{} = source, opts \\ []) do
-    include_executing = Keyword.get(opts, :include_executing, false)
-
-    Tasks.delete_pending_tasks_for(source, "FastIndexingWorker", include_executing: include_executing)
-    Tasks.delete_pending_tasks_for(source, "MediaCollectionIndexingWorker", include_executing: include_executing)
   end
 
   @doc """
@@ -55,6 +38,9 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   item belonging to the source. You can't tell me the method name isn't descriptive!
   Returns a list of media items or changesets (if the media item couldn't be created).
 
+  For each new media item, the method will also run a user script with the `media_indexed`
+  event, if the script is present.
+
   Indexing is slow and usually returns a list of all media data at once for record creation.
   To help with this, we use a file follower to watch the file that yt-dlp writes to
   so we can create media items as they come in. This parallelizes the process and adds
@@ -72,9 +58,6 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
   Returns [%MediaItem{} | %Ecto.Changeset{}]
   """
   def index_and_enqueue_download_for_media_items(%Source{} = source) do
-    # The media_profile is needed to determine the quality options to _then_ determine a more
-    # accurate predicted filepath
-    source = Repo.preload(source, [:media_profile])
     # See the method definition below for more info on how file watchers work
     # (important reading if you're not familiar with it)
     {:ok, media_attributes} = setup_file_watcher_and_kickoff_indexing(source)
@@ -83,15 +66,16 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
     source = Repo.reload!(source)
 
     result =
-      Enum.map(media_attributes, fn media_attrs ->
+      Enum.map(media_attributes, fn media_attrs_struct ->
-        case Media.create_media_item_from_backend_attrs(source, media_attrs) do
+        case DownloadingHelpers.create_media_item_and_run_script(source, media_attrs_struct) do
           {:ok, media_item} -> media_item
           {:error, changeset} -> changeset
         end
       end)
 
     Sources.update_source(source, %{last_indexed_at: DateTime.utc_now()})
-    DownloadingHelpers.enqueue_pending_download_tasks(source)
+    # Wait 5s before enqueuing downloads to give the post-indexing user script a chance to run
+    DownloadingHelpers.enqueue_pending_download_tasks(source, kickoff_delay: 5)
 
     result
   end
@@ -113,13 +97,7 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
     {:ok, pid} = FileFollowerServer.start_link()
 
     handler = fn filepath -> setup_file_follower_watcher(pid, filepath, source) end
-
+    result = MediaCollection.get_media_attributes_for_collection(source.original_url, file_listener_handler: handler)
-    command_opts =
-      [output: DownloadOptionBuilder.build_output_path_for(source)] ++
-        DownloadOptionBuilder.build_quality_options_for(source)
-
-    runner_opts = [file_listener_handler: handler, use_cookies: source.use_cookies]
-    result = MediaCollection.get_media_attributes_for_collection(source.original_url, command_opts, runner_opts)
 
     FileFollowerServer.stop(pid)
 
@@ -143,27 +121,18 @@ defmodule Pinchflat.SlowIndexing.SlowIndexingHelpers do
     end)
   end
 
-  defp create_media_item_and_enqueue_download(source, media_attrs) do
+  defp create_media_item_and_enqueue_download(source, media_attrs_struct) do
     # Reload because the source may have been updated during the (long-running) indexing process
     # and important settings like `download_media` may have changed.
     source = Repo.reload!(source)
 
-    case Media.create_media_item_from_backend_attrs(source, media_attrs) do
+    case DownloadingHelpers.create_media_item_and_run_script(source, media_attrs_struct) do
       {:ok, %MediaItem{} = media_item} ->
-        DownloadingHelpers.kickoff_download_if_pending(media_item)
+        # Wait 5s before enqueuing downloads to give the post-indexing user script a chance to run
+        DownloadingHelpers.kickoff_download_if_pending(media_item, kickoff_delay: 5)
 
       {:error, changeset} ->
         changeset
     end
   end
-
-  # Find the difference between the current time and the last time the source was indexed
-  defp calculate_job_offset_seconds(%Source{last_indexed_at: nil}), do: 0
-
-  defp calculate_job_offset_seconds(source) do
-    offset_seconds = DateTime.diff(DateTime.utc_now(), source.last_indexed_at, :second)
-    index_frequency_seconds = source.index_frequency_minutes * 60
-
-    max(0, index_frequency_seconds - offset_seconds)
-  end
 end

lib/pinchflat/sources/source.ex

@@ -15,7 +15,6 @@ defmodule Pinchflat.Sources.Source do
   alias Pinchflat.Metadata.SourceMetadata
 
   @allowed_fields ~w(
-    enabled
     collection_name
     collection_id
     collection_type
@@ -28,7 +27,6 @@ defmodule Pinchflat.Sources.Source do
     series_directory
     index_frequency_minutes
     fast_index
-    use_cookies
     download_media
     last_indexed_at
     original_url
@@ -37,9 +35,6 @@ defmodule Pinchflat.Sources.Source do
     title_filter_regex
     media_profile_id
     output_path_template_override
-    marked_for_deletion_at
-    min_duration_seconds
-    max_duration_seconds
   )a
 
   # Expensive API calls are made when a source is inserted/updated so
@@ -65,7 +60,6 @@ defmodule Pinchflat.Sources.Source do
                                 )a
 
   schema "sources" do
-    field :enabled, :boolean, default: true
     # This is _not_ used as the primary key or internally in the database
     # relations. This is only used to prevent an enumeration attack on the streaming
     # and RSS feed endpoints since those _must_ be public (ie: no basic auth)
@@ -78,7 +72,6 @@ defmodule Pinchflat.Sources.Source do
     field :collection_type, Ecto.Enum, values: [:channel, :playlist]
     field :index_frequency_minutes, :integer, default: 60 * 24
     field :fast_index, :boolean, default: false
-    field :use_cookies, :boolean, default: false
     field :download_media, :boolean, default: true
     field :last_indexed_at, :utc_datetime
     # Only download media items that were published after this date
@@ -88,17 +81,12 @@ defmodule Pinchflat.Sources.Source do
     field :title_filter_regex, :string
     field :output_path_template_override, :string
 
-    field :min_duration_seconds, :integer
-    field :max_duration_seconds, :integer
-
     field :series_directory, :string
     field :nfo_filepath, :string
     field :poster_filepath, :string
     field :fanart_filepath, :string
     field :banner_filepath, :string
 
-    field :marked_for_deletion_at, :utc_datetime
-
     belongs_to :media_profile, MediaProfile
 
     has_one :metadata, SourceMetadata, on_replace: :update
@@ -124,12 +112,9 @@ 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_min_and_max_durations()
     |> 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
@@ -143,7 +128,7 @@ defmodule Pinchflat.Sources.Source do
   @doc false
   def fast_index_frequency do
     # minutes
-    10
+    15
   end
 
   @doc false
@@ -156,33 +141,6 @@ defmodule Pinchflat.Sources.Source 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
-
-  defp validate_min_and_max_durations(changeset) do
-    min_duration = get_change(changeset, :min_duration_seconds)
-    max_duration = get_change(changeset, :max_duration_seconds)
-
-    case {min_duration, max_duration} do
-      {min, max} when is_nil(min) or is_nil(max) -> changeset
-      {min, max} when min >= max -> add_error(changeset, :max_duration_seconds, "must be greater than minumum duration")
-      _ -> changeset
-    end
-  end
-
   defimpl Jason.Encoder, for: Source do
     def encode(value, opts) do
       value

lib/pinchflat/sources/source_deletion_worker.ex

@@ -1,38 +0,0 @@
-defmodule Pinchflat.Sources.SourceDeletionWorker do
-  @moduledoc false
-
-  use Oban.Worker,
-    queue: :local_data,
-    tags: ["sources", "local_data"]
-
-  require Logger
-
-  alias __MODULE__
-  alias Pinchflat.Sources
-
-  @doc """
-  Starts the source deletion worker. Does not attach it to a task like `kickoff_with_task/2`
-  since deletion also cancels all tasks for the source
-
-  Returns {:ok, %Task{}} | {:error, %Ecto.Changeset{}}
-  """
-  def kickoff(source, job_args \\ %{}, job_opts \\ []) do
-    %{id: source.id}
-    |> Map.merge(job_args)
-    |> SourceDeletionWorker.new(job_opts)
-    |> Oban.insert()
-  end
-
-  @doc """
-  Deletes a source and optionally deletes its files
-
-  Returns :ok
-  """
-  @impl Oban.Worker
-  def perform(%Oban.Job{args: %{"id" => source_id} = args}) do
-    delete_files = Map.get(args, "delete_files", false)
-    source = Sources.get_source!(source_id)
-
-    Sources.delete_source(source, delete_files: delete_files)
-  end
-end

lib/pinchflat/sources/sources.ex

@@ -15,8 +15,8 @@ defmodule Pinchflat.Sources do
   alias Pinchflat.Metadata.SourceMetadata
   alias Pinchflat.Utils.FilesystemUtils
   alias Pinchflat.Downloading.DownloadingHelpers
+  alias Pinchflat.FastIndexing.FastIndexingWorker
   alias Pinchflat.SlowIndexing.SlowIndexingHelpers
-  alias Pinchflat.FastIndexing.FastIndexingHelpers
   alias Pinchflat.Metadata.SourceMetadataStorageWorker
 
   @doc """
@@ -180,19 +180,11 @@ defmodule Pinchflat.Sources do
   end
 
   defp add_source_details_to_changeset(source, changeset) do
-    use_cookies = Ecto.Changeset.get_field(changeset, :use_cookies)
+    case MediaCollection.get_source_details(changeset.changes.original_url) do
-
-    case MediaCollection.get_source_details(changeset.changes.original_url, [], use_cookies: use_cookies) do
       {:ok, source_details} ->
         add_source_details_by_collection_type(source, changeset, source_details)
 
-      err ->
+      {:error, runner_error, _status_code} ->
-        runner_error =
-          case err do
-            {:error, error_msg, _status_code} -> error_msg
-            {:error, error_msg} -> error_msg
-          end
-
         Ecto.Changeset.add_error(
           changeset,
           :original_url,
@@ -255,41 +247,20 @@ defmodule Pinchflat.Sources do
     end
   end
 
-  # If the source is new (ie: not persisted), do nothing
+  # If the source is NOT new (ie: updated) and the download_media flag has changed,
-  defp maybe_handle_media_tasks(%{data: %{__meta__: %{state: state}}}, _source) when state != :loaded do
-    :ok
-  end
-
-  # If the source is NOT new (ie: updated),
   # enqueue or dequeue media download tasks as necessary.
   defp maybe_handle_media_tasks(changeset, source) do
-    current_changes = changeset.changes
+    case {changeset.data, changeset.changes} do
-    applied_changes = Ecto.Changeset.apply_changes(changeset)
+      {%{__meta__: %{state: :loaded}}, %{download_media: true}} ->
-
-    # We need both current_changes and applied_changes to determine
-    # the course of action to take. For example, we only care if a source is supposed
-    # to be `enabled` or not - we don't care if that information comes from the
-    # current changes or if that's how it already was in the database.
-    # Rephrased, we're essentially using it in place of `get_field/2`
-    case {current_changes, applied_changes} do
-      {%{download_media: true}, %{enabled: true}} ->
         DownloadingHelpers.enqueue_pending_download_tasks(source)
 
-      {%{enabled: true}, %{download_media: true}} ->
+      {%{__meta__: %{state: :loaded}}, %{download_media: false}} ->
-        DownloadingHelpers.enqueue_pending_download_tasks(source)
-
-      {%{download_media: false}, _} ->
-        DownloadingHelpers.dequeue_pending_download_tasks(source)
-
-      {%{enabled: false}, _} ->
         DownloadingHelpers.dequeue_pending_download_tasks(source)
 
       _ ->
-        nil
-    end
-
         :ok
     end
+  end
 
   defp maybe_run_indexing_task(changeset, source) do
     case changeset.data do
@@ -322,22 +293,13 @@ defmodule Pinchflat.Sources do
   end
 
   defp maybe_update_slow_indexing_task(changeset, source) do
-    # See comment in `maybe_handle_media_tasks` as to why we need these
+    case changeset.changes do
-    current_changes = changeset.changes
+      %{index_frequency_minutes: mins} when mins > 0 ->
-    applied_changes = Ecto.Changeset.apply_changes(changeset)
-
-    case {current_changes, applied_changes} do
-      {%{index_frequency_minutes: mins}, %{enabled: true}} when mins > 0 ->
         SlowIndexingHelpers.kickoff_indexing_task(source)
 
-      {%{enabled: true}, %{index_frequency_minutes: mins}} when mins > 0 ->
+      %{index_frequency_minutes: _} ->
-        SlowIndexingHelpers.kickoff_indexing_task(source)
+        Tasks.delete_pending_tasks_for(source, "FastIndexingWorker")
-
+        Tasks.delete_pending_tasks_for(source, "MediaCollectionIndexingWorker")
-      {%{index_frequency_minutes: _}, _} ->
-        SlowIndexingHelpers.delete_indexing_tasks(source, include_executing: true)
-
-      {%{enabled: false}, _} ->
-        SlowIndexingHelpers.delete_indexing_tasks(source, include_executing: true)
 
       _ ->
         :ok
@@ -345,25 +307,13 @@ defmodule Pinchflat.Sources do
   end
 
   defp maybe_update_fast_indexing_task(changeset, source) do
-    # See comment in `maybe_handle_media_tasks` as to why we need these
+    case changeset.changes do
-    current_changes = changeset.changes
+      %{fast_index: true} ->
-    applied_changes = Ecto.Changeset.apply_changes(changeset)
+        Tasks.delete_pending_tasks_for(source, "FastIndexingWorker")
+        FastIndexingWorker.kickoff_with_task(source)
 
-    # This technically could be simplified since `maybe_update_slow_indexing_task`
+      %{fast_index: false} ->
-    # has some overlap re: deleting pending tasks, but I'm keeping it separate
+        Tasks.delete_pending_tasks_for(source, "FastIndexingWorker")
-    # for clarity and explicitness.
-    case {current_changes, applied_changes} do
-      {%{fast_index: true}, %{enabled: true}} ->
-        FastIndexingHelpers.kickoff_indexing_task(source)
-
-      {%{enabled: true}, %{fast_index: true}} ->
-        FastIndexingHelpers.kickoff_indexing_task(source)
-
-      {%{fast_index: false}, _} ->
-        Tasks.delete_pending_tasks_for(source, "FastIndexingWorker", include_executing: true)
-
-      {%{enabled: false}, _} ->
-        Tasks.delete_pending_tasks_for(source, "FastIndexingWorker", include_executing: true)
 
       _ ->
         :ok

lib/pinchflat/tasks/tasks.ex

@@ -53,6 +53,20 @@ defmodule Pinchflat.Tasks do
     )
   end
 
+  @doc """
+  Returns the list of pending tasks for a given record type and ID. Optionally allows you to specify
+  which worker to include.
+
+  Returns [%Task{}, ...]
+  """
+  def list_pending_tasks_for(record, worker_name \\ nil) do
+    list_tasks_for(
+      record,
+      worker_name,
+      [:available, :scheduled, :retryable]
+    )
+  end
+
   @doc """
   Gets a single task.
 
@@ -113,13 +127,13 @@ defmodule Pinchflat.Tasks do
 
   @doc """
   Deletes all tasks attached to a given record, cancelling any attached jobs.
-  Optionally allows you to specify which worker and job states to include.
+  Optionally allows you to specify which worker to include.
 
   Returns :ok
   """
-  def delete_tasks_for(record, worker_name \\ nil, job_states \\ Oban.Job.states()) do
+  def delete_tasks_for(record, worker_name \\ nil) do
     record
-    |> list_tasks_for(worker_name, job_states)
+    |> list_tasks_for(worker_name)
     |> Enum.each(&delete_task/1)
   end
 
@@ -129,12 +143,10 @@ defmodule Pinchflat.Tasks do
 
   Returns :ok
   """
-  def delete_pending_tasks_for(record, worker_name \\ nil, opts \\ []) do
+  def delete_pending_tasks_for(record, worker_name \\ nil) do
-    include_executing = Keyword.get(opts, :include_executing, false)
+    record
-    base_job_states = [:available, :scheduled, :retryable]
+    |> list_pending_tasks_for(worker_name)
-    job_states = if include_executing, do: base_job_states ++ [:executing], else: base_job_states
+    |> Enum.each(&delete_task/1)
-
-    delete_tasks_for(record, worker_name, job_states)
   end
 
   @doc """

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

@@ -20,24 +20,6 @@ defmodule Pinchflat.Utils.FilesystemUtils do
     end
   end
 
-  @doc """
-  Checks if two filepaths reference the same file.
-
-  Useful if you have a relative and absolute filepath and want to be sure they're the same file.
-  Also works with symlinks.
-
-  Returns boolean()
-  """
-  def filepaths_reference_same_file?(filepath_1, filepath_2) do
-    {:ok, stat_1} = File.stat(filepath_1)
-    {:ok, stat_2} = File.stat(filepath_2)
-
-    identifier_1 = "#{stat_1.major_device}:#{stat_1.minor_device}:#{stat_1.inode}"
-    identifier_2 = "#{stat_2.major_device}:#{stat_2.minor_device}:#{stat_2.inode}"
-
-    identifier_1 == identifier_2
-  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/map_utils.ex

@@ -1,17 +0,0 @@
-defmodule Pinchflat.Utils.MapUtils do
-  @moduledoc """
-  Utility methods for working with maps
-  """
-
-  @doc """
-  Converts a nested list of 2-element tuples or lists into a map.
-
-  Returns map()
-  """
-  def from_nested_list(list) do
-    Enum.reduce(list, %{}, fn
-      [key, value], acc -> Map.put(acc, key, value)
-      {key, value}, acc -> Map.put(acc, key, value)
-    end)
-  end
-end

lib/pinchflat/yt_dlp/command_runner.ex

@@ -18,8 +18,6 @@ defmodule Pinchflat.YtDlp.CommandRunner do
     - :output_filepath - the path to save the output to. If not provided, a temporary
       file will be created and used. Useful for if you need a reference to the file
       for a file watcher.
-    - :use_cookies - if true, will add a cookie file to the command options. Will not
-      attach a cookie file if the user hasn't set one up.
 
   Returns {:ok, binary()} | {:error, output, status}.
   """
@@ -30,7 +28,7 @@ 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(addl_opts)
+    user_configured_opts = cookie_file_options()
     # These must stay in exactly this order, hence why I'm giving it its own variable.
     all_opts = command_opts ++ print_to_file_opts ++ user_configured_opts ++ global_options()
     formatted_command_opts = [url] ++ CliUtils.parse_options(all_opts)
@@ -80,14 +78,7 @@ defmodule Pinchflat.YtDlp.CommandRunner do
     ]
   end
 
-  defp cookie_file_options(addl_opts) do
+  defp cookie_file_options do
-    case Keyword.get(addl_opts, :use_cookies) do
-      true -> add_cookie_file()
-      _ -> []
-    end
-  end
-
-  defp add_cookie_file do
     base_dir = Application.get_env(:pinchflat, :extras_directory)
     filename_options_map = %{cookies: "cookies.txt"}
 

lib/pinchflat/yt_dlp/media.ex

@@ -10,9 +10,8 @@ defmodule Pinchflat.YtDlp.Media do
     :original_url,
     :livestream,
     :short_form_content,
-    :uploaded_at,
+    :upload_date,
-    :duration_seconds,
+    :duration_seconds
-    :predicted_media_filepath
   ]
 
   defstruct [
@@ -22,10 +21,8 @@ defmodule Pinchflat.YtDlp.Media do
     :original_url,
     :livestream,
     :short_form_content,
-    :uploaded_at,
+    :upload_date,
-    :duration_seconds,
+    :duration_seconds
-    :playlist_index,
-    :predicted_media_filepath
   ]
 
   alias __MODULE__
@@ -39,9 +36,9 @@ defmodule Pinchflat.YtDlp.Media do
   Returns {:ok, map()} | {:error, any, ...}.
   """
   def download(url, command_opts \\ [], addl_opts \\ []) do
-    all_command_opts = [:no_simulate] ++ command_opts
+    opts = [:no_simulate] ++ command_opts
 
-    with {:ok, output} <- backend_runner().run(url, all_command_opts, "after_move:%()j", addl_opts),
+    with {:ok, output} <- backend_runner().run(url, opts, "after_move:%()j", addl_opts),
          {:ok, parsed_json} <- Phoenix.json_library().decode(output) do
       {:ok, parsed_json}
     else
@@ -49,50 +46,17 @@ defmodule Pinchflat.YtDlp.Media do
     end
   end
 
-  @doc """
-  Determines if the media at the given URL is ready to be downloaded.
-  Common examples of non-downloadable media are upcoming or in-progress live streams.
-
-  Returns {:ok, :downloadable | :ignorable} | {:error, any}
-  """
-  def get_downloadable_status(url) do
-    case backend_runner().run(url, [:simulate, :skip_download], "%(.{live_status})j") do
-      {:ok, output} ->
-        output
-        |> Phoenix.json_library().decode!()
-        |> parse_downloadable_status()
-
-      err ->
-        err
-    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 \\ [], addl_opts \\ []) do
-    all_command_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, all_command_opts, "after_move:%()j", addl_opts)
-  end
-
   @doc """
   Returns a map representing the media at the given URL.
-  Optionally takes a list of additional command options to pass to yt-dlp
-  or configuration-related options to pass to the runner.
 
-  Returns {:ok, %Media{}} | {:error, any, ...}.
+  Returns {:ok, [map()]} | {:error, any, ...}.
   """
-  def get_media_attributes(url, command_opts \\ [], addl_opts \\ []) do
+  def get_media_attributes(url) do
-    all_command_opts = [:simulate, :skip_download] ++ command_opts
+    runner = Application.get_env(:pinchflat, :yt_dlp_runner)
+    command_opts = [:simulate, :skip_download]
     output_template = indexing_output_template()
 
-    case backend_runner().run(url, all_command_opts, output_template, addl_opts) do
+    case runner.run(url, command_opts, output_template) do
       {:ok, output} ->
         output
         |> Phoenix.json_library().decode!()
@@ -106,13 +70,9 @@ defmodule Pinchflat.YtDlp.Media do
 
   @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.
-  NOTE: I've switched back to `original_url` (from `webpage_url`) since it's started indicating
-        if something is a short via the URL again
   """
   def indexing_output_template do
-    "%(.{id,title,live_status,original_url,description,aspect_ratio,duration,upload_date,timestamp,playlist_index,filename})j"
+    "%(.{id,title,was_live,webpage_url,description,aspect_ratio,duration,upload_date})j"
   end
 
   @doc """
@@ -126,18 +86,16 @@ defmodule Pinchflat.YtDlp.Media do
       media_id: response["id"],
       title: response["title"],
       description: response["description"],
-      original_url: response["original_url"],
+      original_url: response["webpage_url"],
-      livestream: !!response["live_status"] && response["live_status"] != "not_live",
+      livestream: !!response["was_live"],
       duration_seconds: response["duration"] && round(response["duration"]),
-      short_form_content: response["original_url"] && short_form_content?(response),
+      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,
-      predicted_media_filepath: response["filename"]
     }
   end
 
   defp short_form_content?(response) do
-    if String.contains?(response["original_url"], "/shorts/") do
+    if String.contains?(response["webpage_url"], "/shorts/") do
       true
     else
       # Sometimes shorts are returned without /shorts/ in the URL,
@@ -148,29 +106,7 @@ defmodule Pinchflat.YtDlp.Media do
       #
       # These don't fail if duration or aspect_ratio are missing
       # due to Elixir's comparison semantics
-      response["duration"] <= 60 && response["aspect_ratio"] <= 0.85
+      response["duration"] <= 60 && response["aspect_ratio"] < 0.8
-    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 parse_downloadable_status(response) do
-    case response["live_status"] do
-      status when status in ["is_live", "is_upcoming", "post_live"] -> {:ok, :ignorable}
-      status when status in ["was_live", "not_live"] -> {:ok, :downloadable}
-      # This preserves my tenuous support for non-youtube sources.
-      nil -> {:ok, :downloadable}
-      _ -> {:error, "Unknown live status: #{response["live_status"]}"}
     end
   end
 

lib/pinchflat/yt_dlp/media_collection.ex

@@ -11,34 +11,29 @@ defmodule Pinchflat.YtDlp.MediaCollection do
 
   @doc """
   Returns a list of maps representing the media in the collection.
-  Optionally takes a list of additional command options to pass to yt-dlp
-  or configuration-related options to pass to the runner.
 
-  Runner Options:
+  Options:
     - :file_listener_handler - a function that will be called with the path to the
       file that will be written to when yt-dlp is done. This is useful for
       setting up a file watcher to know when the file is ready to be read.
-    - :use_cookies - whether or not to use user-provided cookies when fetching the media details
 
   Returns {:ok, [map()]} | {:error, any, ...}.
   """
-  def get_media_attributes_for_collection(url, command_opts \\ [], addl_opts \\ []) do
+  def get_media_attributes_for_collection(url, addl_opts \\ []) do
     runner = Application.get_env(:pinchflat, :yt_dlp_runner)
     # `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
-    all_command_opts = [:simulate, :skip_download, :ignore_no_formats_error, :no_warnings] ++ command_opts
+    command_opts = [:simulate, :skip_download, :ignore_no_formats_error, :no_warnings]
-    use_cookies = Keyword.get(addl_opts, :use_cookies, false)
     output_template = YtDlpMedia.indexing_output_template()
     output_filepath = FilesystemUtils.generate_metadata_tmpfile(:json)
     file_listener_handler = Keyword.get(addl_opts, :file_listener_handler, false)
-    runner_opts = [output_filepath: output_filepath, use_cookies: use_cookies]
 
     if file_listener_handler do
       file_listener_handler.(output_filepath)
     end
 
-    case runner.run(url, all_command_opts, output_template, runner_opts) do
+    case runner.run(url, command_opts, output_template, output_filepath: output_filepath) do
       {:ok, output} ->
         parsed_lines =
           output
@@ -69,7 +64,7 @@ defmodule Pinchflat.YtDlp.MediaCollection do
 
   Returns {:ok, map()} | {:error, any, ...}.
   """
-  def get_source_details(source_url, command_opts \\ [], addl_opts \\ []) do
+  def get_source_details(source_url, addl_opts \\ []) 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
@@ -80,14 +75,13 @@ defmodule Pinchflat.YtDlp.MediaCollection do
       playlist_end: 1
     ]
 
-    all_command_opts = default_opts ++ command_opts
+    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, all_command_opts, output_template, addl_opts),
+    with {:ok, output} <- backend_runner().run(source_url, command_opts, output_template),
          {:ok, parsed_json} <- Phoenix.json_library().decode(output) do
       {:ok, format_source_details(parsed_json)}
     else
-      {:error, %Jason.DecodeError{}} -> {:error, "Error decoding JSON response"}
       err -> err
     end
   end
@@ -105,24 +99,13 @@ 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, command_opts, addl_opts \\ []) 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!(command_opts, :playlist_items)
-
-    all_command_opts = [:skip_download] ++ command_opts
     output_template = "playlist:%()j"
 
-    with {:ok, output} <- backend_runner().run(source_url, all_command_opts, output_template, addl_opts),
+    with {:ok, output} <- backend_runner().run(source_url, opts, output_template),
          {:ok, parsed_json} <- Phoenix.json_library().decode(output) do
       {:ok, parsed_json}
     else

lib/pinchflat_web/components/core_components.ex

@@ -19,7 +19,6 @@ defmodule PinchflatWeb.CoreComponents do
   import PinchflatWeb.Gettext
 
   alias Phoenix.LiveView.JS
-  alias PinchflatWeb.CustomComponents.TextComponents
 
   @doc """
   Renders a modal.
@@ -340,15 +339,14 @@ defmodule PinchflatWeb.CoreComponents do
       end)
 
     ~H"""
-    <div x-data={"{ enabled: #{@checked} }"} class="" phx-update="ignore" id={"#{@id}-wrapper"}>
+    <div x-data={"{ enabled: #{@checked}}"}>
-      <.label :if={@label} for={@id}>
+      <.label for={@id}>
         <%= @label %>
         <span :if={@label_suffix} class="text-xs text-bodydark"><%= @label_suffix %></span>
       </.label>
-      <div class="relative flex flex-col">
+      <div class="relative">
         <input type="hidden" id={@id} name={@name} x-bind:value="enabled" {@rest} />
-        <%!-- This triggers a `change` event on the hidden input when the toggle is clicked --%>
+        <div class="inline-block cursor-pointer" @click="enabled = !enabled">
-        <div class="inline-block cursor-pointer" @click={"enabled = !enabled; dispatchFor('#{@id}', 'change')"}>
           <div x-bind:class="enabled && '!bg-primary'" class="block h-8 w-14 rounded-full bg-black"></div>
           <div
             x-bind:class="enabled && '!right-1 !translate-x-full'"
@@ -646,11 +644,7 @@ defmodule PinchflatWeb.CoreComponents do
       <li :for={{k, v} <- @iterable_attributes} class="mb-2 w-2/3">
         <strong><%= k %>:</strong>
         <code class="inline-block text-sm font-mono text-gray p-0.5 mx-0.5">
-          <%= 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/table_components.ex

@@ -2,8 +2,7 @@ defmodule PinchflatWeb.CustomComponents.TableComponents do
   @moduledoc false
   use Phoenix.Component
 
-  import PinchflatWeb.CoreComponents
+  alias PinchflatWeb.CoreComponents
-  import PinchflatWeb.CustomComponents.TextComponents
 
   @doc """
   Renders a table component with the given rows and columns.
@@ -77,13 +76,11 @@ defmodule PinchflatWeb.CustomComponents.TableComponents do
             phx-click={@page_number != 1 && "page_change"}
             phx-value-direction="dec"
           >
-            <.icon name="hero-chevron-left" />
+            <CoreComponents.icon name="hero-chevron-left" />
           </span>
         </li>
         <li>
-          <span class="mx-2">
+          <span class="mx-2">Page <%= @page_number %> of <%= @total_pages %></span>
-            Page <.localized_number number={@page_number} /> of <.localized_number number={@total_pages} />
-          </span>
         </li>
         <li>
           <span
@@ -95,7 +92,7 @@ defmodule PinchflatWeb.CustomComponents.TableComponents do
             phx-click={@page_number != @total_pages && "page_change"}
             phx-value-direction="inc"
           >
-            <.icon name="hero-chevron-right" />
+            <CoreComponents.icon name="hero-chevron-right" />
           </span>
         </li>
       </ul>

lib/pinchflat_web/components/custom_components/text_components.ex

@@ -62,24 +62,17 @@ defmodule PinchflatWeb.CustomComponents.TextComponents do
   end
 
   @doc """
-  Renders a block of text with each line broken into a separate span and links highlighted.
+  Renders a block of text with each line broken into a separate span.
   """
   attr :text, :string, required: true
 
-  def render_description(assigns) do
+  def break_on_newline(assigns) do
-    formatted_text =
+    broken_text =
-      Regex.split(~r{https?://\S+}, assigns.text, include_captures: true)
+      assigns.text
-      |> Enum.map(fn
-        "http" <> _ = url ->
-          Phoenix.HTML.Tag.content_tag(:a, url, class: "text-blue-500 hover:text-blue-300", href: url, target: "_blank")
-
-        text ->
-          text
       |> String.split("\n", trim: false)
       |> Enum.intersperse(Phoenix.HTML.Tag.tag(:span, class: "inline-block mt-2"))
-      end)
 
-    assigns = Map.put(assigns, :text, formatted_text)
+    assigns = Map.put(assigns, :text, broken_text)
 
     ~H"""
     <span><%= @text %></span>
@@ -101,28 +94,4 @@ defmodule PinchflatWeb.CustomComponents.TextComponents do
     <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

@@ -64,7 +64,7 @@ defmodule PinchflatWeb.Layouts do
           <.icon name={@icon} /> <%= @text %>
         </span>
         <span class="text-bodydark2">
-          <.icon name="hero-chevron-down" x-bind:class="{ 'rotate-180': selected }" />
+          <.icon name="hero-chevron-up" x-bind:class="{ 'rotate-180': selected }" />
         </span>
       </span>
 

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

@@ -3,7 +3,7 @@ defmodule Pinchflat.UpgradeButtonLive do
 
   def render(assigns) do
     ~H"""
-    <form id="upgradeForm" phx-change="check_matching_text" phx-hook="supress-enter-submission">
+    <form id="upgradeForm" phx-change="check_matching_text" phx-hook="supressEnterSubmission">
       <.input type="text" name="unlock-pro-textbox" value="" />
     </form>
 

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

@@ -1,7 +1,14 @@
 defmodule PinchflatWeb.ErrorHTML do
   use PinchflatWeb, :html
 
-  embed_templates "error_html/*"
+  # If you want to customize your error pages,
+  # uncomment the embed_templates/1 call below
+  # and add pages to the error directory:
+  #
+  #   * lib/pinchflat_web/controllers/error_html/404.html.heex
+  #   * lib/pinchflat_web/controllers/error_html/500.html.heex
+  #
+  # embed_templates "error_html/*"
 
   # The default is to render a plain text page based on
   # the template name. For example, "404.html" becomes

lib/pinchflat_web/controllers/error_html/404.html.heex

@@ -1,3 +0,0 @@
-<section>
-  <h2 class="text-title-md2 font-bold text-white">404 (not found)</h2>
-</section>

lib/pinchflat_web/controllers/error_html/500.html.heex

@@ -1,29 +0,0 @@
-<section>
-  <h2 class="text-title-md2 font-bold text-white">Internal Server Error</h2>
-  <p class="text-body-md text-white mt-2">
-    This shouldn't happen! Please make a
-    <.inline_link href="https://github.com/kieraneglin/pinchflat/issues/new/choose">GitHub issue</.inline_link>
-    with the following information:
-  </p>
-
-  <ul class="list-disc ml-8 mb-8">
-    <li>What you were doing when you saw this page</li>
-    <li>
-      Your system details and logs from
-      <.inline_link href={~p"/app_info"}>app info</.inline_link>
-    </li>
-    <li>All the information in the textarea below (use select all + copy)</li>
-  </ul>
-  <textarea class="w-full min-h-96 font-mono inline-block rounded-lg" readonly>
-**Status**:
-`<%= if Map.has_key?(assigns, :status), do: @status, else: "" %>`
-
-**Reason**:
-`<%= if Map.has_key?(assigns, :reason), do: inspect(@reason), else: "" %>`
-
-**Stacktrace**:
-```
-  <%= if Map.has_key?(assigns, :stack), do: Exception.format_stacktrace(@stack), else: "" %>
-```
-  </textarea>
-</section>

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

@@ -2,7 +2,7 @@
   <:option>
     <span x-data="{ copied: false }" x-on:click={~s"
         copyWithCallbacks(
-          String.raw`#{Jason.Formatter.pretty_print(Phoenix.json_library().encode!(@media_item))}`,
+          `#{Jason.Formatter.pretty_print(Phoenix.json_library().encode!(@media_item))}`, 
           () => copied = true, 
           () => copied = false
         )

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

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

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

@@ -26,29 +26,25 @@
       <:tab title="Media" id="media">
         <div class="flex flex-col gap-10 dark:text-white">
           <%= if media_file_exists?(@media_item) do %>
-            <section class="grid grid-cols-1 xl:gap-6 mt-6">
+            <section class="grid grid-cols-1 xl:grid-cols-2 xl:gap-6 mt-6">
               <div>
                 <.media_preview media_item={@media_item} />
               </div>
-              <aside class="mt-4">
+              <aside class="mt-4 xl:mt-0">
-                <h2 class="text-xl mb-2"><%= @media_item.title %></h2>
+                <div>Uploaded: <%= @media_item.upload_date %></div>
-                <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
+                    <.subtle_link href={~p"/media/#{@media_item.uuid}/stream"} target="_blank">
-                      href={~p"/media/#{@media_item.uuid}/stream?v=#{DateTime.to_unix(@media_item.updated_at)}"}
-                      target="_blank"
-                    >
                       Open Local Stream
                     </.subtle_link>
                   </span>
                 </div>
-                <div :if={@media_item.description} class="mt-4 text-bodydark">
+                <div class="mt-4 text-bodydark">
-                  <.render_description text={@media_item.description} />
+                  <.break_on_newline text={@media_item.description} />
                 </div>
               </aside>
             </section>
@@ -74,7 +70,7 @@
               <%= task.job.state %>
             </:col>
             <:col :let={task} label="Scheduled At">
-              <.datetime_in_zone datetime={task.job.scheduled_at} />
+              <%= Calendar.strftime(task.job.scheduled_at, "%y-%m-%d %I:%M:%S %p %Z") %>
             </:col>
           </.table>
         <% else %>

lib/pinchflat_web/controllers/media_profiles/media_profile_controller.ex

@@ -1,51 +1,24 @@
 defmodule PinchflatWeb.MediaProfiles.MediaProfileController do
   use PinchflatWeb, :controller
   use Pinchflat.Sources.SourcesQuery
-  use Pinchflat.Profiles.ProfilesQuery
 
   alias Pinchflat.Repo
   alias Pinchflat.Profiles
-  alias Pinchflat.Sources.Source
   alias Pinchflat.Profiles.MediaProfile
-  alias Pinchflat.Profiles.MediaProfileDeletionWorker
 
   def index(conn, _params) do
-    media_profiles_query =
+    media_profiles =
-      from mp in MediaProfile,
+      MediaProfile
-        as: :media_profile,
+      |> order_by(asc: :name)
-        where: is_nil(mp.marked_for_deletion_at),
+      |> Repo.all()
-        order_by: [asc: mp.name],
-        select: map(mp, ^MediaProfile.__schema__(:fields)),
-        select_merge: %{
-          source_count:
-            subquery(
-              from s in Source,
-                where: s.media_profile_id == parent_as(:media_profile).id,
-                select: count(s.id)
-            )
-        }
 
-    render(conn, :index, media_profiles: Repo.all(media_profiles_query))
+    render(conn, :index, media_profiles: media_profiles)
   end
 
-  def new(conn, params) do
+  def new(conn, _params) do
-    # Preload an existing media profile for faster creation
+    changeset = Profiles.change_media_profile(%MediaProfile{})
-    cs_struct =
-      case to_string(params["template_id"]) do
-        "" -> %MediaProfile{}
-        template_id -> Repo.get(MediaProfile, template_id) || %MediaProfile{}
-      end
 
-    render(conn, :new,
+    render(conn, :new, changeset: changeset, layout: get_onboarding_layout())
-      layout: get_onboarding_layout(),
-      changeset:
-        Profiles.change_media_profile(%MediaProfile{
-          cs_struct
-          | id: nil,
-            name: nil,
-            marked_for_deletion_at: nil
-        })
-    )
   end
 
   def create(conn, %{"media_profile" => media_profile_params}) do
@@ -97,15 +70,19 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileController do
   end
 
   def delete(conn, %{"id" => id} = params) do
-    # This awkward comparison converts the string to a boolean
+    delete_files = Map.get(params, "delete_files", false)
-    delete_files = Map.get(params, "delete_files", "") == "true"
     media_profile = Profiles.get_media_profile!(id)
+    {:ok, _media_profile} = Profiles.delete_media_profile(media_profile, delete_files: delete_files)
 
-    {:ok, _} = Profiles.update_media_profile(media_profile, %{marked_for_deletion_at: DateTime.utc_now()})
+    flash_message =
-    MediaProfileDeletionWorker.kickoff(media_profile, %{delete_files: delete_files})
+      if delete_files do
+        "Media profile, its sources, and its files deleted successfully."
+      else
+        "Media profile and its sources deleted successfully. Files were not deleted."
+      end
 
     conn
-    |> put_flash(:info, "Media Profile deletion started. This may take a while to complete.")
+    |> put_flash(:info, flash_message)
     |> redirect(to: ~p"/media_profiles")
   end
 

lib/pinchflat_web/controllers/media_profiles/media_profile_html.ex

@@ -10,7 +10,6 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
   """
   attr :changeset, Ecto.Changeset, required: true
   attr :action, :string, required: true
-  attr :method, :string, required: true
 
   def media_profile_form(assigns)
 
@@ -54,24 +53,12 @@ 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:
@@ -79,11 +66,9 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
       source_collection_type: "the collection type of the sources using this profile. Either 'channel' or 'playlist'",
       artist_name: "the name of the artist with fallbacks to other uploader fields",
       season_from_date: "alias for upload_year",
-      season_episode_from_date: "the upload date formatted as <code>sYYYYeMMDD</code>",
+      season_episode_from_date: "the upload date formatted as sYYYYeMMDD",
       season_episode_index_from_date:
-        "the upload date formatted as <code>sYYYYeMMDDII</code> where <code>II</code> is an index to prevent date collisions",
+        "the upload date formatted as sYYYYeMMDDII where II 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
 
@@ -92,6 +77,7 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
       id
       ext
       title
+      fulltitle
       uploader
       channel
       upload_date
@@ -113,7 +99,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_index_from_date }} - {{ title }}.{{ ext }}"
   end
 
   defp audio_output_template do

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

@@ -2,7 +2,7 @@
   <:option>
     <span x-data="{ copied: false }" x-on:click={~s"
         copyWithCallbacks(
-          String.raw`#{Jason.Formatter.pretty_print(Phoenix.json_library().encode!(@media_profile))}`,
+          `#{Jason.Formatter.pretty_print(Phoenix.json_library().encode!(@media_profile))}`, 
           () => copied = true, 
           () => copied = false
         )
@@ -11,11 +11,6 @@
       <span x-show="copied" x-transition.duration.150ms><.icon name="hero-check" class="ml-2 h-4 w-4" /></span>
     </span>
   </:option>
-  <:option>
-    <.link href={~p"/media_profiles/new?template_id=#{@media_profile}"} method="get">
-      Use as Template
-    </.link>
-  </:option>
   <:option>
     <div class="h-px w-full bg-bodydark2"></div>
   </:option>

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

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

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

@@ -10,6 +10,7 @@
     </.link>
   </nav>
 </div>
+
 <div class="rounded-sm border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark">
   <div class="max-w-full overflow-x-auto">
     <div class="flex flex-col gap-10 min-w-max">
@@ -22,11 +23,6 @@
         <:col :let={media_profile} label="Preferred Resolution">
           <%= media_profile.preferred_resolution %>
         </:col>
-        <:col :let={media_profile} label="Sources">
-          <.subtle_link href={~p"/media_profiles/#{media_profile.id}/#tab-sources"}>
-            <.localized_number number={media_profile.source_count} />
-          </.subtle_link>
-        </:col>
         <:col :let={media_profile} label="" class="flex justify-end">
           <.icon_link href={~p"/media_profiles/#{media_profile.id}/edit"} icon="hero-pencil-square" class="mr-4" />
         </:col>

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

@@ -1,11 +1,4 @@
-<.simple_form
+<.simple_form :let={f} for={@changeset} action={@action}>
-  :let={f}
-  for={@changeset}
-  action={@action}
-  method={@method}
-  x-data="{ advancedMode: !!JSON.parse(localStorage.getItem('advancedMode')) }"
-  x-init="$watch('advancedMode', value => localStorage.setItem('advancedMode', JSON.stringify(value)))"
->
   <.error :if={@changeset.action}>
     Oops, something went wrong! Please check the errors below.
   </.error>
@@ -37,14 +30,10 @@
       </.input>
     </section>
 
-    <section class="flex justify-between items-center mt-8">
+    <h3 class="mt-8 text-2xl text-black dark:text-white">
-      <h3 class="text-2xl text-white">
       General Options
     </h3>
-      <span class="cursor-pointer hover:underline" x-on:click="advancedMode = !advancedMode">
+
-        Editing Mode: <span x-text="advancedMode ? 'Advanced' : 'Standard'"></span>
-      </span>
-    </section>
     <section x-data="{ 
         presets: { 
           default: 'Default',
@@ -95,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>
@@ -125,16 +114,6 @@
       />
     </section>
 
-    <section x-show="advancedMode">
-      <.input
-        field={f[:audio_track]}
-        placeholder="de"
-        type="text"
-        label="Audio Track Language"
-        help="Only works if there are multiple audio tracks. Use either a language code, 'original' for the original audio track, or 'default' for YouTube's preference. Or just leave it blank"
-      />
-    </section>
-
     <h3 class="mt-10 text-2xl text-black dark:text-white">
       Thumbnail Options
     </h3>
@@ -224,16 +203,6 @@
       />
     </section>
 
-    <section x-show="advancedMode">
-      <.input
-        field={f[:media_container]}
-        type="text"
-        label="Media Container"
-        placeholder="mp4"
-        help="Don't change this if you're going to consume media via Plex. Leave blank for default"
-      />
-    </section>
-
     <section x-data="{ presets: { default: null, media_center: 1, audio: null, archiving: 1 } }">
       <.input
         field={f[:redownload_delay_days]}

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

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

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

@@ -1,7 +1,7 @@
 <%!-- The heex HTML formatter is really struggling with this file - I apologize in advance --%>
 <aside>
   <h2 class="text-xl font-bold mb-2">Output Template Syntax</h2>
-  <section class="ml-2 md:ml-4 mb-4 max-w-prose overflow-auto">
+  <section class="ml-2 md:ml-4 mb-4 max-w-prose">
     <p>When generating an output template, you have 3 options for syntax:</p>
     <ul class="list-disc list-inside ml-2 md:ml-5">
       <li>
@@ -46,7 +46,7 @@
   </section>
 
   <h2 class="text-xl font-bold mb-2">Template Options</h2>
-  <section class="ml-2 md:ml-4 mb-4 overflow-auto">
+  <section class="ml-2 md:ml-4 mb-4">
     <p class="max-w-prose">
       Any single-word <code class="text-sm">yt-dlp</code>
       option
@@ -56,23 +56,16 @@
       can be used with the curly braced liquid-style syntax.
       This is just a list of the most common options as well as some custom aliases
     </p>
-    <h3 class="text-lg font-bold my-2">Media Center Custom Aliases</h3>
+    <h3 class="text-lg font-bold mb-2">Custom Aliases</h3>
-    <ul class="list-disc list-inside mb-4 ml-2 md:ml-5 max-w-prose">
+    <ul class="list-disc list-inside ml-2 md:ml-5">
-      <li :for={{k, v} <- media_center_custom_output_template_options()} class="mt-1">
+      <li :for={{k, v} <- custom_output_template_options()}>
         <.inline_code>{{ <%= k %> }}</.inline_code>
-        <span :if={v}>- <%= html_escape({:safe, v}) %></span>
+        <span :if={v}>- <%= v %></span>
-      </li>
-    </ul>
-    <h3 class="text-lg font-bold mb-2">Other Custom Aliases</h3>
-    <ul class="list-disc list-inside mb-4 ml-2 md:ml-5 max-w-prose">
-      <li :for={{k, v} <- other_custom_output_template_options()} class="mt-1">
-        <.inline_code>{{ <%= k %> }}</.inline_code>
-        <span :if={v}>- <%= html_escape({:safe, v}) %></span>
       </li>
     </ul>
     <h3 class="text-lg font-bold mb-2">Common Options</h3>
     <ul class="list-disc list-inside ml-2 md:ml-5">
-      <li :for={opt <- common_output_template_options()} class="mt-1">
+      <li :for={opt <- common_output_template_options()}>
         <.inline_code>{{ <%= opt %> }}</.inline_code>
       </li>
     </ul>

lib/pinchflat_web/controllers/pages/page_html.ex

@@ -5,19 +5,9 @@ defmodule PinchflatWeb.Pages.PageHTML do
 
   embed_templates "page_html/*"
 
-  attr :media_filesize, :integer, required: true
+  def readable_media_filesize(media_filesize) do
+    {num, suffix} = NumberUtils.human_byte_size(media_filesize, precision: 1)
 
-  def readable_media_filesize(assigns) do
+    "#{Float.round(num)} #{suffix}"
-    {num, suffix} = NumberUtils.human_byte_size(assigns.media_filesize, precision: 2)
-
-    assigns =
-      Map.merge(assigns, %{
-        num: num,
-        suffix: suffix
-      })
-
-    ~H"""
-    <.localized_number number={@num} /> <%= @suffix %>
-    """
   end
 end

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

@@ -22,9 +22,7 @@ defmodule Pinchflat.Pages.HistoryTableLive do
     <div>
       <span class="mb-4 flex items-center">
         <.icon_button icon_name="hero-arrow-path" class="h-10 w-10" phx-click="reload_page" tooltip="Refresh" />
-        <span class="ml-2">
+        <span class="ml-2">Showing <%= length(@records) %> of <%= @total_record_count %></span>
-          Showing <.localized_number number={length(@records)} /> of <.localized_number number={@total_record_count} />
-        </span>
       </span>
       <div class="max-w-full overflow-x-auto">
         <.table rows={@records} table_class="text-white">
@@ -34,7 +32,7 @@ defmodule Pinchflat.Pages.HistoryTableLive do
             </.subtle_link>
           </:col>
           <:col :let={media_item} label="Upload Date">
-            <%= DateTime.to_date(media_item.uploaded_at) %>
+            <%= media_item.upload_date %>
           </:col>
           <:col :let={media_item} label="Indexed At">
             <%= format_datetime(media_item.inserted_at) %>

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

@@ -1,39 +1,33 @@
 <div class="grid grid-cols-1 gap-4 md:grid-cols-4">
-  <div class="flex flex-col justify-center rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
+  <div class="rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
-    <a href={~p"/media_profiles"} class="flex flex-col items-center py-2">
+    <a href={~p"/media_profiles"} class="mt-4 flex flex-col items-center justify-center">
-      <span class="text-md font-medium">
+      <span class="text-md font-medium">Media Profile(s)</span>
-        Media <.pluralize count={@media_profile_count} word="Profile" />
-      </span>
       <h4 class="text-title-md font-bold text-white">
-        <.localized_number number={@media_profile_count} />
+        <%= @media_profile_count %>
       </h4>
     </a>
   </div>
-  <div class="flex flex-col justify-center rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
+  <div class="rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
-    <a href={~p"/sources"} class="flex flex-col items-center py-2">
+    <a href={~p"/sources"} class="mt-4 flex flex-col items-center justify-center">
-      <span class="text-md font-medium">
+      <span class="text-md font-medium">Source(s)</span>
-        <.pluralize count={@source_count} word="Source" />
-      </span>
       <h4 class="text-title-md font-bold text-white">
-        <.localized_number number={@source_count} />
+        <%= @source_count %>
       </h4>
     </a>
   </div>
-  <div class="flex flex-col justify-center rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
+  <div class="rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
-    <span class="flex flex-col items-center py-2">
+    <span class="mt-4 flex flex-col items-center justify-center">
-      <span class="text-md font-medium">
+      <span class="text-md font-medium">Downloaded Media</span>
-        <.pluralize count={@media_item_count} word="Download" />
-      </span>
       <h4 class="text-title-md font-bold text-white">
-        <.localized_number number={@media_item_count} />
+        <%= @media_item_count %>
       </h4>
     </span>
   </div>
-  <div class="flex flex-col justify-center rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
+  <div class="rounded-sm border px-7.5 py-6 shadow-default border-strokedark bg-boxdark">
-    <span class="flex flex-col items-center py-2">
+    <span class="mt-4 flex flex-col items-center justify-center">
       <span class="text-md font-medium">Library Size</span>
       <h4 class="text-title-md font-bold text-white">
-        <.readable_media_filesize media_filesize={@media_item_size} />
+        <%= readable_media_filesize(@media_item_size) %>
       </h4>
     </span>
   </div>

lib/pinchflat_web/controllers/settings/setting_html.ex

@@ -1,6 +1,8 @@
 defmodule PinchflatWeb.Settings.SettingHTML do
   use PinchflatWeb, :html
 
+  alias Pinchflat.Downloading.CodecParser
+
   embed_templates "setting_html/*"
 
   @doc """
@@ -14,14 +16,9 @@ defmodule PinchflatWeb.Settings.SettingHTML do
 
   def apprise_server_help do
     url = "https://github.com/caronc/apprise/wiki/URLBasics"
+    classes = "underline decoration-bodydark decoration-1 hover:decoration-white"
 
-    ~s(Server endpoint for Apprise notifications when new media is found. See <a href="#{url}" class="#{help_link_classes()}" target="_blank">Apprise docs</a> for more information)
+    ~s(Server endpoint for Apprise notifications when new media is found. See <a href="#{url}" class="#{classes}" target="_blank">Apprise docs</a> for more information)
-  end
-
-  def youtube_api_help do
-    url = "https://github.com/kieraneglin/pinchflat/wiki/Generating-a-YouTube-API-key"
-
-    ~s(API key for YouTube Data API v3. Greatly improves the accuracy of Fast Indexing. See <a href="#{url}" class="#{help_link_classes()}" target="_blank">here</a> for details on generating an API key)
   end
 
   def diagnostic_info_string do
@@ -33,8 +30,4 @@ defmodule PinchflatWeb.Settings.SettingHTML do
     - Timezone: #{Application.get_env(:pinchflat, :timezone)}
     """
   end
-
-  defp help_link_classes do
-    "underline decoration-bodydark decoration-1 hover:decoration-white"
-  end
 end

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

@@ -1,17 +1,17 @@
 <aside>
-  <h2 class="text-xl font-bold mb-2">Codec Preference</h2>
+  <h2 class="text-xl font-bold mb-2">Codec Preferences</h2>
   <section class="ml-2 md:ml-4 mb-2 max-w-prose">
-    <p>
+    <section>
-      Some users may want to specify the audio codec that <code class="text-sm">yt-dlp</code>
+      Available video codecs:
-      searches for when downloading content. For these users, you can specify one audio and video
+      <ul class="list-disc ml-8">
-      codec to prefer above all others.
+        <li :for={{codec, _} <- CodecParser.video_codec_map()}><%= codec %></li>
-    </p>
+      </ul>
-    <p class="mt-4">
+    </section>
-      NOTE: this is a <em>soft</em>
+    <section class="mt-4">
-      preference. If the codec you specify is not available, <code class="text-sm">yt-dlp</code>
+      Available audio codecs:
-      will download the next best available codec. This is expected and intended behavior.
+      <ul class="list-disc ml-8">
-      <.inline_link href="https://github.com/yt-dlp/yt-dlp#sorting-formats">See here</.inline_link>
+        <li :for={{codec, _} <- CodecParser.audio_codec_map()}><%= codec %></li>
-      for more information and a list of available codecs.
+      </ul>
-    </p>
+    </section>
   </section>
 </aside>

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

@@ -15,7 +15,7 @@
         Notification Settings
       </h3>
       <span class="cursor-pointer hover:underline" x-on:click="advancedMode = !advancedMode">
-        Editing Mode: <span x-text="advancedMode ? 'Advanced' : 'Standard'"></span>
+        Editing Mode: <span x-text="advancedMode ? 'Advanced' : 'Basic'"></span>
       </span>
     </section>
 
@@ -26,25 +26,7 @@
     ) %>
   </section>
 
-  <section class="mt-8">
+  <section class="mt-10" x-show="advancedMode">
-    <section>
-      <h3 class="text-2xl text-black dark:text-white">
-        Indexing Settings
-      </h3>
-
-      <.input
-        field={f[:youtube_api_key]}
-        placeholder="ABC123"
-        type="text"
-        label="YouTube API Key"
-        help={youtube_api_help()}
-        html_help={true}
-        inputclass="font-mono text-sm mr-4"
-      />
-    </section>
-  </section>
-
-  <section class="mt-8" x-show="advancedMode">
     <section>
       <h3 class="text-2xl text-black dark:text-white">
         Codec Options
@@ -55,20 +37,24 @@
       </p>
 
       <.input
-        field={f[:video_codec_preference]}
+        id="video_codec_preference_string"
-        placeholder="avc"
+        name="setting[video_codec_preference_string]"
+        value={Enum.join(f[:video_codec_preference].value, ">")}
+        placeholder="avc>vp9>av01"
         type="text"
         label="Video Codec Preference"
-        help="Video codec preference. Will be remuxed into an MP4 container. See below for more details"
+        help="Order of preference for video codecs. Separate with >. Will be remuxed into an MP4 container. See below for available codecs"
         inputclass="font-mono text-sm mr-4"
       />
 
       <.input
-        field={f[:audio_codec_preference]}
+        id="audio_codec_preference_string"
-        placeholder="m4a"
+        name="setting[audio_codec_preference_string]"
+        value={Enum.join(f[:audio_codec_preference].value, ">")}
+        placeholder="mp4a>opus>aac"
         type="text"
         label="Audio Codec Preference"
-        help="Audio codec preference. See below for more details"
+        help="Order of preference for audio codecs. Separate with >. See below for available codecs"
         inputclass="font-mono text-sm mr-4"
       />
     </section>

lib/pinchflat_web/controllers/sources/source_controller.ex

@@ -1,48 +1,53 @@
 defmodule PinchflatWeb.Sources.SourceController do
   use PinchflatWeb, :controller
-  use Pinchflat.Sources.SourcesQuery
+  use Pinchflat.Media.MediaQuery
 
   alias Pinchflat.Repo
   alias Pinchflat.Tasks
   alias Pinchflat.Sources
   alias Pinchflat.Sources.Source
+  alias Pinchflat.Media.MediaItem
   alias Pinchflat.Profiles.MediaProfile
-  alias Pinchflat.Media.FileSyncingWorker
-  alias Pinchflat.Sources.SourceDeletionWorker
   alias Pinchflat.Downloading.DownloadingHelpers
   alias Pinchflat.SlowIndexing.SlowIndexingHelpers
   alias Pinchflat.Metadata.SourceMetadataStorageWorker
 
   def index(conn, _params) do
-    render(conn, :index)
+    source_query =
+      from s in Source,
+        as: :source,
+        inner_join: mp in assoc(s, :media_profile),
+        preload: [media_profile: mp],
+        order_by: [asc: s.custom_name],
+        select: map(s, ^Source.__schema__(:fields)),
+        select_merge: %{
+          downloaded_count:
+            subquery(
+              from m in MediaItem,
+                where: m.source_id == parent_as(:source).id,
+                where: ^MediaQuery.downloaded(),
+                select: count(m.id)
+            ),
+          pending_count:
+            subquery(
+              from m in MediaItem,
+                join: s in assoc(m, :source),
+                where: m.source_id == parent_as(:source).id,
+                where: ^MediaQuery.pending(),
+                select: count(m.id)
+            )
+        }
+
+    render(conn, :index, sources: Repo.all(source_query))
   end
 
-  def new(conn, params) do
+  def new(conn, _params) do
-    # This lets me preload the settings from another source for more efficient creation
+    changeset = Sources.change_source(%Source{})
-    cs_struct =
-      case to_string(params["template_id"]) do
-        "" -> %Source{}
-        template_id -> Repo.get(Source, template_id) || %Source{}
-      end
 
     render(conn, :new,
+      changeset: changeset,
       media_profiles: media_profiles(),
-      layout: get_onboarding_layout(),
+      layout: get_onboarding_layout()
-      # Most of these don't actually _need_ to be nullified at this point,
-      # but if I don't do it now I know it'll bite me
-      changeset:
-        Sources.change_source(%Source{
-          cs_struct
-          | id: nil,
-            uuid: nil,
-            custom_name: nil,
-            description: nil,
-            collection_name: nil,
-            collection_id: nil,
-            collection_type: nil,
-            original_url: nil,
-            marked_for_deletion_at: nil
-        })
     )
   end
 
@@ -102,15 +107,19 @@ defmodule PinchflatWeb.Sources.SourceController do
   end
 
   def delete(conn, %{"id" => id} = params) do
-    # This awkward comparison converts the string to a boolean
+    delete_files = Map.get(params, "delete_files", false)
-    delete_files = Map.get(params, "delete_files", "") == "true"
     source = Sources.get_source!(id)
+    {:ok, _source} = Sources.delete_source(source, delete_files: delete_files)
 
-    {:ok, _} = Sources.update_source(source, %{marked_for_deletion_at: DateTime.utc_now()})
+    flash_message =
-    SourceDeletionWorker.kickoff(source, %{delete_files: delete_files})
+      if delete_files do
+        "Source and files deleted successfully."
+      else
+        "Source deleted successfully. Files were not deleted."
+      end
 
     conn
-    |> put_flash(:info, "Source deletion started. This may take a while to complete.")
+    |> put_flash(:info, flash_message)
     |> redirect(to: ~p"/sources")
   end
 
@@ -150,15 +159,6 @@ defmodule PinchflatWeb.Sources.SourceController do
     )
   end
 
-  def sync_files_on_disk(conn, %{"source_id" => id}) do
-    wrap_forced_action(
-      conn,
-      id,
-      "File sync enqueued.",
-      &FileSyncingWorker.kickoff_with_task/1
-    )
-  end
-
   defp wrap_forced_action(conn, source_id, message, fun) do
     source = Sources.get_source!(source_id)
     fun.(source)

lib/pinchflat_web/controllers/sources/source_html.ex

@@ -9,14 +9,12 @@ defmodule PinchflatWeb.Sources.SourceHTML do
   attr :changeset, Ecto.Changeset, required: true
   attr :action, :string, required: true
   attr :media_profiles, :list, required: true
-  attr :method, :string, required: true
 
   def source_form(assigns)
 
   def friendly_index_frequencies do
     [
       {"Only once when first created", -1},
-      {"30 minutes", 30},
       {"1 Hour", 60},
       {"3 Hours", 3 * 60},
       {"6 Hours", 6 * 60},

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

@@ -17,7 +17,7 @@
   <:option>
     <span x-data="{ copied: false }" x-on:click={~s"
         copyWithCallbacks(
-          String.raw`#{Jason.Formatter.pretty_print(Phoenix.json_library().encode!(@source))}`,
+          `#{Jason.Formatter.pretty_print(Phoenix.json_library().encode!(@source))}`, 
           () => copied = true, 
           () => copied = false
         )
@@ -26,11 +26,6 @@
       <span x-show="copied" x-transition.duration.150ms><.icon name="hero-check" class="ml-2 h-4 w-4" /></span>
     </span>
   </:option>
-  <:option>
-    <.link href={~p"/sources/new?template_id=#{@source}"} method="get">
-      Use as Template
-    </.link>
-  </:option>
   <:option>
     <div class="h-px w-full bg-bodydark2"></div>
   </:option>
@@ -38,7 +33,7 @@
     <.link
       href={~p"/sources/#{@source}/force_download_pending"}
       method="post"
-      data-confirm="Are you sure you want to force a download of all pending media items? This isn't normally needed."
+      data-confirm="Are you sure you want to force a download of all *pending* media items? This isn't normally needed."
     >
       Download Pending
     </.link>
@@ -47,7 +42,7 @@
     <.link
       href={~p"/sources/#{@source}/force_redownload"}
       method="post"
-      data-confirm="Are you sure you want to re-download all currently downloaded media items? This doesn't upgrade your media, but will download any missing files if your settings have changed. This isn't normally needed."
+      data-confirm="Are you sure you want to re-download all currently downloaded media items? This isn't normally needed and won't change anything if the files already exist."
     >
       Redownload Existing
     </.link>
@@ -70,15 +65,6 @@
       Refresh Metadata
     </.link>
   </:option>
-  <:option>
-    <.link
-      href={~p"/sources/#{@source}/sync_files_on_disk"}
-      method="post"
-      data-confirm="Are you sure you want to sync files? This will update media items if their files have been deleted. File addition or moves are not detected. This isn't normally needed."
-    >
-      Sync Files on Disk
-    </.link>
-  </:option>
   <:option>
     <div class="h-px w-full bg-bodydark2"></div>
   </:option>

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

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

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

@@ -1,63 +1,21 @@
 <aside>
-  <h2 class="text-2xl font-bold mb-2">What is fast indexing?</h2>
+  <h2 class="text-xl font-bold mb-2">What is fast indexing (experimental)?</h2>
   <section class="ml-2 md:ml-4 mb-4 max-w-prose">
     <p>
       Indexing is the act of scanning a channel or playlist (aka: source) for new media.
     </p>
     <p class="mt-2">
       Normal indexing uses <code class="text-sm">yt-dlp</code>
-      to scan the entire source on your specified frequency, but it's very slow for large sources. This is the most accurate way to find uploaded media with the tradeoff being that pairing a large source that's indexed frequently will result in you spending most of your time indexing. Only so many indexing operations can be running at the same time so this can impact your other source's ability to index.
+      to scan the entire source on your specified frequency, but it's very slow for large sources. This is the most accurate way to find uploaded media with the tradeoff being that pairing a large source with a low index frequency will result in you spending most of your time indexing. Only so many indexing operations can be running at the same time, so this can impact your other source's ability to index.
     </p>
     <p class="mt-2">
-      Fast indexing takes a different approach. It still does an initial scan the slow way but after that it uses a secondary mechanism (either RSS or YouTube's API) to frequently check for new videos. This has the potential to be hundreds of times faster, but it can miss videos if the uploader un-privates an old video or uploads dozens of videos in the space of a few minutes.
+      Fast indexing takes a different approach. It still does an initial scan the slow way but after that it uses an RSS feed to frequently check for new videos. This has the potential to be hundreds of times faster, but it can miss videos if the uploader un-privates an old video or uploads dozens of videos in the space of a few minutes. It works well for most channels or playlists but it's not perfect.
-    </p>
-    <p class="mt-2">
-      RSS is used by default but you should enable the YouTube API if you want the best version of fast indexing. This isn't needed for most users but it provides the fastest and most reliable media updates.
-      <.inline_link href="https://github.com/kieraneglin/pinchflat/wiki/Generating-a-YouTube-API-key">
-        Here is some documentation
-      </.inline_link>
-      on how to get your API key which you can add in the
-      <.inline_link href={~p"/settings"}>
-        settings
-      </.inline_link>
-      page.
     </p>
     <p class="mt-2">
       To make up for this limitation, a normal index is still run monthly to catch any videos that were missed by fast indexing. Fast indexing overrides the normal index frequency.
     </p>
-    <p class="mt-4">
+    <p class="mt-2">
-      <h4 class="font-bold text-xl">TL;DR</h4>
+      Fast indexing is experimental so please report any issues on GitHub. It's only recommended for sources with over 200-ish videos and that upload frequently. Not recommended for small or inactive sources.
-
-      <strong class="mt-2 inline-block">In general:</strong>
-      <ul class="list-disc list-inside ml-2 md:ml-5">
-        <li>
-          Uses RSS by default which is fine for most users
-        </li>
-        <li>
-          <.inline_link href="https://github.com/kieraneglin/pinchflat/wiki/Generating-a-YouTube-API-key">
-            Create a YouTube API key
-          </.inline_link>
-          and add it in your
-          <.inline_link href={~p"/settings"}>
-            settings
-          </.inline_link>
-          for the fastest possible media updates
-        </li>
-      </ul>
-
-      <strong class="mt-2 inline-block">Fast indexing is great if any of these apply:</strong>
-      <ul class="list-disc list-inside ml-2 md:ml-5">
-        <li>The source is large channel and uploads frequently</li>
-        <li>You want to download a source's new content as soon as possible</li>
-      </ul>
-
-      <strong class="mt-2 inline-block">Consider <em>not</em> using fast indexing if any of these apply:</strong>
-      <ul class="list-disc list-inside ml-2 md:ml-5">
-        <li>The source is a playlist</li>
-        <li>The source has under 200 videos</li>
-        <li>The source rarely uploads</li>
-        <li>You don't mind if it takes longer for new content to be picked up</li>
-      </ul>
     </p>
   </section>
 </aside>

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

@@ -12,7 +12,31 @@
 <div class="rounded-sm border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark">
   <div class="max-w-full overflow-x-auto">
     <div class="flex flex-col gap-10 min-w-max">
-      <%= live_render(@conn, PinchflatWeb.Sources.IndexTableLive) %>
+      <.table rows={@sources} table_class="text-black dark:text-white">
+        <:col :let={source} label="Name">
+          <.subtle_link href={~p"/sources/#{source.id}"}>
+            <%= StringUtils.truncate(source.custom_name || source.collection_name, 35) %>
+          </.subtle_link>
+        </:col>
+        <:col :let={source} label="Type"><%= source.collection_type %></:col>
+        <:col :let={source} label="Pending"><%= source.pending_count %></:col>
+        <:col :let={source} label="Downloaded"><%= source.downloaded_count %></:col>
+        <:col :let={source} label="Retention">
+          <%= if source.retention_period_days && source.retention_period_days > 0 do %>
+            <%= source.retention_period_days %> day(s)
+          <% else %>
+            <span class="text-lg">∞</span>
+          <% end %>
+        </:col>
+        <:col :let={source} label="Media Profile">
+          <.subtle_link href={~p"/media_profiles/#{source.media_profile_id}"}>
+            <%= source.media_profile.name %>
+          </.subtle_link>
+        </:col>
+        <:col :let={source} label="" class="flex place-content-evenly">
+          <.icon_link href={~p"/sources/#{source.id}/edit"} icon="hero-pencil-square" class="mx-1" />
+        </:col>
+      </.table>
     </div>
   </div>
 </div>

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

@@ -1,103 +0,0 @@
-defmodule PinchflatWeb.Sources.IndexTableLive do
-  use PinchflatWeb, :live_view
-  use Pinchflat.Media.MediaQuery
-  use Pinchflat.Sources.SourcesQuery
-
-  alias Pinchflat.Repo
-  alias Pinchflat.Sources
-  alias Pinchflat.Sources.Source
-  alias Pinchflat.Media.MediaItem
-
-  def render(assigns) do
-    ~H"""
-    <.table rows={@sources} table_class="text-white">
-      <:col :let={source} label="Name">
-        <.subtle_link href={~p"/sources/#{source.id}"}>
-          <%= StringUtils.truncate(source.custom_name || source.collection_name, 35) %>
-        </.subtle_link>
-      </:col>
-      <:col :let={source} label="Pending">
-        <.subtle_link href={~p"/sources/#{source.id}/#tab-pending"}>
-          <.localized_number number={source.pending_count} />
-        </.subtle_link>
-      </:col>
-      <:col :let={source} label="Downloaded">
-        <.subtle_link href={~p"/sources/#{source.id}/#tab-downloaded"}>
-          <.localized_number number={source.downloaded_count} />
-        </.subtle_link>
-      </:col>
-      <:col :let={source} label="Retention">
-        <%= if source.retention_period_days && source.retention_period_days > 0 do %>
-          <.localized_number number={source.retention_period_days} />
-          <.pluralize count={source.retention_period_days} word="day" />
-        <% else %>
-          <span class="text-lg">∞</span>
-        <% end %>
-      </:col>
-      <:col :let={source} label="Media Profile">
-        <.subtle_link href={~p"/media_profiles/#{source.media_profile_id}"}>
-          <%= source.media_profile.name %>
-        </.subtle_link>
-      </:col>
-      <:col :let={source} label="Enabled?">
-        <.input
-          name={"source[#{source.id}][enabled]"}
-          value={source.enabled}
-          id={"source_#{source.id}_enabled"}
-          phx-hook="formless-input"
-          data-subscribe="change"
-          data-event-name="toggle_enabled"
-          data-identifier={source.id}
-          type="toggle"
-        />
-      </:col>
-      <:col :let={source} label="" class="flex place-content-evenly">
-        <.icon_link href={~p"/sources/#{source.id}/edit"} icon="hero-pencil-square" class="mx-1" />
-      </:col>
-    </.table>
-    """
-  end
-
-  def mount(_params, _session, socket) do
-    {:ok, assign(socket, %{sources: get_sources()})}
-  end
-
-  def handle_event("formless-input", %{"event" => "toggle_enabled"} = params, socket) do
-    source = Sources.get_source!(params["id"])
-    should_enable = params["value"] == "true"
-
-    {:ok, _} = Sources.update_source(source, %{enabled: should_enable})
-
-    {:noreply, assign(socket, %{sources: get_sources()})}
-  end
-
-  defp get_sources do
-    query =
-      from s in Source,
-        as: :source,
-        inner_join: mp in assoc(s, :media_profile),
-        where: is_nil(s.marked_for_deletion_at) and is_nil(mp.marked_for_deletion_at),
-        preload: [media_profile: mp],
-        order_by: [asc: s.custom_name],
-        select: map(s, ^Source.__schema__(:fields)),
-        select_merge: %{
-          downloaded_count:
-            subquery(
-              from m in MediaItem,
-                where: m.source_id == parent_as(:source).id,
-                where: ^MediaQuery.downloaded(),
-                select: count(m.id)
-            ),
-          pending_count:
-            subquery(
-              from m in MediaItem,
-                join: s in assoc(m, :source),
-                where: m.source_id == parent_as(:source).id,
-                where: ^MediaQuery.pending(),
-                select: count(m.id)
-            )
-        }
-
-    Repo.all(query)
-  end
-end

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

@@ -1,4 +1,4 @@
-defmodule PinchflatWeb.Sources.MediaItemTableLive do
+defmodule Pinchflat.Sources.MediaItemTableLive do
   use PinchflatWeb, :live_view
   use Pinchflat.Media.MediaQuery
 
@@ -23,9 +23,7 @@ defmodule PinchflatWeb.Sources.MediaItemTableLive do
       <header class="flex justify-between items-center mb-4">
         <span class="flex items-center">
           <.icon_button icon_name="hero-arrow-path" class="h-10 w-10" phx-click="reload_page" tooltip="Refresh" />
-          <span class="ml-2">
+          <span class="ml-2">Showing <%= length(@records) %> of <%= @filtered_record_count %></span>
-            Showing <.localized_number number={length(@records)} /> of <.localized_number number={@filtered_record_count} />
-          </span>
         </span>
         <div class="bg-meta-4 rounded-md">
           <div class="relative">
@@ -51,12 +49,12 @@ defmodule PinchflatWeb.Sources.MediaItemTableLive do
             <%= StringUtils.truncate(media_item.title, 50) %>
           </.subtle_link>
         </:col>
+        <:col :let={media_item} label="Upload Date">
+          <%= media_item.upload_date %>
+        </:col>
         <:col :let={media_item} :if={@media_state == "other"} label="Manually Ignored?">
           <.icon name={if media_item.prevent_download, do: "hero-check", else: "hero-x-mark"} />
         </:col>
-        <:col :let={media_item} label="Upload Date">
-          <%= DateTime.to_date(media_item.uploaded_at) %>
-        </:col>
         <:col :let={media_item} label="" class="flex justify-end">
           <.icon_link href={~p"/sources/#{@source.id}/media/#{media_item.id}/edit"} icon="hero-pencil-square" class="mr-4" />
         </:col>
@@ -119,40 +117,14 @@ defmodule PinchflatWeb.Sources.MediaItemTableLive do
     {:noreply, assign(socket, new_assigns)}
   end
 
-  defp fetch_pagination_attributes(base_query, page, ""), do: fetch_pagination_attributes(base_query, page, nil)
-
-  defp fetch_pagination_attributes(base_query, page, nil) do
-    total_record_count = Repo.aggregate(base_query, :count, :id)
-    total_pages = max(ceil(total_record_count / @limit), 1)
-    page = NumberUtils.clamp(page, 1, total_pages)
-
-    records =
-      fetch_records(base_query, page)
-      |> order_by(desc: :uploaded_at)
-      |> Repo.all()
-
-    %{
-      page: page,
-      total_pages: total_pages,
-      records: records,
-      search_term: nil,
-      total_record_count: total_record_count,
-      filtered_record_count: total_record_count
-    }
-  end
-
   defp fetch_pagination_attributes(base_query, page, search_term) do
-    filtered_base_query = filtered_base_query(base_query, search_term)
+    filtered_base_query = filter_base_query(base_query, search_term)
 
     total_record_count = Repo.aggregate(base_query, :count, :id)
     filtered_record_count = Repo.aggregate(filtered_base_query, :count, :id)
     total_pages = max(ceil(filtered_record_count / @limit), 1)
     page = NumberUtils.clamp(page, 1, total_pages)
-
+    records = fetch_records(filtered_base_query, page)
-    records =
-      fetch_records(filtered_base_query, page)
-      |> order_by(desc: fragment("rank"), desc: :uploaded_at)
-      |> Repo.all()
 
     %{
       page: page,
@@ -170,41 +142,39 @@ defmodule PinchflatWeb.Sources.MediaItemTableLive do
     base_query
     |> limit(^@limit)
     |> offset(^offset)
+    |> Repo.all()
   end
 
   defp generate_base_query(source, "pending") do
     MediaQuery.new()
-    |> select(^select_fields())
     |> MediaQuery.require_assoc(:media_profile)
+    |> MediaQuery.require_assoc(:media_items_search_index)
     |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.pending()))
+    |> order_by(desc: fragment("rank"), desc: :upload_date)
   end
 
   defp generate_base_query(source, "downloaded") do
     MediaQuery.new()
-    |> select(^select_fields())
+    |> MediaQuery.require_assoc(:media_items_search_index)
     |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.downloaded()))
+    |> order_by(desc: fragment("rank"), desc: :upload_date)
   end
 
   defp generate_base_query(source, "other") do
     MediaQuery.new()
-    |> select(^select_fields())
     |> MediaQuery.require_assoc(:media_profile)
+    |> MediaQuery.require_assoc(:media_items_search_index)
     |> where(
       ^dynamic(
         ^MediaQuery.for_source(source) and
           (not (^MediaQuery.downloaded()) and not (^MediaQuery.pending()))
       )
     )
+    |> order_by(desc: fragment("rank"), desc: :upload_date)
   end
 
-  defp filtered_base_query(base_query, search_term) do
+  defp filter_base_query(base_query, search_term) do
     base_query
-    |> MediaQuery.require_assoc(:media_items_search_index)
     |> where(^MediaQuery.matches_search_term(search_term))
   end
-
-  # Selecting only what we need GREATLY speeds up queries on large tables
-  defp select_fields do
-    [:id, :title, :uploaded_at, :prevent_download]
-  end
 end

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

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