Merge pull request #6795 from LinFor/pr-dlna

Fix DLNA on older Samsung TVs
jellyfin · Nov 8, 2021 · 65971eb · 65971eb
2 parents 15dd23e + 5c69d11
commit 65971eb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -291,9 +291,9 @@ private static string WriteFeatureListXml()
             return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                 + "<Features xmlns=\"urn:schemas-upnp-org:av:avs\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"urn:schemas-upnp-org:av:avs http://www.upnp.org/schemas/av/avs.xsd\">"
                 + "<Feature name=\"samsung.com_BASICVIEW\" version=\"1\">"
-                + "<container id=\"I\" type=\"object.item.imageItem\"/>"
-                + "<container id=\"A\" type=\"object.item.audioItem\"/>"
-                + "<container id=\"V\" type=\"object.item.videoItem\"/>"
+                + "<container id=\"0\" type=\"object.item.imageItem\"/>"
+                + "<container id=\"0\" type=\"object.item.audioItem\"/>"
+                + "<container id=\"0\" type=\"object.item.videoItem\"/>"
                 + "</Feature>"
                 + "</Features>";
         }
@@ -800,6 +800,11 @@ private QueryResult<ServerItem> GetMusicFolders(BaseItem item, User user, StubTy
                 }
             };
 
+            if (limit.HasValue)
+            {
+                list = list.Take(limit.Value).ToList();
+            }
+
             return new QueryResult<ServerItem>
             {
                 Items = list,
@@ -884,6 +889,11 @@ private QueryResult<ServerItem> GetMovieFolders(BaseItem item, User user, StubTy
                 }
             };
 
+            if (limit.HasValue)
+            {
+                array = array.Take(limit.Value).ToArray();
+            }
+
             return new QueryResult<ServerItem>
             {
                 Items = array,
@@ -1010,6 +1020,11 @@ private QueryResult<ServerItem> GetTvFolders(BaseItem item, User user, StubType?
                 }
             };
 
+            if (limit.HasValue)
+            {
+                list = list.Take(limit.Value).ToList();
+            }
+
             return new QueryResult<ServerItem>
             {
                 Items = list,
@@ -1037,7 +1052,7 @@ private QueryResult<ServerItem> GetMovieContinueWatching(BaseItem parent, User u
             };
 
             query.IsResumable = true;
-            query.Limit = 10;
+            query.Limit = query.Limit ?? 10;
 
             var result = _libraryManager.GetItemsResult(query);
 
@@ -1451,7 +1466,7 @@ private QueryResult<ServerItem> GetTvLatest(BaseItem parent, User user, Internal
                 new LatestItemsQuery
                 {
                     UserId = user.Id,
-                    Limit = 50,
+                    Limit = query.Limit ?? 50,
                     IncludeItemTypes = new[] { nameof(Episode) },
                     ParentId = parent == null ? Guid.Empty : parent.Id,
                     GroupItems = false
@@ -1476,7 +1491,7 @@ private QueryResult<ServerItem> GetMovieLatest(BaseItem parent, User user, Inter
                 new LatestItemsQuery
                 {
                     UserId = user.Id,
-                    Limit = 50,
+                    Limit = query.Limit ?? 50,
                     IncludeItemTypes = new[] { nameof(Movie) },
                     ParentId = parent?.Id ?? Guid.Empty,
                     GroupItems = true

diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs
@@ -729,7 +729,7 @@ private void AddCommonFields(BaseItem item, StubType? itemStubType, BaseItem con
             {
                 if (item.PremiereDate.HasValue)
                 {
-                    AddValue(writer, "dc", "date", item.PremiereDate.Value.ToString("o", CultureInfo.InvariantCulture), NsDc);
+                    AddValue(writer, "dc", "date", item.PremiereDate.Value.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), NsDc);
                 }
             }
 

diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -64,7 +64,7 @@ private async Task<ControlResponse> ProcessControlRequestInternalAsync(ControlRe
                 requestInfo = await ParseRequestAsync(reader).ConfigureAwait(false);
             }
 
-            Logger.LogDebug("Received control request {0}", requestInfo.LocalName);
+            Logger.LogDebug("Received control request {LocalName}, params: {@Headers}", requestInfo.LocalName, requestInfo.Headers);
 
             var settings = new XmlWriterSettings
             {