lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix?

Browse Source
This commit is contained in:
Bond-009 2020-01-28 13:19:25 +01:00
parent 6b68521bae
commit 36d62c3093
1 changed files with 101 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
Emby.Dlna/ContentDirectory/ControlHandler.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
@ -253,68 +254,80 @@ namespace Emby.Dlna.ContentDirectory
start = startVal; start = startVal;
} }
xmlWriter.WriteStartElement("Result");
xmlWriter.WriteStartElement(string.Empty, "DIDL-Lite", NS_DIDL);
xmlWriter.WriteAttributeString("xmlns", "dc", null, NS_DC);
xmlWriter.WriteAttributeString("xmlns", "dlna", null, NS_DLNA);
xmlWriter.WriteAttributeString("xmlns", "upnp", null, NS_UPNP);
//didl.SetAttribute("xmlns:sec", NS_SEC);
DidlBuilder.WriteXmlRootAttributes(_profile, xmlWriter);
var serverItem = GetItemFromObjectId(id, _user);
var item = serverItem.Item;
int totalCount; int totalCount;
if (string.Equals(flag, "BrowseMetadata", StringComparison.Ordinal))
var settings = new XmlWriterSettings()
{ {
totalCount = 1; Encoding = Encoding.UTF8,
CloseOutput = false,
OmitXmlDeclaration = true,
ConformanceLevel = ConformanceLevel.Fragment
};
if (item.IsDisplayedAsFolder || serverItem.StubType.HasValue) using (StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8))
{ using (var writer = XmlWriter.Create(builder, settings))
var childrenResult = GetUserItems(item, serverItem.StubType, _user, sortCriteria, start, requestedCount);
_didlBuilder.WriteFolderElement(xmlWriter, item, serverItem.StubType, null, childrenResult.TotalRecordCount, filter, id);
}
else
{
var dlnaOptions = _config.GetDlnaConfiguration();
_didlBuilder.WriteItemElement(dlnaOptions, xmlWriter, item, _user, null, null, deviceId, filter);
}
provided++;
}
else
{ {
var childrenResult = GetUserItems(item, serverItem.StubType, _user, sortCriteria, start, requestedCount); writer.WriteStartElement(string.Empty, "DIDL-Lite", NS_DIDL);
totalCount = childrenResult.TotalRecordCount;
provided = childrenResult.Items.Count; writer.WriteAttributeString("xmlns", "dc", null, NS_DC);
writer.WriteAttributeString("xmlns", "dlna", null, NS_DLNA);
writer.WriteAttributeString("xmlns", "upnp", null, NS_UPNP);
var dlnaOptions = _config.GetDlnaConfiguration(); DidlBuilder.WriteXmlRootAttributes(_profile, writer);
foreach (var i in childrenResult.Items)
var serverItem = GetItemFromObjectId(id, _user);
var item = serverItem.Item;
if (string.Equals(flag, "BrowseMetadata", StringComparison.Ordinal))
{ {
var childItem = i.Item; totalCount = 1;
var displayStubType = i.StubType;
if (childItem.IsDisplayedAsFolder || displayStubType.HasValue) if (item.IsDisplayedAsFolder || serverItem.StubType.HasValue)
{ {
var childCount = GetUserItems(childItem, displayStubType, _user, sortCriteria, null, 0) var childrenResult = GetUserItems(item, serverItem.StubType, _user, sortCriteria, start, requestedCount);
.TotalRecordCount;
_didlBuilder.WriteFolderElement(xmlWriter, childItem, displayStubType, item, childCount, filter); _didlBuilder.WriteFolderElement(writer, item, serverItem.StubType, null, childrenResult.TotalRecordCount, filter, id);
} }
else else
{ {
_didlBuilder.WriteItemElement(dlnaOptions, xmlWriter, childItem, _user, item, serverItem.StubType, deviceId, filter); var dlnaOptions = _config.GetDlnaConfiguration();
_didlBuilder.WriteItemElement(dlnaOptions, writer, item, _user, null, null, deviceId, filter);
}
provided++;
}
else
{
var childrenResult = GetUserItems(item, serverItem.StubType, _user, sortCriteria, start, requestedCount);
totalCount = childrenResult.TotalRecordCount;
provided = childrenResult.Items.Count;
var dlnaOptions = _config.GetDlnaConfiguration();
foreach (var i in childrenResult.Items)
{
var childItem = i.Item;
var displayStubType = i.StubType;
if (childItem.IsDisplayedAsFolder || displayStubType.HasValue)
{
var childCount = GetUserItems(childItem, displayStubType, _user, sortCriteria, null, 0)
.TotalRecordCount;
_didlBuilder.WriteFolderElement(writer, childItem, displayStubType, item, childCount, filter);
}
else
{
_didlBuilder.WriteItemElement(dlnaOptions, writer, childItem, _user, item, serverItem.StubType, deviceId, filter);
}
} }
} }
}
xmlWriter.WriteFullEndElement(); writer.WriteFullEndElement();
xmlWriter.WriteFullEndElement();
xmlWriter.WriteElementString("Result", builder.ToString());
}
xmlWriter.WriteElementString("NumberReturned", provided.ToString(CultureInfo.InvariantCulture)); xmlWriter.WriteElementString("NumberReturned", provided.ToString(CultureInfo.InvariantCulture));
xmlWriter.WriteElementString("TotalMatches", totalCount.ToString(CultureInfo.InvariantCulture)); xmlWriter.WriteElementString("TotalMatches", totalCount.ToString(CultureInfo.InvariantCulture));
@ -350,43 +363,55 @@ namespace Emby.Dlna.ContentDirectory
start = startVal; start = startVal;
} }
xmlWriter.WriteStartElement("Result"); QueryResult<BaseItem> childrenResult;
xmlWriter.WriteStartElement(string.Empty, "DIDL-Lite", NS_DIDL); var settings = new XmlWriterSettings()
xmlWriter.WriteAttributeString("xmlns", "dc", null, NS_DC);
xmlWriter.WriteAttributeString("xmlns", "dlna", null, NS_DLNA);
xmlWriter.WriteAttributeString("xmlns", "upnp", null, NS_UPNP);
//didl.SetAttribute("xmlns:sec", NS_SEC);
DidlBuilder.WriteXmlRootAttributes(_profile, xmlWriter);
var serverItem = GetItemFromObjectId(sparams["ContainerID"], _user);
var item = serverItem.Item;
var childrenResult = GetChildrenSorted(item, _user, searchCriteria, sortCriteria, start, requestedCount);
var dlnaOptions = _config.GetDlnaConfiguration();
foreach (var i in childrenResult.Items)
{ {
if (i.IsDisplayedAsFolder) Encoding = Encoding.UTF8,
{ CloseOutput = false,
var childCount = GetChildrenSorted(i, _user, searchCriteria, sortCriteria, null, 0) OmitXmlDeclaration = true,
.TotalRecordCount; ConformanceLevel = ConformanceLevel.Fragment
};
_didlBuilder.WriteFolderElement(xmlWriter, i, null, item, childCount, filter); using (StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8))
} using (var writer = XmlWriter.Create(builder, settings))
else {
writer.WriteStartElement(string.Empty, "DIDL-Lite", NS_DIDL);
writer.WriteAttributeString("xmlns", "dc", null, NS_DC);
writer.WriteAttributeString("xmlns", "dlna", null, NS_DLNA);
writer.WriteAttributeString("xmlns", "upnp", null, NS_UPNP);
DidlBuilder.WriteXmlRootAttributes(_profile, writer);
var serverItem = GetItemFromObjectId(sparams["ContainerID"], _user);
var item = serverItem.Item;
childrenResult = GetChildrenSorted(item, _user, searchCriteria, sortCriteria, start, requestedCount);
var dlnaOptions = _config.GetDlnaConfiguration();
foreach (var i in childrenResult.Items)
{ {
_didlBuilder.WriteItemElement(dlnaOptions, xmlWriter, i, _user, item, serverItem.StubType, deviceId, filter); if (i.IsDisplayedAsFolder)
{
var childCount = GetChildrenSorted(i, _user, searchCriteria, sortCriteria, null, 0)
.TotalRecordCount;
_didlBuilder.WriteFolderElement(writer, i, null, item, childCount, filter);
}
else
{
_didlBuilder.WriteItemElement(dlnaOptions, writer, i, _user, item, serverItem.StubType, deviceId, filter);
}
} }
writer.WriteFullEndElement();
xmlWriter.WriteElementString("Result", builder.ToString());
} }
xmlWriter.WriteFullEndElement();
xmlWriter.WriteFullEndElement();
xmlWriter.WriteElementString("NumberReturned", childrenResult.Items.Count.ToString(CultureInfo.InvariantCulture)); xmlWriter.WriteElementString("NumberReturned", childrenResult.Items.Count.ToString(CultureInfo.InvariantCulture));
xmlWriter.WriteElementString("TotalMatches", childrenResult.TotalRecordCount.ToString(CultureInfo.InvariantCulture)); xmlWriter.WriteElementString("TotalMatches", childrenResult.TotalRecordCount.ToString(CultureInfo.InvariantCulture));
xmlWriter.WriteElementString("UpdateID", _systemUpdateId.ToString(CultureInfo.InvariantCulture)); xmlWriter.WriteElementString("UpdateID", _systemUpdateId.ToString(CultureInfo.InvariantCulture));