Browse Source

Merge pull request #1 from jellyfin/master

Merge from upstream
WWWesten 6 years ago
parent
commit
f2817fef74

+ 3 - 14
Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs

@@ -539,21 +539,10 @@ namespace Emby.Server.Implementations.HttpClientManager
 
                     var contentLength = GetContentLength(httpResponse);
 
-                    if (contentLength.HasValue)
-                    {
-                        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
+                    using (var stream = httpResponse.GetResponseStream())
+                    using (var fs = _fileSystem.GetFileStream(tempFile, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
                     {
-                        // 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);

+ 7 - 6
Emby.Server.Implementations/Localization/Ratings/kz.csv

@@ -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