diff --git a/src/Jackett.Common/Definitions/audiobooktorrents.yml b/src/Jackett.Common/Definitions/abtorrents.yml similarity index 97% rename from src/Jackett.Common/Definitions/audiobooktorrents.yml rename to src/Jackett.Common/Definitions/abtorrents.yml index 1ef07ccb0..24643bdb8 100644 --- a/src/Jackett.Common/Definitions/audiobooktorrents.yml +++ b/src/Jackett.Common/Definitions/abtorrents.yml @@ -1,7 +1,7 @@ ---- -id: audiobooktorrents -name: Audiobook Torrents -description: "Audiobook Torrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS" +--- +id: abtorrents +name: ABtorrents +description: "ABtorrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS" language: en-us type: private encoding: UTF-8 diff --git a/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml b/src/Jackett.Common/Definitions/kickasstorrents-ws.yml similarity index 94% rename from src/Jackett.Common/Definitions/kickasstorrent-kathow.yml rename to src/Jackett.Common/Definitions/kickasstorrents-ws.yml index 8e87a6922..11b898301 100644 --- a/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml +++ b/src/Jackett.Common/Definitions/kickasstorrents-ws.yml @@ -1,7 +1,7 @@ --- -id: kickasstorrent-kathow -name: kickasstorrents (kickass.ws) -description: "kickasstorrents (kickass.ws) is a Public KickAssTorrent clone for TV / MOVIES / GENERAL" +id: kickasstorrents-ws +name: kickasstorrents.ws +description: "kickasstorrents.ws is a Public KickAssTorrent clone for TV / MOVIES / GENERAL" language: en-us type: public encoding: UTF-8 diff --git a/src/Jackett.Common/Definitions/skytorrentsclone.yml b/src/Jackett.Common/Definitions/skytorrents-lol.yml similarity index 93% rename from src/Jackett.Common/Definitions/skytorrentsclone.yml rename to src/Jackett.Common/Definitions/skytorrents-lol.yml index 1c2c11831..055a65277 100644 --- a/src/Jackett.Common/Definitions/skytorrentsclone.yml +++ b/src/Jackett.Common/Definitions/skytorrents-lol.yml @@ -1,6 +1,6 @@ --- -id: skytorrentsclone -name: SkyTorrentsClone +id: skytorrents-lol +name: SkyTorrents.lol description: "SkyTorrents.lol is a Public SkyTorrents clone for TV / MOVIES / GENERAL" language: en-us type: public @@ -17,9 +17,9 @@ legacylinks: - https://skytorrents.unblocked.bar/ # Jackett search fails 'Returning Redirect' & 'Relogin required' loop - https://skytorrents.proxyportal.pw/ # Jackett search fails 'Returning Redirect' & 'Relogin required' loop - https://skytorrents.uk-unblock.pro/ # Jackett search fails 'Returning Redirect' & 'Relogin required' loop - - https://skytorrents.to/ # skytorrentsclone2 #10000 - - https://skytorrents.org/ # skytorrentsclone2 #10000 - - https://skytorrents.net/ # skytorrentsclone2 #10000 + - https://skytorrents.to/ # skytorrents-to #10000 + - https://skytorrents.org/ # skytorrents-to #10000 + - https://skytorrents.net/ # skytorrents-to #10000 caps: categorymappings: diff --git a/src/Jackett.Common/Definitions/skytorrentsclone2.yml b/src/Jackett.Common/Definitions/skytorrents-to.yml similarity index 98% rename from src/Jackett.Common/Definitions/skytorrentsclone2.yml rename to src/Jackett.Common/Definitions/skytorrents-to.yml index 9bf3a9a8c..0f2a71535 100644 --- a/src/Jackett.Common/Definitions/skytorrentsclone2.yml +++ b/src/Jackett.Common/Definitions/skytorrents-to.yml @@ -1,6 +1,6 @@ --- -id: skytorrentsclone2 -name: SkyTorrentsClone2 +id: skytorrents-to +name: SkyTorrents.to description: "SkyTorrents.to is a Public SkyTorrents clone for TV / MOVIES / GENERAL" language: en-us type: public diff --git a/src/Jackett.Common/Definitions/torrent9clone.yml b/src/Jackett.Common/Definitions/torrent9clone.yml index a713fc363..de3e88014 100644 --- a/src/Jackett.Common/Definitions/torrent9clone.yml +++ b/src/Jackett.Common/Definitions/torrent9clone.yml @@ -1,7 +1,7 @@ --- id: torrent9clone -name: Torrent9 clone (torrent9.ch) -description: "Torrent9 is a FRENCH Public site for TV / MOVIES / GENERAL" +name: Torrent9 clone +description: "Torrent9 clone is a FRENCH Public Torrent9 clone for TV / MOVIES / GENERAL" language: fr-fr type: public encoding: UTF-8 diff --git a/src/Jackett.Common/Definitions/torrentgalaxyorg.yml b/src/Jackett.Common/Definitions/torrentgalaxy.yml similarity index 97% rename from src/Jackett.Common/Definitions/torrentgalaxyorg.yml rename to src/Jackett.Common/Definitions/torrentgalaxy.yml index 293efc1d9..f2d79ba19 100644 --- a/src/Jackett.Common/Definitions/torrentgalaxyorg.yml +++ b/src/Jackett.Common/Definitions/torrentgalaxy.yml @@ -1,7 +1,7 @@ --- -id: torrentgalaxyorg -name: TorrentGalaxy.org -description: "TorrentGalaxy.org (TGx) is a Public site for TV / MOVIES / GENERAL" +id: torrentgalaxy +name: TorrentGalaxy +description: "TorrentGalaxy (TGx) is a Public site for TV / MOVIES / GENERAL" language: en-us type: public encoding: UTF-8 diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs index 0572b5c01..cfa72d23d 100644 --- a/src/Jackett.Common/Services/IndexerManagerService.cs +++ b/src/Jackett.Common/Services/IndexerManagerService.cs @@ -37,9 +37,11 @@ namespace Jackett.Common.Services private readonly Dictionary renamedIndexers = new Dictionary { {"ast4u", "animeworld"}, + {"audiobooktorrents", "abtorrents"}, {"broadcastthenet", "broadcasthenet"}, {"cili180", "cilipro"}, {"icetorrent", "speedapp"}, + {"kickasstorrent-kathow", "kickasstorrents-ws"}, {"leaguehd", "lemonhd"}, {"liaorencili", "cilipro"}, {"metaliplayro", "romanianmetaltorrents"}, @@ -48,7 +50,10 @@ namespace Jackett.Common.Services {"puntorrent", "puntotorrent"}, {"rstorrent", "redstartorrent"}, {"scenefz", "speedapp"}, + {"skytorrentsclone", "skytorrentsclone-lol"}, + {"skytorrentsclone2", "skytorrentsclone-to"}, {"tehconnectionme", "anthelion"}, + {"torrentgalaxyorg", "torrentgalaxy"}, {"torrentseed", "latinop2p"}, {"transmithenet", "nebulance"}, {"xtremezone", "speedapp"}, diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index d77bbcbfc..0df172dae 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -267,6 +267,7 @@ namespace Jackett.Updater "Definitions/asgaard.yml", "Definitions/asiandvdclub.yml", "Definitions/ast4u.yml", // renamed to animeworld #10578 + "Definitions/audiobooktorrents.yml", // renamed to abtorrents "Definitions/avg.yml", "Definitions/awesomehd.yml", // migrated to C# "Definitions/b2s-share.yml", @@ -339,6 +340,7 @@ namespace Jackett.Updater "Definitions/katcrs.yml", "Definitions/kaztorka.yml", "Definitions/kickasstorrent.yml", + "Definitions/kickasstorrent-kathow.yml", // renamed to kickasstorrents-ws "Definitions/kikibt.yml", "Definitions/korsar.yml", "Definitions/lapausetorrents.yml", @@ -388,6 +390,8 @@ namespace Jackett.Updater "Definitions/sharingue.yml", "Definitions/shareuniversity.yml", "Definitions/skytorrents.yml", + "Definitions/skytorrentsclone.yml", // renamed to skytorrents-lol + "Definitions/skytorrentsclone2.yml", // renamed to skytorrents-to "Definitions/solidtorrents.yml", // migrated to C# "Definitions/soundpark.yml", // to be migrated to C# "Definitions/spacetorrent.yml", @@ -410,6 +414,7 @@ namespace Jackett.Updater "Definitions/tntvillage.yml", "Definitions/topnow.yml", "Definitions/torrentcouch.yml", + "Definitions/torrentgalaxyorg.yml", // renamed to torrentgalaxy "Definitions/torrenthane.yml", "Definitions/torrentkim.yml", "Definitions/torrentquest.yml",