diff --git a/src/Jackett/Content/logos/privatehd.png b/src/Jackett/Content/logos/privatehd.png new file mode 100644 index 000000000..bb3eb495f Binary files /dev/null and b/src/Jackett/Content/logos/privatehd.png differ diff --git a/src/Jackett/Controllers/APIController.cs b/src/Jackett/Controllers/APIController.cs index 8b28ef0bc..6435cff45 100644 --- a/src/Jackett/Controllers/APIController.cs +++ b/src/Jackett/Controllers/APIController.cs @@ -29,9 +29,9 @@ namespace Jackett.Controllers } [HttpGet] - public async Task Call(string indexerName) + public async Task Call(string indexerID) { - var indexer = indexerService.GetIndexer(indexerName); + var indexer = indexerService.GetIndexer(indexerID); var torznabQuery = TorznabQuery.FromHttpQuery(HttpUtility.ParseQueryString(Request.RequestUri.Query)); if (string.Equals(torznabQuery.QueryType, "caps", StringComparison.InvariantCultureIgnoreCase)) @@ -70,7 +70,7 @@ namespace Jackett.Controllers continue; var originalLink = release.Link; var encodedLink = HttpServerUtility.UrlTokenEncode(Encoding.UTF8.GetBytes(originalLink.ToString())) + "/download.torrent"; - var proxyLink = string.Format("{0}api/{1}/download/{2}", severUrl, indexer.DisplayName, encodedLink); + var proxyLink = string.Format("{0}api/{1}/download/{2}", severUrl, indexer.ID, encodedLink); release.Link = new Uri(proxyLink); } diff --git a/src/Jackett/Controllers/DownloadController.cs b/src/Jackett/Controllers/DownloadController.cs index a43fcb6ff..1b7496b0c 100644 --- a/src/Jackett/Controllers/DownloadController.cs +++ b/src/Jackett/Controllers/DownloadController.cs @@ -26,11 +26,11 @@ namespace Jackett.Controllers } [HttpGet] - public async Task Download(string indexerName, string path) + public async Task Download(string indexerID, string path) { try { - var indexer = indexerService.GetIndexer(indexerName); + var indexer = indexerService.GetIndexer(indexerID); var remoteFile = Encoding.UTF8.GetString(HttpServerUtility.UrlTokenDecode(path)); var downloadBytes = await indexer.Download(new Uri(remoteFile)); @@ -41,7 +41,7 @@ namespace Jackett.Controllers } catch (Exception e) { - logger.Error(e, "Error downloading " + indexerName + " " + path); + logger.Error(e, "Error downloading " + indexerID + " " + path); return new HttpResponseMessage(HttpStatusCode.NotFound); } } diff --git a/src/Jackett/Indexers/BB.cs b/src/Jackett/Indexers/BB.cs index e23c56f82..6eadcee5a 100644 --- a/src/Jackett/Indexers/BB.cs +++ b/src/Jackett/Indexers/BB.cs @@ -130,28 +130,7 @@ namespace Jackett.Indexers release.Link = new Uri(BaseUrl + "/" + qDownload.Attr("href")); var dateStr = row.ChildElements.ElementAt(3).Cq().Text().Trim().Replace(" and", ""); - var dateParts = dateStr.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); - TimeSpan timeAgo = TimeSpan.Zero; - for (var i = 0; i < dateParts.Length / 2; i++) - { - var val = ParseUtil.CoerceInt(dateParts[i * 2]); - var unit = dateParts[i * 2 + 1]; - if (unit.Contains("sec")) - timeAgo += TimeSpan.FromSeconds(val); - else if (unit.Contains("min")) - timeAgo += TimeSpan.FromMinutes(val); - else if (unit.Contains("hour")) - timeAgo += TimeSpan.FromHours(val); - else if (unit.Contains("day")) - timeAgo += TimeSpan.FromDays(val); - else if (unit.Contains("week")) - timeAgo += TimeSpan.FromDays(val * 7); - else if (unit.Contains("month")) - timeAgo += TimeSpan.FromDays(val * 30); - else if (unit.Contains("year")) - timeAgo += TimeSpan.FromDays(val * 365); - } - release.PublishDate = DateTime.SpecifyKind(DateTime.Now - timeAgo, DateTimeKind.Local); + release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); var sizeStr = row.ChildElements.ElementAt(4).Cq().Text().Trim(); var sizeParts = sizeStr.Split(' '); diff --git a/src/Jackett/Indexers/BeyondHD.cs b/src/Jackett/Indexers/BeyondHD.cs index b8e082d00..c71f5d86f 100644 --- a/src/Jackett/Indexers/BeyondHD.cs +++ b/src/Jackett/Indexers/BeyondHD.cs @@ -114,24 +114,7 @@ namespace Jackett.Indexers release.Guid = release.Comments; var dateStr = descCol.ChildElements.Last().Cq().Text().Split('|').Last().ToLowerInvariant().Replace("ago.", "").Trim(); - var dateParts = dateStr.Split(new char[] { ' ', ' ' }, StringSplitOptions.RemoveEmptyEntries); - var timeSpan = TimeSpan.Zero; - for (var i = 0; i < dateParts.Length / 2; i++) - { - var timeVal = ParseUtil.CoerceInt(dateParts[i * 2]); - var timeUnit = dateParts[i * 2 + 1]; - if (timeUnit.Contains("year")) - timeSpan += TimeSpan.FromDays(365 * timeVal); - else if (timeUnit.Contains("month")) - timeSpan += TimeSpan.FromDays(30 * timeVal); - else if (timeUnit.Contains("day")) - timeSpan += TimeSpan.FromDays(timeVal); - else if (timeUnit.Contains("hour")) - timeSpan += TimeSpan.FromHours(timeVal); - else if (timeUnit.Contains("min")) - timeSpan += TimeSpan.FromMinutes(timeVal); - } - release.PublishDate = DateTime.SpecifyKind(DateTime.Now - timeSpan, DateTimeKind.Local); + release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); var sizeEl = row.ChildElements.ElementAt(7); var sizeVal = ParseUtil.CoerceFloat(sizeEl.ChildNodes.First().NodeValue); diff --git a/src/Jackett/Indexers/HDTorrents.cs b/src/Jackett/Indexers/HDTorrents.cs index 73ccdb38e..643c5385f 100644 --- a/src/Jackett/Indexers/HDTorrents.cs +++ b/src/Jackett/Indexers/HDTorrents.cs @@ -169,22 +169,7 @@ namespace Jackett.Indexers string fullSize = qRow.Find("td.mainblockcontent").Get(6).InnerText; string[] sizeSplit = fullSize.Split(' '); - switch (sizeSplit[1].ToLower()) - { - case "kb": - size = ReleaseInfo.BytesFromKB(ParseUtil.CoerceFloat(sizeSplit[0])); - break; - case "mb": - size = ReleaseInfo.BytesFromMB(ParseUtil.CoerceFloat(sizeSplit[0])); - break; - case "gb": - size = ReleaseInfo.BytesFromGB(ParseUtil.CoerceFloat(sizeSplit[0])); - break; - default: - size = null; - break; - } - release.Size = size; + release.Size = ReleaseInfo.GetBytes(sizeSplit[1], ParseUtil.CoerceFloat(sizeSplit[0])); release.Guid = new Uri(SiteLink + "/" + qRow.Find("td.mainblockcontent b a").Attr("href")); release.Link = new Uri(SiteLink + "/" + qRow.Find("td.mainblockcontent").Get(3).FirstChild.GetAttribute("href")); diff --git a/src/Jackett/Indexers/IPTorrents.cs b/src/Jackett/Indexers/IPTorrents.cs index dd351fbf5..802e7c02e 100644 --- a/src/Jackett/Indexers/IPTorrents.cs +++ b/src/Jackett/Indexers/IPTorrents.cs @@ -33,7 +33,7 @@ namespace Jackett.Indexers logger: l) { SearchUrl = SiteLink + "t?q="; - webclient =wc; + webclient = wc; } public Task GetConfigurationForSetup() @@ -58,7 +58,8 @@ namespace Jackett.Indexers Url = SiteLink.ToString(), PostData = pairs, Referer = SiteLink.ToString(), - Type = RequestType.POST + Type = RequestType.POST, + AutoRedirect = true }); cookieHeader = response.Cookies; @@ -91,16 +92,7 @@ namespace Jackett.Indexers } } - HttpRequestMessage CreateHttpRequest(Uri uri) - { - var message = new HttpRequestMessage(); - message.Method = HttpMethod.Get; - message.RequestUri = uri; - message.Headers.UserAgent.ParseAdd(BrowserUtil.ChromeUserAgent); - return message; - } - - public void LoadFromSavedConfiguration(Newtonsoft.Json.Linq.JToken jsonConfig) + public void LoadFromSavedConfiguration(JToken jsonConfig) { cookieHeader = (string)jsonConfig["cookies"]; IsConfigured = true; @@ -137,27 +129,10 @@ namespace Jackett.Indexers release.Guid = new Uri(SiteLink + qTitleLink.Attr("href")); release.Comments = release.Guid; - DateTime pubDate; var descString = qRow.Find(".t_ctime").Text(); var dateString = descString.Split('|').Last().Trim(); dateString = dateString.Split(new string[] { " by " }, StringSplitOptions.None)[0]; - var dateValue = ParseUtil.CoerceFloat(dateString.Split(' ')[0]); - var dateUnit = dateString.Split(' ')[1]; - if (dateUnit.Contains("minute")) - pubDate = DateTime.Now - TimeSpan.FromMinutes(dateValue); - else if (dateUnit.Contains("hour")) - pubDate = DateTime.Now - TimeSpan.FromHours(dateValue); - else if (dateUnit.Contains("day")) - pubDate = DateTime.Now - TimeSpan.FromDays(dateValue); - else if (dateUnit.Contains("week")) - pubDate = DateTime.Now - TimeSpan.FromDays(7 * dateValue); - else if (dateUnit.Contains("month")) - pubDate = DateTime.Now - TimeSpan.FromDays(30 * dateValue); - else if (dateUnit.Contains("year")) - pubDate = DateTime.Now - TimeSpan.FromDays(365 * dateValue); - else - pubDate = DateTime.MinValue; - release.PublishDate = pubDate; + release.PublishDate = DateTimeUtil.FromTimeAgo(dateString); var qLink = row.ChildElements.ElementAt(3).Cq().Children("a"); release.Link = new Uri(SiteLink + qLink.Attr("href")); diff --git a/src/Jackett/Indexers/PrivateHD.cs b/src/Jackett/Indexers/PrivateHD.cs new file mode 100644 index 000000000..6c41ada3d --- /dev/null +++ b/src/Jackett/Indexers/PrivateHD.cs @@ -0,0 +1,167 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Jackett.Models; +using Newtonsoft.Json.Linq; +using NLog; +using Jackett.Utils; +using System.Net; +using System.Net.Http; +using CsQuery; +using System.Web; +using Jackett.Services; +using Jackett.Utils.Clients; +using System.Text.RegularExpressions; + +namespace Jackett.Indexers +{ + public class PrivateHD : BaseIndexer, IIndexer + { + private readonly string LoginUrl = ""; + private readonly string SearchUrl = ""; + private string cookieHeader = ""; + + private IWebClient webclient; + + public PrivateHD(IIndexerManagerService i, IWebClient wc, Logger l) + : base(name: "PrivateHD", + description: "BitTorrent site for High Quality, High Definition (HD) movies and TV Shows", + link: new Uri("https://privatehd.to"), + caps: TorznabCapsUtil.CreateDefaultTorznabTVCaps(), + manager: i, + logger: l) + { + LoginUrl = SiteLink + "auth/login"; + SearchUrl = SiteLink + "torrents?in=1&type=2&search={0}"; + webclient = wc; + } + + public async Task ApplyConfiguration(JToken configJson) + { + var config = new ConfigurationDataBasicLogin(); + config.LoadValuesFromJson(configJson); + + var loginPage = await webclient.GetString(new Utils.Clients.WebRequest() + { + Url = LoginUrl, + Type = RequestType.GET, + AutoRedirect = true, + }); + + var token = new Regex("Avz.CSRF_TOKEN = '(.*?)';").Match(loginPage.Content).Groups[1].ToString(); + var pairs = new Dictionary { + { "_token", token }, + { "username_email", config.Username.Value }, + { "password", config.Password.Value }, + { "remember", "on" } + }; + + var response = await webclient.GetString(new Utils.Clients.WebRequest() + { + Url = LoginUrl, + PostData = pairs, + Referer = LoginUrl, + Type = RequestType.POST, + AutoRedirect = true, + Cookies = loginPage.Cookies + }); + + if (!response.Content.Contains("auth/logout")) + { + CQ dom = response.Content; + var messageEl = dom[".form-error"]; + var errorMessage = messageEl.Text().Trim(); + throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)config); + } + else + { + cookieHeader = response.Cookies; + var configSaveData = new JObject(); + configSaveData["cookies"] = cookieHeader; + SaveConfig(configSaveData); + IsConfigured = true; + } + + } + + public async Task Download(Uri link) + { + var response = await webclient.GetBytes(new Utils.Clients.WebRequest() + { + Url = link.ToString(), + Cookies = cookieHeader + }); + + return response.Content; + } + + public Task GetConfigurationForSetup() + { + var config = new ConfigurationDataBasicLogin(); + return Task.FromResult(config); + } + + public void LoadFromSavedConfiguration(JToken jsonConfig) + { + cookieHeader = (string)jsonConfig["cookies"]; + IsConfigured = true; + } + + public async Task PerformQuery(TorznabQuery query) + { + List releases = new List(); + + var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString(); + var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString)); + + var response = await webclient.GetString(new Utils.Clients.WebRequest() + { + Url = episodeSearchUrl, + Referer = SiteLink.ToString(), + Cookies = cookieHeader + }); + var results = response.Content; + + try + { + CQ dom = results; + var rows = dom["table > tbody > tr"]; + foreach (var row in rows) + { + CQ qRow = row.Cq(); + var release = new ReleaseInfo(); + + release.MinimumRatio = 1; + release.MinimumSeedTime = 172800; + + var qLink = row.ChildElements.ElementAt(1).FirstElementChild.Cq(); + release.Title = qLink.Text().Trim(); + release.Comments = new Uri(qLink.Attr("href")); + release.Guid = release.Comments; + + var qDownload = row.ChildElements.ElementAt(3).FirstElementChild.Cq(); + release.Link = new Uri(qDownload.Attr("href")); + + var dateStr = row.ChildElements.ElementAt(5).Cq().Text().Trim(); + release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); + + var sizeStr = row.ChildElements.ElementAt(6).Cq().Text().Trim(); + var sizeParts = sizeStr.Split(new char[0], StringSplitOptions.RemoveEmptyEntries); + release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0])); + + release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text()); + release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders; + + releases.Add(release); + } + } + catch (Exception ex) + { + OnParseError(results, ex); + } + return releases.ToArray(); + } + } +} diff --git a/src/Jackett/Indexers/TorrentDay.cs b/src/Jackett/Indexers/TorrentDay.cs index ca4107c8d..e5fa4323d 100644 --- a/src/Jackett/Indexers/TorrentDay.cs +++ b/src/Jackett/Indexers/TorrentDay.cs @@ -137,24 +137,7 @@ namespace Jackett.Indexers release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0])); var dateStr = qRow.Find(".ulInfo").Text().Split('|').Last().Trim(); - var dateParts = dateStr.Split(' '); - var dateValue = ParseUtil.CoerceInt(dateParts[0]); - TimeSpan ts = TimeSpan.Zero; - if (dateStr.Contains("sec")) - ts = TimeSpan.FromSeconds(dateValue); - else if (dateStr.Contains("min")) - ts = TimeSpan.FromMinutes(dateValue); - else if (dateStr.Contains("hour")) - ts = TimeSpan.FromHours(dateValue); - else if (dateStr.Contains("day")) - ts = TimeSpan.FromDays(dateValue); - else if (dateStr.Contains("week")) - ts = TimeSpan.FromDays(dateValue * 7); - else if (dateStr.Contains("month")) - ts = TimeSpan.FromDays(dateValue * 30); - else if (dateStr.Contains("year")) - ts = TimeSpan.FromDays(dateValue * 365); - release.PublishDate = DateTime.Now - ts; + release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); release.Seeders = ParseUtil.CoerceInt(qRow.Find(".seedersInfo").Text()); release.Peers = ParseUtil.CoerceInt(qRow.Find(".leechersInfo").Text()) + release.Seeders; diff --git a/src/Jackett/Indexers/TorrentShack.cs b/src/Jackett/Indexers/TorrentShack.cs index b466f7568..321ce56c6 100644 --- a/src/Jackett/Indexers/TorrentShack.cs +++ b/src/Jackett/Indexers/TorrentShack.cs @@ -118,31 +118,7 @@ namespace Jackett.Indexers release.Link = new Uri(SiteLink + "/" + qRow.Find(".torrent_handle_links > a").First().Attr("href")); var dateStr = qRow.Find(".time").Text().Trim(); - if (dateStr.ToLower().Contains("just now")) - release.PublishDate = DateTime.Now; - else - { - var dateParts = dateStr.Split(' '); - var dateValue = ParseUtil.CoerceInt(dateParts[0]); - TimeSpan ts = TimeSpan.Zero; - if (dateStr.Contains("Just now")) - ts = TimeSpan.Zero; - else if (dateStr.Contains("sec")) - ts = TimeSpan.FromSeconds(dateValue); - else if (dateStr.Contains("min")) - ts = TimeSpan.FromMinutes(dateValue); - else if (dateStr.Contains("hour")) - ts = TimeSpan.FromHours(dateValue); - else if (dateStr.Contains("day")) - ts = TimeSpan.FromDays(dateValue); - else if (dateStr.Contains("week")) - ts = TimeSpan.FromDays(dateValue * 7); - else if (dateStr.Contains("month")) - ts = TimeSpan.FromDays(dateValue * 30); - else if (dateStr.Contains("year")) - ts = TimeSpan.FromDays(dateValue * 365); - release.PublishDate = DateTime.Now - ts; - } + release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); var sizeStr = qRow.Find(".size")[0].ChildNodes[0].NodeValue.Trim(); var sizeParts = sizeStr.Split(' '); diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj index 1091c6eb6..f3128a72b 100644 --- a/src/Jackett/Jackett.csproj +++ b/src/Jackett/Jackett.csproj @@ -155,6 +155,7 @@ + @@ -283,6 +284,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/src/Jackett/Startup.cs b/src/Jackett/Startup.cs index a69a022b5..01c1cf70a 100644 --- a/src/Jackett/Startup.cs +++ b/src/Jackett/Startup.cs @@ -51,19 +51,19 @@ namespace Jackett config.Routes.MapHttpRoute( name: "apiDefault", - routeTemplate: "api/{indexerName}", + routeTemplate: "api/{indexerID}", defaults: new { controller = "API", action = "Call" } ); config.Routes.MapHttpRoute( name: "api", - routeTemplate: "api/{indexerName}/api", + routeTemplate: "api/{indexerID}/api", defaults: new { controller = "API", action = "Call" } ); config.Routes.MapHttpRoute( name: "download", - routeTemplate: "api/{indexerName}/download/{path}/download.torrent", + routeTemplate: "api/{indexerID}/download/{path}/download.torrent", defaults: new { controller = "Download", action = "Download" } ); diff --git a/src/Jackett/Utils/Clients/WebRequest.cs b/src/Jackett/Utils/Clients/WebRequest.cs index b18e6a860..487b844e9 100644 --- a/src/Jackett/Utils/Clients/WebRequest.cs +++ b/src/Jackett/Utils/Clients/WebRequest.cs @@ -19,6 +19,7 @@ namespace Jackett.Utils.Clients public string Cookies { get; set; } public string Referer { get; set; } public RequestType Type { get; set; } + public bool AutoRedirect { get; set; } } public enum RequestType diff --git a/src/Jackett/Utils/Clients/WindowsWebClient.cs b/src/Jackett/Utils/Clients/WindowsWebClient.cs index 1c7ff8be9..7be704154 100644 --- a/src/Jackett/Utils/Clients/WindowsWebClient.cs +++ b/src/Jackett/Utils/Clients/WindowsWebClient.cs @@ -13,16 +13,18 @@ namespace Jackett.Utils.Clients class WindowsWebClient : IWebClient { private Logger logger; + CookieContainer cookies; public WindowsWebClient(Logger l) { logger = l; + cookies = new CookieContainer(); } public async Task GetBytes(WebRequest request) { logger.Debug(string.Format("WindowsWebClient:GetBytes(Url:{0})", request.Url)); - var cookies = new CookieContainer(); + if (!string.IsNullOrEmpty(request.Cookies)) { @@ -45,7 +47,6 @@ namespace Jackett.Utils.Clients CookieContainer = cookies, AllowAutoRedirect = false, UseCookies = true, - }); client.DefaultRequestHeaders.Add("User-Agent", BrowserUtil.ChromeUserAgent); @@ -92,9 +93,8 @@ namespace Jackett.Utils.Clients var client = new HttpClient(new HttpClientHandler { CookieContainer = cookies, - AllowAutoRedirect = false, + AllowAutoRedirect = request.AutoRedirect, UseCookies = true, - }); client.DefaultRequestHeaders.Add("User-Agent", BrowserUtil.ChromeUserAgent); diff --git a/src/Jackett/Utils/DateTimeUtil.cs b/src/Jackett/Utils/DateTimeUtil.cs index 093df7a76..81b0c5c0c 100644 --- a/src/Jackett/Utils/DateTimeUtil.cs +++ b/src/Jackett/Utils/DateTimeUtil.cs @@ -14,5 +14,43 @@ namespace Jackett.Utils long unixTimeStampInTicks = (long)(unixTime * TimeSpan.TicksPerSecond); return new DateTime(unixStart.Ticks + unixTimeStampInTicks); } + + // ex: "2 hours 1 day" + public static DateTime FromTimeAgo(string str) + { + str = str.ToLowerInvariant(); + if (str.Contains("now")) + { + return DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); + } + + var dateParts = str.Split(new char[0], StringSplitOptions.RemoveEmptyEntries); + TimeSpan timeAgo = TimeSpan.Zero; + for (var i = 0; i < dateParts.Length / 2; i++) + { + var val = ParseUtil.CoerceFloat(dateParts[i * 2]); + var unit = dateParts[i * 2 + 1]; + if (unit.Contains("sec")) + timeAgo += TimeSpan.FromSeconds(val); + else if (unit.Contains("min")) + timeAgo += TimeSpan.FromMinutes(val); + else if (unit.Contains("hour")) + timeAgo += TimeSpan.FromHours(val); + else if (unit.Contains("day")) + timeAgo += TimeSpan.FromDays(val); + else if (unit.Contains("week")) + timeAgo += TimeSpan.FromDays(val * 7); + else if (unit.Contains("month")) + timeAgo += TimeSpan.FromDays(val * 30); + else if (unit.Contains("year")) + timeAgo += TimeSpan.FromDays(val * 365); + else + { + throw new Exception("TimeAgo parsing failed"); + } + } + + return DateTime.SpecifyKind(DateTime.Now - timeAgo, DateTimeKind.Local); + } } } diff --git a/src/Jackett/Utils/ParseUtil.cs b/src/Jackett/Utils/ParseUtil.cs index c96e2be7a..7af729426 100644 --- a/src/Jackett/Utils/ParseUtil.cs +++ b/src/Jackett/Utils/ParseUtil.cs @@ -11,33 +11,33 @@ namespace Jackett.Utils { public static float CoerceFloat(string str) { - return float.Parse(str, NumberStyles.Any, CultureInfo.InvariantCulture); + return float.Parse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture); } public static int CoerceInt(string str) { - return int.Parse(str, NumberStyles.Any, CultureInfo.InvariantCulture); + return int.Parse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture); } public static long CoerceLong(string str) { - return long.Parse(str, NumberStyles.Any, CultureInfo.InvariantCulture); + return long.Parse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture); } public static bool TryCoerceFloat(string str, out float result) { - return float.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out result); + return float.TryParse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out result); } public static bool TryCoerceInt(string str, out int result) { - return int.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out result); + return int.TryParse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out result); } public static bool TryCoerceLong(string str, out long result) { - return long.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out result); + return long.TryParse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out result); } }