mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-15 18:08:53 -07:00
update sqlite osx
This commit is contained in:
parent
4ef688e432
commit
fba1ed8062
@ -1,6 +1,4 @@
|
||||
using System.Globalization;
|
||||
using System.Threading.Tasks;
|
||||
using MediaBrowser.Common.Configuration;
|
||||
using MediaBrowser.Common.Configuration;
|
||||
using MediaBrowser.Common.Events;
|
||||
using MediaBrowser.Controller.Configuration;
|
||||
using MediaBrowser.Dlna.Server;
|
||||
@ -8,11 +6,13 @@ using MediaBrowser.Model.Logging;
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MediaBrowser.Dlna.Ssdp
|
||||
{
|
||||
@ -248,6 +248,10 @@ namespace MediaBrowser.Dlna.Ssdp
|
||||
catch (ObjectDisposedException)
|
||||
{
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Debug("Error in BeginReceiveFrom", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private void ReceiveCallback(IAsyncResult result)
|
||||
|
@ -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<DeviceInfo>(i.FullName);
|
||||
return _json.DeserializeFromFile<DeviceInfo>(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)
|
||||
{
|
||||
|
@ -167,10 +167,6 @@
|
||||
<Link>sqlite3\linux\lib64\libsqlite3.so.0.8.6</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</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="Imazen.WebP.dll.config">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
@ -183,10 +179,4 @@
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\ThirdParty\SQLite3\windows\x86\3.8.2\sqlite3.dll">
|
||||
<Link>sqlite3.dll</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
</Project>
|
@ -1,6 +1,5 @@
|
||||
<configuration>
|
||||
<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/mac/libsqlite3.0.dylib" os="osx"/>
|
||||
<dllmap dll="sqlite3" target="libsqlite3.so.0.8.6" os="linux" cpu="!x86,x86-64"/>
|
||||
</configuration>
|
Loading…
Reference in New Issue
Block a user