Different cosmetic fixes

2 files changed, 26 insertions, 14 deletions

diff --git a/src/invidious/routes/api/v1/videos.cr b/src/invidious/routes/api/v1/videos.cr
index 51344508..54602112 100644
--- a/src/invidious/routes/api/v1/videos.cr
+++ b/src/invidious/routes/api/v1/videos.cr
@@ -128,11 +128,11 @@ module Invidious::Routes::API::V1::Videos
             end
 
             str << <<-END_CUE
-	          #{start_time} --> #{end_time}
-	          #{text}
+	        #{start_time} --> #{end_time}
+	        #{text}
 	
 	
-	          END_CUE
+	        END_CUE
           end
         end
       end
diff --git a/src/invidious/videos/caption.cr b/src/invidious/videos/caption.cr
index 83a4c82f..377f30d6 100644
--- a/src/invidious/videos/caption.cr
+++ b/src/invidious/videos/caption.cr
@@ -40,8 +40,7 @@ module Invidious::Videos
       tree.children.each do |item|
         if item.name == "body"
           item.children.each do |cue|
-            if cue.name == "p"
-              if !(cue.children.size == 1 && cue.children[0].content == "\n")
+            if cue.name == "p" && !(cue.children.size == 1 && cue.children[0].content == "\n")
                 cues << cue
               end
             end
@@ -51,12 +50,15 @@ module Invidious::Videos
       end
       result = String.build do |result|
         result << <<-END_VTT
-			WEBVTT
-			Kind: captions
-			Language: #{tlang || @language_code}
-	
-	
-			END_VTT
+		WEBVTT
+		Kind: captions
+		Language: #{tlang || @language_code}
+
+
+		END_VTT
+
+		result << "\n\n"
+		
         cues.each_with_index do |node, i|
           start_time = node["t"].to_f.milliseconds
 
@@ -70,11 +72,21 @@ module Invidious::Videos
             end_time = start_time + duration
           end
 
-          start_time = "#{start_time.hours.to_s.rjust(2, '0')}:#{start_time.minutes.to_s.rjust(2, '0')}:#{start_time.seconds.to_s.rjust(2, '0')}.#{start_time.milliseconds.to_s.rjust(3, '0')}"
+          # start_time
+          result << start_time.hours.to_s.rjust(2, '0')
+          result << ':' << start_time.minutes.to_s.rjust(2, '0')
+          result << ':' << start_time.seconds.to_s.rjust(2, '0')
+          result << '.' << start_time.milliseconds.to_s.rjust(3, '0')
 
-          end_time = "#{end_time.hours.to_s.rjust(2, '0')}:#{end_time.minutes.to_s.rjust(2, '0')}:#{end_time.seconds.to_s.rjust(2, '0')}.#{end_time.milliseconds.to_s.rjust(3, '0')}"
+          result << " --> "
 
-          result << start_time + " --> " + end_time + "\n"
+          # end_time
+          result << end_time.hours.to_s.rjust(2, '0')
+          result << ':' << end_time.minutes.to_s.rjust(2, '0')
+          result << ':' << end_time.seconds.to_s.rjust(2, '0')
+          result << '.' << end_time.milliseconds.to_s.rjust(3, '0')
+
+          result << "\n"
 
           node.children.each do |s|
             result << s.content