Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 20:24:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

add user profile settings about virtual episodes

Browse Source
This commit is contained in:
Luke Pulverenti 2013-10-25 11:52:10 -04:00
parent e8bb5c4b9a
commit 55b284cdff
5 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -399,6 +399,12 @@ namespace MediaBrowser.Api.Playback
/// <returns>System.String.</returns> /// <returns>System.String.</returns>
private string GetConvertedAssPath(Video video, MediaStream subtitleStream, long? startTimeTicks, bool performConversion) private string GetConvertedAssPath(Video video, MediaStream subtitleStream, long? startTimeTicks, bool performConversion)
{ {
// If it's already ass, no conversion neccessary
//if (string.Equals(Path.GetExtension(subtitleStream.Path), ".ass", StringComparison.OrdinalIgnoreCase))
//{
// return subtitleStream.Path;
//}
var offset = TimeSpan.FromTicks(startTimeTicks ?? 0); var offset = TimeSpan.FromTicks(startTimeTicks ?? 0);
var path = Kernel.Instance.FFMpegManager.GetSubtitleCachePath(video, subtitleStream.Index, offset, ".ass"); var path = Kernel.Instance.FFMpegManager.GetSubtitleCachePath(video, subtitleStream.Index, offset, ".ass");

3
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@ -56,6 +56,8 @@ namespace MediaBrowser.Model.Configuration
public bool IsDisabled { get; set; } public bool IsDisabled { get; set; }
public bool DisplayVirtualEpisodes { get; set; }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="UserConfiguration" /> class. /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
/// </summary> /// </summary>
@ -63,6 +65,7 @@ namespace MediaBrowser.Model.Configuration
{ {
IsAdministrator = true; IsAdministrator = true;
BlockNotRated = false; BlockNotRated = false;
DisplayVirtualEpisodes = true;
} }
} }
} }

2
MediaBrowser.Server.Implementations/HttpServer/NativeWebSocket.cs
View File

@ -120,7 +120,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
var result = await WebSocket.ReceiveAsync(buffer, cancellationToken).ConfigureAwait(false); var result = await WebSocket.ReceiveAsync(buffer, cancellationToken).ConfigureAwait(false);
if (result.CloseStatus.HasValue && result.CloseStatus.Value != WebSocketCloseStatus.Empty) if (result.CloseStatus.HasValue)
{ {
_logger.Info("Web socket connection closed by client. Reason: {0}", result.CloseStatus.Value); _logger.Info("Web socket connection closed by client. Reason: {0}", result.CloseStatus.Value);
return null; return null;

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

@ -516,6 +516,7 @@ namespace MediaBrowser.WebDashboard.Api
"updatepasswordpage.js", "updatepasswordpage.js",
"userimagepage.js", "userimagepage.js",
"userprofilespage.js", "userprofilespage.js",
"usersettings.js",
"wizardfinishpage.js", "wizardfinishpage.js",
"wizardservice.js", "wizardservice.js",
"wizardstartpage.js", "wizardstartpage.js",

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -338,6 +338,9 @@
<Content Include="dashboard-ui\scripts\tvupcoming.js"> <Content Include="dashboard-ui\scripts\tvupcoming.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\scripts\usersettings.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\wizardservice.js"> <Content Include="dashboard-ui\scripts\wizardservice.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -347,6 +350,9 @@
<Content Include="dashboard-ui\tvupcoming.html"> <Content Include="dashboard-ui\tvupcoming.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\usersettings.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\wizardservice.html"> <Content Include="dashboard-ui\wizardservice.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>