lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Bond_009 2019-07-08 15:14:51 +02:00 committed by Joshua M. Boniface
parent b294b802a8
commit 5d9fa06675
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
View File

@ -11,7 +11,6 @@ using Emby.XmlTv.Classes;
using Emby.XmlTv.Entities; using Emby.XmlTv.Entities;
using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
using MediaBrowser.Common.Progress;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.LiveTv; using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
@ -29,7 +28,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings
private readonly IFileSystem _fileSystem; private readonly IFileSystem _fileSystem;
private readonly IZipClient _zipClient; private readonly IZipClient _zipClient;
public XmlTvListingsProvider(IServerConfigurationManager config, IHttpClient httpClient, ILogger logger, IFileSystem fileSystem, IZipClient zipClient) public XmlTvListingsProvider(
IServerConfigurationManager config,
IHttpClient httpClient,
ILogger logger,
IFileSystem fileSystem,
IZipClient zipClient)
{ {
_config = config; _config = config;
_httpClient = httpClient; _httpClient = httpClient;
@ -77,12 +81,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
{ {
CancellationToken = cancellationToken, CancellationToken = cancellationToken,
Url = path, Url = path,
Progress = new SimpleProgress<double>(),
// It's going to come back gzipped regardless of this value
// So we need to make sure the decompression method is set to gzip
DecompressionMethod = CompressionMethod.Gzip, DecompressionMethod = CompressionMethod.Gzip,
UserAgent = "Emby/3.0"
}, },
HttpMethod.Get).ConfigureAwait(false)) HttpMethod.Get).ConfigureAwait(false))
using (var stream = res.Content) using (var stream = res.Content)
@ -117,7 +116,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error extracting from gz file {file}", file); _logger.LogError(ex, "Error extracting from gz file {File}", file);
} }
try try
@ -127,7 +126,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error extracting from zip file {file}", file); _logger.LogError(ex, "Error extracting from zip file {File}", file);
} }
} }