lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce repeated deserialization of dlna profiles

Browse Source
This commit is contained in:
Luke Pulverenti 2016-06-29 23:34:56 -04:00
parent 2733c598b2
commit cbeb77c0ad
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
MediaBrowser.Dlna/DlnaManager.cs
View File

@ -29,6 +29,8 @@ namespace MediaBrowser.Dlna
private readonly IJsonSerializer _jsonSerializer;
private readonly IServerApplicationHost _appHost;
private readonly Dictionary<string, DeviceProfile> _profiles = new Dictionary<string, DeviceProfile>(StringComparer.Ordinal);
public DlnaManager(IXmlSerializer xmlSerializer,
IFileSystem fileSystem,
IApplicationPaths appPaths,
@ -300,20 +302,31 @@ namespace MediaBrowser.Dlna
private DeviceProfile ParseProfileXmlFile(string path, DeviceProfileType type)
{
try
lock (_profiles)
{
var profile = (DeviceProfile)_xmlSerializer.DeserializeFromFile(typeof(DeviceProfile), path);
DeviceProfile profile;
if (_profiles.TryGetValue(path, out profile))
{
return profile;
}
profile.Id = path.ToLower().GetMD5().ToString("N");
profile.ProfileType = type;
try
{
profile = (DeviceProfile)_xmlSerializer.DeserializeFromFile(typeof(DeviceProfile), path);
return profile;
}
catch (Exception ex)
{
_logger.ErrorException("Error parsing profile xml: {0}", ex, path);
profile.Id = path.ToLower().GetMD5().ToString("N");
profile.ProfileType = type;
return null;
_profiles[path] = profile;
return profile;
}
catch (Exception ex)
{
_logger.ErrorException("Error parsing profile xml: {0}", ex, path);
return null;
}
}
}
@ -428,7 +441,7 @@ namespace MediaBrowser.Dlna
var newFilename = _fileSystem.GetValidFilename(profile.Name) + ".xml";
var path = Path.Combine(UserProfilesPath, newFilename);
_xmlSerializer.SerializeToFile(profile, path);
SaveProfile(profile, path);
}
public void UpdateProfile(DeviceProfile profile)
@ -455,6 +468,15 @@ namespace MediaBrowser.Dlna
_fileSystem.DeleteFile(current.Path);
}
SaveProfile(profile, path);
}
private void SaveProfile(DeviceProfile profile, string path)
{
lock (_profiles)
{
_profiles[path] = profile;
}
_xmlSerializer.SerializeToFile(profile, path);
}

2
MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
View File

@ -162,6 +162,8 @@ namespace MediaBrowser.Server.Implementations.Connect
{
var path = CacheFilePath;
_logger.Info("Loading data from {0}", path);
try
{
var endpoint = _fileSystem.ReadAllText(path, Encoding.UTF8);

2
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
View File

@ -359,7 +359,7 @@ namespace MediaBrowser.Server.Implementations.Connect
{
var path = CacheFilePath;
_logger.Debug("Loading data from {0}", path);
_logger.Info("Loading data from {0}", path);
try
{