diff --git a/README.md b/README.md index e98ec3a2a..8a52c5580 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ Download in the [Releases page](https://github.com/zone117x/Jackett/releases) * [SceneAccess](https://sceneaccess.eu/login) * [ShowRSS](https://showrss.info/) * [Torrentz](https://torrentz.eu/) + * [HD-Torrents.org](https://hd-torrents.org/) ### Additional Trackers diff --git a/src/Jackett/Indexers/HDTorrents.cs b/src/Jackett/Indexers/HDTorrents.cs index 243c2a17f..25abcb125 100644 --- a/src/Jackett/Indexers/HDTorrents.cs +++ b/src/Jackett/Indexers/HDTorrents.cs @@ -164,15 +164,29 @@ namespace Jackett.Indexers release.Description = release.Title; if (0 != qRow.Find("td.mainblockcontent u").Length) - release.Imdb = ParseUtil.TryCoerceLong(qRow.Find("td.mainblockcontent u").Parent().First().Attr("href").Replace("http://www.imdb.com/title/tt", "").Replace("/", "")); + { + var imdbStr = qRow.Find("td.mainblockcontent u").Parent().First().Attr("href").Replace("http://www.imdb.com/title/tt", "").Replace("/", ""); + long imdb; + if (ParseUtil.TryCoerceLong(imdbStr, out imdb)) + { + release.Imdb = imdb; + } + } release.MinimumRatio = 1; release.MinimumSeedTime = 172800; release.MagnetUri = new Uri(DefaultUrl + "/" + qRow.Find("td.mainblockcontent").Get(3).FirstChild.GetAttribute("href")); - release.Seeders = ParseUtil.TryCoerceInt(qRow.Find("td").Get(9).FirstChild.FirstChild.InnerText); - release.Peers = ParseUtil.TryCoerceInt(qRow.Find("td").Get(10).FirstChild.FirstChild.InnerText); + int seeders, peers; + if (ParseUtil.TryCoerceInt(qRow.Find("td").Get(9).FirstChild.FirstChild.InnerText, out seeders)) + { + release.Seeders = seeders; + if (ParseUtil.TryCoerceInt(qRow.Find("td").Get(10).FirstChild.FirstChild.InnerText, out peers)) + { + release.Peers = peers + release.Seeders; + } + } string fullSize = qRow.Find("td.mainblockcontent").Get(6).InnerText; string[] sizeSplit = fullSize.Split(' '); diff --git a/src/Jackett/Indexers/Torrentz.cs b/src/Jackett/Indexers/Torrentz.cs index 85d019ad5..d822f93a8 100644 --- a/src/Jackett/Indexers/Torrentz.cs +++ b/src/Jackett/Indexers/Torrentz.cs @@ -144,7 +144,7 @@ namespace Jackett.Indexers release.InfoHash = td.hash; release.Size = td.Size; release.Seeders = td.Seeders; - release.Peers = td.Peers; + release.Peers = td.Peers + release.Seeders; release.MagnetUri = TorrentzHelper.createMagnetLink(td.hash, serie_title); releases.Add(release); } diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj index 9773b7ea2..5ba2dc7e8 100644 --- a/src/Jackett/Jackett.csproj +++ b/src/Jackett/Jackett.csproj @@ -164,7 +164,9 @@ PreserveNewest - + + PreserveNewest + PreserveNewest diff --git a/src/Jackett/ParseUtil.cs b/src/Jackett/ParseUtil.cs index d7dfcdece..9b62c0027 100644 --- a/src/Jackett/ParseUtil.cs +++ b/src/Jackett/ParseUtil.cs @@ -25,25 +25,19 @@ namespace Jackett } - public static float TryCoerceFloat(string str) + public static bool TryCoerceFloat(string str, out float result) { - float val; - float.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out val); - return val; + return float.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out result); } - public static int TryCoerceInt(string str) + public static bool TryCoerceInt(string str, out int result) { - int val; - int.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out val); - return val; + return int.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out result); } - public static long TryCoerceLong(string str) + public static bool TryCoerceLong(string str, out long result) { - long val; - long.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out val); - return val; + return long.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out result); } } diff --git a/src/Jackett/Server.cs b/src/Jackett/Server.cs index 3931b8137..30e060746 100644 --- a/src/Jackett/Server.cs +++ b/src/Jackett/Server.cs @@ -90,7 +90,9 @@ namespace Jackett } } else + { Program.LoggerInstance.FatalException("Failed to start HTTP server. " + ex.Message, ex); + } } catch (Exception ex) { diff --git a/src/Jackett/WebContent/logos/hdtorrents.png b/src/Jackett/WebContent/logos/hdtorrents.png index 31254c372..0817e54d0 100644 Binary files a/src/Jackett/WebContent/logos/hdtorrents.png and b/src/Jackett/WebContent/logos/hdtorrents.png differ