mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments
This commit is contained in:
commit
cc7741efd4
2 changed files with 6 additions and 3 deletions
|
@ -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);
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue