mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
update sqlite
This commit is contained in:
parent
cc9a624647
commit
d9bdfb9daa
@ -1027,7 +1027,7 @@ namespace MediaBrowser.Server.Implementations.Connect
|
|||||||
{
|
{
|
||||||
var user = e.Argument;
|
var user = e.Argument;
|
||||||
|
|
||||||
//await TryUploadUserPreferences(user, CancellationToken.None).ConfigureAwait(false);
|
await TryUploadUserPreferences(user, CancellationToken.None).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task TryUploadUserPreferences(User user, CancellationToken cancellationToken)
|
private async Task TryUploadUserPreferences(User user, CancellationToken cancellationToken)
|
||||||
@ -1046,9 +1046,6 @@ namespace MediaBrowser.Server.Implementations.Connect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var obj = ConnectUserPreferences.FromUserConfiguration(user.Configuration);
|
|
||||||
var json = _json.SerializeToString(new UserPreferencesDto<ConnectUserPreferences> { data = obj });
|
|
||||||
|
|
||||||
var url = GetConnectUrl("user/preferences");
|
var url = GetConnectUrl("user/preferences");
|
||||||
url += "?userId=" + user.ConnectUserId;
|
url += "?userId=" + user.ConnectUserId;
|
||||||
url += "&key=userpreferences";
|
url += "&key=userpreferences";
|
||||||
@ -1056,11 +1053,13 @@ namespace MediaBrowser.Server.Implementations.Connect
|
|||||||
var options = new HttpRequestOptions
|
var options = new HttpRequestOptions
|
||||||
{
|
{
|
||||||
Url = url,
|
Url = url,
|
||||||
CancellationToken = cancellationToken,
|
CancellationToken = cancellationToken
|
||||||
RequestContent = json,
|
|
||||||
RequestContentType = "application/json"
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var postData = new Dictionary<string, string>();
|
||||||
|
postData["data"] = _json.SerializeToString(ConnectUserPreferences.FromUserConfiguration(user.Configuration));
|
||||||
|
options.SetPostData(postData);
|
||||||
|
|
||||||
SetServerAccessToken(options);
|
SetServerAccessToken(options);
|
||||||
|
|
||||||
try
|
try
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Data.SQLite">
|
<Reference Include="System.Data.SQLite">
|
||||||
<HintPath>..\packages\System.Data.SQLite.Core.MSIL.1.0.94.0\lib\net45\System.Data.SQLite.dll</HintPath>
|
<HintPath>..\ThirdParty\System.Data.SQLite.ManagedOnly\1.0.94.0\System.Data.SQLite.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
using MediaBrowser.Model.Logging;
|
using MediaBrowser.Model.Logging;
|
||||||
|
using MediaBrowser.Model.Serialization;
|
||||||
using System;
|
using System;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
using System.Data.SQLite;
|
using System.Data.SQLite;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Model.Serialization;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Server.Implementations.Persistence
|
namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
{
|
{
|
||||||
@ -135,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
|||||||
throw new ArgumentNullException("dbPath");
|
throw new ArgumentNullException("dbPath");
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Info("Opening {0}", dbPath);
|
logger.Info("Sqlite {0} opening {1}", SQLiteConnection.SQLiteVersion, dbPath);
|
||||||
|
|
||||||
var connectionstr = new SQLiteConnectionStringBuilder
|
var connectionstr = new SQLiteConnectionStringBuilder
|
||||||
{
|
{
|
||||||
|
@ -2,5 +2,4 @@
|
|||||||
<packages>
|
<packages>
|
||||||
<package id="Mono.Nat" version="1.2.21.0" targetFramework="net45" />
|
<package id="Mono.Nat" version="1.2.21.0" targetFramework="net45" />
|
||||||
<package id="morelinq" version="1.0.16006" targetFramework="net45" />
|
<package id="morelinq" version="1.0.16006" targetFramework="net45" />
|
||||||
<package id="System.Data.SQLite.Core.MSIL" version="1.0.94.0" targetFramework="net45" />
|
|
||||||
</packages>
|
</packages>
|
@ -31,8 +31,9 @@
|
|||||||
<OutputPath>bin\Release</OutputPath>
|
<OutputPath>bin\Release</OutputPath>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
<Externalconsole>true</Externalconsole>
|
<Externalconsole>true</Externalconsole>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
@ -44,6 +45,9 @@
|
|||||||
<OutputPath>bin\Release Mono</OutputPath>
|
<OutputPath>bin\Release Mono</OutputPath>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Mono|x86'">
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
|
<Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
@ -141,16 +145,6 @@
|
|||||||
<Name>MediaBrowser.XbmcMetadata</Name>
|
<Name>MediaBrowser.XbmcMetadata</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.dll">
|
|
||||||
<Link>System.Data.SQLite.dll</Link>
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.Linq.dll">
|
|
||||||
<Link>System.Data.SQLite.Linq.dll</Link>
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\ThirdParty\libwebp\linux\x86\libwebp.so">
|
<None Include="..\ThirdParty\libwebp\linux\x86\libwebp.so">
|
||||||
<Link>libwebp\linux\lib\libwebp.so</Link>
|
<Link>libwebp\linux\lib\libwebp.so</Link>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user