Invidious is an alternative front-end to YouTube
Add default playlist preference (#5449)
Fijxuf9cf70f9d7cf
diff --git a/locales/en-US.json b/locales/en-US.jsonindex 3f42a509..fa28e7f8 100644--- a/locales/en-US.json+++ b/locales/en-US.json@@ -122,6 +122,8 @@"Redirect homepage to feed: ": "Redirect homepage to feed: ","preferences_max_results_label": "Number of videos shown in feed: ","preferences_sort_label": "Sort videos by: ",+ "preferences_default_playlist": "Default playlist: ",+ "preferences_default_playlist_none": "No default playlist set","published": "published","published - reverse": "published - reverse","alphabetically": "alphabetically",diff --git a/locales/es.json b/locales/es.jsonindex 46217943..686e13f9 100644--- a/locales/es.json+++ b/locales/es.json@@ -78,6 +78,8 @@"Redirect homepage to feed: ": "Redirigir la página de inicio a la fuente: ","preferences_max_results_label": "Número de videos mostrados en la fuente: ","preferences_sort_label": "Ordenar los videos por: ",+ "preferences_default_playlist": "Lista de reproducción por defecto: ",+ "preferences_default_playlist_none": "Ninguna lista de reproducción por defecto establecida","published": "fecha de publicación","published - reverse": "fecha de publicación: orden inverso","alphabetically": "alfabéticamente",diff --git a/src/invidious/config.cr b/src/invidious/config.crindex e47e405c..36f09d28 100644--- a/src/invidious/config.cr+++ b/src/invidious/config.cr@@ -52,6 +52,8 @@ struct ConfigPreferencesproperty vr_mode : Bool = trueproperty show_nick : Bool = trueproperty save_player_pos : Bool = false+ @[YAML::Field(ignore: true)]+ property default_playlist : String? = nildef to_tuple{% begin %}diff --git a/src/invidious/routes/preferences.cr b/src/invidious/routes/preferences.crindex 39ca77c0..9936e523 100644--- a/src/invidious/routes/preferences.cr+++ b/src/invidious/routes/preferences.cr@@ -144,6 +144,8 @@ module Invidious::Routes::PreferencesRoutenotifications_only ||= "off"notifications_only = notifications_only == "on"+ default_playlist = env.params.body["default_playlist"]?.try &.as(String)+# Convert to JSON and back again to take advantage of converters used for compatibilitypreferences = Preferences.from_json({annotations: annotations,@@ -180,6 +182,7 @@ module Invidious::Routes::PreferencesRoutevr_mode: vr_mode,show_nick: show_nick,save_player_pos: save_player_pos,+ default_playlist: default_playlist,}.to_json)if user = env.get? "user"diff --git a/src/invidious/user/preferences.cr b/src/invidious/user/preferences.crindex 0a8525f3..df195dd6 100644--- a/src/invidious/user/preferences.cr+++ b/src/invidious/user/preferences.cr@@ -56,6 +56,7 @@ struct Preferencesproperty extend_desc : Bool = CONFIG.default_user_preferences.extend_descproperty volume : Int32 = CONFIG.default_user_preferences.volumeproperty save_player_pos : Bool = CONFIG.default_user_preferences.save_player_pos+ property default_playlist : String? = nilmodule BoolToStringdef self.to_json(value : String, json : JSON::Builder)diff --git a/src/invidious/views/user/preferences.ecr b/src/invidious/views/user/preferences.ecrindex cf8b5593..23cb89f6 100644--- a/src/invidious/views/user/preferences.ecr+++ b/src/invidious/views/user/preferences.ecr@@ -126,6 +126,19 @@<input name="save_player_pos" id="save_player_pos" type="checkbox" <% if preferences.save_player_pos %>checked<% end %>></div>+ <% if user = env.get?("user").try &.as(User) %>+ <% playlists = Invidious::Database::Playlists.select_user_created_playlists(user.email) %>+ <div class="pure-control-group">+ <label for="default_playlist"><%= translate(locale, "preferences_default_playlist") %></label>+ <select name="default_playlist" id="default_playlist">+ <option value=""><%= translate(locale, "preferences_default_playlist_none") %></option>+ <% playlists.each do |plid, playlist_title| %>+ <option value="<%= plid %>" <%= "selected" if user.preferences.default_playlist == plid %>><%= HTML.escape(playlist_title) %></option>+ <% end %>+ </select>+ </div>+ <% end %>+<legend><%= translate(locale, "preferences_category_visual") %></legend><div class="pure-control-group">diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecrindex 6f9ced6f..fada6361 100644--- a/src/invidious/views/watch.ecr+++ b/src/invidious/views/watch.ecr@@ -163,7 +163,7 @@ we're going to need to do it here in order to allow for translations.<label for="playlist_id"><%= translate(locale, "Add to playlist: ") %></label><select style="width:100%" name="playlist_id" id="playlist_id"><% playlists.each do |plid, playlist_title| %>- <option data-plid="<%= plid %>" value="<%= plid %>"><%= HTML.escape(playlist_title) %></option>+ <option data-plid="<%= plid %>" value="<%= plid %>" <%= "selected" if user.preferences.default_playlist == plid %>><%= HTML.escape(playlist_title) %></option><% end %></select></div>