From d39ebe7ac176c8f2f2f65e28f5c0dee759d9d4ce Mon Sep 17 00:00:00 2001 From: Kieran Date: Mon, 25 Mar 2024 10:34:22 -0700 Subject: [PATCH] Improve default recommendation for artist placeholder (#119) * Improved default recommendation for audio artist placeholder * Updated docs --- lib/pinchflat/downloading/output_path_builder.ex | 3 ++- .../controllers/media_profiles/media_profile_html.ex | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/pinchflat/downloading/output_path_builder.ex b/lib/pinchflat/downloading/output_path_builder.ex index 374d57f..89d3f6c 100644 --- a/lib/pinchflat/downloading/output_path_builder.ex +++ b/lib/pinchflat/downloading/output_path_builder.ex @@ -42,7 +42,8 @@ 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 diff --git a/lib/pinchflat_web/controllers/media_profiles/media_profile_html.ex b/lib/pinchflat_web/controllers/media_profiles/media_profile_html.ex index 7ce35f3..159af46 100644 --- a/lib/pinchflat_web/controllers/media_profiles/media_profile_html.ex +++ b/lib/pinchflat_web/controllers/media_profiles/media_profile_html.ex @@ -39,7 +39,8 @@ 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 that use this profile. Either 'channel' or 'playlist'" + source_collection_type: "the collection type of the sources using this profile. Either 'channel' or 'playlist'", + artist_name: "the name of the artist with fallbacks to other uploader fields" } end @@ -74,6 +75,6 @@ defmodule PinchflatWeb.MediaProfiles.MediaProfileHTML do end defp audio_output_template do - "/music/{{ source_custom_name }}/{{ title }}.{{ ext }}" + "/music/{{ artist_name }}/{{ title }}.{{ ext }}" end end