diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs
deleted file mode 100644
index 2cc053c644..0000000000
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs
+++ /dev/null
@@ -1,401 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Xml;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Providers.TV.TheTVDB
-{
- ///
- /// Class TvdbPrescanTask
- ///
- public class TvdbPrescanTask : ILibraryPostScanTask
- {
- public const string TvdbBaseUrl = "https://thetvdb.com/";
-
- ///
- /// The server time URL
- ///
- private const string ServerTimeUrl = TvdbBaseUrl + "api/Updates.php?type=none";
-
- ///
- /// The updates URL
- ///
- private const string UpdatesUrl = TvdbBaseUrl + "api/Updates.php?type=all&time={0}";
-
- ///
- /// The _HTTP client
- ///
- private readonly IHttpClient _httpClient;
- ///
- /// The _logger
- ///
- private readonly ILogger _logger;
- ///
- /// The _config
- ///
- private readonly IServerConfigurationManager _config;
- private readonly IFileSystem _fileSystem;
- private readonly ILibraryManager _libraryManager;
- private readonly IXmlReaderSettingsFactory _xmlSettings;
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// The logger.
- /// The HTTP client.
- /// The config.
- public TvdbPrescanTask(ILogger logger, IHttpClient httpClient, IServerConfigurationManager config, IFileSystem fileSystem, ILibraryManager libraryManager, IXmlReaderSettingsFactory xmlSettings)
- {
- _logger = logger;
- _httpClient = httpClient;
- _config = config;
- _fileSystem = fileSystem;
- _libraryManager = libraryManager;
- _xmlSettings = xmlSettings;
- }
-
- protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
-
- ///
- /// Runs the specified progress.
- ///
- /// The progress.
- /// The cancellation token.
- /// Task.
- public async Task Run(IProgress progress, CancellationToken cancellationToken)
- {
- return;
- var path = "";
- //var path = TvdbSeriesProvider.GetSeriesDataPath(_config.CommonApplicationPaths);
-
- Directory.CreateDirectory(path);
-
- var timestampFile = Path.Combine(path, "time.txt");
-
- var timestampFileInfo = _fileSystem.GetFileInfo(timestampFile);
-
- // Don't check for tvdb updates anymore frequently than 24 hours
- if (timestampFileInfo.Exists && (DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(timestampFileInfo)).TotalDays < 1)
- {
- return;
- }
-
- // Find out the last time we queried tvdb for updates
- var lastUpdateTime = timestampFileInfo.Exists ? File.ReadAllText(timestampFile, Encoding.UTF8) : string.Empty;
-
- string newUpdateTime;
-
- var existingDirectories = _fileSystem.GetDirectoryPaths(path)
- .Select(Path.GetFileName)
- .ToList();
-
- var seriesList = _libraryManager.GetItemList(new InternalItemsQuery()
- {
- IncludeItemTypes = new[] { typeof(Series).Name },
- Recursive = true,
- GroupByPresentationUniqueKey = false,
- DtoOptions = new DtoOptions(false)
- {
- EnableImages = false
- }
-
- }).Cast()
- .ToList();
-
- var seriesIdsInLibrary = seriesList
- .Where(i => !string.IsNullOrEmpty(i.GetProviderId(MetadataProviders.Tvdb)))
- .Select(i => i.GetProviderId(MetadataProviders.Tvdb))
- .ToList();
-
- var missingSeries = seriesIdsInLibrary.Except(existingDirectories, StringComparer.OrdinalIgnoreCase)
- .ToList();
-
- var enableInternetProviders = seriesList.Count == 0 ? false : seriesList[0].IsMetadataFetcherEnabled(_libraryManager.GetLibraryOptions(seriesList[0]), TvdbSeriesProvider.Current.Name);
- if (!enableInternetProviders)
- {
- progress.Report(100);
- return;
- }
-
- // If this is our first time, update all series
- if (string.IsNullOrEmpty(lastUpdateTime))
- {
- // First get tvdb server time
- using (var response = await _httpClient.SendAsync(new HttpRequestOptions
- {
- Url = ServerTimeUrl,
- CancellationToken = cancellationToken,
- EnableHttpCompression = true,
- BufferContent = false
-
- }, "GET").ConfigureAwait(false))
- {
- // First get tvdb server time
- using (var stream = response.Content)
- {
- newUpdateTime = GetUpdateTime(stream);
- }
- }
-
- existingDirectories.AddRange(missingSeries);
-
- await UpdateSeries(existingDirectories, path, null, progress, cancellationToken).ConfigureAwait(false);
- }
- else
- {
- var seriesToUpdate = await GetSeriesIdsToUpdate(existingDirectories, lastUpdateTime, cancellationToken).ConfigureAwait(false);
-
- newUpdateTime = seriesToUpdate.Item2;
-
- long.TryParse(lastUpdateTime, NumberStyles.Any, UsCulture, out var lastUpdateValue);
-
- var nullableUpdateValue = lastUpdateValue == 0 ? (long?)null : lastUpdateValue;
-
- var listToUpdate = seriesToUpdate.Item1.ToList();
- listToUpdate.AddRange(missingSeries);
-
- await UpdateSeries(listToUpdate, path, nullableUpdateValue, progress, cancellationToken).ConfigureAwait(false);
- }
-
- File.WriteAllText(timestampFile, newUpdateTime, Encoding.UTF8);
- progress.Report(100);
- }
-
- ///
- /// Gets the update time.
- ///
- /// The response.
- /// System.String.
- private string GetUpdateTime(Stream response)
- {
- var settings = _xmlSettings.Create(false);
-
- settings.CheckCharacters = false;
- settings.IgnoreProcessingInstructions = true;
- settings.IgnoreComments = true;
-
- using (var streamReader = new StreamReader(response, Encoding.UTF8))
- {
- // Use XmlReader for best performance
- using (var reader = XmlReader.Create(streamReader, settings))
- {
- reader.MoveToContent();
- reader.Read();
-
- // Loop through each element
- while (!reader.EOF && reader.ReadState == ReadState.Interactive)
- {
- if (reader.NodeType == XmlNodeType.Element)
- {
- switch (reader.Name)
- {
- case "Time":
- {
- return (reader.ReadElementContentAsString() ?? string.Empty).Trim();
- }
- default:
- reader.Skip();
- break;
- }
- }
- else
- {
- reader.Read();
- }
- }
- }
- }
-
- return null;
- }
-
- ///
- /// Gets the series ids to update.
- ///
- /// The existing series ids.
- /// The last update time.
- /// The cancellation token.
- /// Task{IEnumerable{System.String}}.
- private async Task, string>> GetSeriesIdsToUpdate(IEnumerable existingSeriesIds, string lastUpdateTime, CancellationToken cancellationToken)
- {
- // First get last time
- using (var response = await _httpClient.SendAsync(new HttpRequestOptions
- {
- Url = string.Format(UpdatesUrl, lastUpdateTime),
- CancellationToken = cancellationToken,
- EnableHttpCompression = true,
- BufferContent = false
-
- }, "GET").ConfigureAwait(false))
- {
- using (var stream = response.Content)
- {
- var data = GetUpdatedSeriesIdList(stream);
-
- var existingDictionary = existingSeriesIds.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
- var seriesList = data.Item1
- .Where(i => !string.IsNullOrWhiteSpace(i) && existingDictionary.ContainsKey(i));
-
- return new Tuple, string>(seriesList, data.Item2);
- }
- }
- }
-
- private Tuple, string> GetUpdatedSeriesIdList(Stream stream)
- {
- string updateTime = null;
- var idList = new List();
-
- var settings = _xmlSettings.Create(false);
-
- settings.CheckCharacters = false;
- settings.IgnoreProcessingInstructions = true;
- settings.IgnoreComments = true;
-
- using (var streamReader = new StreamReader(stream, Encoding.UTF8))
- {
- // Use XmlReader for best performance
- using (var reader = XmlReader.Create(streamReader, settings))
- {
- reader.MoveToContent();
- reader.Read();
-
- // Loop through each element
- while (!reader.EOF && reader.ReadState == ReadState.Interactive)
- {
- if (reader.NodeType == XmlNodeType.Element)
- {
- switch (reader.Name)
- {
- case "Time":
- {
- updateTime = (reader.ReadElementContentAsString() ?? string.Empty).Trim();
- break;
- }
- case "Series":
- {
- var id = (reader.ReadElementContentAsString() ?? string.Empty).Trim();
- idList.Add(id);
- break;
- }
- default:
- reader.Skip();
- break;
- }
- }
- else
- {
- reader.Read();
- }
- }
- }
- }
-
- return new Tuple, string>(idList, updateTime);
- }
-
- ///
- /// Updates the series.
- ///
- /// The series ids.
- /// The series data path.
- /// The last tv db update time.
- /// The progress.
- /// The cancellation token.
- /// Task.
- private async Task UpdateSeries(List seriesIds, string seriesDataPath, long? lastTvDbUpdateTime, IProgress progress, CancellationToken cancellationToken)
- {
- var numComplete = 0;
-
- var seriesList = _libraryManager.GetItemList(new InternalItemsQuery()
- {
- IncludeItemTypes = new[] { typeof(Series).Name },
- Recursive = true,
- GroupByPresentationUniqueKey = false,
- DtoOptions = new DtoOptions(false)
- {
- EnableImages = false
- }
-
- }).Cast();
-
- // Gather all series into a lookup by tvdb id
- var allSeries = seriesList
- .Where(i => !string.IsNullOrEmpty(i.GetProviderId(MetadataProviders.Tvdb)))
- .ToLookup(i => i.GetProviderId(MetadataProviders.Tvdb));
-
- foreach (var seriesId in seriesIds)
- {
- // Find the preferred language(s) for the movie in the library
- var languages = allSeries[seriesId]
- .Select(i => i.GetPreferredMetadataLanguage())
- .Distinct(StringComparer.OrdinalIgnoreCase)
- .ToList();
-
- foreach (var language in languages)
- {
- try
- {
- await UpdateSeries(seriesId, seriesDataPath, lastTvDbUpdateTime, language, cancellationToken).ConfigureAwait(false);
- }
- catch (HttpException ex)
- {
- _logger.LogError(ex, "Error updating tvdb series id {ID}, language {Language}", seriesId, language);
-
- // Already logged at lower levels, but don't fail the whole operation, unless timed out
- // We have to fail this to make it run again otherwise new episode data could potentially be missing
- if (ex.IsTimedOut)
- {
- throw;
- }
- }
- }
-
- numComplete++;
- double percent = numComplete;
- percent /= seriesIds.Count;
- percent *= 100;
-
- progress.Report(percent);
- }
- }
-
- ///
- /// Updates the series.
- ///
- /// The id.
- /// The series data path.
- /// The last tv db update time.
- /// The preferred metadata language.
- /// The cancellation token.
- /// Task.
- private Task UpdateSeries(string id, string seriesDataPath, long? lastTvDbUpdateTime, string preferredMetadataLanguage, CancellationToken cancellationToken)
- {
- _logger.LogInformation("Updating series from tvdb " + id + ", language " + preferredMetadataLanguage);
-
- seriesDataPath = Path.Combine(seriesDataPath, id);
-
- Directory.CreateDirectory(seriesDataPath);
-
- //return TvdbSeriesProvider.Current.DownloadSeriesZip(id, MetadataProviders.Tvdb.ToString(), null, null, seriesDataPath, lastTvDbUpdateTime, preferredMetadataLanguage, cancellationToken);
- return Task.CompletedTask;
- }
- }
-}
diff --git a/MediaBrowser.Providers/TV/TvExternalIds.cs b/MediaBrowser.Providers/TV/TvExternalIds.cs
index 5c246e3000..f50ebc1afd 100644
--- a/MediaBrowser.Providers/TV/TvExternalIds.cs
+++ b/MediaBrowser.Providers/TV/TvExternalIds.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Providers.TV
public string Key => MetadataProviders.Tvdb.ToString();
- public string UrlFormatString => TvdbPrescanTask.TvdbBaseUrl + "?tab=series&id={0}";
+ public string UrlFormatString => "https://thetvdb.com/?tab=series&id={0}";
public bool Supports(IHasProviderIds item)
{
@@ -53,7 +53,7 @@ namespace MediaBrowser.Providers.TV
public string Key => MetadataProviders.Tvdb.ToString();
- public string UrlFormatString => TvdbPrescanTask.TvdbBaseUrl + "?tab=episode&id={0}";
+ public string UrlFormatString => "https://thetvdb.com/?tab=episode&id={0}";
public bool Supports(IHasProviderIds item)
{