diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-11-07 17:37:10 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-11-07 17:37:10 -0500 |
| commit | d9bdfb9daa9d825f9c7bfc4a165329bfa7ad1069 (patch) | |
| tree | ff254eef55e08ea60fbf1cb3036472aff0931ea4 /MediaBrowser.Server.Implementations | |
| parent | cc9a62464755eade9505f5c9779f097627543f1c (diff) | |
update sqlite
Diffstat (limited to 'MediaBrowser.Server.Implementations')
4 files changed, 9 insertions, 11 deletions
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index 337d37c61..f0d3b76e5 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -1027,7 +1027,7 @@ namespace MediaBrowser.Server.Implementations.Connect { 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) @@ -1046,9 +1046,6 @@ namespace MediaBrowser.Server.Implementations.Connect return; } - var obj = ConnectUserPreferences.FromUserConfiguration(user.Configuration); - var json = _json.SerializeToString(new UserPreferencesDto<ConnectUserPreferences> { data = obj }); - var url = GetConnectUrl("user/preferences"); url += "?userId=" + user.ConnectUserId; url += "&key=userpreferences"; @@ -1056,11 +1053,13 @@ namespace MediaBrowser.Server.Implementations.Connect var options = new HttpRequestOptions { Url = url, - CancellationToken = cancellationToken, - RequestContent = json, - RequestContentType = "application/json" + CancellationToken = cancellationToken }; + var postData = new Dictionary<string, string>(); + postData["data"] = _json.SerializeToString(ConnectUserPreferences.FromUserConfiguration(user.Configuration)); + options.SetPostData(postData); + SetServerAccessToken(options); try diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index c7a9446a6..ed46ad4a4 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -62,7 +62,7 @@ <Reference Include="System" /> <Reference Include="System.Core" /> <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 Include="System.Drawing" /> <Reference Include="Microsoft.CSharp" /> diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs index 6e484413a..d67c1894d 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs @@ -1,10 +1,10 @@ using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Serialization; using System; using System.Data; using System.Data.SQLite; using System.IO; using System.Threading.Tasks; -using MediaBrowser.Model.Serialization; namespace MediaBrowser.Server.Implementations.Persistence { @@ -135,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.Persistence throw new ArgumentNullException("dbPath"); } - logger.Info("Opening {0}", dbPath); + logger.Info("Sqlite {0} opening {1}", SQLiteConnection.SQLiteVersion, dbPath); var connectionstr = new SQLiteConnectionStringBuilder { diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index f6a6c2af6..2200af8e8 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -2,5 +2,4 @@ <packages>
<package id="Mono.Nat" version="1.2.21.0" 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>
\ No newline at end of file |
