github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-16 10:03:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed Unit Test for SabController.AddByUrl

Browse source 
Added unit test for SabController.IsInQueue (Need to Mock SAB)
SabController uses HttpUtility.UrlEncode on Title to clean it
This commit is contained in:
markus101 2010-09-27 00:19:43 -07:00
parent 67b617b950
commit 50f97e824e
3 changed files with 53 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
NzbDrone.Core/Controllers/SabController.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Web;
using log4net;
using System.Xml.Linq;
using System.Xml;
@ -28,7 +29,7 @@ namespace NzbDrone.Core.Controllers
const string mode = "addurl";
const string cat = "tv";
string name = nzb.Link.ToString().Replace("&", "%26");
string nzbName = CleanUrlString(nzb.Title);
string nzbName = HttpUtility.UrlEncode(nzb.Title);
string action = string.Format("mode={0}&name={1}&cat={2}&nzbname={3}", mode, name, cat, nzbName);
string request = GetSabRequest(action);
@ -45,7 +46,7 @@ namespace NzbDrone.Core.Controllers
{
string action = "mode=queue&output=xml";
XDocument xDoc = XDocument.Load(action);
XDocument xDoc = XDocument.Load(GetSabRequest(action));
//If an Error Occurred, retuyrn
if (xDoc.Descendants("error").Count() != 0)
@ -87,22 +88,5 @@ namespace NzbDrone.Core.Controllers
_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();
}
}
}