shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-10-02 16:52:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Leonardo Galli
2017-05-26 11:12:14 +02:00
parent b7f6ff7b2e 6767f602fb
commit 10bceaf370
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -71,7 +71,8 @@ Radarr is currently undergoing rapid development and pull requests are actively
* All indexers supported by Sonarr also supported * All indexers supported by Sonarr also supported
* New PassThePopcorn Indexer * New PassThePopcorn Indexer
* QBittorrent, Deluge, rTorrent, Transmission and uTorrent download client (Other clients are coming) * QBittorrent, Deluge, rTorrent, Transmission and uTorrent download client (Other clients are coming)
* New TorrentPotato Indexer (Works well with [Jackett](https://github.com/Jackett/Jackett)) * New TorrentPotato Indexer
* Torznab Indexer now supports Movies (Works well with [Jackett](https://github.com/Jackett/Jackett))
* Scanning PreDB to know when a new release is available * Scanning PreDB to know when a new release is available
* Importing movies from various online sources, such as IMDb Watchlists (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114)) * 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) * Full integration with Kodi, Plex (notification, library update)

10
src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotato.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using NLog; using NLog;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
@@ -26,14 +26,6 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
} }
public override IEnumerable<ProviderDefinition> DefaultDefinitions
{
get
{
yield return GetDefinition("Jackett", new TorrentPotatoSettings { BaseUrl = "http://localhost:9117/potato/YOURINDEXER"});
}
}
private IndexerDefinition GetDefinition(string name, TorrentPotatoSettings settings) private IndexerDefinition GetDefinition(string name, TorrentPotatoSettings settings)
{ {
return new IndexerDefinition return new IndexerDefinition

2
src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoSettings.cs
View File

@@ -28,7 +28,7 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
[FieldDefinition(1, Label = "Username", HelpText = "The username you use at your indexer.")] [FieldDefinition(1, Label = "Username", HelpText = "The username you use at your indexer.")]
public string User { get; set; } public string User { get; set; }
[FieldDefinition(2, Label = "Passkey", HelpText = "The password you use at your Indexer (or your API key if you're using Jackett).")] [FieldDefinition(2, Label = "Passkey", HelpText = "The password you use at your Indexer.")]
public string Passkey { get; set; } public string Passkey { get; set; }
public NzbDroneValidationResult Validate() public NzbDroneValidationResult Validate()
{ {

1
src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
View File

@@ -41,6 +41,7 @@ namespace NzbDrone.Core.Indexers.Torznab
{ {
get get
{ {
yield return GetDefinition("Jackett", GetSettings("http://localhost:9117/torznab/YOURINDEXER"));
yield return GetDefinition("HD4Free.xyz", GetSettings("http://hd4free.xyz")); yield return GetDefinition("HD4Free.xyz", GetSettings("http://hd4free.xyz"));
} }
} }

11
src/UI/AddMovies/BulkImport/BulkImportSelectAllCell.js
View File

@@ -13,9 +13,7 @@ module.exports = SelectAllCell.extend({
initialize : function() { initialize : function() {
this._originalInit.apply(this, arguments); this._originalInit.apply(this, arguments);
var tmdbId = this.model.get('tmdbId'); this._refreshIsDuplicate();
var existingMovie = FullMovieCollection.where({ tmdbId: tmdbId });
this.isDuplicate = existingMovie.length > 0 ? true : false;
this.listenTo(this.model, 'change', this._refresh); this.listenTo(this.model, 'change', this._refresh);
}, },
@@ -39,6 +37,13 @@ module.exports = SelectAllCell.extend({
}, },
_refresh: function() { _refresh: function() {
this._refreshIsDuplicate();
this.render(); this.render();
},
_refreshIsDuplicate: function() {
var tmdbId = this.model.get('tmdbId');
var existingMovie = FullMovieCollection.where({ tmdbId: tmdbId });
this.isDuplicate = existingMovie.length > 0 ? true : false;
} }
}); });