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

Merge branch 'master' of https://github.com/Jackett/Jackett

Browse Source
This commit is contained in:
Garfield69
2020-03-12 18:14:49 +13:00
parent c6d4746e85 e9851a1dbc
commit 9e005c4c0b
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Jackett.Common/Indexers/FunFile.cs
View File

@@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using AngleSharp.Html.Parser; using AngleSharp.Html.Parser;
@@ -77,27 +78,16 @@ namespace Jackett.Common.Indexers
{ {
var releases = new List<ReleaseInfo>(); var releases = new List<ReleaseInfo>();
var searchString = query.GetQueryString(); var qc = new NameValueCollection
var searchUrl = SearchUrl;
var queryCollection = new NameValueCollection();
queryCollection.Add("incldead", "1");
queryCollection.Add("showspam", "1");
if (!string.IsNullOrWhiteSpace(searchString))
{ {
queryCollection.Add("search", searchString); {"incldead", "1"},
} {"showspam", "1"},
{"cat", MapTorznabCapsToTrackers(query).FirstOrDefault() ?? "0"}
var cats = MapTorznabCapsToTrackers(query); };
var cat = "0"; if (!string.IsNullOrWhiteSpace(query.GetQueryString()))
if (cats.Count == 1) qc.Add("search", query.GetQueryString());
{
cat = cats[0];
}
queryCollection.Add("cat", cat);
searchUrl += "?" + queryCollection.GetQueryString();
var searchUrl = SearchUrl + "?" + qc.GetQueryString();
var results = await RequestStringWithCookiesAndRetry(searchUrl); var results = await RequestStringWithCookiesAndRetry(searchUrl);
// Occasionally the cookies become invalid, login again if that happens // Occasionally the cookies become invalid, login again if that happens
@@ -126,14 +116,17 @@ namespace Jackett.Common.Indexers
var qTimeAgo = row.QuerySelector("td:nth-of-type(6)"); var qTimeAgo = row.QuerySelector("td:nth-of-type(6)");
var qSize = row.QuerySelector("td:nth-of-type(8)"); var qSize = row.QuerySelector("td:nth-of-type(8)");
var catStr = qCatLink.GetAttribute("href").Split('=')[1].Split('&')[0]; if (qDownloadLink == null)
release.Category = MapTrackerCatToNewznab(catStr); throw new Exception("Download links not found. Make sure you can download from the website.");
release.Link = new Uri(SiteLink + qDownloadLink.GetAttribute("href")); release.Link = new Uri(SiteLink + qDownloadLink.GetAttribute("href"));
release.Title = qDetailsLink.GetAttribute("title").Trim(); release.Title = qDetailsLink.GetAttribute("title").Trim();
release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href"));
release.Guid = release.Link; release.Guid = release.Link;
var catStr = qCatLink.GetAttribute("href").Split('=')[1].Split('&')[0];
release.Category = MapTrackerCatToNewznab(catStr);
var sizeStr = qSize.TextContent; var sizeStr = qSize.TextContent;
release.Size = ReleaseInfo.GetBytes(sizeStr); release.Size = ReleaseInfo.GetBytes(sizeStr);