Merge 3f64e3f439 into 4782a67038

Closes issue 4880

.github/workflows/build-stable-container.yml

@@ -47,9 +47,11 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: quay.io/invidious/invidious
+          flavor: |
+            latest=false
           tags: |
             type=semver,pattern={{version}}
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            type=raw,value=latest
           labels: |
             quay.expires-after=12w
 
@@ -71,10 +73,11 @@ jobs:
         with:
           images: quay.io/invidious/invidious
           flavor: |
+            latest=false
             suffix=-arm64
           tags: |
             type=semver,pattern={{version}}
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            type=raw,value=latest
           labels: |
             quay.expires-after=12w
 

CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+
+## v2.20240825.2 (2024-08-26)
+
+This releases fixes the container tags pushed on quay.io.
+Previously, the ARM64 build was released under the `latest` tag, instead of `latest-arm64`.
+
+### Full list of pull requests merged since the last release (newest first)
+
+CI: Fix docker container tags ([#4883], by @SamantazFox)
+
+[#4877]: https://github.com/iv-org/invidious/pull/4877
+
+
 ## v2.20240825.1 (2024-08-25)
 
 Add patch component to be [semver] compliant and make github actions happy.
@@ -8,8 +21,9 @@ Add patch component to be [semver] compliant and make github actions happy.
 
 ### Full list of pull requests merged since the last release (newest first)
 
-Allow manual trigger of release-container build (#4877, thanks @syeopite)
+Allow manual trigger of release-container build ([#4877], thanks @syeopite)
 
+[#4877]: https://github.com/iv-org/invidious/pull/4877
 
 
 ## v2.20240825.0 (2024-08-25)

assets/css/default.css

@@ -9,6 +9,36 @@ body {
     Arial, sans-serif;
 }
 
+.length-watch-page{
+  position: relative;
+  background-color: rgba(35, 35, 35, 0.75);
+  color: #fff;
+  border-radius: 2px;
+  padding: 4px;
+  font-size: 20px;
+  right: 0.25em;
+  bottom: 0.25em;
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+.dark-theme .length-watch-page{
+  background-color: #fff;
+  color: rgba(35, 35, 35, 1);
+}
+
+@media (prefers-color-scheme: dark) {
+  .length-watch-page{
+    background-color: #fff;
+    color: rgba(35, 35, 35, 1);
+  }
+  
+  .light-theme .length-watch-page {
+    background-color: rgba(35, 35, 35, 0.75);
+    color: #fff;
+  }
+}
+
 #contents {
   display: flex;
   flex-direction: column;

src/invidious/helpers/utils.cr

@@ -11,6 +11,21 @@ def ci_lower_bound(pos, n)
   return (phat + z*z/(2*n) - z * Math.sqrt((phat*(1 - phat) + z*z/(4*n))/n))/(1 + z*z/n)
 end
 
+def video_length_abbreviated(locale, length)
+  length_abbreviated = ""
+  if length.days > 0
+    length_abbreviated = "#{translate_count(locale, "generic_count_days_short", length.days)} #{translate_count(locale, "generic_count_hours_short", length.hours)} #{translate_count(locale, "generic_count_minutes_short", length.minutes)}"
+  elsif length.hours > 0
+    length_abbreviated = "#{translate_count(locale, "generic_count_hours_short", length.hours)} #{translate_count(locale, "generic_count_minutes_short", length.minutes)}"
+  elsif length.minutes > 0
+    length_abbreviated = translate_count(locale, "generic_count_minutes_short", length.minutes)
+  else
+    length_abbreviated = translate_count(locale, "generic_count_seconds", length.seconds)
+  end
+
+  return length_abbreviated
+end
+
 def elapsed_text(elapsed)
   millis = elapsed.total_milliseconds
   return "#{millis.round(2)}ms" if millis >= 1

src/invidious/views/watch.ecr

@@ -77,6 +77,9 @@ we're going to need to do it here in order to allow for translations.
 <div class="h-box">
     <h1>
         <%= title %>
+        <span class="length-watch-page">
+            <%= video_length_abbreviated(locale, video.length_seconds.seconds)%>
+        </span>
         <% if params.listen %>
             <a title="<%=translate(locale, "Video mode")%>" href="/watch?<%= env.params.query %>&listen=0">
                 <i class="icon ion-ios-videocam"></i>
@@ -88,6 +91,7 @@ we're going to need to do it here in order to allow for translations.
         <% end %>
     </h1>
 
+
     <% if !video.is_listed %>
         <h3>
             <i class="icon ion-ios-unlock"></i> <%= translate(locale, "Unlisted") %>