Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-10-31 02:27:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some m3u8 issues

Browse Source
This commit is contained in:
Zoe Roux 2021-01-02 23:50:56 +01:00
parent c28fba653f
commit 52b6aa878d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Kyoo/Views/API/VideoApi.cs
View File

@ -42,7 +42,7 @@ namespace Kyoo.Api
[HttpGet("{showSlug}-s{seasonNumber}e{episodeNumber}")] [HttpGet("{showSlug}-s{seasonNumber}e{episodeNumber}")]
[HttpGet("direct/{showSlug}-s{seasonNumber}e{episodeNumber}")] [HttpGet("direct/{showSlug}-s{seasonNumber}e{episodeNumber}.{extension?}")]
[Authorize(Policy="Play")] [Authorize(Policy="Play")]
public async Task<IActionResult> DirectEpisode(string showSlug, int seasonNumber, int episodeNumber) public async Task<IActionResult> DirectEpisode(string showSlug, int seasonNumber, int episodeNumber)
{ {
@ -56,7 +56,7 @@ namespace Kyoo.Api
} }
[HttpGet("{movieSlug}")] [HttpGet("{movieSlug}")]
[HttpGet("direct/{movieSlug}")] [HttpGet("direct/{movieSlug}.{extension?}")]
[Authorize(Policy="Play")] [Authorize(Policy="Play")]
public async Task<IActionResult> DirectMovie(string movieSlug) 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")] [Authorize(Policy="Play")]
public async Task<IActionResult> TransmuxEpisode(string showSlug, int seasonNumber, int episodeNumber) public async Task<IActionResult> TransmuxEpisode(string showSlug, int seasonNumber, int episodeNumber)
{ {
@ -81,10 +81,10 @@ namespace Kyoo.Api
string path = await _transcoder.Transmux(episode); string path = await _transcoder.Transmux(episode);
if (path == null) if (path == null)
return StatusCode(500); 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")] [Authorize(Policy="Play")]
public async Task<IActionResult> TransmuxMovie(string movieSlug) public async Task<IActionResult> TransmuxMovie(string movieSlug)
{ {
@ -95,10 +95,10 @@ namespace Kyoo.Api
string path = await _transcoder.Transmux(episode); string path = await _transcoder.Transmux(episode);
if (path == null) if (path == null)
return StatusCode(500); 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")] [Authorize(Policy="Play")]
public async Task<IActionResult> TranscodeEpisode(string showSlug, int seasonNumber, int episodeNumber) public async Task<IActionResult> TranscodeEpisode(string showSlug, int seasonNumber, int episodeNumber)
{ {
@ -111,10 +111,10 @@ namespace Kyoo.Api
string path = await _transcoder.Transcode(episode); string path = await _transcoder.Transcode(episode);
if (path == null) if (path == null)
return StatusCode(500); 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")] [Authorize(Policy="Play")]
public async Task<IActionResult> TranscodeMovie(string movieSlug) public async Task<IActionResult> TranscodeMovie(string movieSlug)
{ {
@ -125,7 +125,7 @@ namespace Kyoo.Api
string path = await _transcoder.Transcode(episode); string path = await _transcoder.Transcode(episode);
if (path == null) if (path == null)
return StatusCode(500); return StatusCode(500);
return PhysicalFile(path, "application/x-mpegURL ", true); return PhysicalFile(path, "application/x-mpegurl", true);
} }

2
Kyoo/Views/WebClient

@ -1 +1 @@
Subproject commit 00d7391755661d535bf2c4e35087050ee3a1a21c Subproject commit 2201028d9fd234dac81d1f0fcaac3793463cba46