Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-07 10:14:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #749 from 7illusions/master

Browse Source 
DLNA Discovery and Profile fixes
This commit is contained in:
Luke 2014-03-24 08:49:52 -04:00
commit 1c3c12ebf6
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Dlna/DlnaManager.cs
View File

@ -70,55 +70,55 @@ namespace MediaBrowser.Dlna
{ {
if (!string.IsNullOrWhiteSpace(profileInfo.DeviceDescription)) if (!string.IsNullOrWhiteSpace(profileInfo.DeviceDescription))
{ {
if (!Regex.IsMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription)) if (deviceInfo.DeviceDescription == null || !Regex.IsMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription))
return false; return false;
} }
if (!string.IsNullOrWhiteSpace(profileInfo.FriendlyName)) if (!string.IsNullOrWhiteSpace(profileInfo.FriendlyName))
{ {
if (!Regex.IsMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName)) if (deviceInfo.FriendlyName == null || !Regex.IsMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName))
return false; return false;
} }
if (!string.IsNullOrWhiteSpace(profileInfo.Manufacturer)) if (!string.IsNullOrWhiteSpace(profileInfo.Manufacturer))
{ {
if (!Regex.IsMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer)) if (deviceInfo.Manufacturer == null || !Regex.IsMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer))
return false; return false;
} }
if (!string.IsNullOrWhiteSpace(profileInfo.ManufacturerUrl)) if (!string.IsNullOrWhiteSpace(profileInfo.ManufacturerUrl))
{ {
if (!Regex.IsMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl)) if (deviceInfo.ManufacturerUrl == null || !Regex.IsMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl))
return false; return false;
} }
if (!string.IsNullOrWhiteSpace(profileInfo.ModelDescription)) if (!string.IsNullOrWhiteSpace(profileInfo.ModelDescription))
{ {
if (!Regex.IsMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription)) if (deviceInfo.ModelDescription == null || !Regex.IsMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription))
return false; return false;
} }
if (!string.IsNullOrWhiteSpace(profileInfo.ModelName)) if (!string.IsNullOrWhiteSpace(profileInfo.ModelName))
{ {
if (!Regex.IsMatch(deviceInfo.ModelName, profileInfo.ModelName)) if (deviceInfo.ModelName == null || !Regex.IsMatch(deviceInfo.ModelName, profileInfo.ModelName))
return false; return false;
} }
if (!string.IsNullOrWhiteSpace(profileInfo.ModelNumber)) if (!string.IsNullOrWhiteSpace(profileInfo.ModelNumber))
{ {
if (!Regex.IsMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber)) if (deviceInfo.ModelNumber == null || !Regex.IsMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber))
return false; return false;
} }
if (!string.IsNullOrWhiteSpace(profileInfo.ModelUrl)) if (!string.IsNullOrWhiteSpace(profileInfo.ModelUrl))
{ {
if (!Regex.IsMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl)) if (deviceInfo.ModelUrl == null || !Regex.IsMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl))
return false; return false;
} }
if (!string.IsNullOrWhiteSpace(profileInfo.SerialNumber)) if (!string.IsNullOrWhiteSpace(profileInfo.SerialNumber))
{ {
if (!Regex.IsMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber)) if (deviceInfo.SerialNumber == null || !Regex.IsMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber))
return false; return false;
} }

3
MediaBrowser.Dlna/PlayTo/Device.cs
View File

@ -681,6 +681,9 @@ namespace MediaBrowser.Dlna.PlayTo
var presentationUrl = document.Descendants(uPnpNamespaces.ud.GetName("presentationURL")).FirstOrDefault(); var presentationUrl = document.Descendants(uPnpNamespaces.ud.GetName("presentationURL")).FirstOrDefault();
if (presentationUrl != null) if (presentationUrl != null)
deviceProperties.PresentationUrl = presentationUrl.Value; deviceProperties.PresentationUrl = presentationUrl.Value;
var modelUrl = document.Descendants(uPnpNamespaces.ud.GetName("modelURL")).FirstOrDefault();
if (modelUrl != null)
deviceProperties.ModelUrl = modelUrl.Value;
deviceProperties.BaseUrl = String.Format("http://{0}:{1}", url.Host, url.Port); deviceProperties.BaseUrl = String.Format("http://{0}:{1}", url.Host, url.Port);

5
MediaBrowser.Dlna/PlayTo/DeviceInfo.cs
View File

@ -34,6 +34,8 @@ namespace MediaBrowser.Dlna.PlayTo
public string ModelNumber { get; set; } public string ModelNumber { get; set; }
public string ModelUrl { get; set; }
public string Manufacturer { get; set; } public string Manufacturer { get; set; }
public string ManufacturerUrl { get; set; } public string ManufacturerUrl { get; set; }
@ -72,7 +74,8 @@ namespace MediaBrowser.Dlna.PlayTo
ModelName = ModelName, ModelName = ModelName,
ModelNumber = ModelNumber, ModelNumber = ModelNumber,
FriendlyName = Name, FriendlyName = Name,
ManufacturerUrl = ManufacturerUrl ManufacturerUrl = ManufacturerUrl,
ModelUrl = ModelUrl
}; };
} }
} }