mirror of
https://github.com/Radarr/Radarr.git
synced 2024-08-16 23:39:44 +02:00
SabController - Removed AddByPath, Completed AddByUrl and IsInQueue
Created SabControllerTest - Added AddByPath Test (Needs more work) Added, Episode, FeedItem, ItemInfo and Site classes to store information
This commit is contained in:
parent
f5cf44c2b3
commit
a427f9c16d
@ -60,6 +60,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="DbConfigControllerTest.cs" />
|
<Compile Include="DbConfigControllerTest.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
<Compile Include="SabControllerTest.cs" />
|
||||||
<Compile Include="TvDbControllerTest.cs" />
|
<Compile Include="TvDbControllerTest.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
39
NzbDrone.Core.Test/SabControllerTest.cs
Normal file
39
NzbDrone.Core.Test/SabControllerTest.cs
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using Gallio.Framework;
|
||||||
|
using log4net;
|
||||||
|
using MbUnit.Framework;
|
||||||
|
using MbUnit.Framework.ContractVerifiers;
|
||||||
|
using Moq;
|
||||||
|
using NzbDrone.Core.Repository;
|
||||||
|
using NzbDrone.Core.Controllers;
|
||||||
|
using SubSonic.Repository;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Test
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class SabControllerTest
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void AddByUrl()
|
||||||
|
{
|
||||||
|
//Setup
|
||||||
|
String key = "SabnzbdInfo";
|
||||||
|
String value = "192.168.5.55:2222";
|
||||||
|
|
||||||
|
var repo = new Mock<IRepository>();
|
||||||
|
var config = new Mock<IConfigController>();
|
||||||
|
config.Setup(c => c.SetValue("SabnzbdInfo", "192.168.5.55:2222"));
|
||||||
|
|
||||||
|
//var config = new Config() { Key = key, Value = value };
|
||||||
|
var target = new SabController(config.Object, new Mock<ILog>().Object);
|
||||||
|
|
||||||
|
//Act
|
||||||
|
bool result = target.AddByUrl("http://www.nzbclub.com/nzb_download.aspx?mid=1950232");
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
Assert.AreEqual(true, result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -2,12 +2,13 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using NzbDrone.Core.Repository;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Controllers
|
namespace NzbDrone.Core.Controllers
|
||||||
{
|
{
|
||||||
public interface IDownloadClientController
|
public interface IDownloadClientController
|
||||||
{
|
{
|
||||||
string AddByUrl(string url); //Should accept something other than string (NzbInfo?) returns result if applicable
|
bool AddByUrl(ItemInfo nzb); //Should accept something other than string (NzbInfo?) returns success or failure
|
||||||
bool IsInQueue(string goodName);//Should accept something other than string (Episode?) returns bool
|
bool IsInQueue(Episode episode);//Should accept something other than string (Episode?) returns bool
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,37 +1,108 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Net;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using log4net;
|
||||||
|
using System.Xml.Linq;
|
||||||
|
using System.Xml;
|
||||||
|
using NzbDrone.Core.Repository;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Controllers
|
namespace NzbDrone.Core.Controllers
|
||||||
{
|
{
|
||||||
public class SabController : IDownloadClientController
|
public class SabController : IDownloadClientController
|
||||||
{
|
{
|
||||||
private readonly IConfigController _config;
|
private readonly IConfigController _config;
|
||||||
|
private readonly ILog _logger;
|
||||||
|
|
||||||
public SabController(IConfigController config)
|
public SabController(IConfigController config, ILog logger)
|
||||||
{
|
{
|
||||||
_config = config;
|
_config = config;
|
||||||
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string AddByUrl(string url)
|
#region IDownloadClientController Members
|
||||||
|
|
||||||
|
public bool AddByUrl(ItemInfo nzb)
|
||||||
{
|
{
|
||||||
|
const string mode = "addurl";
|
||||||
|
const string cat = "tv";
|
||||||
|
string name = nzb.Link.ToString().Replace("&", "%26");
|
||||||
|
string nzbName = CleanUrlString(nzb.Title);
|
||||||
|
|
||||||
|
string action = string.Format("mode={0}&name={1}&cat={2}&nzbname={3}", mode, name, cat, nzbName);
|
||||||
|
string request = GetSabRequest(action);
|
||||||
|
|
||||||
return "";
|
_logger.DebugFormat("Adding report [{0}] to the queue.", nzbName);
|
||||||
}
|
|
||||||
|
|
||||||
public string AddByPath(string path)
|
if (SendRequest(request) == "ok")
|
||||||
{
|
return true;
|
||||||
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public bool IsInQueue(string goodName)
|
|
||||||
{
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool IsInQueue(Episode epsiode)
|
||||||
|
{
|
||||||
|
string action = "mode=queue&output=xml";
|
||||||
|
|
||||||
|
XDocument xDoc = XDocument.Load(action);
|
||||||
|
|
||||||
|
//If an Error Occurred, retuyrn
|
||||||
|
if (xDoc.Descendants("error").Count() != 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (xDoc.Descendants("queue").Count() == 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
//Get the Count of Items in Queue where 'filename' is Equal to goodName, if not zero, return true (isInQueue)
|
||||||
|
if ((from s in xDoc.Descendants("slot") where s.Element("filename").ToString().Equals(epsiode.FeedItem.TitleFix, StringComparison.InvariantCultureIgnoreCase) select s).Count() != 0)
|
||||||
|
{
|
||||||
|
_logger.DebugFormat("Episode in queue - '{0}'", epsiode.FeedItem.TitleFix);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false; //Not in Queue
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private string GetSabRequest(string action)
|
||||||
|
{
|
||||||
|
string sabnzbdInfo = _config.GetValue("SabnzbdInfo", String.Empty, false);
|
||||||
|
string username = _config.GetValue("Username", String.Empty, false);
|
||||||
|
string password = _config.GetValue("Password", String.Empty, false);
|
||||||
|
string apiKey = _config.GetValue("ApiKey", String.Empty, false);
|
||||||
|
string priority = _config.GetValue("Priority", String.Empty, false);
|
||||||
|
|
||||||
|
return string.Format(
|
||||||
|
@"http://{0}/sabnzbd/api?$Action&priority={1}&apikey={2}&ma_username={3}&ma_password={4}",
|
||||||
|
sabnzbdInfo, priority, apiKey, username, password).Replace("$Action", action);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string SendRequest(string request)
|
||||||
|
{
|
||||||
|
var webClient = new WebClient();
|
||||||
|
string response = webClient.DownloadString(request).Replace("\n", String.Empty);
|
||||||
|
_logger.DebugFormat("Queue Repsonse: [{0}]", response);
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string CleanUrlString(string name)
|
||||||
|
{
|
||||||
|
string result = name;
|
||||||
|
string[] badCharacters =
|
||||||
|
{
|
||||||
|
"%", "<", ">", "#", "{", "}", "|", "\\", "^", "`", "[", "]", "`", ";", "/", "?",
|
||||||
|
":", "@", "=", "&", "$"
|
||||||
|
};
|
||||||
|
string[] goodCharacters =
|
||||||
|
{
|
||||||
|
"%25", "%3C", "%3E", "%23", "%7B", "%7D", "%7C", "%5C", "%5E", "%7E", "%5B",
|
||||||
|
"%5D", "%60", "%3B", "%2F", "%3F", "%3A", "%40", "%3D", "%26", "%24"
|
||||||
|
};
|
||||||
|
|
||||||
|
return result.Trim();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -130,6 +130,8 @@
|
|||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Runtime.Serialization" />
|
<Reference Include="System.Runtime.Serialization" />
|
||||||
<Reference Include="System.Web" />
|
<Reference Include="System.Web" />
|
||||||
|
<Reference Include="System.XML" />
|
||||||
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="TvdbLib, Version=0.8.8.0, Culture=neutral, processorArchitecture=MSIL" />
|
<Reference Include="TvdbLib, Version=0.8.8.0, Culture=neutral, processorArchitecture=MSIL" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
127
NzbDrone.Core/Repository/Episode.cs
Normal file
127
NzbDrone.Core/Repository/Episode.cs
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Repository
|
||||||
|
{
|
||||||
|
public class Episode
|
||||||
|
{
|
||||||
|
//Information about the current episode being processed
|
||||||
|
|
||||||
|
private const string EpisodePattern = @"
|
||||||
|
(?<showName>.*)
|
||||||
|
(?:
|
||||||
|
s(?<seasonNumber>\d+)e(?<episodeNumber>\d+)-?e(?<episodeNumber2>\d+)
|
||||||
|
| s(?<seasonNumber>\d+)e(?<episodeNumber>\d+)
|
||||||
|
| (?<seasonNumber>\d+)x(?<episodeNumber>\d+)
|
||||||
|
| (?<airDate>\d{4}.\d{2}.\d{2})
|
||||||
|
)
|
||||||
|
(?:
|
||||||
|
(?<episodeName>.*?)
|
||||||
|
(?<release>
|
||||||
|
(?:hdtv|pdtv|xvid|ws|720p|x264|bdrip|dvdrip|dsr|proper)
|
||||||
|
.*)
|
||||||
|
| (?<episodeName>.*)
|
||||||
|
)
|
||||||
|
";
|
||||||
|
public FeedItem FeedItem { get; set; }
|
||||||
|
public string ShowName { get; set; }
|
||||||
|
public string EpisodeName { get; set; }
|
||||||
|
public string EpisodeName2 { get; set; }
|
||||||
|
public int SeasonNumber { get; set; }
|
||||||
|
public int EpisodeNumber { get; set; }
|
||||||
|
public int EpisodeNumber2 { get; set; }
|
||||||
|
public DateTime AirDate { get; set; }
|
||||||
|
public string Release { get; set; }
|
||||||
|
public int Quality { get; set; }
|
||||||
|
|
||||||
|
public bool IsProper
|
||||||
|
{
|
||||||
|
get { return FeedItem.Title.Contains("PROPER"); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsDaily
|
||||||
|
{
|
||||||
|
get { return AirDate != DateTime.MinValue; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsMulti
|
||||||
|
{
|
||||||
|
get { return SeasonNumber != 0 && EpisodeNumber != 0 && EpisodeNumber2 != 0; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string EpisodeTitle
|
||||||
|
{
|
||||||
|
get { return IsDaily ? GetDailyEpisode() : IsMulti ? GetMultiEpisode() : GetSeasonEpisode(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Title
|
||||||
|
{
|
||||||
|
get { return string.Format("{0} - {1}", ShowName, EpisodeTitle); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return string.Format("{0} - {1}", ShowName, EpisodeTitle);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetDailyEpisode()
|
||||||
|
{
|
||||||
|
return AirDate.ToString("yyyy-MM-dd");
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetMultiEpisode()
|
||||||
|
{
|
||||||
|
return string.Format("{0}x{1:D2}-{0}x{2:D2}", SeasonNumber, EpisodeNumber, EpisodeNumber2);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetSeasonEpisode()
|
||||||
|
{
|
||||||
|
return string.Format("{0}x{1:D2}", SeasonNumber, EpisodeNumber);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Episode Parse(FeedItem feedItem)
|
||||||
|
{
|
||||||
|
Match match = Regex.Match(feedItem.Title, EpisodePattern,
|
||||||
|
RegexOptions.IgnorePatternWhitespace | RegexOptions.IgnoreCase);
|
||||||
|
|
||||||
|
if (!match.Success)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return new Episode
|
||||||
|
{
|
||||||
|
ShowName = ReplaceSeparatorChars(match.Groups["showName"].Value),
|
||||||
|
SeasonNumber = ParseInt(match.Groups["seasonNumber"].Value),
|
||||||
|
EpisodeNumber = ParseInt(match.Groups["episodeNumber"].Value),
|
||||||
|
EpisodeNumber2 = ParseInt(match.Groups["episodeNumber2"].Value),
|
||||||
|
EpisodeName = ReplaceSeparatorChars(match.Groups["episodeName"].Value),
|
||||||
|
Release = ReplaceSeparatorChars(match.Groups["release"].Value)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string ReplaceSeparatorChars(string s)
|
||||||
|
{
|
||||||
|
if (s == null) return string.Empty;
|
||||||
|
return s.Replace('.', ' ').Replace('-', ' ').Replace('_', ' ').Trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int ParseInt(string s)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
int.TryParse(s, out i);
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static DateTime ParseAirDate(string s)
|
||||||
|
{
|
||||||
|
DateTime d;
|
||||||
|
if (DateTime.TryParse(ReplaceSeparatorChars(s).Replace(' ', '-'), out d))
|
||||||
|
return d;
|
||||||
|
return DateTime.MinValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
16
NzbDrone.Core/Repository/FeedItem.cs
Normal file
16
NzbDrone.Core/Repository/FeedItem.cs
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Repository
|
||||||
|
{
|
||||||
|
public class FeedItem
|
||||||
|
{
|
||||||
|
//Item from the NZB Feed waiting tp be processed.
|
||||||
|
public string Description { get; set; }
|
||||||
|
public string Title { get; set; }
|
||||||
|
public string TitleFix { get; set; }
|
||||||
|
public string NzbId { get; set; }
|
||||||
|
}
|
||||||
|
}
|
21
NzbDrone.Core/Repository/ItemInfo.cs
Normal file
21
NzbDrone.Core/Repository/ItemInfo.cs
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Repository
|
||||||
|
{
|
||||||
|
public class ItemInfo
|
||||||
|
{
|
||||||
|
public string Id { get; set; }
|
||||||
|
public string Title { get; set; }
|
||||||
|
public Site Site { get; set; }
|
||||||
|
public Uri Link { get; set; }
|
||||||
|
public string Description { get; set; }
|
||||||
|
|
||||||
|
public bool IsPassworded()
|
||||||
|
{
|
||||||
|
return Title.EndsWith("(Passworded)", StringComparison.InvariantCultureIgnoreCase);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
36
NzbDrone.Core/Repository/Site.cs
Normal file
36
NzbDrone.Core/Repository/Site.cs
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Repository
|
||||||
|
{
|
||||||
|
public class Site
|
||||||
|
{
|
||||||
|
private static readonly IList<Site> Sites = new List<Site>
|
||||||
|
{
|
||||||
|
new Site {Name = "nzbmatrix", Url = "nzbmatrix.com", Pattern = @"\d{6,10}"},
|
||||||
|
new Site {Name = "nzbsDotOrg", Url = "nzbs.org", Pattern = @"\d{5,10}"},
|
||||||
|
new Site {Name = "nzbsrus", Url = "nzbsrus.com", Pattern = @"\d{6,10}"},
|
||||||
|
new Site {Name = "lilx", Url = "lilx.net", Pattern = @"\d{6,10}"},
|
||||||
|
};
|
||||||
|
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string Pattern { get; set; }
|
||||||
|
public string Url { get; set; }
|
||||||
|
|
||||||
|
// TODO: use HttpUtility.ParseQueryString();
|
||||||
|
// https://nzbmatrix.com/api-nzb-download.php?id=626526
|
||||||
|
public string ParseId(string url)
|
||||||
|
{
|
||||||
|
return Regex.Match(url, Pattern).Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Site Parse(string url)
|
||||||
|
{
|
||||||
|
return Sites.Where(site => url.Contains(site.Url)).SingleOrDefault() ??
|
||||||
|
new Site { Name = "unknown", Pattern = @"\d{6,10}" };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user