diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-20 03:13:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 03:13:30 -0400 |
| commit | 76adfd1f630e88ac613cd19e095d5b6247d92640 (patch) | |
| tree | 7285698d1052a30b98d9f7edff7593ac323494e9 /Emby.Server.Implementations | |
| parent | 64dc283753af2ce61864477bdcbeee12426a7a4b (diff) | |
| parent | 07751895a18380b48e6cdfb2ad5b1bfc14cb5b5b (diff) | |
Merge pull request #2895 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 14 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Data/SqliteItemRepository.cs | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 59f521eb5..713ece421 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -2206,17 +2206,19 @@ namespace Emby.Server.Implementations /// <returns>Task{CheckForUpdateResult}.</returns> public async Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, IProgress<double> progress) { - var cacheLength = TimeSpan.FromMinutes(5); var updateLevel = SystemUpdateLevel; + var cacheLength = updateLevel == PackageVersionClass.Release ? + TimeSpan.FromHours(4) : + TimeSpan.FromMinutes(5); - var result = await new GithubUpdater(HttpClient, JsonSerializer).CheckForUpdateResult("MediaBrowser", - "Emby", - ApplicationVersion, + var result = await new GithubUpdater(HttpClient, JsonSerializer).CheckForUpdateResult("MediaBrowser", + "Emby", + ApplicationVersion, updateLevel, ReleaseAssetFilename, "MBServer", - UpdateTargetFileName, - cacheLength, + UpdateTargetFileName, + cacheLength, cancellationToken).ConfigureAwait(false); HasUpdateAvailable = result.IsUpdateAvailable; diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 2186982d3..89ffb0fce 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -4410,7 +4410,7 @@ namespace Emby.Server.Implementations.Data index++; } - whereClauses.Add(string.Join(" OR ", includeIds.ToArray())); + whereClauses.Add("(" + string.Join(" OR ", includeIds.ToArray()) + ")"); } if (query.ExcludeItemIds.Length > 0) { |