mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

Implement torrentbytes

This commit is contained in:
KZ 2015-07-30 21:09:38 +01:00
parent 922583ea5d
commit 1606e3379f
8 changed files with 217 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -194,3 +194,5 @@ FakesAssemblies/
# Visual Studio 6 workspace options file
*.opt
/Build.mono
/Build.windows

BIN
src/Jackett/Content/logos/torrentbytes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

2
src/Jackett/Controllers/APIController.cs
View File

@ -78,7 +78,7 @@ namespace Jackett.Controllers
}
else
{
logger.Info(string.Format("Found {0} releases from {1} for: {2}", releases.Count(), indexer.DisplayName, torznabQuery.SanitizedSearchTerm));
logger.Info(string.Format("Found {0} releases from {1} for: {2} {3}", releases.Count(), indexer.DisplayName, torznabQuery.SanitizedSearchTerm, torznabQuery.GetEpisodeSearchString()));
}
var severUrl = string.Format("{0}://{1}:{2}/", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port);

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

@ -128,7 +128,7 @@ namespace Jackett.Indexers
if (queryCollection.Count > 0)
{
searchUrl += "?" + string.Join("&", queryCollection.AllKeys.Select(a => a + "=" + HttpUtility.UrlEncode(queryCollection[a])));
searchUrl += "?" + queryCollection.GetQueryString();
}
var response = await RequestStringWithCookiesAndRetry(searchUrl, null, BrowseUrl);

179
src/Jackett/Indexers/TorrentBytes.cs Normal file
View File

@ -0,0 +1,179 @@
using CsQuery;
using Jackett.Models;
using Jackett.Services;
using Jackett.Utils;
using Jackett.Utils.Clients;
using Newtonsoft.Json.Linq;
using NLog;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Globalization;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Web;
namespace Jackett.Indexers
{
public class TorrentBytes : BaseIndexer, IIndexer
{
private string BrowseUrl { get { return SiteLink + "browse.php"; } }
private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
public TorrentBytes(IIndexerManagerService i, IWebClient wc, Logger l)
: base(name: "TorrentBytes",
description: "A decade of torrentbytes",
link: "https://www.torrentbytes.net/",
caps: TorznabCapsUtil.CreateDefaultTorznabTVCaps(),
manager: i,
client: wc,
logger: l)
{
AddCategoryMapping(41, TorznabCatType.TV);
AddCategoryMapping(33, TorznabCatType.TVSD);
AddCategoryMapping(38, TorznabCatType.TVHD);
AddCategoryMapping(32, TorznabCatType.TVSD);
AddCategoryMapping(37, TorznabCatType.TVSD);
AddCategoryMapping(44, TorznabCatType.TVSD);
AddCategoryMapping(40, TorznabCatType.Movies);
AddCategoryMapping(19, TorznabCatType.MoviesSD);
AddCategoryMapping(5, TorznabCatType.MoviesHD);
AddCategoryMapping(20, TorznabCatType.MoviesSD);
AddCategoryMapping(28, TorznabCatType.MoviesForeign);
AddCategoryMapping(45, TorznabCatType.MoviesSD);
AddCategoryMapping(43, TorznabCatType.Audio);
AddCategoryMapping(48, TorznabCatType.AudioLossless);
AddCategoryMapping(6, TorznabCatType.AudioLossy);
AddCategoryMapping(46, TorznabCatType.Movies);
AddCategoryMapping(1, TorznabCatType.Apps);
AddCategoryMapping(2, TorznabCatType.Apps);
AddCategoryMapping(23, TorznabCatType.Anime);
AddCategoryMapping(21, TorznabCatType.XXX);
AddCategoryMapping(9, TorznabCatType.XXXSD);
AddCategoryMapping(39, TorznabCatType.XXXHD);
AddCategoryMapping(29, TorznabCatType.XXXSD);
AddCategoryMapping(24, TorznabCatType.XXXImg);
}
public Task<ConfigurationData> GetConfigurationForSetup()
{
return Task.FromResult<ConfigurationData>(new ConfigurationDataBasicLogin());
}
public async Task ApplyConfiguration(JToken configJson)
{
var incomingConfig = new ConfigurationDataBasicLogin();
incomingConfig.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string> {
{ "username", incomingConfig.Username.Value },
{ "password", incomingConfig.Password.Value },
{ "returnto", "/" },
{ "login", "Log in!" }
};
var loginPage = await RequestStringWithCookies(SiteLink, string.Empty);
var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, SiteLink, SiteLink);
ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
{
CQ dom = result.Content;
var messageEl = dom["body > div"].First();
var errorMessage = messageEl.Text().Trim();
throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)incomingConfig);
});
}
public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
{
var releases = new List<ReleaseInfo>();
var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
var searchUrl = BrowseUrl;
var trackerCats = MapTorznabCapsToTrackers(query);
var queryCollection = new NameValueCollection();
// Tracker can only search OR return things in categories
if (!string.IsNullOrWhiteSpace(searchString))
{
queryCollection.Add("search", searchString);
queryCollection.Add("cat", "0");
queryCollection.Add("sc", "1");
}
else
{
foreach (var cat in MapTorznabCapsToTrackers(query))
{
queryCollection.Add("c" + cat, "1");
}
queryCollection.Add("incldead", "0");
}
searchUrl += "?" + queryCollection.GetQueryString();
// 15 results per page - really don't want to call the server twice but only 15 results per page is a bit crap!
await ProcessPage(releases, searchUrl);
await ProcessPage(releases, searchUrl + "&page=1");
return releases;
}
private async Task ProcessPage(List<ReleaseInfo> releases, string searchUrl)
{
var response = await RequestStringWithCookiesAndRetry(searchUrl, null, BrowseUrl);
var results = response.Content;
try
{
CQ dom = results;
var rows = dom["#content table:eq(4) tr"];
foreach (var row in rows.Skip(1))
{
var release = new ReleaseInfo();
var link = row.Cq().Find("td:eq(1) a:eq(1)").First();
release.Guid = new Uri(SiteLink + link.Attr("href"));
release.Comments = release.Guid;
release.Title = link.Text().Trim();
release.Description = release.Title;
// If we search an get no results, we still get a table just with no info.
if (string.IsNullOrWhiteSpace(release.Title))
{
break;
}
var cat = row.Cq().Find("td:eq(0) a").First().Attr("href").Substring(15);
release.Category = MapTrackerCatToNewznab(cat);
var qLink = row.Cq().Find("td:eq(1) a").First();
release.Link = new Uri(SiteLink + qLink.Attr("href"));
var added = row.Cq().Find("td:eq(4)").First().Text().Trim();
release.PublishDate = DateTimeUtil.FromTimeAgo(added);
var sizeStr = row.Cq().Find("td:eq(6)").First().Text().Trim();
release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Seeders = ParseUtil.CoerceInt(row.Cq().Find("td:eq(8)").First().Text().Trim());
release.Peers = ParseUtil.CoerceInt(row.Cq().Find("td:eq(9)").First().Text().Trim()) + release.Seeders;
releases.Add(release);
}
}
catch (Exception ex)
{
OnParseError(results, ex);
}
}
}
}

4
src/Jackett/Jackett.csproj
View File

@ -186,6 +186,7 @@
<Compile Include="Indexers\HDTorrents.cs" />
<Compile Include="Indexers\IIndexer.cs" />
<Compile Include="Indexers\ImmortalSeed.cs" />
<Compile Include="Indexers\TorrentBytes.cs" />
<Compile Include="Indexers\IPTorrents.cs" />
<Compile Include="Indexers\MoreThanTV.cs" />
<Compile Include="Indexers\Pretome.cs" />
@ -406,6 +407,9 @@
<Content Include="Content\logos\t411.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\logos\torrentbytes.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\logos\torrentday.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

24
src/Jackett/Models/TorznabCatType.cs
View File

@ -27,6 +27,10 @@ namespace Jackett.Models
cats.Add(3000, "Audio");
cats.Add(3040, "Audio/Lossless");
cats.Add(3010, "Audio/MP3");
cats.Add(6000, "XXX");
cats.Add(6040, "XXX/x264");
cats.Add(6010, "XXX/DVD");
cats.Add(6060, "XXX/Imageset");
}
public static bool QueryContainsParentCategory(int[] queryCats, int releaseCat)
@ -142,5 +146,25 @@ namespace Jackett.Models
{
get { return GetCat(3010); }
}
public static TorznabCategory XXX
{
get { return GetCat(6000); }
}
public static TorznabCategory XXXHD
{
get { return GetCat(6040); }
}
public static TorznabCategory XXXSD
{
get { return GetCat(6010); }
}
public static TorznabCategory XXXImg
{
get { return GetCat(6060); }
}
}
}

6
src/Jackett/Utils/StringUtil.cs
View File

@ -1,10 +1,12 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
namespace Jackett.Utils
{
@ -56,5 +58,9 @@ namespace Jackett.Utils
return String.Join("\n", fields);
}
public static string GetQueryString(this NameValueCollection collection)
{
return string.Join("&", collection.AllKeys.Select(a => a + "=" + HttpUtility.UrlEncode(collection[a])));
}
}
}