Removed custom codec work from download options builder

lib/pinchflat/downloading/codec_parser.ex

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

lib/pinchflat/downloading/download_option_builder.ex

@@ -4,9 +4,9 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   """
 
   alias Pinchflat.Sources
+  alias Pinchflat.Settings
   alias Pinchflat.Sources.Source
   alias Pinchflat.Media.MediaItem
-  alias Pinchflat.Downloading.CodecParser
   alias Pinchflat.Downloading.OutputPathBuilder
 
   alias Pinchflat.Utils.FilesystemUtils, as: FSUtils
@@ -122,13 +122,13 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
   end
 
   defp quality_options(media_profile) do
-    vcodec_string = CodecParser.generate_vcodec_string_from_settings()
+    vcodec = Settings.get!(:video_codec_preference)
-    acodec_string = CodecParser.generate_acodec_string_from_settings()
+    acodec = Settings.get!(:audio_codec_preference)
 
     case media_profile.preferred_resolution do
       # Also be aware that :audio disabled all embedding options for subtitles
       :audio ->
-        [:extract_audio, format: "#{acodec_string}/best"]
+        [:extract_audio, format_sort: "+acodec:#{acodec}"]
 
       resolution_atom ->
         {resolution_string, _} =
@@ -137,10 +137,9 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilder do
           |> Integer.parse()
 
         [
-          format_sort: "res:#{resolution_string}",
           # Since Plex doesn't support reading metadata from MKV
           remux_video: "mp4",
-          format: "((#{vcodec_string})+(#{acodec_string}))/best"
+          format_sort: "res:#{resolution_string},+codec:#{vcodec}:#{acodec}"
         ]
     end
   end

test/pinchflat/downloading/codec_parser_test.exs

@@ -1,70 +0,0 @@
-defmodule Pinchflat.Downloading.CodecParserTest do
-  use Pinchflat.DataCase
-
-  alias Pinchflat.Settings
-  alias Pinchflat.Downloading.CodecParser
-
-  describe "generate_vcodec_string_from_settings/1" do
-    test "returns a default vcodec string when setting isn't set" do
-      Settings.set(video_codec_preference: [])
-
-      assert "bestvideo[vcodec~='^avc']/bestvideo" == CodecParser.generate_vcodec_string_from_settings()
-    end
-
-    test "generates a vcodec string" do
-      Settings.set(video_codec_preference: ["av01"])
-
-      assert "bestvideo[vcodec~='^av01']/bestvideo" == CodecParser.generate_vcodec_string_from_settings()
-    end
-  end
-
-  describe "generate_acodec_string_from_settings/1" do
-    test "returns a default acodec string when setting isn't set" do
-      Settings.set(audio_codec_preference: [])
-
-      assert "bestaudio[acodec~='^mp4a']/bestaudio" == CodecParser.generate_acodec_string_from_settings()
-    end
-
-    test "generates an acodec string" do
-      Settings.set(audio_codec_preference: ["mp3"])
-
-      assert "bestaudio[acodec~='^mp3']/bestaudio" == CodecParser.generate_acodec_string_from_settings()
-    end
-  end
-
-  describe "generate_vcodec_string/1" do
-    test "returns a default vcodec string when nil" do
-      assert "bestvideo[vcodec~='^avc']/bestvideo" == CodecParser.generate_vcodec_string(nil)
-    end
-
-    test "returns a default vcodec string when empty" do
-      assert "bestvideo[vcodec~='^avc']/bestvideo" == CodecParser.generate_vcodec_string([])
-    end
-
-    test "generates a vcodec string" do
-      assert "bestvideo[vcodec~='^av01']/bestvideo" == CodecParser.generate_vcodec_string(["av01"])
-    end
-
-    test "ignores options that don't exist" do
-      assert "bestvideo[vcodec~='^av01']/bestvideo" == CodecParser.generate_vcodec_string(["av01", "foo"])
-    end
-  end
-
-  describe "generate_acodec_string/1" do
-    test "returns a default acodec string when nil" do
-      assert "bestaudio[acodec~='^mp4a']/bestaudio" == CodecParser.generate_acodec_string(nil)
-    end
-
-    test "returns a default acodec string when empty" do
-      assert "bestaudio[acodec~='^mp4a']/bestaudio" == CodecParser.generate_acodec_string([])
-    end
-
-    test "generates an acodec string" do
-      assert "bestaudio[acodec~='^mp3']/bestaudio" == CodecParser.generate_acodec_string(["mp3"])
-    end
-
-    test "ignores options that don't exist" do
-      assert "bestaudio[acodec~='^mp3']/bestaudio" == CodecParser.generate_acodec_string(["mp3", "foo"])
-    end
-  end
-end

test/pinchflat/downloading/download_option_builder_test.exs

@@ -256,10 +256,8 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
         media_item = Repo.preload(media_item_fixture(source_id: source.id), source: :media_profile)
 
         assert {:ok, res} = DownloadOptionBuilder.build(media_item)
-        assert {:format_sort, "res:#{resolution}"} in res
-
-        assert {:format, "((bestvideo[vcodec~='^avc']/bestvideo)+(bestaudio[acodec~='^mp4a']/bestaudio))/best"} in res
 
+        assert {:format_sort, "res:#{resolution},+codec:avc:m4a"} in res
         assert {:remux_video, "mp4"} in res
       end)
     end
@@ -270,20 +268,20 @@ defmodule Pinchflat.Downloading.DownloadOptionBuilderTest do
       assert {:ok, res} = DownloadOptionBuilder.build(media_item)
 
       assert :extract_audio in res
-      assert {:format, "bestaudio[acodec~='^mp4a']/bestaudio/best"} in res
+      assert {:format_sort, "+acodec:m4a"} in res
 
       refute {:remux_video, "mp4"} in res
     end
 
     test "includes custom quality options if specified", %{media_item: media_item} do
-      Settings.set(video_codec_preference: ["av01"])
+      Settings.set(video_codec_preference: "av01")
-      Settings.set(audio_codec_preference: ["aac"])
+      Settings.set(audio_codec_preference: "aac")
 
       media_item = update_media_profile_attribute(media_item, %{preferred_resolution: :"1080p"})
 
       assert {:ok, res} = DownloadOptionBuilder.build(media_item)
 
-      assert {:format, "((bestvideo[vcodec~='^av01']/bestvideo)+(bestaudio[acodec~='^aac']/bestaudio))/best"} in res
+      assert {:format_sort, "res:1080,+codec:av01:aac"} in res
     end
   end