diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-31 22:04:42 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-31 22:04:42 -0500 |
| commit | 492d159154e504ec12a850a97a2725256fbd73b4 (patch) | |
| tree | acf35683dc66f5092c5c5d0d0216c3115ac8cb34 | |
| parent | d7e2ffee38e0263fed203df3f72da5684871aabb (diff) | |
compatibility fix for upnp inspector
| -rw-r--r-- | MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs index f2b006410..e480326e9 100644 --- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs +++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs @@ -185,13 +185,15 @@ namespace MediaBrowser.Dlna.ContentDirectory 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 requestedVal; if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0) { - requested = requestedVal; + requestedCount = requestedVal; } int startVal; @@ -221,7 +223,7 @@ namespace MediaBrowser.Dlna.ContentDirectory 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)); } @@ -234,7 +236,7 @@ namespace MediaBrowser.Dlna.ContentDirectory } 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; provided = childrenResult.Items.Length; @@ -277,13 +279,15 @@ namespace MediaBrowser.Dlna.ContentDirectory // 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 requestedVal; if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0) { - requested = requestedVal; + requestedCount = requestedVal; } int startVal; @@ -311,7 +315,7 @@ namespace MediaBrowser.Dlna.ContentDirectory 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; |