mirror of
https://github.com/Radarr/Radarr.git
synced 2026-03-20 16:44:37 -04:00
Compare commits
186 Commits
v0.2.0.210
...
v0.2.0.288
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
520836f475 | ||
|
|
6d6bf1044b | ||
|
|
195866f3aa | ||
|
|
10f0be0708 | ||
|
|
721773ef68 | ||
|
|
0d647ffb9a | ||
|
|
b6235e99c8 | ||
|
|
1d0a6af7d7 | ||
|
|
efd7af165c | ||
|
|
3f4ee6d841 | ||
|
|
55c437d980 | ||
|
|
ecfe103c50 | ||
|
|
a282ad7809 | ||
|
|
64176b8d26 | ||
|
|
278fb298b6 | ||
|
|
1d1b88cf05 | ||
|
|
0c50aa7872 | ||
|
|
0bfa01f072 | ||
|
|
3e9594f069 | ||
|
|
a07138680b | ||
|
|
5f6f2f2859 | ||
|
|
e185ba0191 | ||
|
|
3ab0b17379 | ||
|
|
942d97931e | ||
|
|
40809f1d91 | ||
|
|
f6a37186aa | ||
|
|
9522bf3095 | ||
|
|
c3c7387390 | ||
|
|
09fb58c3e9 | ||
|
|
3d33e630ec | ||
|
|
b51916fb2b | ||
|
|
c9ee92cc30 | ||
|
|
0e81416c2f | ||
|
|
6cd7d46208 | ||
|
|
6af6da16b4 | ||
|
|
4c5900373d | ||
|
|
2fd167c446 | ||
|
|
31149aeed9 | ||
|
|
977b87cbf3 | ||
|
|
42ed4ff48a | ||
|
|
060c71f439 | ||
|
|
63527858e7 | ||
|
|
2f4ea9cac7 | ||
|
|
a1f2369306 | ||
|
|
a35c5f79c1 | ||
|
|
d382e15749 | ||
|
|
5b7d513986 | ||
|
|
be083cfd53 | ||
|
|
f9844c284a | ||
|
|
e8065d07b3 | ||
|
|
8a0820ad1e | ||
|
|
8274cc016f | ||
|
|
b88281b458 | ||
|
|
a1cb5eb420 | ||
|
|
d458c4ecc8 | ||
|
|
b6e4f53597 | ||
|
|
4abbf55ee4 | ||
|
|
1fd909cff6 | ||
|
|
7ca53d1073 | ||
|
|
2bda0f700c | ||
|
|
16b2cc49d4 | ||
|
|
e3e67d1098 | ||
|
|
3276e3ec52 | ||
|
|
5e9a79afe8 | ||
|
|
c6912a193c | ||
|
|
47083e6be1 | ||
|
|
ca78cc5c3c | ||
|
|
76db305ffa | ||
|
|
5d2ef4786b | ||
|
|
9953a5ed06 | ||
|
|
dd194d41be | ||
|
|
8168cf82c5 | ||
|
|
e2d6e39168 | ||
|
|
a340bc4da3 | ||
|
|
4bcb0e17f8 | ||
|
|
25a51df894 | ||
|
|
f9c6ffcdaa | ||
|
|
b76c54ceac | ||
|
|
4be7772d53 | ||
|
|
cbc70a8ff3 | ||
|
|
dd8af0ad8c | ||
|
|
00541e6cc1 | ||
|
|
a8eec60c9d | ||
|
|
7bb319b6d6 | ||
|
|
50a5a2de9b | ||
|
|
dbe5946d10 | ||
|
|
d5caac5d3b | ||
|
|
487c5e22ce | ||
|
|
6efd63a292 | ||
|
|
f31dc3c054 | ||
|
|
c60be3a467 | ||
|
|
44b4e71c05 | ||
|
|
5ebd035b1c | ||
|
|
d50514f8bc | ||
|
|
7da2183080 | ||
|
|
a417ac2716 | ||
|
|
a89e662721 | ||
|
|
72aac6e551 | ||
|
|
4b1e4eecfb | ||
|
|
8e452f8b6d | ||
|
|
7e6db89eff | ||
|
|
16214e666b | ||
|
|
2b25ce237f | ||
|
|
f0a9955447 | ||
|
|
d0439296fe | ||
|
|
e2c2bdb65b | ||
|
|
bc3fdb0f80 | ||
|
|
186b2ada36 | ||
|
|
577125f345 | ||
|
|
687dd8a05f | ||
|
|
81861c6121 | ||
|
|
302462f48c | ||
|
|
d132f55830 | ||
|
|
6bbd64e59a | ||
|
|
290c4e1f2e | ||
|
|
1112616514 | ||
|
|
7fddbca4b7 | ||
|
|
692841478c | ||
|
|
23232b9830 | ||
|
|
b886566b25 | ||
|
|
2c56d60678 | ||
|
|
a0c8127ecf | ||
|
|
05f61df59e | ||
|
|
a0b80ad41a | ||
|
|
9e7cb708bf | ||
|
|
95d97c59d7 | ||
|
|
a75f3e1f8e | ||
|
|
d09d30544f | ||
|
|
1ad4006819 | ||
|
|
43d904d20b | ||
|
|
5339f8efdc | ||
|
|
b273bfb10e | ||
|
|
244e82722d | ||
|
|
e182d8b964 | ||
|
|
02e610a5f2 | ||
|
|
032bc2d5c4 | ||
|
|
e59db74cad | ||
|
|
fbe9ad6582 | ||
|
|
87da542758 | ||
|
|
b2317ada1f | ||
|
|
336aee7fda | ||
|
|
9e7468d723 | ||
|
|
f05ee13206 | ||
|
|
8b3b46b724 | ||
|
|
80e53f209d | ||
|
|
82f29cdc70 | ||
|
|
93d6505f85 | ||
|
|
2b7afd3272 | ||
|
|
6d4e1f6c2e | ||
|
|
2b579eb0d3 | ||
|
|
c0f323b05a | ||
|
|
791121fa06 | ||
|
|
f25d4463f5 | ||
|
|
00099a5e40 | ||
|
|
7c251157ed | ||
|
|
cc3c2533fa | ||
|
|
f8162b34f2 | ||
|
|
3ff5b36d29 | ||
|
|
1fa736c6d8 | ||
|
|
94eccc6c14 | ||
|
|
9fffcfaea3 | ||
|
|
f481676c81 | ||
|
|
76a42b28f3 | ||
|
|
ad26e48408 | ||
|
|
0bab97e02f | ||
|
|
2413457323 | ||
|
|
bfcd05206f | ||
|
|
ddf10ed137 | ||
|
|
b4d1c0e053 | ||
|
|
68f58fb37d | ||
|
|
f9923f4592 | ||
|
|
dd553b9439 | ||
|
|
451f2d30e4 | ||
|
|
463d85e479 | ||
|
|
2c52795822 | ||
|
|
4f37a36619 | ||
|
|
5aaba98c57 | ||
|
|
a98b69859c | ||
|
|
734a36de06 | ||
|
|
b02944a3b2 | ||
|
|
6878abe2a2 | ||
|
|
ec1c81e3ed | ||
|
|
47824426c6 | ||
|
|
4ded288c5d | ||
|
|
d123ca6063 | ||
|
|
0ee8b75b54 |
@@ -61,6 +61,8 @@ To connect to the UI, fire up your browser and open <http://localhost:7878> or <
|
||||
* Importing movies from various online sources, such as IMDb Watchlists (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114))
|
||||
* Full integration with Kodi, Plex (notification, library update, metadata)
|
||||
|
||||
##Feature Requests
|
||||
[](http://feathub.com/Radarr/Radarr)
|
||||
|
||||
## Configuring Development Environment
|
||||
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using NzbDrone.Common.EnsureThat;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Common.Reflection;
|
||||
using NzbDrone.Core.Annotations;
|
||||
using NzbDrone.Core.Qualities;
|
||||
using NzbDrone.Core.Profiles;
|
||||
|
||||
namespace NzbDrone.Api.ClientSchema
|
||||
{
|
||||
@@ -73,14 +76,14 @@ namespace NzbDrone.Api.ClientSchema
|
||||
|
||||
if (propertyInfo.PropertyType == typeof(int))
|
||||
{
|
||||
var value = Convert.ToInt32(field.Value);
|
||||
propertyInfo.SetValue(target, value, null);
|
||||
var value = field.Value.ToString().ParseInt32();
|
||||
propertyInfo.SetValue(target, value ?? 0, null);
|
||||
}
|
||||
|
||||
else if (propertyInfo.PropertyType == typeof(long))
|
||||
{
|
||||
var value = Convert.ToInt64(field.Value);
|
||||
propertyInfo.SetValue(target, value, null);
|
||||
var value = field.Value.ToString().ParseInt64();
|
||||
propertyInfo.SetValue(target, value ?? 0, null);
|
||||
}
|
||||
|
||||
else if (propertyInfo.PropertyType == typeof(int?))
|
||||
@@ -147,6 +150,18 @@ namespace NzbDrone.Api.ClientSchema
|
||||
|
||||
private static List<SelectOption> GetSelectOptions(Type selectOptions)
|
||||
{
|
||||
if (selectOptions == typeof(Profile))
|
||||
{
|
||||
return new List<SelectOption>();
|
||||
}
|
||||
|
||||
if (selectOptions == typeof(Quality))
|
||||
{
|
||||
var qOptions = from Quality q in selectOptions.GetProperties(BindingFlags.Static | BindingFlags.Public)
|
||||
select new SelectOption {Name = q.Name, Value = q.Id};
|
||||
return qOptions.OrderBy(o => o.Value).ToList();
|
||||
}
|
||||
|
||||
var options = from Enum e in Enum.GetValues(selectOptions)
|
||||
select new SelectOption { Value = Convert.ToInt32(e), Name = e.ToString() };
|
||||
|
||||
|
||||
22
src/NzbDrone.Api/Config/NetImportConfigModule.cs
Normal file
22
src/NzbDrone.Api/Config/NetImportConfigModule.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using FluentValidation;
|
||||
using NzbDrone.Api.Validation;
|
||||
using NzbDrone.Core.Configuration;
|
||||
|
||||
namespace NzbDrone.Api.Config
|
||||
{
|
||||
public class NetImportConfigModule : NzbDroneConfigModule<NetImportConfigResource>
|
||||
{
|
||||
|
||||
public NetImportConfigModule(IConfigService configService)
|
||||
: base(configService)
|
||||
{
|
||||
SharedValidator.RuleFor(c => c.NetImportSyncInterval)
|
||||
.IsValidNetImportSyncInterval();
|
||||
}
|
||||
|
||||
protected override NetImportConfigResource ToResource(IConfigService model)
|
||||
{
|
||||
return NetImportConfigResourceMapper.ToResource(model);
|
||||
}
|
||||
}
|
||||
}
|
||||
21
src/NzbDrone.Api/Config/NetImportConfigResource.cs
Normal file
21
src/NzbDrone.Api/Config/NetImportConfigResource.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using NzbDrone.Api.REST;
|
||||
using NzbDrone.Core.Configuration;
|
||||
|
||||
namespace NzbDrone.Api.Config
|
||||
{
|
||||
public class NetImportConfigResource : RestResource
|
||||
{
|
||||
public int NetImportSyncInterval { get; set; }
|
||||
}
|
||||
|
||||
public static class NetImportConfigResourceMapper
|
||||
{
|
||||
public static NetImportConfigResource ToResource(IConfigService model)
|
||||
{
|
||||
return new NetImportConfigResource
|
||||
{
|
||||
NetImportSyncInterval = model.NetImportSyncInterval
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,9 +25,9 @@ namespace NzbDrone.Api.Indexers
|
||||
|
||||
release.ReleaseWeight = initialWeight;
|
||||
|
||||
if (decision.RemoteEpisode.Series != null)
|
||||
if (decision.RemoteMovie.Movie != null)
|
||||
{
|
||||
release.QualityWeight = decision.RemoteEpisode.Series
|
||||
release.QualityWeight = decision.RemoteMovie.Movie
|
||||
.Profile.Value
|
||||
.Items.FindIndex(v => v.Quality == release.Quality.Quality) * 100;
|
||||
}
|
||||
|
||||
@@ -35,21 +35,21 @@ namespace NzbDrone.Api.EpisodeFiles
|
||||
_seriesService = seriesService;
|
||||
_qualityUpgradableSpecification = qualityUpgradableSpecification;
|
||||
_logger = logger;
|
||||
/*GetResourceById = GetEpisodeFile;
|
||||
GetResourceAll = GetEpisodeFiles;
|
||||
GetResourceById = GetMovieFile;
|
||||
/*GetResourceAll = GetEpisodeFiles;
|
||||
UpdateResource = SetQuality;*/
|
||||
UpdateResource = SetQuality;
|
||||
DeleteResource = DeleteEpisodeFile;
|
||||
}
|
||||
|
||||
/*private EpisodeFileResource GetEpisodeFile(int id)
|
||||
private MovieFileResource GetMovieFile(int id)
|
||||
{
|
||||
var episodeFile = _mediaFileService.Get(id);
|
||||
var series = _seriesService.GetSeries(episodeFile.SeriesId);
|
||||
var episodeFile = _mediaFileService.GetMovie(id);
|
||||
|
||||
return episodeFile.ToResource(series, _qualityUpgradableSpecification);
|
||||
return episodeFile.ToResource();
|
||||
}
|
||||
|
||||
private List<EpisodeFileResource> GetEpisodeFiles()
|
||||
/*private List<EpisodeFileResource> GetEpisodeFiles()
|
||||
{
|
||||
if (!Request.Query.SeriesId.HasValue)
|
||||
{
|
||||
@@ -62,13 +62,13 @@ namespace NzbDrone.Api.EpisodeFiles
|
||||
|
||||
return _mediaFileService.GetFilesBySeries(seriesId).ConvertAll(f => f.ToResource(series, _qualityUpgradableSpecification));
|
||||
}
|
||||
|
||||
private void SetQuality(EpisodeFileResource episodeFileResource)
|
||||
*/
|
||||
private void SetQuality(MovieFileResource episodeFileResource)
|
||||
{
|
||||
var episodeFile = _mediaFileService.Get(episodeFileResource.Id);
|
||||
var episodeFile = _mediaFileService.GetMovie(episodeFileResource.Id);
|
||||
episodeFile.Quality = episodeFileResource.Quality;
|
||||
_mediaFileService.Update(episodeFile);
|
||||
}*/
|
||||
}
|
||||
|
||||
private void DeleteEpisodeFile(int id)
|
||||
{
|
||||
|
||||
34
src/NzbDrone.Api/NetImport/ListImportModule.cs
Normal file
34
src/NzbDrone.Api/NetImport/ListImportModule.cs
Normal file
@@ -0,0 +1,34 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Nancy;
|
||||
using Nancy.Extensions;
|
||||
using NzbDrone.Api.Extensions;
|
||||
using NzbDrone.Api.Movie;
|
||||
using NzbDrone.Core.MetadataSource;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Api.NetImport
|
||||
{
|
||||
public class ListImportModule : NzbDroneApiModule
|
||||
{
|
||||
private readonly IMovieService _movieService;
|
||||
private readonly ISearchForNewMovie _movieSearch;
|
||||
|
||||
public ListImportModule(IMovieService movieService, ISearchForNewMovie movieSearch)
|
||||
: base("/movie/import")
|
||||
{
|
||||
_movieService = movieService;
|
||||
_movieSearch = movieSearch;
|
||||
Put["/"] = Movie => SaveAll();
|
||||
}
|
||||
|
||||
private Response SaveAll()
|
||||
{
|
||||
var resources = Request.Body.FromJson<List<MovieResource>>();
|
||||
|
||||
var Movies = resources.Select(MovieResource => _movieSearch.MapMovieToTmdbMovie(MovieResource.ToModel())).Where(m => m != null).DistinctBy(m => m.TmdbId).ToList();
|
||||
|
||||
return _movieService.AddMovies(Movies).ToResource().AsResponse(HttpStatusCode.Accepted);
|
||||
}
|
||||
}
|
||||
}
|
||||
44
src/NzbDrone.Api/NetImport/NetImportModule.cs
Normal file
44
src/NzbDrone.Api/NetImport/NetImportModule.cs
Normal file
@@ -0,0 +1,44 @@
|
||||
using NzbDrone.Api.ClientSchema;
|
||||
using NzbDrone.Core.NetImport;
|
||||
using NzbDrone.Core.Profiles;
|
||||
|
||||
namespace NzbDrone.Api.NetImport
|
||||
{
|
||||
public class NetImportModule : ProviderModuleBase<NetImportResource, INetImport, NetImportDefinition>
|
||||
{
|
||||
private readonly IProfileService _profileService;
|
||||
public NetImportModule(NetImportFactory indexerFactory, IProfileService profileService)
|
||||
: base(indexerFactory, "netimport")
|
||||
{
|
||||
_profileService = profileService;
|
||||
}
|
||||
|
||||
protected override void MapToResource(NetImportResource resource, NetImportDefinition definition)
|
||||
{
|
||||
base.MapToResource(resource, definition);
|
||||
|
||||
resource.Enabled = definition.Enabled;
|
||||
resource.EnableAuto = definition.EnableAuto;
|
||||
resource.ProfileId = definition.ProfileId;
|
||||
resource.RootFolderPath = definition.RootFolderPath;
|
||||
resource.ShouldMonitor = definition.ShouldMonitor;
|
||||
}
|
||||
|
||||
protected override void MapToModel(NetImportDefinition definition, NetImportResource resource)
|
||||
{
|
||||
base.MapToModel(definition, resource);
|
||||
|
||||
definition.Enabled = resource.Enabled;
|
||||
definition.EnableAuto = resource.EnableAuto;
|
||||
definition.ProfileId = resource.ProfileId;
|
||||
definition.RootFolderPath = resource.RootFolderPath;
|
||||
definition.ShouldMonitor = resource.ShouldMonitor;
|
||||
}
|
||||
|
||||
protected override void Validate(NetImportDefinition definition, bool includeWarnings)
|
||||
{
|
||||
if (!definition.Enable) return;
|
||||
base.Validate(definition, includeWarnings);
|
||||
}
|
||||
}
|
||||
}
|
||||
13
src/NzbDrone.Api/NetImport/NetImportResource.cs
Normal file
13
src/NzbDrone.Api/NetImport/NetImportResource.cs
Normal file
@@ -0,0 +1,13 @@
|
||||
using NzbDrone.Core.NetImport;
|
||||
|
||||
namespace NzbDrone.Api.NetImport
|
||||
{
|
||||
public class NetImportResource : ProviderResource
|
||||
{
|
||||
public bool Enabled { get; set; }
|
||||
public bool EnableAuto { get; set; }
|
||||
public bool ShouldMonitor { get; set; }
|
||||
public string RootFolderPath { get; set; }
|
||||
public int ProfileId { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -109,6 +109,8 @@
|
||||
<Compile Include="ClientSchema\SelectOption.cs" />
|
||||
<Compile Include="Commands\CommandModule.cs" />
|
||||
<Compile Include="Commands\CommandResource.cs" />
|
||||
<Compile Include="Config\NetImportConfigModule.cs" />
|
||||
<Compile Include="Config\NetImportConfigResource.cs" />
|
||||
<Compile Include="Extensions\AccessControlHeaders.cs" />
|
||||
<Compile Include="Extensions\Pipelines\CorsPipeline.cs" />
|
||||
<Compile Include="Extensions\Pipelines\RequestLoggingPipeline.cs" />
|
||||
@@ -121,6 +123,9 @@
|
||||
<Compile Include="Movies\RenameMovieModule.cs" />
|
||||
<Compile Include="Movies\RenameMovieResource.cs" />
|
||||
<Compile Include="Movies\MovieEditorModule.cs" />
|
||||
<Compile Include="NetImport\ListImportModule.cs" />
|
||||
<Compile Include="NetImport\NetImportModule.cs" />
|
||||
<Compile Include="NetImport\NetImportResource.cs" />
|
||||
<Compile Include="Parse\ParseModule.cs" />
|
||||
<Compile Include="Parse\ParseResource.cs" />
|
||||
<Compile Include="ManualImport\ManualImportModule.cs" />
|
||||
@@ -234,6 +239,7 @@
|
||||
<Compile Include="SeasonPass\SeasonPassResource.cs" />
|
||||
<Compile Include="Series\AlternateTitleResource.cs" />
|
||||
<Compile Include="Series\MovieFileResource.cs" />
|
||||
<Compile Include="Series\FetchMovieListModule.cs" />
|
||||
<Compile Include="Series\SeasonResource.cs" />
|
||||
<Compile Include="SeasonPass\SeasonPassModule.cs" />
|
||||
<Compile Include="Series\SeriesEditorModule.cs" />
|
||||
@@ -254,6 +260,7 @@
|
||||
<Compile Include="TinyIoCNancyBootstrapper.cs" />
|
||||
<Compile Include="Update\UpdateModule.cs" />
|
||||
<Compile Include="Update\UpdateResource.cs" />
|
||||
<Compile Include="Validation\NetImportSyncIntervalValidator.cs" />
|
||||
<Compile Include="Validation\RssSyncIntervalValidator.cs" />
|
||||
<Compile Include="Validation\EmptyCollectionValidator.cs" />
|
||||
<Compile Include="Validation\RuleBuilderExtensions.cs" />
|
||||
@@ -295,4 +302,4 @@
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -11,6 +11,7 @@ namespace NzbDrone.Api.Profiles
|
||||
{
|
||||
public string Name { get; set; }
|
||||
public Quality Cutoff { get; set; }
|
||||
public string PreferredTags { get; set; }
|
||||
public List<ProfileQualityItemResource> Items { get; set; }
|
||||
public Language Language { get; set; }
|
||||
}
|
||||
@@ -33,6 +34,7 @@ namespace NzbDrone.Api.Profiles
|
||||
|
||||
Name = model.Name,
|
||||
Cutoff = model.Cutoff,
|
||||
PreferredTags = model.PreferredTags != null ? string.Join(",", model.PreferredTags) : "",
|
||||
Items = model.Items.ConvertAll(ToResource),
|
||||
Language = model.Language
|
||||
};
|
||||
@@ -59,6 +61,7 @@ namespace NzbDrone.Api.Profiles
|
||||
|
||||
Name = resource.Name,
|
||||
Cutoff = (Quality)resource.Cutoff.Id,
|
||||
PreferredTags = resource.PreferredTags.Split(',').ToList(),
|
||||
Items = resource.Items.ConvertAll(ToModel),
|
||||
Language = resource.Language
|
||||
};
|
||||
|
||||
@@ -38,8 +38,8 @@ namespace NzbDrone.Api.RootFolders
|
||||
Id = resource.Id,
|
||||
|
||||
Path = resource.Path,
|
||||
//FreeSpace
|
||||
//UnmappedFolders
|
||||
FreeSpace = resource.FreeSpace,
|
||||
UnmappedFolders = resource.UnmappedFolders
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
60
src/NzbDrone.Api/Series/FetchMovieListModule.cs
Normal file
60
src/NzbDrone.Api/Series/FetchMovieListModule.cs
Normal file
@@ -0,0 +1,60 @@
|
||||
using System.Collections.Generic;
|
||||
using Nancy;
|
||||
using NzbDrone.Api.Extensions;
|
||||
using NzbDrone.Core.MediaCover;
|
||||
using NzbDrone.Core.MetadataSource;
|
||||
using System.Linq;
|
||||
using NzbDrone.Core.NetImport;
|
||||
|
||||
namespace NzbDrone.Api.Movie
|
||||
{
|
||||
public class FetchMovieListModule : NzbDroneRestModule<MovieResource>
|
||||
{
|
||||
private readonly IFetchNetImport _fetchNetImport;
|
||||
private readonly ISearchForNewMovie _movieSearch;
|
||||
|
||||
public FetchMovieListModule(IFetchNetImport netImport, ISearchForNewMovie movieSearch)
|
||||
: base("/netimport/movies")
|
||||
{
|
||||
_fetchNetImport = netImport;
|
||||
_movieSearch = movieSearch;
|
||||
Get["/"] = x => Search();
|
||||
}
|
||||
|
||||
|
||||
private Response Search()
|
||||
{
|
||||
var results = _fetchNetImport.FetchAndFilter((int) Request.Query.listId, false);
|
||||
|
||||
List<Core.Tv.Movie> realResults = new List<Core.Tv.Movie>();
|
||||
|
||||
/*foreach (var movie in results)
|
||||
{
|
||||
var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
|
||||
|
||||
if (mapped != null)
|
||||
{
|
||||
realResults.Add(mapped);
|
||||
}
|
||||
}*/
|
||||
|
||||
return MapToResource(results).AsResponse();
|
||||
}
|
||||
|
||||
|
||||
private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
|
||||
{
|
||||
foreach (var currentSeries in movies)
|
||||
{
|
||||
var resource = currentSeries.ToResource();
|
||||
var poster = currentSeries.Images.FirstOrDefault(c => c.CoverType == MediaCoverTypes.Poster);
|
||||
if (poster != null)
|
||||
{
|
||||
resource.RemotePoster = poster.Url;
|
||||
}
|
||||
|
||||
yield return resource;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
using FluentValidation.Validators;
|
||||
|
||||
namespace NzbDrone.Api.Validation
|
||||
{
|
||||
public class NetImportSyncIntervalValidator : PropertyValidator
|
||||
{
|
||||
public NetImportSyncIntervalValidator()
|
||||
: base("Must be between 10 and 1440 or 0 to disable")
|
||||
{
|
||||
}
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
var value = (int)context.PropertyValue;
|
||||
|
||||
if (value == 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (value >= 10 && value <= 1440)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,7 @@ namespace NzbDrone.Api.Validation
|
||||
public class RssSyncIntervalValidator : PropertyValidator
|
||||
{
|
||||
public RssSyncIntervalValidator()
|
||||
: base("Must be between 10 and 120 or 0 to disable")
|
||||
: base("Must be between 10 and 720 or 0 to disable")
|
||||
{
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace NzbDrone.Api.Validation
|
||||
return true;
|
||||
}
|
||||
|
||||
if (value >= 10 && value <= 120)
|
||||
if (value >= 10 && value <= 720)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -36,5 +36,10 @@ namespace NzbDrone.Api.Validation
|
||||
{
|
||||
return ruleBuilder.SetValidator(new RssSyncIntervalValidator());
|
||||
}
|
||||
|
||||
public static IRuleBuilderOptions<T, int> IsValidNetImportSyncInterval<T>(this IRuleBuilder<T, int> ruleBuilder)
|
||||
{
|
||||
return ruleBuilder.SetValidator(new NetImportSyncIntervalValidator());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 81 KiB |
@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.Configuration
|
||||
[Test]
|
||||
public void Get_value_should_return_default_when_no_value()
|
||||
{
|
||||
Subject.RssSyncInterval.Should().Be(15);
|
||||
Subject.RssSyncInterval.Should().Be(60);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -47,7 +47,7 @@ namespace NzbDrone.Core.Test.Configuration
|
||||
public void get_value_with_out_persist_should_not_store_default_value()
|
||||
{
|
||||
var interval = Subject.RssSyncInterval;
|
||||
interval.Should().Be(15);
|
||||
interval.Should().Be(60);
|
||||
Mocker.GetMock<IConfigRepository>().Verify(c => c.Insert(It.IsAny<Config>()), Times.Never());
|
||||
}
|
||||
|
||||
|
||||
@@ -196,18 +196,18 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
|
||||
Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void should_return_true_if_RAWHD()
|
||||
{
|
||||
parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.RAWHD);
|
||||
//[Test]
|
||||
//public void should_return_true_if_RAWHD()
|
||||
//{
|
||||
// parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.RAWHD);
|
||||
|
||||
series.Runtime = 45;
|
||||
parseResultSingle.Series = series;
|
||||
parseResultSingle.Series.SeriesType = SeriesTypes.Daily;
|
||||
parseResultSingle.Release.Size = 8000.Megabytes();
|
||||
// series.Runtime = 45;
|
||||
// parseResultSingle.Series = series;
|
||||
// parseResultSingle.Series.SeriesType = SeriesTypes.Daily;
|
||||
// parseResultSingle.Release.Size = 8000.Megabytes();
|
||||
|
||||
Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
|
||||
}
|
||||
// Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
|
||||
//}
|
||||
|
||||
[Test]
|
||||
public void should_return_true_for_special()
|
||||
|
||||
449
src/NzbDrone.Core.Test/Files/couchpotato_movie_list.json
Normal file
449
src/NzbDrone.Core.Test/Files/couchpotato_movie_list.json
Normal file
@@ -0,0 +1,449 @@
|
||||
{
|
||||
"movies": [
|
||||
{
|
||||
"status": "active",
|
||||
"info": {
|
||||
"rating": { "imdb": [ 8.1, 228515 ] },
|
||||
"genres": [ "Action", "Adventure", "Fantasy", "Science Fiction", "Thriller", "War", "Sci-Fi" ],
|
||||
"tmdb_id": 330459,
|
||||
"plot": "A rogue band of resistance fighters unite for a mission to steal the Death Star plans and bring a new hope to the galaxy.",
|
||||
"tagline": "A Rebellion Built on Hope",
|
||||
"release_date": {
|
||||
"dvd": 1461016800,
|
||||
"expires": 1486410729,
|
||||
"theater": 1453417200,
|
||||
"bluray": true
|
||||
},
|
||||
"year": 2016,
|
||||
"original_title": "Rogue One: A Star Wars Story",
|
||||
"actor_roles": {
|
||||
"Warwick Davis": "Bistan",
|
||||
"Michael Giacchino": "Stormtrooper",
|
||||
"Lex Lang": "Stormtrooper",
|
||||
"Samuel Witwer": "Stormtrooper",
|
||||
"Steen Young": "Vault Officer",
|
||||
"Russell Balogh": "X-Wing Pilot",
|
||||
"Alan Tudyk": "K-2SO",
|
||||
"Angus Cook": "Mechanic",
|
||||
"David Boat": "Stormtrooper",
|
||||
"Kevin Hickman": "Stormtrooper",
|
||||
"Aidan Cook": "Edrio Two Tubes",
|
||||
"Valene Kane": "Lyra Erso",
|
||||
"Simon Farnaby": "Blue Squadron",
|
||||
"Donnie Yen": "Chirrut Imwe",
|
||||
"Forest Whitaker": "Saw Gerrera",
|
||||
"Jordan Stephens": "Corporal Tonc",
|
||||
"Verona Blue": "Stormtrooper",
|
||||
"David Sobolov": "Stormtrooper",
|
||||
"Attila G. Kerekes": "Rebel Marine on Yavin",
|
||||
"Ian McElhinney": "General Dodonna",
|
||||
"John Gilroy": "Stormtrooper",
|
||||
"Matthew Wood": "Stormtrooper",
|
||||
"Jiang Wen": "Baze Malbus",
|
||||
"Sharon Duncan-Brewster": "Senator Pamlo",
|
||||
"Christopher Scarabosio": "Stormtrooper",
|
||||
"Stephen Stanton": "Admiral Raddus (voice)",
|
||||
"Andrew Zographos": "X-Wing Pilot",
|
||||
"Ben Daniels": "General Merrick",
|
||||
"James Arnold Taylor": "Stormtrooper",
|
||||
"Robin Atkin Downes": "Stormtrooper",
|
||||
"Guy Henry": "Grand Moff Tarkin",
|
||||
"Mac Pietowski": "Commi Tech / Marine Soldier",
|
||||
"James Earl Jones": "Darth Vader (voice)",
|
||||
"Daniel Naprous": "Darth Vader",
|
||||
"Geraldine James": "Blue Squadron",
|
||||
"Eugene Byrd": "Stormtrooper",
|
||||
"Michael Donovan": "Stormtrooper",
|
||||
"Paul Kasey": "Admiral Raddus",
|
||||
"Fred Tatasciore": "Stormtrooper",
|
||||
"Vanessa Lengies": "Stormtrooper",
|
||||
"Duncan Pow": "Sergeant Melshi",
|
||||
"Dolly Gadsdon": "Younger Jyn (as Dolly Gadson)",
|
||||
"David Acord": "Stormtrooper",
|
||||
"Nick Kellington": "Bistan",
|
||||
"Julian Stone": "Stormtrooper",
|
||||
"Christian Simpson": "Stormtrooper",
|
||||
"Alistair Petrie": "General Draven",
|
||||
"Ariyon Bakare": "Blue Squadron",
|
||||
"Drewe Henley": "Red Leader Garven Dreis",
|
||||
"Ram Bergman": "Death Star technician",
|
||||
"Anthony Daniels": "C-3PO",
|
||||
"Derek Arnold": "Pao",
|
||||
"Karen Huie": "Stormtrooper",
|
||||
"Steve Bardrack": "Stormtrooper",
|
||||
"Jonathan Aris": "Senator Jebel",
|
||||
"Alexi Melvin": "Stormtroooper",
|
||||
"Emeson Nwolie": "Personnel",
|
||||
"Tyrone Love": "Rebel Marine Commander",
|
||||
"John S. Schwartz": "Stormtrooper",
|
||||
"Orly Schuchmacher": "Stormtrooper",
|
||||
"Dave Filoni": "Stormtrooper",
|
||||
"Yuri Lowenthal": "Stormtrooper",
|
||||
"Mads Mikkelsen": "Galen Erso",
|
||||
"Fares Fares": "Senator Vaspar",
|
||||
"Ian Whyte": "Moroff",
|
||||
"Genevieve O'Reilly": "Mon Mothma",
|
||||
"Jorge Leon Martinez": "X-Wing Pilot",
|
||||
"Beau Gadsdon": "Young Jyn",
|
||||
"Katie Sheridan": "Stormtrooper",
|
||||
"Michael Smiley": "Dr. Evazan",
|
||||
"Babou Ceesay": "Lieutenant Sefla",
|
||||
"Tom Harrison-Read": "Stormtrooper",
|
||||
"Spencer Wilding": "Darth Vader",
|
||||
"Tom Kane": "Stormtrooper",
|
||||
"Riz Ahmed": "Bodhi Rook",
|
||||
"Ingvild Deila": "Princess Leia",
|
||||
"Tony Gilroy": "Stormtrooper",
|
||||
"Felicity Jones": "Jyn Erso",
|
||||
"Jonathan Dixon": "Stormtrooper",
|
||||
"Angus MacInnes": "Gold Leader Dutch Vander",
|
||||
"William M. Patrick": "Stormtroooper",
|
||||
"Diego Luna": "Captain Cassian Andor",
|
||||
"Sam Hanover": "Imperial Officer",
|
||||
"Jimmy Smits": "Bail Organa",
|
||||
"Ned Dennehy": "Prisoner",
|
||||
"Rian Johnson": "Death Star Technician",
|
||||
"Jimmy Vee": "R2-D2",
|
||||
"David Cowgill": "Stormtrooper",
|
||||
"Vanessa Marshall": "Stormtrooper",
|
||||
"Terri Douglas": "Stormtrooper",
|
||||
"David Ankrum": "Wedge Antilles",
|
||||
"Flora Miller": "Stormtroooper",
|
||||
"Steve Blum": "Stormtrooper",
|
||||
"Ben Mendelsohn": "Director Orson Krennic"
|
||||
},
|
||||
"via_imdb": true,
|
||||
"images": {
|
||||
"disc_art": [],
|
||||
"poster": [ "https://images-na.ssl-images-amazon.com/images/M/MV5BMjEwMzMxODIzOV5BMl5BanBnXkFtZTgwNzg3OTAzMDI@._V1_SX300.jpg" ],
|
||||
"backdrop": [ "https://image.tmdb.org/t/p/w1280/tZjVVIYXACV4IIIhXeIM59ytqwS.jpg" ],
|
||||
"extra_thumbs": [],
|
||||
"poster_original": [ "https://image.tmdb.org/t/p/original/qjiskwlV1qQzRCjpV0cL9pEMF9a.jpg" ],
|
||||
"actors": {
|
||||
"Warwick Davis": "https://image.tmdb.org/t/p/w185/5xBunTQJexQOuCmtlh8MNJerbaM.jpg",
|
||||
"Michael Giacchino": "https://image.tmdb.org/t/p/w185/2YW8sSVvRhCwiQmsFCgtFsGkbv8.jpg",
|
||||
"Michael Smiley": "https://image.tmdb.org/t/p/w185/muzJQpsKJ4srfVpyRa7qkrRYWSq.jpg",
|
||||
"Babou Ceesay": "https://image.tmdb.org/t/p/w185/7HtIvbNxACa03ofJpN4EFQTNtRU.jpg",
|
||||
"Julian Stone": "https://image.tmdb.org/t/p/w185/sNKqRYXFYHCz8lXExXl0DAl3iGD.jpg",
|
||||
"Jordan Stephens": "https://image.tmdb.org/t/p/w185/oCQl5rkRExrDhGXNPeSxsmC5wvk.jpg",
|
||||
"Alistair Petrie": "https://image.tmdb.org/t/p/w185/tC5CHVPnxAMqF0W0csTqcDAawwj.jpg",
|
||||
"Samuel Witwer": "https://image.tmdb.org/t/p/w185/e4FRojd6SmiyRLo2nQQGUXwi16v.jpg",
|
||||
"Ben Daniels": "https://image.tmdb.org/t/p/w185/x6MI4Fdz1XbERbNbXYoxTK6NAgv.jpg",
|
||||
"Ariyon Bakare": "https://image.tmdb.org/t/p/w185/xjJlH9hU58Ocy6GxKfBlEvTif1p.jpg",
|
||||
"James Arnold Taylor": "https://image.tmdb.org/t/p/w185/rAtyfY0diWt078qQIg0IX9xxG9F.jpg",
|
||||
"Robin Atkin Downes": "https://image.tmdb.org/t/p/w185/pCnIQMMgrFc4hBOE4LJDdebqRZ4.jpg",
|
||||
"Drewe Henley": "https://image.tmdb.org/t/p/w185/C28FmnpDyhI9BwD6YjagAe1U53.jpg",
|
||||
"Spencer Wilding": "https://image.tmdb.org/t/p/w185/g3FJIpQZri7gG515rLehuo81T6W.jpg",
|
||||
"Alan Tudyk": "https://image.tmdb.org/t/p/w185/6QuMtbD8kmhpwWhFKfNzEvHRLOu.jpg",
|
||||
"Guy Henry": "https://image.tmdb.org/t/p/w185/zNjPC6BTZj7DZK4KFL0nMC1El2S.jpg",
|
||||
"Angus Cook": "https://image.tmdb.org/t/p/w185/jPc794vF0h8bmslQ3sO8O3vUVIa.jpg",
|
||||
"David Boat": "https://image.tmdb.org/t/p/w185/4ewxttZW0bhlta27oc5Tjrxel3p.jpg",
|
||||
"Tom Kane": "https://image.tmdb.org/t/p/w185/hAyEHNuhD6PqbPdCNR7iUyM271I.jpg",
|
||||
"Anthony Daniels": "https://image.tmdb.org/t/p/w185/cljvryjb3VwTsNR7fjQKjNPMaBB.jpg",
|
||||
"Duncan Pow": "https://image.tmdb.org/t/p/w185/vJOzoMzxszyZGnySfql3KY9zR78.jpg",
|
||||
"Fares Fares": "https://image.tmdb.org/t/p/w185/1BE5IG3hcFXfMjBuJJyKs2JpPjI.jpg",
|
||||
"Tony Gilroy": "https://image.tmdb.org/t/p/w185/9HOtDgcO6F4Fa4BaIjt0t3Vbxrj.jpg",
|
||||
"Felicity Jones": "https://image.tmdb.org/t/p/w185/9YekpRl6ndS7zpY0wwZAWcAXkl8.jpg",
|
||||
"Eugene Byrd": "https://image.tmdb.org/t/p/w185/ab4zEcqdBSjpaz4CPQ2Z6q4rLmO.jpg",
|
||||
"Jonathan Aris": "https://image.tmdb.org/t/p/w185/6RMuwGYfLLGq01LNGBydj9jpTWn.jpg",
|
||||
"Valene Kane": "https://image.tmdb.org/t/p/w185/7TcV6HqGXjf28yjuSU42Z5XZRYb.jpg",
|
||||
"Angus MacInnes": "https://image.tmdb.org/t/p/w185/qftkol8hj7yBBP3KCxRWYkhRyLC.jpg",
|
||||
"James Earl Jones": "https://image.tmdb.org/t/p/w185/2ZuBf3ip2RXhkiQqGUjbUzAf4Nx.jpg",
|
||||
"Emeson Nwolie": "https://image.tmdb.org/t/p/w185/dWCOK3qCOm1Vve567FXKhBp5x8B.jpg",
|
||||
"Terri Douglas": "https://image.tmdb.org/t/p/w185/lECiABogAKm5Zl8Je6niNAoqz5N.jpg",
|
||||
"Simon Farnaby": "https://image.tmdb.org/t/p/w185/3u1ObLUvaTyEMmpWQnkRg5Trlng.jpg",
|
||||
"Donnie Yen": "https://image.tmdb.org/t/p/w185/vlKBbOc0htUsDGvcxeULcFXDMRo.jpg",
|
||||
"Forest Whitaker": "https://image.tmdb.org/t/p/w185/4pMQkelS5lK661m9Kz3oIxLYiyS.jpg",
|
||||
"Diego Luna": "https://image.tmdb.org/t/p/w185/9f1y0pLqohP8U3eEVCa4di1tESb.jpg",
|
||||
"Dave Filoni": "https://image.tmdb.org/t/p/w185/1m7ijGgs29Emn3Sj08c1GwGTUm0.jpg",
|
||||
"Jimmy Smits": "https://image.tmdb.org/t/p/w185/tZfr6EaIxzlT9MhY5T4C6cL3UjF.jpg",
|
||||
"Yuri Lowenthal": "https://image.tmdb.org/t/p/w185/d5vbYEkrPYAiVdTee8e4xCm7Fg1.jpg",
|
||||
"Verona Blue": "https://image.tmdb.org/t/p/w185/9UJiyVd65nGCVLsTuFjtF3ejCqa.jpg",
|
||||
"David Sobolov": "https://image.tmdb.org/t/p/w185/lUXbnlyQPsfAGg0oinCtj6KlOkt.jpg",
|
||||
"Ned Dennehy": "https://image.tmdb.org/t/p/w185/k4kgPvUND2eTrgmotrVWVJM0JUG.jpg",
|
||||
"Ian McElhinney": "https://image.tmdb.org/t/p/w185/33RGircMDTbdvD6LUp8sLmQKWvA.jpg",
|
||||
"Fred Tatasciore": "https://image.tmdb.org/t/p/w185/lNe4zn9fJ302GehQVaFk5BNcGGM.jpg",
|
||||
"Mads Mikkelsen": "https://image.tmdb.org/t/p/w185/nJjN0bS6ssbOrXcnPJrNEIsbX9s.jpg",
|
||||
"Paul Kasey": "https://image.tmdb.org/t/p/w185/56f0ouOg2ASKKKZlaywor8E5V3J.jpg",
|
||||
"David Cowgill": "https://image.tmdb.org/t/p/w185/kcGjj4EuHfMp0VILRVoacoPqNFL.jpg",
|
||||
"Ian Whyte": "https://image.tmdb.org/t/p/w185/6mRY7hTtHfDTGuTLmZmODOu9buF.jpg",
|
||||
"Genevieve O'Reilly": "https://image.tmdb.org/t/p/w185/8NrrFxrGng88GU7lxwOyK3PZv05.jpg",
|
||||
"Jorge Leon Martinez": "https://image.tmdb.org/t/p/w185/nWYveATaySCXosWAjcSS8VNPRe7.jpg",
|
||||
"Katie Sheridan": "https://image.tmdb.org/t/p/w185/awNPsff9HU7NgAhG1qQ4Kh7pMmj.jpg",
|
||||
"Vanessa Marshall": "https://image.tmdb.org/t/p/w185/wOXilt4TVOd0LuTw6RbWhe5DUy4.jpg",
|
||||
"Vanessa Lengies": "https://image.tmdb.org/t/p/w185/vU4syqfb0PYE9efbBq9YZQu24cY.jpg",
|
||||
"David Ankrum": "https://image.tmdb.org/t/p/w185/vo6JMA38exMSSbyQ3K0YCBwBrWT.jpg",
|
||||
"Riz Ahmed": "https://image.tmdb.org/t/p/w185/yWjuIP634unLBCB4XjSgmJs5QGC.jpg",
|
||||
"Steve Blum": "https://image.tmdb.org/t/p/w185/asCL6bWSZ7Xl2kSoRqrPB0CUUUU.jpg",
|
||||
"Rian Johnson": "https://image.tmdb.org/t/p/w185/qWWRFkeMjTjQKoyEXhsV0QQp4qd.jpg",
|
||||
"Matthew Wood": "https://image.tmdb.org/t/p/w185/oB9wVbEIg8fjY3ulDKjKsGn2A55.jpg",
|
||||
"Jiang Wen": "https://image.tmdb.org/t/p/w185/sLLXxXg11VFdVYFthF9RB8wIQKv.jpg",
|
||||
"Ben Mendelsohn": "https://image.tmdb.org/t/p/w185/nAeZkSUXh9CUAUq1cFAg77rZLIS.jpg",
|
||||
"Geraldine James": "https://image.tmdb.org/t/p/w185/iHKFccX2qpSzMbhIBdfvr835MVg.jpg",
|
||||
"Russell Balogh": "https://image.tmdb.org/t/p/w185/yCfE3Pf1npGB15Rw8GHt4nvgK6p.jpg"
|
||||
},
|
||||
"backdrop_original": [ "https://image.tmdb.org/t/p/original/tZjVVIYXACV4IIIhXeIM59ytqwS.jpg" ],
|
||||
"clear_art": [],
|
||||
"logo": [],
|
||||
"banner": [],
|
||||
"landscape": [],
|
||||
"extra_fanart": []
|
||||
},
|
||||
"directors": [ "Gareth Edwards" ],
|
||||
"titles": [ "Rogue One: A Star Wars Story", "Rogue One", "Star Wars: Rogue One", "Star Wars Anthology: Rogue One", "Rogue One: Uma História Star Wars", "星際大戰外傳:俠盜一號", "Rogue One - A Star Wars Story", "星球大战外传:侠盗一号", "Rogue One: История от Междузвездни войни", "Star Wars - Rouge One" ],
|
||||
"imdb": "tt3748528",
|
||||
"mpaa": "PG-13",
|
||||
"via_tmdb": true,
|
||||
"actors": [ "Felicity Jones", "Diego Luna", "Alan Tudyk", "Donnie Yen" ],
|
||||
"writers": [ "Chris Weitz (screenplay)", "Tony Gilroy (screenplay)", "John Knoll (story by)", "Gary Whitta (story by)", "George Lucas (based on characters created by)" ],
|
||||
"runtime": 133,
|
||||
"type": "movie",
|
||||
"released": "16 Dec 2016"
|
||||
},
|
||||
"_t": "media",
|
||||
"releases": [],
|
||||
"title": "Rogue One: A Star Wars Story",
|
||||
"_rev": "00030f77",
|
||||
"profile_id": "38699ec285c447bab0bc6267ffb2f3ad",
|
||||
"_id": "d9d4e0ff9b0842518b9d5f5184a60f31",
|
||||
"category_id": null,
|
||||
"type": "movie",
|
||||
"files": { "image_poster": [ "C:\\Users\\devin\\AppData\\Roaming\\CouchPotato\\cache\\2100049b45a923e858dd161ae28b1f4d.jpg" ] },
|
||||
"identifiers": { "imdb": "tt3748528" }
|
||||
},
|
||||
{
|
||||
"status": "active",
|
||||
"info": {
|
||||
"rating": { "imdb": [ 7.3, 16900 ] },
|
||||
"genres": [ "Animation", "Comedy", "Family", "Music", "Drama" ],
|
||||
"tmdb_id": 335797,
|
||||
"plot": "In a city of humanoid animals, a hustling theater impresario's attempt to save his theater with a singing competition becomes grander than he anticipates even as its finalists' find that their lives will never be the same.",
|
||||
"tagline": "Auditions begin 2016.",
|
||||
"release_date": {
|
||||
"dvd": 1490997600,
|
||||
"expires": 1485114888,
|
||||
"theater": 1482274800,
|
||||
"bluray": true
|
||||
},
|
||||
"year": 2016,
|
||||
"original_title": "Sing",
|
||||
"actor_roles": {
|
||||
"Taron Egerton": "Johnny (voice)",
|
||||
"Catherine Cavadini": "Additional Voices (voice)",
|
||||
"Beck Bennett": "Lance (voice)",
|
||||
"Rhea Perlman": "Judith (voice)",
|
||||
"Jon Robert Hall": "Frog (voice)",
|
||||
"Abby Craden": "Additional Voices (voice)",
|
||||
"Jim Cummings": "Additional Voices (voice)",
|
||||
"Peter Serafinowicz": "Big Daddy (voice)",
|
||||
"Bill Farmer": "News Reporter Dog (voice)",
|
||||
"Jessica Rau": "Additional Voices (voice)",
|
||||
"Townsend Coleman": "Additional Voices (voice)",
|
||||
"Jen Faith Brown": "Singer (voice)",
|
||||
"Brad Morris": "Baboon (voice)",
|
||||
"Doug Burch": "Additional Voices (voice)",
|
||||
"Jennifer Hudson": "Young Nana (voice)",
|
||||
"Laura Dickinson": "Spider (voice)",
|
||||
"Jeremy Maxwell": "Additional Voices (voice)",
|
||||
"Asher Blinkoff": "Piglet (voice)",
|
||||
"Reese Witherspoon": "Rosita (voice)",
|
||||
"Scarlett Johansson": "Ash (voice)",
|
||||
"Carlos Alazraqui": "Additional Voices (voice)",
|
||||
"Edgar Wright": "Additional Voices (voice)",
|
||||
"Asa Jennings": "Piglet (voice)",
|
||||
"Nick Offerman": "Norman (voice)",
|
||||
"Mickael Carreira": "Voice 3",
|
||||
"Sara Mann": "Additional Voices (voice)",
|
||||
"Jay Pharoah": "Meena's Grandfather (voice)",
|
||||
"Adam Buxton": "Stan (voice)",
|
||||
"Garth Jennings": "Miss Crawly / Additional Voices (voice)",
|
||||
"Deolinda Kinzimba": "Voice 4",
|
||||
"Jess Harnell": "Additional Voices (voice)",
|
||||
"Bob Bergen": "Additional Voices (voice)",
|
||||
"Leslie Jones": "Meena's Mother (voice)",
|
||||
"Chris Renaud": "Additional Voices (voice)",
|
||||
"Nick Kroll": "Gunter (voice)",
|
||||
"Seth MacFarlane": "Mike (voice)",
|
||||
"Marisa Liz": "Voice 2",
|
||||
"Áurea": "Voice 1",
|
||||
"Leo Jennings": "Piglet (voice)",
|
||||
"Oscar Jennings": "Piglet (voice)",
|
||||
"Tara Strong": "Additional Voices (voice)",
|
||||
"John C. Reilly": "Eddie (voice)",
|
||||
"Matthew McConaughey": "Buster Moon (voice)",
|
||||
"Caspar Jennings": "Piglet (voice)",
|
||||
"Daamen J. Krall": "Additional Voices (voice)",
|
||||
"Tori Kelly": "Meena (voice)",
|
||||
"Laraine Newman": "Meena's Grandmother / Additional Voices (voice)",
|
||||
"Willow Geer": "Additional Voices (voice)",
|
||||
"Wes Anderson": "Additional Voices (voice)",
|
||||
"Jason Pace": "Additional Voices (voice)",
|
||||
"Jennifer Saunders": "Nana (voice)",
|
||||
"John DeMita": "Additional Voices (voice)"
|
||||
},
|
||||
"via_imdb": true,
|
||||
"images": {
|
||||
"disc_art": [],
|
||||
"poster": [ "https://images-na.ssl-images-amazon.com/images/M/MV5BMTYzODYzODU2Ml5BMl5BanBnXkFtZTgwNTc1MTA2NzE@._V1_SX300.jpg" ],
|
||||
"backdrop": [ "https://image.tmdb.org/t/p/w1280/fxDXp8un4qNY9b1dLd7SH6CKzC.jpg" ],
|
||||
"extra_thumbs": [],
|
||||
"poster_original": [ "https://image.tmdb.org/t/p/original/5XFchtGifv8mz4qlyT8PZ7ZsjfG.jpg" ],
|
||||
"actors": {
|
||||
"Taron Egerton": "https://image.tmdb.org/t/p/w185/bVsLVoO3BGoHRLjWoM4Gjav2hNb.jpg",
|
||||
"Catherine Cavadini": "https://image.tmdb.org/t/p/w185/o2wULQltvbzCTCJitNeT72AjklR.jpg",
|
||||
"Beck Bennett": "https://image.tmdb.org/t/p/w185/oblaqelpyBvtB5GaSgQpDrfka9M.jpg",
|
||||
"Daamen J. Krall": "https://image.tmdb.org/t/p/w185/u0CORJ8e2vvw1dFARU4estHYS2I.jpg",
|
||||
"Rhea Perlman": "https://image.tmdb.org/t/p/w185/cq7Cf4z3BHD9o58ki7MgCioty8q.jpg",
|
||||
"Abby Craden": "https://image.tmdb.org/t/p/w185/biX1xErOEwsuRvidr8Pw6edEyK4.jpg",
|
||||
"Jim Cummings": "https://image.tmdb.org/t/p/w185/i9frXvIJsGtoFikBEFVqE7uN8Bq.jpg",
|
||||
"Peter Serafinowicz": "https://image.tmdb.org/t/p/w185/nfXHDKeetwO16agC0S7tDmLt1il.jpg",
|
||||
"Bill Farmer": "https://image.tmdb.org/t/p/w185/4aDBlkt8nEkr1RkEhiKIbDWhpZB.jpg",
|
||||
"Jessica Rau": "https://image.tmdb.org/t/p/w185/jBbIYc3UQf7JU8ggQVkfezpmgVZ.jpg",
|
||||
"Townsend Coleman": "https://image.tmdb.org/t/p/w185/j7PvxQ7XuOQc1ggSRHWRP6CB8CU.jpg",
|
||||
"Brad Morris": "https://image.tmdb.org/t/p/w185/qX6oVdAt7Vzzcnw28bdXFp05BBH.jpg",
|
||||
"Doug Burch": "https://image.tmdb.org/t/p/w185/zwfqhPuIFrUL70bWPESdJZWXc7F.jpg",
|
||||
"Jennifer Hudson": "https://image.tmdb.org/t/p/w185/zqTu7AANIUsVMAYz5rK1YPnvbWR.jpg",
|
||||
"Asher Blinkoff": "https://image.tmdb.org/t/p/w185/780sIDWQoAIVVaUbAQex50Vam0V.jpg",
|
||||
"Reese Witherspoon": "https://image.tmdb.org/t/p/w185/a3o8T1P6yy4KWL7wZG6HuDeuh5n.jpg",
|
||||
"Scarlett Johansson": "https://image.tmdb.org/t/p/w185/f3c1rwcOoeU0v6Ak5loUvMyifR0.jpg",
|
||||
"Carlos Alazraqui": "https://image.tmdb.org/t/p/w185/o62NevO1Vt9n1MdYsWOsDyhUt3A.jpg",
|
||||
"Nick Offerman": "https://image.tmdb.org/t/p/w185/8rJOtmxL5GIfNdOfksVPzepQOy2.jpg",
|
||||
"Sara Mann": "https://image.tmdb.org/t/p/w185/1TiV16ODOJtTZQrWmHRwOyQnMb0.jpg",
|
||||
"Jay Pharoah": "https://image.tmdb.org/t/p/w185/yRD2vypRF0niEdoCCI0pNZENzvm.jpg",
|
||||
"Tara Strong": "https://image.tmdb.org/t/p/w185/rFUZnJ4BaSaQVKW734xnUHSN9pm.jpg",
|
||||
"Garth Jennings": "https://image.tmdb.org/t/p/w185/ahQh5uW5CXLe1LotxN4Y20aj5Gx.jpg",
|
||||
"Jess Harnell": "https://image.tmdb.org/t/p/w185/k0BOzEyMkZ1CcoCaohjqTyQJjP1.jpg",
|
||||
"Leslie Jones": "https://image.tmdb.org/t/p/w185/2cXrwJoX0QHGBtNMsMLqeF6bR3s.jpg",
|
||||
"Chris Renaud": "https://image.tmdb.org/t/p/w185/yK3RxNsIEBljUe9jPG0iz53Iz6t.jpg",
|
||||
"Nick Kroll": "https://image.tmdb.org/t/p/w185/puZov7sMmuVkvdqJvmlxtWcS1fU.jpg",
|
||||
"Seth MacFarlane": "https://image.tmdb.org/t/p/w185/v4c6JhGYpjMRBwf95gtPxBnElNu.jpg",
|
||||
"Bob Bergen": "https://image.tmdb.org/t/p/w185/kuWDjNTw6OVnc3q1ugMGBYpMMMa.jpg",
|
||||
"Edgar Wright": "https://image.tmdb.org/t/p/w185/ypyH2s4egy5BkviuGDfeltpb19N.jpg",
|
||||
"Matthew McConaughey": "https://image.tmdb.org/t/p/w185/jdRmHrG0TWXGhs4tO6TJNSoL25T.jpg",
|
||||
"John C. Reilly": "https://image.tmdb.org/t/p/w185/kUo2TPQp4kOWWvijvkjLl0v9PQB.jpg",
|
||||
"Adam Buxton": "https://image.tmdb.org/t/p/w185/zL31NlBBKL1NTjR48h610by5Rld.jpg",
|
||||
"Tori Kelly": "https://image.tmdb.org/t/p/w185/dMyLOIOYqTMQtMEiK9DSxxHTz6F.jpg",
|
||||
"Laraine Newman": "https://image.tmdb.org/t/p/w185/ApYftBOqDMBnVColOQwXIodOt5s.jpg",
|
||||
"Willow Geer": "https://image.tmdb.org/t/p/w185/q2TjAxrQSpPPUiTUwFBXcLJ7qxc.jpg",
|
||||
"Wes Anderson": "https://image.tmdb.org/t/p/w185/r6mr3gvbuocMznHXSlXVKDj7mEI.jpg",
|
||||
"Jason Pace": "https://image.tmdb.org/t/p/w185/2q6KfNytYUiHuf8Rx9HyBGoD1T7.jpg",
|
||||
"Jennifer Saunders": "https://image.tmdb.org/t/p/w185/nlxiFy0LUYGlICaFY3rF2DRovcc.jpg",
|
||||
"John DeMita": "https://image.tmdb.org/t/p/w185/lzwHtcKVd5oenYtoFtJYeNddpwT.jpg"
|
||||
},
|
||||
"backdrop_original": [ "https://image.tmdb.org/t/p/original/fxDXp8un4qNY9b1dLd7SH6CKzC.jpg" ],
|
||||
"clear_art": [],
|
||||
"logo": [],
|
||||
"banner": [],
|
||||
"landscape": [],
|
||||
"extra_fanart": []
|
||||
},
|
||||
"directors": [ "Christophe Lourdelet", "Garth Jennings" ],
|
||||
"titles": [ "Sing", "Welcome to the Auditions" ],
|
||||
"imdb": "tt3470600",
|
||||
"mpaa": "PG",
|
||||
"via_tmdb": true,
|
||||
"actors": [ "Matthew McConaughey", "Reese Witherspoon", "Seth MacFarlane", "Scarlett Johansson" ],
|
||||
"writers": [ "Garth Jennings" ],
|
||||
"runtime": 110,
|
||||
"type": "movie",
|
||||
"released": "21 Dec 2016"
|
||||
},
|
||||
"_t": "media",
|
||||
"releases": [],
|
||||
"title": "Sing",
|
||||
"_rev": "00031b86",
|
||||
"profile_id": "38699ec285c447bab0bc6267ffb2f3ad",
|
||||
"_id": "f12dc6bbff294daa85db0d839646442a",
|
||||
"category_id": null,
|
||||
"type": "movie",
|
||||
"files": { "image_poster": [ "C:\\Users\\devin\\AppData\\Roaming\\CouchPotato\\cache\\2ad327d73e8ef4deab7a4b564d3b9cb4.jpg" ] },
|
||||
"identifiers": { "imdb": "tt3470600" }
|
||||
},
|
||||
{
|
||||
"status": "active",
|
||||
"info": {
|
||||
"rating": { "imdb": [ 6.4, 10027 ] },
|
||||
"genres": [ "Action", "Horror" ],
|
||||
"tmdb_id": 346672,
|
||||
"plot": "Vampire death dealer Selene fends off brutal attacks from both the Lycan clan and the Vampire faction that betrayed her. With her only allies, David and his father Thomas, she must stop the eternal war between Lycans and Vampires, even if it means she has to make the ultimate sacrifice.",
|
||||
"tagline": "Protect the Bloodline",
|
||||
"release_date": {
|
||||
"dvd": 1493589600,
|
||||
"expires": 1485114954,
|
||||
"theater": 1483657200,
|
||||
"bluray": true
|
||||
},
|
||||
"year": 2016,
|
||||
"original_title": "Underworld: Blood Wars",
|
||||
"actor_roles": {
|
||||
"India Eisley": "Eve",
|
||||
"Kate Beckinsale": "Selene",
|
||||
"Oliver Stark": "Gregor",
|
||||
"Brian Caspe": "Hajna",
|
||||
"Charles Dance": "Thomas",
|
||||
"Alicia Vela-Bailey": "Safehouse Lycan",
|
||||
"Bradley James": "Varga",
|
||||
"David Bowles": "Grey Lycan",
|
||||
"Theo James": "David",
|
||||
"Lara Pulver": "Semira",
|
||||
"Eva Larvoire": "Tech Lycan",
|
||||
"Tobias Menzies": "Marius",
|
||||
"Daisy Head": "Alexia",
|
||||
"Trent Garrett": "Hybrid Michael"
|
||||
},
|
||||
"via_imdb": true,
|
||||
"images": {
|
||||
"disc_art": [],
|
||||
"poster": [ "https://images-na.ssl-images-amazon.com/images/M/MV5BMjI5Njk0NTIyNV5BMl5BanBnXkFtZTgwNjU4MjY5MDI@._V1_SX300.jpg" ],
|
||||
"backdrop": [ "https://image.tmdb.org/t/p/w1280/PIXSMakrO3s2dqA7mCvAAoVR0E.jpg" ],
|
||||
"extra_thumbs": [],
|
||||
"poster_original": [ "https://image.tmdb.org/t/p/original/nHXiMnWUAUba2LZ0dFkNDVdvJ1o.jpg" ],
|
||||
"actors": {
|
||||
"India Eisley": "https://image.tmdb.org/t/p/w185/njL744BT8mz9jf2TxcZDnSOEZFb.jpg",
|
||||
"Kate Beckinsale": "https://image.tmdb.org/t/p/w185/pTRtcZn9gWQZRiet36qWKh94urn.jpg",
|
||||
"Oliver Stark": "https://image.tmdb.org/t/p/w185/5yULYfaUMymZdSLhk2W96hZIQBP.jpg",
|
||||
"Brian Caspe": "https://image.tmdb.org/t/p/w185/1fDVsCwZOwp97Pdl7q743seHCMP.jpg",
|
||||
"Charles Dance": "https://image.tmdb.org/t/p/w185/bLT03rnI29YmbYWjA1JJCl4xVXw.jpg",
|
||||
"Alicia Vela-Bailey": "https://image.tmdb.org/t/p/w185/kVuyn6sS7ZSBlXVjjxq0LSE3k4I.jpg",
|
||||
"Bradley James": "https://image.tmdb.org/t/p/w185/4XAtJsz67pmpIsCQ9SBKfqayk2d.jpg",
|
||||
"Trent Garrett": "https://image.tmdb.org/t/p/w185/w9J2snV7QI71B5F7rCxfPqeS7GU.jpg",
|
||||
"Theo James": "https://image.tmdb.org/t/p/w185/hLNSoQ3gc52X5VVb172yO3CuUEq.jpg",
|
||||
"Eva Larvoire": "https://image.tmdb.org/t/p/w185/Aq96CWP3Pub2CdWSNbL5eaTwRt0.jpg",
|
||||
"Tobias Menzies": "https://image.tmdb.org/t/p/w185/bXUpxFsIowySRyyqchaE1XprptI.jpg",
|
||||
"Daisy Head": "https://image.tmdb.org/t/p/w185/33JAZTxDWj646mxdW1HksqHOsiY.jpg",
|
||||
"Lara Pulver": "https://image.tmdb.org/t/p/w185/ve68vtNYVXmKjzn81zKhI7TWEvy.jpg"
|
||||
},
|
||||
"backdrop_original": [ "https://image.tmdb.org/t/p/original/PIXSMakrO3s2dqA7mCvAAoVR0E.jpg" ],
|
||||
"clear_art": [],
|
||||
"logo": [],
|
||||
"banner": [],
|
||||
"landscape": [],
|
||||
"extra_fanart": []
|
||||
},
|
||||
"directors": [ "Anna Foerster" ],
|
||||
"titles": [ "Underworld: Blood Wars", "Inframundo: Guerras de Sangre", "Anjos da Noite: Guerras de Sangue", "Underworld Reboot", "Underworld: Next Generation", "決戰異世界:弒血之戰", "Інший світ 5: Кровна помста", "Інший світ 5", "Underworld 5 - Blood Wars" ],
|
||||
"imdb": "tt3717252",
|
||||
"mpaa": "R",
|
||||
"via_tmdb": true,
|
||||
"actors": [ "Kate Beckinsale", "Theo James", "Tobias Menzies", "Lara Pulver" ],
|
||||
"writers": [ "Cory Goodman (screenplay)", "Kyle Ward (story by)", "Cory Goodman (story by)", "Kevin Grevioux (based on characters created by)", "Len Wiseman (based on characters created by)", "Danny McBride (based on characters created by)" ],
|
||||
"runtime": 91,
|
||||
"type": "movie",
|
||||
"released": "06 Jan 2017"
|
||||
},
|
||||
"_t": "media",
|
||||
"releases": [],
|
||||
"title": "Underworld: Blood Wars",
|
||||
"_rev": "00037887",
|
||||
"profile_id": "38699ec285c447bab0bc6267ffb2f3ad",
|
||||
"_id": "4040237fdbd349629a51e29e8ff634f2",
|
||||
"category_id": null,
|
||||
"type": "movie",
|
||||
"files": { "image_poster": [ "C:\\Users\\devin\\AppData\\Roaming\\CouchPotato\\cache\\e41f29a177dd6756dce94f24148c81fe.jpg" ] },
|
||||
"identifiers": { "imdb": "tt3717252" }
|
||||
}
|
||||
],
|
||||
"total": 3,
|
||||
"empty": false,
|
||||
"success": true
|
||||
}
|
||||
1760
src/NzbDrone.Core.Test/Files/imdb_watchlist.xml
Normal file
1760
src/NzbDrone.Core.Test/Files/imdb_watchlist.xml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -45,6 +45,7 @@ namespace NzbDrone.Core.Test.IndexerTests
|
||||
return new IndexerResponse(new IndexerRequest(httpRequest), httpResponse);
|
||||
}
|
||||
|
||||
|
||||
[Test]
|
||||
public void should_handle_relative_url()
|
||||
{
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using FluentAssertions;
|
||||
using Moq;
|
||||
using NUnit.Framework;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Indexers;
|
||||
using NzbDrone.Core.NetImport;
|
||||
using NzbDrone.Core.NetImport.CouchPotato;
|
||||
using NzbDrone.Core.NetImport.RSSImport;
|
||||
using NzbDrone.Core.Test.Framework;
|
||||
|
||||
namespace NzbDrone.Core.Test.NetImport.CouchPotato
|
||||
{
|
||||
public class CouchPotatoTest : CoreTest<CouchPotatoParser>
|
||||
{
|
||||
private NetImportResponse CreateResponse(string url, string content)
|
||||
{
|
||||
var httpRequest = new HttpRequest(url);
|
||||
var httpResponse = new HttpResponse(httpRequest, new HttpHeader(), Encoding.UTF8.GetBytes(content));
|
||||
|
||||
return new NetImportResponse(new NetImportRequest(httpRequest), httpResponse);
|
||||
}
|
||||
|
||||
|
||||
[Test]
|
||||
public void should_parse_json_of_couchpotato()
|
||||
{
|
||||
var json = ReadAllText("Files/couchpotato_movie_list.json");
|
||||
|
||||
var result = Subject.ParseResponse(CreateResponse("http://my.indexer.com/api?q=My+Favourite+Show", json));
|
||||
|
||||
result.First().Title.Should().Be("Rogue One: A Star Wars Story");
|
||||
result.First().ImdbId.Should().Be("tt3748528");
|
||||
}
|
||||
}
|
||||
}
|
||||
45
src/NzbDrone.Core.Test/NetImport/RSSImportFixture.cs
Normal file
45
src/NzbDrone.Core.Test/NetImport/RSSImportFixture.cs
Normal file
@@ -0,0 +1,45 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using FizzWare.NBuilder;
|
||||
using FluentAssertions;
|
||||
using Moq;
|
||||
using NUnit.Framework;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Datastore;
|
||||
using NzbDrone.Core.NetImport;
|
||||
using NzbDrone.Core.NetImport.RSSImport;
|
||||
using NzbDrone.Core.Test.Framework;
|
||||
|
||||
namespace NzbDrone.Core.Test.NetImport
|
||||
{
|
||||
[TestFixture]
|
||||
public class RSSImportFixture : CoreTest<RSSImport>
|
||||
{
|
||||
|
||||
[SetUp]
|
||||
public void Setup()
|
||||
{
|
||||
Subject.Definition = Subject.DefaultDefinitions.First();
|
||||
}
|
||||
private void GivenRecentFeedResponse(string rssXmlFile)
|
||||
{
|
||||
var recentFeed = ReadAllText(@"Files/" + rssXmlFile);
|
||||
|
||||
Mocker.GetMock<IHttpClient>()
|
||||
.Setup(o => o.Execute(It.IsAny<HttpRequest>()))
|
||||
.Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void should_fetch_imdb_list()
|
||||
{
|
||||
GivenRecentFeedResponse("imdb_watchlist.xml");
|
||||
|
||||
var result = Subject.Fetch();
|
||||
|
||||
result.First().Title.Should().Be("Think Like a Man Too");
|
||||
result.First().ImdbId.Should().Be("tt2239832");
|
||||
}
|
||||
}
|
||||
}
|
||||
36
src/NzbDrone.Core.Test/NetImport/RSSImportParserFixture.cs
Normal file
36
src/NzbDrone.Core.Test/NetImport/RSSImportParserFixture.cs
Normal file
@@ -0,0 +1,36 @@
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using FluentAssertions;
|
||||
using Moq;
|
||||
using NUnit.Framework;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Indexers;
|
||||
using NzbDrone.Core.NetImport;
|
||||
using NzbDrone.Core.NetImport.RSSImport;
|
||||
using NzbDrone.Core.Test.Framework;
|
||||
|
||||
namespace NzbDrone.Core.Test.NetImport
|
||||
{
|
||||
public class RSSImportTest : CoreTest<RSSImportParser>
|
||||
{
|
||||
private NetImportResponse CreateResponse(string url, string content)
|
||||
{
|
||||
var httpRequest = new HttpRequest(url);
|
||||
var httpResponse = new HttpResponse(httpRequest, new HttpHeader(), Encoding.UTF8.GetBytes(content));
|
||||
|
||||
return new NetImportResponse(new NetImportRequest(httpRequest), httpResponse);
|
||||
}
|
||||
|
||||
|
||||
[Test]
|
||||
public void should_parse_xml_of_imdb()
|
||||
{
|
||||
var xml = ReadAllText("Files/imdb_watchlist.xml");
|
||||
|
||||
var result = Subject.ParseResponse(CreateResponse("http://my.indexer.com/api?q=My+Favourite+Show", xml));
|
||||
|
||||
result.First().Title.Should().Be("Think Like a Man Too");
|
||||
result.First().ImdbId.Should().Be("tt2239832");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -190,6 +190,9 @@
|
||||
<Compile Include="Download\Pending\PendingReleaseServiceTests\RemoveRejectedFixture.cs" />
|
||||
<Compile Include="Download\Pending\PendingReleaseServiceTests\RemoveGrabbedFixture.cs" />
|
||||
<Compile Include="Download\Pending\PendingReleaseServiceTests\AddFixture.cs" />
|
||||
<None Include="Files\couchpotato_movie_list.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Files\Indexers\Rarbg\RecentFeed_v1.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
@@ -284,6 +287,9 @@
|
||||
<Compile Include="MetadataSource\SkyHook\SkyHookProxySearchFixture.cs" />
|
||||
<Compile Include="MetadataSource\SearchSeriesComparerFixture.cs" />
|
||||
<Compile Include="MetadataSource\SkyHook\SkyHookProxyFixture.cs" />
|
||||
<Compile Include="NetImport\CouchPotato\CouchPotatoParserFixture.cs" />
|
||||
<Compile Include="NetImport\RSSImportFixture.cs" />
|
||||
<Compile Include="NetImport\RSSImportParserFixture.cs" />
|
||||
<Compile Include="NotificationTests\SynologyIndexerFixture.cs" />
|
||||
<Compile Include="OrganizerTests\FileNameBuilderTests\CleanTitleFixture.cs" />
|
||||
<Compile Include="OrganizerTests\FileNameBuilderTests\EpisodeTitleCollapseFixture.cs" />
|
||||
@@ -409,6 +415,9 @@
|
||||
<Link>sqlite3.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Files\imdb_watchlist.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="License.txt" />
|
||||
<None Include="Files\Indexers\BroadcastheNet\RecentFeed.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
|
||||
@@ -215,19 +215,19 @@ namespace NzbDrone.Core.Test.ParserTests
|
||||
ParseAndVerifyQuality(title, Quality.Bluray1080p, proper);
|
||||
}
|
||||
|
||||
[TestCase("POI S02E11 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
|
||||
[TestCase("How I Met Your Mother S01E18 Nothing Good Happens After 2 A.M. 720p HDTV DD5.1 MPEG2-TrollHD", false)]
|
||||
[TestCase("The Voice S01E11 The Finals 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
|
||||
[TestCase("Californication.S07E11.1080i.HDTV.DD5.1.MPEG2-NTb.ts", false)]
|
||||
[TestCase("Game of Thrones S04E10 1080i HDTV MPEG2 DD5.1-CtrlHD.ts", false)]
|
||||
[TestCase("VICE.S02E05.1080i.HDTV.DD2.0.MPEG2-NTb.ts", false)]
|
||||
[TestCase("Show - S03E01 - Episode Title Raw-HD.ts", false)]
|
||||
[TestCase("Saturday.Night.Live.Vintage.S10E09.Eddie.Murphy.The.Honeydrippers.1080i.UPSCALE.HDTV.DD5.1.MPEG2-zebra", false)]
|
||||
[TestCase("The.Colbert.Report.2011-08-04.1080i.HDTV.MPEG-2-CtrlHD", false)]
|
||||
public void should_parse_raw_quality(string title, bool proper)
|
||||
{
|
||||
ParseAndVerifyQuality(title, Quality.RAWHD, proper);
|
||||
}
|
||||
//[TestCase("POI S02E11 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
|
||||
//[TestCase("How I Met Your Mother S01E18 Nothing Good Happens After 2 A.M. 720p HDTV DD5.1 MPEG2-TrollHD", false)]
|
||||
//[TestCase("The Voice S01E11 The Finals 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
|
||||
//[TestCase("Californication.S07E11.1080i.HDTV.DD5.1.MPEG2-NTb.ts", false)]
|
||||
//[TestCase("Game of Thrones S04E10 1080i HDTV MPEG2 DD5.1-CtrlHD.ts", false)]
|
||||
//[TestCase("VICE.S02E05.1080i.HDTV.DD2.0.MPEG2-NTb.ts", false)]
|
||||
//[TestCase("Show - S03E01 - Episode Title Raw-HD.ts", false)]
|
||||
//[TestCase("Saturday.Night.Live.Vintage.S10E09.Eddie.Murphy.The.Honeydrippers.1080i.UPSCALE.HDTV.DD5.1.MPEG2-zebra", false)]
|
||||
//[TestCase("The.Colbert.Report.2011-08-04.1080i.HDTV.MPEG-2-CtrlHD", false)]
|
||||
//public void should_parse_raw_quality(string title, bool proper)
|
||||
//{
|
||||
// ParseAndVerifyQuality(title, Quality.RAWHD, proper);
|
||||
//}
|
||||
|
||||
[TestCase("Sonny.With.a.Chance.S02E15", false)]
|
||||
[TestCase("Law & Order: Special Victims Unit - 11x11 - Quickie", false)]
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace NzbDrone.Core.Test.Qualities
|
||||
new object[] {7, Quality.Bluray1080p},
|
||||
new object[] {8, Quality.WEBDL480p},
|
||||
new object[] {9, Quality.HDTV1080p},
|
||||
new object[] {10, Quality.RAWHD},
|
||||
//new object[] {10, Quality.RAWHD},
|
||||
new object[] {16, Quality.HDTV2160p},
|
||||
new object[] {18, Quality.WEBDL2160p},
|
||||
new object[] {19, Quality.Bluray2160p},
|
||||
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Test.Qualities
|
||||
new object[] {Quality.Bluray1080p, 7},
|
||||
new object[] {Quality.WEBDL480p, 8},
|
||||
new object[] {Quality.HDTV1080p, 9},
|
||||
new object[] {Quality.RAWHD, 10},
|
||||
//new object[] {Quality.RAWHD, 10},
|
||||
new object[] {Quality.HDTV2160p, 16},
|
||||
new object[] {Quality.WEBDL2160p, 18},
|
||||
new object[] {Quality.Bluray2160p, 19},
|
||||
@@ -65,20 +65,27 @@ namespace NzbDrone.Core.Test.Qualities
|
||||
{
|
||||
var qualities = new List<Quality>
|
||||
{
|
||||
Quality.Unknown,
|
||||
Quality.CAM,
|
||||
Quality.TELECINE,
|
||||
Quality.DVDSCR,
|
||||
Quality.REGIONAL,
|
||||
Quality.SDTV,
|
||||
Quality.WEBDL480p,
|
||||
Quality.DVD,
|
||||
Quality.DVDR,
|
||||
Quality.HDTV720p,
|
||||
Quality.HDTV1080p,
|
||||
Quality.HDTV2160p,
|
||||
Quality.RAWHD,
|
||||
Quality.WEBDL480p,
|
||||
Quality.WEBDL720p,
|
||||
Quality.WEBDL1080p,
|
||||
Quality.WEBDL2160p,
|
||||
Quality.Bluray480p,
|
||||
Quality.Bluray576p,
|
||||
Quality.Bluray720p,
|
||||
Quality.Bluray1080p,
|
||||
Quality.Bluray2160p,
|
||||
Quality.BRDISK,
|
||||
Quality.RAWHD
|
||||
};
|
||||
|
||||
if (allowed.Length == 0)
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests
|
||||
{
|
||||
new ProfileQualityItem { Allowed = true, Quality = Quality.SDTV },
|
||||
new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL480p },
|
||||
new ProfileQualityItem { Allowed = true, Quality = Quality.RAWHD }
|
||||
//new ProfileQualityItem { Allowed = true, Quality = Quality.RAWHD }
|
||||
}
|
||||
};
|
||||
|
||||
@@ -71,13 +71,13 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests
|
||||
|
||||
var qualityMet = new EpisodeFile { RelativePath = "a", Quality = new QualityModel { Quality = Quality.WEBDL480p } };
|
||||
var qualityUnmet = new EpisodeFile { RelativePath = "b", Quality = new QualityModel { Quality = Quality.SDTV } };
|
||||
var qualityRawHD = new EpisodeFile { RelativePath = "c", Quality = new QualityModel { Quality = Quality.RAWHD } };
|
||||
//var qualityRawHD = new EpisodeFile { RelativePath = "c", Quality = new QualityModel { Quality = Quality.RAWHD } };
|
||||
|
||||
MediaFileRepository fileRepository = Mocker.Resolve<MediaFileRepository>();
|
||||
|
||||
qualityMet = fileRepository.Insert(qualityMet);
|
||||
qualityUnmet = fileRepository.Insert(qualityUnmet);
|
||||
qualityRawHD = fileRepository.Insert(qualityRawHD);
|
||||
//qualityRawHD = fileRepository.Insert(qualityRawHD);
|
||||
|
||||
var monitoredSeriesEpisodes = Builder<Episode>.CreateListOfSize(4)
|
||||
.All()
|
||||
@@ -90,8 +90,8 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests
|
||||
.With(e => e.Monitored = false)
|
||||
.With(e => e.EpisodeFileId = qualityMet.Id)
|
||||
.TheNext(1)
|
||||
.With(e => e.EpisodeFileId = qualityRawHD.Id)
|
||||
.TheLast(1)
|
||||
//.With(e => e.EpisodeFileId = qualityRawHD.Id)
|
||||
//.TheLast(1)
|
||||
.With(e => e.SeasonNumber = 0)
|
||||
.Build();
|
||||
|
||||
|
||||
@@ -100,11 +100,18 @@ namespace NzbDrone.Core.Configuration
|
||||
|
||||
public int RssSyncInterval
|
||||
{
|
||||
get { return GetValueInt("RssSyncInterval", 15); }
|
||||
get { return GetValueInt("RssSyncInterval", 60); }
|
||||
|
||||
set { SetValue("RssSyncInterval", value); }
|
||||
}
|
||||
|
||||
public int NetImportSyncInterval
|
||||
{
|
||||
get { return GetValueInt("NetImportSyncInterval", 60); }
|
||||
|
||||
set { SetValue("NetImportSyncInterval", value); }
|
||||
}
|
||||
|
||||
public int MinimumAge
|
||||
{
|
||||
get { return GetValueInt("MinimumAge", 0); }
|
||||
@@ -169,7 +176,7 @@ namespace NzbDrone.Core.Configuration
|
||||
|
||||
public int DownloadedEpisodesScanInterval
|
||||
{
|
||||
get { return GetValueInt("DownloadedEpisodesScanInterval", 1); }
|
||||
get { return GetValueInt("DownloadedEpisodesScanInterval", 0); }
|
||||
|
||||
set { SetValue("DownloadedEpisodesScanInterval", value); }
|
||||
}
|
||||
|
||||
@@ -46,6 +46,8 @@ namespace NzbDrone.Core.Configuration
|
||||
int RssSyncInterval { get; set; }
|
||||
int MinimumAge { get; set; }
|
||||
|
||||
int NetImportSyncInterval { get; set; }
|
||||
|
||||
//UI
|
||||
int FirstDayOfWeek { get; set; }
|
||||
string CalendarWeekColumnHeader { get; set; }
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
using FluentMigrator;
|
||||
using FluentMigrator.Expressions;
|
||||
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||
|
||||
namespace NzbDrone.Core.Datastore.Migration
|
||||
{
|
||||
[Migration(123)]
|
||||
public class create_netimport_table : NzbDroneMigrationBase
|
||||
{
|
||||
protected override void MainDbUpgrade()
|
||||
{
|
||||
if (!this.Schema.Schema("dbo").Table("NetImport").Exists())
|
||||
{
|
||||
Create.TableForModel("NetImport")
|
||||
.WithColumn("Enabled").AsBoolean()
|
||||
.WithColumn("Name").AsString().Unique()
|
||||
.WithColumn("Implementation").AsString()
|
||||
.WithColumn("ConfigContract").AsString().Nullable()
|
||||
.WithColumn("Settings").AsString().Nullable()
|
||||
.WithColumn("EnableAuto").AsInt32()
|
||||
.WithColumn("RootFolderPath").AsString()
|
||||
.WithColumn("ShouldMonitor").AsInt32()
|
||||
.WithColumn("ProfileId").AsInt32();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using FluentMigrator;
|
||||
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||
using System.Data;
|
||||
|
||||
namespace NzbDrone.Core.Datastore.Migration
|
||||
{
|
||||
[Migration(124)]
|
||||
public class add_preferred_tags_to_profile : NzbDroneMigrationBase
|
||||
{
|
||||
protected override void MainDbUpgrade()
|
||||
{
|
||||
Alter.Table("Profiles").AddColumn("PreferredTags").AsString().Nullable();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
31
src/NzbDrone.Core/Datastore/Migration/125_fix_imdb_unique.cs
Normal file
31
src/NzbDrone.Core/Datastore/Migration/125_fix_imdb_unique.cs
Normal file
@@ -0,0 +1,31 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using FluentMigrator;
|
||||
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||
using System.Data;
|
||||
|
||||
namespace NzbDrone.Core.Datastore.Migration
|
||||
{
|
||||
[Migration(125)]
|
||||
public class fix_imdb_unique : NzbDroneMigrationBase
|
||||
{
|
||||
protected override void MainDbUpgrade()
|
||||
{
|
||||
Execute.WithConnection(DeleteUniqueIndex);
|
||||
}
|
||||
|
||||
private void DeleteUniqueIndex(IDbConnection conn, IDbTransaction tran)
|
||||
{
|
||||
using (IDbCommand getSeriesCmd = conn.CreateCommand())
|
||||
{
|
||||
getSeriesCmd.Transaction = tran;
|
||||
getSeriesCmd.CommandText = @"DROP INDEX 'IX_Movies_ImdbId'";
|
||||
|
||||
getSeriesCmd.ExecuteNonQuery();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
using System.Data;
|
||||
using FluentMigrator;
|
||||
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||
|
||||
namespace NzbDrone.Core.Datastore.Migration
|
||||
{
|
||||
[Migration(126)]
|
||||
public class update_qualities_and_profiles : NzbDroneMigrationBase
|
||||
{
|
||||
protected override void MainDbUpgrade()
|
||||
{
|
||||
Execute.WithConnection(ConvertProfile);
|
||||
}
|
||||
|
||||
private void ConvertProfile(IDbConnection conn, IDbTransaction tran)
|
||||
{
|
||||
var updater = new ProfileUpdater70(conn, tran);
|
||||
updater.SplitQualityAppend(0, 27); // TELECINE AFTER Unknown
|
||||
updater.SplitQualityAppend(0, 26); // TELESYNC AFTER Unknown
|
||||
updater.SplitQualityAppend(0, 25); // CAM AFTER Unknown
|
||||
updater.SplitQualityAppend(0, 24); // WORKPRINT AFTER Unknown
|
||||
|
||||
updater.SplitQualityPrepend(2, 23); // DVDR BEFORE DVD
|
||||
updater.SplitQualityPrepend(2, 28); // DVDSCR BEFORE DVD
|
||||
updater.SplitQualityPrepend(2, 29); // REGIONAL BEFORE DVD
|
||||
|
||||
updater.SplitQualityAppend(2, 21); // Bluray576p AFTER SDTV
|
||||
updater.SplitQualityAppend(2, 20); // Bluray480p AFTER SDTV
|
||||
|
||||
updater.AppendQuality(22);
|
||||
|
||||
updater.Commit();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -34,6 +34,7 @@ using NzbDrone.Core.Extras.Metadata.Files;
|
||||
using NzbDrone.Core.Extras.Others;
|
||||
using NzbDrone.Core.Extras.Subtitles;
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
using NzbDrone.Core.NetImport;
|
||||
|
||||
namespace NzbDrone.Core.Datastore
|
||||
{
|
||||
@@ -55,6 +56,11 @@ namespace NzbDrone.Core.Datastore
|
||||
.Ignore(i => i.SupportsRss)
|
||||
.Ignore(i => i.SupportsSearch);
|
||||
|
||||
Mapper.Entity<NetImportDefinition>().RegisterDefinition("NetImport")
|
||||
.Ignore(i => i.Enable)
|
||||
.Relationship()
|
||||
.HasOne(n => n.Profile, n => n.ProfileId);
|
||||
|
||||
Mapper.Entity<NotificationDefinition>().RegisterDefinition("Notifications")
|
||||
.Ignore(i => i.SupportsOnGrab)
|
||||
.Ignore(i => i.SupportsOnDownload)
|
||||
|
||||
@@ -23,6 +23,7 @@ namespace NzbDrone.Core.DecisionEngine
|
||||
var comparers = new List<CompareDelegate>
|
||||
{
|
||||
CompareQuality,
|
||||
ComparePreferredWords,
|
||||
CompareProtocol,
|
||||
ComparePeersIfTorrent,
|
||||
CompareAgeIfUsenet,
|
||||
@@ -65,6 +66,26 @@ namespace NzbDrone.Core.DecisionEngine
|
||||
CompareBy(x.RemoteEpisode, y.RemoteEpisode, remoteEpisode => remoteEpisode.ParsedEpisodeInfo.Quality.Revision.Version));
|
||||
}
|
||||
|
||||
private int ComparePreferredWords(DownloadDecision x, DownloadDecision y)
|
||||
{
|
||||
return CompareBy(x.RemoteMovie, y.RemoteMovie, remoteMovie =>
|
||||
{
|
||||
var title = remoteMovie.Release.Title;
|
||||
remoteMovie.Movie.Profile.LazyLoad();
|
||||
var preferredWords = remoteMovie.Movie.Profile.Value.PreferredTags;
|
||||
|
||||
if (preferredWords == null)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
var num = preferredWords.AsEnumerable().Count(w => title.ToLower().Contains(w.ToLower()));
|
||||
|
||||
return num;
|
||||
|
||||
});
|
||||
; }
|
||||
|
||||
private int CompareProtocol(DownloadDecision x, DownloadDecision y)
|
||||
{
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
|
||||
return Decision.Accept();
|
||||
}
|
||||
|
||||
public Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
|
||||
public virtual Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
|
||||
{
|
||||
if (subject.Movie.MovieFile.Value != null)
|
||||
{
|
||||
|
||||
@@ -39,7 +39,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
|
||||
var profile = subject.Movie.Profile.Value;
|
||||
var delayProfile = _delayProfileService.BestForTags(subject.Movie.Tags);
|
||||
var delay = delayProfile.GetProtocolDelay(subject.Release.DownloadProtocol);
|
||||
var isPreferredProtocol = subject.Release.DownloadProtocol == delayProfile.PreferredProtocol;
|
||||
var isPreferredProtocol = subject.Release.DownloadProtocol == delayProfile.PreferredProtocol;
|
||||
|
||||
// Preferred word count
|
||||
var title = subject.Release.Title;
|
||||
var preferredWords = subject.Movie.Profile.Value.PreferredTags;
|
||||
var preferredCount = preferredWords.AsEnumerable().Count(w => title.ToLower().Contains(w.ToLower()));
|
||||
|
||||
|
||||
if (delay == 0)
|
||||
{
|
||||
@@ -49,7 +55,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
|
||||
|
||||
var comparer = new QualityModelComparer(profile);
|
||||
|
||||
if (isPreferredProtocol)
|
||||
if (isPreferredProtocol && (subject.Movie.MovieFileId != 0) && (preferredCount > 0 || preferredWords == null))
|
||||
{
|
||||
var upgradable = _qualityUpgradableSpecification.IsUpgradable(profile, subject.Movie.MovieFile.Value.Quality, subject.ParsedMovieInfo.Quality);
|
||||
|
||||
@@ -59,7 +65,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
|
||||
|
||||
if (revisionUpgrade)
|
||||
{
|
||||
_logger.Debug("New quality is a better revision for existing quality, skipping delay");
|
||||
_logger.Debug("New quality is a better revision for existing quality and preferred word count is {0}, skipping delay", preferredCount);
|
||||
return Decision.Accept();
|
||||
}
|
||||
}
|
||||
@@ -68,11 +74,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
|
||||
|
||||
// If quality meets or exceeds the best allowed quality in the profile accept it immediately
|
||||
var bestQualityInProfile = new QualityModel(profile.LastAllowedQuality());
|
||||
var isBestInProfile = comparer.Compare(subject.ParsedEpisodeInfo.Quality, bestQualityInProfile) >= 0;
|
||||
var isBestInProfile = comparer.Compare(subject.ParsedMovieInfo.Quality, bestQualityInProfile) >= 0;
|
||||
|
||||
if (isBestInProfile && isPreferredProtocol)
|
||||
if (isBestInProfile && isPreferredProtocol && (preferredCount > 0 || preferredWords == null))
|
||||
{
|
||||
_logger.Debug("Quality is highest in profile for preferred protocol, will not delay");
|
||||
_logger.Debug("Quality is highest in profile for preferred protocol and preferred word count is {0}, will not delay.", preferredCount);
|
||||
return Decision.Accept();
|
||||
}
|
||||
|
||||
@@ -82,13 +88,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
|
||||
if (oldest != null && oldest.Release.AgeMinutes > delay)
|
||||
{
|
||||
return Decision.Accept();
|
||||
}
|
||||
}*/
|
||||
|
||||
if (subject.Release.AgeMinutes < delay)
|
||||
{
|
||||
_logger.Debug("Waiting for better quality release, There is a {0} minute delay on {1}", delay, subject.Release.DownloadProtocol);
|
||||
return Decision.Reject("Waiting for better quality release");
|
||||
}*/ //TODO: Update for movies!
|
||||
} //TODO: Update for movies!
|
||||
|
||||
return Decision.Accept();
|
||||
}
|
||||
|
||||
@@ -19,7 +19,21 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
|
||||
|
||||
public Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
if (searchCriteria != null)
|
||||
{
|
||||
if (searchCriteria.UserInvokedSearch)
|
||||
{
|
||||
_logger.Debug("Skipping monitored check during search");
|
||||
return Decision.Accept();
|
||||
}
|
||||
}
|
||||
|
||||
if (!subject.Movie.Monitored)
|
||||
{
|
||||
return Decision.Reject("Movie is not monitored");
|
||||
}
|
||||
|
||||
return Decision.Accept();
|
||||
}
|
||||
|
||||
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
|
||||
public DelugeSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Host).ValidHost();
|
||||
RuleFor(c => c.Port).GreaterThan(0);
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
|
||||
RuleFor(c => c.MovieCategory).Matches("^[-a-z]*$").WithMessage("Allowed characters a-z and -");
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
|
||||
public HadoukenSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Host).ValidHost();
|
||||
RuleFor(c => c.Port).GreaterThan(0);
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
|
||||
RuleFor(c => c.Username).NotEmpty()
|
||||
.WithMessage("Username must not be empty.");
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
|
||||
public NzbVortexSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Host).ValidHost();
|
||||
RuleFor(c => c.Port).GreaterThan(0);
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
|
||||
RuleFor(c => c.ApiKey).NotEmpty()
|
||||
.WithMessage("API Key is required");
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
|
||||
public NzbgetSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Host).ValidHost();
|
||||
RuleFor(c => c.Port).GreaterThan(0);
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
RuleFor(c => c.Username).NotEmpty().When(c => !string.IsNullOrWhiteSpace(c.Password));
|
||||
RuleFor(c => c.Password).NotEmpty().When(c => !string.IsNullOrWhiteSpace(c.Username));
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
|
||||
public QBittorrentSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Host).ValidHost();
|
||||
RuleFor(c => c.Port).InclusiveBetween(0, 65535);
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
|
||||
public SabnzbdSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Host).ValidHost();
|
||||
RuleFor(c => c.Port).GreaterThan(0);
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
|
||||
RuleFor(c => c.ApiKey).NotEmpty()
|
||||
.WithMessage("API Key is required when username/password are not configured")
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
|
||||
public TransmissionSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Host).ValidHost();
|
||||
RuleFor(c => c.Port).GreaterThan(0);
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
|
||||
RuleFor(c => c.UrlBase).ValidUrlBase();
|
||||
|
||||
|
||||
@@ -10,10 +10,10 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
|
||||
public RTorrentSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Host).ValidHost();
|
||||
RuleFor(c => c.Port).InclusiveBetween(0, 65535);
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
RuleFor(c => c.MovieCategory).NotEmpty()
|
||||
.WithMessage("A category is recommended")
|
||||
.AsWarning();
|
||||
.AsWarning();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
|
||||
public UTorrentSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Host).ValidHost();
|
||||
RuleFor(c => c.Port).InclusiveBetween(0, 65535);
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
RuleFor(c => c.TvCategory).NotEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Download
|
||||
public ProcessedDecisions ProcessDecisions(List<DownloadDecision> decisions)
|
||||
{
|
||||
//var qualifiedReports = GetQualifiedReports(decisions);
|
||||
var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions);
|
||||
var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisionsForMovies(decisions);
|
||||
var grabbed = new List<DownloadDecision>();
|
||||
var pending = new List<DownloadDecision>();
|
||||
|
||||
|
||||
@@ -102,13 +102,13 @@ namespace NzbDrone.Core.Extras
|
||||
|
||||
public void Handle(MediaCoversUpdatedEvent message)
|
||||
{
|
||||
var series = message.Series;
|
||||
var episodeFiles = GetEpisodeFiles(series.Id);
|
||||
//var series = message.Series;
|
||||
//var episodeFiles = GetEpisodeFiles(series.Id);
|
||||
|
||||
foreach (var extraFileManager in _extraFileManagers)
|
||||
{
|
||||
extraFileManager.CreateAfterSeriesScan(series, episodeFiles);
|
||||
}
|
||||
//foreach (var extraFileManager in _extraFileManagers)
|
||||
//{
|
||||
// extraFileManager.CreateAfterSeriesScan(series, episodeFiles);
|
||||
//}
|
||||
}
|
||||
|
||||
//TODO: Implementing this will fix a lot of our warning exceptions
|
||||
|
||||
@@ -54,13 +54,19 @@ namespace NzbDrone.Core.Indexers.AwesomeHD
|
||||
|
||||
private IEnumerable<IndexerRequest> GetRequest(string searchParameters)
|
||||
{
|
||||
var onlyInternal = "";
|
||||
if (Settings.Internal)
|
||||
{
|
||||
onlyInternal = "&internal=true";
|
||||
}
|
||||
|
||||
if (searchParameters != null)
|
||||
{
|
||||
yield return new IndexerRequest(string.Format("{0}/searchapi.php?action=imdbsearch&passkey={1}&imdb={2}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.Passkey.Trim(), searchParameters), HttpAccept.Rss);
|
||||
yield return new IndexerRequest($"{Settings.BaseUrl.Trim().TrimEnd('/')}/searchapi.php?action=imdbsearch&passkey={Settings.Passkey.Trim()}&imdb={searchParameters}", HttpAccept.Rss);
|
||||
}
|
||||
else
|
||||
{
|
||||
yield return new IndexerRequest(string.Format("{0}/searchapi.php?action=latestmovies&passkey={1}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.Passkey.Trim()), HttpAccept.Rss);
|
||||
yield return new IndexerRequest($"{Settings.BaseUrl.Trim().TrimEnd('/')}/searchapi.php?action=latestmovies&passkey={Settings.Passkey.Trim()}{onlyInternal}", HttpAccept.Rss);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -29,6 +29,9 @@ namespace NzbDrone.Core.Indexers.AwesomeHD
|
||||
[FieldDefinition(1, Label = "Passkey")]
|
||||
public string Passkey { get; set; }
|
||||
|
||||
[FieldDefinition(2, Type = FieldType.Checkbox, Label = "Require Internal", HelpText = "Will only include internal releases for RSS Sync.")]
|
||||
public bool Internal { get; set; }
|
||||
|
||||
public NzbDroneValidationResult Validate()
|
||||
{
|
||||
return new NzbDroneValidationResult(Validator.Validate(this));
|
||||
|
||||
@@ -27,4 +27,4 @@ namespace NzbDrone.Core.Indexers.HDBits
|
||||
return new HDBitsParser(Settings);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -129,4 +129,4 @@ namespace NzbDrone.Core.Indexers.HDBits
|
||||
ImdbImportFail = 8,
|
||||
ImdbTvNotAllowed = 9
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -87,4 +87,4 @@ namespace NzbDrone.Core.Indexers.HDBits
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NzbDrone.Common.Http;
|
||||
@@ -45,17 +44,34 @@ namespace NzbDrone.Core.Indexers.HDBits
|
||||
return new IndexerPageableRequestChain();
|
||||
}
|
||||
|
||||
public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
|
||||
public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
|
||||
{
|
||||
|
||||
var pageableRequests = new IndexerPageableRequestChain();
|
||||
var queryBase = new TorrentQuery();
|
||||
var query = queryBase.Clone();
|
||||
query.ImdbInfo.Id = int.Parse(searchCriteria.Movie.ImdbId.Substring(2));
|
||||
pageableRequests.Add(GetRequest(query));
|
||||
|
||||
if (TryAddSearchParameters(queryBase, searchCriteria))
|
||||
{
|
||||
var query = queryBase.Clone();
|
||||
query.ImdbInfo.Id = int.Parse(searchCriteria.Movie.ImdbId.Substring(2));
|
||||
pageableRequests.Add(GetRequest(query));
|
||||
}
|
||||
|
||||
return pageableRequests;
|
||||
}
|
||||
|
||||
private bool TryAddSearchParameters(TorrentQuery query, SearchCriteriaBase searchCriteria)
|
||||
{
|
||||
var imdbId = int.Parse(searchCriteria.Movie.ImdbId.Substring(2));
|
||||
|
||||
if (imdbId != 0)
|
||||
{
|
||||
query.ImdbInfo = query.ImdbInfo ?? new ImdbInfo();
|
||||
query.ImdbInfo.Id = imdbId;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private IEnumerable<IndexerRequest> GetRequest(TorrentQuery query)
|
||||
{
|
||||
var request = new HttpRequestBuilder(Settings.BaseUrl)
|
||||
@@ -75,4 +91,4 @@ namespace NzbDrone.Core.Indexers.HDBits
|
||||
yield return new IndexerRequest(request);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -306,6 +306,8 @@ namespace NzbDrone.Core.Indexers
|
||||
request.HttpRequest.RateLimit = RateLimit;
|
||||
}
|
||||
|
||||
request.HttpRequest.AllowAutoRedirect = true;
|
||||
|
||||
return new IndexerResponse(request, _httpClient.Execute(request.HttpRequest));
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
using NLog;
|
||||
using NzbDrone.Common.Cache;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Parser;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace NzbDrone.Core.Indexers.PassThePopcorn
|
||||
{
|
||||
@@ -13,13 +15,28 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
|
||||
public override bool SupportsSearch => true;
|
||||
public override int PageSize => 50;
|
||||
|
||||
public PassThePopcorn(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
private readonly ICached<Dictionary<string, string>> _authCookieCache;
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly Logger _logger;
|
||||
|
||||
public PassThePopcorn(IHttpClient httpClient, ICacheManager cacheManager, IIndexerStatusService indexerStatusService,
|
||||
IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
: base(httpClient, indexerStatusService, configService, parsingService, logger)
|
||||
{ }
|
||||
{
|
||||
_httpClient = httpClient;
|
||||
_logger = logger;
|
||||
_authCookieCache = cacheManager.GetCache<Dictionary<string, string>>(GetType(), "authCookies");
|
||||
}
|
||||
|
||||
public override IIndexerRequestGenerator GetRequestGenerator()
|
||||
{
|
||||
return new PassThePopcornRequestGenerator() { Settings = Settings };
|
||||
return new PassThePopcornRequestGenerator()
|
||||
{
|
||||
Settings = Settings,
|
||||
HttpClient = _httpClient,
|
||||
Logger = _logger,
|
||||
AuthCookieCache = _authCookieCache
|
||||
};
|
||||
}
|
||||
|
||||
public override IParseIndexerResponse GetParser()
|
||||
|
||||
@@ -56,4 +56,12 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
|
||||
public string PassKey { get; set; }
|
||||
}
|
||||
|
||||
public class PassThePopcornAuthResponse
|
||||
{
|
||||
public string Result { get; set; }
|
||||
public string Popcron { get; set; }
|
||||
public string AntiCsrfToken { get; set; }
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,16 +1,30 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Common.Serializer;
|
||||
using NzbDrone.Core.IndexerSearch.Definitions;
|
||||
using NzbDrone.Common.Cache;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Serializer;
|
||||
|
||||
namespace NzbDrone.Core.Indexers.PassThePopcorn
|
||||
{
|
||||
public class PassThePopcornRequestGenerator : IIndexerRequestGenerator
|
||||
{
|
||||
|
||||
public PassThePopcornSettings Settings { get; set; }
|
||||
|
||||
public ICached<Dictionary<string, string>> AuthCookieCache { get; set; }
|
||||
public IHttpClient HttpClient { get; set; }
|
||||
public Logger Logger { get; set; }
|
||||
|
||||
//public PassThePopcornRequestGenerator(ICacheManager cacheManager, IHttpClient httpClient, Logger logger)
|
||||
//{
|
||||
// _httpClient = httpClient;
|
||||
// _logger = logger;
|
||||
|
||||
// _authCookieCache = cacheManager.GetCache<Dictionary<string, string>>(GetType(), "authCookies");
|
||||
//}
|
||||
|
||||
public virtual IndexerPageableRequestChain GetRecentRequests()
|
||||
{
|
||||
var pageableRequests = new IndexerPageableRequestChain();
|
||||
@@ -54,14 +68,70 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
|
||||
|
||||
private IEnumerable<IndexerRequest> GetRequest(string searchParameters)
|
||||
{
|
||||
var request = new IndexerRequest(string.Format("{0}/torrents.php?json=noredirect&searchstr={1}", Settings.BaseUrl.Trim().TrimEnd('/'), searchParameters), HttpAccept.Json);
|
||||
Authenticate();
|
||||
|
||||
foreach (var cookie in HttpHeader.ParseCookies(Settings.Cookie))
|
||||
var request =
|
||||
new IndexerRequest(
|
||||
$"{Settings.BaseUrl.Trim().TrimEnd('/')}/torrents.php?json=noredirect&searchstr={searchParameters}",
|
||||
HttpAccept.Json);
|
||||
|
||||
var cookies = AuthCookieCache.Find(Settings.BaseUrl.Trim().TrimEnd('/'));
|
||||
foreach (var cookie in cookies)
|
||||
{
|
||||
request.HttpRequest.Cookies[cookie.Key] = cookie.Value;
|
||||
}
|
||||
|
||||
yield return request;
|
||||
}
|
||||
|
||||
private void Authenticate()
|
||||
{
|
||||
var requestBuilder = new HttpRequestBuilder($"{Settings.BaseUrl.Trim().TrimEnd('/')}")
|
||||
{
|
||||
LogResponseContent = true
|
||||
};
|
||||
|
||||
requestBuilder.Method = HttpMethod.POST;
|
||||
requestBuilder.Resource("ajax.php?action=login");
|
||||
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
|
||||
|
||||
var authKey = Settings.BaseUrl.Trim().TrimEnd('/');
|
||||
var cookies = AuthCookieCache.Find(authKey);
|
||||
|
||||
if (cookies == null)
|
||||
{
|
||||
AuthCookieCache.Remove(authKey);
|
||||
var authLoginRequest = requestBuilder
|
||||
.AddFormParameter("username", Settings.Username)
|
||||
.AddFormParameter("password", Settings.Password)
|
||||
.AddFormParameter("passkey", Settings.Passkey)
|
||||
.AddFormParameter("keeplogged", "1")
|
||||
.AddFormParameter("login", "Log In!")
|
||||
.SetHeader("Content-Type", "multipart/form-data")
|
||||
.Accept(HttpAccept.Json)
|
||||
.Build();
|
||||
|
||||
// authLoginRequest.Method = HttpMethod.POST;
|
||||
|
||||
var response = HttpClient.Execute(authLoginRequest);
|
||||
var result = Json.Deserialize<PassThePopcornAuthResponse>(response.Content);
|
||||
|
||||
if (result.Result != "Ok" || string.IsNullOrWhiteSpace(result.Result))
|
||||
{
|
||||
Logger.Debug("PassThePopcorn authentication failed.");
|
||||
throw new Exception("Failed to authenticate with PassThePopcorn.");
|
||||
}
|
||||
|
||||
Logger.Debug("PassThePopcorn authentication succeeded.");
|
||||
|
||||
cookies = response.GetCookies();
|
||||
AuthCookieCache.Set(authKey, cookies);
|
||||
requestBuilder.SetCookies(cookies);
|
||||
}
|
||||
else
|
||||
{
|
||||
requestBuilder.SetCookies(cookies);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,12 +11,9 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
|
||||
public PassThePopcornSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.BaseUrl).ValidRootUrl();
|
||||
RuleFor(c => c.Cookie).NotEmpty();
|
||||
|
||||
RuleFor(c => c.Cookie)
|
||||
.Matches(@"__cfduid=[0-9a-f]{43}", RegexOptions.IgnoreCase)
|
||||
.WithMessage("Wrong pattern")
|
||||
.AsWarning();
|
||||
RuleFor(c => c.Username).NotEmpty();
|
||||
RuleFor(c => c.Password).NotEmpty();
|
||||
RuleFor(c => c.Passkey).NotEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,21 +26,30 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
|
||||
BaseUrl = "https://passthepopcorn.me";
|
||||
}
|
||||
|
||||
[FieldDefinition(0, Label = "API URL", Advanced = true, HelpText = "Do not change this unless you know what you're doing. Since your cookie will be sent to that host.")]
|
||||
[FieldDefinition(0, Label = "URL", Advanced = true, HelpText = "Do not change this unless you know what you're doing. Since your cookie will be sent to that host.")]
|
||||
public string BaseUrl { get; set; }
|
||||
|
||||
[FieldDefinition(1, Label = "Cookie", HelpText = "PassThePopcorn uses a login cookie needed to access the API, you'll have to retrieve it via a browser.")]
|
||||
public string Cookie { get; set; }
|
||||
[FieldDefinition(1, Label = "Username", HelpText = "PTP Username")]
|
||||
public string Username { get; set; }
|
||||
|
||||
[FieldDefinition(2, Type = FieldType.Checkbox, Label = "Prefer Golden", HelpText = "Favors Golden Popcorn-releases over all other releases.")]
|
||||
[FieldDefinition(2, Label = "Password", Type = FieldType.Password, HelpText = "PTP Password")]
|
||||
public string Password { get; set; }
|
||||
|
||||
[FieldDefinition(3, Label = "Passkey", HelpText = "PTP Passkey")]
|
||||
public string Passkey { get; set; }
|
||||
|
||||
[FieldDefinition(4, Label = "Prefer Golden", Type = FieldType.Checkbox , HelpText = "Favors Golden Popcorn-releases over all other releases.")]
|
||||
public bool Golden { get; set; }
|
||||
|
||||
[FieldDefinition(3, Type = FieldType.Checkbox, Label = "Prefer Scene", HelpText = "Favors scene-releases over non-scene releases.")]
|
||||
[FieldDefinition(5, Label = "Prefer Scene", Type = FieldType.Checkbox, HelpText = "Favors scene-releases over non-scene releases.")]
|
||||
public bool Scene { get; set; }
|
||||
|
||||
[FieldDefinition(4, Type = FieldType.Checkbox, Label = "Require Approved", HelpText = "Require staff-approval for releases to be accepted.")]
|
||||
[FieldDefinition(6, Label = "Require Approved", Type = FieldType.Checkbox, HelpText = "Require staff-approval for releases to be accepted.")]
|
||||
public bool Approved { get; set; }
|
||||
|
||||
[FieldDefinition(7, Label = "Require Golden", Type = FieldType.Checkbox, HelpText = "Require Golden Popcorn-releases for releases to be accepted.")]
|
||||
public bool RequireGolden { get; set; }
|
||||
|
||||
public NzbDroneValidationResult Validate()
|
||||
{
|
||||
return new NzbDroneValidationResult(Validator.Validate(this));
|
||||
|
||||
@@ -14,6 +14,7 @@ using NzbDrone.Core.Lifecycle;
|
||||
using NzbDrone.Core.MediaFiles.Commands;
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
using NzbDrone.Core.Messaging.Events;
|
||||
using NzbDrone.Core.NetImport;
|
||||
using NzbDrone.Core.Tv.Commands;
|
||||
using NzbDrone.Core.Update.Commands;
|
||||
|
||||
@@ -85,6 +86,12 @@ namespace NzbDrone.Core.Jobs
|
||||
TypeName = typeof(RssSyncCommand).FullName
|
||||
},
|
||||
|
||||
new ScheduledTask
|
||||
{
|
||||
Interval = GetNetImportSyncInterval(),
|
||||
TypeName = typeof(NetImportSyncCommand).FullName
|
||||
},
|
||||
|
||||
new ScheduledTask
|
||||
{
|
||||
Interval = _configService.DownloadedEpisodesScanInterval,
|
||||
@@ -138,6 +145,23 @@ namespace NzbDrone.Core.Jobs
|
||||
return interval;
|
||||
}
|
||||
|
||||
private int GetNetImportSyncInterval()
|
||||
{
|
||||
var interval = _configService.NetImportSyncInterval;
|
||||
|
||||
if (interval > 0 && interval < 10)
|
||||
{
|
||||
return 10;
|
||||
}
|
||||
|
||||
if (interval < 0)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return interval;
|
||||
}
|
||||
|
||||
public void Handle(CommandExecutedEvent message)
|
||||
{
|
||||
var scheduledTask = _scheduledTaskRepository.All().SingleOrDefault(c => c.TypeName == message.Command.Body.GetType().FullName);
|
||||
@@ -157,7 +181,10 @@ namespace NzbDrone.Core.Jobs
|
||||
var downloadedEpisodes = _scheduledTaskRepository.GetDefinition(typeof(DownloadedEpisodesScanCommand));
|
||||
downloadedEpisodes.Interval = _configService.DownloadedEpisodesScanInterval;
|
||||
|
||||
_scheduledTaskRepository.UpdateMany(new List<ScheduledTask> { rss, downloadedEpisodes });
|
||||
var netImport = _scheduledTaskRepository.GetDefinition(typeof(NetImportSyncCommand));
|
||||
netImport.Interval = _configService.NetImportSyncInterval;
|
||||
|
||||
_scheduledTaskRepository.UpdateMany(new List<ScheduledTask> { rss, downloadedEpisodes, netImport });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,11 +46,18 @@ namespace NzbDrone.Core.MediaCover
|
||||
{
|
||||
try
|
||||
{
|
||||
GdiPlusInterop.CheckGdiPlus();
|
||||
|
||||
using (var bmp = new Bitmap(filename))
|
||||
{
|
||||
}
|
||||
return true;
|
||||
}
|
||||
catch (DllNotFoundException ex)
|
||||
{
|
||||
_logger.Error(ex, "Could not find libgdiplus. Cannot test if image is corrupt.");
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Debug(ex, "Corrupted image found at: {0}. Redownloading...", filename);
|
||||
|
||||
@@ -153,7 +153,12 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
|
||||
|
||||
private int GetMinimumAllowedRuntime(Movie movie)
|
||||
{
|
||||
return 360; //6 minutes
|
||||
if (movie.Runtime < 1)
|
||||
{
|
||||
return 5 * 60;
|
||||
}
|
||||
|
||||
return movie.Runtime / 5 * 60;
|
||||
}
|
||||
|
||||
private int GetMinimumAllowedRuntime(Series series)
|
||||
|
||||
@@ -128,7 +128,48 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
|
||||
var current = localMovie.Quality;
|
||||
var qualityName = current.Quality.Name.ToLower();
|
||||
QualityModel updated = null;
|
||||
if (width > 1400)
|
||||
if (width > 2000)
|
||||
{
|
||||
if (qualityName.Contains("bluray"))
|
||||
{
|
||||
updated = new QualityModel(Quality.Bluray2160p);
|
||||
}
|
||||
|
||||
else if (qualityName.Contains("webdl"))
|
||||
{
|
||||
updated = new QualityModel(Quality.WEBDL2160p);
|
||||
}
|
||||
|
||||
else if (qualityName.Contains("hdtv"))
|
||||
{
|
||||
updated = new QualityModel(Quality.HDTV2160p);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
var def = _qualitiesService.Get(Quality.HDTV2160p);
|
||||
if (localMovie.Size > def.MinSize && def.MaxSize > localMovie.Size)
|
||||
{
|
||||
updated = new QualityModel(Quality.HDTV2160p);
|
||||
}
|
||||
def = _qualitiesService.Get(Quality.WEBDL2160p);
|
||||
if (localMovie.Size > def.MinSize && def.MaxSize > localMovie.Size)
|
||||
{
|
||||
updated = new QualityModel(Quality.WEBDL2160p);
|
||||
}
|
||||
def = _qualitiesService.Get(Quality.Bluray2160p);
|
||||
if (localMovie.Size > def.MinSize && def.MaxSize > localMovie.Size)
|
||||
{
|
||||
updated = new QualityModel(Quality.Bluray2160p);
|
||||
}
|
||||
if (updated == null)
|
||||
{
|
||||
updated = new QualityModel(Quality.Bluray2160p);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else if (width > 1400)
|
||||
{
|
||||
if (qualityName.Contains("bluray"))
|
||||
{
|
||||
@@ -147,7 +188,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
|
||||
|
||||
else
|
||||
{
|
||||
|
||||
var def = _qualitiesService.Get(Quality.HDTV1080p);
|
||||
if (localMovie.Size > def.MinSize && def.MaxSize > localMovie.Size)
|
||||
{
|
||||
|
||||
@@ -33,7 +33,8 @@ namespace NzbDrone.Core.MediaFiles
|
||||
//List<MovieFile> Get(IEnumerable<int> ids);
|
||||
}
|
||||
|
||||
public class MediaFileService : IMediaFileService, IHandleAsync<SeriesDeletedEvent>
|
||||
public class MediaFileService : IMediaFileService, IHandleAsync<SeriesDeletedEvent>,
|
||||
IHandleAsync<MovieDeletedEvent>
|
||||
{
|
||||
private readonly IEventAggregator _eventAggregator;
|
||||
private readonly IMediaFileRepository _mediaFileRepository;
|
||||
@@ -155,5 +156,14 @@ namespace NzbDrone.Core.MediaFiles
|
||||
{
|
||||
return _movieFileRepository.Get(id);
|
||||
}
|
||||
}
|
||||
|
||||
public void HandleAsync(MovieDeletedEvent message)
|
||||
{
|
||||
if (message.DeleteFiles == true)
|
||||
{
|
||||
var files = GetFilesByMovie(message.Movie.Id);
|
||||
_movieFileRepository.DeleteMany(files);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using Newtonsoft.Json;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Core.Datastore;
|
||||
@@ -49,7 +50,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
|
||||
}
|
||||
|
||||
return
|
||||
AudioChannelPositions.Replace(" / ", "$")
|
||||
AudioChannelPositions.Replace("Object Based /", "").Replace(" / ", "$")
|
||||
.Split('$')
|
||||
.First()
|
||||
.Split('/')
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.MediaFiles
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Warn("The existing movie file was not lazy loaded.");
|
||||
//_logger.Warn("The existing movie file was not lazy loaded.");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using NzbDrone.Core.Profiles;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Core.MetadataSource
|
||||
@@ -7,6 +8,6 @@ namespace NzbDrone.Core.MetadataSource
|
||||
public interface IProvideMovieInfo
|
||||
{
|
||||
Movie GetMovieInfo(string ImdbId);
|
||||
Movie GetMovieInfo(int TmdbId);
|
||||
Movie GetMovieInfo(int TmdbId, Profile profile);
|
||||
}
|
||||
}
|
||||
@@ -6,5 +6,7 @@ namespace NzbDrone.Core.MetadataSource
|
||||
public interface ISearchForNewMovie
|
||||
{
|
||||
List<Movie> SearchForNewMovie(string title);
|
||||
|
||||
Movie MapMovieToTmdbMovie(Movie movie);
|
||||
}
|
||||
}
|
||||
@@ -42,6 +42,8 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
|
||||
public bool adult { get; set; }
|
||||
public string backdrop_path { get; set; }
|
||||
public Belongs_To_Collection belongs_to_collection { get; set; }
|
||||
public int? status_code { get; set; }
|
||||
public string status_message { get; set; }
|
||||
public int budget { get; set; }
|
||||
public Genre[] genres { get; set; }
|
||||
public string homepage { get; set; }
|
||||
|
||||
@@ -14,6 +14,8 @@ using NzbDrone.Core.Tv;
|
||||
using Newtonsoft.Json;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Text;
|
||||
using NzbDrone.Core.Parser;
|
||||
using NzbDrone.Core.Profiles;
|
||||
|
||||
namespace NzbDrone.Core.MetadataSource.SkyHook
|
||||
{
|
||||
@@ -67,24 +69,55 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
|
||||
return new Tuple<Series, List<Episode>>(series, episodes.ToList());
|
||||
}
|
||||
|
||||
public Movie GetMovieInfo(int TmdbId)
|
||||
public Movie GetMovieInfo(int TmdbId, Profile profile = null)
|
||||
{
|
||||
var langCode = profile != null ? IsoLanguages.Get(profile.Language).TwoLetterCode : "us";
|
||||
|
||||
var request = _movieBuilder.Create()
|
||||
.SetSegment("route", "movie")
|
||||
.SetSegment("id", TmdbId.ToString())
|
||||
.SetSegment("secondaryRoute", "")
|
||||
.AddQueryParam("append_to_response", "alternative_titles,release_dates,videos")
|
||||
.AddQueryParam("country", "US")
|
||||
.AddQueryParam("language", langCode.ToUpper())
|
||||
// .AddQueryParam("country", "US")
|
||||
.Build();
|
||||
|
||||
request.AllowAutoRedirect = true;
|
||||
request.SuppressHttpError = true;
|
||||
|
||||
var response = _httpClient.Get<MovieResourceRoot>(request);
|
||||
|
||||
var resource = response.Resource;
|
||||
|
||||
var movie = new Movie();
|
||||
if (resource.status_message != null)
|
||||
{
|
||||
if (resource.status_code == 34)
|
||||
{
|
||||
_logger.Warn("Movie with TmdbId {0} could not be found. This is probably the case when the movie was deleted from TMDB.", TmdbId);
|
||||
return null;
|
||||
}
|
||||
|
||||
_logger.Warn(resource.status_message);
|
||||
return null;
|
||||
}
|
||||
|
||||
var movie = new Movie();
|
||||
|
||||
if (langCode != "us")
|
||||
{
|
||||
movie.AlternativeTitles.Add(resource.original_title);
|
||||
}
|
||||
|
||||
foreach (var alternativeTitle in resource.alternative_titles.titles)
|
||||
{
|
||||
if (alternativeTitle.iso_3166_1.ToLower() == langCode)
|
||||
{
|
||||
movie.AlternativeTitles.Add(alternativeTitle.title);
|
||||
}
|
||||
else if (alternativeTitle.iso_3166_1.ToLower() == "us")
|
||||
{
|
||||
movie.AlternativeTitles.Add(alternativeTitle.title);
|
||||
}
|
||||
}
|
||||
|
||||
movie.TmdbId = TmdbId;
|
||||
movie.ImdbId = resource.imdb_id;
|
||||
@@ -106,10 +139,10 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
|
||||
movie.Images.Add(_configService.GetCoverForURL(resource.backdrop_path, MediaCoverTypes.Banner));
|
||||
movie.Runtime = resource.runtime;
|
||||
|
||||
foreach(Title title in resource.alternative_titles.titles)
|
||||
{
|
||||
movie.AlternativeTitles.Add(title.title);
|
||||
}
|
||||
//foreach(Title title in resource.alternative_titles.titles)
|
||||
//{
|
||||
// movie.AlternativeTitles.Add(title.title);
|
||||
//}
|
||||
|
||||
foreach(ReleaseDates releaseDates in resource.release_dates.results)
|
||||
{
|
||||
@@ -149,7 +182,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
|
||||
{
|
||||
movie.Status = MovieStatusType.Announced;
|
||||
}
|
||||
|
||||
|
||||
if (resource.videos != null)
|
||||
{
|
||||
foreach (Video video in resource.videos.results)
|
||||
@@ -561,5 +594,40 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
public Movie MapMovieToTmdbMovie(Movie movie)
|
||||
{
|
||||
Movie newMovie = movie;
|
||||
if (movie.TmdbId > 0)
|
||||
{
|
||||
newMovie = GetMovieInfo(movie.TmdbId);
|
||||
}
|
||||
else if (movie.ImdbId.IsNotNullOrWhiteSpace())
|
||||
{
|
||||
newMovie = GetMovieInfo(movie.ImdbId);
|
||||
}
|
||||
else
|
||||
{
|
||||
var yearStr = "";
|
||||
if (movie.Year > 1900)
|
||||
{
|
||||
yearStr = $" {movie.Year}";
|
||||
}
|
||||
newMovie = SearchForNewMovie(movie.Title + yearStr).FirstOrDefault();
|
||||
}
|
||||
|
||||
if (newMovie == null)
|
||||
{
|
||||
_logger.Warn("Couldn't map movie {0} to a movie on The Movie DB. It will not be added :(", movie.Title);
|
||||
return null;
|
||||
}
|
||||
|
||||
newMovie.Path = movie.Path;
|
||||
newMovie.RootFolderPath = movie.RootFolderPath;
|
||||
newMovie.ProfileId = movie.ProfileId;
|
||||
newMovie.Monitored = movie.Monitored;
|
||||
|
||||
return newMovie;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
91
src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoAPI.cs
Normal file
91
src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoAPI.cs
Normal file
@@ -0,0 +1,91 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Windows.Forms;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.CouchPotato
|
||||
{
|
||||
public class CouchPotatoResponse
|
||||
{
|
||||
public Movie[] movies { get; set; }
|
||||
public int total { get; set; }
|
||||
public bool empty { get; set; }
|
||||
public bool success { get; set; }
|
||||
}
|
||||
|
||||
public class Movie
|
||||
{
|
||||
public string status { get; set; }
|
||||
public Info info { get; set; }
|
||||
public string _t { get; set; }
|
||||
public List<Release> releases { get; set; }
|
||||
public string title { get; set; }
|
||||
public string _rev { get; set; }
|
||||
public string profile_id { get; set; }
|
||||
public string _id { get; set; }
|
||||
public object category_id { get; set; }
|
||||
public string type { get; set; }
|
||||
}
|
||||
|
||||
public class Info
|
||||
{
|
||||
public string[] genres { get; set; }
|
||||
public int? tmdb_id { get; set; }
|
||||
public string plot { get; set; }
|
||||
public string tagline { get; set; }
|
||||
public int? year { get; set; }
|
||||
public string original_title { get; set; }
|
||||
public bool? via_imdb { get; set; }
|
||||
public string[] directors { get; set; }
|
||||
public string[] titles { get; set; }
|
||||
public string imdb { get; set; }
|
||||
public string mpaa { get; set; }
|
||||
public bool? via_tmdb { get; set; }
|
||||
public string[] actors { get; set; }
|
||||
public string[] writers { get; set; }
|
||||
public int? runtime { get; set; }
|
||||
public string type { get; set; }
|
||||
public string released { get; set; }
|
||||
}
|
||||
|
||||
public class ReleaseInfo
|
||||
{
|
||||
public double? size { get; set; }
|
||||
public int? seeders { get; set; }
|
||||
public string protocol { get; set; }
|
||||
public string description { get; set; }
|
||||
public string url { get; set; }
|
||||
public int? age { get; set; }
|
||||
public string id { get; set; }
|
||||
public int? leechers { get; set; }
|
||||
public int? score { get; set; }
|
||||
public string provider { get; set; }
|
||||
public int? seed_time { get; set; }
|
||||
public string provider_extra { get; set; }
|
||||
public string detail_url { get; set; }
|
||||
public string type { get; set; }
|
||||
public double? seed_ratio { get; set; }
|
||||
public string name { get; set; }
|
||||
}
|
||||
|
||||
public class DownloadInfo
|
||||
{
|
||||
public bool? status_support { get; set; }
|
||||
public string id { get; set; }
|
||||
public string downloader { get; set; }
|
||||
}
|
||||
|
||||
public class Release
|
||||
{
|
||||
public string status { get; set; }
|
||||
public ReleaseInfo info { get; set; }
|
||||
public DownloadInfo download_info { get; set; }
|
||||
public string _id { get; set; }
|
||||
public string media_id { get; set; }
|
||||
public string _rev { get; set; }
|
||||
public string _t { get; set; }
|
||||
public bool? is_3d { get; set; }
|
||||
public int? last_edit { get; set; }
|
||||
public string identifier { get; set; }
|
||||
public string quality { get; set; }
|
||||
}
|
||||
}
|
||||
54
src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs
Normal file
54
src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs
Normal file
@@ -0,0 +1,54 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Xml.Serialization;
|
||||
using FluentValidation.Results;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Indexers;
|
||||
using NzbDrone.Core.Indexers.PassThePopcorn;
|
||||
using NzbDrone.Core.Parser;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.CouchPotato
|
||||
{
|
||||
public class CouchPotatoImport : HttpNetImportBase<CouchPotatoSettings>
|
||||
{
|
||||
public override string Name => "CouchPotato";
|
||||
public override bool Enabled => true;
|
||||
public override bool EnableAuto => false;
|
||||
|
||||
public CouchPotatoImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
: base(httpClient, configService, parsingService, logger)
|
||||
{ }
|
||||
|
||||
/*public new virtual IEnumerable<ProviderDefinition> DefaultDefinitions
|
||||
{
|
||||
get
|
||||
{
|
||||
var config = (CouchPotatoSettings)new CouchPotatoSettings();
|
||||
config.Link = "http://localhost";
|
||||
config.Port = "5050";
|
||||
|
||||
yield return new NetImportDefinition
|
||||
{
|
||||
Name = "Localhost",
|
||||
Enabled = config.Validate().IsValid && Enabled,
|
||||
Implementation = GetType().Name,
|
||||
Settings = config
|
||||
};
|
||||
}
|
||||
}*/
|
||||
|
||||
public override INetImportRequestGenerator GetRequestGenerator()
|
||||
{
|
||||
return new CouchPotatoRequestGenerator() { Settings = Settings };
|
||||
}
|
||||
|
||||
public override IParseNetImportResponse GetParser()
|
||||
{
|
||||
return new CouchPotatoParser(Settings);
|
||||
}
|
||||
}
|
||||
}
|
||||
109
src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs
Normal file
109
src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs
Normal file
@@ -0,0 +1,109 @@
|
||||
using Newtonsoft.Json;
|
||||
using NzbDrone.Core.NetImport.Exceptions;
|
||||
using NzbDrone.Core.Tv;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Windows.Forms;
|
||||
using System.Xml;
|
||||
using System.Xml.Linq;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Indexers;
|
||||
using NzbDrone.Core.Indexers.Exceptions;
|
||||
using NzbDrone.Core.Parser.Model;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.CouchPotato
|
||||
{
|
||||
public class CouchPotatoParser : IParseNetImportResponse
|
||||
{
|
||||
private readonly CouchPotatoSettings _settings;
|
||||
private NetImportResponse _importResponse;
|
||||
private readonly Logger _logger;
|
||||
|
||||
private static readonly Regex ReplaceEntities = new Regex("&[a-z]+;", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
|
||||
public CouchPotatoParser(CouchPotatoSettings settings)
|
||||
{
|
||||
_settings = settings;
|
||||
}
|
||||
|
||||
public IList<Tv.Movie> ParseResponse(NetImportResponse importResponse)
|
||||
{
|
||||
_importResponse = importResponse;
|
||||
|
||||
var movies = new List<Tv.Movie>();
|
||||
|
||||
if (!PreProcess(_importResponse))
|
||||
{
|
||||
return movies;
|
||||
}
|
||||
|
||||
var jsonResponse = JsonConvert.DeserializeObject<CouchPotatoResponse>(_importResponse.Content);
|
||||
|
||||
// no movies were return
|
||||
if (jsonResponse.total == 0)
|
||||
{
|
||||
return movies;
|
||||
}
|
||||
|
||||
var responseData = jsonResponse.movies;
|
||||
|
||||
foreach (var item in responseData)
|
||||
{
|
||||
int tmdbid = item.info.tmdb_id ?? 0;
|
||||
|
||||
// if there are no releases at all the movie wasn't found on CP, so return movies
|
||||
if (!item.releases.Any() && item.type == "movie")
|
||||
{
|
||||
movies.AddIfNotNull(new Tv.Movie()
|
||||
{
|
||||
Title = item.title,
|
||||
ImdbId = item.info.imdb,
|
||||
TmdbId = tmdbid
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
// snatched,missing,available,downloaded
|
||||
// done,seeding
|
||||
bool isCompleted = item.releases.Any(rel => (rel.status == "done" || rel.status == "seeding"));
|
||||
if (!isCompleted)
|
||||
{
|
||||
movies.AddIfNotNull(new Tv.Movie()
|
||||
{
|
||||
Title = item.title,
|
||||
ImdbId = item.info.imdb,
|
||||
TmdbId = tmdbid,
|
||||
Monitored = false
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return movies;
|
||||
}
|
||||
|
||||
protected virtual bool PreProcess(NetImportResponse indexerResponse)
|
||||
{
|
||||
if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
|
||||
{
|
||||
throw new NetImportException(indexerResponse, "Indexer API call resulted in an unexpected StatusCode [{0}]", indexerResponse.HttpResponse.StatusCode);
|
||||
}
|
||||
|
||||
if (indexerResponse.HttpResponse.Headers.ContentType != null && indexerResponse.HttpResponse.Headers.ContentType.Contains("text/json") &&
|
||||
indexerResponse.HttpRequest.Headers.Accept != null && !indexerResponse.HttpRequest.Headers.Accept.Contains("text/json"))
|
||||
{
|
||||
throw new NetImportException(indexerResponse, "Indexer responded with html content. Site is likely blocked or unavailable.");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
using NzbDrone.Common.Http;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.CouchPotato
|
||||
{
|
||||
public class CouchPotatoRequestGenerator : INetImportRequestGenerator
|
||||
{
|
||||
public CouchPotatoSettings Settings { get; set; }
|
||||
|
||||
public virtual NetImportPageableRequestChain GetMovies()
|
||||
{
|
||||
var pageableRequests = new NetImportPageableRequestChain();
|
||||
|
||||
pageableRequests.Add(GetMovies(null));
|
||||
|
||||
return pageableRequests;
|
||||
}
|
||||
|
||||
private IEnumerable<NetImportRequest> GetMovies(string searchParameters)
|
||||
{
|
||||
var urlBase = "";
|
||||
if (!string.IsNullOrWhiteSpace(Settings.UrlBase))
|
||||
{
|
||||
urlBase = Settings.UrlBase.StartsWith("/") ? Settings.UrlBase : $"/{Settings.UrlBase}";
|
||||
}
|
||||
|
||||
var status = "";
|
||||
|
||||
if (Settings.OnlyActive)
|
||||
{
|
||||
status = "?status=active";
|
||||
}
|
||||
|
||||
var request = new NetImportRequest($"{Settings.Link.Trim()}:{Settings.Port}{urlBase}/api/{Settings.ApiKey}/movie.list/{status}", HttpAccept.Json);
|
||||
yield return request;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
using FluentValidation;
|
||||
using NzbDrone.Core.Annotations;
|
||||
using NzbDrone.Core.Profiles;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Validation;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.CouchPotato
|
||||
{
|
||||
|
||||
public class CouchPotatoSettingsValidator : AbstractValidator<CouchPotatoSettings>
|
||||
{
|
||||
public CouchPotatoSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Link).ValidRootUrl();
|
||||
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
|
||||
RuleFor(c => c.ApiKey).NotEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
public class CouchPotatoSettings : NetImportBaseSettings
|
||||
{
|
||||
public CouchPotatoSettings()
|
||||
{
|
||||
Link = "http://localhost";
|
||||
Port = 5050;
|
||||
UrlBase = "";
|
||||
OnlyActive = true;
|
||||
}
|
||||
|
||||
[FieldDefinition(0, Label = "CouchPotato URL", HelpText = "Link to your CoouchPootato.")]
|
||||
public new string Link { get; set; }
|
||||
|
||||
[FieldDefinition(1, Label = "CouchPotato Port", HelpText = "Port your CoouchPootato uses.")]
|
||||
public int Port { get; set; }
|
||||
|
||||
[FieldDefinition(2, Label = "CouchPotato Url Base",
|
||||
HelpText = "UrlBase your CoouchPootato uses, leave blank for none")]
|
||||
public string UrlBase { get; set; }
|
||||
|
||||
[FieldDefinition(3, Label = "CouchPotato API Key", HelpText = "CoouchPootato API Key.")]
|
||||
public string ApiKey { get; set; }
|
||||
|
||||
[FieldDefinition(4, Label = "Only Wanted", HelpText = "Only add wanted movies.", Type = FieldType.Checkbox)]
|
||||
public bool OnlyActive { get; set; }
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
23
src/NzbDrone.Core/NetImport/Exceptions/NetImportException.cs
Normal file
23
src/NzbDrone.Core/NetImport/Exceptions/NetImportException.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
using NzbDrone.Common.Exceptions;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.Exceptions
|
||||
{
|
||||
public class NetImportException : NzbDroneException
|
||||
{
|
||||
private readonly NetImportResponse _netImportResponse;
|
||||
|
||||
public NetImportException(NetImportResponse response, string message, params object[] args)
|
||||
: base(message, args)
|
||||
{
|
||||
_netImportResponse = response;
|
||||
}
|
||||
|
||||
public NetImportException(NetImportResponse response, string message)
|
||||
: base(message)
|
||||
{
|
||||
_netImportResponse = response;
|
||||
}
|
||||
|
||||
public NetImportResponse Response => _netImportResponse;
|
||||
}
|
||||
}
|
||||
303
src/NzbDrone.Core/NetImport/HttpNetImportBase.cs
Normal file
303
src/NzbDrone.Core/NetImport/HttpNetImportBase.cs
Normal file
@@ -0,0 +1,303 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using FluentValidation.Results;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Http.CloudFlare;
|
||||
using NzbDrone.Core.Indexers.Exceptions;
|
||||
using NzbDrone.Core.IndexerSearch.Definitions;
|
||||
using NzbDrone.Core.NetImport.Exceptions;
|
||||
using NzbDrone.Core.Parser;
|
||||
using NzbDrone.Core.Parser.Model;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public abstract class HttpNetImportBase<TSettings> : NetImportBase<TSettings>
|
||||
where TSettings : IProviderConfig, new()
|
||||
{
|
||||
protected const int MaxNumResultsPerQuery = 1000;
|
||||
|
||||
protected readonly IHttpClient _httpClient;
|
||||
|
||||
public override bool Enabled => true;
|
||||
|
||||
public bool SupportsPaging => PageSize > 0;
|
||||
|
||||
public virtual int PageSize => 0;
|
||||
|
||||
public virtual TimeSpan RateLimit => TimeSpan.FromSeconds(2);
|
||||
|
||||
public abstract INetImportRequestGenerator GetRequestGenerator();
|
||||
public abstract IParseNetImportResponse GetParser();
|
||||
|
||||
public HttpNetImportBase(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
: base(configService, parsingService, logger)
|
||||
{
|
||||
_httpClient = httpClient;
|
||||
}
|
||||
|
||||
public override IList<Movie> Fetch()
|
||||
{
|
||||
var generator = GetRequestGenerator();
|
||||
|
||||
return FetchMovies(generator.GetMovies());
|
||||
}
|
||||
|
||||
protected virtual IList<Movie> FetchMovies(NetImportPageableRequestChain pageableRequestChain, bool isRecent = false)
|
||||
{
|
||||
var movies = new List<Movie>();
|
||||
var url = string.Empty;
|
||||
|
||||
var parser = GetParser();
|
||||
|
||||
try
|
||||
{
|
||||
var fullyUpdated = false;
|
||||
Movie lastMovie = null;
|
||||
if (isRecent)
|
||||
{
|
||||
//lastReleaseInfo = _indexerStatusService.GetLastRssSyncReleaseInfo(Definition.Id);
|
||||
}
|
||||
|
||||
for (int i = 0; i < pageableRequestChain.Tiers; i++)
|
||||
{
|
||||
var pageableRequests = pageableRequestChain.GetTier(i);
|
||||
|
||||
foreach (var pageableRequest in pageableRequests)
|
||||
{
|
||||
var pagedReleases = new List<Movie>();
|
||||
|
||||
foreach (var request in pageableRequest)
|
||||
{
|
||||
url = request.Url.FullUri;
|
||||
|
||||
var page = FetchPage(request, parser);
|
||||
|
||||
pagedReleases.AddRange(page);
|
||||
|
||||
if (isRecent && page.Any())
|
||||
{
|
||||
if (lastMovie == null)
|
||||
{
|
||||
fullyUpdated = true;
|
||||
break;
|
||||
}/*
|
||||
var oldestReleaseDate = page.Select(v => v.PublishDate).Min();
|
||||
if (oldestReleaseDate < lastReleaseInfo.PublishDate || page.Any(v => v.DownloadUrl == lastReleaseInfo.DownloadUrl))
|
||||
{
|
||||
fullyUpdated = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if (pagedReleases.Count >= MaxNumResultsPerQuery &&
|
||||
oldestReleaseDate < DateTime.UtcNow - TimeSpan.FromHours(24))
|
||||
{
|
||||
fullyUpdated = false;
|
||||
break;
|
||||
}*///update later
|
||||
}
|
||||
else if (pagedReleases.Count >= MaxNumResultsPerQuery)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (!IsFullPage(page))
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
movies.AddRange(pagedReleases);
|
||||
}
|
||||
|
||||
if (movies.Any())
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (isRecent && !movies.Empty())
|
||||
{
|
||||
var ordered = movies.OrderByDescending(v => v.Title).ToList();
|
||||
|
||||
lastMovie = ordered.First();
|
||||
//_indexerStatusService.UpdateRssSyncStatus(Definition.Id, lastReleaseInfo);
|
||||
}
|
||||
|
||||
//_indexerStatusService.RecordSuccess(Definition.Id);
|
||||
}
|
||||
catch (WebException webException)
|
||||
{
|
||||
if (webException.Status == WebExceptionStatus.NameResolutionFailure ||
|
||||
webException.Status == WebExceptionStatus.ConnectFailure)
|
||||
{
|
||||
//_indexerStatusService.RecordConnectionFailure(Definition.Id);
|
||||
}
|
||||
else
|
||||
{
|
||||
//_indexerStatusService.RecordFailure(Definition.Id);
|
||||
}
|
||||
|
||||
if (webException.Message.Contains("502") || webException.Message.Contains("503") ||
|
||||
webException.Message.Contains("timed out"))
|
||||
{
|
||||
_logger.Warn("{0} server is currently unavailable. {1} {2}", this, url, webException.Message);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Warn("{0} {1} {2}", this, url, webException.Message);
|
||||
}
|
||||
}
|
||||
catch (HttpException httpException)
|
||||
{
|
||||
if ((int)httpException.Response.StatusCode == 429)
|
||||
{
|
||||
//_indexerStatusService.RecordFailure(Definition.Id, TimeSpan.FromHours(1));
|
||||
_logger.Warn("API Request Limit reached for {0}", this);
|
||||
}
|
||||
else
|
||||
{
|
||||
//_indexerStatusService.RecordFailure(Definition.Id);
|
||||
_logger.Warn("{0} {1}", this, httpException.Message);
|
||||
}
|
||||
}
|
||||
catch (RequestLimitReachedException)
|
||||
{
|
||||
//_indexerStatusService.RecordFailure(Definition.Id, TimeSpan.FromHours(1));
|
||||
_logger.Warn("API Request Limit reached for {0}", this);
|
||||
}
|
||||
catch (ApiKeyException)
|
||||
{
|
||||
//_indexerStatusService.RecordFailure(Definition.Id);
|
||||
_logger.Warn("Invalid API Key for {0} {1}", this, url);
|
||||
}
|
||||
catch (CloudFlareCaptchaException ex)
|
||||
{
|
||||
//_indexerStatusService.RecordFailure(Definition.Id);
|
||||
if (ex.IsExpired)
|
||||
{
|
||||
_logger.Error(ex, "Expired CAPTCHA token for {0}, please refresh in indexer settings.", this);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Error(ex, "CAPTCHA token required for {0}, check indexer settings.", this);
|
||||
}
|
||||
}
|
||||
catch (IndexerException ex)
|
||||
{
|
||||
//_indexerStatusService.RecordFailure(Definition.Id);
|
||||
var message = string.Format("{0} - {1}", ex.Message, url);
|
||||
_logger.Warn(ex, message);
|
||||
}
|
||||
catch (Exception feedEx)
|
||||
{
|
||||
//_indexerStatusService.RecordFailure(Definition.Id);
|
||||
feedEx.Data.Add("FeedUrl", url);
|
||||
_logger.Error(feedEx, "An error occurred while processing feed. " + url);
|
||||
}
|
||||
|
||||
return movies;
|
||||
}
|
||||
|
||||
protected virtual bool IsFullPage(IList<Movie> page)
|
||||
{
|
||||
return PageSize != 0 && page.Count >= PageSize;
|
||||
}
|
||||
|
||||
protected virtual IList<Movie> FetchPage(NetImportRequest request, IParseNetImportResponse parser)
|
||||
{
|
||||
var response = FetchIndexerResponse(request);
|
||||
|
||||
return parser.ParseResponse(response).ToList().Select(m =>
|
||||
{
|
||||
m.RootFolderPath = ((NetImportDefinition) Definition).RootFolderPath;
|
||||
m.ProfileId = ((NetImportDefinition) Definition).ProfileId;
|
||||
m.Monitored = ((NetImportDefinition) Definition).ShouldMonitor;
|
||||
return m;
|
||||
}).ToList();
|
||||
}
|
||||
|
||||
protected virtual NetImportResponse FetchIndexerResponse(NetImportRequest request)
|
||||
{
|
||||
_logger.Debug("Downloading List " + request.HttpRequest.ToString(false));
|
||||
|
||||
if (request.HttpRequest.RateLimit < RateLimit)
|
||||
{
|
||||
request.HttpRequest.RateLimit = RateLimit;
|
||||
}
|
||||
|
||||
request.HttpRequest.AllowAutoRedirect = true;
|
||||
|
||||
return new NetImportResponse(request, _httpClient.Execute(request.HttpRequest));
|
||||
}
|
||||
|
||||
protected override void Test(List<ValidationFailure> failures)
|
||||
{
|
||||
failures.AddIfNotNull(TestConnection());
|
||||
}
|
||||
|
||||
protected virtual ValidationFailure TestConnection()
|
||||
{
|
||||
try
|
||||
{
|
||||
var parser = GetParser();
|
||||
var generator = GetRequestGenerator();
|
||||
var releases = FetchPage(generator.GetMovies().GetAllTiers().First().First(), parser);
|
||||
|
||||
if (releases.Empty())
|
||||
{
|
||||
return new ValidationFailure(string.Empty, "No results were returned from your list, please check your settings.");
|
||||
}
|
||||
}
|
||||
catch (ApiKeyException)
|
||||
{
|
||||
_logger.Warn("List returned result for RSS URL, API Key appears to be invalid");
|
||||
|
||||
return new ValidationFailure("ApiKey", "Invalid API Key");
|
||||
}
|
||||
catch (RequestLimitReachedException)
|
||||
{
|
||||
_logger.Warn("Request limit reached");
|
||||
}
|
||||
catch (CloudFlareCaptchaException ex)
|
||||
{
|
||||
if (ex.IsExpired)
|
||||
{
|
||||
return new ValidationFailure("CaptchaToken", "CloudFlare CAPTCHA token expired, please Refresh.");
|
||||
}
|
||||
else
|
||||
{
|
||||
return new ValidationFailure("CaptchaToken", "Site protected by CloudFlare CAPTCHA. Valid CAPTCHA token required.");
|
||||
}
|
||||
}
|
||||
catch (UnsupportedFeedException ex)
|
||||
{
|
||||
_logger.Warn(ex, "List feed is not supported");
|
||||
|
||||
return new ValidationFailure(string.Empty, "List feed is not supported: " + ex.Message);
|
||||
}
|
||||
catch (NetImportException ex)
|
||||
{
|
||||
_logger.Warn(ex, "Unable to connect to list");
|
||||
|
||||
return new ValidationFailure(string.Empty, "Unable to connect to indexer. " + ex.Message);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Warn(ex, "Unable to connect to list");
|
||||
|
||||
return new ValidationFailure(string.Empty, "Unable to connect to list, check the log for more details");
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
16
src/NzbDrone.Core/NetImport/INetImport.cs
Normal file
16
src/NzbDrone.Core/NetImport/INetImport.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
using System.Collections.Generic;
|
||||
using NzbDrone.Core.IndexerSearch.Definitions;
|
||||
using NzbDrone.Core.Parser.Model;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public interface INetImport : IProvider
|
||||
{
|
||||
bool Enabled { get; }
|
||||
bool EnableAuto { get; }
|
||||
|
||||
IList<Movie> Fetch();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
using NzbDrone.Core.IndexerSearch.Definitions;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public interface INetImportRequestGenerator
|
||||
{
|
||||
NetImportPageableRequestChain GetMovies();
|
||||
}
|
||||
}
|
||||
11
src/NzbDrone.Core/NetImport/IProcessNetImportResponse.cs
Normal file
11
src/NzbDrone.Core/NetImport/IProcessNetImportResponse.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using System.Collections.Generic;
|
||||
using NzbDrone.Core.Parser.Model;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public interface IParseNetImportResponse
|
||||
{
|
||||
IList<Movie> ParseResponse(NetImportResponse netMovieImporterResponse);
|
||||
}
|
||||
}
|
||||
90
src/NzbDrone.Core/NetImport/NetImportBase.cs
Normal file
90
src/NzbDrone.Core/NetImport/NetImportBase.cs
Normal file
@@ -0,0 +1,90 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using FluentValidation.Results;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.IndexerSearch.Definitions;
|
||||
using NzbDrone.Core.Parser;
|
||||
using NzbDrone.Core.Parser.Model;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public abstract class NetImportBase<TSettings> : INetImport
|
||||
where TSettings : IProviderConfig, new()
|
||||
{
|
||||
protected readonly IConfigService _configService;
|
||||
protected readonly IParsingService _parsingService;
|
||||
protected readonly Logger _logger;
|
||||
|
||||
public abstract string Name { get; }
|
||||
|
||||
public abstract bool Enabled { get; }
|
||||
public abstract bool EnableAuto { get; }
|
||||
|
||||
public NetImportBase(IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
{
|
||||
_configService = configService;
|
||||
_parsingService = parsingService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public Type ConfigContract => typeof(TSettings);
|
||||
|
||||
public virtual ProviderMessage Message => null;
|
||||
|
||||
public virtual IEnumerable<ProviderDefinition> DefaultDefinitions
|
||||
{
|
||||
get
|
||||
{
|
||||
var config = (IProviderConfig)new TSettings();
|
||||
|
||||
yield return new NetImportDefinition
|
||||
{
|
||||
Name = this.Name,
|
||||
Enabled = config.Validate().IsValid && Enabled,
|
||||
EnableAuto = true,
|
||||
ProfileId = 1,
|
||||
Implementation = GetType().Name,
|
||||
Settings = config
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public virtual ProviderDefinition Definition { get; set; }
|
||||
|
||||
public virtual object RequestAction(string action, IDictionary<string, string> query) { return null; }
|
||||
|
||||
protected TSettings Settings => (TSettings)Definition.Settings;
|
||||
|
||||
public abstract IList<Movie> Fetch();
|
||||
|
||||
public ValidationResult Test()
|
||||
{
|
||||
var failures = new List<ValidationFailure>();
|
||||
|
||||
try
|
||||
{
|
||||
Test(failures);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Error(ex, "Test aborted due to exception");
|
||||
failures.Add(new ValidationFailure(string.Empty, "Test was aborted due to an error: " + ex.Message));
|
||||
}
|
||||
|
||||
return new ValidationResult(failures);
|
||||
}
|
||||
|
||||
protected abstract void Test(List<ValidationFailure> failures);
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return Definition.Name;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
36
src/NzbDrone.Core/NetImport/NetImportBaseSettings.cs
Normal file
36
src/NzbDrone.Core/NetImport/NetImportBaseSettings.cs
Normal file
@@ -0,0 +1,36 @@
|
||||
using FluentValidation;
|
||||
using NzbDrone.Core.Annotations;
|
||||
using NzbDrone.Core.Profiles;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Validation;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public class NetImportBaseSettingsValidator : AbstractValidator<NetImportBaseSettings>
|
||||
{
|
||||
public NetImportBaseSettingsValidator()
|
||||
{
|
||||
RuleFor(c => c.Link).NotEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
public class NetImportBaseSettings : IProviderConfig
|
||||
{
|
||||
private static readonly NetImportBaseSettingsValidator Validator = new NetImportBaseSettingsValidator();
|
||||
|
||||
public NetImportBaseSettings()
|
||||
{
|
||||
Link = "http://rss.imdb.com/list/";
|
||||
}
|
||||
|
||||
[FieldDefinition(0, Label = "Link", HelpText = "Link to the list of movies.")]
|
||||
public string Link { get; set; }
|
||||
|
||||
public bool IsValid => !string.IsNullOrWhiteSpace(Link);
|
||||
|
||||
public NzbDroneValidationResult Validate()
|
||||
{
|
||||
return new NzbDroneValidationResult(Validator.Validate(this));
|
||||
}
|
||||
}
|
||||
}
|
||||
17
src/NzbDrone.Core/NetImport/NetImportDefinition.cs
Normal file
17
src/NzbDrone.Core/NetImport/NetImportDefinition.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using Marr.Data;
|
||||
using NzbDrone.Core.Profiles;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public class NetImportDefinition : ProviderDefinition
|
||||
{
|
||||
public bool Enabled { get; set; }
|
||||
public bool EnableAuto { get; set; }
|
||||
public bool ShouldMonitor { get; set; }
|
||||
public int ProfileId { get; set; }
|
||||
public LazyLoaded<Profile> Profile { get; set; }
|
||||
public string RootFolderPath { get; set; }
|
||||
public override bool Enable => Enabled;
|
||||
}
|
||||
}
|
||||
56
src/NzbDrone.Core/NetImport/NetImportFactory.cs
Normal file
56
src/NzbDrone.Core/NetImport/NetImportFactory.cs
Normal file
@@ -0,0 +1,56 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Composition;
|
||||
using NzbDrone.Core.Messaging.Events;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public interface INetImportFactory : IProviderFactory<INetImport, NetImportDefinition>
|
||||
{
|
||||
List<INetImport> Enabled();
|
||||
}
|
||||
|
||||
public class NetImportFactory : ProviderFactory<INetImport, NetImportDefinition>, INetImportFactory
|
||||
{
|
||||
private readonly INetImportRepository _providerRepository;
|
||||
private readonly Logger _logger;
|
||||
|
||||
public NetImportFactory(INetImportRepository providerRepository,
|
||||
IEnumerable<INetImport> providers,
|
||||
IContainer container,
|
||||
IEventAggregator eventAggregator,
|
||||
Logger logger)
|
||||
: base(providerRepository, providers, container, eventAggregator, logger)
|
||||
{
|
||||
_providerRepository = providerRepository;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
protected override List<NetImportDefinition> Active()
|
||||
{
|
||||
return base.Active().Where(c => c.Enabled).ToList();
|
||||
}
|
||||
|
||||
public override void SetProviderCharacteristics(INetImport provider, NetImportDefinition definition)
|
||||
{
|
||||
base.SetProviderCharacteristics(provider, definition);
|
||||
}
|
||||
|
||||
public List<INetImport> Enabled()
|
||||
{
|
||||
var enabledImporters = GetAvailableProviders().Where(n => ((NetImportDefinition)n.Definition).Enabled);
|
||||
var indexers = FilterBlockedIndexers(enabledImporters);
|
||||
return indexers.ToList();
|
||||
}
|
||||
|
||||
private IEnumerable<INetImport> FilterBlockedIndexers(IEnumerable<INetImport> importers)
|
||||
{
|
||||
foreach (var importer in importers)
|
||||
{
|
||||
yield return importer;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
25
src/NzbDrone.Core/NetImport/NetImportPageableRequest.cs
Normal file
25
src/NzbDrone.Core/NetImport/NetImportPageableRequest.cs
Normal file
@@ -0,0 +1,25 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public class NetImportPageableRequest : IEnumerable<NetImportRequest>
|
||||
{
|
||||
private readonly IEnumerable<NetImportRequest> _enumerable;
|
||||
|
||||
public NetImportPageableRequest(IEnumerable<NetImportRequest> enumerable)
|
||||
{
|
||||
_enumerable = enumerable;
|
||||
}
|
||||
|
||||
public IEnumerator<NetImportRequest> GetEnumerator()
|
||||
{
|
||||
return _enumerable.GetEnumerator();
|
||||
}
|
||||
|
||||
IEnumerator IEnumerable.GetEnumerator()
|
||||
{
|
||||
return _enumerable.GetEnumerator();
|
||||
}
|
||||
}
|
||||
}
|
||||
48
src/NzbDrone.Core/NetImport/NetImportPageableRequestChain.cs
Normal file
48
src/NzbDrone.Core/NetImport/NetImportPageableRequestChain.cs
Normal file
@@ -0,0 +1,48 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public class NetImportPageableRequestChain
|
||||
{
|
||||
private List<List<NetImportPageableRequest>> _chains;
|
||||
|
||||
public NetImportPageableRequestChain()
|
||||
{
|
||||
_chains = new List<List<NetImportPageableRequest>>();
|
||||
_chains.Add(new List<NetImportPageableRequest>());
|
||||
}
|
||||
|
||||
public int Tiers => _chains.Count;
|
||||
|
||||
public IEnumerable<NetImportPageableRequest> GetAllTiers()
|
||||
{
|
||||
return _chains.SelectMany(v => v);
|
||||
}
|
||||
|
||||
public IEnumerable<NetImportPageableRequest> GetTier(int index)
|
||||
{
|
||||
return _chains[index];
|
||||
}
|
||||
|
||||
public void Add(IEnumerable<NetImportRequest> request)
|
||||
{
|
||||
if (request == null) return;
|
||||
|
||||
_chains.Last().Add(new NetImportPageableRequest(request));
|
||||
}
|
||||
|
||||
public void AddTier(IEnumerable<NetImportRequest> request)
|
||||
{
|
||||
AddTier();
|
||||
Add(request);
|
||||
}
|
||||
|
||||
public void AddTier()
|
||||
{
|
||||
if (_chains.Last().Count == 0) return;
|
||||
|
||||
_chains.Add(new List<NetImportPageableRequest>());
|
||||
}
|
||||
}
|
||||
}
|
||||
20
src/NzbDrone.Core/NetImport/NetImportRepository.cs
Normal file
20
src/NzbDrone.Core/NetImport/NetImportRepository.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using NzbDrone.Core.Datastore;
|
||||
using NzbDrone.Core.Messaging.Events;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public interface INetImportRepository : IProviderRepository<NetImportDefinition>
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public class NetImportRepository : ProviderRepository<NetImportDefinition>, INetImportRepository
|
||||
{
|
||||
public NetImportRepository(IMainDatabase database, IEventAggregator eventAggregator)
|
||||
: base(database, eventAggregator)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
21
src/NzbDrone.Core/NetImport/NetImportRequest.cs
Normal file
21
src/NzbDrone.Core/NetImport/NetImportRequest.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using NzbDrone.Common.Http;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public class NetImportRequest
|
||||
{
|
||||
public HttpRequest HttpRequest { get; private set; }
|
||||
|
||||
public NetImportRequest(string url, HttpAccept httpAccept)
|
||||
{
|
||||
HttpRequest = new HttpRequest(url, httpAccept);
|
||||
}
|
||||
|
||||
public NetImportRequest(HttpRequest httpRequest)
|
||||
{
|
||||
HttpRequest = httpRequest;
|
||||
}
|
||||
|
||||
public HttpUri Url => HttpRequest.Url;
|
||||
}
|
||||
}
|
||||
24
src/NzbDrone.Core/NetImport/NetImportResponse.cs
Normal file
24
src/NzbDrone.Core/NetImport/NetImportResponse.cs
Normal file
@@ -0,0 +1,24 @@
|
||||
using NzbDrone.Common.Http;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public class NetImportResponse
|
||||
{
|
||||
private readonly NetImportRequest _netImport;
|
||||
private readonly HttpResponse _httpResponse;
|
||||
|
||||
public NetImportResponse(NetImportRequest netImport, HttpResponse httpResponse)
|
||||
{
|
||||
_netImport = netImport;
|
||||
_httpResponse = httpResponse;
|
||||
}
|
||||
|
||||
public NetImportRequest Request => _netImport;
|
||||
|
||||
public HttpRequest HttpRequest => _httpResponse.Request;
|
||||
|
||||
public HttpResponse HttpResponse => _httpResponse;
|
||||
|
||||
public string Content => _httpResponse.Content;
|
||||
}
|
||||
}
|
||||
92
src/NzbDrone.Core/NetImport/NetImportSearchService.cs
Normal file
92
src/NzbDrone.Core/NetImport/NetImportSearchService.cs
Normal file
@@ -0,0 +1,92 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
using NzbDrone.Core.Messaging.Events;
|
||||
using NzbDrone.Core.MetadataSource;
|
||||
using NzbDrone.Core.RootFolders;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public interface IFetchNetImport
|
||||
{
|
||||
List<Movie> Fetch(int listId, bool onlyEnableAuto);
|
||||
List<Movie> FetchAndFilter(int listId, bool onlyEnableAuto);
|
||||
}
|
||||
|
||||
public class NetImportSearchService : IFetchNetImport, IExecute<NetImportSyncCommand>
|
||||
{
|
||||
private readonly Logger _logger;
|
||||
private readonly INetImportFactory _netImportFactory;
|
||||
private readonly IMovieService _movieService;
|
||||
private readonly ISearchForNewMovie _movieSearch;
|
||||
private readonly IRootFolderService _rootFolder;
|
||||
|
||||
public NetImportSearchService(INetImportFactory netImportFactory, IMovieService movieService,
|
||||
ISearchForNewMovie movieSearch, IRootFolderService rootFolder, Logger logger)
|
||||
{
|
||||
_netImportFactory = netImportFactory;
|
||||
_movieService = movieService;
|
||||
_movieSearch = movieSearch;
|
||||
_rootFolder = rootFolder;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
||||
public List<Movie> Fetch(int listId, bool onlyEnableAuto = false)
|
||||
{
|
||||
return MovieListSearch(listId, onlyEnableAuto);
|
||||
}
|
||||
|
||||
public List<Movie> FetchAndFilter(int listId, bool onlyEnableAuto)
|
||||
{
|
||||
var movies = MovieListSearch(listId, onlyEnableAuto);
|
||||
|
||||
return movies.Where(x => !_movieService.MovieExists(x)).ToList();
|
||||
}
|
||||
|
||||
public List<Movie> MovieListSearch(int listId, bool onlyEnableAuto = false)
|
||||
{
|
||||
var movies = new List<Movie>();
|
||||
|
||||
var importLists = _netImportFactory.GetAvailableProviders();
|
||||
|
||||
var lists = listId == 0 ? importLists : importLists.Where(n => ((NetImportDefinition)n.Definition).Id == listId);
|
||||
|
||||
if (onlyEnableAuto)
|
||||
{
|
||||
lists = importLists.Where(a => ((NetImportDefinition)a.Definition).EnableAuto);
|
||||
}
|
||||
|
||||
foreach (var list in lists)
|
||||
{
|
||||
movies.AddRange(list.Fetch());
|
||||
}
|
||||
|
||||
_logger.Debug("Found {0} movies from list(s) {1}", movies.Count, string.Join(", ", lists.Select(l => l.Definition.Name)));
|
||||
|
||||
return movies;
|
||||
}
|
||||
|
||||
public void Execute(NetImportSyncCommand message)
|
||||
{
|
||||
var movies = FetchAndFilter(0, true);
|
||||
|
||||
_logger.Debug("Found {0} movies on your auto enabled lists not in your library", movies.Count);
|
||||
|
||||
foreach (var movie in movies)
|
||||
{
|
||||
var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
|
||||
|
||||
if (mapped != null)
|
||||
{
|
||||
_movieService.AddMovie(mapped);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
12
src/NzbDrone.Core/NetImport/NetImportSyncCommand.cs
Normal file
12
src/NzbDrone.Core/NetImport/NetImportSyncCommand.cs
Normal file
@@ -0,0 +1,12 @@
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
|
||||
namespace NzbDrone.Core.NetImport
|
||||
{
|
||||
public class NetImportSyncCommand : Command
|
||||
{
|
||||
|
||||
public override bool SendUpdatesToClient => true;
|
||||
|
||||
public int listId = 0;
|
||||
}
|
||||
}
|
||||
56
src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs
Normal file
56
src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs
Normal file
@@ -0,0 +1,56 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Xml.Serialization;
|
||||
using FluentValidation.Results;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Indexers;
|
||||
using NzbDrone.Core.Indexers.PassThePopcorn;
|
||||
using NzbDrone.Core.Parser;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.RSSImport
|
||||
{
|
||||
public class RSSImport : HttpNetImportBase<RSSImportSettings>
|
||||
{
|
||||
public override string Name => "RSSList";
|
||||
public override bool Enabled => true;
|
||||
public override bool EnableAuto => true;
|
||||
|
||||
public RSSImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
: base(httpClient, configService, parsingService, logger)
|
||||
{ }
|
||||
|
||||
public override IEnumerable<ProviderDefinition> DefaultDefinitions
|
||||
{
|
||||
get
|
||||
{
|
||||
foreach (var def in base.DefaultDefinitions)
|
||||
{
|
||||
yield return def;
|
||||
}
|
||||
yield return new NetImportDefinition
|
||||
{
|
||||
Name = "IMDb Watchlist",
|
||||
Enabled = Enabled,
|
||||
EnableAuto = true,
|
||||
ProfileId = 1,
|
||||
Implementation = GetType().Name,
|
||||
Settings = new RSSImportSettings { Link = "http://rss.imdb.com/list/YOURLISTID" },
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public override INetImportRequestGenerator GetRequestGenerator()
|
||||
{
|
||||
return new RSSImportRequestGenerator() { Settings = Settings };
|
||||
}
|
||||
|
||||
public override IParseNetImportResponse GetParser()
|
||||
{
|
||||
return new RSSImportParser(Settings);
|
||||
}
|
||||
}
|
||||
}
|
||||
236
src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs
Normal file
236
src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs
Normal file
@@ -0,0 +1,236 @@
|
||||
using Newtonsoft.Json;
|
||||
using NzbDrone.Core.NetImport.Exceptions;
|
||||
using NzbDrone.Core.Tv;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Xml;
|
||||
using System.Xml.Linq;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Indexers;
|
||||
using NzbDrone.Core.Indexers.Exceptions;
|
||||
using NzbDrone.Core.Parser.Model;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.RSSImport
|
||||
{
|
||||
public class RSSImportParser : IParseNetImportResponse
|
||||
{
|
||||
private readonly RSSImportSettings _settings;
|
||||
private NetImportResponse _importResponse;
|
||||
private readonly Logger _logger;
|
||||
|
||||
private static readonly Regex ReplaceEntities = new Regex("&[a-z]+;", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
|
||||
public RSSImportParser(RSSImportSettings settings)
|
||||
{
|
||||
_settings = settings;
|
||||
}
|
||||
|
||||
public virtual IList<Movie> ParseResponse(NetImportResponse importResponse)
|
||||
{
|
||||
_importResponse = importResponse;
|
||||
|
||||
var movies = new List<Movie>();
|
||||
|
||||
if (!PreProcess(importResponse))
|
||||
{
|
||||
return movies;
|
||||
}
|
||||
|
||||
var document = LoadXmlDocument(importResponse);
|
||||
var items = GetItems(document);
|
||||
|
||||
foreach (var item in items)
|
||||
{
|
||||
try
|
||||
{
|
||||
var reportInfo = ProcessItem(item);
|
||||
|
||||
movies.AddIfNotNull(reportInfo);
|
||||
}
|
||||
catch (Exception itemEx)
|
||||
{
|
||||
//itemEx.Data.Add("Item", item.Title());
|
||||
_logger.Error(itemEx, "An error occurred while processing feed item from " + importResponse.Request.Url);
|
||||
}
|
||||
}
|
||||
|
||||
return movies;
|
||||
}
|
||||
|
||||
protected virtual XDocument LoadXmlDocument(NetImportResponse indexerResponse)
|
||||
{
|
||||
try
|
||||
{
|
||||
var content = indexerResponse.Content;
|
||||
content = ReplaceEntities.Replace(content, ReplaceEntity);
|
||||
|
||||
using (var xmlTextReader = XmlReader.Create(new StringReader(content), new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore, IgnoreComments = true }))
|
||||
{
|
||||
return XDocument.Load(xmlTextReader);
|
||||
}
|
||||
}
|
||||
catch (XmlException ex)
|
||||
{
|
||||
var contentSample = indexerResponse.Content.Substring(0, Math.Min(indexerResponse.Content.Length, 512));
|
||||
_logger.Debug("Truncated response content (originally {0} characters): {1}", indexerResponse.Content.Length, contentSample);
|
||||
|
||||
ex.Data.Add("ContentLength", indexerResponse.Content.Length);
|
||||
ex.Data.Add("ContentSample", contentSample);
|
||||
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual string ReplaceEntity(Match match)
|
||||
{
|
||||
try
|
||||
{
|
||||
var character = WebUtility.HtmlDecode(match.Value);
|
||||
return string.Concat("&#", (int)character[0], ";");
|
||||
}
|
||||
catch
|
||||
{
|
||||
return match.Value;
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual Movie CreateNewMovie()
|
||||
{
|
||||
return new Movie();
|
||||
}
|
||||
|
||||
protected virtual bool PreProcess(NetImportResponse indexerResponse)
|
||||
{
|
||||
if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
|
||||
{
|
||||
throw new NetImportException(indexerResponse, "Indexer API call resulted in an unexpected StatusCode [{0}]", indexerResponse.HttpResponse.StatusCode);
|
||||
}
|
||||
|
||||
if (indexerResponse.HttpResponse.Headers.ContentType != null && indexerResponse.HttpResponse.Headers.ContentType.Contains("text/html") &&
|
||||
indexerResponse.HttpRequest.Headers.Accept != null && !indexerResponse.HttpRequest.Headers.Accept.Contains("text/html"))
|
||||
{
|
||||
throw new NetImportException(indexerResponse, "Indexer responded with html content. Site is likely blocked or unavailable.");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Movie ProcessItem(XElement item)
|
||||
{
|
||||
var releaseInfo = CreateNewMovie();
|
||||
|
||||
releaseInfo = ProcessItem(item, releaseInfo);
|
||||
|
||||
//_logger.Trace("Parsed: {0}", releaseInfo.Title);
|
||||
|
||||
return PostProcess(item, releaseInfo);
|
||||
}
|
||||
|
||||
protected virtual Movie ProcessItem(XElement item, Movie releaseInfo)
|
||||
{
|
||||
var result = Parser.Parser.ParseMovieTitle(GetTitle(item));
|
||||
|
||||
releaseInfo.Title = GetTitle(item);
|
||||
|
||||
if (result != null)
|
||||
{
|
||||
releaseInfo.Title = result.MovieTitle;
|
||||
releaseInfo.Year = result.Year;
|
||||
releaseInfo.ImdbId = result.ImdbId;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (releaseInfo.ImdbId.IsNullOrWhiteSpace())
|
||||
{
|
||||
releaseInfo.ImdbId = GetImdbId(item);
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
_logger.Debug("Unable to extract Imdb Id :(.");
|
||||
}
|
||||
|
||||
return releaseInfo;
|
||||
}
|
||||
|
||||
protected virtual Movie PostProcess(XElement item, Movie releaseInfo)
|
||||
{
|
||||
return releaseInfo;
|
||||
}
|
||||
|
||||
protected virtual string GetTitle(XElement item)
|
||||
{
|
||||
return item.TryGetValue("title", "Unknown");
|
||||
}
|
||||
|
||||
protected virtual DateTime GetPublishDate(XElement item)
|
||||
{
|
||||
var dateString = item.TryGetValue("pubDate");
|
||||
|
||||
if (dateString.IsNullOrWhiteSpace())
|
||||
{
|
||||
throw new UnsupportedFeedException("Rss feed must have a pubDate element with a valid publish date.");
|
||||
}
|
||||
|
||||
return XElementExtensions.ParseDate(dateString);
|
||||
}
|
||||
|
||||
protected virtual string GetImdbId(XElement item)
|
||||
{
|
||||
var url = item.TryGetValue("link");
|
||||
if (url.IsNullOrWhiteSpace())
|
||||
{
|
||||
return "";
|
||||
}
|
||||
return Parser.Parser.ParseImdbId(url);
|
||||
}
|
||||
|
||||
protected IEnumerable<XElement> GetItems(XDocument document)
|
||||
{
|
||||
var root = document.Root;
|
||||
|
||||
if (root == null)
|
||||
{
|
||||
return Enumerable.Empty<XElement>();
|
||||
}
|
||||
|
||||
var channel = root.Element("channel");
|
||||
|
||||
if (channel == null)
|
||||
{
|
||||
return Enumerable.Empty<XElement>();
|
||||
}
|
||||
|
||||
return channel.Elements("item");
|
||||
}
|
||||
|
||||
protected virtual string ParseUrl(string value)
|
||||
{
|
||||
if (value.IsNullOrWhiteSpace())
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var url = _importResponse.HttpRequest.Url + new HttpUri(value);
|
||||
|
||||
return url.FullUri;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Debug(ex, string.Format("Failed to parse Url {0}, ignoring.", value));
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Common.Serializer;
|
||||
using NzbDrone.Core.IndexerSearch.Definitions;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.RSSImport
|
||||
{
|
||||
public class RSSImportRequestGenerator : INetImportRequestGenerator
|
||||
{
|
||||
public RSSImportSettings Settings { get; set; }
|
||||
|
||||
public virtual NetImportPageableRequestChain GetMovies()
|
||||
{
|
||||
var pageableRequests = new NetImportPageableRequestChain();
|
||||
|
||||
pageableRequests.Add(GetMovies(null));
|
||||
|
||||
return pageableRequests;
|
||||
}
|
||||
|
||||
//public NetImportPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
|
||||
//{
|
||||
// return new NetImportPageableRequestChain();
|
||||
//}
|
||||
|
||||
private IEnumerable<NetImportRequest> GetMovies(string searchParameters)
|
||||
{
|
||||
var request = new NetImportRequest($"{Settings.Link.Trim()}", HttpAccept.Rss);
|
||||
yield return request;
|
||||
}
|
||||
}
|
||||
}
|
||||
22
src/NzbDrone.Core/NetImport/RSSImport/RSSImportSettings.cs
Normal file
22
src/NzbDrone.Core/NetImport/RSSImport/RSSImportSettings.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using FluentValidation;
|
||||
using NzbDrone.Core.Annotations;
|
||||
using NzbDrone.Core.Profiles;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Validation;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.RSSImport
|
||||
{
|
||||
|
||||
public class RSSImportSettings : NetImportBaseSettings
|
||||
{
|
||||
//private const string helpLink = "https://imdb.com";
|
||||
|
||||
public RSSImportSettings()
|
||||
{
|
||||
Link = "http://rss.yoursite.com";
|
||||
}
|
||||
|
||||
[FieldDefinition(0, Label = "RSS Link", HelpText = "Link to the rss feed of movies.")]
|
||||
public new string Link { get; set; }
|
||||
}
|
||||
}
|
||||
13
src/NzbDrone.Core/NetImport/StevenLu/StevenLuAPI.cs
Normal file
13
src/NzbDrone.Core/NetImport/StevenLu/StevenLuAPI.cs
Normal file
@@ -0,0 +1,13 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Windows.Forms;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.StevenLu
|
||||
{
|
||||
public class StevenLuResponse
|
||||
{
|
||||
public string title { get; set; }
|
||||
public string imdb_id { get; set; }
|
||||
public string poster_url { get; set; }
|
||||
}
|
||||
}
|
||||
36
src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs
Normal file
36
src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs
Normal file
@@ -0,0 +1,36 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Xml.Serialization;
|
||||
using FluentValidation.Results;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Indexers;
|
||||
using NzbDrone.Core.Indexers.PassThePopcorn;
|
||||
using NzbDrone.Core.Parser;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
namespace NzbDrone.Core.NetImport.StevenLu
|
||||
{
|
||||
public class StevenLuImport : HttpNetImportBase<StevenLuSettings>
|
||||
{
|
||||
public override string Name => "StevenLu";
|
||||
public override bool Enabled => true;
|
||||
public override bool EnableAuto => true;
|
||||
|
||||
public StevenLuImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
: base(httpClient, configService, parsingService, logger)
|
||||
{ }
|
||||
|
||||
public override INetImportRequestGenerator GetRequestGenerator()
|
||||
{
|
||||
return new StevenLuRequestGenerator() { Settings = Settings };
|
||||
}
|
||||
|
||||
public override IParseNetImportResponse GetParser()
|
||||
{
|
||||
return new StevenLuParser(Settings);
|
||||
}
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user