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

centralize page size value

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-09 12:42:55 -04:00
parent 43d9cea6c4
commit fe645c5cad
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Controller/Library/DtoBuilder.cs
View File

@ -836,17 +836,13 @@ namespace MediaBrowser.Controller.Library
BaseItem item = null;
if (userId.HasValue)
{
item = libraryManager.GetItemById(new Guid(id));
}
else if (!isIndexFolder)
if (!isIndexFolder)
{
item = libraryManager.GetItemById(new Guid(id));
}
// If we still don't find it, look within individual user views
if (item == null && !userId.HasValue)
if (item == null && !userId.HasValue && isIndexFolder)
{
foreach (var user in userManager.Users)
{

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

@ -72,7 +72,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
/// <value>The name of the server.</value>
private string ServerName { get; set; }
private ContainerAdapter _containerAdapter;
private readonly ContainerAdapter _containerAdapter;
/// <summary>
/// Initializes a new instance of the <see cref="HttpServer" /> class.
@ -149,7 +149,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (!string.IsNullOrEmpty(exception.Message))
{
res.AddHeader("X-Application-Error-Code", exception.Message.Replace(Environment.NewLine, " "));
var error = exception.Message.Replace(Environment.NewLine, " ");
error = RemoveControlCharacters(error);
res.AddHeader("X-Application-Error-Code", error);
}
}
@ -188,6 +191,27 @@ namespace MediaBrowser.Server.Implementations.HttpServer
});
}
/// <summary>
/// Removes the control characters.
/// </summary>
/// <param name="inString">The in string.</param>
/// <returns>System.String.</returns>
private static string RemoveControlCharacters(string inString)
{
if (inString == null) return null;
var newString = new StringBuilder();
foreach (var ch in inString)
{
if (!char.IsControl(ch))
{
newString.Append(ch);
}
}
return newString.ToString();
}
/// <summary>
/// Starts the Web Service
/// </summary>