Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from jellyfin/master

Browse Source 
Merge from upstream
This commit is contained in:
WWWesten 2019-02-23 18:58:38 +05:00 committed by GitHub
commit f2817fef74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
View File

@ -539,21 +539,10 @@ namespace Emby.Server.Implementations.HttpClientManager
var contentLength = GetContentLength(httpResponse);
if (contentLength.HasValue)
using (var stream = httpResponse.GetResponseStream())
using (var fs = _fileSystem.GetFileStream(tempFile, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
{
using (var fs = _fileSystem.GetFileStream(tempFile, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
{
await httpResponse.GetResponseStream().CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, options.CancellationToken).ConfigureAwait(false);
}
}
else
{
// We're not able to track progress
using (var stream = httpResponse.GetResponseStream())
using (var fs = _fileSystem.GetFileStream(tempFile, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
{
await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, options.CancellationToken).ConfigureAwait(false);
}
await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, options.CancellationToken).ConfigureAwait(false);
}
options.Progress.Report(100);

13
Emby.Server.Implementations/Localization/Ratings/kz.csv
View File

@ -1,6 +1,7 @@
KZ-К,1
KZ-БА,6
KZ-Б14,7
KZ-Е16,8
KZ-Е18,10
KZ-НА,15
KZ-6-,0
KZ-6+,6
KZ-12+,12
KZ-14+,14
KZ-16+,16
KZ-18+,18
KZ-21+,21

1 KZ-К KZ-6- 1 0
2 KZ-БА KZ-6+ 6 6
3 KZ-Б14 KZ-12+ 7 12
4 KZ-Е16 KZ-14+ 8 14
5 KZ-Е18 KZ-16+ 10 16
6 KZ-НА KZ-18+ 15 18
7 KZ-21+ 21