From d0e7b63ab696c5ecf0a7e61a974203c9d49779ed Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Mon, 2 Nov 2020 16:11:52 +1300 Subject: [PATCH] myamity: Now just a forum. Removed. resolves #9780 --- README.md | 1 - src/Jackett.Common/Indexers/MyAmity.cs | 215 ------------------------- 2 files changed, 216 deletions(-) delete mode 100644 src/Jackett.Common/Indexers/MyAmity.cs diff --git a/README.md b/README.md index 987360f66..205550674 100644 --- a/README.md +++ b/README.md @@ -417,7 +417,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * MoreThanTV (MTV) * Movie Zone (Mz) * MyAnonamouse (MAM) - * myAmity * MySpleen [![(invite needed)][inviteneeded]](#) * NBTorrents [![(invite needed)][inviteneeded]](#) * NCore diff --git a/src/Jackett.Common/Indexers/MyAmity.cs b/src/Jackett.Common/Indexers/MyAmity.cs deleted file mode 100644 index 9eb96f5a0..000000000 --- a/src/Jackett.Common/Indexers/MyAmity.cs +++ /dev/null @@ -1,215 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using System.Text; -using System.Threading.Tasks; -using AngleSharp.Html.Parser; -using Jackett.Common.Models; -using Jackett.Common.Models.IndexerConfig; -using Jackett.Common.Services.Interfaces; -using Jackett.Common.Utils; -using Jackett.Common.Utils.Clients; -using Newtonsoft.Json.Linq; -using NLog; - -namespace Jackett.Common.Indexers -{ - [ExcludeFromCodeCoverage] - public class MyAmity : BaseWebIndexer - { - private string LoginUrl => SiteLink + "account-login.php"; - private string BrowseUrl => SiteLink + "torrents-search.php"; - - private new ConfigurationDataBasicLoginWithRSSAndDisplay configData - { - get => (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; - set => base.configData = value; - } - - public MyAmity(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps) - : base(id: "myamity", - name: "myAmity", - description: "A German general tracker.", - link: "https://ttv2.myamity.info/", - caps: new TorznabCapabilities - { - TvSearchParams = new List - { - TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep - }, - MovieSearchParams = new List - { - MovieSearchParam.Q - }, - MusicSearchParams = new List - { - MusicSearchParam.Q - }, - BookSearchParams = new List - { - BookSearchParam.Q - } - }, - configService: configService, - client: wc, - logger: l, - p: ps, - configData: new ConfigurationDataBasicLoginWithRSSAndDisplay()) - { - Encoding = Encoding.UTF8; - Language = "de-de"; - Type = "private"; - - AddCategoryMapping(20, TorznabCatType.PC); // Apps - PC - AddCategoryMapping(24, TorznabCatType.AudioAudiobook); // Audio - Hoerbuch/-spiel - AddCategoryMapping(22, TorznabCatType.Audio); // Audio - Musik - AddCategoryMapping(52, TorznabCatType.Movies3D); // Filme - 3D - AddCategoryMapping(51, TorznabCatType.MoviesBluRay); // Filme - BluRay Complete - AddCategoryMapping(1, TorznabCatType.MoviesDVD); // Filme - DVD - AddCategoryMapping(56, TorznabCatType.MoviesUHD); // Filme - UHD/4K - AddCategoryMapping(54, TorznabCatType.MoviesHD); // Filme - HD/1080p - AddCategoryMapping(3, TorznabCatType.MoviesHD); // Filme - HD/720p - AddCategoryMapping(48, TorznabCatType.XXX); // Filme - Heimatfilme.XXX - AddCategoryMapping(50, TorznabCatType.Movies); // Filme - x264/H.264 - AddCategoryMapping(2, TorznabCatType.MoviesSD); // Filme - XViD - AddCategoryMapping(11, TorznabCatType.Console); // Games - Konsolen - AddCategoryMapping(10, TorznabCatType.PCGames); // Games - PC - AddCategoryMapping(53, TorznabCatType.Other); // International - Complete - AddCategoryMapping(36, TorznabCatType.Books); // Sonstige - E-Books - AddCategoryMapping(38, TorznabCatType.Other); // Sonstige - Handy - AddCategoryMapping(59, TorznabCatType.TVAnime); // Sonstige - Anime - AddCategoryMapping(7, TorznabCatType.TVDocumentary); // TV/HDTV - Dokus - AddCategoryMapping(8, TorznabCatType.TV); // TV/HDTV - Serien - AddCategoryMapping(57, TorznabCatType.TVSport); // Sport - Allgemein - } - - public override async Task ApplyConfiguration(JToken configJson) - { - LoadValuesFromJson(configJson); - - var pairs = new Dictionary - { - { "username", configData.Username.Value }, - { "password", configData.Password.Value } - }; - - var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl, true); - - await ConfigureIfOK(result.Cookies, result.ContentString != null && result.Cookies.Contains("pass=") && !result.Cookies.Contains("deleted"), () => - { - var parser = new HtmlParser(); - var dom = parser.ParseDocument(result.ContentString); - var errorMessage = dom.QuerySelector("div.myFrame-content").InnerHtml; - throw new ExceptionWithConfigData(errorMessage, configData); - }); - return IndexerConfigurationStatus.RequiresTesting; - } - - protected override async Task> PerformQuery(TorznabQuery query) - { - var startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday); - var endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday); - var delta = new TimeSpan(1, 0, 0); - var adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition); - TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment }; - var germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments); - - var releases = new List(); - - var searchString = query.GetQueryString(); - var searchUrl = BrowseUrl; - var queryCollection = new NameValueCollection(); - queryCollection.Add("incldead", "1"); - queryCollection.Add("freeleech", "0"); - queryCollection.Add("inclexternal", "0"); - queryCollection.Add("lang", "0"); - - if (!string.IsNullOrWhiteSpace(searchString)) - { - queryCollection.Add("search", searchString); - } - - foreach (var cat in MapTorznabCapsToTrackers(query)) - { - queryCollection.Add("c" + cat, "1"); - } - searchUrl += "?" + queryCollection.GetQueryString(); - - var response = await RequestWithCookiesAsync(searchUrl); - if (response.IsRedirect || response.Cookies != null && response.Cookies.Contains("pass=deleted;")) - { - // re-login - await ApplyConfiguration(null); - response = await RequestWithCookiesAsync(searchUrl); - } - - var results = response.ContentString; - try - { - var parser = new HtmlParser(); - var dom = parser.ParseDocument(results); - var rows = dom.QuerySelectorAll("table.ttable_headinner > tbody > tr.t-row"); - - foreach (var row in rows) - { - var release = new ReleaseInfo(); - release.MinimumRatio = 1; - release.MinimumSeedTime = 90 * 60; - - var qDetailsLink = row.QuerySelector("a[href^=\"torrents-details.php?id=\"]"); - var qDetailsTitle = row.QuerySelector("td:has(a[href^=\"torrents-details.php?id=\"]) b"); // #7100 - release.Title = qDetailsTitle.TextContent; - - if (!query.MatchQueryStringAND(release.Title)) - continue; - - var qCatLink = row.QuerySelector("a[href^=\"torrents.php?cat=\"]"); - var qDLLink = row.QuerySelector("a[href^=\"download.php\"]"); - var qSeeders = row.QuerySelector("td:nth-of-type(7)"); - var qLeechers = row.QuerySelector("td:nth-of-type(8)"); - var qDateStr = row.QuerySelector("td:nth-of-type(10)"); - var qSize = row.QuerySelector("td:nth-of-type(5)"); - - var catStr = qCatLink.GetAttribute("href").Split('=')[1]; - release.Category = MapTrackerCatToNewznab(catStr); - - release.Link = new Uri(SiteLink + qDLLink.GetAttribute("href")); - release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); - release.Guid = release.Link; - - var sizeStr = qSize.TextContent; - release.Size = ReleaseInfo.GetBytes(sizeStr); - - release.Seeders = ParseUtil.CoerceInt(qSeeders.TextContent); - release.Peers = ParseUtil.CoerceInt(qLeechers.TextContent) + release.Seeders; - - var dateStr = qDateStr.TextContent.Trim(); - var dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified); - - var pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz); - release.PublishDate = pubDateUtc.ToLocalTime(); - - var grabs = row.QuerySelector("td:nth-child(6)").TextContent; - release.Grabs = ParseUtil.CoerceInt(grabs); - - if (row.QuerySelector("img[src=\"images/free.gif\"]") != null) - release.DownloadVolumeFactor = 0; - else - release.DownloadVolumeFactor = 1; - - release.UploadVolumeFactor = 1; - - releases.Add(release); - } - } - catch (Exception ex) - { - OnParseError(results, ex); - } - - return releases; - } - } -}