From 52b6aa878dba039fa3de2deeffa13dee3d01cb46 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sat, 2 Jan 2021 23:50:56 +0100
Subject: [PATCH] Fixing some m3u8 issues

---
 Kyoo/Views/API/VideoApi.cs | 20 ++++++++++----------
 Kyoo/Views/WebClient       |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Kyoo/Views/API/VideoApi.cs b/Kyoo/Views/API/VideoApi.cs
index cafba9ba..aa8127c3 100644
--- a/Kyoo/Views/API/VideoApi.cs
+++ b/Kyoo/Views/API/VideoApi.cs
@@ -42,7 +42,7 @@ namespace Kyoo.Api
 		
 
 		[HttpGet("{showSlug}-s{seasonNumber}e{episodeNumber}")]
-		[HttpGet("direct/{showSlug}-s{seasonNumber}e{episodeNumber}")]
+		[HttpGet("direct/{showSlug}-s{seasonNumber}e{episodeNumber}.{extension?}")]
 		[Authorize(Policy="Play")]
 		public async Task<IActionResult> DirectEpisode(string showSlug, int seasonNumber, int episodeNumber)
 		{
@@ -56,7 +56,7 @@ namespace Kyoo.Api
 		}
 		
 		[HttpGet("{movieSlug}")]
-		[HttpGet("direct/{movieSlug}")]
+		[HttpGet("direct/{movieSlug}.{extension?}")]
 		[Authorize(Policy="Play")]
 		public async Task<IActionResult> DirectMovie(string movieSlug)
 		{
@@ -68,7 +68,7 @@ namespace Kyoo.Api
 		}
 		
 
-		[HttpGet("transmux/{showSlug}-s{seasonNumber}e{episodeNumber}")]
+		[HttpGet("transmux/{showSlug}-s{seasonNumber}e{episodeNumber}.{extension?}")]
 		[Authorize(Policy="Play")]
 		public async Task<IActionResult> TransmuxEpisode(string showSlug, int seasonNumber, int episodeNumber)
 		{
@@ -81,10 +81,10 @@ namespace Kyoo.Api
 			string path = await _transcoder.Transmux(episode);
 			if (path == null)
 				return StatusCode(500);
-			return PhysicalFile(path, "application/x-mpegURL ", true);
+			return PhysicalFile(path, "application/x-mpegurl", true);
 		}
 		
-		[HttpGet("transmux/{movieSlug}")]
+		[HttpGet("transmux/{movieSlug}.{extension?}")]
 		[Authorize(Policy="Play")]
 		public async Task<IActionResult> TransmuxMovie(string movieSlug)
 		{
@@ -95,10 +95,10 @@ namespace Kyoo.Api
 			string path = await _transcoder.Transmux(episode);
 			if (path == null)
 				return StatusCode(500);
-			return PhysicalFile(path, "application/x-mpegURL ", true);
+			return PhysicalFile(path, "application/x-mpegurl", true);
 		}
 
-		[HttpGet("transcode/{showSlug}-s{seasonNumber}e{episodeNumber}")]
+		[HttpGet("transcode/{showSlug}-s{seasonNumber}e{episodeNumber}.{extension?}")]
 		[Authorize(Policy="Play")]
 		public async Task<IActionResult> TranscodeEpisode(string showSlug, int seasonNumber, int episodeNumber)
 		{
@@ -111,10 +111,10 @@ namespace Kyoo.Api
 			string path = await _transcoder.Transcode(episode);
 			if (path == null)
 				return StatusCode(500);
-			return PhysicalFile(path, "application/x-mpegURL ", true);
+			return PhysicalFile(path, "application/x-mpegurl", true);
 		}
 		
-		[HttpGet("transcode/{movieSlug}")]
+		[HttpGet("transcode/{movieSlug}.{extension?}")]
 		[Authorize(Policy="Play")]
 		public async Task<IActionResult> TranscodeMovie(string movieSlug)
 		{
@@ -125,7 +125,7 @@ namespace Kyoo.Api
 			string path = await _transcoder.Transcode(episode);
 			if (path == null)
 				return StatusCode(500);
-			return PhysicalFile(path, "application/x-mpegURL ", true);
+			return PhysicalFile(path, "application/x-mpegurl", true);
 		}
 		
 		
diff --git a/Kyoo/Views/WebClient b/Kyoo/Views/WebClient
index 00d73917..2201028d 160000
--- a/Kyoo/Views/WebClient
+++ b/Kyoo/Views/WebClient
@@ -1 +1 @@
-Subproject commit 00d7391755661d535bf2c4e35087050ee3a1a21c
+Subproject commit 2201028d9fd234dac81d1f0fcaac3793463cba46