mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 20:12:41 +02:00
Patch/onedr0p (#757)
* Fix double ? in log * Rename Download Station to TorrentDownloadStation * Rename Trakt, TMDb, and set Enable sync default to false * Added omgwtfnzbs Newznab prefix * Update Media info for Windows/macOS to 0.7.92.1
This commit is contained in:
parent
dadf6708ab
commit
a68dd6d2f7
Binary file not shown.
Binary file not shown.
@ -66,13 +66,9 @@ private void LogEnd(NancyContext context)
|
||||
private Response LogError(NancyContext context, Exception exception)
|
||||
{
|
||||
var response = _errorPipeline.HandleException(context, exception);
|
||||
|
||||
context.Response = response;
|
||||
|
||||
LogEnd(context);
|
||||
|
||||
context.Response = null;
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
@ -80,12 +76,9 @@ private static string GetRequestPathAndQuery(Request request)
|
||||
{
|
||||
if (request.Url.Query.IsNotNullOrWhiteSpace())
|
||||
{
|
||||
return string.Concat(request.Url.Path, "?", request.Url.Query);
|
||||
}
|
||||
else
|
||||
{
|
||||
return request.Url.Path;
|
||||
return string.Concat(request.Url.Path, request.Url.Query);
|
||||
}
|
||||
return request.Url.Path;
|
||||
}
|
||||
}
|
||||
}
|
@ -16,7 +16,7 @@
|
||||
namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
|
||||
{
|
||||
[TestFixture]
|
||||
public class DownloadStationFixture : DownloadClientFixtureBase<DownloadStation>
|
||||
public class TorrentDownloadStationFixture : DownloadClientFixtureBase<TorrentDownloadStation>
|
||||
{
|
||||
protected DownloadStationSettings _settings;
|
||||
|
@ -183,7 +183,7 @@
|
||||
<Compile Include="Download\DownloadClientTests\TransmissionTests\TransmissionFixtureBase.cs" />
|
||||
<Compile Include="Download\DownloadClientTests\UTorrentTests\UTorrentFixture.cs" />
|
||||
<Compile Include="Download\DownloadClientTests\VuzeTests\VuzeFixture.cs" />
|
||||
<Compile Include="Download\DownloadClientTests\DownloadStationTests\DownloadStationFixture.cs" />
|
||||
<Compile Include="Download\DownloadClientTests\DownloadStationTests\TorrentDownloadStationFixture.cs" />
|
||||
<Compile Include="Download\DownloadClientTests\DownloadStationTests\SerialNumberProviderFixture.cs" />
|
||||
<Compile Include="Download\DownloadClientTests\DownloadStationTests\SharedFolderResolverFixture.cs" />
|
||||
<Compile Include="Download\DownloadServiceFixture.cs" />
|
||||
|
@ -0,0 +1,14 @@
|
||||
using FluentMigrator;
|
||||
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||
|
||||
namespace NzbDrone.Core.Datastore.Migration
|
||||
{
|
||||
[Migration(132)]
|
||||
public class rename_torrent_downloadstation : NzbDroneMigrationBase
|
||||
{
|
||||
protected override void MainDbUpgrade()
|
||||
{
|
||||
Execute.Sql("UPDATE DownloadClients SET Implementation = 'TorrentDownloadStation' WHERE Implementation = 'DownloadStation';");
|
||||
}
|
||||
}
|
||||
}
|
@ -18,13 +18,13 @@
|
||||
|
||||
namespace NzbDrone.Core.Download.Clients.DownloadStation
|
||||
{
|
||||
public class DownloadStation : TorrentClientBase<DownloadStationSettings>
|
||||
public class TorrentDownloadStation : TorrentClientBase<DownloadStationSettings>
|
||||
{
|
||||
protected readonly IDownloadStationProxy _proxy;
|
||||
protected readonly ISharedFolderResolver _sharedFolderResolver;
|
||||
protected readonly ISerialNumberProvider _serialNumberProvider;
|
||||
|
||||
public DownloadStation(IDownloadStationProxy proxy,
|
||||
public TorrentDownloadStation(IDownloadStationProxy proxy,
|
||||
ITorrentFileInfoReader torrentFileInfoReader,
|
||||
IHttpClient httpClient,
|
||||
IConfigService configService,
|
@ -48,6 +48,7 @@ public override IEnumerable<ProviderDefinition> DefaultDefinitions
|
||||
yield return GetDefinition("NZBgeek", GetSettings("https://api.nzbgeek.info"));
|
||||
yield return GetDefinition("nzbplanet.net", GetSettings("https://api.nzbplanet.net"));
|
||||
yield return GetDefinition("Nzbs.org", GetSettings("http://nzbs.org"));
|
||||
yield return GetDefinition("omgwtfnzbs", GetSettings("https://api.omgwtfnzbs.me"));
|
||||
yield return GetDefinition("OZnzb.com", GetSettings("https://api.oznzb.com"));
|
||||
yield return GetDefinition("PFmonkey", GetSettings("https://www.pfmonkey.com"));
|
||||
yield return GetDefinition("SimplyNZBs", GetSettings("https://simplynzbs.com"));
|
||||
|
@ -16,31 +16,13 @@ namespace NzbDrone.Core.NetImport.CouchPotato
|
||||
public class CouchPotatoImport : HttpNetImportBase<CouchPotatoSettings>
|
||||
{
|
||||
public override string Name => "CouchPotato";
|
||||
public override bool Enabled => true;
|
||||
public override bool Enabled => false;
|
||||
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 };
|
||||
|
@ -15,9 +15,9 @@ 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 override string Name => "RSS";
|
||||
public override bool Enabled => false;
|
||||
public override bool EnableAuto => false;
|
||||
|
||||
public RSSImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
: base(httpClient, configService, parsingService, logger)
|
||||
|
@ -16,8 +16,8 @@ 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 override bool Enabled => false;
|
||||
public override bool EnableAuto => false;
|
||||
|
||||
public StevenLuImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
: base(httpClient, configService, parsingService, logger)
|
||||
|
@ -8,8 +8,8 @@ namespace NzbDrone.Core.NetImport.TMDb
|
||||
{
|
||||
public class TMDbImport : HttpNetImportBase<TMDbSettings>
|
||||
{
|
||||
public override string Name => "TMDb Lists";
|
||||
public override bool Enabled => true;
|
||||
public override string Name => "TMDb";
|
||||
public override bool Enabled => false;
|
||||
public override bool EnableAuto => false;
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly Logger _logger;
|
||||
|
@ -15,8 +15,8 @@ namespace NzbDrone.Core.NetImport.Trakt
|
||||
{
|
||||
public class TraktImport : HttpNetImportBase<TraktSettings>
|
||||
{
|
||||
public override string Name => "Trakt List";
|
||||
public override bool Enabled => true;
|
||||
public override string Name => "Trakt";
|
||||
public override bool Enabled => false;
|
||||
public override bool EnableAuto => false;
|
||||
|
||||
public TraktImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
|
||||
|
@ -127,6 +127,7 @@
|
||||
<Compile Include="Datastore\Migration\129_add_parsed_movie_info_to_pending_release.cs" />
|
||||
<Compile Include="Datastore\Migration\128_remove_kickass.cs" />
|
||||
<Compile Include="Datastore\Migration\130_remove_wombles_kickass.cs" />
|
||||
<Compile Include="Datastore\Migration\132_rename_torrent_downloadstation.cs" />
|
||||
<Compile Include="NetImport\TMDb\TMDbLanguageCodes.cs" />
|
||||
<Compile Include="NetImport\TMDb\TMDbSettings.cs" />
|
||||
<Compile Include="NetImport\TMDb\TMDbListType.cs" />
|
||||
@ -419,7 +420,7 @@
|
||||
<Compile Include="Download\Clients\Deluge\DelugeUpdateUIResult.cs" />
|
||||
<Compile Include="Download\Clients\DownloadClientAuthenticationException.cs" />
|
||||
<Compile Include="Download\Clients\DownloadClientException.cs" />
|
||||
<Compile Include="Download\Clients\DownloadStation\DownloadStation.cs" />
|
||||
<Compile Include="Download\Clients\DownloadStation\TorrentDownloadStation.cs" />
|
||||
<Compile Include="Download\Clients\DownloadStation\Proxies\DownloadStationProxy.cs" />
|
||||
<Compile Include="Download\Clients\DownloadStation\DownloadStationSettings.cs" />
|
||||
<Compile Include="Download\Clients\DownloadStation\DownloadStationTorrent.cs" />
|
||||
|
Loading…
Reference in New Issue
Block a user