cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

display program data path and bookmark in the dashboard

Browse Source
This commit is contained in:
Luke Pulverenti 2013-06-01 23:17:10 -04:00
parent 5b280de519
commit 7736c8cefc
4 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
View File

@ -131,6 +131,16 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
await options.ResourcePool.WaitAsync(options.CancellationToken).ConfigureAwait(false);
}
if ((DateTime.UtcNow - client.LastTimeout).TotalSeconds < 30)
{
if (options.ResourcePool != null)
{
options.ResourcePool.Release();
}
throw new HttpException(string.Format("Connection to {0} timed out", options.Url)) { IsTimedOut = true };
}
_logger.Info("HttpClientManager.Get url: {0}", options.Url);
try

6
MediaBrowser.Model/System/SystemInfo.cs
View File

@ -61,6 +61,12 @@ namespace MediaBrowser.Model.System
/// <value>The id.</value>
public string Id { get; set; }
/// <summary>
/// Gets or sets the program data path.
/// </summary>
/// <value>The program data path.</value>
public string ProgramDataPath { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="SystemInfo"/> class.
/// </summary>

27
MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs
View File

@ -306,6 +306,33 @@ namespace MediaBrowser.Server.Implementations.HttpServer
return;
}
var localPath = context.Request.Url.LocalPath;
if (string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase))
{
context.Response.Redirect(DefaultRedirectPath);
context.Response.Close();
return;
}
if (string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase))
{
context.Response.Redirect("mediabrowser/" + DefaultRedirectPath);
context.Response.Close();
return;
}
if (string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase))
{
context.Response.Redirect("mediabrowser/" + DefaultRedirectPath);
context.Response.Close();
return;
}
if (string.IsNullOrEmpty(localPath))
{
context.Response.Redirect("/mediabrowser/" + DefaultRedirectPath);
context.Response.Close();
return;
}
RaiseReceiveWebRequest(context);
await Task.Factory.StartNew(() =>

5
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@ -191,7 +191,7 @@ namespace MediaBrowser.ServerApplication
{
base.OnLoggerLoaded();
_httpServerCreationTask = Task.Run(() => ServerFactory.CreateServer(this, LogManager, "Media Browser", "index.html"));
_httpServerCreationTask = Task.Run(() => ServerFactory.CreateServer(this, LogManager, "Media Browser", "dashboard/index.html"));
}
/// <summary>
@ -516,7 +516,8 @@ namespace MediaBrowser.ServerApplication
FailedPluginAssemblies = FailedAssemblies.ToArray(),
InProgressInstallations = InstallationManager.CurrentInstallations.Select(i => i.Item1).ToArray(),
CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(),
Id = _systemId
Id = _systemId,
ProgramDataPath = ApplicationPaths.ProgramDataPath
};
}