michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

minor dashboard cleanup

Browse Source
This commit is contained in:
Luke Pulverenti 2013-12-25 22:44:26 -05:00
parent bb5e6fdcad
commit 74f0d8bdbe
5 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
MediaBrowser.Api/LibraryService.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Dto;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.Movies;
@ -32,6 +33,21 @@ namespace MediaBrowser.Api
public string Id { get; set; }
}
[Route("/Videos/{Id}/Subtitle/{Index}", "GET")]
[Api(Description = "Gets an external subtitle file")]
public class GetSubtitle
{
/// <summary>
/// Gets or sets the id.
/// </summary>
/// <value>The id.</value>
[ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
public string Id { get; set; }
[ApiMember(Name = "Index", Description = "The subtitle stream index", IsRequired = true, DataType = "int", ParameterType = "path", Verb = "GET")]
public int Index { get; set; }
}
/// <summary>
/// Class GetCriticReviews
/// </summary>
@ -240,6 +256,25 @@ namespace MediaBrowser.Api
return ToStaticFileResult(item.Path);
}
public object Get(GetSubtitle request)
{
var subtitleStream = _itemRepo.GetMediaStreams(new MediaStreamQuery
{
Index = request.Index,
ItemId = new Guid(request.Id),
Type = MediaStreamType.Subtitle
}).FirstOrDefault();
if (subtitleStream == null)
{
throw new ResourceNotFoundException();
}
return ToStaticFileResult(subtitleStream.Path);
}
/// <summary>
/// Gets the specified request.
/// </summary>

5
MediaBrowser.Common/Net/MimeTypes.cs
View File

@ -218,6 +218,11 @@ namespace MediaBrowser.Common.Net
return "image/svg+xml";
}
if (ext.Equals(".srt", StringComparison.OrdinalIgnoreCase))
{
return "text/plain";
}
throw new ArgumentException("Argument not supported: " + path);
}
}

2
MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
View File

@ -139,7 +139,7 @@ namespace MediaBrowser.Server.Implementations.Roku
return _httpClient.Post(new HttpRequestOptions
{
Url = "mb/remotecontrol",
Url = "http://" + Session.RemoteEndPoint + "/mb/remotecontrol",
CancellationToken = cancellationToken,
RequestContent = json,
RequestContentType = "application/json"

3
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -474,7 +474,8 @@ namespace MediaBrowser.WebDashboard.Api
"advancedconfigurationpage.js",
"advancedmetadataconfigurationpage.js",
"boxsets.js",
"clientsettings.js",
"appsplayback.js",
"appsweather.js",
"dashboardpage.js",
"directorybrowser.js",
"edititemmetadata.js",

10
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -85,6 +85,9 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="ApiClient.js" />
<Content Include="dashboard-ui\appsplayback.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\css\icons.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -406,6 +409,9 @@
<Content Include="dashboard-ui\livetvrecordings.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\appsplayback.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\livetvchannel.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -1415,7 +1421,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="dashboard-ui\clientsettings.html">
<Content Include="dashboard-ui\appsweather.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
@ -1486,7 +1492,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="dashboard-ui\scripts\clientsettings.js">
<Content Include="dashboard-ui\scripts\appsweather.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>