diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-23 12:08:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 12:08:03 -0400 |
| commit | ad5ceb2cb4352270598c226767ab78460fe6718a (patch) | |
| tree | 1a804fbb76aeb5205a065d3f742609e7bab4020e /MediaBrowser.MediaEncoding | |
| parent | d4b50a18e1c639f98cb26250c4d1dccbfcc49185 (diff) | |
| parent | 023952d04df3765ee5574915f0a84903bb97a748 (diff) | |
Merge pull request #2723 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs b/MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs index 1b5b4b4e4..e21292cbd 100644 --- a/MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs +++ b/MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs @@ -7,6 +7,7 @@ using MediaBrowser.Model.IO; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Net; +using MediaBrowser.Common.Progress; using MediaBrowser.Controller.IO; using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; @@ -62,7 +63,7 @@ namespace MediaBrowser.MediaEncoding.Encoder // Kick this off, but no need to wait on it var task = Task.Run(async () => { - await DownloadFontFile(fontsDirectory, fontFilename, new Progress<double>()).ConfigureAwait(false); + await DownloadFontFile(fontsDirectory, fontFilename, new SimpleProgress<double>()).ConfigureAwait(false); await WriteFontConfigFile(fontsDirectory).ConfigureAwait(false); }); diff --git a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs index e26a6392c..3954897ca 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs @@ -136,7 +136,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles if ((DateTime.UtcNow - _lastRateLimitException).TotalHours < 1) { - throw new Exception("OpenSubtitles rate limit reached"); + throw new RateLimitExceededException("OpenSubtitles rate limit reached"); } var resultDownLoad = await OpenSubtitles.DownloadSubtitlesAsync(downloadsList, cancellationToken).ConfigureAwait(false); @@ -144,7 +144,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles if ((resultDownLoad.Status ?? string.Empty).IndexOf("407", StringComparison.OrdinalIgnoreCase) != -1) { _lastRateLimitException = DateTime.UtcNow; - throw new Exception("OpenSubtitles rate limit reached"); + throw new RateLimitExceededException("OpenSubtitles rate limit reached"); } if (!(resultDownLoad is MethodResponseSubtitleDownload)) |