diff options
| author | Andrew Mahone <andrew.mahone@gmail.com> | 2019-11-05 08:35:42 -0500 |
|---|---|---|
| committer | Andrew Mahone <andrew.mahone@gmail.com> | 2019-11-05 08:35:42 -0500 |
| commit | cc7741efd4c3b7c2c9039c768fc1a9e1442dbf8d (patch) | |
| tree | 9e939c5461bfbc44f4f16b944cd79dee1a3e4650 | |
| parent | cdc7d83c223c4aa92591eef4675b53c030e3bcbf (diff) | |
| parent | 3602251cf53c636e3006605e2b48a77d7952d029 (diff) | |
Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments
| -rw-r--r-- | Emby.Server.Implementations/Data/SqliteItemRepository.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/MediaInfoService.cs | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 864ee4683..2b9c6a52f 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -6180,7 +6180,8 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type statement.TryBind("@AttachmentIndex", query.Index.Value); } - foreach (var row in statement.ExecuteQuery()) { + foreach (var row in statement.ExecuteQuery()) + { list.Add(GetMediaAttachment(row)); } } @@ -6230,7 +6231,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type { if (i != startIndex) { - insertText.Append(","); + insertText.Append(','); } var index = i.ToString(CultureInfo.InvariantCulture); diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs index de5c4ddb7..296d565b9 100644 --- a/MediaBrowser.Api/Playback/MediaInfoService.cs +++ b/MediaBrowser.Api/Playback/MediaInfoService.cs @@ -527,7 +527,9 @@ namespace MediaBrowser.Api.Playback 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, mediaSource.Id, attachment.Index); |