Reinstate changes from merge

This commit is contained in:
KZ
2015-07-19 15:08:56 +01:00
128 changed files with 2767 additions and 1176 deletions

View File

@@ -1,5 +1,8 @@
using CsQuery;
using Jackett.Models;
using Jackett.Utils;
using Newtonsoft.Json.Linq;
using NLog;
using System;
using System.Collections.Generic;
using System.Globalization;
@@ -11,9 +14,9 @@ using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
namespace Jackett
namespace Jackett.Indexers
{
public class BitMeTV : IndexerInterface
public class BitMeTV : IIndexer
{
class BmtvConfig : ConfigurationData
{
@@ -48,12 +51,14 @@ namespace Jackett
CookieContainer cookies;
HttpClientHandler handler;
HttpClient client;
Logger logger;
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public event Action<IIndexer, JToken> OnSaveConfigurationRequested;
public event Action<IIndexer, string, Exception> OnResultParsingError;
public BitMeTV()
public BitMeTV(Logger l)
{
logger = l;
IsConfigured = false;
cookies = new CookieContainer();
handler = new HttpClientHandler
@@ -124,7 +129,7 @@ namespace Jackett
public void LoadFromSavedConfiguration(JToken jsonConfig)
{
cookies.FillFromJson(new Uri(BaseUrl), jsonConfig);
cookies.FillFromJson(new Uri(BaseUrl), jsonConfig, logger);
IsConfigured = true;
}