Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

compatibility fix for upnp inspector

Browse Source
This commit is contained in:
Luke Pulverenti 2015-01-31 22:04:42 -05:00
parent d7e2ffee38
commit 492d159154
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
View File

@ -185,13 +185,15 @@ namespace MediaBrowser.Dlna.ContentDirectory
var provided = 0; var provided = 0;
int? requested = 0; // Default to null instead of 0
// Upnp inspector sends 0 as requestedCount when it wants everything
int? requestedCount = null;
int? start = 0; int? start = 0;
int requestedVal; int requestedVal;
if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0) if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0)
{ {
requested = requestedVal; requestedCount = requestedVal;
} }
int startVal; int startVal;
@ -221,7 +223,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
if (item.IsFolder || serverItem.StubType.HasValue) if (item.IsFolder || serverItem.StubType.HasValue)
{ {
var childrenResult = (await GetUserItems(item, serverItem.StubType, user, sortCriteria, start, requested).ConfigureAwait(false)); var childrenResult = (await GetUserItems(item, serverItem.StubType, user, sortCriteria, start, requestedCount).ConfigureAwait(false));
result.DocumentElement.AppendChild(_didlBuilder.GetFolderElement(result, item, serverItem.StubType, null, childrenResult.TotalRecordCount, filter, id)); result.DocumentElement.AppendChild(_didlBuilder.GetFolderElement(result, item, serverItem.StubType, null, childrenResult.TotalRecordCount, filter, id));
} }
@ -234,7 +236,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
} }
else else
{ {
var childrenResult = (await GetUserItems(item, serverItem.StubType, user, sortCriteria, start, requested).ConfigureAwait(false)); var childrenResult = (await GetUserItems(item, serverItem.StubType, user, sortCriteria, start, requestedCount).ConfigureAwait(false));
totalCount = childrenResult.TotalRecordCount; totalCount = childrenResult.TotalRecordCount;
provided = childrenResult.Items.Length; provided = childrenResult.Items.Length;
@ -277,13 +279,15 @@ namespace MediaBrowser.Dlna.ContentDirectory
// sort example: dc:title, dc:date // sort example: dc:title, dc:date
int? requested = 0; // Default to null instead of 0
// Upnp inspector sends 0 as requestedCount when it wants everything
int? requestedCount = null;
int? start = 0; int? start = 0;
int requestedVal; int requestedVal;
if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0) if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0)
{ {
requested = requestedVal; requestedCount = requestedVal;
} }
int startVal; int startVal;
@ -311,7 +315,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
var item = serverItem.Item; var item = serverItem.Item;
var childrenResult = (await GetChildrenSorted(item, user, searchCriteria, sortCriteria, start, requested).ConfigureAwait(false)); var childrenResult = (await GetChildrenSorted(item, user, searchCriteria, sortCriteria, start, requestedCount).ConfigureAwait(false));
var totalCount = childrenResult.TotalRecordCount; var totalCount = childrenResult.TotalRecordCount;