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

update sqlite osx

Browse Source
This commit is contained in:
Luke Pulverenti 2014-11-06 19:16:16 -05:00
parent 4ef688e432
commit fba1ed8062
4 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
View File

@ -1,6 +1,4 @@
using System.Globalization; using MediaBrowser.Common.Configuration;
using System.Threading.Tasks;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Events; using MediaBrowser.Common.Events;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.Dlna.Server; using MediaBrowser.Dlna.Server;
@ -8,11 +6,13 @@ using MediaBrowser.Model.Logging;
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
namespace MediaBrowser.Dlna.Ssdp namespace MediaBrowser.Dlna.Ssdp
{ {
@ -248,6 +248,10 @@ namespace MediaBrowser.Dlna.Ssdp
catch (ObjectDisposedException) catch (ObjectDisposedException)
{ {
} }
catch (Exception ex)
{
_logger.Debug("Error in BeginReceiveFrom", ex);
}
} }
private void ReceiveCallback(IAsyncResult result) private void ReceiveCallback(IAsyncResult result)

14
MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs
View File

@ -97,23 +97,23 @@ namespace MediaBrowser.Server.Implementations.Devices
try try
{ {
return new DirectoryInfo(path) return Directory
.EnumerateFiles("*", SearchOption.AllDirectories) .EnumerateFiles(path, "*", SearchOption.AllDirectories)
.Where(i => string.Equals(i.Name, "device.json", StringComparison.OrdinalIgnoreCase)) .Where(i => string.Equals(Path.GetFileName(i), "device.json", StringComparison.OrdinalIgnoreCase))
.ToList()
.Select(i => .Select(i =>
{ {
try try
{ {
return _json.DeserializeFromFile<DeviceInfo>(i.FullName); return _json.DeserializeFromFile<DeviceInfo>(i);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.ErrorException("Error reading {0}", ex, i.FullName); _logger.ErrorException("Error reading {0}", ex, i);
return null; return null;
} }
}) })
.Where(i => i != null) .Where(i => i != null);
.ToList();
} }
catch (IOException) catch (IOException)
{ {

10
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View File

@ -167,10 +167,6 @@
<Link>sqlite3\linux\lib64\libsqlite3.so.0.8.6</Link> <Link>sqlite3\linux\lib64\libsqlite3.so.0.8.6</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="..\ThirdParty\SQLite3\mac\universal\3.8.2\libsqlite3.0.dylib">
<Link>sqlite3\mac\libsqlite3.0.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="app.config" /> <None Include="app.config" />
<None Include="Imazen.WebP.dll.config"> <None Include="Imazen.WebP.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@ -183,10 +179,4 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\ThirdParty\SQLite3\windows\x86\3.8.2\sqlite3.dll">
<Link>sqlite3.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project> </Project>

1
MediaBrowser.Server.Mono/System.Data.SQLite.dll.config
View File

@ -1,6 +1,5 @@
<configuration> <configuration>
<dllmap dll="sqlite3" target="./sqlite3/linux/lib/libsqlite3.so.0.8.6" os="linux" wordsize="32"/> <dllmap dll="sqlite3" target="./sqlite3/linux/lib/libsqlite3.so.0.8.6" os="linux" wordsize="32"/>
<dllmap dll="sqlite3" target="./sqlite3/linux/lib64/libsqlite3.so.0.8.6" os="linux" wordsize="64"/> <dllmap dll="sqlite3" target="./sqlite3/linux/lib64/libsqlite3.so.0.8.6" os="linux" wordsize="64"/>
<dllmap dll="sqlite3" target="./sqlite3/mac/libsqlite3.0.dylib" os="osx"/>
<dllmap dll="sqlite3" target="libsqlite3.so.0.8.6" os="linux" cpu="!x86,x86-64"/> <dllmap dll="sqlite3" target="libsqlite3.so.0.8.6" os="linux" cpu="!x86,x86-64"/>
</configuration> </configuration>