From 2364d7a36af8b70822faf9b4620cda2b674a5ddb Mon Sep 17 00:00:00 2001 From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com> Date: Sat, 15 Jun 2024 01:34:15 +0100 Subject: [PATCH] totheglory: changes for 2fa (#15416) --- src/Jackett.Common/Definitions/totheglory.yml | 14 +++-------- ...totheglorycookie.yml => totheglory2fa.yml} | 6 ++--- .../Services/IndexerManagerService.cs | 25 +++++++++++-------- src/Jackett.Updater/Program.cs | 1 + 4 files changed, 21 insertions(+), 25 deletions(-) rename src/Jackett.Common/Definitions/{totheglorycookie.yml => totheglory2fa.yml} (96%) diff --git a/src/Jackett.Common/Definitions/totheglory.yml b/src/Jackett.Common/Definitions/totheglory.yml index 3be2da390..4fd92a0bc 100644 --- a/src/Jackett.Common/Definitions/totheglory.yml +++ b/src/Jackett.Common/Definitions/totheglory.yml @@ -1,7 +1,7 @@ --- id: totheglory name: ToTheGlory -description: "ToTheGlory (TTG) A Chinese tracker" +description: "ToTheGlory (TTG) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL" language: zh-CN type: private encoding: UTF-8 @@ -95,13 +95,6 @@ settings: - name: password type: password label: Password - - name: 2facode - type: text - label: 2FA code - - name: info_2fa - type: info - label: "About 2FA code" - default: "Only fill in the 2FA code box if you have enabled 2FA on the TTG Web Site. Otherwise just leave it empty." - name: passid type: select label: Security Question ID @@ -118,14 +111,14 @@ settings: - name: info_passid type: info label: "About Security ID" - default: "Only select the Security Question ID from the pulldown if you have set it on the TTG Web Site. Otherwise just leave it as ignore not set." + default: "Only select the Security Question ID from the pulldown if you have set it on the TTG Web Site. Otherwise just leave it as Ignore not set." - name: passan type: text label: Security Question Answer - name: info_passan type: info label: "About Security Question Answer" - default: "Only fill in the Security Question Answer box if you have set it on the TTG Web Site. Dont forget to write your answer in the same language you saved it on the TTG Web Site. Otherwise just leave it empty." + default: "Only fill in the Security Question Answer box if you have set it on the TTG Web Site. Don't forget to write your answer in the same language you saved it on the TTG Web Site. Otherwise just leave it empty." login: path: login.php?returnto= @@ -135,7 +128,6 @@ login: username: "{{ .Config.username }}" password: "{{ .Config.password }}" rememberme: yes - otp: "{{ .Config.2facode }}" passid: "{{ .Config.passid }}" passan: "{{ .Config.passan }}" error: diff --git a/src/Jackett.Common/Definitions/totheglorycookie.yml b/src/Jackett.Common/Definitions/totheglory2fa.yml similarity index 96% rename from src/Jackett.Common/Definitions/totheglorycookie.yml rename to src/Jackett.Common/Definitions/totheglory2fa.yml index ead8fc019..7e0bb3ce4 100644 --- a/src/Jackett.Common/Definitions/totheglorycookie.yml +++ b/src/Jackett.Common/Definitions/totheglory2fa.yml @@ -1,7 +1,7 @@ --- -id: totheglorycookie -name: ToTheGloryCookie -description: "ToTheGlory (TTG) A Chinese tracker. This uses the cookie method for access" +id: totheglory2fa +name: ToTheGlory2FA +description: "ToTheGlory (TTG) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL. This indexer uses cookie login for 2FA." language: zh-CN type: private encoding: UTF-8 diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs index 3bbe53cd3..89727ff42 100644 --- a/src/Jackett.Common/Services/IndexerManagerService.cs +++ b/src/Jackett.Common/Services/IndexerManagerService.cs @@ -38,39 +38,42 @@ namespace Jackett.Common.Services // (the id is used in the torznab/download/search urls and in the indexer configuration file) // if the indexer is removed, remove it from this list too // use: {"", ""} + // list alphabetically by the original name + // group successive and collective renames, use comments to indicate this private readonly Dictionary _renamedIndexers = new Dictionary { {"audiobooktorrents", "abtorrents"}, {"baibako", "rudub"}, {"broadcastthenet", "broadcasthenet"}, {"casatorrent", "teamctgame"}, - {"icetorrent", "speedapp"}, {"hdzone", "hdfun"}, + {"icetorrent", "speedapp"}, // v + {"scenefz", "speedapp"}, // | + {"xtremezone", "speedapp"}, // ^ {"kickasstorrent-kathow", "kickasstorrents-ws"}, {"kisssub", "miobt"}, - {"legacyhd", "reelflix"}, - {"reelflix", "reelflix-api"}, + {"legacyhd", "reelflix"}, // v + {"reelflix", "reelflix-api"}, // ^ {"magico", "trellas"}, {"metaliplayro", "romanianmetaltorrents"}, {"mteamtp2fa", "mteamtp"}, {"nnm-club", "noname-club"}, - {"oxtorrent", "torrent911"}, + {"oxtorrent", "torrent911"}, // v + {"torrent911", "oxtorrent-vip"}, // ^ {"passtheheadphones", "redacted"}, {"puntorrent", "puntotorrent"}, {"rstorrent", "redstartorrent"}, - {"scenefz", "speedapp"}, {"seals", "greatposterwall"}, {"speedcdcookie", "speedcd"}, - {"tehconnectionme", "anthelion"}, - {"torrent911", "oxtorrent-vip"}, - {"anthelion", "anthelion-api"}, + {"tehconnectionme", "anthelion"}, // v + {"anthelion", "anthelion-api"}, // ^ {"todotorrents", "dontorrent"}, {"torrent9clone", "torrent9-tel"}, {"torrentgalaxyorg", "torrentgalaxy"}, {"torrentsurf", "xtremebytes"}, - {"transmithenet", "nebulance"}, - {"nebulance", "nebulanceapi"}, - {"xtremezone", "speedapp"}, + {"totheglorycookie", "totheglory2fa"}, + {"transmithenet", "nebulance"}, // v + {"nebulance", "nebulanceapi"}, // ^ {"yourexotic", "exoticaz"} }; diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 5add9c5ce..c6afeb373 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -679,6 +679,7 @@ namespace Jackett.Updater "Definitions/torrof.yml", "Definitions/torviet.yml", "Definitions/totallykids.yml", + "Definitions/totheglorycookie.yml", // renamed totheglory2fa "Definitions/trackeros-api.yml", "Definitions/trackeros.yml", // switch to *-API #12807 "Definitions/tspate.yml",