From fddca10b6bc00bd252013725c5bd925b3b77be32 Mon Sep 17 00:00:00 2001
From: syeopite <syeopite@syeopite.dev>
Date: Sat, 26 Jun 2021 21:24:07 -0700
Subject: [PATCH] Small download refactoring. See commit message

Wrap download widget around details box

Remove ability to disable dl on only certain vids
---
 src/invidious/helpers/helpers.cr |  1 -
 src/invidious/views/watch.ecr    | 71 ++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr
index f9cffa3b..d67b395e 100644
--- a/src/invidious/helpers/helpers.cr
+++ b/src/invidious/helpers/helpers.cr
@@ -92,7 +92,6 @@ class Config
   property admins : Array(String) = [] of String
   property external_port : Int32? = nil
   property default_user_preferences : ConfigPreferences = ConfigPreferences.from_yaml("")
-  property dmca_content : Array(String) = [] of String    # For compliance with DMCA, disables download widget using list of video IDs
   property check_tables : Bool = false                    # Check table integrity, automatically try to add any missing columns, create tables, etc.
   property cache_annotations : Bool = false               # Cache annotations requested from IA, will not cache empty annotations or annotations that only contain cards
   property banner : String? = nil                         # Optional banner to be displayed along top of page for announcements, etc.
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index 97f0e6f3..418f85c5 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -161,40 +161,47 @@ we're going to need to do it here in order to allow for translations.
                 <% end %>
             <% end %>
 
-            <% if CONFIG.dmca_content.includes?(video.id) || CONFIG.disabled?("downloads") %>
-                <p id="download"><%= translate(locale, "Download is disabled.") %></p>
+            <% if CONFIG.disabled?("downloads") %>
             <% else %>
-                <form class="pure-form pure-form-stacked" action="/latest_version" method="get" rel="noopener" target="_blank">
-                    <div class="pure-control-group">
-                        <label for="download_widget"><%= translate(locale, "Download as: ") %></label>
-                        <select style="width:100%" name="download_widget" id="download_widget">
-                            <% fmt_stream.each do |option| %>
-                                <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= option["mimeType"].as_s.split(";")[0].split("/")[1] %>"}'>
-                                    <%= itag_to_metadata?(option["itag"]).try &.["height"]? || "~240" %>p - <%= option["mimeType"].as_s.split(";")[0] %>
-                                </option>
-                            <% end %>
-                            <% video_streams.each do |option| %>
-                                <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= option["mimeType"].as_s.split(";")[0].split("/")[1] %>"}'>
-                                    <%= option["qualityLabel"] %> - <%= option["mimeType"].as_s.split(";")[0] %> @ <%= option["fps"] %>fps - video only
-                                </option>
-                            <% end %>
-                            <% audio_streams.each do |option| %>
-                                <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= option["mimeType"].as_s.split(";")[0].split("/")[1] %>"}'>
-                                    <%= option["mimeType"].as_s.split(";")[0] %> @ <%= option["bitrate"]?.try &.as_i./ 1000 %>k - audio only
-                                </option>
-                            <% end %>
-                            <% captions.each do |caption| %>
-                                <option value='{"id":"<%= video.id %>","label":"<%= caption.name %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= caption.languageCode %>.vtt"}'>
-                                    <%= translate(locale, "Subtitles - `x` (.vtt)", caption.name) %>
-                                </option>
-                            <% end %>
-                        </select>
-                    </div>
+                <details id="download-box">
+                    <summary class="simulated_a">
+                        <p> 
+                            <i style="margin: 0px 2px;" class="icon ion-md-download"></i>
+                            <%= translate(locale, "Download") %> 
+                        </p>
+                    </summary>
 
-                    <button type="submit" class="pure-button pure-button-primary">
-                        <b><%= translate(locale, "Download") %></b>
-                    </button>
-                </form>
+                    <form class="pure-form pure-form-stacked" action="/latest_version" method="get" rel="noopener" target="_blank">
+                        <div class="pure-control-group">
+                            <select style="width:100%" name="download_widget" id="download_widget">
+                                <% fmt_stream.each do |option| %>
+                                    <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= option["mimeType"].as_s.split(";")[0].split("/")[1] %>"}'>
+                                        <%= itag_to_metadata?(option["itag"]).try &.["height"]? || "~240" %>p - <%= option["mimeType"].as_s.split(";")[0] %>
+                                    </option>
+                                <% end %>
+                                <% video_streams.each do |option| %>
+                                    <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= option["mimeType"].as_s.split(";")[0].split("/")[1] %>"}'>
+                                        <%= option["qualityLabel"] %> - <%= option["mimeType"].as_s.split(";")[0] %> @ <%= option["fps"] %>fps - video only
+                                    </option>
+                                <% end %>
+                                <% audio_streams.each do |option| %>
+                                    <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= option["mimeType"].as_s.split(";")[0].split("/")[1] %>"}'>
+                                        <%= option["mimeType"].as_s.split(";")[0] %> @ <%= option["bitrate"]?.try &.as_i./ 1000 %>k - audio only
+                                    </option>
+                                <% end %>
+                                <% captions.each do |caption| %>
+                                    <option value='{"id":"<%= video.id %>","label":"<%= caption.name.simpleText %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= caption.languageCode %>.vtt"}'>
+                                        <%= translate(locale, "Subtitles - `x` (.vtt)", caption.name.simpleText) %>
+                                    </option>
+                                <% end %>
+                            </select>
+                        </div>
+
+                        <button type="submit" class="pure-button pure-button-primary">
+                            <b><%= translate(locale, "Download") %></b>
+                        </button>
+                    </form>
+                </details>
             <% end %>
 
             <p id="views"><i class="icon ion-ios-eye"></i> <%= number_with_separator(video.views) %></p>