Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-23 14:10:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments

Browse source
This commit is contained in:
Andrew Mahone 2019-11-05 08:35:42 -05:00
parent cdc7d83c22 3602251cf5
commit cc7741efd4
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View file

@ -6180,7 +6180,8 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
statement.TryBind("@AttachmentIndex", query.Index.Value); statement.TryBind("@AttachmentIndex", query.Index.Value);
} }
foreach (var row in statement.ExecuteQuery()) { foreach (var row in statement.ExecuteQuery())
{
list.Add(GetMediaAttachment(row)); list.Add(GetMediaAttachment(row));
} }
} }
@ -6230,7 +6231,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
{ {
if (i != startIndex) if (i != startIndex)
{ {
insertText.Append(","); insertText.Append(',');
} }
var index = i.ToString(CultureInfo.InvariantCulture); var index = i.ToString(CultureInfo.InvariantCulture);

4
MediaBrowser.Api/Playback/MediaInfoService.cs
View file

@ -527,7 +527,9 @@ namespace MediaBrowser.Api.Playback
foreach (var attachment in mediaSource.MediaAttachments) foreach (var attachment in mediaSource.MediaAttachments)
{ {
attachment.DeliveryUrl = string.Format("/Videos/{0}/{1}/Attachments/{2}", attachment.DeliveryUrl = string.Format(
CultureInfo.InvariantCulture,
"/Videos/{0}/{1}/Attachments/{2}",
item.Id, item.Id,
mediaSource.Id, mediaSource.Id,
attachment.Index); attachment.Index);