Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-24 02:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prefer ApiKey over api_key in generated URL's (#13342)

Browse Source
This commit is contained in:
Niels van Velzen 2025-01-11 17:35:44 +01:00 committed by GitHub
parent 17bbe4a2cd
commit 3b8e614819
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Api/Controllers/SubtitleController.cs
View File

@ -395,7 +395,7 @@ public class SubtitleController : BaseJellyfinApiController
var url = string.Format( var url = string.Format(
CultureInfo.InvariantCulture, CultureInfo.InvariantCulture,
"stream.vtt?CopyTimestamps=true&AddVttTimeMap=true&StartPositionTicks={0}&EndPositionTicks={1}&api_key={2}", "stream.vtt?CopyTimestamps=true&AddVttTimeMap=true&StartPositionTicks={0}&EndPositionTicks={1}&ApiKey={2}",
positionTicks.ToString(CultureInfo.InvariantCulture), positionTicks.ToString(CultureInfo.InvariantCulture),
endPositionTicks.ToString(CultureInfo.InvariantCulture), endPositionTicks.ToString(CultureInfo.InvariantCulture),
accessToken); accessToken);

4
Jellyfin.Api/Helpers/DynamicHlsHelper.cs
View File

@ -550,7 +550,7 @@ public class DynamicHlsHelper
var url = string.Format( var url = string.Format(
CultureInfo.InvariantCulture, CultureInfo.InvariantCulture,
"{0}/Subtitles/{1}/subtitles.m3u8?SegmentLength={2}&api_key={3}", "{0}/Subtitles/{1}/subtitles.m3u8?SegmentLength={2}&ApiKey={3}",
state.Request.MediaSourceId, state.Request.MediaSourceId,
stream.Index.ToString(CultureInfo.InvariantCulture), stream.Index.ToString(CultureInfo.InvariantCulture),
30.ToString(CultureInfo.InvariantCulture), 30.ToString(CultureInfo.InvariantCulture),
@ -587,7 +587,7 @@ public class DynamicHlsHelper
var url = string.Format( var url = string.Format(
CultureInfo.InvariantCulture, CultureInfo.InvariantCulture,
"Trickplay/{0}/tiles.m3u8?MediaSourceId={1}&api_key={2}", "Trickplay/{0}/tiles.m3u8?MediaSourceId={1}&ApiKey={2}",
width.ToString(CultureInfo.InvariantCulture), width.ToString(CultureInfo.InvariantCulture),
state.Request.MediaSourceId, state.Request.MediaSourceId,
user.GetToken()); user.GetToken());

2
Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
View File

@ -536,7 +536,7 @@ public class TrickplayManager : ITrickplayManager
if (trickplayInfo.ThumbnailCount > 0) if (trickplayInfo.ThumbnailCount > 0)
{ {
const string urlFormat = "{0}.jpg?MediaSourceId={1}&api_key={2}"; const string urlFormat = "{0}.jpg?MediaSourceId={1}&ApiKey={2}";
const string decimalFormat = "{0:0.###}"; const string decimalFormat = "{0:0.###}";
var resolution = $"{trickplayInfo.Width}x{trickplayInfo.Height}"; var resolution = $"{trickplayInfo.Width}x{trickplayInfo.Height}";

4
MediaBrowser.Model/Dlna/StreamInfo.cs
View File

@ -979,7 +979,7 @@ public class StreamInfo
} }
list.Add(new NameValuePair("PlaySessionId", item.PlaySessionId ?? string.Empty)); list.Add(new NameValuePair("PlaySessionId", item.PlaySessionId ?? string.Empty));
list.Add(new NameValuePair("api_key", accessToken ?? string.Empty)); list.Add(new NameValuePair("ApiKey", accessToken ?? string.Empty));
string? liveStreamId = item.MediaSource?.LiveStreamId; string? liveStreamId = item.MediaSource?.LiveStreamId;
list.Add(new NameValuePair("LiveStreamId", liveStreamId ?? string.Empty)); list.Add(new NameValuePair("LiveStreamId", liveStreamId ?? string.Empty));
@ -1189,7 +1189,7 @@ public class StreamInfo
if (!string.IsNullOrEmpty(accessToken)) if (!string.IsNullOrEmpty(accessToken))
{ {
info.Url += "?api_key=" + accessToken; info.Url += "?ApiKey=" + accessToken;
} }
info.IsExternalUrl = false; info.IsExternalUrl = false;