Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-11 09:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

update dlna profile header checks

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-22 13:18:53 -05:00
parent 4a24490752
commit 9e568bf99a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MediaBrowser.Dlna/DlnaManager.cs
View File

@ -251,7 +251,8 @@ namespace MediaBrowser.Dlna
case HeaderMatchType.Substring: case HeaderMatchType.Substring:
return value.IndexOf(header.Value, StringComparison.OrdinalIgnoreCase) != -1; return value.IndexOf(header.Value, StringComparison.OrdinalIgnoreCase) != -1;
case HeaderMatchType.Regex: case HeaderMatchType.Regex:
return Regex.IsMatch(value, header.Value, RegexOptions.IgnoreCase); // Reports of IgnoreCase not working on linux so try it a couple different ways.
return Regex.IsMatch(value, header.Value, RegexOptions.IgnoreCase) || Regex.IsMatch(value.ToUpper(), header.Value.ToUpper(), RegexOptions.IgnoreCase);
default: default:
throw new ArgumentException("Unrecognized HeaderMatchType"); throw new ArgumentException("Unrecognized HeaderMatchType");
} }
@ -280,7 +281,7 @@ namespace MediaBrowser.Dlna
{ {
try try
{ {
return _fileSystem.GetFiles(path) return _fileSystem.GetFiles(path)
.Where(i => string.Equals(i.Extension, ".xml", StringComparison.OrdinalIgnoreCase)) .Where(i => string.Equals(i.Extension, ".xml", StringComparison.OrdinalIgnoreCase))
.Select(i => ParseProfileXmlFile(i.FullName, type)) .Select(i => ParseProfileXmlFile(i.FullName, type))
.Where(i => i != null) .Where(i => i != null)
@ -318,7 +319,7 @@ namespace MediaBrowser.Dlna
throw new ArgumentNullException("id"); throw new ArgumentNullException("id");
} }
var info = GetProfileInfosInternal().First(i => string.Equals(i.Info.Id, id)); var info = GetProfileInfosInternal().First(i => string.Equals(i.Info.Id, id, StringComparison.OrdinalIgnoreCase));
return ParseProfileXmlFile(info.Path, info.Info.Type); return ParseProfileXmlFile(info.Path, info.Info.Type);
} }
@ -342,7 +343,7 @@ namespace MediaBrowser.Dlna
{ {
try try
{ {
return _fileSystem.GetFiles(path) return _fileSystem.GetFiles(path)
.Where(i => string.Equals(i.Extension, ".xml", StringComparison.OrdinalIgnoreCase)) .Where(i => string.Equals(i.Extension, ".xml", StringComparison.OrdinalIgnoreCase))
.Select(i => new InternalProfileInfo .Select(i => new InternalProfileInfo
{ {
@ -384,7 +385,7 @@ namespace MediaBrowser.Dlna
if (!fileInfo.Exists || fileInfo.Length != stream.Length) if (!fileInfo.Exists || fileInfo.Length != stream.Length)
{ {
_fileSystem.CreateDirectory(systemProfilesPath); _fileSystem.CreateDirectory(systemProfilesPath);
using (var fileStream = _fileSystem.GetFileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read)) using (var fileStream = _fileSystem.GetFileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
{ {
@ -395,12 +396,12 @@ namespace MediaBrowser.Dlna
} }
// Not necessary, but just to make it easy to find // Not necessary, but just to make it easy to find
_fileSystem.CreateDirectory(UserProfilesPath); _fileSystem.CreateDirectory(UserProfilesPath);
} }
public void DeleteProfile(string id) public void DeleteProfile(string id)
{ {
var info = GetProfileInfosInternal().First(i => string.Equals(id, i.Info.Id)); var info = GetProfileInfosInternal().First(i => string.Equals(id, i.Info.Id, StringComparison.OrdinalIgnoreCase));
if (info.Info.Type == DeviceProfileType.System) if (info.Info.Type == DeviceProfileType.System)
{ {