shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced most indexers' byte size string parsing with shared helper function

Browse Source
This commit is contained in:
unknown
2015-07-25 21:53:53 -06:00
parent abdca8cee8
commit 01dc9cb0a5
21 changed files with 34 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -24,6 +24,7 @@ Download in the [Releases page](https://github.com/zone117x/Jackett/releases)
### Supported Trackers ### Supported Trackers
* [AlphaRatio](https://alpharatio.cc/) * [AlphaRatio](https://alpharatio.cc/)
* [AnimeBytes](https://animebytes.tv/) * [AnimeBytes](https://animebytes.tv/)
* [BakaBT](http://bakabt.me/)
* [bB](http://reddit.com/r/baconbits) * [bB](http://reddit.com/r/baconbits)
* [BeyondHD](https://beyondhd.me/) * [BeyondHD](https://beyondhd.me/)
* [BIT-HDTV](https://www.bit-hdtv.com) * [BIT-HDTV](https://www.bit-hdtv.com)
@@ -47,7 +48,6 @@ Download in the [Releases page](https://github.com/zone117x/Jackett/releases)
* [TorrentLeech](http://www.torrentleech.org/) * [TorrentLeech](http://www.torrentleech.org/)
* [TorrentShack](http://torrentshack.me/) * [TorrentShack](http://torrentshack.me/)
* [Torrentz](https://torrentz.eu/) * [Torrentz](https://torrentz.eu/)
* [BakaBT](http://bakabt.me/)
### Additional Trackers ### Additional Trackers

3
src/Jackett/Indexers/AnimeBytes.cs
View File

@@ -353,8 +353,7 @@ namespace Jackett.Indexers
var size = rowCq.Find(".torrent_size"); var size = rowCq.Find(".torrent_size");
if (size.Count() > 0) if (size.Count() > 0)
{ {
var sizeParts = size.First().Text().Split(' '); release.Size = ReleaseInfo.GetBytes(size.First().Text());
release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0]));
} }
// Additional 5 hours per GB // Additional 5 hours per GB

5
src/Jackett/Indexers/BB.cs
View File

@@ -132,9 +132,8 @@ namespace Jackett.Indexers
var dateStr = row.ChildElements.ElementAt(3).Cq().Text().Trim().Replace(" and", ""); var dateStr = row.ChildElements.ElementAt(3).Cq().Text().Trim().Replace(" and", "");
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
var sizeStr = row.ChildElements.ElementAt(4).Cq().Text().Trim(); var sizeStr = row.ChildElements.ElementAt(4).Cq().Text();
var sizeParts = sizeStr.Split(' '); release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0]));
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim()); release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text().Trim()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text().Trim()) + release.Seeders;

4
src/Jackett/Indexers/BakaBT.cs
View File

@@ -185,8 +185,8 @@ namespace Jackett.Indexers
release.MinimumRatio = 1; release.MinimumRatio = 1;
var size = qRow.Find(".size").First().Text().Split(' '); var size = qRow.Find(".size").First().Text();
release.Size = ReleaseInfo.GetBytes(size[1], ParseUtil.CoerceFloat(size[0])); release.Size = ReleaseInfo.GetBytes(size);
//22 Jul 15 //22 Jul 15
var dateStr = qRow.Find(".added . datetime").First().Text().Replace("'", string.Empty); var dateStr = qRow.Find(".added . datetime").First().Text().Replace("'", string.Empty);

7
src/Jackett/Indexers/BeyondHD.cs
View File

@@ -116,11 +116,8 @@ namespace Jackett.Indexers
var dateStr = descCol.ChildElements.Last().Cq().Text().Split('|').Last().ToLowerInvariant().Replace("ago.", "").Trim(); var dateStr = descCol.ChildElements.Last().Cq().Text().Split('|').Last().ToLowerInvariant().Replace("ago.", "").Trim();
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
var sizeEl = row.ChildElements.ElementAt(7); var sizeStr = row.ChildElements.ElementAt(7).Cq().Text();
var sizeVal = ParseUtil.CoerceFloat(sizeEl.ChildNodes.First().NodeValue); release.Size = ReleaseInfo.GetBytes(sizeStr);
var sizeUnit = sizeEl.ChildNodes.Last().NodeValue;
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text()); release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(10).Cq().Text()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(10).Cq().Text()) + release.Seeders;

6
src/Jackett/Indexers/BitHdtv.cs
View File

@@ -125,10 +125,8 @@ namespace Jackett.Indexers
var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
release.PublishDate = DateTime.SpecifyKind(pubDate, DateTimeKind.Local); release.PublishDate = DateTime.SpecifyKind(pubDate, DateTimeKind.Local);
var sizeCol = qRow.Children().ElementAt(6); var sizeStr = qRow.Children().ElementAt(6).Cq().Text();
var sizeVal = sizeCol.ChildNodes[0].NodeValue; release.Size = ReleaseInfo.GetBytes(sizeStr);
var sizeUnit = sizeCol.ChildNodes[2].NodeValue;
release.Size = ReleaseInfo.GetBytes(sizeUnit, ParseUtil.CoerceFloat(sizeVal));
release.Seeders = ParseUtil.CoerceInt(qRow.Children().ElementAt(8).Cq().Text().Trim()); release.Seeders = ParseUtil.CoerceInt(qRow.Children().ElementAt(8).Cq().Text().Trim());
release.Peers = ParseUtil.CoerceInt(qRow.Children().ElementAt(9).Cq().Text().Trim()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(qRow.Children().ElementAt(9).Cq().Text().Trim()) + release.Seeders;

6
src/Jackett/Indexers/BitMeTV.cs
View File

@@ -163,10 +163,8 @@ namespace Jackett.Indexers
release.Link = new Uri(SiteLink + "/" + row.ChildElements.ElementAt(2).Cq().Children("a.index").Attr("href")); release.Link = new Uri(SiteLink + "/" + row.ChildElements.ElementAt(2).Cq().Children("a.index").Attr("href"));
var sizeCol = row.ChildElements.ElementAt(6); var sizeStr = row.ChildElements.ElementAt(6).Cq().Text();
var sizeVal = ParseUtil.CoerceFloat(sizeCol.ChildNodes[0].NodeValue); release.Size = ReleaseInfo.GetBytes(sizeStr);
var sizeUnit = sizeCol.ChildNodes[2].NodeValue;
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text()); release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders;

6
src/Jackett/Indexers/FrenchTorrentDb.cs
View File

@@ -139,10 +139,8 @@ namespace Jackett.Indexers
release.PublishDate = DateTime.Now; release.PublishDate = DateTime.Now;
release.Seeders = ParseUtil.CoerceInt(qRow.Find("li.torrents_seeders").Text()); release.Seeders = ParseUtil.CoerceInt(qRow.Find("li.torrents_seeders").Text());
release.Peers = ParseUtil.CoerceInt(qRow.Find("li.torrents_leechers").Text()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(qRow.Find("li.torrents_leechers").Text()) + release.Seeders;
var sizeParts = qRow.Find("li.torrents_size").Text().Split(' '); var sizeParts = qRow.Find("li.torrents_size").Text();
var sizeVal = ParseUtil.CoerceFloat(sizeParts[0]); release.Size = ReleaseInfo.GetBytes(sizeParts);
var sizeUnit = sizeParts[1];
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
releases.Add(release); releases.Add(release);
} }

6
src/Jackett/Indexers/Freshon.cs
View File

@@ -162,10 +162,8 @@ namespace Jackett.Indexers
release.Seeders = ParseUtil.CoerceInt(qRow.Find("td.table_seeders").Text().Trim()); release.Seeders = ParseUtil.CoerceInt(qRow.Find("td.table_seeders").Text().Trim());
release.Peers = ParseUtil.CoerceInt(qRow.Find("td.table_leechers").Text().Trim()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(qRow.Find("td.table_leechers").Text().Trim()) + release.Seeders;
var sizeCol = qRow.Find("td.table_size")[0]; var sizeStr = qRow.Find("td.table_size")[0].Cq().Text();
var sizeVal = ParseUtil.CoerceFloat(sizeCol.ChildNodes[0].NodeValue.Trim()); release.Size = ReleaseInfo.GetBytes(sizeStr);
var sizeUnit = sizeCol.ChildNodes[2].NodeValue.Trim();
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
releases.Add(release); releases.Add(release);
} }

3
src/Jackett/Indexers/HDTorrents.cs
View File

@@ -167,8 +167,7 @@ namespace Jackett.Indexers
} }
string fullSize = qRow.Find("td.mainblockcontent").Get(6).InnerText; string fullSize = qRow.Find("td.mainblockcontent").Get(6).InnerText;
string[] sizeSplit = fullSize.Split(' '); release.Size = ReleaseInfo.GetBytes(fullSize);
release.Size = ReleaseInfo.GetBytes(sizeSplit[1], ParseUtil.CoerceFloat(sizeSplit[0]));
release.Guid = new Uri(SiteLink + "/" + qRow.Find("td.mainblockcontent b a").Attr("href")); 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")); release.Link = new Uri(SiteLink + "/" + qRow.Find("td.mainblockcontent").Get(3).FirstChild.GetAttribute("href"));

6
src/Jackett/Indexers/IPTorrents.cs
View File

@@ -150,10 +150,8 @@ namespace Jackett.Indexers
var qLink = row.ChildElements.ElementAt(3).Cq().Children("a"); var qLink = row.ChildElements.ElementAt(3).Cq().Children("a");
release.Link = new Uri(SiteLink + qLink.Attr("href")); release.Link = new Uri(SiteLink + qLink.Attr("href"));
var sizeStr = row.ChildElements.ElementAt(5).Cq().Text().Trim(); var sizeStr = row.ChildElements.ElementAt(5).Cq().Text();
var sizeVal = ParseUtil.CoerceFloat(sizeStr.Split(' ')[0]); release.Size = ReleaseInfo.GetBytes(sizeStr);
var sizeUnit = sizeStr.Split(' ')[1];
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
release.Seeders = ParseUtil.CoerceInt(qRow.Find(".t_seeders").Text().Trim()); release.Seeders = ParseUtil.CoerceInt(qRow.Find(".t_seeders").Text().Trim());
release.Peers = ParseUtil.CoerceInt(qRow.Find(".t_leechers").Text().Trim()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(qRow.Find(".t_leechers").Text().Trim()) + release.Seeders;

1
src/Jackett/Indexers/Pretome.cs
View File

@@ -30,7 +30,6 @@ namespace Jackett.Indexers
{ {
return new Item[] { Pin, Username, Password }; return new Item[] { Pin, Username, Password };
} }
} }
private readonly string LoginUrl = ""; private readonly string LoginUrl = "";

5
src/Jackett/Indexers/PrivateHD.cs
View File

@@ -154,9 +154,8 @@ namespace Jackett.Indexers
var dateStr = row.ChildElements.ElementAt(5).Cq().Text().Trim(); var dateStr = row.ChildElements.ElementAt(5).Cq().Text().Trim();
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
var sizeStr = row.ChildElements.ElementAt(6).Cq().Text().Trim(); var sizeStr = row.ChildElements.ElementAt(6).Cq().Text();
var sizeParts = sizeStr.Split(new char[0], StringSplitOptions.RemoveEmptyEntries); release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0]));
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text()); release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders;

3
src/Jackett/Indexers/SceneAccess.cs
View File

@@ -138,8 +138,7 @@ namespace Jackett.Indexers
release.Link = new Uri(SiteLink + "/" + qRow.Find(".td_dl > a").Attr("href")); release.Link = new Uri(SiteLink + "/" + qRow.Find(".td_dl > a").Attr("href"));
var sizeStr = qRow.Find(".ttr_size").Contents()[0].NodeValue; var sizeStr = qRow.Find(".ttr_size").Contents()[0].NodeValue;
var sizeParts = sizeStr.Split(' '); release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0]));
var timeStr = qRow.Find(".ttr_added").Text(); var timeStr = qRow.Find(".ttr_added").Text();
DateTime time; DateTime time;

6
src/Jackett/Indexers/SceneTime.cs
View File

@@ -137,10 +137,8 @@ namespace Jackett.Indexers
var localDate = TimeZoneInfo.ConvertTimeToUtc(euDate, TimeZoneInfo.FindSystemTimeZoneById(timezoneString)).ToLocalTime(); var localDate = TimeZoneInfo.ConvertTimeToUtc(euDate, TimeZoneInfo.FindSystemTimeZoneById(timezoneString)).ToLocalTime();
release.PublishDate = localDate; release.PublishDate = localDate;
var sizeNodes = row.ChildElements.ElementAt(5).ChildNodes; var sizeStr = row.ChildElements.ElementAt(5).Cq().Text();
var sizeVal = sizeNodes.First().NodeValue; release.Size = ReleaseInfo.GetBytes(sizeStr);
var sizeUnit = sizeNodes.Last().NodeValue;
release.Size = ReleaseInfo.GetBytes(sizeUnit, ParseUtil.CoerceFloat(sizeVal));
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(6).Cq().Text().Trim()); release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(6).Cq().Text().Trim());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim()) + release.Seeders;

4
src/Jackett/Indexers/SpeedCD.cs
View File

@@ -121,8 +121,8 @@ namespace Jackett.Indexers
release.Title = Regex.Replace((string)jobj["name"], "<.*?>", String.Empty); release.Title = Regex.Replace((string)jobj["name"], "<.*?>", String.Empty);
var sizeParts = ((string)jobj["size"]).Split(' '); var SizeStr = ((string)jobj["size"]);
release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0])); release.Size = ReleaseInfo.GetBytes(SizeStr);
release.Seeders = ParseUtil.CoerceInt((string)jobj["seed"]); release.Seeders = ParseUtil.CoerceInt((string)jobj["seed"]);
release.Peers = ParseUtil.CoerceInt((string)jobj["leech"]) + release.Seeders; release.Peers = ParseUtil.CoerceInt((string)jobj["leech"]) + release.Seeders;

5
src/Jackett/Indexers/ThePirateBay.cs
View File

@@ -152,10 +152,7 @@ namespace Jackett.Indexers
release.PublishDate = DateTime.SpecifyKind(utc, DateTimeKind.Utc).ToLocalTime(); release.PublishDate = DateTime.SpecifyKind(utc, DateTimeKind.Utc).ToLocalTime();
} }
var sizeParts = descParts[1].Split(new char[] { ' ', ' ' }, StringSplitOptions.RemoveEmptyEntries); release.Size = ReleaseInfo.GetBytes(descParts[1]);
var sizeVal = ParseUtil.CoerceFloat(sizeParts[1]);
var sizeUnit = sizeParts[2];
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(2).Cq().Text()); release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(2).Cq().Text());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(3).Cq().Text()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(3).Cq().Text()) + release.Seeders;

5
src/Jackett/Indexers/TorrentDay.cs
View File

@@ -132,9 +132,8 @@ namespace Jackett.Indexers
release.Comments = release.Guid; release.Comments = release.Guid;
release.Link = new Uri(SiteLink + "/" + qRow.Find(".dlLinksInfo > a").Attr("href")); release.Link = new Uri(SiteLink + "/" + qRow.Find(".dlLinksInfo > a").Attr("href"));
var sizeStr = qRow.Find(".sizeInfo").Text().Trim(); var sizeStr = qRow.Find(".sizeInfo").Text();
var sizeParts = sizeStr.Split(' '); release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0]));
var dateStr = qRow.Find(".ulInfo").Text().Split('|').Last().Trim(); var dateStr = qRow.Find(".ulInfo").Text().Split('|').Last().Trim();
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);

4
src/Jackett/Indexers/TorrentLeech.cs
View File

@@ -128,8 +128,8 @@ namespace Jackett.Indexers
//"yyyy-MMM-dd hh:mm:ss" //"yyyy-MMM-dd hh:mm:ss"
release.PublishDate = DateTime.ParseExact(dateString, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture); release.PublishDate = DateTime.ParseExact(dateString, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture);
var sizeStringParts = qRow.Children().ElementAt(4).InnerText.Split(' '); var sizeStr = qRow.Children().ElementAt(4).InnerText;
release.Size = ReleaseInfo.GetBytes(sizeStringParts[1], ParseUtil.CoerceFloat(sizeStringParts[0])); release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Seeders = ParseUtil.CoerceInt(qRow.Find(".seeders").Text()); release.Seeders = ParseUtil.CoerceInt(qRow.Find(".seeders").Text());
release.Peers = release.Seeders + ParseUtil.CoerceInt(qRow.Find(".leechers").Text()); release.Peers = release.Seeders + ParseUtil.CoerceInt(qRow.Find(".leechers").Text());

5
src/Jackett/Indexers/TorrentShack.cs
View File

@@ -120,9 +120,8 @@ namespace Jackett.Indexers
var dateStr = qRow.Find(".time").Text().Trim(); var dateStr = qRow.Find(".time").Text().Trim();
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr); release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
var sizeStr = qRow.Find(".size")[0].ChildNodes[0].NodeValue.Trim(); var sizeStr = qRow.Find(".size")[0].ChildNodes[0].NodeValue;
var sizeParts = sizeStr.Split(' '); release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0]));
release.Seeders = ParseUtil.CoerceInt(qRow.Children().ElementAt(6).InnerText.Trim()); release.Seeders = ParseUtil.CoerceInt(qRow.Children().ElementAt(6).InnerText.Trim());
release.Peers = ParseUtil.CoerceInt(qRow.Children().ElementAt(7).InnerText.Trim()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(qRow.Children().ElementAt(7).InnerText.Trim()) + release.Seeders;

2
src/Jackett/Jackett.csproj
View File

@@ -279,7 +279,7 @@
<Content Include="Content\logos\animebytes.png"> <Content Include="Content\logos\animebytes.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\logos\BakaBT.png"> <Content Include="Content\logos\bakabt.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\logos\bb.png"> <Content Include="Content\logos\bb.png">