Skip to content

Commit 8518dd7

Browse files
LukePulverentiLukePulverenti
authored
Merge pull request #3311 from MediaBrowser/dev
Dev
2 parents 4efa849 + bbf1f24 commit 8518dd7

File tree

178 files changed

+773
-795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+773
-795
lines changed

‎BDInfo/BDInfo.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\MediaBrowser.Common.3.3.44-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
37+
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3838
</Reference>
3939
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\MediaBrowser.Common.3.3.44-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
40+
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.Configuration" />

‎BDInfo/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.44-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.45-beta" targetFramework="net47" />
44
</packages>

‎DvdLib/DvdLib.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
<Compile Include="Ifo\VideoAttributes.cs" />
5050
<Compile Include="Properties\AssemblyInfo.cs" />
5151
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.44-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
5353
</Reference>
5454
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\MediaBrowser.Common.3.3.44-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
55+
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5656
</Reference>
5757
<Reference Include="System" />
5858
<Reference Include="System.Configuration" />

‎DvdLib/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.44-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.45-beta" targetFramework="net47" />
44
</packages>

‎Emby.Dlna/Api/DlnaServerService.cs

+38-20
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
using System.Collections.Generic;
44
using System.IO;
55
using System.Threading.Tasks;
6-
using MediaBrowser.Model.IO;
76
using MediaBrowser.Model.Services;
87
using MediaBrowser.Common.Extensions;
98
using System.Text;
109
using MediaBrowser.Controller.Net;
1110
using System.Linq;
11+
using Emby.Dlna.Main;
1212

1313
namespace Emby.Dlna.Api
1414
{
@@ -109,21 +109,39 @@ public class GetIcon
109109
public class DlnaServerService : IService, IRequiresRequest
110110
{
111111
private readonly IDlnaManager _dlnaManager;
112-
private readonly IContentDirectory _contentDirectory;
113-
private readonly IConnectionManager _connectionManager;
114-
private readonly IMediaReceiverRegistrar _mediaReceiverRegistrar;
115112

116113
private const string XMLContentType = "text/xml; charset=UTF-8";
117114

118115
public IRequest Request { get; set; }
119116
private IHttpResultFactory _resultFactory;
120117

121-
public DlnaServerService(IDlnaManager dlnaManager, IHttpResultFactory httpResultFactory, IContentDirectory contentDirectory, IConnectionManager connectionManager, IMediaReceiverRegistrar mediaReceiverRegistrar)
118+
private IContentDirectory ContentDirectory
119+
{
120+
get
121+
{
122+
return DlnaEntryPoint.Current.ContentDirectory;
123+
}
124+
}
125+
126+
private IConnectionManager ConnectionManager
127+
{
128+
get
129+
{
130+
return DlnaEntryPoint.Current.ConnectionManager;
131+
}
132+
}
133+
134+
private IMediaReceiverRegistrar MediaReceiverRegistrar
135+
{
136+
get
137+
{
138+
return DlnaEntryPoint.Current.MediaReceiverRegistrar;
139+
}
140+
}
141+
142+
public DlnaServerService(IDlnaManager dlnaManager, IHttpResultFactory httpResultFactory)
122143
{
123144
_dlnaManager = dlnaManager;
124-
_contentDirectory = contentDirectory;
125-
_connectionManager = connectionManager;
126-
_mediaReceiverRegistrar = mediaReceiverRegistrar;
127145
_resultFactory = httpResultFactory;
128146
}
129147

@@ -147,42 +165,42 @@ public object Get(GetDescriptionXml request)
147165

148166
public object Get(GetContentDirectory request)
149167
{
150-
var xml = _contentDirectory.GetServiceXml(Request.Headers.ToDictionary());
168+
var xml = ContentDirectory.GetServiceXml(Request.Headers.ToDictionary());
151169

152170
return _resultFactory.GetResult(xml, XMLContentType);
153171
}
154172

155173
public object Get(GetMediaReceiverRegistrar request)
156174
{
157-
var xml = _mediaReceiverRegistrar.GetServiceXml(Request.Headers.ToDictionary());
175+
var xml = MediaReceiverRegistrar.GetServiceXml(Request.Headers.ToDictionary());
158176

159177
return _resultFactory.GetResult(xml, XMLContentType);
160178
}
161179

162180
public object Get(GetConnnectionManager request)
163181
{
164-
var xml = _connectionManager.GetServiceXml(Request.Headers.ToDictionary());
182+
var xml = ConnectionManager.GetServiceXml(Request.Headers.ToDictionary());
165183

166184
return _resultFactory.GetResult(xml, XMLContentType);
167185
}
168186

169187
public object Post(ProcessMediaReceiverRegistrarControlRequest request)
170188
{
171-
var response = PostAsync(request.RequestStream, _mediaReceiverRegistrar);
189+
var response = PostAsync(request.RequestStream, MediaReceiverRegistrar);
172190

173191
return _resultFactory.GetResult(response.Xml, XMLContentType);
174192
}
175193

176194
public object Post(ProcessContentDirectoryControlRequest request)
177195
{
178-
var response = PostAsync(request.RequestStream, _contentDirectory);
196+
var response = PostAsync(request.RequestStream, ContentDirectory);
179197

180198
return _resultFactory.GetResult(response.Xml, XMLContentType);
181199
}
182200

183201
public object Post(ProcessConnectionManagerControlRequest request)
184202
{
185-
var response = PostAsync(request.RequestStream, _connectionManager);
203+
var response = PostAsync(request.RequestStream, ConnectionManager);
186204

187205
return _resultFactory.GetResult(response.Xml, XMLContentType);
188206
}
@@ -244,32 +262,32 @@ public object Get(GetIcon request)
244262

245263
public object Subscribe(ProcessContentDirectoryEventRequest request)
246264
{
247-
return ProcessEventRequest(_contentDirectory);
265+
return ProcessEventRequest(ContentDirectory);
248266
}
249267

250268
public object Subscribe(ProcessConnectionManagerEventRequest request)
251269
{
252-
return ProcessEventRequest(_connectionManager);
270+
return ProcessEventRequest(ConnectionManager);
253271
}
254272

255273
public object Subscribe(ProcessMediaReceiverRegistrarEventRequest request)
256274
{
257-
return ProcessEventRequest(_mediaReceiverRegistrar);
275+
return ProcessEventRequest(MediaReceiverRegistrar);
258276
}
259277

260278
public object Unsubscribe(ProcessContentDirectoryEventRequest request)
261279
{
262-
return ProcessEventRequest(_contentDirectory);
280+
return ProcessEventRequest(ContentDirectory);
263281
}
264282

265283
public object Unsubscribe(ProcessConnectionManagerEventRequest request)
266284
{
267-
return ProcessEventRequest(_connectionManager);
285+
return ProcessEventRequest(ConnectionManager);
268286
}
269287

270288
public object Unsubscribe(ProcessMediaReceiverRegistrarEventRequest request)
271289
{
272-
return ProcessEventRequest(_mediaReceiverRegistrar);
290+
return ProcessEventRequest(MediaReceiverRegistrar);
273291
}
274292

275293
private object ProcessEventRequest(IEventManager eventManager)

‎Emby.Dlna/ContentDirectory/ContentDirectory.cs

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using MediaBrowser.Common.Net;
2-
using MediaBrowser.Controller.Channels;
32
using MediaBrowser.Controller.Configuration;
43
using MediaBrowser.Controller.Dlna;
54
using MediaBrowser.Controller.Drawing;
@@ -26,10 +25,9 @@ public class ContentDirectory : BaseService, IContentDirectory
2625
private readonly IServerConfigurationManager _config;
2726
private readonly IUserManager _userManager;
2827
private readonly ILocalizationManager _localization;
29-
private readonly IChannelManager _channelManager;
3028
private readonly IMediaSourceManager _mediaSourceManager;
3129
private readonly IUserViewManager _userViewManager;
32-
private readonly Func<IMediaEncoder> _mediaEncoder;
30+
private readonly IMediaEncoder _mediaEncoder;
3331
protected readonly IXmlReaderSettingsFactory XmlReaderSettingsFactory;
3432
private readonly ITVSeriesManager _tvSeriesManager;
3533

@@ -40,7 +38,7 @@ public ContentDirectory(IDlnaManager dlna,
4038
IServerConfigurationManager config,
4139
IUserManager userManager,
4240
ILogger logger,
43-
IHttpClient httpClient, ILocalizationManager localization, IChannelManager channelManager, IMediaSourceManager mediaSourceManager, IUserViewManager userViewManager, Func<IMediaEncoder> mediaEncoder, IXmlReaderSettingsFactory xmlReaderSettingsFactory, ITVSeriesManager tvSeriesManager)
41+
IHttpClient httpClient, ILocalizationManager localization, IMediaSourceManager mediaSourceManager, IUserViewManager userViewManager, IMediaEncoder mediaEncoder, IXmlReaderSettingsFactory xmlReaderSettingsFactory, ITVSeriesManager tvSeriesManager)
4442
: base(logger, httpClient)
4543
{
4644
_dlna = dlna;
@@ -50,7 +48,6 @@ public ContentDirectory(IDlnaManager dlna,
5048
_config = config;
5149
_userManager = userManager;
5250
_localization = localization;
53-
_channelManager = channelManager;
5451
_mediaSourceManager = mediaSourceManager;
5552
_userViewManager = userViewManager;
5653
_mediaEncoder = mediaEncoder;
@@ -95,10 +92,9 @@ public ControlResponse ProcessControlRequest(ControlRequest request)
9592
SystemUpdateId,
9693
_config,
9794
_localization,
98-
_channelManager,
9995
_mediaSourceManager,
10096
_userViewManager,
101-
_mediaEncoder(),
97+
_mediaEncoder,
10298
XmlReaderSettingsFactory,
10399
_tvSeriesManager)
104100
.ProcessControlRequest(request);

‎Emby.Dlna/ContentDirectory/ControlHandler.cs

+8-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ namespace Emby.Dlna.ContentDirectory
3838
public class ControlHandler : BaseControlHandler
3939
{
4040
private readonly ILibraryManager _libraryManager;
41-
private readonly IChannelManager _channelManager;
4241
private readonly IUserDataManager _userDataManager;
4342
private readonly IServerConfigurationManager _config;
4443
private readonly User _user;
@@ -57,14 +56,13 @@ public class ControlHandler : BaseControlHandler
5756

5857
private readonly DeviceProfile _profile;
5958

60-
public ControlHandler(ILogger logger, ILibraryManager libraryManager, DeviceProfile profile, string serverAddress, string accessToken, IImageProcessor imageProcessor, IUserDataManager userDataManager, User user, int systemUpdateId, IServerConfigurationManager config, ILocalizationManager localization, IChannelManager channelManager, IMediaSourceManager mediaSourceManager, IUserViewManager userViewManager, IMediaEncoder mediaEncoder, IXmlReaderSettingsFactory xmlReaderSettingsFactory, ITVSeriesManager tvSeriesManager)
59+
public ControlHandler(ILogger logger, ILibraryManager libraryManager, DeviceProfile profile, string serverAddress, string accessToken, IImageProcessor imageProcessor, IUserDataManager userDataManager, User user, int systemUpdateId, IServerConfigurationManager config, ILocalizationManager localization, IMediaSourceManager mediaSourceManager, IUserViewManager userViewManager, IMediaEncoder mediaEncoder, IXmlReaderSettingsFactory xmlReaderSettingsFactory, ITVSeriesManager tvSeriesManager)
6160
: base(config, logger, xmlReaderSettingsFactory)
6261
{
6362
_libraryManager = libraryManager;
6463
_userDataManager = userDataManager;
6564
_user = user;
6665
_systemUpdateId = systemUpdateId;
67-
_channelManager = channelManager;
6866
_userViewManager = userViewManager;
6967
_tvSeriesManager = tvSeriesManager;
7068
_profile = profile;
@@ -247,6 +245,8 @@ private IEnumerable<KeyValuePair<string, string>> HandleBrowse(IDictionary<strin
247245

248246
int totalCount;
249247

248+
var dlnaOptions = _config.GetDlnaConfiguration();
249+
250250
using (XmlWriter writer = XmlWriter.Create(builder, settings))
251251
{
252252
//writer.WriteStartDocument();
@@ -275,7 +275,7 @@ private IEnumerable<KeyValuePair<string, string>> HandleBrowse(IDictionary<strin
275275
}
276276
else
277277
{
278-
_didlBuilder.WriteItemElement(_config.GetDlnaConfiguration(), writer, item, user, null, null, deviceId, filter);
278+
_didlBuilder.WriteItemElement(dlnaOptions, writer, item, user, null, null, deviceId, filter);
279279
}
280280

281281
provided++;
@@ -301,7 +301,7 @@ private IEnumerable<KeyValuePair<string, string>> HandleBrowse(IDictionary<strin
301301
}
302302
else
303303
{
304-
_didlBuilder.WriteItemElement(_config.GetDlnaConfiguration(), writer, childItem, user, item, serverItem.StubType, deviceId, filter);
304+
_didlBuilder.WriteItemElement(dlnaOptions, writer, childItem, user, item, serverItem.StubType, deviceId, filter);
305305
}
306306
}
307307
}
@@ -386,6 +386,8 @@ private IEnumerable<KeyValuePair<string, string>> HandleSearch(IDictionary<strin
386386

387387
provided = childrenResult.Items.Length;
388388

389+
var dlnaOptions = _config.GetDlnaConfiguration();
390+
389391
foreach (var i in childrenResult.Items)
390392
{
391393
if (i.IsDisplayedAsFolder)
@@ -397,7 +399,7 @@ private IEnumerable<KeyValuePair<string, string>> HandleSearch(IDictionary<strin
397399
}
398400
else
399401
{
400-
_didlBuilder.WriteItemElement(_config.GetDlnaConfiguration(), writer, i, user, item, serverItem.StubType, deviceId, filter);
402+
_didlBuilder.WriteItemElement(dlnaOptions, writer, i, user, item, serverItem.StubType, deviceId, filter);
401403
}
402404
}
403405

‎Emby.Dlna/ControlRequest.cs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System.Collections.Generic;
2+
using System.IO;
3+
4+
namespace Emby.Dlna
5+
{
6+
public class ControlRequest
7+
{
8+
public IDictionary<string, string> Headers { get; set; }
9+
10+
public Stream InputXml { get; set; }
11+
12+
public string TargetServerUuId { get; set; }
13+
14+
public string RequestedUrl { get; set; }
15+
16+
public ControlRequest()
17+
{
18+
Headers = new Dictionary<string, string>();
19+
}
20+
}
21+
}

‎Emby.Dlna/ControlResponse.cs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System.Collections.Generic;
2+
3+
namespace Emby.Dlna
4+
{
5+
public class ControlResponse
6+
{
7+
public IDictionary<string, string> Headers { get; set; }
8+
9+
public string Xml { get; set; }
10+
11+
public bool IsSuccessful { get; set; }
12+
13+
public ControlResponse()
14+
{
15+
Headers = new Dictionary<string, string>();
16+
}
17+
}
18+
}

‎Emby.Dlna/Emby.Dlna.csproj

+11-3
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,20 @@
5050
<Compile Include="ContentDirectory\ContentDirectoryXmlBuilder.cs" />
5151
<Compile Include="ContentDirectory\ControlHandler.cs" />
5252
<Compile Include="ContentDirectory\ServiceActionListBuilder.cs" />
53+
<Compile Include="ControlRequest.cs" />
54+
<Compile Include="ControlResponse.cs" />
5355
<Compile Include="Didl\DidlBuilder.cs" />
5456
<Compile Include="Didl\Filter.cs" />
5557
<Compile Include="Didl\StringWriterWithEncoding.cs" />
5658
<Compile Include="DlnaManager.cs" />
5759
<Compile Include="Eventing\EventManager.cs" />
5860
<Compile Include="Eventing\EventSubscription.cs" />
61+
<Compile Include="EventSubscriptionResponse.cs" />
62+
<Compile Include="IConnectionManager.cs" />
63+
<Compile Include="IContentDirectory.cs" />
64+
<Compile Include="IEventManager.cs" />
65+
<Compile Include="IMediaReceiverRegistrar.cs" />
66+
<Compile Include="IUpnpService.cs" />
5967
<Compile Include="Main\DlnaEntryPoint.cs" />
6068
<Compile Include="MediaReceiverRegistrar\ControlHandler.cs" />
6169
<Compile Include="MediaReceiverRegistrar\MediaReceiverRegistrar.cs" />
@@ -166,13 +174,13 @@
166174
</ItemGroup>
167175
<ItemGroup>
168176
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
169-
<HintPath>..\packages\MediaBrowser.Common.3.3.44-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
177+
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
170178
</Reference>
171179
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
172-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.44-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
180+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
173181
</Reference>
174182
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
175-
<HintPath>..\packages\MediaBrowser.Common.3.3.44-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
183+
<HintPath>..\packages\MediaBrowser.Common.3.3.45-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
176184
</Reference>
177185
<Reference Include="System" />
178186
<Reference Include="System.Configuration" />

0 commit comments

Comments
 (0)