set default value for MinimumRatio / MinimumSeedTime. resolves #6811 (#6921)

This commit is contained in:
Diego Heras 2020-01-11 19:07:19 +01:00 committed by garfield69
parent 748e1c4f2e
commit 26564cdfbd
37 changed files with 54 additions and 38 deletions

View File

@ -377,13 +377,13 @@ namespace Jackett.Common.Indexers
Title = name,
Seeders = seeders,
Peers = seeders + leechers,
MinimumRatio = 1,
MinimumSeedTime = 172800,
PublishDate = date,
Size = size,
Guid = detailsLink,
Comments = commentsLink,
Link = downloadLink,
MinimumRatio = 1,
MinimumSeedTime = 172800, // 48 hours
UploadVolumeFactor = 1,
DownloadVolumeFactor = downloadVolumeFactor
};

View File

@ -110,7 +110,7 @@ namespace Jackett.Common.Indexers.Abstract
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
var qLink = qRow.Find("a.torrent-filename"); ;
release.Title = qLink.Text().Trim();

View File

@ -142,7 +142,7 @@ namespace Jackett.Common.Indexers
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
var catStr = row.ChildElements.ElementAt(0).FirstElementChild.GetAttribute("href").Split(new char[] { '[', ']' })[1];
release.Category = MapTrackerCatToNewznab(catStr);

View File

@ -156,6 +156,7 @@ namespace Jackett.Common.Indexers
release.Peers = release.Seeders + int.Parse(qRow.Find(".peers a").Get(1).InnerText);
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; // 48 hours
var size = qRow.Find(".size").First().Text();
release.Size = ReleaseInfo.GetBytes(size);

View File

@ -138,7 +138,7 @@ namespace Jackett.Common.Indexers
{
var release = new ReleaseInfo();
release.MinimumRatio = 0.7;
release.MinimumSeedTime = 48 * 60 * 60;
release.MinimumSeedTime = 172800; // 48 hours
release.DownloadVolumeFactor = 1;
release.UploadVolumeFactor = 1;

View File

@ -147,7 +147,7 @@ namespace Jackett.Common.Indexers
var qLink = qRow.Children().ElementAt(2).Cq().Children("a").First();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
release.Title = qLink.Attr("title");
if (!query.MatchQueryStringAND(release.Title))
continue;

View File

@ -1383,7 +1383,7 @@ namespace Jackett.Common.Indexers
{
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 48 * 60 * 60;
release.MinimumSeedTime = 172800; // 48 hours
// Parse fields
foreach (var Field in Search.Fields)

View File

@ -227,6 +227,8 @@ namespace Jackett.Common.Indexers
InfoHash = (string) torrent["hash"],
MagnetUri = new Uri((string) torrent["magnet"]),
Comments = new Uri($"{SiteLink}details/{(string) torrent["hash"]}"),
MinimumRatio = 1,
MinimumSeedTime = 172800, // 48 hours
DownloadVolumeFactor = 0,
UploadVolumeFactor = 1
};

View File

@ -303,7 +303,7 @@ namespace Jackett.Common.Indexers
release.Peers = 2;
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;

View File

@ -52,6 +52,8 @@ namespace Jackett.Common.Indexers.Feeds
// add some default values if none returned by feed
release.Seeders = release.Seeders > 0 ? release.Seeders : 0;
release.Peers = release.Peers > 0 ? release.Peers : 0;
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; // 48 hours
release.DownloadVolumeFactor = release.DownloadVolumeFactor > 0 ? release.DownloadVolumeFactor : 0;
release.UploadVolumeFactor = release.UploadVolumeFactor > 0 ? release.UploadVolumeFactor : 1;
return release;

View File

@ -114,7 +114,7 @@ namespace Jackett.Common.Indexers
{
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 48 * 60 * 60;
release.MinimumSeedTime = 172800; // 48 hours
var qRow = row.Cq();
var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First();

View File

@ -241,7 +241,7 @@ namespace Jackett.Common.Indexers
release.Title = main_title_link.Text();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
int seeders, peers;
if (ParseUtil.TryCoerceInt(qRow.Find("td:nth-child(7) > div").Text(), out seeders))

View File

@ -190,7 +190,7 @@ namespace Jackett.Common.Indexers
release.UploadVolumeFactor = (string)torrent["doubletorrent"] == "0" ? 1 : 2;
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
releases.Add(release);
}

View File

@ -134,7 +134,7 @@ namespace Jackett.Common.Indexers
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
var qLink = row.ChildElements.ElementAt(1).FirstElementChild.Cq();
release.Title = qLink.Text().Trim();

View File

@ -156,7 +156,7 @@ namespace Jackett.Common.Indexers
release.Description = qRow.Find("td:nth-child(3) > span").Text();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
int tdIndex = 0;
if(qRow.Find("td:nth-last-child(1)").Text() == "Edit") tdIndex = 1;

View File

@ -113,7 +113,7 @@ namespace Jackett.Common.Indexers
var debug = qRow.Html();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
var qTitle = qRow.Find(".bTitle");
var titleParts = qTitle.Text().Split('/');

View File

@ -229,6 +229,8 @@ namespace Jackett.Common.Indexers
Size = 524288000,
Seeders = 1,
Peers = 2,
MinimumRatio = 1,
MinimumSeedTime = 172800, // 48 hours
DownloadVolumeFactor = 0,
UploadVolumeFactor = 1
};
@ -259,6 +261,8 @@ namespace Jackett.Common.Indexers
Size = 524288000,
Seeders = 1,
Peers = 2,
MinimumRatio = 1,
MinimumSeedTime = 172800, // 48 hours
DownloadVolumeFactor = 0,
UploadVolumeFactor = 1
};
@ -289,6 +293,8 @@ namespace Jackett.Common.Indexers
Size = 524288000,
Seeders = 1,
Peers = 2,
MinimumRatio = 1,
MinimumSeedTime = 172800, // 48 hours
DownloadVolumeFactor = 0,
UploadVolumeFactor = 1
};

View File

@ -142,7 +142,7 @@ namespace Jackett.Common.Indexers
release.Description = qRow.Find("span").Get(0).GetAttribute("title") + " " + qRow.Find("a.infolink").Text();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;

View File

@ -904,6 +904,8 @@ namespace Jackett.Common.Indexers
result.Peers = 1;
result.Title = FixedTitle(result, quality, language);
result.MinimumRatio = 1;
result.MinimumSeedTime = 172800; // 48 hours
result.DownloadVolumeFactor = 0;
result.UploadVolumeFactor = 1;

View File

@ -387,15 +387,15 @@ namespace Jackett.Common.Indexers
Title = name,
Seeders = seeders,
Peers = seeders + leechers,
MinimumRatio = 1,
MinimumSeedTime = 172800,
PublishDate = date,
Size = size,
Files = files,
Grabs = completed,
Guid = detailsLink,
Comments = commentsLink,
Link = downloadLink
Link = downloadLink,
MinimumRatio = 1,
MinimumSeedTime = 172800 // 48 hours
};
var genres = tRow.Find("span.genres").Text();

View File

@ -401,15 +401,15 @@ namespace Jackett.Common.Indexers
Title = name,
Seeders = seeders,
Peers = seeders + leechers,
MinimumRatio = 1,
MinimumSeedTime = 172800,
PublishDate = date,
Size = size,
Files = files,
Grabs = completed,
Guid = detailsLink,
Comments = commentsLink,
Link = downloadLink
Link = downloadLink,
MinimumRatio = 1,
MinimumSeedTime = 172800 // 48 hours
};
// IMDB

View File

@ -287,7 +287,7 @@ namespace Jackett.Common.Indexers
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
var qLink = row.ChildElements.ElementAt(1).Cq().Find("a").First();
release.Title = qLink.Attr("title");

View File

@ -257,6 +257,8 @@ namespace Jackett.Common.Indexers
release.Seeders = item.Value<int>("seeders");
release.Peers = item.Value<int>("leechers") + release.Seeders;
release.Size = item.Value<long>("size");
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; // 48 hours
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;

View File

@ -332,7 +332,7 @@ namespace Jackett.Common.Indexers
var debug = qRow.Html();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
CQ qLink = qRow.Find(".br_right > a").First();
release.Guid = new Uri(SiteLink + qLink.Attr("href"));

View File

@ -220,7 +220,7 @@ namespace Jackett.Common.Indexers
{
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
var categoryCol = row.ChildElements.ElementAt(categoryIndex);
string catLink = categoryCol.Cq().Find("a").Attr("href");

View File

@ -80,7 +80,7 @@ namespace Jackett.Common.Indexers
release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
serie_title = node.SelectSingleNode(".//*[local-name()='raw_title']").InnerText;
release.Title = serie_title;

View File

@ -165,11 +165,8 @@ namespace Jackett.Common.Indexers
release.InfoHash = (string)torrent["infohash"];
release.MagnetUri = new Uri((string)torrent["magnet"]);
/*
release.MinimumRatio = 0;
release.MinimumSeedTime = 0;
*/
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; // 48 hours
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;

View File

@ -179,7 +179,7 @@ namespace Jackett.Common.Indexers
release.Seeders = seeders;
release.Peers = seeders + leechers;
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
release.Category = MapTrackerCatToNewznab(category.ToString());
release.Comments = comments;

View File

@ -135,7 +135,7 @@ namespace Jackett.Common.Indexers
var tags = new List<string>();
release.MinimumRatio = 1.1;
release.MinimumSeedTime = 48 * 60 * 60;
release.MinimumSeedTime = 172800; // 48 hours
release.Title = row.name;
release.Category = MapTrackerCatToNewznab(row.category.ToString());
release.Size = row.size;

View File

@ -179,7 +179,7 @@ namespace Jackett.Common.Indexers
release.Peers = (int.Parse(parameters[peers_id]) + release.Seeders);
release.Grabs = int.Parse(parameters[grabs_id]);
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
release.DownloadVolumeFactor = 1;
release.UploadVolumeFactor = UploadFactorCalculator(release.PublishDate, type);
release.Category = new List<int> { TvCategoryParser.ParseTvShowQuality(release.Title) };

View File

@ -234,7 +234,7 @@ namespace Jackett.Common.Indexers
continue;
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
release.Category = MapTrackerCatToNewznab(torrent.c.ToString());
var torrentID = (long)torrent.t;

View File

@ -221,7 +221,7 @@ namespace Jackett.Common.Indexers
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
release.Guid = new Uri(SiteLink + "torrent/" + torrent.fid);
release.Comments = release.Guid;

View File

@ -198,7 +198,7 @@ namespace Jackett.Common.Indexers
{
var release = new ReleaseInfo();
release.MinimumRatio = 0.8;
release.MinimumSeedTime = 48 * 60 * 60;
release.MinimumSeedTime = 172800; // 48 hours
release.Category = MapTrackerCatToNewznab(torrent[0].ToString());
release.Title = torrent[1].ToString();

View File

@ -147,6 +147,8 @@ namespace Jackett.Common.Indexers {
var grabs = torrent.Value<string>("completed");
if (grabs == null) grabs = "0";
release.Grabs = ParseUtil.CoerceInt(grabs);
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; // 48 hours
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;

View File

@ -146,7 +146,7 @@ namespace Jackett.Common.Indexers
release.Peers = ParseUtil.CoerceInt(timeAnchor.ParentElement.NextElementSibling.NextElementSibling.NextElementSibling.TextContent.Trim()) + release.Seeders;
release.Size = ReleaseInfo.GetBytes(timeAnchor.ParentElement.PreviousElementSibling.TextContent);
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.MinimumSeedTime = 172800; // 48 hours
release.Files = ParseUtil.CoerceLong(row.QuerySelector("td > div:contains(\"Files:\")").TextContent.Split(':')[1].Trim());
release.Grabs = ParseUtil.CoerceLong(row.QuerySelector("td:nth-last-child(3)").TextContent);

View File

@ -145,7 +145,7 @@ namespace Jackett.Common.Indexers
var tags = new List<string>();
release.MinimumRatio = 1.1;
release.MinimumSeedTime = 48 * 60 * 60;
release.MinimumSeedTime = 172800; // 48 hours
release.Title = row.name;
release.Category = MapTrackerCatToNewznab(row.category.ToString());
release.Size = row.size;

View File

@ -188,6 +188,8 @@ namespace Jackett.Common.Indexers
release.Seeders = torrent_info.Value<int>("seeds");
release.Peers = torrent_info.Value<int>("peers") + release.Seeders;
release.Size = torrent_info.Value<long>("size_bytes");
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; // 48 hours
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;