aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2019-11-04 11:31:41 -0500
committerAndrew Mahone <andrew.mahone@gmail.com>2019-11-04 11:31:41 -0500
commit262a8f47afb4905be4eac815dd92849c7616ce89 (patch)
tree56abbcea40ade1a61114374eaee23ac200bfcab2
parent9eef5f860d29eaa32d6b06f76d74f6c9bbe1e3cd (diff)
Remove attachment filenames from attachment URLs.
-rw-r--r--MediaBrowser.Api/Attachments/AttachmentService.cs5
-rw-r--r--MediaBrowser.Api/Playback/MediaInfoService.cs6
2 files changed, 3 insertions, 8 deletions
diff --git a/MediaBrowser.Api/Attachments/AttachmentService.cs b/MediaBrowser.Api/Attachments/AttachmentService.cs
index 9fceebd3b..c52ca2481 100644
--- a/MediaBrowser.Api/Attachments/AttachmentService.cs
+++ b/MediaBrowser.Api/Attachments/AttachmentService.cs
@@ -20,7 +20,7 @@ using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
namespace MediaBrowser.Api.Attachments
{
- [Route("/Videos/{Id}/{MediaSourceId}/Attachments/{Index}/{Filename}", "GET", Summary = "Gets specified attachment.")]
+ [Route("/Videos/{Id}/{MediaSourceId}/Attachments/{Index}", "GET", Summary = "Gets specified attachment.")]
public class GetAttachment
{
[ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -31,9 +31,6 @@ namespace MediaBrowser.Api.Attachments
[ApiMember(Name = "Index", Description = "The attachment stream index", IsRequired = true, DataType = "int", ParameterType = "path", Verb = "GET")]
public int Index { get; set; }
-
- [ApiMember(Name = "Filename", Description = "The attachment filename", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "GET")]
- public string Filename { get; set; }
}
public class AttachmentService : BaseApiService
diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs
index 41b324975..de5c4ddb7 100644
--- a/MediaBrowser.Api/Playback/MediaInfoService.cs
+++ b/MediaBrowser.Api/Playback/MediaInfoService.cs
@@ -527,12 +527,10 @@ namespace MediaBrowser.Api.Playback
foreach (var attachment in mediaSource.MediaAttachments)
{
- var filename = string.IsNullOrWhiteSpace(attachment.Filename) ? "Attachment" : attachment.Filename;
- attachment.DeliveryUrl = string.Format("/Videos/{0}/{1}/Attachments/{2}/{3}",
+ attachment.DeliveryUrl = string.Format("/Videos/{0}/{1}/Attachments/{2}",
item.Id,
mediaSource.Id,
- attachment.Index,
- filename);
+ attachment.Index);
}
}