aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Providers
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-05-05 10:45:45 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-05-05 10:45:45 -0400
commite1dd361c7bf05af49d9210ab679e85fa00870990 (patch)
tree31668ec58054d8d11632ef2658658b68a6d02eae /MediaBrowser.Providers
parent28f7aa5b5e88ec95feef12e60d13253d2b77a562 (diff)
added subtitle parsing stubs
Diffstat (limited to 'MediaBrowser.Providers')
-rw-r--r--MediaBrowser.Providers/Movies/MovieDbProvider.cs2
-rw-r--r--MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs17
2 files changed, 14 insertions, 5 deletions
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index c83e127ae5..d812abe9f6 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -356,8 +356,6 @@ namespace MediaBrowser.Providers.Movies
await Task.Delay(Convert.ToInt32(diff), cancellationToken).ConfigureAwait(false);
}
- _lastRequestDate = DateTime.Now;
-
return await _httpClient.Get(options).ConfigureAwait(false);
}
finally
diff --git a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
index 6025493e79..7309513d63 100644
--- a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
+++ b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
@@ -1,5 +1,6 @@
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.MediaInfo;
using OpenSubtitlesHandler;
@@ -37,13 +38,23 @@ namespace MediaBrowser.Providers.Subtitles
public Task<SubtitleResponse> GetSubtitles(SubtitleRequest request, CancellationToken cancellationToken)
{
- return GetMediaSubtitleSubtitles(request, cancellationToken);
+ return GetSubtitlesInternal(request, cancellationToken);
}
- public async Task<SubtitleResponse> GetMediaSubtitleSubtitles(SubtitleRequest request, CancellationToken cancellationToken)
+ private async Task<SubtitleResponse> GetSubtitlesInternal(SubtitleRequest request,
+ CancellationToken cancellationToken)
{
var response = new SubtitleResponse();
+ var imdbIdText = request.GetProviderId(MetadataProviders.Imdb);
+ long imdbId;
+
+ if (string.IsNullOrWhiteSpace(imdbIdText) ||
+ long.TryParse(imdbIdText.TrimStart('t'), NumberStyles.Any, _usCulture, out imdbId))
+ {
+ return response;
+ }
+
switch (request.ContentType)
{
case SubtitleMediaType.Episode:
@@ -102,7 +113,7 @@ namespace MediaBrowser.Providers.Subtitles
x =>
request.ContentType == SubtitleMediaType.Episode
? int.Parse(x.SeriesSeason) == request.ParentIndexNumber && int.Parse(x.SeriesEpisode) == request.IndexNumber
- : long.Parse(x.IDMovieImdb) == request.ImdbId;
+ : long.Parse(x.IDMovieImdb) == imdbId;
var results = ((MethodResponseSubtitleSearch)result).Results;
var bestResult = results.Where(x => x.SubBad == "0" && mediaFilter(x))