Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some warnings #2741

Merged
merged 13 commits into from Apr 3, 2020
Merged

Fix some warnings #2741

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
be8ba96
Fix some warnings
Bond-009 Apr 2, 2020
8a566df
Fix build
Bond-009 Apr 2, 2020
231c1e5
Update Emby.Dlna.csproj
Bond-009 Apr 3, 2020
f6c9a44
Update Device.cs
Bond-009 Apr 3, 2020
3161e85
Address comments
Bond-009 Apr 3, 2020
cbb6797
Update SqliteItemRepository.cs
Bond-009 Apr 3, 2020
d6224dd
Update InternalPeopleQuery.cs
Bond-009 Apr 3, 2020
0b21494
Update Emby.Server.Implementations/Data/SqliteItemRepository.cs
Bond-009 Apr 3, 2020
ad0e2e4
Update Device.cs
Bond-009 Apr 3, 2020
4cacfd5
Update DidlBuilder.cs
Bond-009 Apr 3, 2020
91b17e7
Update Device.cs
Bond-009 Apr 3, 2020
0951dc6
Update MediaBrowser.Controller/Entities/InternalPeopleQuery.cs
Bond-009 Apr 3, 2020
64692af
Update Device.cs
Bond-009 Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions Emby.Dlna/Api/DlnaServerService.cs
View file
Open in desktop
@@ -1,6 +1,7 @@
#pragma warning disable CS1591

using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Text;
using System.Threading.Tasks;
Expand Down Expand Up @@ -151,20 +152,23 @@ public object Get(GetDescriptionXml request)
return _resultFactory.GetStaticResult(Request, cacheKey, null, cacheLength, XMLContentType, () => Task.FromResult<Stream>(new MemoryStream(bytes)));
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Get(GetContentDirectory request)
{
var xml = ContentDirectory.GetServiceXml();

return _resultFactory.GetResult(Request, xml, XMLContentType);
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Get(GetMediaReceiverRegistrar request)
{
var xml = MediaReceiverRegistrar.GetServiceXml();

return _resultFactory.GetResult(Request, xml, XMLContentType);
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Get(GetConnnectionManager request)
{
var xml = ConnectionManager.GetServiceXml();
Expand Down Expand Up @@ -313,31 +317,37 @@ public object Get(GetIcon request)
return _resultFactory.GetStaticResult(Request, cacheKey, null, cacheLength, contentType, () => Task.FromResult(_dlnaManager.GetIcon(request.Filename).Stream));
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Subscribe(ProcessContentDirectoryEventRequest request)
{
return ProcessEventRequest(ContentDirectory);
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Subscribe(ProcessConnectionManagerEventRequest request)
{
return ProcessEventRequest(ConnectionManager);
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Subscribe(ProcessMediaReceiverRegistrarEventRequest request)
{
return ProcessEventRequest(MediaReceiverRegistrar);
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Unsubscribe(ProcessContentDirectoryEventRequest request)
{
return ProcessEventRequest(ContentDirectory);
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Unsubscribe(ProcessConnectionManagerEventRequest request)
{
return ProcessEventRequest(ConnectionManager);
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Unsubscribe(ProcessMediaReceiverRegistrarEventRequest request)
{
return ProcessEventRequest(MediaReceiverRegistrar);
Expand Down
3 changes: 3 additions & 0 deletions Emby.Dlna/Api/DlnaService.cs
View file
Open in desktop
@@ -1,5 +1,6 @@
#pragma warning disable CS1591

using System.Diagnostics.CodeAnalysis;
using System.Linq;
using MediaBrowser.Controller.Dlna;
using MediaBrowser.Controller.Net;
Expand Down Expand Up @@ -52,6 +53,7 @@ public DlnaService(IDlnaManager dlnaManager)
_dlnaManager = dlnaManager;
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Get(GetProfileInfos request)
{
return _dlnaManager.GetProfileInfos().ToArray();
Expand All @@ -62,6 +64,7 @@ public object Get(GetProfile request)
return _dlnaManager.GetProfile(request.Id);
}

[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
public object Get(GetDefaultProfile request)
{
return _dlnaManager.GetDefaultProfile();
Expand Down
111 changes: 59 additions & 52 deletions Emby.Dlna/ContentDirectory/ControlHandler.cs
View file
Open in desktop
Expand Up @@ -78,7 +78,18 @@ public class ControlHandler : BaseControlHandler
_profile = profile;
_config = config;

_didlBuilder = new DidlBuilder(profile, user, imageProcessor, serverAddress, accessToken, userDataManager, localization, mediaSourceManager, Logger, mediaEncoder);
_didlBuilder = new DidlBuilder(
profile,
user,
imageProcessor,
serverAddress,
accessToken,
userDataManager,
localization,
mediaSourceManager,
Logger,
mediaEncoder,
libraryManager);
}

/// <inheritdoc />
Expand Down Expand Up @@ -153,7 +164,7 @@ private void HandleXSetBookmark(IDictionary<string, string> sparams)
{
var id = sparams["ObjectID"];

var serverItem = GetItemFromObjectId(id, _user);
var serverItem = GetItemFromObjectId(id);

var item = serverItem.Item;

Expand Down Expand Up @@ -276,7 +287,7 @@ private void HandleBrowse(XmlWriter xmlWriter, IDictionary<string, string> spara

DidlBuilder.WriteXmlRootAttributes(_profile, writer);

var serverItem = GetItemFromObjectId(id, _user);
var serverItem = GetItemFromObjectId(id);
var item = serverItem.Item;


Expand All @@ -293,7 +304,7 @@ private void HandleBrowse(XmlWriter xmlWriter, IDictionary<string, string> spara
else
{
var dlnaOptions = _config.GetDlnaConfiguration();
_didlBuilder.WriteItemElement(dlnaOptions, writer, item, _user, null, null, deviceId, filter);
_didlBuilder.WriteItemElement(writer, item, _user, null, null, deviceId, filter);
}

provided++;
Expand All @@ -320,7 +331,7 @@ private void HandleBrowse(XmlWriter xmlWriter, IDictionary<string, string> spara
}
else
{
_didlBuilder.WriteItemElement(dlnaOptions, writer, childItem, _user, item, serverItem.StubType, deviceId, filter);
_didlBuilder.WriteItemElement(writer, childItem, _user, item, serverItem.StubType, deviceId, filter);
}
}
}
Expand Down Expand Up @@ -387,7 +398,7 @@ private void HandleSearch(XmlWriter xmlWriter, IDictionary<string, string> spara

DidlBuilder.WriteXmlRootAttributes(_profile, writer);

var serverItem = GetItemFromObjectId(sparams["ContainerID"], _user);
var serverItem = GetItemFromObjectId(sparams["ContainerID"]);

var item = serverItem.Item;

Expand All @@ -406,7 +417,7 @@ private void HandleSearch(XmlWriter xmlWriter, IDictionary<string, string> spara
}
else
{
_didlBuilder.WriteItemElement(dlnaOptions, writer, i, _user, item, serverItem.StubType, deviceId, filter);
_didlBuilder.WriteItemElement(writer, i, _user, item, serverItem.StubType, deviceId, filter);
}
}

Expand Down Expand Up @@ -512,11 +523,11 @@ private QueryResult<ServerItem> GetUserItems(BaseItem item, StubType? stubType,
}
else if (string.Equals(CollectionType.Folders, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
{
return GetFolders(item, user, stubType, sort, startIndex, limit);
return GetFolders(user, startIndex, limit);
JustAMan marked this conversation as resolved.
Show resolved Hide resolved
}
else if (string.Equals(CollectionType.LiveTv, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
{
return GetLiveTvChannels(item, user, stubType, sort, startIndex, limit);
return GetLiveTvChannels(user, sort, startIndex, limit);
}
}

Expand Down Expand Up @@ -547,7 +558,7 @@ private QueryResult<ServerItem> GetUserItems(BaseItem item, StubType? stubType,
return ToResult(queryResult);
}

private QueryResult<ServerItem> GetLiveTvChannels(BaseItem item, User user, StubType? stubType, SortCriteria sort, int? startIndex, int? limit)
private QueryResult<ServerItem> GetLiveTvChannels(User user, SortCriteria sort, int? startIndex, int? limit)
{
var query = new InternalItemsQuery(user)
{
Expand Down Expand Up @@ -579,7 +590,7 @@ private QueryResult<ServerItem> GetMusicFolders(BaseItem item, User user, StubTy

if (stubType.HasValue && stubType.Value == StubType.Playlists)
{
return GetMusicPlaylists(item, user, query);
return GetMusicPlaylists(user, query);
}

if (stubType.HasValue && stubType.Value == StubType.Albums)
Expand Down Expand Up @@ -707,7 +718,7 @@ private QueryResult<ServerItem> GetMovieFolders(BaseItem item, User user, StubTy

if (stubType.HasValue && stubType.Value == StubType.Collections)
{
return GetMovieCollections(item, user, query);
return GetMovieCollections(user, query);
}

if (stubType.HasValue && stubType.Value == StubType.Favorites)
Expand All @@ -720,46 +731,42 @@ private QueryResult<ServerItem> GetMovieFolders(BaseItem item, User user, StubTy
return GetGenres(item, user, query);
}

var list = new List<ServerItem>();

list.Add(new ServerItem(item)
{
StubType = StubType.ContinueWatching
});

list.Add(new ServerItem(item)
var array = new ServerItem[]
{
StubType = StubType.Latest
});

list.Add(new ServerItem(item)
{
StubType = StubType.Movies
});

list.Add(new ServerItem(item)
{
StubType = StubType.Collections
});

list.Add(new ServerItem(item)
{
StubType = StubType.Favorites
});

list.Add(new ServerItem(item)
{
StubType = StubType.Genres
});
new ServerItem(item)
{
StubType = StubType.ContinueWatching
},
new ServerItem(item)
{
StubType = StubType.Latest
},
new ServerItem(item)
{
StubType = StubType.Movies
},
new ServerItem(item)
{
StubType = StubType.Collections
},
new ServerItem(item)
{
StubType = StubType.Favorites
},
new ServerItem(item)
{
StubType = StubType.Genres
}
};

return new QueryResult<ServerItem>
{
Items = list,
TotalRecordCount = list.Count
Items = array,
TotalRecordCount = array.Length
};
}

private QueryResult<ServerItem> GetFolders(BaseItem item, User user, StubType? stubType, SortCriteria sort, int? startIndex, int? limit)
private QueryResult<ServerItem> GetFolders(User user, int? startIndex, int? limit)
{
var folders = _libraryManager.GetUserRootFolder().GetChildren(user, true)
.OrderBy(i => i.SortName)
Expand Down Expand Up @@ -792,7 +799,7 @@ private QueryResult<ServerItem> GetTvFolders(BaseItem item, User user, StubType?

if (stubType.HasValue && stubType.Value == StubType.NextUp)
{
return GetNextUp(item, user, query);
return GetNextUp(item, query);
}

if (stubType.HasValue && stubType.Value == StubType.Latest)
Expand Down Expand Up @@ -910,7 +917,7 @@ private QueryResult<ServerItem> GetMovieMovies(BaseItem parent, User user, Inter
return ToResult(result);
}

private QueryResult<ServerItem> GetMovieCollections(BaseItem parent, User user, InternalItemsQuery query)
private QueryResult<ServerItem> GetMovieCollections(User user, InternalItemsQuery query)
{
query.Recursive = true;
//query.Parent = parent;
Expand Down Expand Up @@ -1105,7 +1112,7 @@ private QueryResult<ServerItem> GetFavoriteArtists(BaseItem parent, User user, I
return ToResult(result);
}

private QueryResult<ServerItem> GetMusicPlaylists(BaseItem parent, User user, InternalItemsQuery query)
private QueryResult<ServerItem> GetMusicPlaylists(User user, InternalItemsQuery query)
{
query.Parent = null;
query.IncludeItemTypes = new[] { typeof(Playlist).Name };
Expand Down Expand Up @@ -1134,7 +1141,7 @@ private QueryResult<ServerItem> GetMusicLatest(BaseItem parent, User user, Inter
return ToResult(items);
}

private QueryResult<ServerItem> GetNextUp(BaseItem parent, User user, InternalItemsQuery query)
private QueryResult<ServerItem> GetNextUp(BaseItem parent, InternalItemsQuery query)
{
query.OrderBy = Array.Empty<(string, SortOrder)>();

Expand Down Expand Up @@ -1289,15 +1296,15 @@ private QueryResult<ServerItem> ApplyPaging(QueryResult<ServerItem> result, int?
return result;
}

private ServerItem GetItemFromObjectId(string id, User user)
private ServerItem GetItemFromObjectId(string id)
{
return DidlBuilder.IsIdRoot(id)

? new ServerItem(_libraryManager.GetUserRootFolder())
: ParseItemId(id, user);
: ParseItemId(id);
}

private ServerItem ParseItemId(string id, User user)
private ServerItem ParseItemId(string id)
{
StubType? stubType = null;

Expand Down