Out of alpha, into beta

* Added docs link to README

* Added docs to sidebar in-app

* Updated some tests

* Updated docs in media profile form

.github/workflows/build_and_push_docker.yml

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

.github/workflows/docker_release.yml

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

.iex.exs

@@ -22,4 +22,30 @@ alias Pinchflat.Metadata.MetadataFileHelpers
 
 alias Pinchflat.SlowIndexing.FileFollowerServer
 
-Pinchflat.Release.check_file_permissions()
+defmodule IexHelpers do
+  def last_media_item do
+    Repo.one(from m in MediaItem, limit: 1)
+  end
+
+  def details(type) do
+    source =
+      case type do
+        :playlist -> playlist_url()
+        :channel -> channel_url()
+      end
+
+    YtDlpCollection.get_source_details(source)
+  end
+
+  def ids(type) do
+    source =
+      case type do
+        :playlist -> playlist_url()
+        :channel -> channel_url()
+      end
+
+    YtDlpCollection.get_media_attributes_for_collection(source)
+  end
+end
+
+import IexHelpers

.sobelow-conf

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

README.md

@@ -22,12 +22,12 @@
 - [Installation](#installation)
   - [Unraid](#unraid)
   - [Docker](#docker)
-- [Username and Password (authentication)](https://github.com/kieraneglin/pinchflat/wiki/Username-and-Password)
+- [Authentication](#authentication)
 - [Frequently asked questions](https://github.com/kieraneglin/pinchflat/wiki/Frequently-Asked-Questions)
 - [Documentation](https://github.com/kieraneglin/pinchflat/wiki)
 - [EFF donations](#eff-donations)
 - [Pre-release disclaimer](#pre-release-disclaimer)
-- [Development and Contributing](https://github.com/kieraneglin/pinchflat/wiki/Development-and-Contributing)
+- [Development](#development)
 
 ## What it does
 
@@ -43,15 +43,12 @@ If it doesn't work for your use case, please make a feature request! You can als
 - Powerful naming system so content is stored where and how you want it
 - Easy-to-use web interface with presets to get you started right away
 - First-class support for media center apps like Plex, Jellyfin, and Kodi
-- Supports serving RSS feeds to your favourite podcast app (beta - [docs](<https://github.com/kieraneglin/pinchflat/wiki/Podcast-RSS-Feeds-(beta)>))
 - Automatically downloads new content from channels and playlists
   - Uses a novel approach to download new content more quickly than other apps
 - Supports downloading audio content
 - Custom rules for handling YouTube Shorts and livestreams
 - 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
 
 ## Screenshots
 
@@ -64,31 +61,12 @@ If it doesn't work for your use case, please make a feature request! You can als
 
 Simply search for Pinchflat in the Community Apps store!
 
-### Portainer
-
-Important: See the note below about storing config on a network file share. It's preferred to store the config on a local disk if at all possible.
-
-Docker Compose file:
-
-```yaml
-version: '3'
-services:
-  pinchflat:
-    image: keglin/pinchflat:latest
-    ports:
-      - '8945:8945'
-    volumes:
-      - /host/path/to/config:/config
-      - /host/path/to/downloads:/downloads
-```
-
 ### Docker
 
 1. Create two directories on your host machine: one for storing config and one for storing downloaded media. Make sure they're both writable by the user running the Docker container.
 2. Prepare the docker image in one of the two ways below:
-   - **From GHCR:** `docker pull ghcr.io/kieraneglin/pinchflat:latest`
+   - **From Docker Hub:** `docker pull keglin/pinchflat:latest`, or;
-     - NOTE: also available on Docker Hub at `keglin/pinchflat:latest`
+   - **Building locally:** `docker build . --file selfhosted.Dockerfile -t keglin/pinchflat:latest`
-   - **Building locally:** `docker build . --file selfhosted.Dockerfile -t ghcr.io/kieraneglin/pinchflat:latest`
 3. Run the container:
 
 ```bash
@@ -98,22 +76,14 @@ docker run \
   -p 8945:8945 \
   -v /host/path/to/config:/config \
   -v /host/path/to/downloads:/downloads \
-  ghcr.io/kieraneglin/pinchflat:latest
+  keglin/pinchflat:latest
 ```
 
-### IMPORTANT: File permissions
+NOTE: it's recommended to not run the container as root. Doing so can create permission issues if other apps need to work with the downloaded media. If you need to run any command as root, you can run `su` from the container's shell as there is no password set for the root user.
 
-You _must_ ensure the host directories you've mounted are writable by the user running the Docker container. If you get a permission error follow the steps it suggests. See [#106](https://github.com/kieraneglin/pinchflat/issues/106) for more.
+## Authentication
 
-It's recommended to not run the container as root. Doing so can create permission issues if other apps need to work with the downloaded media. If you need to run any command as root, you can run `su` from the container's shell as there is no password set for the root user.
+HTTP basic authentication is optionally supported. To use it, set the `BASIC_AUTH_USERNAME` and `BASIC_AUTH_PASSWORD` environment variables when starting the container. No authentication will be required unless you set _both_ of these.
-
-### Advanced: storing Pinchflat config directory on a network share
-
-README: This is currently in the testing phase and not a recommended option (yet). The implications of changing this setting isn't clear and this could, conceivably, result in data loss. Only change this setting if you know what you're doing, why this is important, and are okay with possible data loss or DB corruption. This may become the default in the future once it's been tested more thoroughly.
-
-As pointed out in [#137](https://github.com/kieraneglin/pinchflat/issues/137), SQLite doesn't like being run in WAL mode on network shares. If you're running Pinchflat on a network share, you can disable WAL mode by setting the `JOURNAL_MODE` environment variable to `delete`. This will make Pinchflat run in rollback journal mode which is less performant but should work on network shares.
-
-If you change this setting and it works well for you, please leave a comment on [#137](https://github.com/kieraneglin/pinchflat/issues/137)! Doubly so if it does _not_ work well.
 
 ## EFF donations
 
@@ -123,6 +93,30 @@ A portion of all donations to Pinchflat will be donated to the [Electronic Front
 
 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.
 
+## Development
+
+Pinchflat is written in Elixir - a functional programming language that runs on the Erlang VM. It uses the Phoenix web framework and SQLite for the database. The frontend is mostly normal server-rendered HTML with a little Alpine.js as-needed.
+
+Elixir is a personal favourite of mine and is ideal for building fault-tolerant systems. It's also a joy to work with and has a great community. If you're interested in contributing, I'd be happy to help you get started with Elixir - just open an issue with some questions and we can chat!
+
+### Local setup
+
+- `docker compose build --no-cache`
+- `docker compose up -d && docker attach pinchflat-phx-1`
+- After a few minutes the app should be accessible at `localhost:4008`
+  - Please let me know if you run into any hiccups here - I haven't had to bootstrap the app from scratch in a long time and I might have forgotten something
+- Media downloads and config will be stored in the `tmp` directory. Not the OS's `/tmp` directory, but the one in the root of the project
+
+### Running tests and linting
+
+- Open a shell with `docker compose exec phx bash`
+- Run `mix test` to run the tests
+- Run `mix check` to do a full testing, linting, and static analysis pass
+
+### Top tips
+
+- Look for any module that ends in `*_worker.ex` - these are where the interesting stuff happens and you can trace back from there to see how the app works. `lib/pinchflat/slow_indexing/media_collection_indexing_worker.ex` is a good place to start
+
 ## License
 
 See `LICENSE` file

assets/js/app.js

@@ -38,30 +38,6 @@ let liveSocket = new LiveSocket('/live', Socket, {
   }
 })
 
-window.copyTextToClipboard = async (text) => {
-  // Navigator clipboard api needs a secure context (https)
-  if (navigator.clipboard && window.isSecureContext) {
-    await navigator.clipboard.writeText(text)
-  } else {
-    const textArea = document.createElement('textarea')
-    textArea.value = text
-    // Move textarea out of the viewport so it's not visible
-    textArea.style.position = 'absolute'
-    textArea.style.left = '-999999px'
-
-    document.body.prepend(textArea)
-    textArea.select()
-
-    try {
-      document.execCommand('copy')
-    } catch (error) {
-      console.error(error)
-    } finally {
-      textArea.remove()
-    }
-  }
-}
-
 // Show progress bar on live navigation and form submits
 topbar.config({ barColors: { 0: '#29d' }, shadowColor: 'rgba(0, 0, 0, .3)' })
 window.addEventListener('phx:page-loading-start', (_info) => topbar.show(300))

config/config.exs

@@ -16,19 +16,13 @@ config :pinchflat,
   media_directory: "/downloads",
   # The user may or may not store metadata for their needs, but the app will always store its copy
   metadata_directory: "/config/metadata",
-  extras_directory: "/config/extras",
   tmpfile_directory: Path.join([System.tmp_dir!(), "pinchflat", "data"]),
   # Setting BASIC_AUTH_USERNAME and BASIC_AUTH_PASSWORD implies you want to use basic auth.
   # If either is unset, basic auth will not be used.
-  basic_auth_username: "",
+  basic_auth_username: System.get_env("BASIC_AUTH_USERNAME"),
-  basic_auth_password: "",
+  basic_auth_password: System.get_env("BASIC_AUTH_PASSWORD"),
-  expose_feed_endpoints: false,
   file_watcher_poll_interval: 1000
 
-config :pinchflat, Pinchflat.Repo,
-  journal_mode: :wal,
-  pool_size: 5
-
 # Configures the endpoint
 config :pinchflat, PinchflatWeb.Endpoint,
   url: [host: "localhost", port: 8945],

config/dev.exs

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

config/runtime.exs

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

config/test.exs

@@ -17,6 +17,7 @@ config :pinchflat, Oban, testing: :manual
 # Run `mix help test` for more information.
 config :pinchflat, Pinchflat.Repo,
   database: Path.expand("../priv/repo/pinchflat_test.db", Path.dirname(__ENV__.file)),
+  pool_size: 5,
   pool: Ecto.Adapters.SQL.Sandbox
 
 # We don't run a server during test. If one is required,
@@ -32,7 +33,8 @@ config :pinchflat, Pinchflat.Mailer, adapter: Swoosh.Adapters.Test
 # Disable swoosh api client as it is only required for production adapters.
 config :swoosh, :api_client, false
 
-config :logger, level: :critical
+# Print only warnings and errors during test
+config :logger, level: :warning
 
 # Initialize plugs at runtime for faster test compilation
 config :phoenix, :plug_init_mode, :runtime

lib/pinchflat/boot/data_backfill_worker.ex

@@ -18,6 +18,7 @@ defmodule Pinchflat.Boot.DataBackfillWorker do
 
   alias __MODULE__
   alias Pinchflat.Repo
+  alias Pinchflat.Media.MediaItem
 
   @doc """
   Cancels all pending backfill jobs. Useful for ensuring worker runs immediately
@@ -43,14 +44,26 @@ defmodule Pinchflat.Boot.DataBackfillWorker do
   """
   def perform(%Oban.Job{}) do
     Logger.info("Running data backfill worker")
-    # Nothing to do for now - just reschedule
+    backfill_shorts_data()
-    # Keeping in-place because we _will_ need it in the future
 
     reschedule_backfill()
 
     :ok
   end
 
+  defp backfill_shorts_data do
+    query =
+      from(
+        m in MediaItem,
+        where: fragment("? like ?", m.original_url, "%/shorts/%"),
+        where: m.short_form_content == false
+      )
+
+    {count, _} = Repo.update_all(query, set: [short_form_content: true])
+
+    Logger.info("Backfill worker set short_form_content to true for #{count} media items.")
+  end
+
   defp reschedule_backfill do
     # Run hourly
     next_run_in = 60 * 60

lib/pinchflat/boot/pre_job_startup_tasks.ex

@@ -31,38 +31,59 @@ defmodule Pinchflat.Boot.PreJobStartupTasks do
   """
   @impl true
   def init(state) do
-    reset_executing_jobs()
-    create_blank_cookie_file()
     apply_default_settings()
+    ensure_directories_are_writeable()
+    rename_old_job_workers()
 
     {:ok, state}
   end
 
-  # If a node cannot gracefully shut down, the currently executing jobs get stuck
-  # in the "executing" state. This is a problem because the job runner will not
-  # pick them up again
-  defp reset_executing_jobs do
-    {count, _} =
-      Oban.Job
-      |> where(state: "executing")
-      |> Repo.update_all(set: [state: "retryable"])
-
-    Logger.info("Reset #{count} executing jobs")
-  end
-
-  defp create_blank_cookie_file do
-    base_dir = Application.get_env(:pinchflat, :extras_directory)
-    filepath = Path.join(base_dir, "cookies.txt")
-
-    if !File.exists?(filepath) do
-      Logger.info("Cookies does not exist - creating it")
-
-      FilesystemHelpers.write_p!(filepath, "")
-    end
-  end
-
   defp apply_default_settings do
     Settings.fetch!(:onboarding, true)
     Settings.fetch!(:pro_enabled, false)
   end
+
+  defp ensure_directories_are_writeable do
+    directories = [
+      Application.get_env(:pinchflat, :media_directory),
+      Application.get_env(:pinchflat, :tmpfile_directory),
+      Application.get_env(:pinchflat, :metadata_directory)
+    ]
+
+    Enum.each(directories, fn dir ->
+      file = Path.join([dir, ".keep"])
+
+      # This will fail if the directory is not writeable, stopping boot
+      FilesystemHelpers.write_p!(file, "")
+    end)
+  end
+
+  # As part of a large refactor, I ended up moving a bunch of workers around. This
+  # is a problem because the workers are stored in the database and the runner
+  # will try to run the OLD jobs. This is also why these tasks run before the job
+  # runner starts up.
+  #
+  # Can be removed after a few months (created: 2024-03-12)
+  defp rename_old_job_workers do
+    # [ [old_name, new_name], ...]
+    rename_map = [
+      ["Pinchflat.Workers.MediaIndexingWorker", "Pinchflat.FastIndexing.MediaIndexingWorker"],
+      ["Pinchflat.Workers.MediaDownloadWorker", "Pinchflat.Downloading.MediaDownloadWorker"],
+      ["Pinchflat.Workers.FastIndexingWorker", "Pinchflat.FastIndexing.FastIndexingWorker"],
+      ["Pinchflat.Workers.MediaCollectionIndexingWorker", "Pinchflat.SlowIndexing.MediaCollectionIndexingWorker"],
+      ["Pinchflat.Workers.DataBackfillWorker", "Pinchflat.Boot.DataBackfillWorker"]
+    ]
+
+    jobs_renamed =
+      Enum.reduce(rename_map, 0, fn [old_name, new_name], acc ->
+        {count, _} =
+          Oban.Job
+          |> where(worker: ^old_name)
+          |> Repo.update_all(set: [worker: new_name])
+
+        acc + count
+      end)
+
+    Logger.info("Renamed #{jobs_renamed} old job workers")
+  end
 end

lib/pinchflat/downloading/download_option_builder.ex

@@ -22,7 +22,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
         thumbnail_options(media_item_with_preloads) ++
         metadata_options(media_profile) ++
         quality_options(media_profile) ++
-        sponsorblock_options(media_profile) ++
         output_options(media_item_with_preloads)
 
     {:ok, built_options}
@@ -117,17 +116,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
     end
   end
 
-  defp sponsorblock_options(media_profile) do
-    categories = media_profile.sponsorblock_categories
-    behaviour = media_profile.sponsorblock_behaviour
-
-    case {behaviour, categories} do
-      {_, []} -> []
-      {:remove, _} -> [sponsorblock_remove: Enum.join(categories, ",")]
-      {:disabled, _} -> []
-    end
-  end
-
   defp output_options(media_item_with_preloads) do
     [
       output: build_output_path_for(media_item_with_preloads.source)

lib/pinchflat/downloading/media_download_worker.ex

@@ -57,9 +57,7 @@ defmodule Pinchflat.Downloading.MediaDownloadWorker do
         {:ok, updated_media_item}
 
       err ->
-        Logger.error("Failed to download media for media item #{media_item.id}: #{inspect(err)}")
+        err
-
-        {:error, :download_failed}
     end
   end
 

lib/pinchflat/downloading/output_path_builder.ex

@@ -42,8 +42,7 @@ defmodule Pinchflat.Downloading.OutputPathBuilder do
       "upload_day" => "%(upload_date>%d)S",
       "upload_yyyy_mm_dd" => "%(upload_date>%Y-%m-%d)S",
       "season_from_date" => "%(upload_date>%Y)S",
-      "season_episode_from_date" => "s%(upload_date>%Y)Se%(upload_date>%m%d)S",
+      "season_episode_from_date" => "s%(upload_date>%Y)Se%(upload_date>%m%d)S"
-      "artist_name" => "%(artist,creator,uploader,uploader_id)S"
     }
   end
 end

lib/pinchflat/fast_indexing/fast_indexing_helpers.ex

@@ -5,10 +5,8 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
   Many of these methods are made to be kickoff or be consumed by workers.
   """
 
-  alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Sources.Source
-  alias Pinchflat.Media.MediaQuery
   alias Pinchflat.FastIndexing.YoutubeRss
   alias Pinchflat.Downloading.MediaDownloadWorker
   alias Pinchflat.FastIndexing.MediaIndexingWorker
@@ -29,7 +27,7 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
   """
   def kickoff_indexing_tasks_from_youtube_rss_feed(%Source{} = source) do
     {:ok, media_ids} = YoutubeRss.get_recent_media_ids_from_rss(source)
-    existing_media_items = list_media_items_by_media_id_for(source, media_ids)
+    existing_media_items = Media.list_media_items_by_media_id_for(source, media_ids)
     new_media_ids = media_ids -- Enum.map(existing_media_items, & &1.media_id)
 
     Enum.each(new_media_ids, fn media_id ->
@@ -63,13 +61,6 @@ defmodule Pinchflat.FastIndexing.FastIndexingHelpers do
     end
   end
 
-  defp list_media_items_by_media_id_for(source, media_ids) do
-    MediaQuery.new()
-    |> MediaQuery.for_source(source)
-    |> MediaQuery.with_media_ids(media_ids)
-    |> Repo.all()
-  end
-
   defp create_media_item_from_url(source, url) do
     {:ok, media_attrs} = YtDlpMedia.get_media_attributes(url)
 

lib/pinchflat/filesystem/filesystem_helpers.ex

@@ -20,21 +20,6 @@ defmodule Pinchflat.Filesystem.FilesystemHelpers do
     filepath
   end
 
-  @doc """
-  Writes content to a file, creating directories as needed.
-  Takes the same args as File.write/3.
-
-  Returns :ok | {:error, any()}
-  """
-  def write_p(file, content, modes \\ []) do
-    dirname = Path.dirname(file)
-
-    case File.mkdir_p(dirname) do
-      :ok -> File.write(file, content, modes)
-      err -> err
-    end
-  end
-
   @doc """
   Writes content to a file, creating directories as needed.
   Takes the same args as File.write!/3.
@@ -42,7 +27,11 @@ defmodule Pinchflat.Filesystem.FilesystemHelpers do
   Returns :ok | raises on error
   """
   def write_p!(filepath, content, modes \\ []) do
-    :ok = write_p(filepath, content, modes)
+    filepath
+    |> Path.dirname()
+    |> File.mkdir_p!()
+
+    File.write!(filepath, content, modes)
   end
 
   @doc """

lib/pinchflat/media/media.ex

@@ -9,7 +9,6 @@ defmodule Pinchflat.Media do
   alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
   alias Pinchflat.Media.MediaItem
-  alias Pinchflat.Media.MediaQuery
   alias Pinchflat.Metadata.MediaMetadata
   alias Pinchflat.Filesystem.FilesystemHelpers
 
@@ -22,6 +21,33 @@ defmodule Pinchflat.Media do
     Repo.all(MediaItem)
   end
 
+  @doc """
+  Returns a list of media_items for a given source.
+
+  Returns [%MediaItem{}, ...].
+  """
+  def list_media_items_for(%Source{} = source) do
+    MediaItem
+    |> where([mi], mi.source_id == ^source.id)
+    |> Repo.all()
+  end
+
+  @doc """
+  Fetches all media items belonging to a given source that have a media_id in the given list.
+  Useful for determining the what media items we DON'T already have for fast indexing.
+
+  NOTE: These queries are getting a little tedious. When I have the time, I should see about
+  implementing a query pattern and having these compose queries from a common base. This would
+  also let me compose simple queries in the module using them for one-off methods
+
+  Returns [%MediaItem{}, ...].
+  """
+  def list_media_items_by_media_id_for(%Source{} = source, media_ids) do
+    MediaItem
+    |> where([mi], mi.source_id == ^source.id and mi.media_id in ^media_ids)
+    |> Repo.all()
+  end
+
   @doc """
   Returns a list of pending media_items for a given source, where
   pending means the `media_filepath` is `nil` AND the media_item
@@ -34,11 +60,13 @@ defmodule Pinchflat.Media do
   """
   def list_pending_media_items_for(%Source{} = source, opts \\ []) do
     limit = Keyword.get(opts, :limit, nil)
-    source = Repo.preload(source, :media_profile)
+    media_profile = Repo.preload(source, :media_profile).media_profile
 
-    MediaQuery.new()
+    MediaItem
-    |> MediaQuery.for_source(source)
+    |> where([mi], mi.source_id == ^source.id and is_nil(mi.media_filepath))
-    |> matching_download_criteria_for(source)
+    |> where(^build_format_clauses(media_profile))
+    |> where(^maybe_apply_cutoff_date(source))
+    |> where(^maybe_apply_title_regex(source))
     |> Repo.maybe_limit(limit)
     |> Repo.all()
   end
@@ -51,9 +79,8 @@ defmodule Pinchflat.Media do
   def list_downloaded_media_items_for(%Source{} = source, opts \\ []) do
     limit = Keyword.get(opts, :limit, nil)
 
-    MediaQuery.new()
+    MediaItem
-    |> MediaQuery.for_source(source)
+    |> where([mi], mi.source_id == ^source.id and not is_nil(mi.media_filepath))
-    |> MediaQuery.with_media_filepath()
     |> Repo.maybe_limit(limit)
     |> Repo.all()
   end
@@ -70,9 +97,10 @@ defmodule Pinchflat.Media do
   def pending_download?(%MediaItem{} = media_item) do
     media_item = Repo.preload(media_item, source: :media_profile)
 
-    MediaQuery.new()
+    MediaItem
-    |> MediaQuery.with_id(media_item.id)
+    |> where([mi], mi.id == ^media_item.id and is_nil(mi.media_filepath))
-    |> matching_download_criteria_for(media_item.source)
+    |> where(^build_format_clauses(media_item.source.media_profile))
+    |> where(^maybe_apply_cutoff_date(media_item.source))
     |> Repo.exists?()
   end
 
@@ -91,9 +119,20 @@ defmodule Pinchflat.Media do
   def search(search_term, opts) do
     limit = Keyword.get(opts, :limit, 50)
 
-    MediaQuery.new()
+    from(mi in MediaItem,
-    |> MediaQuery.matching_search_term(search_term)
+      join: mi_search_index in assoc(mi, :media_items_search_index),
-    |> Repo.maybe_limit(limit)
+      where: fragment("media_items_search_index MATCH ?", ^search_term),
+      select_merge: %{
+        matching_search_term:
+          fragment("""
+            coalesce(snippet(media_items_search_index, 0, '[PF_HIGHLIGHT]', '[/PF_HIGHLIGHT]', '...', 20), '') ||
+            ' ' ||
+            coalesce(snippet(media_items_search_index, 1, '[PF_HIGHLIGHT]', '[/PF_HIGHLIGHT]', '...', 20), '')
+          """)
+      },
+      order_by: [desc: fragment("rank")],
+      limit: ^limit
+    )
     |> Repo.all()
   end
 
@@ -201,11 +240,54 @@ defmodule Pinchflat.Media do
     |> Enum.each(&FilesystemHelpers.delete_file_and_remove_empty_directories/1)
   end
 
-  defp matching_download_criteria_for(query, source_with_preloads) do
+  defp maybe_apply_cutoff_date(source) do
-    query
+    if source.download_cutoff_date do
-    |> MediaQuery.with_no_media_filepath()
+      dynamic([mi], mi.upload_date >= ^source.download_cutoff_date)
-    |> MediaQuery.with_upload_date_after(source_with_preloads.download_cutoff_date)
+    else
-    |> MediaQuery.with_format_preference(source_with_preloads.media_profile)
+      dynamic(true)
-    |> MediaQuery.matching_title_regex(source_with_preloads.title_filter_regex)
+    end
+  end
+
+  defp maybe_apply_title_regex(source) do
+    if source.title_filter_regex do
+      dynamic([mi], fragment("regexp_like(?, ?)", mi.title, ^source.title_filter_regex))
+    else
+      dynamic(true)
+    end
+  end
+
+  defp build_format_clauses(media_profile) do
+    mapped_struct = Map.from_struct(media_profile)
+
+    Enum.reduce(mapped_struct, dynamic(true), fn attr, dynamic ->
+      case {attr, media_profile} do
+        {{:shorts_behaviour, :only}, %{livestream_behaviour: :only}} ->
+          dynamic(
+            [mi],
+            ^dynamic and (mi.livestream == true or mi.short_form_content == true)
+          )
+
+        # Technically redundant, but makes the other clauses easier to parse
+        # (redundant because this condition is the same as the condition above, just flipped)
+        {{:livestream_behaviour, :only}, %{shorts_behaviour: :only}} ->
+          dynamic
+
+        {{:shorts_behaviour, :only}, _} ->
+          dynamic([mi], ^dynamic and mi.short_form_content == true)
+
+        {{:livestream_behaviour, :only}, _} ->
+          dynamic([mi], ^dynamic and mi.livestream == true)
+
+        {{:shorts_behaviour, :exclude}, %{livestream_behaviour: lb}} when lb != :only ->
+          dynamic([mi], ^dynamic and mi.short_form_content == false)
+
+        {{:livestream_behaviour, :exclude}, %{shorts_behaviour: sb}} when sb != :only ->
+          # return records with livestream: false
+          dynamic([mi], ^dynamic and mi.livestream == false)
+
+        _ ->
+          dynamic
+      end
+    end)
   end
 end

lib/pinchflat/media/media_item.ex

@@ -5,7 +5,6 @@ defmodule Pinchflat.Media.MediaItem do
 
   use Ecto.Schema
   import Ecto.Changeset
-  import Pinchflat.Utils.ChangesetUtils
 
   alias Pinchflat.Tasks.Task
   alias Pinchflat.Sources.Source
@@ -22,7 +21,6 @@ defmodule Pinchflat.Media.MediaItem do
     :source_id,
     :short_form_content,
     :upload_date,
-    :duration_seconds,
     # these fields are captured only on download
     :media_downloaded_at,
     :media_filepath,
@@ -34,7 +32,6 @@ defmodule Pinchflat.Media.MediaItem do
   ]
   # Pretty much all the fields captured at index are required.
   @required_fields ~w(
-    uuid
     title
     original_url
     livestream
@@ -45,11 +42,6 @@ defmodule Pinchflat.Media.MediaItem do
     )a
 
   schema "media_items" do
-    # This is _not_ used as the primary key or internally in the database
-    # relations. This is only used to prevent an enumeration attack on the streaming
-    # and RSS feed endpoints since those _must_ be public (ie: no basic auth)
-    field :uuid, Ecto.UUID
-
     field :title, :string
     field :media_id, :string
     field :description, :string
@@ -58,7 +50,6 @@ defmodule Pinchflat.Media.MediaItem do
     field :short_form_content, :boolean, default: false
     field :media_downloaded_at, :utc_datetime
     field :upload_date, :date
-    field :duration_seconds, :integer
 
     field :media_filepath, :string
     field :media_size_bytes, :integer
@@ -87,7 +78,6 @@ defmodule Pinchflat.Media.MediaItem do
     media_item
     |> cast(attrs, @allowed_fields)
     |> cast_assoc(:metadata, with: &MediaMetadata.changeset/2, required: false)
-    |> dynamic_default(:uuid, fn _ -> Ecto.UUID.generate() end)
     |> validate_required(@required_fields)
     |> unique_constraint([:media_id, :source_id])
   end

lib/pinchflat/media/media_query.ex

@@ -1,120 +0,0 @@
-defmodule Pinchflat.Media.MediaQuery do
-  @moduledoc """
-  Query helpers for the Media context.
-
-  These methods are made to be one-ish liners used
-  to compose queries for media items. 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.
-
-  ALSO, this is me trying something new. If I like it,
-  I'll refactor other contexts to use this pattern.
-  """
-  import Ecto.Query, warn: false
-
-  alias Pinchflat.Media.MediaItem
-
-  # Prefixes:
-  # - for_* - belonging to a certain record
-  # - with_* - for filtering based on full, concrete attributes
-  # - matching_* - for filtering based on partial attributes (e.g. LIKE, regex, full-text search)
-  #
-  # Suffixes:
-  # - _for - the arg passed is an association record
-
-  def new do
-    MediaItem
-  end
-
-  def for_source(query, source) do
-    where(query, [mi], mi.source_id == ^source.id)
-  end
-
-  def with_id(query, id) do
-    where(query, [mi], mi.id == ^id)
-  end
-
-  def with_media_ids(query, media_ids) do
-    where(query, [mi], mi.media_id in ^media_ids)
-  end
-
-  def with_media_filepath(query) do
-    where(query, [mi], not is_nil(mi.media_filepath))
-  end
-
-  def with_no_media_filepath(query) do
-    where(query, [mi], is_nil(mi.media_filepath))
-  end
-
-  def with_upload_date_after(query, nil), do: query
-
-  def with_upload_date_after(query, date) do
-    where(query, [mi], mi.upload_date >= ^date)
-  end
-
-  def matching_title_regex(query, nil), do: query
-
-  def matching_title_regex(query, regex) do
-    where(query, [mi], fragment("regexp_like(?, ?)", mi.title, ^regex))
-  end
-
-  def matching_search_term(query, nil), do: query
-
-  def matching_search_term(query, term) do
-    from(mi in query,
-      join: mi_search_index in assoc(mi, :media_items_search_index),
-      where: fragment("media_items_search_index MATCH ?", ^term),
-      select_merge: %{
-        matching_search_term:
-          fragment("""
-            coalesce(snippet(media_items_search_index, 0, '[PF_HIGHLIGHT]', '[/PF_HIGHLIGHT]', '...', 20), '') ||
-            ' ' ||
-            coalesce(snippet(media_items_search_index, 1, '[PF_HIGHLIGHT]', '[/PF_HIGHLIGHT]', '...', 20), '')
-          """)
-      },
-      order_by: [desc: fragment("rank")]
-    )
-  end
-
-  # NOTE: this method breaks the contract set by other methods in that it
-  # takes a media_profile struct instead of taking just the attributes it
-  # cares about. Consider refactoring but low priority.
-  def with_format_preference(query, media_profile) do
-    mapped_struct = Map.from_struct(media_profile)
-
-    finders =
-      Enum.reduce(mapped_struct, dynamic(true), fn attr, dynamic ->
-        case {attr, media_profile} do
-          {{:shorts_behaviour, :only}, %{livestream_behaviour: :only}} ->
-            dynamic(
-              [mi],
-              ^dynamic and (mi.livestream == true or mi.short_form_content == true)
-            )
-
-          # Technically redundant, but makes the other clauses easier to parse
-          # (redundant because this condition is the same as the condition above, just flipped)
-          {{:livestream_behaviour, :only}, %{shorts_behaviour: :only}} ->
-            dynamic
-
-          {{:shorts_behaviour, :only}, _} ->
-            dynamic([mi], ^dynamic and mi.short_form_content == true)
-
-          {{:livestream_behaviour, :only}, _} ->
-            dynamic([mi], ^dynamic and mi.livestream == true)
-
-          {{:shorts_behaviour, :exclude}, %{livestream_behaviour: lb}} when lb != :only ->
-            dynamic([mi], ^dynamic and mi.short_form_content == false)
-
-          {{:livestream_behaviour, :exclude}, %{shorts_behaviour: sb}} when sb != :only ->
-            # return records with livestream: false
-            dynamic([mi], ^dynamic and mi.livestream == false)
-
-          _ ->
-            dynamic
-        end
-      end)
-
-    where(query, ^finders)
-  end
-end

lib/pinchflat/metadata/metadata_file_helpers.ex

@@ -11,22 +11,6 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
 
   alias Pinchflat.Filesystem.FilesystemHelpers
 
-  @doc """
-  Returns the directory where metadata for a database record should be stored.
-
-  Returns binary()
-  """
-  def metadata_directory_for(database_record) do
-    metadata_directory = Application.get_env(:pinchflat, :metadata_directory)
-    record_table_name = database_record.__meta__.source
-
-    Path.join([
-      metadata_directory,
-      record_table_name,
-      to_string(database_record.id)
-    ])
-  end
-
   @doc """
   Compresses and stores metadata for a media item, returning the filepath.
 
@@ -124,8 +108,13 @@ defmodule Pinchflat.Metadata.MetadataFileHelpers do
   end
 
   defp generate_filepath_for(database_record, filename) do
+    metadata_directory = Application.get_env(:pinchflat, :metadata_directory)
+    record_table_name = database_record.__meta__.source
+
     Path.join([
-      metadata_directory_for(database_record),
+      metadata_directory,
+      record_table_name,
+      to_string(database_record.id),
       filename
     ])
   end

lib/pinchflat/metadata/metadata_parser.ex

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

lib/pinchflat/metadata/source_metadata.ex

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

lib/pinchflat/metadata/source_metadata_storage_worker.ex

@@ -32,7 +32,6 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
 
   @doc """
   Fetches and stores various forms of metadata for a source:
-    - Attributes like `description`
     - JSON metadata for internal use
     - The series directory for the source
     - The NFO file for the source (if specified)
@@ -48,24 +47,21 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
   def perform(%Oban.Job{args: %{"id" => source_id}}) do
     source = Repo.preload(Sources.get_source!(source_id), [:metadata, :media_profile])
     series_directory = determine_series_directory(source)
+    {source_metadata, image_filepath_attrs} = fetch_source_metadata_and_images(series_directory, source)
 
-    {source_metadata, source_image_attrs, metadata_image_attrs} =
+    # `run_post_commit_tasks: false` prevents this from running in an infinite loop
-      fetch_source_metadata_and_images(series_directory, source)
-
-    source_metadata_filepath = MetadataFileHelpers.compress_and_store_metadata_for(source, source_metadata)
-
     Sources.update_source(
       source,
       Map.merge(
         %{
           series_directory: series_directory,
           nfo_filepath: store_source_nfo(source, series_directory, source_metadata),
-          description: source_metadata["description"],
+          metadata: %{
-          metadata: Map.merge(%{metadata_filepath: source_metadata_filepath}, metadata_image_attrs)
+            metadata_filepath: MetadataFileHelpers.compress_and_store_metadata_for(source, source_metadata)
+          }
         },
-        source_image_attrs
+        image_filepath_attrs
       ),
-      # `run_post_commit_tasks: false` prevents this from running in an infinite loop
       run_post_commit_tasks: false
     )
 
@@ -76,19 +72,18 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorker do
   end
 
   defp fetch_source_metadata_and_images(series_directory, source) do
-    metadata_directory = MetadataFileHelpers.metadata_directory_for(source)
-    tmp_output_path = "#{tmp_directory()}/#{StringUtils.random_string(16)}/source_image.%(ext)S"
-    opts = [:write_all_thumbnails, convert_thumbnails: "jpg", output: tmp_output_path]
-
-    {:ok, metadata} = MediaCollection.get_source_metadata(source.original_url, opts)
-    metadata_image_attrs = SourceImageParser.store_source_images(metadata_directory, metadata)
-
     if source.media_profile.download_source_images && series_directory do
-      source_image_attrs = SourceImageParser.store_source_images(series_directory, metadata)
+      output_path = "#{tmp_directory()}/#{StringUtils.random_string(16)}/source_image.%(ext)S"
+      opts = [:write_all_thumbnails, convert_thumbnails: "jpg", output: output_path]
 
-      {metadata, source_image_attrs, metadata_image_attrs}
+      {:ok, metadata} = MediaCollection.get_source_metadata(source.original_url, opts)
+      image_attrs = SourceImageParser.store_source_images(series_directory, metadata)
+
+      {metadata, image_attrs}
     else
-      {metadata, %{}, metadata_image_attrs}
+      {:ok, metadata} = MediaCollection.get_source_metadata(source.original_url, [])
+
+      {metadata, %{}}
     end
   end
 

lib/pinchflat/podcasts/podcast_helpers.ex

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

lib/pinchflat/podcasts/rss_feed_builder.ex

@@ -1,139 +0,0 @@
-defmodule Pinchflat.Podcasts.RssFeedBuilder do
-  @moduledoc """
-  Methods for building an RSS feed for a source and its media items.
-  """
-
-  @datetime_format "%a, %d %b %Y %H:%M:%S %z"
-
-  alias Pinchflat.Utils.DatetimeUtils
-  alias Pinchflat.Podcasts.PodcastHelpers
-  alias PinchflatWeb.Router.Helpers, as: Routes
-
-  @doc """
-  Builds an RSS feed for a given source and its media items.
-  Only MediaItems that have been persisted will be included in the feed.
-
-  ## Options:
-    - `:limit` - The maximum number of media items to include in the feed. Defaults to 300.
-
-  Returns an XML document as a string.
-  """
-  def build(source, opts \\ []) do
-    limit = Keyword.get(opts, :limit, 300)
-    url_base = Keyword.get(opts, :url_base, PinchflatWeb.Endpoint.url())
-
-    media_items = PodcastHelpers.persisted_media_items_for(source, limit: limit)
-    build_source_xml(source, media_items, url_base)
-  end
-
-  defp build_source_xml(source, media_items, url_base) do
-    media_item_xml = Enum.map(media_items, &build_media_item_xml(source, &1, url_base))
-    # "caching" the image path since it requires some DB calls and is used twice
-    feed_image_path = feed_image_path(url_base, source, media_items)
-
-    # Useful: resources:
-    #   - https://validator.w3.org/feed/#validate_by_input
-    #   - https://github.com/Podcastindex-org/podcast-namespace/blob/main/docs/1.0.md
-    #   - https://podba.se/validate
-    """
-    <?xml version="1.0" encoding="UTF-8"?>
-    <rss version="2.0"
-      xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
-      xmlns:podcast="https://podcastindex.org/namespace/1.0"
-      xmlns:atom="http://www.w3.org/2005/Atom">
-      <channel>
-        <title>#{safe(source.custom_name)}</title>
-        <link>#{safe(source.original_url)}</link>
-        <description>#{safe(source.description)}</description>
-        <category>TV &amp; Film</category>
-        <generator>Generated by Pinchflat</generator>
-        <language>en-us</language>
-        <lastBuildDate>#{Calendar.strftime(source.updated_at, @datetime_format)}</lastBuildDate>
-        <pubDate>#{Calendar.strftime(source.inserted_at, @datetime_format)}</pubDate>
-        <atom:link href="#{safe(generate_self_link(url_base, source))}" rel="self" type="application/rss+xml" />
-        <podcast:locked>yes</podcast:locked>
-        <podcast:guid>#{source.uuid}</podcast:guid>
-        <image>
-          <url>#{safe(feed_image_path)}</url>
-          <title>#{safe(source.custom_name)}</title>
-          <link>#{safe(source.original_url)}</link>
-        </image>
-        <itunes:author>#{safe(source.custom_name)}</itunes:author>
-        <itunes:subtitle>#{safe(source.custom_name)}</itunes:subtitle>
-        <itunes:block>yes</itunes:block>
-        <itunes:image href="#{safe(feed_image_path)}"></itunes:image>
-        <itunes:explicit>false</itunes:explicit>
-        <itunes:category text="TV &amp; Film"></itunes:category>
-
-        #{Enum.join(media_item_xml, "\n")}
-
-      </channel>
-    </rss>
-    """
-  end
-
-  defp build_media_item_xml(source, media_item, url_base) do
-    """
-    <item>
-      <guid isPermaLink="false">#{media_item.uuid}</guid>
-      <title>#{safe(media_item.title)}</title>
-      <link>#{safe(media_item.original_url)}</link>
-      <description>#{safe(media_item.description)}</description>
-      <pubDate>#{generate_upload_date(media_item)}</pubDate>
-      <itunes:duration>#{media_item.duration_seconds}</itunes:duration>
-      <enclosure
-        url="#{media_stream_path(url_base, media_item)}"
-        length="#{media_item.media_size_bytes}"
-        type="#{MIME.from_path(media_item.media_filepath)}"
-      />
-      <itunes:author>#{safe(source.custom_name)}</itunes:author>
-      <itunes:subtitle>#{safe(media_item.title)}</itunes:subtitle>
-      <itunes:summary><![CDATA[#{media_item.description}]]></itunes:summary>
-      <itunes:explicit>false</itunes:explicit>
-    </item>
-    """
-  end
-
-  defp safe(nil), do: ""
-
-  defp safe(value) do
-    value
-    |> Phoenix.HTML.html_escape()
-    |> Phoenix.HTML.safe_to_string()
-  end
-
-  defp generate_self_link(url_base, source) do
-    Path.join(url_base, "#{podcast_route(:rss_feed, source.uuid)}.xml")
-  end
-
-  defp media_stream_path(url_base, media_item) do
-    extension = Path.extname(media_item.media_filepath)
-
-    Path.join(url_base, "#{media_route(:stream, media_item.uuid)}#{extension}")
-  end
-
-  defp feed_image_path(url_base, source, media_items) do
-    case PodcastHelpers.select_cover_image(source, media_items) do
-      {:error, _} ->
-        ""
-
-      {:ok, filepath} ->
-        extension = Path.extname(filepath)
-        Path.join(url_base, "#{podcast_route(:feed_image, source.uuid)}#{extension}")
-    end
-  end
-
-  defp generate_upload_date(media_item) do
-    media_item.upload_date
-    |> DatetimeUtils.date_to_datetime()
-    |> Calendar.strftime(@datetime_format)
-  end
-
-  defp podcast_route(action, params) do
-    Routes.podcast_path(PinchflatWeb.Endpoint, action, params)
-  end
-
-  defp media_route(action, params) do
-    Routes.media_item_path(PinchflatWeb.Endpoint, action, params)
-  end
-end

lib/pinchflat/profiles/media_profile.ex

@@ -21,8 +21,6 @@ defmodule Pinchflat.Profiles.MediaProfile do
     download_metadata
     embed_metadata
     download_nfo
-    sponsorblock_behaviour
-    sponsorblock_categories
     shorts_behaviour
     livestream_behaviour
     preferred_resolution
@@ -49,8 +47,6 @@ defmodule Pinchflat.Profiles.MediaProfile do
     field :embed_metadata, :boolean, default: false
 
     field :download_nfo, :boolean, default: false
-    field :sponsorblock_behaviour, Ecto.Enum, values: [:disabled, :remove], default: :disabled
-    field :sponsorblock_categories, {:array, :string}, default: []
     # NOTE: these do NOT speed up indexing - the indexer still has to go
     # through the entire collection to determine if a media is a short or
     # a livestream.

lib/pinchflat/release.ex

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

lib/pinchflat/sources/source.ex

@@ -17,7 +17,6 @@ defmodule Pinchflat.Sources.Source do
     collection_id
     collection_type
     custom_name
-    description
     nfo_filepath
     poster_filepath
     fanart_filepath
@@ -48,7 +47,6 @@ defmodule Pinchflat.Sources.Source do
 
   @pre_insert_required_fields @initially_required_fields ++
                                 ~w(
-                                  uuid
                                   custom_name
                                   collection_name
                                   collection_id
@@ -56,13 +54,7 @@ defmodule Pinchflat.Sources.Source do
                                 )a
 
   schema "sources" do
-    # This is _not_ used as the primary key or internally in the database
-    # relations. This is only used to prevent an enumeration attack on the streaming
-    # and RSS feed endpoints since those _must_ be public (ie: no basic auth)
-    field :uuid, Ecto.UUID
-
     field :custom_name, :string
-    field :description, :string
     field :collection_name, :string
     field :collection_id, :string
     field :collection_type, Ecto.Enum, values: [:channel, :playlist]
@@ -104,7 +96,6 @@ defmodule Pinchflat.Sources.Source do
     source
     |> cast(attrs, @allowed_fields)
     |> dynamic_default(:custom_name, fn cs -> get_field(cs, :collection_name) end)
-    |> dynamic_default(:uuid, fn _ -> Ecto.UUID.generate() end)
     |> validate_required(required_fields)
     |> cast_assoc(:metadata, with: &SourceMetadata.changeset/2, required: false)
   end

lib/pinchflat/sources/sources.ex

@@ -9,7 +9,6 @@ defmodule Pinchflat.Sources do
   alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources.Source
-  alias Pinchflat.Media.MediaQuery
   alias Pinchflat.Profiles.MediaProfile
   alias Pinchflat.YtDlp.MediaCollection
   alias Pinchflat.Metadata.SourceMetadata
@@ -113,9 +112,8 @@ defmodule Pinchflat.Sources do
     delete_files = Keyword.get(opts, :delete_files, false)
     Tasks.delete_tasks_for(source)
 
-    MediaQuery.new()
+    source
-    |> MediaQuery.for_source(source)
+    |> Media.list_media_items_for()
-    |> Repo.all()
     |> Enum.each(fn media_item ->
       Media.delete_media_item(media_item, delete_files: delete_files)
     end)

lib/pinchflat/utils/datetime_utils.ex

@@ -1,17 +0,0 @@
-defmodule Pinchflat.Utils.DatetimeUtils do
-  @moduledoc """
-  Utility methods for working with dates and datetimes
-  """
-
-  @doc """
-  Converts a Date to a DateTime
-
-  Returns %DateTime{}
-  """
-  def date_to_datetime(date) do
-    date
-    |> Date.to_gregorian_days()
-    |> Kernel.*(86_400)
-    |> DateTime.from_gregorian_seconds()
-  end
-end

lib/pinchflat/yt_dlp/command_runner.ex

@@ -31,8 +31,7 @@ defmodule Pinchflat.YtDlp.CommandRunner do
     # Also, can't use RAM file since yt-dlp needs a concrete filepath.
     output_filepath = Keyword.get(addl_opts, :output_filepath, FSUtils.generate_metadata_tmpfile(:json))
     print_to_file_opts = [{:print_to_file, output_template}, output_filepath]
-    cookie_opts = build_cookie_options()
+    formatted_command_opts = [url] ++ parse_options(command_opts ++ print_to_file_opts)
-    formatted_command_opts = [url] ++ parse_options(command_opts ++ print_to_file_opts ++ cookie_opts)
 
     Logger.info("[yt-dlp] called with: #{Enum.join(formatted_command_opts, " ")}")
 
@@ -48,19 +47,6 @@ defmodule Pinchflat.YtDlp.CommandRunner do
     end
   end
 
-  defp build_cookie_options do
-    base_dir = Application.get_env(:pinchflat, :extras_directory)
-    cookie_file = Path.join(base_dir, "cookies.txt")
-
-    case File.read(cookie_file) do
-      {:ok, cookie_data} ->
-        if String.trim(cookie_data) != "", do: [cookies: cookie_file], else: []
-
-      {:error, _} ->
-        []
-    end
-  end
-
   # We want to satisfy the following behaviours:
   #
   # 1. If the key is an atom, convert it to a string and convert it to kebab case (for convenience)

lib/pinchflat/yt_dlp/media.ex

@@ -10,8 +10,7 @@ defmodule Pinchflat.YtDlp.Media do
     :original_url,
     :livestream,
     :short_form_content,
-    :upload_date,
+    :upload_date
-    :duration_seconds
   ]
 
   defstruct [
@@ -21,8 +20,7 @@ defmodule Pinchflat.YtDlp.Media do
     :original_url,
     :livestream,
     :short_form_content,
-    :upload_date,
+    :upload_date
-    :duration_seconds
   ]
 
   alias __MODULE__
@@ -88,7 +86,6 @@ defmodule Pinchflat.YtDlp.Media do
       description: response["description"],
       original_url: response["webpage_url"],
       livestream: response["was_live"],
-      duration_seconds: response["duration"] && round(response["duration"]),
       short_form_content: response["webpage_url"] && short_form_content?(response),
       upload_date: response["upload_date"] && MetadataFileHelpers.parse_upload_date(response["upload_date"])
     }

lib/pinchflat_web.ex

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

lib/pinchflat_web/components/core_components.ex

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

lib/pinchflat_web/components/custom_components/button_components.ex

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

lib/pinchflat_web/components/custom_components/tab_components.ex

@@ -9,31 +9,24 @@ defmodule PinchflatWeb.CustomComponents.TabComponents do
     attr :title, :string, required: true
   end
 
-  slot :tab_append, required: false
-
   def tabbed_layout(assigns) do
     ~H"""
     <div
       x-data="{ openTab: 0, activeClasses: 'text-meta-5 border-meta-5', inactiveClasses: 'border-transparent' }"
       class="w-full"
     >
-      <header class="flex flex-col md:flex-row md:justify-between border-b border-strokedark">
+      <div class="mb-6 flex flex-wrap gap-5 border-b border-strokedark sm:gap-10">
-        <div class="flex flex-wrap gap-5 sm:gap-10">
+        <a
-          <a
+          :for={{tab, idx} <- Enum.with_index(@tab)}
-            :for={{tab, idx} <- Enum.with_index(@tab)}
+          href="#"
-            href="#"
+          @click.prevent={"openTab = #{idx}"}
-            @click.prevent={"openTab = #{idx}"}
+          x-bind:class={"openTab === #{idx} ? activeClasses : inactiveClasses"}
-            x-bind:class={"openTab === #{idx} ? activeClasses : inactiveClasses"}
+          class="border-b-2 py-4 text-sm font-medium hover:text-meta-5 md:text-base"
-            class="border-b-2 py-4 w-full sm:w-fit text-sm font-medium hover:text-meta-5 md:text-base"
+        >
-          >
+          <span class="text-xl"><%= tab.title %></span>
-            <span class="text-xl"><%= tab.title %></span>
+        </a>
-          </a>
+      </div>
-        </div>
+      <div>
-        <div class="mx-4 my-4 lg:my-0 flex gap-5 sm:gap-10 items-center">
-          <%= render_slot(@tab_append) %>
-        </div>
-      </header>
-      <div class="mt-4">
         <div :for={{tab, idx} <- Enum.with_index(@tab)} x-show={"openTab === #{idx}"} class="font-medium leading-relaxed">
           <%= render_slot(tab) %>
         </div>

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

@@ -57,11 +57,6 @@
             <.icon name="hero-currency-dollar" /> Donate
           </span>
         </li>
-        <li>
-          <span class="group relative flex items-center gap-2.5 px-4 py-2 text-sm">
-            v<%= Application.spec(:pinchflat)[:vsn] %>
-          </span>
-        </li>
       </ul>
     </nav>
   </section>

lib/pinchflat_web/controllers/media_items/media_item_controller.ex

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

lib/pinchflat_web/controllers/media_items/media_item_html.ex

@@ -2,16 +2,4 @@ defmodule PinchflatWeb.MediaItems.MediaItemHTML do
   use PinchflatWeb, :html
 
   embed_templates "media_item_html/*"
-
-  def media_file_exists?(media_item) do
-    !!media_item.media_filepath and File.exists?(media_item.media_filepath)
-  end
-
-  def media_type(media_item) do
-    case Path.extname(media_item.media_filepath) do
-      ext when ext in [".mp4", ".webm", ".mkv"] -> :video
-      ext when ext in [".mp3", ".m4a"] -> :audio
-      _ -> :unknown
-    end
-  end
 end

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

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

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

@@ -8,30 +8,11 @@
     </h2>
   </div>
 </div>
-<div class="rounded-sm border border-stroke bg-white py-5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark px-7.5">
+<div class="rounded-sm border border-stroke bg-white py-5 pt-6 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5">
   <div class="max-w-full overflow-x-auto">
     <.tabbed_layout>
-      <:tab_append>
-        <.button_dropdown text="Actions" class="justify-center w-full sm:w-50">
-          <:option>
-            <.link
-              href={~p"/sources/#{@media_item.source_id}/media/#{@media_item}?delete_files=true"}
-              method="delete"
-              data-confirm="Are you sure you want to delete this record and all associated files on disk? This cannot be undone."
-            >
-              Delete Files
-            </.link>
-          </:option>
-        </.button_dropdown>
-      </:tab_append>
-
       <:tab title="Attributes">
         <div class="flex flex-col gap-10 dark:text-white">
-          <%= if media_file_exists?(@media_item) do %>
-            <h3 class="font-bold text-xl">Preview</h3>
-            <.media_preview media_item={@media_item} />
-          <% end %>
-
           <h3 class="font-bold text-xl">Attributes</h3>
           <section>
             <strong>Source:</strong>
@@ -42,6 +23,18 @@
 
           <.list_items_from_map map={Map.from_struct(@media_item)} />
         </div>
+
+        <section class="flex justify-center my-10">
+          <.link
+            href={~p"/sources/#{@media_item.source_id}/media/#{@media_item}?delete_files=true"}
+            method="delete"
+            data-confirm="Are you sure you want to delete this record and all associated files on disk? This cannot be undone."
+          >
+            <.button color="bg-meta-1" rounding="rounded-lg">
+              Delete Files
+            </.button>
+          </.link>
+        </section>
       </:tab>
       <:tab title="Tasks">
         <%= if match?([_|_], @media_item.tasks) do %>

lib/pinchflat_web/controllers/media_profiles/media_profile_html.ex

@@ -32,26 +32,6 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
     ]
   end
 
-  def friendly_sponsorblock_options do
-    [
-      {"Disabled (default)", "disabled"},
-      {"Remove Segments", "remove"}
-    ]
-  end
-
-  def frieldly_sponsorblock_categories do
-    [
-      {"Sponsor", "sponsor"},
-      {"Intro/Intermission", "intro"},
-      {"Outro/Credits", "outro"},
-      {"Self Promotion", "selfpromo"},
-      {"Preview/Recap", "preview"},
-      {"Filler Tangent", "filler"},
-      {"Interaction Reminder", "interaction"},
-      {"Non-music Section", "music_offtopic"}
-    ]
-  end
-
   def custom_output_template_options do
     %{
       upload_day: nil,
@@ -59,8 +39,7 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
       upload_year: nil,
       upload_yyyy_mm_dd: "the upload date in the format YYYY-MM-DD",
       source_custom_name: "the name of the sources that use this profile",
-      source_collection_type: "the collection type of the sources using this profile. Either 'channel' or 'playlist'",
+      source_collection_type: "the collection type of the sources that use this profile. Either 'channel' or 'playlist'"
-      artist_name: "the name of the artist with fallbacks to other uploader fields"
     }
   end
 
@@ -95,6 +74,6 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do
   end
 
   defp audio_output_template do
-    "/music/{{ artist_name }}/{{ title }}.{{ ext }}"
+    "/music/{{ source_custom_name }}/{{ title }}.{{ ext }}"
   end
 end

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

@@ -38,7 +38,7 @@
         presets: { 
           default: 'Default',
           media_center: 'TV Shows',
-          audio: 'Music',
+          audio: 'Audio',
           archiving: 'Archiving'
         }
     }">
@@ -238,36 +238,6 @@
       />
     </section>
 
-    <h3 class="mt-10 text-2xl text-black dark:text-white">
-      SponsorBlock Options
-    </h3>
-
-    <section x-data="{ sponsorblockBehaviour: null }">
-      <section x-data="{ presets: { default: 'disabled', media_center: 'disabled', audio: 'disabled', archiving: 'disabled' } }">
-        <.input
-          field={f[:sponsorblock_behaviour]}
-          options={friendly_sponsorblock_options()}
-          type="select"
-          label="SponsorBlock Behaviour"
-          help="Action to take when SponsorBlock segments are found. 'Disabled' won't take any action"
-          x-model="sponsorblockBehaviour"
-          x-init="
-            sponsorblockBehaviour = $el.value
-            $watch('selectedPreset', p => p && ($el.value = presets[p]))
-          "
-        />
-      </section>
-
-      <section x-show="sponsorblockBehaviour !== 'disabled'" x-transition>
-        <.input
-          field={f[:sponsorblock_categories]}
-          options={frieldly_sponsorblock_categories()}
-          type="checkbox_group"
-          label="SponsorBlock Categories"
-        />
-      </section>
-    </section>
-
     <.button class="my-10 sm:mb-7.5 w-full sm:w-auto" rounding="rounded-lg">Save Media profile</.button>
   </section>
 

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

@@ -19,35 +19,33 @@
 <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 overflow-x-auto">
     <.tabbed_layout>
-      <:tab_append>
-        <.button_dropdown text="Actions" class="justify-center w-full sm:w-50">
-          <:option>
-            <.link
-              href={~p"/media_profiles/#{@media_profile}"}
-              method="delete"
-              data-confirm="Are you sure you want to delete this profile and all its sources (leaving files in place)? This cannot be undone."
-            >
-              Delete Profile
-            </.link>
-          </:option>
-          <:option>
-            <.link
-              href={~p"/media_profiles/#{@media_profile}?delete_files=true"}
-              method="delete"
-              data-confirm="Are you sure you want to delete this profile, all its sources, and its files on disk? This cannot be undone."
-              class="mt-5 md:mt-0"
-            >
-              Delete Profile + Files
-            </.link>
-          </:option>
-        </.button_dropdown>
-      </:tab_append>
-
       <:tab title="Attributes">
         <div class="flex flex-col gap-10 text-white">
           <h3 class="font-bold text-xl">Attributes for "<%= @media_profile.name %>"</h3>
           <.list_items_from_map map={Map.from_struct(@media_profile)} />
         </div>
+
+        <section class="flex flex-col md:flex-row items-center md:justify-around my-10">
+          <.link
+            href={~p"/media_profiles/#{@media_profile}"}
+            method="delete"
+            data-confirm="Are you sure you want to delete this profile and all its sources (leaving files in place)? This cannot be undone."
+          >
+            <.button color="bg-meta-1" rounding="rounded-lg">
+              Delete Profile and its Sources
+            </.button>
+          </.link>
+          <.link
+            href={~p"/media_profiles/#{@media_profile}?delete_files=true"}
+            method="delete"
+            data-confirm="Are you sure you want to delete this profile, all its sources, and its files on disk? This cannot be undone."
+            class="mt-5 md:mt-0"
+          >
+            <.button color="bg-meta-1" rounding="rounded-lg">
+              Delete Profile, Sources, and Files
+            </.button>
+          </.link>
+        </section>
       </:tab>
       <:tab title="Sources">
         <.table rows={@media_profile.sources} table_class="text-black dark:text-white">

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

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

lib/pinchflat_web/controllers/podcasts/podcast_controller.ex

@@ -1,38 +0,0 @@
-defmodule PinchflatWeb.Podcasts.PodcastController do
-  use PinchflatWeb, :controller
-
-  alias Pinchflat.Repo
-  alias Pinchflat.Media
-  alias Pinchflat.Sources.Source
-  alias Pinchflat.Podcasts.RssFeedBuilder
-  alias Pinchflat.Podcasts.PodcastHelpers
-
-  def rss_feed(conn, %{"uuid" => uuid}) do
-    source = Repo.get_by!(Source, uuid: uuid)
-    url_base = url(conn, ~p"/")
-    xml = RssFeedBuilder.build(source, limit: 300, url_base: url_base)
-
-    conn
-    |> put_resp_content_type("application/rss+xml")
-    |> put_resp_header("content-disposition", "inline")
-    |> send_resp(200, xml)
-  end
-
-  def feed_image(conn, %{"uuid" => uuid}) do
-    source = Repo.get_by!(Source, uuid: uuid)
-    # This provides a fallback image if the source has none.
-    # We only need one since we're using the internal metadata image which
-    # we know exists.
-    media_items = Media.list_downloaded_media_items_for(source, limit: 1)
-
-    case PodcastHelpers.select_cover_image(source, media_items) do
-      {:error, _} ->
-        send_resp(conn, 404, "Image not found")
-
-      {:ok, filepath} ->
-        conn
-        |> put_resp_content_type(MIME.from_path(filepath))
-        |> send_file(200, filepath)
-    end
-  end
-end

lib/pinchflat_web/controllers/sources/source_controller.ex

@@ -1,15 +1,12 @@
 defmodule PinchflatWeb.Sources.SourceController do
   use PinchflatWeb, :controller
 
-  import Ecto.Query, warn: false
-
   alias Pinchflat.Repo
   alias Pinchflat.Media
   alias Pinchflat.Tasks
   alias Pinchflat.Sources
   alias Pinchflat.Profiles
   alias Pinchflat.Sources.Source
-  alias Pinchflat.Media.MediaQuery
 
   def index(conn, _params) do
     sources = Repo.preload(Sources.list_sources(), :media_profile)
@@ -57,8 +54,7 @@ defmodule PinchflatWeb.Sources.SourceController do
       source: source,
       pending_tasks: pending_tasks,
       pending_media: pending_media,
-      downloaded_media: downloaded_media,
+      downloaded_media: downloaded_media
-      total_downloaded: total_downloaded_for(source)
     )
   end
 
@@ -108,15 +104,6 @@ defmodule PinchflatWeb.Sources.SourceController do
     Profiles.list_media_profiles()
   end
 
-  # NOTE: should move this out of the controller
-  # once I finally add some query fragment layer
-  defp total_downloaded_for(source) do
-    MediaQuery.new()
-    |> MediaQuery.for_source(source)
-    |> MediaQuery.with_media_filepath()
-    |> Repo.aggregate(:count, :id)
-  end
-
   defp get_onboarding_layout do
     if Settings.get!(:onboarding) do
       {Layouts, :onboarding}

lib/pinchflat_web/controllers/sources/source_html.ex

@@ -24,8 +24,4 @@ defmodule PinchflatWeb.Sources.SourceHTML do
       {"Monthly", 30 * 24 * 60}
     ]
   end
-
-  def rss_feed_url(conn, source) do
-    url(conn, ~p"/sources/#{source.uuid}/feed") <> ".xml"
-  end
 end

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

@@ -19,46 +19,6 @@
 <div class="rounded-sm border border-stroke bg-white px-5 py-5 shadow-default dark:border-strokedark dark:bg-boxdark sm:px-7.5">
   <div class="max-w-full overflow-x-auto">
     <.tabbed_layout>
-      <:tab_append>
-        <.button_dropdown text="Actions" class="justify-center w-full sm:w-50">
-          <:option>
-            <span
-              x-data="{ copied: false }"
-              x-on:click={"
-                window.copyTextToClipboard('#{rss_feed_url(@conn, @source)}')
-                copied = true
-                setTimeout(() => copied = false, 4000)
-              "}
-            >
-              Copy RSS Feed
-              <span x-show="copied" x-transition.duration.150ms><.icon name="hero-check" class="ml-2 h-4 w-4" /></span>
-            </span>
-          </:option>
-          <:option>
-            <div class="h-px w-full bg-bodydark2"></div>
-          </:option>
-          <:option>
-            <.link
-              href={~p"/sources/#{@source}"}
-              method="delete"
-              data-confirm="Are you sure you want to delete this source (leaving files in place)? This cannot be undone."
-            >
-              Delete Source
-            </.link>
-          </:option>
-          <:option>
-            <.link
-              href={~p"/sources/#{@source}?delete_files=true"}
-              method="delete"
-              data-confirm="Are you sure you want to delete this source and it's files on disk? This cannot be undone."
-              class="mt-5 md:mt-0"
-            >
-              Delete Source + Files
-            </.link>
-          </:option>
-        </.button_dropdown>
-      </:tab_append>
-
       <:tab title="Attributes">
         <div class="flex flex-col gap-10 text-white">
           <h3 class="font-bold text-lg">Attributes</h3>
@@ -71,6 +31,28 @@
 
           <.list_items_from_map map={Map.from_struct(@source)} />
         </div>
+
+        <section class="flex flex-col md:flex-row items-center md:justify-around mt-10">
+          <.link
+            href={~p"/sources/#{@source}"}
+            method="delete"
+            data-confirm="Are you sure you want to delete this source (leaving files in place)? This cannot be undone."
+          >
+            <.button color="bg-meta-1" rounding="rounded-lg">
+              Delete Source
+            </.button>
+          </.link>
+          <.link
+            href={~p"/sources/#{@source}?delete_files=true"}
+            method="delete"
+            data-confirm="Are you sure you want to delete this source and it's files on disk? This cannot be undone."
+            class="mt-5 md:mt-0"
+          >
+            <.button color="bg-meta-1" rounding="rounded-lg">
+              Delete Source and Files
+            </.button>
+          </.link>
+        </section>
       </:tab>
       <:tab title="Pending Media">
         <%= if match?([_|_], @pending_media) do %>
@@ -89,7 +71,7 @@
       </:tab>
       <:tab title="Downloaded Media">
         <%= if match?([_|_], @downloaded_media) do %>
-          <h4 class="text-white text-lg mb-6">Shows a maximum of 100 media items (<%= @total_downloaded %> total)</h4>
+          <h4 class="text-white text-lg mb-6">Shows a maximum of 100 media items</h4>
           <.table rows={@downloaded_media} table_class="text-black dark:text-white">
             <:col :let={media_item} label="Title">
               <%= StringUtils.truncate(media_item.title, 50) %>

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

@@ -39,32 +39,24 @@
     Indexing Options
   </h3>
 
-  <section x-data="{ fastIndexingEnabled: null }">
+  <.input
-    <.input
+    field={f[:index_frequency_minutes]}
-      field={f[:index_frequency_minutes]}
+    options={friendly_index_frequencies()}
-      options={friendly_index_frequencies()}
+    type="select"
-      type="select"
+    label="Index Frequency"
-      label="Index Frequency"
+    help="Indexing is the process of checking for media to download. Sets the time between one index of this source finishing and the next one starting"
-      x-bind:disabled="fastIndexingEnabled == true"
+  />
-      x-init="$watch('fastIndexingEnabled', v => v && ($el.value = 30 * 24 * 60))"
-      help="Indexing is the process of checking for media to download. Sets the time between one index of this source finishing and the next one starting"
-    />
 
-    <div phx-click={show_modal("upgrade-modal")}>
+  <%!-- TODO: use Alpine to disable the index frequency when fast indexing is enabled --%>
-      <.input
+  <div phx-click={show_modal("upgrade-modal")}>
-        field={f[:fast_index]}
+    <.input
-        type="toggle"
+      field={f[:fast_index]}
-        label="Use Fast Indexing"
+      type="toggle"
-        label_suffix="(pro)"
+      label="Use Fast Indexing"
-        help="Experimental. Overrides 'Index Frequency'. Recommended for large channels that upload frequently. See below for more info"
+      label_suffix="(pro)"
-        x-init="
+      help="Experimental. Ignores 'Index Frequency'. Recommended for large channels that upload frequently. See below for more info"
-          // `enabled` is the data attribute that the toggle uses internally
+    />
-          fastIndexingEnabled = enabled
+  </div>
-          $watch('enabled', value => fastIndexingEnabled = !!value)
-        "
-      />
-    </div>
-  </section>
 
   <h3 class="mt-8 text-2xl text-black dark:text-white">
     Downloading Options

lib/pinchflat_web/endpoint.ex

@@ -47,54 +47,5 @@ defmodule PinchflatWeb.Endpoint do
   plug Plug.MethodOverride
   plug Plug.Head
   plug Plug.Session, @session_options
-
-  plug :override_base_url
-  plug :strip_trailing_extension
-
   plug PinchflatWeb.Router
-
-  # URLs need to be generated using the host of the current page being accessed
-  # for things like Podcast RSS feeds to contain links to the right location.
-  #
-  # Normally you'd set the `url` option in the Endpoint configuration, but
-  # since this is self-hosted and often accessed at multiple different URLs,
-  # that would probably be more difficult for end-users to set up than just
-  # having the application figure it out.
-  defp override_base_url(conn, _opts) do
-    new_scheme =
-      case get_req_header(conn, "x-forwarded-proto") do
-        [scheme] -> scheme
-        _ -> to_string(conn.scheme)
-      end
-
-    new_port = if conn.port in [80, 443], do: "", else: ":#{conn.port}"
-    new_base_url = "#{new_scheme}://#{conn.host}#{new_port}"
-
-    Phoenix.Controller.put_router_url(conn, new_base_url)
-  end
-
-  defp strip_trailing_extension(%{path_info: []} = conn, _opts), do: conn
-
-  defp strip_trailing_extension(conn, _opts) do
-    path =
-      conn.path_info
-      |> List.last()
-      |> String.split(".")
-      |> Enum.reverse()
-
-    case path do
-      [_] ->
-        conn
-
-      [_format | fragments] ->
-        new_path =
-          fragments
-          |> Enum.reverse()
-          |> Enum.join(".")
-
-        path_fragments = List.replace_at(conn.path_info, -1, new_path)
-
-        %{conn | path_info: path_fragments}
-    end
-  end
 end

lib/pinchflat_web/router.ex

@@ -1,9 +1,6 @@
 defmodule PinchflatWeb.Router do
   use PinchflatWeb, :router
-  import Phoenix.LiveDashboard.Router
 
-  # IMPORTANT: `strip_trailing_extension` in endpoint.ex removes
-  # the extension from the path
   pipeline :browser do
     plug :basic_auth
     plug :accepts, ["html"]
@@ -12,17 +9,12 @@ defmodule PinchflatWeb.Router do
     plug :put_root_layout, html: {PinchflatWeb.Layouts, :root}
     plug :protect_from_forgery
     plug :put_secure_browser_headers
-    plug :allow_iframe_embed
   end
 
   pipeline :api do
     plug :accepts, ["json"]
   end
 
-  pipeline :feeds do
-    plug :maybe_basic_auth
-  end
-
   scope "/", PinchflatWeb do
     pipe_through :browser
 
@@ -36,30 +28,25 @@ defmodule PinchflatWeb.Router do
     end
   end
 
-  # Routes in here _may not be_ protected by basic auth. This is necessary for
+  # Other scopes may use custom stacks.
-  # media streaming to work for RSS podcast feeds.
+  # scope "/api", PinchflatWeb do
-  scope "/", PinchflatWeb do
+  #   pipe_through :api
-    pipe_through :feeds
+  # end
 
-    get "/sources/:uuid/feed", Podcasts.PodcastController, :rss_feed
+  # Enable LiveDashboard and Swoosh mailbox preview in development
-    get "/sources/:uuid/feed_image", Podcasts.PodcastController, :feed_image
+  if Application.compile_env(:pinchflat, :dev_routes) do
+    # If you want to use the LiveDashboard in production, you should put
+    # it behind authentication and allow only admins to access it.
+    # If your application does not have an admins-only section yet,
+    # you can use Plug.BasicAuth to set up some basic authentication
+    # as long as you are also using SSL (which you should anyway).
+    import Phoenix.LiveDashboard.Router
 
-    get "/media/:uuid/stream", MediaItems.MediaItemController, :stream
+    scope "/dev" do
-  end
+      pipe_through :browser
 
-  scope "/dev" do
+      live_dashboard "/dashboard", metrics: PinchflatWeb.Telemetry
-    pipe_through :browser
+      forward "/mailbox", Plug.Swoosh.MailboxPreview
-
-    live_dashboard "/dashboard",
-      metrics: PinchflatWeb.Telemetry,
-      ecto_repos: [Pinchflat.Repo]
-  end
-
-  defp maybe_basic_auth(conn, opts) do
-    if Application.get_env(:pinchflat, :expose_feed_endpoints) do
-      conn
-    else
-      basic_auth(conn, opts)
     end
   end
 
@@ -77,8 +64,4 @@ defmodule PinchflatWeb.Router do
   defp credential_set?(credential) do
     credential && credential != ""
   end
-
-  defp allow_iframe_embed(conn, _opts) do
-    delete_resp_header(conn, "x-frame-options")
-  end
 end

mix.exs

@@ -4,7 +4,7 @@ defmodule Pinchflat.MixProject do
   def project do
     [
       app: :pinchflat,
-      version: "0.1.6",
+      version: "0.1.0",
       elixir: "~> 1.16",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
@@ -33,7 +33,7 @@ defmodule Pinchflat.MixProject do
   def application do
     [
       mod: {Pinchflat.Application, []},
-      extra_applications: [:logger, :runtime_tools, :inets, :os_mon]
+      extra_applications: [:logger, :runtime_tools, :inets]
     ]
   end
 
@@ -50,7 +50,6 @@ defmodule Pinchflat.MixProject do
       {:phoenix_ecto, "~> 4.4"},
       {:ecto_sql, "~> 3.10"},
       {:ecto_sqlite3, ">= 0.0.0"},
-      {:ecto_sqlite3_extras, "~> 1.2.0"},
       {:phoenix_html, "~> 3.3"},
       {:phoenix_live_reload, "~> 1.2", only: :dev},
       {:phoenix_live_view, "~> 0.20.1"},

mix.lock

@@ -13,7 +13,6 @@
   "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},
   "ecto_sql": {:hex, :ecto_sql, "3.11.1", "e9abf28ae27ef3916b43545f9578b4750956ccea444853606472089e7d169470", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ce14063ab3514424276e7e360108ad6c2308f6d88164a076aac8a387e1fea634"},
   "ecto_sqlite3": {:hex, :ecto_sqlite3, "0.15.1", "40f2fbd9e246455f8c42e7e0a77009ef806caa1b3ce6f717b2a0a80e8432fcfd", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.11", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:exqlite, "~> 0.19", [hex: :exqlite, repo: "hexpm", optional: false]}], "hexpm", "28b16e177123c688948357176662bf9ff9084daddf950ef5b6baf3ee93707064"},
-  "ecto_sqlite3_extras": {:hex, :ecto_sqlite3_extras, "1.2.2", "36e60b561a11441d15f26c791817999269fb578b985162207ebb08b04ca71e40", [:mix], [{:exqlite, ">= 0.13.2", [hex: :exqlite, repo: "hexpm", optional: false]}, {:table_rex, "~> 4.0", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "2b66ba7246bb4f7e39e2578acd4a0e4e4be54f60ff52d450a01be95eeb78ff1e"},
   "elixir_make": {:hex, :elixir_make, "0.7.8", "505026f266552ee5aabca0b9f9c229cbb496c689537c9f922f3eb5431157efc7", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.0", [hex: :certifi, repo: "hexpm", optional: true]}], "hexpm", "7a71945b913d37ea89b06966e1342c85cfe549b15e6d6d081e8081c493062c07"},
   "esbuild": {:hex, :esbuild, "0.8.1", "0cbf919f0eccb136d2eeef0df49c4acf55336de864e63594adcea3814f3edf41", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "25fc876a67c13cb0a776e7b5d7974851556baeda2085296c14ab48555ea7560f"},
   "ex_check": {:hex, :ex_check, "0.14.0", "d6fbe0bcc51cf38fea276f5bc2af0c9ae0a2bb059f602f8de88709421dae4f0e", [:mix], [], "hexpm", "8a602e98c66e6a4be3a639321f1f545292042f290f91fa942a285888c6868af0"},
@@ -47,7 +46,6 @@
   "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
   "sobelow": {:hex, :sobelow, "0.13.0", "218afe9075904793f5c64b8837cc356e493d88fddde126a463839351870b8d1e", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"},
   "swoosh": {:hex, :swoosh, "1.14.4", "94e9dba91f7695a10f49b0172c4a4cb658ef24abef7e8140394521b7f3bbb2d4", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:req, "~> 0.4 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "081c5a590e4ba85cc89baddf7b2beecf6c13f7f84a958f1cd969290815f0f026"},
-  "table_rex": {:hex, :table_rex, "4.0.0", "3c613a68ebdc6d4d1e731bc973c233500974ec3993c99fcdabb210407b90959b", [:mix], [], "hexpm", "c35c4d5612ca49ebb0344ea10387da4d2afe278387d4019e4d8111e815df8f55"},
   "tailwind": {:hex, :tailwind, "0.2.2", "9e27288b568ede1d88517e8c61259bc214a12d7eed271e102db4c93fcca9b2cd", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}], "hexpm", "ccfb5025179ea307f7f899d1bb3905cd0ac9f687ed77feebc8f67bdca78565c4"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.2", "2caabe9344ec17eafe5403304771c3539f3b6e2f7fb6a6f602558c825d0d0bfb", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "9b43db0dc33863930b9ef9d27137e78974756f5f198cae18409970ed6fa5b561"},

priv/repo/migrations/20240325174728_add_image_attrs_to_source_metadata.exs

@@ -1,11 +0,0 @@
-defmodule Pinchflat.Repo.Migrations.AddImageAttrsToSourceMetadata do
-  use Ecto.Migration
-
-  def change do
-    alter table(:source_metadata) do
-      add :fanart_filepath, :string
-      add :poster_filepath, :string
-      add :banner_filepath, :string
-    end
-  end
-end

priv/repo/migrations/20240325222242_add_uuid_to_source_and_media.exs

@@ -1,13 +0,0 @@
-defmodule Pinchflat.Repo.Migrations.AddUuidToSourceAndMedia do
-  use Ecto.Migration
-
-  def change do
-    alter table(:sources) do
-      add :uuid, :uuid
-    end
-
-    alter table(:media_items) do
-      add :uuid, :uuid
-    end
-  end
-end

priv/repo/migrations/20240325222243_backfill_content_uuids.exs

@@ -1,13 +0,0 @@
-defmodule Pinchflat.Repo.Migrations.BackfillContentUuids do
-  use Ecto.Migration
-
-  def up do
-    execute("UPDATE sources SET uuid = gen_random_uuid() WHERE uuid IS NULL")
-    execute("UPDATE media_items SET uuid = gen_random_uuid() WHERE uuid IS NULL")
-  end
-
-  def down do
-    execute("UPDATE sources SET uuid = NULL")
-    execute("UPDATE media_items SET uuid = NULL")
-  end
-end

priv/repo/migrations/20240325222846_add_description_to_source.exs

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

priv/repo/migrations/20240327165841_add_index_to_uuid_fields.exs

@@ -1,8 +0,0 @@
-defmodule Pinchflat.Repo.Migrations.AddIndexToUuidFields do
-  use Ecto.Migration
-
-  def change do
-    create unique_index(:sources, [:uuid])
-    create unique_index(:media_items, [:uuid])
-  end
-end

priv/repo/migrations/20240328160057_add_sponsorblock_to_media_profiles.exs

@@ -1,10 +0,0 @@
-defmodule Pinchflat.Repo.Migrations.AddSponsorblockToMediaProfiles do
-  use Ecto.Migration
-
-  def change do
-    alter table(:media_profiles) do
-      add :sponsorblock_behaviour, :string, default: "disabled"
-      add :sponsorblock_categories, {:array, :string}, default: []
-    end
-  end
-end

priv/repo/migrations/20240328221845_add_duration_to_media_items.exs

@@ -1,9 +0,0 @@
-defmodule Pinchflat.Repo.Migrations.AddDurationToMediaItems do
-  use Ecto.Migration
-
-  def change do
-    alter table(:media_items) do
-      add :duration_seconds, :integer
-    end
-  end
-end

rel/overlays/bin/check_file_permissions

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd -P -- "$(dirname -- "$0")"
-exec ./pinchflat eval Pinchflat.Release.check_file_permissions

rel/overlays/bin/docker_start

@@ -1,11 +1,4 @@
 #!/bin/sh
-/app/bin/check_file_permissions
-
-if [ $? -ne 0 ]; then
-  echo "Filesystem error. Exiting."
-  exit 1
-fi
-
 /app/bin/migrate
 
 cd -P -- "$(dirname -- "$0")"

selfhosted.Dockerfile

@@ -39,7 +39,6 @@ RUN mix local.hex --force && \
 
 # set build ENV
 ENV MIX_ENV="prod"
-ENV ERL_FLAGS="+JPperf true"
 
 # install mix dependencies
 COPY mix.exs mix.lock ./
@@ -75,11 +74,9 @@ RUN mix release
 # the compiled release and other runtime necessities
 FROM ${RUNNER_IMAGE}
 
-ARG PORT=8945
-
 RUN apt-get update -y
 RUN apt-get install -y libstdc++6 openssl libncurses5 locales ca-certificates \
-  ffmpeg curl git openssh-client nano
+  ffmpeg curl git openssh-client
 RUN apt-get clean && rm -f /var/lib/apt/lists/*_*
 
 # Download and update YT-DLP
@@ -103,9 +100,9 @@ RUN chown nobody /config /downloads
 
 # set runner ENV
 ENV MIX_ENV="prod"
-ENV PORT=${PORT}
+ENV CONFIG_PATH="/config"
+ENV PORT=8945
 ENV RUN_CONTEXT="selfhosted"
-EXPOSE ${PORT}
 
 # Only copy the final release from the build stage
 COPY --from=builder --chown=nobody:root /app/_build/${MIX_ENV}/rel/pinchflat ./

test/pinchflat/boot/data_backfill_worker_test.exs

@@ -1,6 +1,8 @@
 defmodule Pinchflat.Boot.DataBackfillWorkerTest do
   use Pinchflat.DataCase
 
+  import Pinchflat.MediaFixtures
+
   alias Pinchflat.Boot.DataBackfillWorker
   alias Pinchflat.JobFixtures.TestJobWorker
 
@@ -43,4 +45,26 @@ defmodule Pinchflat.Boot.DataBackfillWorkerTest do
       assert_enqueued(worker: DataBackfillWorker, scheduled_at: now_plus(60, :minutes))
     end
   end
+
+  describe "perform/1 when testing backfill_shorts_data" do
+    test "sets short_form_content to true for media items with shorts in the URL" do
+      media_item = media_item_with_attachments(%{original_url: "https://example.com/shorts/123"})
+
+      refute media_item.short_form_content
+
+      perform_job(DataBackfillWorker, %{})
+
+      assert Repo.reload!(media_item).short_form_content
+    end
+
+    test "does not set short_form_content to true for media items without shorts in the URL" do
+      media_item = media_item_with_attachments(%{original_url: "https://example.com/longs/123"})
+
+      refute media_item.short_form_content
+
+      perform_job(DataBackfillWorker, %{})
+
+      refute Repo.reload!(media_item).short_form_content
+    end
+  end
 end

test/pinchflat/downloading/download_option_builder_test.exs

@@ -1,8 +1,8 @@
 defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
   use Pinchflat.DataCase
   import Pinchflat.MediaFixtures
-  import Pinchflat.SourcesFixtures
   import Pinchflat.ProfilesFixtures
+  import Pinchflat.SourcesFixtures
 
   alias Pinchflat.Profiles
   alias Pinchflat.Downloading.DownloadOptionBuilder
@@ -222,45 +222,6 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
     end
   end
 
-  describe "build/1 when testing sponsorblock options" do
-    test "includes :sponsorblock_remove option when specified", %{media_item: media_item} do
-      media_item =
-        update_media_profile_attribute(media_item, %{
-          sponsorblock_behaviour: :remove,
-          sponsorblock_categories: ["sponsor", "intro"]
-        })
-
-      assert {:ok, res} = DownloadOptionBuilder.build(media_item)
-
-      assert {:sponsorblock_remove, "sponsor,intro"} in res
-    end
-
-    test "does not include :sponsorblock_remove option without categories", %{media_item: media_item} do
-      media_item =
-        update_media_profile_attribute(media_item, %{
-          sponsorblock_behaviour: :remove,
-          sponsorblock_categories: []
-        })
-
-      assert {:ok, res} = DownloadOptionBuilder.build(media_item)
-
-      refute {:sponsorblock_remove, ""} in res
-      refute {:sponsorblock_remove, []} in res
-      refute :sponsorblock_remove in res
-    end
-
-    test "does not include any sponsorblock options when disabled", %{media_item: media_item} do
-      media_item =
-        update_media_profile_attribute(media_item, %{sponsorblock_behaviour: :disabled})
-
-      assert {:ok, res} = DownloadOptionBuilder.build(media_item)
-
-      refute {:sponsorblock_remove, ""} in res
-      refute {:sponsorblock_remove, []} in res
-      refute :sponsorblock_remove in res
-    end
-  end
-
   describe "build_output_path_for/1" do
     test "builds an output path for a source", %{media_item: media_item} do
       path = DownloadOptionBuilder.build_output_path_for(media_item.source)

test/pinchflat/downloading/media_download_worker_test.exs

@@ -74,12 +74,6 @@ defmodule Pinchflat.Downloading.MediaDownloadWorkerTest do
       end)
     end
 
-    test "it ensures error are returned in a 2-item tuple", %{media_item: media_item} do
-      expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot -> {:error, "error", 1} end)
-
-      assert {:error, :download_failed} = perform_job(MediaDownloadWorker, %{id: media_item.id})
-    end
-
     test "it does not download if the source is set to not download", %{media_item: media_item} do
       expect(YtDlpRunnerMock, :run, 0, fn _url, _opts, _ot -> :ok end)
 

test/pinchflat/downloading/media_downloader_test.exs

@@ -35,7 +35,7 @@ defmodule Pinchflat.Downloading.MediaDownloaderTest do
       assert {:ok, _} = MediaDownloader.download_for_media_item(media_item)
     end
 
-    test "it saves the metadata filepath to the database", %{media_item: media_item} do
+    test "it saves the metadata filepatha to the database", %{media_item: media_item} do
       expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
         {:ok, render_metadata(:media_metadata)}
       end)
@@ -58,7 +58,7 @@ defmodule Pinchflat.Downloading.MediaDownloaderTest do
 
   describe "download_for_media_item/3 when testing media_item attributes" do
     setup do
-      stub(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
+      expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
         {:ok, render_metadata(:media_metadata)}
       end)
 
@@ -93,51 +93,16 @@ defmodule Pinchflat.Downloading.MediaDownloaderTest do
       assert [["de", _], ["en", _] | _rest] = updated_media_item.subtitle_filepaths
     end
 
-    test "it extracts the duration_seconds", %{media_item: media_item} do
-      assert media_item.duration_seconds == nil
-      assert {:ok, updated_media_item} = MediaDownloader.download_for_media_item(media_item)
-      assert is_integer(updated_media_item.duration_seconds)
-    end
-
     test "it extracts the thumbnail_filepath", %{media_item: media_item} do
-      expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
-        metadata = render_parsed_metadata(:media_metadata)
-
-        thumbnail_filepath =
-          metadata["thumbnails"]
-          |> Enum.reverse()
-          |> Enum.find_value(fn attrs -> attrs["filepath"] end)
-          |> String.split(~r{\.}, include_captures: true)
-          |> List.insert_at(-3, "-thumb")
-          |> Enum.join()
-
-        :ok = File.cp(thumbnail_filepath_fixture(), thumbnail_filepath)
-
-        {:ok, Phoenix.json_library().encode!(metadata)}
-      end)
-
       assert media_item.thumbnail_filepath == nil
       assert {:ok, updated_media_item} = MediaDownloader.download_for_media_item(media_item)
       assert String.ends_with?(updated_media_item.thumbnail_filepath, ".webp")
-
-      File.rm(updated_media_item.thumbnail_filepath)
     end
 
     test "it extracts the metadata_filepath", %{media_item: media_item} do
-      expect(YtDlpRunnerMock, :run, fn _url, _opts, _ot ->
-        metadata = render_parsed_metadata(:media_metadata)
-
-        infojson_filepath = metadata["infojson_filename"]
-        :ok = File.cp(infojson_filepath_fixture(), infojson_filepath)
-
-        {:ok, Phoenix.json_library().encode!(metadata)}
-      end)
-
       assert media_item.metadata_filepath == nil
       assert {:ok, updated_media_item} = MediaDownloader.download_for_media_item(media_item)
       assert String.ends_with?(updated_media_item.metadata_filepath, ".info.json")
-
-      File.rm(updated_media_item.metadata_filepath)
     end
   end
 

test/pinchflat/filesystem/filesystem_helpers_test.exs

@@ -34,29 +34,6 @@ defmodule Pinchflat.Filesystem.FilesystemHelpersTest do
     end
   end
 
-  describe "write_p/3" do
-    test "writes content to a file" do
-      filepath = FilesystemHelpers.generate_metadata_tmpfile(:json)
-      content = "{}"
-
-      assert :ok = FilesystemHelpers.write_p(filepath, content)
-      assert File.read!(filepath) == content
-
-      File.rm!(filepath)
-    end
-
-    test "creates directories as needed" do
-      tmpfile_directory = Application.get_env(:pinchflat, :tmpfile_directory)
-      filepath = Path.join([tmpfile_directory, "foo", "bar", "file.json"])
-      content = "{}"
-
-      assert :ok = FilesystemHelpers.write_p(filepath, content)
-      assert File.read!(filepath) == content
-
-      File.rm!(filepath)
-    end
-  end
-
   describe "write_p!/3" do
     test "writes content to a file" do
       filepath = FilesystemHelpers.generate_metadata_tmpfile(:json)

test/pinchflat/media_test.exs

@@ -38,6 +38,32 @@ defmodule Pinchflat.MediaTest do
     end
   end
 
+  describe "list_media_items_for/1" do
+    test "it returns media_items for a given source" do
+      source = source_fixture()
+      media_item = media_item_fixture(%{source_id: source.id})
+
+      assert Media.list_media_items_for(source) == [media_item]
+    end
+  end
+
+  describe "list_media_items_by_media_id_for/2" do
+    test "returns media_items for a given source and media_ids" do
+      source = source_fixture()
+      media_item = media_item_fixture(%{source_id: source.id, media_id: "123"})
+
+      assert Media.list_media_items_by_media_id_for(source, ["123"]) == [media_item]
+    end
+
+    test "does not return matching media_ids for a different source" do
+      source = source_fixture()
+      other_source = source_fixture()
+      _media_item = media_item_fixture(%{source_id: other_source.id, media_id: "123"})
+
+      assert Media.list_media_items_by_media_id_for(source, ["123"]) == []
+    end
+  end
+
   describe "list_pending_media_items_for/1" do
     test "it returns pending without a filepath for a given source" do
       source = source_fixture()
@@ -299,27 +325,6 @@ defmodule Pinchflat.MediaTest do
 
       assert Media.pending_download?(media_item)
     end
-
-    test "returns true if the content matches the title regex" do
-      source = source_fixture(%{title_filter_regex: "(?i)^FOO$"})
-      media_item = media_item_fixture(%{source_id: source.id, media_filepath: nil, title: "foo"})
-
-      assert Media.pending_download?(media_item)
-    end
-
-    test "returns false if the content doesn't match the title regex" do
-      source = source_fixture(%{title_filter_regex: "(?i)^FOO$"})
-      media_item = media_item_fixture(%{source_id: source.id, media_filepath: nil, title: "bar"})
-
-      refute Media.pending_download?(media_item)
-    end
-
-    test "return true if there is no title regex" do
-      source = source_fixture(%{title_filter_regex: nil})
-      media_item = media_item_fixture(%{source_id: source.id, media_filepath: nil, title: "foo"})
-
-      assert Media.pending_download?(media_item)
-    end
   end
 
   describe "search/1" do
@@ -393,37 +398,6 @@ defmodule Pinchflat.MediaTest do
       assert media_item.media_filepath == valid_attrs.media_filepath
     end
 
-    test "automatically sets the UUID" do
-      valid_attrs = %{
-        media_id: Faker.String.base64(12),
-        title: Faker.Commerce.product_name(),
-        media_filepath: "/video/#{Faker.File.file_name(:video)}",
-        source_id: source_fixture().id,
-        original_url: "https://www.youtube.com/channel/#{Faker.String.base64(12)}",
-        upload_date: Date.utc_today()
-      }
-
-      assert {:ok, %MediaItem{} = media_item} = Media.create_media_item(valid_attrs)
-
-      assert String.length(media_item.uuid) == 36
-    end
-
-    test "UUID is not writable by the user" do
-      valid_attrs = %{
-        media_id: Faker.String.base64(12),
-        title: Faker.Commerce.product_name(),
-        media_filepath: "/video/#{Faker.File.file_name(:video)}",
-        source_id: source_fixture().id,
-        original_url: "https://www.youtube.com/channel/#{Faker.String.base64(12)}",
-        upload_date: Date.utc_today(),
-        uuid: "some-uuid"
-      }
-
-      assert {:ok, %MediaItem{} = media_item} = Media.create_media_item(valid_attrs)
-
-      assert String.length(media_item.uuid) == 36
-    end
-
     test "creating with invalid data returns error changeset" do
       assert {:error, %Ecto.Changeset{}} = Media.create_media_item(@invalid_attrs)
     end

test/pinchflat/metadata/metadata_file_helpers_test.exs

@@ -140,14 +140,4 @@ defmodule Pinchflat.Metadata.MetadataFileHelpersTest do
       end
     end
   end
-
-  describe "metadata_directory_for/1" do
-    test "returns the metadata directory for the given record", %{media_item: media_item} do
-      base_metadata_directory = Application.get_env(:pinchflat, :metadata_directory)
-
-      metadata_directory = Helpers.metadata_directory_for(media_item)
-
-      assert metadata_directory == Path.join([base_metadata_directory, "media_items", "#{media_item.id}"])
-    end
-  end
 end

test/pinchflat/metadata/metadata_parser_test.exs

@@ -1,6 +1,5 @@
 defmodule Pinchflat.Metadata.MetadataParserTest do
   use Pinchflat.DataCase
-  import Pinchflat.MediaFixtures
 
   alias Pinchflat.Metadata.MetadataParser, as: Parser
 
@@ -45,12 +44,6 @@ defmodule Pinchflat.Metadata.MetadataParserTest do
 
       assert result.livestream == metadata["was_live"]
     end
-
-    test "it extracts the duration in seconds", %{metadata: metadata} do
-      result = Parser.parse_for_media_item(metadata)
-
-      assert result.duration_seconds == round(metadata["duration"])
-    end
   end
 
   describe "parse_for_media_item/1 when testing subtitle metadata" do
@@ -95,22 +88,6 @@ defmodule Pinchflat.Metadata.MetadataParserTest do
   end
 
   describe "parse_for_media_item/1 when testing thumbnail metadata" do
-    setup %{metadata: metadata} do
-      thumbnail_filepath =
-        metadata["thumbnails"]
-        |> Enum.reverse()
-        |> Enum.find_value(fn attrs -> attrs["filepath"] end)
-        |> String.split(~r{\.}, include_captures: true)
-        |> List.insert_at(-3, "-thumb")
-        |> Enum.join()
-
-      :ok = File.cp(thumbnail_filepath_fixture(), thumbnail_filepath)
-
-      on_exit(fn -> File.rm(thumbnail_filepath) end)
-
-      {:ok, filepath: thumbnail_filepath}
-    end
-
     test "extracts the thumbnail filepath", %{metadata: metadata} do
       result = Parser.parse_for_media_item(metadata)
 
@@ -126,14 +103,6 @@ defmodule Pinchflat.Metadata.MetadataParserTest do
       assert String.contains?(result.thumbnail_filepath, "-thumb.webp")
     end
 
-    test "doesn't include thumbnail if the file doesn't exist on-disk", %{metadata: metadata, filepath: filepath} do
-      File.rm(filepath)
-
-      result = Parser.parse_for_media_item(metadata)
-
-      assert result.thumbnail_filepath == nil
-    end
-
     test "doesn't freak out if the media has no thumbnails", %{metadata: metadata} do
       metadata = Map.put(metadata, "thumbnails", %{})
 
@@ -152,29 +121,12 @@ defmodule Pinchflat.Metadata.MetadataParserTest do
   end
 
   describe "parse_for_media_item/1 when testing infojson metadata" do
-    setup %{metadata: metadata} do
-      infojson_filepath = metadata["infojson_filename"]
-      :ok = File.cp(infojson_filepath_fixture(), infojson_filepath)
-
-      on_exit(fn -> File.rm(infojson_filepath) end)
-
-      {:ok, filepath: infojson_filepath}
-    end
-
     test "extracts the metadata filepath", %{metadata: metadata} do
       result = Parser.parse_for_media_item(metadata)
 
       assert String.ends_with?(result.metadata_filepath, ".info.json")
     end
 
-    test "doesn't include metadata if the file doesn't exist on-disk", %{metadata: metadata, filepath: filepath} do
-      File.rm(filepath)
-
-      result = Parser.parse_for_media_item(metadata)
-
-      assert result.metadata_filepath == nil
-    end
-
     test "doesn't freak out if the media has no infojson", %{metadata: metadata} do
       metadata = Map.put(metadata, "infojson_filename", nil)
 

test/pinchflat/metadata/source_metadata_storage_worker_test.exs

@@ -50,23 +50,6 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorkerTest do
     end
   end
 
-  describe "perform/1 when testing attribute updates" do
-    test "the source description is saved" do
-      stub(YtDlpRunnerMock, :run, fn
-        _url, _opts, ot when ot == @source_details_ot -> {:ok, source_details_return_fixture()}
-        _url, _opts, ot when ot == @metadata_ot -> {:ok, render_metadata(:channel_source_metadata)}
-      end)
-
-      source = source_fixture(%{description: nil})
-
-      refute source.description
-      perform_job(SourceMetadataStorageWorker, %{id: source.id})
-      source = Repo.preload(Repo.reload(source), :metadata)
-
-      assert source.description == "This is a test file for Pinchflat"
-    end
-  end
-
   describe "perform/1 when testing metadata storage" do
     test "sets metadata location for source" do
       stub(YtDlpRunnerMock, :run, fn
@@ -76,6 +59,7 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorkerTest do
 
       source = Repo.preload(source_fixture(), :metadata)
 
+      refute source.metadata
       perform_job(SourceMetadataStorageWorker, %{id: source.id})
       source = Repo.preload(Repo.reload(source), :metadata)
 
@@ -99,42 +83,6 @@ defmodule Pinchflat.Metadata.SourceMetadataStorageWorkerTest do
 
       assert metadata == %{"title" => "test"}
     end
-
-    test "sets metadata image location for source" do
-      stub(YtDlpRunnerMock, :run, fn
-        _url, _opts, ot when ot == @source_details_ot -> {:ok, source_details_return_fixture()}
-        _url, _opts, ot when ot == @metadata_ot -> {:ok, render_metadata(:channel_source_metadata)}
-      end)
-
-      source = source_fixture()
-
-      perform_job(SourceMetadataStorageWorker, %{id: source.id})
-      source = Repo.preload(Repo.reload(source), :metadata)
-
-      assert source.metadata.fanart_filepath
-      assert source.metadata.poster_filepath
-      assert source.metadata.banner_filepath
-
-      Sources.delete_source(source, delete_files: true)
-    end
-
-    test "stores metadata images for source" do
-      stub(YtDlpRunnerMock, :run, fn
-        _url, _opts, ot when ot == @source_details_ot -> {:ok, source_details_return_fixture()}
-        _url, _opts, ot when ot == @metadata_ot -> {:ok, render_metadata(:channel_source_metadata)}
-      end)
-
-      source = source_fixture()
-
-      perform_job(SourceMetadataStorageWorker, %{id: source.id})
-      source = Repo.preload(Repo.reload(source), :metadata)
-
-      assert File.exists?(source.metadata.fanart_filepath)
-      assert File.exists?(source.metadata.poster_filepath)
-      assert File.exists?(source.metadata.banner_filepath)
-
-      Sources.delete_source(source, delete_files: true)
-    end
   end
 
   describe "perform/1 when testing source image downloading" do

test/pinchflat/podcasts/podcast_helpers_test.exs

@@ -1,64 +0,0 @@
-defmodule Pinchflat.Podcasts.PodcastHelpersTest do
-  use Pinchflat.DataCase
-
-  import Pinchflat.SourcesFixtures
-  import Pinchflat.MediaFixtures
-
-  alias Pinchflat.Podcasts.PodcastHelpers
-
-  describe "persisted_media_items_for/2" do
-    test "returns media items with files that exist on-disk" do
-      source = source_fixture()
-      good_media = media_item_with_attachments(%{source_id: source.id})
-      _bad_media = media_item_fixture(%{source_id: source.id, media_filepath: "/tmp/existing_file.mp3"})
-
-      assert [persisted_media] = PodcastHelpers.persisted_media_items_for(source)
-      assert persisted_media.id == good_media.id
-    end
-
-    test "lets you specify a limit" do
-      source = source_fixture()
-      _good_media = media_item_with_attachments(%{source_id: source.id})
-
-      assert [] = PodcastHelpers.persisted_media_items_for(source, limit: 0)
-    end
-  end
-
-  describe "select_cover_image/2" do
-    test "returns a source's poster, if present" do
-      source = source_with_metadata_attachments()
-
-      {:ok, res} = PodcastHelpers.select_cover_image(source, [])
-
-      assert res == source.metadata.poster_filepath
-    end
-
-    test "falls back to a source's fanart, if present" do
-      source = source_with_metadata_attachments()
-
-      File.rm(source.metadata.poster_filepath)
-
-      {:ok, res} = PodcastHelpers.select_cover_image(source, [])
-
-      assert res == source.metadata.fanart_filepath
-    end
-
-    test "falls back to a media item's thumbnail, if present" do
-      source = source_with_metadata_attachments()
-      media_item = media_item_with_metadata_attachments(%{source_id: source.id})
-
-      File.rm(source.metadata.poster_filepath)
-      File.rm(source.metadata.fanart_filepath)
-
-      {:ok, res} = PodcastHelpers.select_cover_image(source, [media_item])
-
-      assert res == media_item.metadata.thumbnail_filepath
-    end
-
-    test "returns error if no artwork can be found" do
-      source = source_fixture()
-
-      assert PodcastHelpers.select_cover_image(source, []) == {:error, :no_suitable_image}
-    end
-  end
-end

test/pinchflat/podcasts/rss_feed_builder_test.exs

@@ -1,145 +0,0 @@
-defmodule Pinchflat.Podcasts.RssFeedBuilderTest do
-  use Pinchflat.DataCase
-
-  import Pinchflat.MediaFixtures
-  import Pinchflat.SourcesFixtures
-
-  alias Pinchflat.Podcasts.RssFeedBuilder
-
-  @datetime_format "%a, %d %b %Y %H:%M:%S %z"
-
-  setup do
-    source = source_fixture()
-
-    {:ok, source: source}
-  end
-
-  describe "build/2" do
-    test "returns an XML document", %{source: source} do
-      res = RssFeedBuilder.build(source)
-
-      assert String.contains?(res, ~s(<?xml version="1.0" encoding="UTF-8"?>))
-    end
-
-    test "escapes illegal characters" do
-      source = source_fixture(%{custom_name: "A & B"})
-      res = RssFeedBuilder.build(source)
-
-      assert String.contains?(res, ~s(<title>A &amp; B</title>))
-    end
-
-    test "can optionally apply a limit to media items", %{source: source} do
-      good_media = media_item_with_attachments(%{source_id: source.id})
-
-      res = RssFeedBuilder.build(source, limit: 0)
-
-      refute String.contains?(res, ~s(<title>#{good_media.title}</title>))
-    end
-
-    test "can optionally specify a URL base", %{source: source} do
-      res = RssFeedBuilder.build(source, url_base: "http://example.com")
-
-      assert String.contains?(res, ~s(http://example.com/sources/#{source.uuid}/feed.xml))
-    end
-  end
-
-  describe "build/2 when testing source XML" do
-    test "returns XML for static source attributes", %{source: source} do
-      res = RssFeedBuilder.build(source)
-
-      assert String.contains?(res, ~s(<title>#{source.custom_name}</title>))
-      assert String.contains?(res, ~s(<link>#{source.original_url}</link>))
-      assert String.contains?(res, ~s(<description>#{source.description}</description>))
-      assert String.contains?(res, ~s(<itunes:author>#{source.custom_name}</itunes:author>))
-      assert String.contains?(res, ~s(<itunes:subtitle>#{source.custom_name}</itunes:subtitle>))
-      assert String.contains?(res, ~s(<description>#{source.description}</description>))
-      assert String.contains?(res, ~s(<podcast:guid>#{source.uuid}</podcast:guid>))
-    end
-
-    test "returns the lastBuildDate and pubDate based off the source's timestamps", %{source: source} do
-      res = RssFeedBuilder.build(source)
-
-      assert String.contains?(res, ~s(<lastBuildDate>#{format_date(source.updated_at)}</lastBuildDate>))
-      assert String.contains?(res, ~s(<pubDate>#{format_date(source.inserted_at)}</pubDate>))
-    end
-
-    test "returns a self-link", %{source: source} do
-      res = RssFeedBuilder.build(source)
-
-      assert String.contains?(
-               res,
-               ~s(<atom:link href="http://localhost:8945/sources/#{source.uuid}/feed.xml" rel="self" type="application/rss+xml" />)
-             )
-    end
-
-    test "returns a link to the feed image" do
-      source = source_with_metadata_attachments()
-
-      res = RssFeedBuilder.build(source)
-      [_before, image_block, _after] = String.split(res, ~r(</?image>))
-
-      assert String.contains?(image_block, ~s(<url>http://localhost:8945/sources/#{source.uuid}/feed_image.jpg</url>))
-      assert String.contains?(image_block, ~s(<title>#{source.custom_name}</title>))
-      assert String.contains?(image_block, ~s(<link>#{source.original_url}</link>))
-
-      assert String.contains?(
-               res,
-               ~s(<itunes:image href="http://localhost:8945/sources/#{source.uuid}/feed_image.jpg"></itunes:image>)
-             )
-    end
-  end
-
-  describe "build/2 when testing media XML" do
-    test "only includes media persisted to disk", %{source: source} do
-      good_media = media_item_with_attachments(%{source_id: source.id})
-      bad_media = media_item_fixture(%{source_id: source.id, media_filepath: "/tmp/existing_file.mp3"})
-      pending_media = media_item_fixture(%{source_id: source.id, media_filepath: nil})
-
-      res = RssFeedBuilder.build(source)
-
-      assert String.contains?(res, ~s(<title>#{good_media.title}</title>))
-      refute String.contains?(res, ~s(<title>#{bad_media.title}</title>))
-      refute String.contains?(res, ~s(<title>#{pending_media.title}</title>))
-    end
-
-    test "returns XML for static media attributes", %{source: source} do
-      media_item = media_item_with_attachments(%{source_id: source.id})
-
-      res = RssFeedBuilder.build(source)
-      [_before, item_xml, _after] = String.split(res, ~r(</?item>))
-
-      assert String.contains?(item_xml, ~s(<guid isPermaLink="false">#{media_item.uuid}</guid>))
-      assert String.contains?(item_xml, ~s(<title>#{media_item.title}</title>))
-      assert String.contains?(item_xml, ~s(<link>#{media_item.original_url}</link>))
-      assert String.contains?(item_xml, ~s(<description>#{media_item.description}</description>))
-      assert String.contains?(item_xml, ~s(<itunes:author>#{source.custom_name}</itunes:author>))
-      assert String.contains?(item_xml, ~s(<itunes:subtitle>#{media_item.title}</itunes:subtitle>))
-      assert String.contains?(item_xml, ~s(<itunes:summary><![CDATA[#{media_item.description}]]></itunes:summary>))
-    end
-
-    test "returns pubDate based off the media's upload_date", %{source: source} do
-      media_item_with_attachments(%{source_id: source.id, upload_date: ~D[2020-01-01]})
-
-      res = RssFeedBuilder.build(source)
-      [_before, item_xml, _after] = String.split(res, ~r(</?item>))
-
-      assert String.contains?(item_xml, ~s(<pubDate>Wed, 01 Jan 2020 00:00:00 +0000</pubDate>))
-    end
-
-    test "returns an enclosure tag with the media's stream URL", %{source: source} do
-      media_item = media_item_with_attachments(%{source_id: source.id, media_size_bytes: 1234})
-
-      res = RssFeedBuilder.build(source)
-      [_before, item_xml, _after] = String.split(res, ~r(</?item>))
-
-      assert String.contains?(item_xml, ~s(<enclosure))
-      assert String.contains?(item_xml, ~s(url="http://localhost:8945/media/#{media_item.uuid}/stream.mp4"))
-      assert String.contains?(item_xml, ~s(length="1234"))
-      assert String.contains?(item_xml, ~s(type="video/mp4"))
-    end
-  end
-
-  defp format_date(date) do
-    Calendar.strftime(date, @datetime_format)
-  end
-end

test/pinchflat/sources_test.exs

@@ -59,31 +59,6 @@ defmodule Pinchflat.SourcesTest do
   end
 
   describe "create_source/2" do
-    test "automatically sets the UUID" do
-      expect(YtDlpRunnerMock, :run, &channel_mock/3)
-
-      valid_attrs = %{
-        media_profile_id: media_profile_fixture().id,
-        original_url: "https://www.youtube.com/channel/abc123"
-      }
-
-      assert {:ok, %Source{} = source} = Sources.create_source(valid_attrs)
-      assert String.length(source.uuid) == 36
-    end
-
-    test "UUID is not writable by the user" do
-      expect(YtDlpRunnerMock, :run, &channel_mock/3)
-
-      valid_attrs = %{
-        media_profile_id: media_profile_fixture().id,
-        original_url: "https://www.youtube.com/channel/abc123",
-        uuid: "some_uuid"
-      }
-
-      assert {:ok, %Source{} = source} = Sources.create_source(valid_attrs)
-      assert String.length(source.uuid) == 36
-    end
-
     test "creates a source and adds name + ID from runner response for channels" do
       expect(YtDlpRunnerMock, :run, &channel_mock/3)
 

test/pinchflat/utils/datetime_utils_test.exs

@@ -1,14 +0,0 @@
-defmodule Pinchflat.Utils.DatetimeUtilsTest do
-  use ExUnit.Case, async: true
-
-  alias Pinchflat.Utils.DatetimeUtils
-
-  describe "date_to_datetime/1" do
-    test "converts a Date to a DateTime" do
-      date = ~D[2022-01-01]
-      datetime = DatetimeUtils.date_to_datetime(date)
-
-      assert datetime == ~U[2022-01-01 00:00:00Z]
-    end
-  end
-end

test/pinchflat/yt_dlp/command_runner_test.exs

@@ -1,8 +1,6 @@
 defmodule Pinchflat.YtDlp.CommandRunnerTest do
   use ExUnit.Case, async: true
 
-  alias Pinchflat.Filesystem.FilesystemHelpers
-
   alias Pinchflat.YtDlp.CommandRunner, as: Runner
 
   @original_executable Application.compile_env(:pinchflat, :yt_dlp_executable)
@@ -67,41 +65,6 @@ defmodule Pinchflat.YtDlp.CommandRunnerTest do
     end
   end
 
-  describe "run/4 when testing cookie options" do
-    setup do
-      base_dir = Application.get_env(:pinchflat, :extras_directory)
-      cookie_file = Path.join(base_dir, "cookies.txt")
-
-      {:ok, cookie_file: cookie_file}
-    end
-
-    test "includes cookie options when cookies.txt exists", %{cookie_file: cookie_file} do
-      FilesystemHelpers.write_p!(cookie_file, "cookie data")
-
-      assert {:ok, output} = Runner.run(@media_url, [], "")
-
-      assert String.contains?(output, "--cookies #{cookie_file}")
-    end
-
-    test "doesn't include cookie options when cookies.txt blank", %{cookie_file: cookie_file} do
-      FilesystemHelpers.write_p!(cookie_file, " \n \n ")
-
-      assert {:ok, output} = Runner.run(@media_url, [], "")
-
-      refute String.contains?(output, "--cookies")
-      refute String.contains?(output, cookie_file)
-    end
-
-    test "doesn't include cookie options when cookies.txt doesn't exist", %{cookie_file: cookie_file} do
-      File.rm(cookie_file)
-
-      assert {:ok, output} = Runner.run(@media_url, [], "")
-
-      refute String.contains?(output, "--cookies")
-      refute String.contains?(output, cookie_file)
-    end
-  end
-
   defp wrap_executable(new_executable, fun) do
     Application.put_env(:pinchflat, :yt_dlp_executable, new_executable)
     fun.()

test/pinchflat/yt_dlp/media_test.exs

@@ -104,8 +104,7 @@ defmodule Pinchflat.YtDlp.MediaTest do
                original_url: "https://www.youtube.com/watch?v=TiZPUDkDYbk",
                livestream: false,
                short_form_content: false,
-               upload_date: Date.from_iso8601!("2021-01-01"),
+               upload_date: Date.from_iso8601!("2021-01-01")
-               duration_seconds: 60
              } == Media.response_to_struct(response)
     end
 
@@ -175,27 +174,5 @@ defmodule Pinchflat.YtDlp.MediaTest do
 
       assert %Media{upload_date: nil} = Media.response_to_struct(response)
     end
-
-    test "parses the duration" do
-      response = %{
-        "webpage_url" => "https://www.youtube.com/watch?v=TiZPUDkDYbk",
-        "aspect_ratio" => 1.0,
-        "duration" => 60.4,
-        "upload_date" => "20210101"
-      }
-
-      assert %Media{duration_seconds: 60} = Media.response_to_struct(response)
-    end
-
-    test "doesn't blow up if duration is missing" do
-      response = %{
-        "webpage_url" => "https://www.youtube.com/watch?v=TiZPUDkDYbk",
-        "aspect_ratio" => 1.0,
-        "duration" => nil,
-        "upload_date" => "20210101"
-      }
-
-      assert %Media{duration_seconds: nil} = Media.response_to_struct(response)
-    end
   end
 end

test/pinchflat_web/controllers/media_item_controller_test.exs

@@ -66,147 +66,6 @@ defmodule PinchflatWeb.MediaItemControllerTest do
     end
   end
 
-  describe "streaming media" do
-    test "returns 404 if the media isn't found", %{conn: conn} do
-      media_item = media_item_fixture()
-      conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
-
-      assert conn.status == 404
-    end
-
-    test "automatically sets the content type", %{conn: conn} do
-      media_item = media_item_with_attachments()
-      conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
-
-      assert {"content-type", "video/mp4; charset=utf-8"} in conn.resp_headers
-    end
-
-    test "sets the content length", %{conn: conn} do
-      media_item = media_item_with_attachments()
-      filesize = File.stat!(media_item.media_filepath).size
-
-      conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
-
-      assert {"content-length", to_string(filesize)} in conn.resp_headers
-    end
-  end
-
-  describe "streaming media when range is valid" do
-    setup do
-      media_item = media_item_with_attachments()
-
-      %{media_item: media_item}
-    end
-
-    test "sets the correct status and headers", %{conn: conn, media_item: media_item} do
-      filesize = File.stat!(media_item.media_filepath).size
-
-      conn =
-        conn
-        |> put_req_header("range", "bytes=0-100")
-        |> get(~p"/media/#{media_item.uuid}/stream")
-
-      assert conn.status == 206
-      assert {"content-range", "bytes 0-100/#{filesize}"} in conn.resp_headers
-      assert {"content-length", "101"} in conn.resp_headers
-    end
-
-    test "streams the specified range", %{conn: conn, media_item: media_item} do
-      conn =
-        conn
-        |> put_req_header("range", "bytes=0-100")
-        |> get(~p"/media/#{media_item.uuid}/stream")
-
-      assert byte_size(conn.resp_body) == 101
-    end
-
-    test "supports range offsets", %{conn: conn, media_item: media_item} do
-      contents = File.read!(media_item.media_filepath)
-      expected = String.slice(contents, 100..200)
-
-      conn =
-        conn
-        |> put_req_header("range", "bytes=100-200")
-        |> get(~p"/media/#{media_item.uuid}/stream")
-
-      assert conn.resp_body == expected
-    end
-
-    test "returns as expected if the requested range is larger than the file", %{conn: conn, media_item: media_item} do
-      contents = File.read!(media_item.media_filepath)
-      filesize = File.stat!(media_item.media_filepath).size
-
-      conn =
-        conn
-        |> put_req_header("range", "bytes=0-#{filesize * 10}")
-        |> get(~p"/media/#{media_item.uuid}/stream")
-
-      assert conn.resp_body == contents
-      assert {"content-range", "bytes 0-#{filesize - 1}/#{filesize}"} in conn.resp_headers
-      assert {"content-length", to_string(filesize)} in conn.resp_headers
-    end
-
-    test "supports endless ranges", %{conn: conn, media_item: media_item} do
-      contents = File.read!(media_item.media_filepath)
-
-      conn =
-        conn
-        |> put_req_header("range", "bytes=0-")
-        |> get(~p"/media/#{media_item.uuid}/stream")
-
-      assert conn.resp_body == contents
-    end
-
-    test "supports endless ranges with offsets", %{conn: conn, media_item: media_item} do
-      contents = File.read!(media_item.media_filepath)
-      {_, expected} = String.split_at(contents, 100)
-
-      conn =
-        conn
-        |> put_req_header("range", "bytes=100-")
-        |> get(~p"/media/#{media_item.uuid}/stream")
-
-      assert conn.resp_body == expected
-    end
-  end
-
-  describe "streaming media when range is invalid or not present" do
-    setup do
-      media_item = media_item_with_attachments()
-
-      %{media_item: media_item}
-    end
-
-    test "sets the correct status and headers", %{conn: conn, media_item: media_item} do
-      filesize = File.stat!(media_item.media_filepath).size
-
-      conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
-
-      assert conn.status == 200
-      assert {"content-length", to_string(filesize)} in conn.resp_headers
-    end
-
-    test "streams the entire file", %{conn: conn, media_item: media_item} do
-      contents = File.read!(media_item.media_filepath)
-
-      conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
-
-      assert conn.resp_body == contents
-    end
-
-    test "doesn't blow up if the range header is invalid", %{conn: conn, media_item: media_item} do
-      contents = File.read!(media_item.media_filepath)
-
-      conn =
-        conn
-        |> put_req_header("range", "bytes=-")
-        |> get(~p"/media/#{media_item.uuid}/stream")
-
-      assert conn.status == 200
-      assert conn.resp_body == contents
-    end
-  end
-
   defp create_media_item(_) do
     media_item = media_item_fixture()
     %{media_item: media_item}

test/pinchflat_web/controllers/podcast_controller_test.exs

@@ -1,38 +0,0 @@
-defmodule PinchflatWeb.PodcastControllerTest do
-  use PinchflatWeb.ConnCase
-
-  import Pinchflat.SourcesFixtures
-
-  describe "rss_feed" do
-    test "renders the XML document", %{conn: conn} do
-      source = source_fixture()
-
-      conn = get(conn, ~p"/sources/#{source.uuid}/feed" <> ".xml")
-
-      assert conn.status == 200
-      assert {"content-type", "application/rss+xml; charset=utf-8"} in conn.resp_headers
-      assert {"content-disposition", "inline"} in conn.resp_headers
-    end
-  end
-
-  describe "feed_image" do
-    test "returns a feed image if one can be found", %{conn: conn} do
-      source = source_with_metadata_attachments()
-
-      conn = get(conn, ~p"/sources/#{source.uuid}/feed_image" <> ".jpg")
-
-      assert conn.status == 200
-      assert {"content-type", "image/jpeg; charset=utf-8"} in conn.resp_headers
-      assert conn.resp_body == File.read!(source.metadata.poster_filepath)
-    end
-
-    test "returns 404 if an image cannot be found", %{conn: conn} do
-      source = source_fixture()
-
-      conn = get(conn, ~p"/sources/#{source.uuid}/feed_image" <> ".jpg")
-
-      assert conn.status == 404
-      assert conn.resp_body == "Image not found"
-    end
-  end
-end

test/pinchflat_web/routing_test.exs

@@ -1,8 +1,6 @@
 defmodule PinchflatWeb.RoutingTest do
   use PinchflatWeb.ConnCase
 
-  import Pinchflat.SourcesFixtures
-
   describe "basic_auth plug" do
     setup do
       old_username = Application.get_env(:pinchflat, :basic_auth_username)
@@ -56,53 +54,4 @@ defmodule PinchflatWeb.RoutingTest do
       assert conn.status == 200
     end
   end
-
-  describe "maybe_basic_auth plug" do
-    setup do
-      old_username = Application.get_env(:pinchflat, :basic_auth_username)
-      old_password = Application.get_env(:pinchflat, :basic_auth_password)
-      old_expose_feed_endpoints = Application.get_env(:pinchflat, :expose_feed_endpoints)
-
-      source = source_fixture()
-
-      on_exit(fn ->
-        Application.put_env(:pinchflat, :basic_auth_username, old_username)
-        Application.put_env(:pinchflat, :basic_auth_password, old_password)
-        Application.put_env(:pinchflat, :expose_feed_endpoints, old_expose_feed_endpoints)
-      end)
-
-      {:ok, source: source}
-    end
-
-    test "uses basic auth when expose_feed_endpoints is false", %{source: source} do
-      Application.put_env(:pinchflat, :basic_auth_username, "user")
-      Application.put_env(:pinchflat, :basic_auth_password, "pass")
-      Application.put_env(:pinchflat, :expose_feed_endpoints, false)
-
-      conn = get(build_conn(), "/sources/#{source.uuid}/feed")
-
-      assert conn.status == 401
-      assert {"www-authenticate", "Basic realm=\"Pinchflat\""} in conn.resp_headers
-    end
-
-    test "does not use basic auth when expose_feed_endpoints is true", %{source: source} do
-      Application.put_env(:pinchflat, :basic_auth_username, "user")
-      Application.put_env(:pinchflat, :basic_auth_password, "pass")
-      Application.put_env(:pinchflat, :expose_feed_endpoints, true)
-
-      conn = get(build_conn(), "/sources/#{source.uuid}/feed")
-
-      assert conn.status == 200
-    end
-
-    test "does not use basic auth when username/password aren't set", %{source: source} do
-      Application.put_env(:pinchflat, :basic_auth_username, nil)
-      Application.put_env(:pinchflat, :basic_auth_password, nil)
-      Application.put_env(:pinchflat, :expose_feed_endpoints, false)
-
-      conn = get(build_conn(), "/sources/#{source.uuid}/feed")
-
-      assert conn.status == 200
-    end
-  end
 end

test/support/files/media_metadata.json

@@ -1513,7 +1513,7 @@
       "url": "https://i.ytimg.com/vi_webp/ABC123/maxresdefault.webp",
       "preference": 0,
       "id": "41",
-      "filepath": "/tmp/test/tmpfiles/Pinchflat Example Video-ABC123.webp"
+      "filepath": "/app/tmp/videos/ABC123/Pinchflat Example Video-ABC123.webp"
     }
   ],
   "thumbnail": "https://i.ytimg.com/vi/ABC123/maxresdefault.jpg",
@@ -9769,7 +9769,7 @@
     "release_git_head": "5498729c59b03a9511c64552da3ba2f802166f8d",
     "repository": "yt-dlp/yt-dlp-nightly-builds"
   },
-  "infojson_filename": "/tmp/test/tmpfiles/Pinchflat Example Video-ABC123.info.json",
+  "infojson_filename": "/app/tmp/videos/ABC123/Pinchflat Example Video-ABC123.info.json",
   "__infojson_filename": "/app/tmp/videos/ABC123/Pinchflat Example Video-ABC123.info.json",
   "__real_download": true,
   "__files_to_merge": [

test/support/fixtures/media_fixtures.ex

@@ -5,7 +5,6 @@ defmodule Pinchflat.MediaFixtures do
   """
 
   alias Pinchflat.SourcesFixtures
-  alias Pinchflat.Filesystem.FilesystemHelpers
 
   @doc """
   Generate a media_item.
@@ -45,36 +44,25 @@ defmodule Pinchflat.MediaFixtures do
     media_item_fixture(merged_attrs)
   end
 
-  def media_item_with_metadata_attachments(attrs \\ %{}) do
-    metadata_dir =
-      Path.join(Application.get_env(:pinchflat, :metadata_directory), "#{:rand.uniform(1_000_000)}")
-
-    json_gz_filepath = Path.join(metadata_dir, "metadata.json.gz")
-    thumbnail_filepath = Path.join(metadata_dir, "thumbnail.jpg")
-
-    FilesystemHelpers.cp_p!(media_metadata_filepath_fixture(), json_gz_filepath)
-    FilesystemHelpers.cp_p!(thumbnail_filepath_fixture(), thumbnail_filepath)
-
-    merged_attrs =
-      Map.merge(attrs, %{
-        metadata: %{
-          metadata_filepath: json_gz_filepath,
-          thumbnail_filepath: thumbnail_filepath
-        }
-      })
-
-    media_item_with_attachments(merged_attrs)
-  end
-
   def media_item_with_attachments(attrs \\ %{}) do
     stored_media_filepath =
       Path.join([
         Application.get_env(:pinchflat, :media_directory),
         "#{:rand.uniform(1_000_000)}",
-        "#{:rand.uniform(1_000_000)}_media.mp4"
+        "#{:rand.uniform(1_000_000)}_media.mkv"
       ])
 
-    FilesystemHelpers.cp_p!(media_filepath_fixture(), stored_media_filepath)
+    fixture_media_filepath =
+      Path.join([
+        File.cwd!(),
+        "test",
+        "support",
+        "files",
+        "media.mkv"
+      ])
+
+    :ok = File.mkdir_p(Path.dirname(stored_media_filepath))
+    :ok = File.cp(fixture_media_filepath, stored_media_filepath)
 
     merged_attrs = Map.merge(attrs, %{media_filepath: stored_media_filepath})
     media_item_fixture(merged_attrs)
@@ -94,44 +82,4 @@ defmodule Pinchflat.MediaFixtures do
 
     Phoenix.json_library().encode!(media_attributes)
   end
-
-  def media_filepath_fixture do
-    Path.join([
-      File.cwd!(),
-      "test",
-      "support",
-      "files",
-      "media.mkv"
-    ])
-  end
-
-  def thumbnail_filepath_fixture do
-    Path.join([
-      File.cwd!(),
-      "test",
-      "support",
-      "files",
-      "thumbnail.jpg"
-    ])
-  end
-
-  def infojson_filepath_fixture do
-    Path.join([
-      File.cwd!(),
-      "test",
-      "support",
-      "files",
-      "example.info.json"
-    ])
-  end
-
-  def media_metadata_filepath_fixture do
-    Path.join([
-      File.cwd!(),
-      "test",
-      "support",
-      "files",
-      "media_metadata.json"
-    ])
-  end
 end

test/support/fixtures/sources_fixtures.ex

@@ -5,10 +5,8 @@ defmodule Pinchflat.SourcesFixtures do
   """
 
   alias Pinchflat.Repo
-  alias Pinchflat.MediaFixtures
-  alias Pinchflat.Sources.Source
   alias Pinchflat.ProfilesFixtures
-  alias Pinchflat.Filesystem.FilesystemHelpers
+  alias Pinchflat.Sources.Source
 
   @doc """
   Generate a source.
@@ -24,7 +22,6 @@ defmodule Pinchflat.SourcesFixtures do
             collection_id: Base.encode16(:crypto.hash(:md5, "#{:rand.uniform(1_000_000)}")),
             collection_type: "channel",
             custom_name: "Cool and good internal name!",
-            description: "This is a description",
             original_url: "https://www.youtube.com/channel/#{Faker.String.base64(12)}",
             media_profile_id: ProfilesFixtures.media_profile_fixture().id,
             index_frequency_minutes: 60
@@ -51,30 +48,6 @@ defmodule Pinchflat.SourcesFixtures do
     source_fixture(merged_attrs)
   end
 
-  def source_with_metadata_attachments(attrs \\ %{}) do
-    metadata_dir =
-      Path.join(Application.get_env(:pinchflat, :metadata_directory), "#{:rand.uniform(1_000_000)}")
-
-    json_gz_filepath = Path.join(metadata_dir, "metadata.json.gz")
-    poster_filepath = Path.join(metadata_dir, "poster.jpg")
-    fanart_filepath = Path.join(metadata_dir, "fanart.jpg")
-
-    FilesystemHelpers.cp_p!(MediaFixtures.media_metadata_filepath_fixture(), json_gz_filepath)
-    FilesystemHelpers.cp_p!(MediaFixtures.thumbnail_filepath_fixture(), poster_filepath)
-    FilesystemHelpers.cp_p!(MediaFixtures.thumbnail_filepath_fixture(), fanart_filepath)
-
-    merged_attrs =
-      Map.merge(attrs, %{
-        metadata: %{
-          metadata_filepath: json_gz_filepath,
-          poster_filepath: poster_filepath,
-          fanart_filepath: fanart_filepath
-        }
-      })
-
-    source_fixture(merged_attrs)
-  end
-
   def source_attributes_return_fixture do
     source_attributes = [
       %{

test/test_helper.exs

@@ -11,11 +11,9 @@ Faker.start()
 ExUnit.after_suite(fn _ ->
   File.rm_rf!(Application.get_env(:pinchflat, :media_directory))
   File.rm_rf!(Application.get_env(:pinchflat, :metadata_directory))
-  File.rm_rf!(Application.get_env(:pinchflat, :extras_directory))
   File.rm_rf!(Application.get_env(:pinchflat, :tmpfile_directory))
 
   File.mkdir_p!(Application.get_env(:pinchflat, :media_directory))
   File.mkdir_p!(Application.get_env(:pinchflat, :metadata_directory))
-  File.mkdir_p!(Application.get_env(:pinchflat, :extras_directory))
   File.mkdir_p!(Application.get_env(:pinchflat, :tmpfile_directory))
 end)