From fba1ed80629410b5f16c8da38a1e408bee55f09b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 6 Nov 2014 19:16:16 -0500 Subject: update sqlite osx --- .../Devices/DeviceRepository.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs') diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs b/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs index 14a877e78..d587e5af7 100644 --- a/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs +++ b/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs @@ -97,23 +97,23 @@ namespace MediaBrowser.Server.Implementations.Devices try { - return new DirectoryInfo(path) - .EnumerateFiles("*", SearchOption.AllDirectories) - .Where(i => string.Equals(i.Name, "device.json", StringComparison.OrdinalIgnoreCase)) + return Directory + .EnumerateFiles(path, "*", SearchOption.AllDirectories) + .Where(i => string.Equals(Path.GetFileName(i), "device.json", StringComparison.OrdinalIgnoreCase)) + .ToList() .Select(i => { try { - return _json.DeserializeFromFile(i.FullName); + return _json.DeserializeFromFile(i); } catch (Exception ex) { - _logger.ErrorException("Error reading {0}", ex, i.FullName); + _logger.ErrorException("Error reading {0}", ex, i); return null; } }) - .Where(i => i != null) - .ToList(); + .Where(i => i != null); } catch (IOException) { -- cgit v1.2.3