broadcity: removed. resolves #6662

This reverts commit 11a757f2cf.
v7 is intended for .net7 and we are still on .net6

.github/workflows/issuebot.yml

@@ -0,0 +1,50 @@
+#
+name: Redeliver failed webhook deliveries
+
+# This workflow runs every 6 hours or when manually triggered.
+on:
+  schedule:
+    - cron: '40 */6 * * *'
+  workflow_dispatch:
+
+# This workflow will use the built in `GITHUB_TOKEN` to check out the repository contents. This grants `GITHUB_TOKEN` permission to do that.
+permissions:
+  contents: read
+
+#
+jobs:
+  redeliver-failed-deliveries:
+    name: Redeliver failed deliveries
+    runs-on: ubuntu-latest
+    steps:
+      # This workflow will run a script that is stored in the repository. This step checks out the repository contents so that the workflow can access the script.
+      - name: Check out repo content
+        uses: actions/checkout@v4
+
+      # This step sets up Node.js. The script that this workflow will run uses Node.js.
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18.x'
+
+      # This step installs the octokit library. The script that this workflow will run uses the octokit library.
+      - name: Install dependencies
+        run: npm install octokit
+
+      # This step sets some environment variables, then runs a script to find and redeliver failed webhook deliveries.
+      # - Replace `YOUR_APP_ID_SECRET_NAME` with the name of the secret where you stored your app ID.
+      # - Replace `YOUR_PRIVATE_KEY_SECRET_NAME` with the name of the secret where you stored your private key.
+      # - Replace `YOUR_TOKEN_SECRET_NAME` with the name of the secret where you stored your personal access token.
+      # - Replace `YOUR_LAST_REDELIVERY_VARIABLE_NAME` with the name that you want to use for a configuration variable that will be stored in the repository where this workflow is stored. The name can be any string that contains only alphanumeric characters and `_`, and does not start with `GITHUB_` or a number. For more information, see "[AUTOTITLE](/actions/learn-github-actions/variables#defining-configuration-variables-for-multiple-workflows)."
+      
+      - name: Run script
+        env:
+          APP_ID: ${{ secrets.PROBOT_ID }}
+          PRIVATE_KEY: ${{ secrets.PROBOT_KEY }}
+          TOKEN: ${{ secrets.PROBOT_TOKEN }}
+          LAST_REDELIVERY_VARIABLE_NAME: 'PROBOT_TIME'
+          
+          WORKFLOW_REPO: ${{ github.event.repository.name }}
+          WORKFLOW_REPO_OWNER: ${{ github.repository_owner }}
+        run: |
+          node .github/workflows/scripts/redeliver-failed-deliveries.js

.github/workflows/scripts/redeliver-failed-deliveries.js

@@ -0,0 +1,221 @@
+// This script uses GitHub's Octokit SDK to make API requests. For more information, see "[AUTOTITLE](/rest/guides/scripting-with-the-rest-api-and-javascript)."
+const { App, Octokit } = require("octokit");
+
+const sleep = ms => new Promise(r => setTimeout(r, ms));
+let secondDelivery = true;
+
+//
+async function checkAndRedeliverWebhooks() {
+  // Get the values of environment variables that were set by the GitHub Actions workflow.
+  const APP_ID = process.env.APP_ID;
+  const PRIVATE_KEY = process.env.PRIVATE_KEY;
+  const TOKEN = process.env.TOKEN;
+  const LAST_REDELIVERY_VARIABLE_NAME = process.env.LAST_REDELIVERY_VARIABLE_NAME;
+  
+  const WORKFLOW_REPO_NAME = process.env.WORKFLOW_REPO;
+  const WORKFLOW_REPO_OWNER = process.env.WORKFLOW_REPO_OWNER;
+
+  // Create an instance of the octokit `App` using the app ID and private key values that were set in the GitHub Actions workflow.
+  //
+  // This will be used to make API requests to the webhook-related endpoints.
+  const app = new App({
+    appId: APP_ID,
+    privateKey: PRIVATE_KEY,
+  });
+
+  // Create an instance of `Octokit` using the token values that were set in the GitHub Actions workflow.
+  //
+  // This will be used to update the configuration variable that stores the last time that this script ran.
+  const octokit = new Octokit({ 
+    auth: TOKEN,
+  });
+
+  try {
+    // Get the last time that this script ran from the configuration variable. If the variable is not defined, use the current time minus 24 hours.
+    const lastStoredRedeliveryTime = await getVariable({
+      variableName: LAST_REDELIVERY_VARIABLE_NAME,
+      repoOwner: WORKFLOW_REPO_OWNER,
+      repoName: WORKFLOW_REPO_NAME,
+      octokit,
+    });
+    const lastWebhookRedeliveryTime = lastStoredRedeliveryTime || (Date.now() - (24 * 60 * 60 * 1000)).toString();
+
+    // Record the time that this script started redelivering webhooks.
+    const newWebhookRedeliveryTime = Date.now().toString();
+
+    // Get the webhook deliveries that were delivered after `lastWebhookRedeliveryTime`.
+    const deliveries = await fetchWebhookDeliveriesSince({lastWebhookRedeliveryTime, app});
+
+    // Consolidate deliveries that have the same globally unique identifier (GUID). The GUID is constant across redeliveries of the same delivery.
+    let deliveriesByGuid = {};
+    for (const delivery of deliveries) {
+      deliveriesByGuid[delivery.guid]
+        ? deliveriesByGuid[delivery.guid].push(delivery)
+        : (deliveriesByGuid[delivery.guid] = [delivery]);
+    }
+
+    // For each GUID value, if no deliveries for that GUID have been successfully delivered within the time frame, get the delivery ID of one of the deliveries with that GUID.
+    //
+    // This will prevent duplicate redeliveries if a delivery has failed multiple times.
+    // This will also prevent redelivery of failed deliveries that have already been successfully redelivered.
+    let failedDeliveryIDs = [];
+    for (const guid in deliveriesByGuid) {
+      const deliveries = deliveriesByGuid[guid];
+      const anySucceeded = deliveries.some(
+        (delivery) => delivery.status === "OK"
+      );
+      if (!anySucceeded) {
+        failedDeliveryIDs.push(deliveries[0].id);
+      }
+    }
+
+    // Redeliver any failed deliveries.
+    for (const deliveryId of failedDeliveryIDs) {
+      await redeliverWebhook({deliveryId, app});
+      // its likely ProBot was asleep when the first redeliver was sent and we know PRoBot startup takes about 12s
+      // so the first redeliver will likely timeout after 10s, but will have started ProBot
+      if (secondDelivery) {
+        secondDelivery = false;
+        // so we wait 13s so that the rest of the redeliveries will succeed
+        await sleep(13000);
+      }
+    }
+
+    // Update the configuration variable (or create the variable if it doesn't already exist) to store the time that this script started.
+    // This value will be used next time this script runs.
+    await updateVariable({
+      variableName: LAST_REDELIVERY_VARIABLE_NAME,
+      value: newWebhookRedeliveryTime,
+      variableExists: Boolean(lastStoredRedeliveryTime),
+      repoOwner: WORKFLOW_REPO_OWNER,
+      repoName: WORKFLOW_REPO_NAME,
+      octokit,
+      });
+
+    // Log the number of redeliveries.
+    console.log(
+      `Redelivered ${
+        failedDeliveryIDs.length
+      } failed webhook deliveries out of ${
+        deliveries.length
+      } total deliveries since ${Date(lastWebhookRedeliveryTime)}.`
+    );
+  } catch (error) {
+    // If there was an error, log the error so that it appears in the workflow run log, then throw the error so that the workflow run registers as a failure.
+    if (error.response) {
+      console.error(
+        `Failed to check and redeliver webhooks: ${error.response.data.message}`
+      );
+    }
+    console.error(error);
+    throw(error);
+  }
+}
+
+// This function will fetch all of the webhook deliveries that were delivered since `lastWebhookRedeliveryTime`.
+// It uses the `octokit.paginate.iterator()` method to iterate through paginated results. For more information, see "[AUTOTITLE](/rest/guides/scripting-with-the-rest-api-and-javascript#making-paginated-requests)."
+//
+// If a page of results includes deliveries that occurred before `lastWebhookRedeliveryTime`,
+// it will store only the deliveries that occurred after `lastWebhookRedeliveryTime` and then stop.
+// Otherwise, it will store all of the deliveries from the page and request the next page.
+async function fetchWebhookDeliveriesSince({lastWebhookRedeliveryTime, app}) {
+  const iterator = app.octokit.paginate.iterator(
+    "GET /app/hook/deliveries",
+    {
+      per_page: 100,
+      headers: {
+        "x-github-api-version": "2022-11-28",
+      },
+    }
+  );
+
+  const deliveries = [];
+
+  for await (const { data } of iterator) {
+    const oldestDeliveryTimestamp = new Date(
+      data[data.length - 1].delivered_at
+    ).getTime();
+
+    if (oldestDeliveryTimestamp < lastWebhookRedeliveryTime) {
+      for (const delivery of data) {
+        if (
+          new Date(delivery.delivered_at).getTime() > lastWebhookRedeliveryTime
+        ) {
+          deliveries.push(delivery);
+        } else {
+          break;
+        }
+      }
+      break;
+    } else {
+      deliveries.push(...data);
+    }
+  }
+
+  return deliveries;
+}
+
+// This function will redeliver a failed webhook delivery.
+async function redeliverWebhook({deliveryId, app}) {
+  await app.octokit.request("POST /app/hook/deliveries/{delivery_id}/attempts", {
+    delivery_id: deliveryId,
+  });
+}
+
+// This function gets the value of a configuration variable.
+// If the variable does not exist, the endpoint returns a 404 response and this function returns `undefined`.
+async function getVariable({ variableName, repoOwner, repoName, octokit }) {
+  try {
+    const {
+      data: { value },
+    } = await octokit.request(
+      "GET /repos/{owner}/{repo}/actions/variables/{name}",
+      {
+        owner: repoOwner,
+        repo: repoName,
+        name: variableName,
+      }
+    );
+    return value;
+  } catch (error) {
+    if (error.status === 404) {
+      return undefined;
+    } else {
+      throw error;
+    }
+  }
+}
+
+// This function will update a configuration variable (or create the variable if it doesn't already exist). For more information, see "[AUTOTITLE](/actions/learn-github-actions/variables#defining-configuration-variables-for-multiple-workflows)."
+async function updateVariable({
+  variableName,
+  value,
+  variableExists,
+  repoOwner,
+  repoName,
+  octokit,
+}) {
+  if (variableExists) {
+    await octokit.request(
+      "PATCH /repos/{owner}/{repo}/actions/variables/{name}",
+      {
+        owner: repoOwner,
+        repo: repoName,
+        name: variableName,
+        value: value,
+      }
+    );
+  } else {
+    await octokit.request("POST /repos/{owner}/{repo}/actions/variables", {
+      owner: repoOwner,
+      repo: repoName,
+      name: variableName,
+      value: value,
+    });
+  }
+}
+
+// This will execute the `checkAndRedeliverWebhooks` function.
+(async () => {
+  await checkAndRedeliverWebhooks();
+})();

README.md

@@ -46,7 +46,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Byrutor
  * Cinecalidad
  * comicat
- * ConCen
  * cpasbien
  * cpasbienClone
  * CrackingPatching
@@ -92,7 +91,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NNTT
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
- * OKPT
  * OneJAV
  * ParnuXi
  * PC-torrent
@@ -134,7 +132,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentSir (토렌트썰)
  * TorrentView (토렌트뷰)
  * TorrentWhiz (토렌트위즈)
- * Torrentz2eu
  * Torrentz2nz
  * TrahT
  * truPornolabs
@@ -142,6 +139,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * VSTHouse
  * VST Torrentz
  * VSTorrent
+ * Wolfmax4K
  * xxxAdultTorrent
  * XXXClub
  * xxxtor
@@ -153,9 +151,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
  * AniDUB
- * Anime-Free
  * AnimeLayer
  * ArenaBG
+ * BitMagnet (Local DHT) [[site](https://github.com/bitmagnet-io/bitmagnet)]
  * BookTracker
  * BootyTape
  * Catorrent
@@ -173,7 +171,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * File-Tracker
  * Gay-Torrents.net
  * Genesis-Movement
- * HD-Club
  * HD-CzTorrent
  * HDGalaKtik
  * HellTorrents
@@ -206,7 +203,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RUDUB (ex-BaibaKoTV)
  * Rustorka
  * RuTracker
- * SATClubbing
  * seleZen
  * Sharewood
  * SkTorrent
@@ -215,7 +211,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Toloka.to
  * TorrentMasters
  * Torrents-Local
- * TorrentDownload
  * TribalMixes
  * Union Fansub
  * UniOtaku
@@ -233,7 +228,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 2xFree
  * 3ChangTrai (3CT)
  * 3D Torrents (3DT)
- * 3Wmg
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
@@ -242,6 +236,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Acid Lounge (A-L)
  * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
  * Aftershock
+ * AGSVPT (Artic Global Seed Vault)
  * Aidoru!Online
  * Aither
  * AlphaRatio (AR)
@@ -250,21 +245,21 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AnimeTorrents (AnT)
  * AnimeTorrents.ro (Anime Torrents Romania)
  * AnimeWorld
- * AniToons
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
  * ArabTorrents [![(invite needed)][inviteneeded]](#)
  * AsianCinema
  * AsianDVDClub
+ * AT-12 Project
  * Audiences
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
- * Azusa [![(invite needed)][inviteneeded]](#)
+ * Azusa (梓喵) [![(invite needed)][inviteneeded]](#)
  * Back-ups
  * BakaBT
- * BeiTai
+ * BeiTai (备胎)
  * Beload
  * Best-Core
  * BeyondHD (BHD)
@@ -274,9 +269,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Bitded
  * Bithorlo (BHO)
  * BitHUmen [![(invite needed)][inviteneeded]](#)
- * Bit Of Valor
  * BitPorn
- * BitSexy
  * Bitspyder
  * BitTorrentFiles
  * BiTTuRK
@@ -287,7 +280,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Boxing Torrents
  * Brasil Tracker
  * BroadcasTheNet (BTN)
- * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
  * BrSociety
  * BTArg
@@ -298,25 +290,28 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Carp-Hunter
  * Carpathians
  * CarPT
- * CartoonChaos (CC)
  * Cathode-Ray.Tube (CRT)
  * Central Torrent
  * CeskeForum
  * CGPeers [![(invite needed)][inviteneeded]](#)
  * CHDBits [![(invite needed)][inviteneeded]](#)
- * cheggit
  * ChileBT
  * Cinemageddon [![(invite needed)][inviteneeded]](#)
  * CinemaMovieS_ZT
- * Cinematik [![(invite needed)][inviteneeded]](#)
+ * Cinematik
  * CinemaZ (EuTorrents)
  * Classix
  * Coastal-Crew
+ * ConCen [![(invite needed)][inviteneeded]](#)
  * Concertos
+ * CrabPT (蟹黄堡)
  * CrazySpirits
  * CrnaBerza
  * Dajiao (打胶) [![(invite needed)][inviteneeded]](#)
  * DANISH BYTES
+ * Darius Tracker
+ * Dark-Shadow
+ * Das Unerwartete (D-U)
  * DataScene (DS)
  * DesiTorrents
  * Diablo Torrent
@@ -326,7 +321,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DiscFan
  * DivTeam
  * DocsPedia
- * Dream Tracker
+ * Dream Tracker [![(invite needed)][inviteneeded]](#)
  * Drugari
  * Ebooks-Shares
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
@@ -363,12 +358,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
- * Greek Team
+ * H-P2P
  * HaiDan
- * Haitang
+ * Hǎitáng (海棠PT)
  * HappyFappy
+ * Hares Club (白兔俱乐部) [![(invite needed)][inviteneeded]](#)
  * Hawke-uno
- * HD Dolby
+ * HD-Club
  * HD-Forever (HDF)
  * HD-Olimpo
  * HD-Only (HDO)
@@ -379,35 +375,35 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDArea (HDA)
  * HDAtmos
  * HDBits [![(invite needed)][inviteneeded]](#)
- * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
- * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
+ * HDCiTY (HDC) [![(invite needed)][inviteneeded]](#)
  * HDFans
+ * HDFun (HDZone)
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
- * HDMaYi
- * HDPT [![(invite needed)][inviteneeded]](#)
+ * HDMaYi (小蚂蚁PT站)
+ * HDPT (明教) [![(invite needed)][inviteneeded]](#)
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
- * HDTime
+ * HDtime
  * HDTorrents.it [![(invite needed)][inviteneeded]](#)
  * HDTurk
  * HDU
  * hdvbits
  * HDVIDEO
- * HDZone
+ * Heavens-Hell
  * Hebits
  * HellasHut
  * HHanClub
- * HomePornTorrents (HPT)
  * House of Devil
  * HQMusic
  * iAnon
- * ICC2022
+ * ICC2022 (冰淇淋)
  * ImmortalSeed (iS)
  * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
  * Infire
  * Insane Tracker
  * IPTorrents (IPT)
+ * IrishTV
  * ItaTorrents
  * JME-REUNIT3D
  * JoyHD [![(invite needed)][inviteneeded]](#)
@@ -416,10 +412,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * KamePT [![(invite needed)][inviteneeded]](#)
  * Karagarga
  * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * KIMOJI
  * Korsar
  * KrazyZone
  * Kufei (库非)
  * Kufirc
+ * Last Digital Underground (LDU)
  * LastFiles
  * Le Saloon
  * LaidBackManor
@@ -432,17 +430,18 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Lesbians4u
  * Libble
  * LibraNet (LN)
+ * LilleSky.org
  * LinkoManija
  * Locadora
  * LosslessClub [![(invite needed)][inviteneeded]](#)
  * LST
  * M-Team TP (MTTP)
  * MaDs Revolution
- * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
  * Making Off
  * Mansão dos Animes (MDAN)
  * MegamixTracker
+ * Mendigos da WEB
  * MeseVilág (Fairytale World)
  * MetalGuru [![(invite needed)][inviteneeded]](#)
  * Milkie
@@ -453,7 +452,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MoreThanTV (MTV)
  * MouseBits
  * Movie-Torrentz
- * MuziekFabriek
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NCore
@@ -462,6 +460,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NorBits
  * NORDiCHD
  * Ntelogo
+ * OKPT
+ * Old Greek Tracker
  * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
  * Orpheus
@@ -475,9 +475,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PassThePopcorn (PTP)
  * Peeratiko
  * Peers.FM
- * PigNetwork
+ * PigNetwork (猪猪网)
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
+ * Polish Torrent (PTT)
  * PolishSource (PS)
  * PolishTracker
  * Pornbay [![(invite needed)][inviteneeded]](#)
@@ -486,18 +487,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Pretome
  * PrivateHD (PHD)
  * ProAudioTorrents (PAT)
+ * PT GTK
  * PT分享站 (itzmx)
- * PTCafe
+ * PTCafe (咖啡)
  * PTChina (铂金学院)
- * PTerClub
+ * PTerClub (PT之友俱乐部)
  * PTFiles (PTF)
  * PThome [![(invite needed)][inviteneeded]](#)
  * PTLSP
- * PTSBAO
+ * PTSBAO (烧包)
  * PTtime
  * Punk's Horror Tracker
  * PuntoTorrent
- * PuTao
+ * PuTao (葡萄)
  * PWTorrents (PWT)
  * R3V WTF!
  * Racing4Everyone (R4E)
@@ -506,13 +508,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
  * RedBits
- * Red Leaves [![(invite needed)][inviteneeded]](#)
+ * Red Leaves (红叶) [![(invite needed)][inviteneeded]](#)
  * ReelFlix
  * Resurrect The Net [![(invite needed)][inviteneeded]](#)
  * RetroFlix
  * RevolutionTT
+ * RM-HD
  * Romanian Metal Torrents (RMT)
  * Rousi
+ * RPTScene (RPTorrents)
+ * SATClubbing
  * SceneHD [![(invite needed)][inviteneeded]](#)
  * SceneLinks (SL)
  * SceneRush
@@ -521,19 +526,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SeedFile
  * Shadowflow (影) [![(invite needed)][inviteneeded]](#)
  * Shareisland
+ * SharkPT
  * Shazbat
  * SiamBIT
  * SkipTheCommercials
  * SkipTheTrailers
  * slosoul
  * SnowPT (SSPT)
- * SoulVoice
+ * SoulVoice (聆音Club)
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
  * SpeedCD
  * Speedmaster HD [![(invite needed)][inviteneeded]](#)
  * SpeedTorrent Reloaded
  * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
- * SportHD
  * SportsCult
  * SpringSunday [![(invite needed)][inviteneeded]](#)
  * SugoiMusic
@@ -546,11 +551,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TeamOS
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
  * teracod (Movie Zone)
+ * TGay
+ * The Crazy Ones
  * The Falling Angels (TFA)
  * The Geeks
  * The New Retro
  * The Occult [![(invite needed)][inviteneeded]](#)
  * The Old School
+ * The Paradiese
  * The Place [![(invite needed)][inviteneeded]](#)
  * The Shinning (TsH)
  * The Show
@@ -561,9 +569,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TheRebels
  * TheScenePlace (TSP)
  * Thor's Land
- * TJUPT
+ * TJUPT (北洋园PT)
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * TmGHuB
+ * Toca Share
+ * Tormac
  * Tornado
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
@@ -586,33 +596,30 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentLeech (TL)
  * TorrentLeech.pl
  * TorrentSeeds (TS)
- * TotallyKids (TK)
  * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
  * TrackerMK
  * TranceTraffic
+ * Trellas (Magico) [![(invite needed)][inviteneeded]](#)
  * TreZzoR [![(invite needed)][inviteneeded]](#)
- * TurkSeed
  * TurkTorrent (TT)
  * TV Chaos UK (TVCUK)
  * TvRoad
  * TVstore
- * Twisted-Music
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UBits
  * UHDBits
  * UltraHD
  * UnionGang
  * Universal-Torrents
- * UnleashTheCartoons
  * UnlimitZ
- * Upload.cx [![(invite needed)][inviteneeded]](#)
+ * upload.cx
  * UTOPIA
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * White Angel
  * WinterSakura
  * World-In-HD [![(invite needed)][inviteneeded]](#)
  * World-of-Tomorrow
- * Wukong
+ * Wukong (悟空问道)
  * x-ite.me (XM)
  * xBytesV2
  * Xider-Torrent
@@ -621,7 +628,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * XtremeBytes
  * XWT-Classics
  * XWTorrents (XWT)
- * YDYPT
+ * YDYPT (伊甸园PT)
  * Zamunda.net
  * Zelka.org
  * ZmPT (织梦)
@@ -630,47 +637,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
 Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be missing features or be broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com or jacketttest -at- gmail.com to get them fixed/improved.
 
-### Aggregate indexers
+### Jackett Torznab query syntax
 
-A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab`.
-It will query all configured indexers and return the combined results.
-
-If your client supports multiple feeds it's recommended to add each indexer directly instead of using the all indexer.
-Using the all indexer has no advantages (besides reduced management overhead), the only disadvantages:
-* you lose control over indexer specific settings (categories, search modes, etc.)
-* mixing search modes (IMDB, query, etc.) might cause low-quality results
-* indexer specific categories (>= 100000) can't be used.
-* slow indexers will slow down the overall result
-* total results are limited to 1000
-
-To get all Jackett indexers including their capabilities you can use `t=indexers` on the all indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as a query parameter.
-
-### Filter indexers
-
-Another special "filter" indexer is available at `/api/v2.0/indexers/<filter>/results/torznab`
-It will query the configured indexers that match the `<filter>` expression criteria and return the combined results as "all".
-
-Supported filters
-Filter | Condition
--|-
-`type:<type>` | where the indexer type is equal to `<type>`
-`tag:<tag>` | where the indexer tags contains `<tag>`
-`lang:<tag>` | where the indexer language start with `<lang>`
-`test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
-`status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (successfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)
-
-Supported operators
-Operator | Condition
--|-
-`!<expr>` | where not `<expr>`
-`<expr1>+<expr2>[+<expr3>...]` | where `<expr1>` and `<expr2>` [and `<expr3>`...]
-`<expr1>,<expr2>[,<expr3>...]` | where `<expr1>` or `<expr2>` [or `<expr3>`...]
-
-Example 1:
-The "filter" indexer at `/api/v2.0/indexers/tag:group1,!type:private+lang:en/results/torznab` will query all the configured indexers tagged with `group1` or all the indexers not private and with `en` language (`en-en`,`en-us`,...)
-
-Example 2:
-The "filter" indexer at `/api/v2.0/indexers/!status:failing,test:passed` will query all the configured indexers not `failing` or which `passed` its last test.
+Jackett accepts Torznab queries following the specifications described is the [Torznab document](https://torznab.github.io/spec-1.3-draft/index.html).
+For example, `.../api/v2.0/indexers/<aJackettIndexerName>/results/torznab/api?apikey=<yourJackettApiKey>&t=caps` would return the capabilities of the indexer, and `.../api/v2.0/indexers/<aJackettIndexerName>/results/torznab/api?apikey=<yourJackettApiKey>&t=search&q=keywords` would perform a free text search on that indexer.
 
 ### Search modes and parameters
 
@@ -705,6 +675,48 @@ Examples:
 .../api?apikey=APIKEY&t=book&cat=5,6&genre=horror&publisher=Stuff
 ```
 
+### Filter indexers
+
+A special "filter" indexer is available at `.../api/v2.0/indexers/<filter>/results/torznab`
+It will query the configured indexers that match the `<filter>` expression criteria and return the combined results as "all".
+
+Supported filters
+Filter | Condition
+-|-
+`type:<type>` | where the indexer type is equal to `<type>`
+`tag:<tag>` | where the indexer tags contains `<tag>`
+`lang:<tag>` | where the indexer language start with `<lang>`
+`test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
+`status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (successfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)
+
+Supported operators
+Operator | Condition
+-|-
+`!<expr>` | where not `<expr>`
+`<expr1>+<expr2>[+<expr3>...]` | where `<expr1>` and `<expr2>` [and `<expr3>`...]
+`<expr1>,<expr2>[,<expr3>...]` | where `<expr1>` or `<expr2>` [or `<expr3>`...]
+
+Example 1:
+The "filter" indexer at `.../api/v2.0/indexers/tag:group1,!type:private+lang:en/results/torznab` will query all the configured indexers tagged with `group1` or all the indexers not private and with `en` language (`en-en`,`en-us`,...)
+
+Example 2:
+The "filter" indexer at `/api/v2.0/indexers/!status:failing,test:passed` will query all the configured indexers not `failing` or which `passed` its last test.
+
+### Aggregate indexers
+
+A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab`.
+It will query all configured indexers and return the combined results.
+
+If your client supports multiple feeds it's recommended to add each indexer directly instead of using the all indexer.
+Using the "all" indexer has no advantages (besides reduced management overhead), the only disadvantages:
+* you lose control over indexer specific settings (categories, search modes, etc.)
+* mixing search modes (IMDB, query, etc.) might cause low-quality results
+* indexer specific categories (>= 100000) can't be used.
+* slow indexers will slow down the overall result
+* total results are limited to 1000
+
+To get all Jackett indexers including their capabilities you can use `t=indexers` on the "all" indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as a query parameter.
+
 ## Installation on Windows
 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
 
@@ -854,7 +866,7 @@ configuration or even disable the cache. Keep in mind that you can be banned by
 If you have enabled the Jackett internal cache, but have an indexer for which you would prefer to fetch fresh results (thus ignoring the internal cache) then add the **&cache=false** parameter to your torznab query.
 
 ## Configuring FlareSolverr
-Some indexers are protected by CloudFlare or similar services and Jackett is not able to solve the challenges.
+Some indexers are protected by Cloudflare or similar services and Jackett is not able to solve the challenges.
 For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) has been integrated into Jackett. This service is in charge of solving the challenges and configuring Jackett with the necessary cookies.
 Setting up this service is optional, most indexers don't need it.
 * Install FlareSolverr service (following their instructions)

azure-pipelines.yml

@@ -11,6 +11,7 @@ variables:
   # system.debug: true
 
 trigger:
+  batch: true
   branches:
     include:
       - '*'

src/Jackett.Common/Content/custom.css

@@ -378,3 +378,11 @@ input#searchquery {
 .tagify .tagify__tag-text {
     text-transform: lowercase;
 }
+
+#searchResults .indexers .error{
+    color: Tomato;
+}
+
+#searchResults .indexers .no-results{
+    color: Grey;
+}

src/Jackett.Common/Content/custom.js

@@ -147,6 +147,10 @@ function loadJackettSettings() {
             $("#can-upgrade-from-mono").show();
         }
 
+        if (data.external != null && data.external === true && data.password === '') {
+            $("#warning-external-access").show();
+        }
+
         $.each(data.notices, function (index, value) {
             console.log(value);
             doNotify(value, "danger", "glyphicon glyphicon-alert", false);
@@ -1059,6 +1063,7 @@ function showSearch(selectedFilter, selectedIndexer, query, category) {
     releaseDialog.on('hidden.bs.modal', function (e) {
         $('#indexers div.dataTables_filter input').focusWithoutScrolling();
         window.location.hash = currentFilter ? "indexers&filter=" + currentFilter : '';
+        document.title = "Jackett";
     });
 
     var setTrackers = function (filterId, trackers) {
@@ -1148,6 +1153,8 @@ function showSearch(selectedFilter, selectedIndexer, query, category) {
         $('#searchResults div.dataTables_filter input').val("");
         clearSearchResultTable($('#searchResults'));
 
+        document.title = "(...) " + searchString;
+
         var trackerId = filterId || "all";
         api.resultsForIndexer(trackerId, queryObj, function (data) {
             $('#jackett-search-perform').html($('#search-button-ready').html());
@@ -1155,9 +1162,11 @@ function showSearch(selectedFilter, selectedIndexer, query, category) {
             searchResults.empty();
             updateSearchResultTable(searchResults, data).search('').columns().search('').draw();
             searchResults.find('div.dataTables_filter input').focusWithoutScrolling();
+            document.title = "(" + data.Results.length +") " + searchString;
         }).fail(function () {
             $('#jackett-search-perform').html($('#search-button-ready').html());
             doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
+            document.title = "(err) " + searchString;
         });
     });
 

src/Jackett.Common/Content/custom_mobile.css

@@ -372,3 +372,12 @@ input#searchquery {
 .tagify .tagify__tag-text {
     text-transform: lowercase;
 }
+
+#searchResults .indexers .error{
+    color: Tomato;
+}
+
+#searchResults .indexers .no-results{
+    color: Grey;
+}
+

src/Jackett.Common/Content/index.html

@@ -29,8 +29,8 @@
     <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/tagify.css?changed=11662">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20220721002" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20220721002" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20240225001" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20240225001" media="only screen and (max-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=20230107001" />
     <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">
@@ -50,6 +50,12 @@
         </div>
         <hr />
 
+        <div id="warning-external-access" hidden class="alert alert-danger text-center" role="alert">
+            <strong>
+                <span class="glyphicon glyphicon-alert"></span> Security Risk: Your instance has external access enabled without using an admin password. <span class="glyphicon glyphicon-alert"></span>
+            </strong>
+        </div>
+
         <div id="can-upgrade-from-mono" hidden class="alert alert-info" role="alert">
             <strong>Standalone version of Jackett is now available - Mono not required</strong> <br>
             To upgrade to the standalone version of Jackett, <a href="https://github.com/Jackett/Jackett#install-on-linux-amdx64" target="_blank" class="alert-link">click here</a> for install instructions.
@@ -561,14 +567,35 @@
 
     <script id="jackett-search-results" type="text/x-handlebars-template">
         <hr />
-        <p>Your search was done using:
-            {{#each Indexers}}{{Name}}
+        <span class="indexers">Your search was done using:
+        {{#each Indexers}}
+            <span
             {{#if Error}}
-            (<span title="{{Error}}"><b>Error</b></span>)
+                class="error"
             {{else}}
-            ({{Results}})
+                {{#ifCond Results 0}}
+                class="no-results"
+                {{/ifCond}}
             {{/if}}
-            , {{/each}}
+            >
+            {{Name}}
+            {{#if Error}}
+                (<span title="{{Error}}"<b>Error</b></span>)
+            {{~else~}}
+                ({{~Results~}})
+                {{#if ElapsedTime}}
+                    <span title="Elapsed time">[{{~ElapsedTime~}}ms]</span>
+                {{~else~}}
+                    <span title="Elapsed time">[cache]</span>
+                {{~/if~}}
+            {{~/if~}}
+            {{~#if @last~}}
+                    .
+                {{~else~}}
+                    ,
+            {{~/if~}}
+            </span>
+        {{/each}}
         </p>
         <datalist id="jackett-search-saved-presets"></datalist>
         <table id="jackett-search-results-datatable" class="dataTable compact cell-border hover stripe">
@@ -760,6 +787,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2023071401"></script>
+    <script type="text/javascript" src="../custom.js?changed=20240229v1"></script>
 </body>
 </html>

src/Jackett.Common/Definitions/0daykiev.yml

@@ -62,6 +62,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "The tracker has a system for deleting inactive accounts after 6 months from your last visit to the tracker."
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/1337x.yml

@@ -13,36 +13,33 @@ links:
   - https://x1337x.eu/
   - https://x1337x.se/
   - https://1337x.so/
-  - https://1337x.unblockit.ing/
+  - https://1337x.unblockit.africa/
+  - https://1337x.unblockninja.com/
   - https://1337x.ninjaproxy1.com/
-  - https://1337x.mrunblock.bond/
+  - https://1337x.proxyninja.org/
+  - https://1337x.torrentbay.st/
 legacylinks:
   - https://1337x.is/
-  - https://1337x.nocensor.work/
-  - https://1337x.nocensor.biz/
   - https://1337x.gd/
-  - https://1337x.nocensor.sbs/
-  - https://1337x.unblockit.cat/
-  - https://1337x.unblockit.nz/
-  - https://1337x.nocensor.world/
-  - https://1337x.unblockit.page/
-  - https://1337x.unblockit.pet/
   - https://1337x.nocensor.lol/
   - https://1337x.unblockit.ink/
   - https://1337x.nocensor.art/
   - https://1337x.unblockit.bio/
   - https://1337x.unblockit.boo/
   - https://1337x.mrunblock.guru/
-  - https://1337x.mrunblock.life/ # cloudflare 403
+  - https://1337x.mrunblock.life/
   - https://1337x.unblockit.click/
   - https://1337x.unblockit.asia/
   - https://1337x.unblockit.mov/
   - https://1337x.unblockit.rsvp/
-  - https://1337x.unblockninja.com/
   - https://1337x.unblockit.vegas/
   - https://1337x.unblockit.esq/
   - https://1337x.unblockit.zip/
   - https://1337x.unblockit.foo/
+  - https://1337x.unblockit.ing/
+  - https://1337x.mrunblock.bond/
+  - https://1337x.unblockit.date/
+  - https://1337x.unblockit.dad/
 
 caps:
   categorymappings:
@@ -239,7 +236,7 @@ search:
           args: ["(?i)WEB\\sDL", "WEB-DL"]
         - name: re_replace
           args: ["(?i)HDTVRIP", "HDTV"]
-    category_sub:
+    category_optional:
       optional: true
       selector: td[class^="coll-1"] a[href^="/sub/"]
       attribute: href
@@ -248,7 +245,7 @@ search:
         - name: split
           args: ["/", 2]
     category:
-      text: "{{ if .Result.category_sub }}{{ .Result.category_sub }}{{ else }}40{{ end }}"
+      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}40{{ end }}"
     details:
       selector: td[class^="coll-1"] a[href^="/torrent/"]
       attribute: href

src/Jackett.Common/Definitions/1ptbar.yml

@@ -67,6 +67,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if packed (at User CP).</li><li>Packed accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unpacked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/2xfree.yml

@@ -68,6 +68,14 @@ settings:
     type: info
     label: Upload Speed Limit Rule
     default: The upload bandwidth shall not exceed 120Mbps, that is, the upload speed shall not exceed 15MB/s.
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not be deleted after parking (in the control panel)</li><li>Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account will be deleted if they do not log in for 150 consecutive days</li><li>Users with no traffic (ie, upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/3changtrai.yml

@@ -60,6 +60,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Cherish your account. Inactive accounts will be deleted based on the following provisions:<ol><li>Nexus Master or later will not be deleted account.</li><li>Veteran User or higher will not be deleted if temporarily locked (at User Settings).</li><li>Temporarily locked accounts will be deleted if not logged in within 90 days.</li><li>Accounts that are not temporarily locked will be deleted if they do not log in within 60 days.</li><li>Accounts with no storage for uploads and downloads will be deleted if they do not log in within 30 days or have registered within 14 days.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/3dtorrents.yml

@@ -65,6 +65,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactivity grace period is three months which means that if you do not log in to the 3Dtorrents web site for 90 days, your account will be deleted. If you are VIP your will stay until the VIP period is over."
 
 login:
   path: index.php?page=login

src/Jackett.Common/Definitions/52pt.yml

@@ -29,13 +29,12 @@ caps:
     music-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    label: Username
+  - name: password
+    type: password
+    label: Password
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -60,11 +59,29 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User (junior college) and above will be retained forever</li><li>Elite User (junior high school) and above will not be deleted after parking (in the control panel)</li><li>Users with a parked account who do not log in for 400 consecutive days will be deleted</li><li>Users with non-parked account will be deleted if they do not log in for 150 consecutive days</li><li>Users with no traffic (that is, upload/download data are both 0) will be deleted if they do not log in for 15 consecutive days, or if the registration time reaches 60 days.</li></ol>"
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: index.php
     selector: a[href="usercp.php"]

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -127,6 +127,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive accounts of users, power users and mega users will be permanently deleted from the database after 125 days! Torrents in your share don't count as activity - only logging in again counts! You can extend this period to 250 days by setting your account to parking. You can find the option to do this under Edit Profile."
 
 login:
   path: signin.php

src/Jackett.Common/Definitions/abnormal.yml

@@ -74,6 +74,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Accounts are automatically deactivated after 4 months of inactivity (no connection to the site)."
 
 login:
   method: form

src/Jackett.Common/Definitions/abtorrents.yml

@@ -98,6 +98,10 @@ settings:
     type: info
     label: Search results
     default: "If you are getting the error <b>Login Failed, got redirected</b> then access the site with your browser and <b>mark as read</b> all PMs."
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Any account that has unread PMs older than 14 days or has not logged in for 30 days will be suspended</li><li>Any account that has not been logged into for 90 days is deemed inactive and will thus be purged</li><li>Any account that has not been logged into for 30 days is deemed inactive and will be put on suspension until User logs in again</li><li>User’s stats, points, and history are irrevocably lost when purged</li><li>Logging into the site is the ONLY way to keep an account active</li><li>SEEDING ONLY does NOT constitute site activity.</li></ol>"
 
 login:
   method: cookie
@@ -141,25 +145,23 @@ search:
       selector: a[href^="filelist.php?id="]
     date_day:
       # auto adjusted by site account profile
-      # Yesterday, 6:00 AM
-      selector: td:nth-last-child(5) > span[title*="day"]
-      attribute: title
+      # Yesterday 6:00 AM
+      selector: td:nth-last-child(2) > div:contains("day")
       optional: true
       filters:
         - name: fuzzytime
     date_year:
       # auto adjusted by site account profile
-      # Aug 6 2021, 7:25 PM
-      selector: td:nth-last-child(5) > span[title]:not([title*="day"])
-      attribute: title
+      # Aug 6 2021 7:25 PM
+      selector: td:nth-last-child(2) > div:not(:contains("day"))
       optional: true
       filters:
         - name: dateparse
-          args: "MMM d yyyy, h:mm tt"
+          args: "MMM d yyyy h:mm tt"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-last-child(4)
+      selector: td:nth-last-child(4) div:first-child
     grabs:
       selector: a[href^="snatches.php?id="]
     seeders:

src/Jackett.Common/Definitions/acidlounge.yml

@@ -5,8 +5,6 @@ description: "Acid Lounge (A-L) is a Private Torrent Tracker for 0DAY / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
-certificates:
-  - ed11f0187f4aafad54382796f112ecf4bec5d76b  # Expired 28 Oct 2023
 links:
   - https://www.acid-lounge.org.uk/
 
@@ -92,6 +90,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Accounts with nothing uploaded/ downloaded will be disabled after 4 weeks."
 
 login:
   path: Main/?act=Login

src/Jackett.Common/Definitions/acrossthetasman.yml

@@ -53,7 +53,11 @@ login:
 
 search:
   paths:
-    - path: "torrents.php?sort={{ .Config.sort }}&order={{ .Config.order}}&query={{ .Keywords }}"
+    - path: torrents.php
+  inputs:
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.order }}"
+    query: "{{ .Keywords }}"
 
   rows:
     selector: table[width='100%'][align='center']:not([class]) > tbody > tr

src/Jackett.Common/Definitions/aftershock.yml

@@ -84,6 +84,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "You will be immediately banned if you have not logged in for more than 6 weeks."
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/agsvpt.yml

@@ -0,0 +1,209 @@
+---
+id: agsvpt
+name: AGSVPT
+description: "AGSVPT (Arctic Global Seed Vault) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://www.agsvpt.com/
+  - https://abroad.agsvpt.com/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movie(电影)", default: true}
+    - {id: 402, cat: TV, desc: "TV Series(电视剧)", default: true}
+    - {id: 403, cat: TV, desc: "TV Shows(综艺)", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Anime(动漫)", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)", default: true}
+    - {id: 419, cat: TV, desc: "Playlet（短剧）", default: true}
+    - {id: 411, cat: Audio, desc: "Music(音乐)）", default: true}
+    - {id: 406, cat: Audio/Video, desc: "MV(演唱", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports(体育)", default: true}
+    - {id: 408, cat: Audio/Audiobook, desc: "Audio(音频)", default: true}
+    # special
+    - {id: 413, cat: PC/Games, desc: "Game(游戏)", default: false}
+    - {id: 416, cat: Books/Comics, desc: "Comic(漫画)", default: false}
+    - {id: 412, cat: PC/0day, desc: "Software(软件)", default: false}
+    - {id: 418, cat: Other, desc: "Picture(图片)", default: false}
+    - {id: 415, cat: Books/EBook, desc: "E-Book(电子书/有声书)", default: false}
+    - {id: 417, cat: Other, desc: "Education(学习资料)", default: false}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - 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 <b>2FA code</b> box if you have enabled <b>2FA</b> on the AGSVPT Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>每页种子数:每页显示</b><i>(Torrents per page:)</i> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Elite User and above will not have their account deleted after parking (in the Control Panel)</li><li>Users who do not log in for 400 consecutive days will be disabled.</li><li>Users with a parked account will be disabled if they do not log in for 150 consecutive days</li><li>Users who have no traffic (i.e., uploading/downloading data is 0) within 7 days of new registration will be disabled</li><li>Users with no traffic (i.e. both upload/download data is 0) who do not log in for 30 consecutive days will be disabled.</li></ol>"
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+      message:
+        selector: td.text
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [401, 402, 403, 405, 404, 419, 411, 406, 407, 408]
+    - path: special.php
+      categories: [413, 416, 412, 418, 415, 417]
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+    description_verified:
+      case:
+        span[title="通过"]: "Verified:"
+        span[title="未审"]: "Unverified:"
+        span[title="拒绝"]: "Banned:"
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span
+      filters:
+        - name: prepend
+          args: "{{ .Result.description_verified }} "
+# NexusPHP v1.8.8 2023-09-25

src/Jackett.Common/Definitions/aither-api.yml

@@ -50,6 +50,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "You must log in to the Aither web site with your browser once every 120 days to prevent your account from getting disabled."
 
 login:
   path: /api/torrents
@@ -117,6 +121,8 @@ search:
     genre:
       selector: meta.genres
       filters:
+        - name: re_replace
+          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -163,6 +169,6 @@ search:
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
-      # 5 days (as seconds = 3 x 24 x 60 x 60)
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 7.1.2
+# json UNIT3D 7.2.5

src/Jackett.Common/Definitions/amigosshare.yml

@@ -128,6 +128,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive accounts, that is, without access for 90 days (3 months), will be automatically deleted by the system; with no possibility of reactivation."
 
 login:
   path: account-login.php

src/Jackett.Common/Definitions/anime-free.yml

@@ -1,144 +0,0 @@
----
-id: anime-free
-name: Anime-Free
-description: "Anime-Free is a RUSSIAN Semi-Private Torrent Tracker for Hentai manga, eroge and flash porn games"
-language: ru-RU
-type: semi-private
-encoding: windows-1251
-testlinktorrent: false
-links:
-  - https://anime-free.one/
-legacylinks:
-  - https://anime-free.net/ # redirects to *.biz
-  - https://anime-free.biz/
-  - http://anime-free.one/
-
-caps:
-  categorymappings:
-    - {id: 14, cat: TV/Anime, desc: "Аниме хентай"}
-    - {id: 47, cat: TV/Anime, desc: "   Хентай на Русском языке"}
-    - {id: 48, cat: TV/Anime, desc: "   Хентай Без русского перевода"}
-    - {id: 45, cat: TV/Anime, desc: "   Хентай Без цензуры"}
-    - {id: 46, cat: TV/Anime, desc: "   Хентай с цензурой"}
-    - {id: 54, cat: Other, desc: "Косплей"}
-    - {id: 51, cat: TV/Anime, desc: "[3D] хентай и анимация"}
-    - {id: 5, cat: Books/Comics, desc: "Хентай манга"}
-    - {id: 56, cat: Console, desc: "Игры"}
-    - {id: 10, cat: Console, desc: "   Эротические и хентай игры"}
-    - {id: 55, cat: Console, desc: "   3DCG/3D-Animation игры"}
-    - {id: 57, cat: Console, desc: "   Игры на русском языке"}
-    - {id: 58, cat: Other, desc: "   Онлайн игры"}
-    - {id: 52, cat: Books/Comics, desc: "Порно комиксы"}
-    - {id: 49, cat: XXX/ImageSet, desc: "Хентай картинки, иллюстрации, обои и Art "}
-    - {id: 43, cat: TV/Anime, desc: "Эччи (Легкая эротика)"}
-    - {id: 4, cat: TV/Anime, desc: "Аниме Хентай"}
-    - {id: 50, cat: Other, desc: "Хентай Онлайн"}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: email
-    type: text
-    label: Email
-  - name: password
-    type: password
-    label: Password
-
-login:
-  path: /
-  method: form
-  form: form.login-form
-  inputs:
-    login_name: "{{ .Config.email }}"
-    login_password: "{{ .Config.password }}"
-  error:
-    - selector: div.berrors
-  test:
-    path: /
-    selector: a[href$="/index.php?action=logout"]
-
-download:
-  selectors:
-    - selector: a[href*="/engine/download.php?id="]
-      attribute: href
-
-search:
-  # https://anime-free.biz/index.php?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story=slaves+to+passion&all_word_seach=1&titleonly=3&searchuser=&replyless=0&replylimit=0&searchdate=0&beforeafter=after&sortby=date&resorder=desc&showposts=0&catlist[]=0
-  paths:
-    - path: index.php
-  inputs:
-    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
-    do: search
-    subaction: search
-    search_start: 0
-    full_search: 1
-    result_from: 1
-    showposts: 0
-    all_word_seach: 1
-    # 0 article, 1 comments, 2 static pages, 3 article titles
-    titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
-    searchdate: 0
-    searchuser: ""
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    sortby: date
-    resorder: desc
-
-  rows:
-    selector: article
-
-  fields:
-    category:
-      selector: a[href*="category="]
-      attribute: href
-      optional: true
-      default: 54
-      case:
-        a[href$="3d_hentai"]: 51
-        a[href$="3dcg_game"]: 55
-        a[href$="censored"]: 46
-        a[href$="comics"]: 52
-        a[href$="cosplay"]: 54
-        a[href$="etty"]: 43
-        a[href$="h-game"]: 10
-        a[href$="h-online"]: 50
-        a[href$="hentai"]: 4
-        a[href$="hentai_games"]: 56
-        a[href$="hentai_manga"]: 5
-        a[href$="hentai_raznoe"]: 49
-        a[href$="hentai_rus"]: 47
-        a[href$="online_games"]: 58
-        a[href$="original_hentai"]: 48
-        a[href$="rus-game"]: 57
-        a[href$="uncensored"]: 45
-    title:
-      selector: h2.title a
-    details:
-      selector: h2.title a
-      attribute: href
-    download:
-      selector: h2.title a
-      attribute: href
-    poster:
-      selector: img.entry-image
-      attribute: src
-    description:
-      selector: div[itemprop="description"]
-    date:
-      selector: li:has(img#adddate)
-      filters:
-        - name: dateparse
-          args: "dd-MM-yyyy, HH:mm"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    size:
-      selector: b.file_size
-      optional: true
-      default: 0 B
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/animetime.yml

@@ -11,11 +11,13 @@ links:
 
 caps:
   categories:
-    Anime: TV/Anime
+    anime: TV/Anime
+    books: Books
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
+    book-search: [q]
 
 settings: []
 
@@ -37,11 +39,12 @@ search:
 
   fields:
     category:
-      text: Anime
+      selector: span.badge.badge-primary
     title:
-      selector: div.flex.flex-wrap ~ p
+      selector: a[href*="/view/"]
     details:
-      text: /
+      selector: a[href*="/view/"]
+      attribute: href
     download:
       selector: a[href*="/download/"]
       attribute: href
@@ -62,6 +65,15 @@ search:
       text: 1
     leechers:
       text: 1
+    genre:
+      selector: span.badge.badge-secondary
+      filters:
+        - name: replace
+          args: ["non english", "non_english"]
+        - name: replace
+          args: ["music video", "music_video"]
+        - name: replace
+          args: ["Anime Time", "Anime_Time"]
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/animetorrentsro.yml

@@ -59,6 +59,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive accounts under VIP and without parked are automatically deleted after about a year."
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/animeworld-api.yml

@@ -61,6 +61,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Accounts are set as inactive by the system after 180 days. After 270 days in inactive status, the accounts are automatically deleted from the system."
 
 login:
   path: /api/torrents
@@ -128,6 +132,8 @@ search:
     genre:
       selector: meta.genres
       filters:
+        - name: re_replace
+          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Cinema TV)", "Cinema_TV"]
         - name: re_replace

src/Jackett.Common/Definitions/anirena.yml

@@ -41,7 +41,9 @@ caps:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}?s={{ .Keywords}}{{ else }}{{ end }}"
+    - path: /
+  inputs:
+    s: "{{ .Keywords }}"
 
   rows:
     selector: table tbody tr:has(td.torrents_small_type_data1)

src/Jackett.Common/Definitions/anthelion-api.yml

@@ -32,6 +32,10 @@ settings:
     type: info
     label: About your API key
     default: "Find or Generate a new API Key by accessing your <a href=\"https://anthelion.me/\" target=\"_blank\">Anthelion</a> account <i>Settings</i> page and scrolling down to the <b>API Key</b> section.<br>Tick the <b>Search</b> and <b>Download</b> checkboxes and click the <b>save profile</b> button to generate the key."
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Activity is defined as actually using your account, including the snatch/grab/seeding of torrents. You are also required to sign-in to the web frontend of Anthelion at least once per 3mo (90 days) (Note, using autodl/ARR does not satisfy this)."
 
 login:
   path: api.php
@@ -60,7 +64,8 @@ search:
     q: "{{ .Keywords }}"
     tmdb: "{{ .Query.TMDBID }}"
     imdb: "{{ .Query.IMDBIDShort }}"
-    cat: "{{ join .Categories \",\" }}"
+    # category filtering is disabled since it seems to rely on the AND operator that prevents some releases to show on search.
+    # cat: "{{ join .Categories \",\" }}"
     limit: 100
     offset: 0
 

src/Jackett.Common/Definitions/arabp2p.yml

@@ -34,6 +34,10 @@ settings:
     options:
       2: desc
       1: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "You must log in periodically. If the member is absent from the website for a period of 3 months, the account will be deleted without prior warning."
 
 caps:
   categorymappings:
@@ -48,6 +52,7 @@ caps:
     - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
     - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
     - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
+    - {id: 117, cat: TV, desc: "رمضان 2024 (Ramadan)"}
     # المرئيات الاجنبية Foreign Movies
     - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
     - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}
@@ -55,9 +60,12 @@ caps:
     - {id: 57, cat: TV/Foreign, desc: "مسلسلات آسيوية (Asian Series)"}
     - {id: 42, cat: Movies/Foreign, desc: "افلام اجنبيه (Foreign)"}
     - {id: 74, cat: Movies/HD, desc: "جودة عالية HD"}
-    - {id: 76, cat: Movies/3D, desc: "&ثلاثي الابعاد 3D (3D)"}
+    - {id: 113, cat: TV/Foreign, desc: "مسلسلات لاتينية مترجم.مدبلج(Latin Series"}
     - {id: 59, cat: Movies/Foreign, desc: "افلام آسيوية (Asian Movies)"}
     - {id: 86, cat: Movies/Foreign, desc: "افلام هنديه (Indian Movies)"}
+    - {id: 114, cat: Movies/Foreign, desc: "افلام لاتينية مترجم.مدبلج (Latin Movies)"}
+    - {id: 115, cat: TV/Foreign, desc: "مسلسلات تركية مترجم.مدبلج (Turkish Series)"}
+    - {id: 116, cat: Movies/Foreign, desc: "افلام تركية مترجم.مدبلج (Turkish Movies)"}
     # انمي مدبلج عربي Anime Arabic dubbed
     - {id: 98, cat: TV/Anime, desc: "افلام (Movies)"}
     - {id: 100, cat: TV/Anime, desc: "مسلسلات (Series)"}
@@ -88,7 +96,6 @@ caps:
     - {id: 65, cat: Other, desc: "صور (Images)"}
     - {id: 56, cat: Other, desc: "رياضي (Sport)"}
     - {id: 46, cat: Other, desc: "منوع (Misc)"}
-    - {id: 112, cat: Other, desc: "رمضان 2023"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/asiancinema.yml

@@ -47,6 +47,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Your account will be automatically deleted from the database after 90 days of inactivity. If you return or visit the site with your account before that amount of time passes, then the inactivity timer will reset and your account will be fine for another 90 days.<br>Keep in mind that 'activity' is considered a visit to any page and that torrent traffic is not counted as account activity. In order to reset the inactivity timer all you have to do is visit a single page while logged in with your account. If your account is deleted for inactivity, please do not ask the site staff to un-delete it for you. The deletion is performed automatically by the server and, as such, your account cannot be recovered after it has been deleted."
 
 login:
   path: login

src/Jackett.Common/Definitions/asiandvdclub.yml

@@ -62,6 +62,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "No special action required for red ribbons and permanent sponsors and above regardless of time, for others after 1 year of zero activity on tracker and/or website account will be closed."
 
 login:
   path: login
@@ -91,11 +95,10 @@ search:
     selector: table.torrenttable_helper > tbody > tr:has(img)
 
   fields:
-    category:
+    category_optional:
       selector: img[class^="cat-"]
       attribute: class
       optional: true
-      default: 12
       case:
         img.cat-anime: 1
         img.cat-hk: 2
@@ -113,6 +116,8 @@ search:
         img.cat-pinku: 12
         img.cat-drama: 15
         img.cat-ost: 16
+    category:
+      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}12{{ end }}"
     title:
       selector: span[id]
     details:

src/Jackett.Common/Definitions/at12project.yml

@@ -1,18 +1,17 @@
 ---
-id: anitoons
-name: AniToons
-description: "AniToons is a BRAZILIAN Private Torrent Tracker for ANIME / CARTOONS"
-language: pt-BR
+id: at12project
+name: AT-12 Project
+description: "AT-12 Project is a Private Torrent Tracker for JAPANESE MOVIES / TV"
+language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://anitoons.xyz/
+  - https://at-12project.cc/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 6, cat: XXX, desc: "Adult"}
+    - {id: 7, cat: Movies, desc: "MOVIE"}
+    - {id: 8, cat: TV, desc: "TV"}
 
   modes:
     search: [q]
@@ -26,7 +25,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://anitoons.xyz/\" target=\"_blank\">AniToons</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://at-12project.cc/\" target=\"_blank\">AT-12 Project</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -115,7 +114,9 @@ search:
       selector: meta.genres
       filters:
         - name: re_replace
-          args: ["(?i)(Ficção científica)", "Ficção_científica"]
+          args: ["(?i)^None$", ""]
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: replace
           args: [" & ", "_&_"]
     description:
@@ -154,10 +155,6 @@ search:
       case:
         False: 1 # normal
         True: 2 # double
-# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
+    minimumratio:
+      text: 1.0
 # json UNIT3D 7.0.3

src/Jackett.Common/Definitions/audiences.yml

@@ -61,6 +61,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Users with Extreme User and above will be retained forever</li><li>Starting from 20230701, the non-login ban time will be adjusted to:<ul><li>(Home Alone) User - 40 days</li><li>(Young and vigorous) Power User - 60 days</li><li>(Children of Jianghu) Elite User - 80 days</li><li>(Street Fighter) Crazy User - 100 days</li><li>(non-stop) Insane User - 120 days</li><li>(Outstanding Citizen) Veteran User - 180 days</li></ul></li><li>Users with no traffic (i.e. uploading/downloading data) If it is 0) If you do not log in for 7 consecutive days will be disabled</li><li>'Parked accounts' no longer enjoy the benefits of retaining accounts, and are also subject to the above rules.</li></ol>"
 
 login:
   method: cookie

src/Jackett.Common/Definitions/audionews.yml

@@ -227,6 +227,10 @@ settings:
     options:
       2: desc
       1: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "You must stay active on the site...<ol><li>Any New users that have no stats for one month will have their account deleted</li><li>Any disabled accounts will be deleted after 6 months</li><li>Any accounts inactive for more than 6 months will be deleted</li><li>Donor accounts will be left untouched.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/azusa.yml

@@ -1,7 +1,7 @@
 ---
 id: azusa
-name: Azusa
-description: "Azusa is a CHINESE Torrent Tracker focusing on Comics"
+name: Azusa (梓喵)
+description: "Azusa (梓喵) is a CHINESE Private Torrent Tracker focusing on Comics"
 language: zh-CN
 type: private
 encoding: UTF-8

src/Jackett.Common/Definitions/backups.yml

@@ -43,6 +43,7 @@ caps:
     - {id: 62, cat: Console, desc: "RaspberryPi"}
     - {id: 56, cat: Console, desc: "Retro Minis"}
     - {id: 67, cat: Console, desc: "Retrobat"}
+    - {id: 76, cat: Console, desc: "RGS"}
     - {id: 27, cat: Console, desc: "Roms and Emulators"}
     - {id: 68, cat: Console, desc: "Schmoomer's"}
     - {id: 57, cat: Console, desc: "Sega"}
@@ -51,6 +52,7 @@ caps:
     - {id: 9, cat: TV, desc: "TV-Boxsets"}
     - {id: 11, cat: TV, desc: "TV/x264"}
     - {id: 10, cat: TV, desc: "TV/Xvid"}
+    - {id: 73, cat: Console, desc: "Wolfanoz"}
     - {id: 14, cat: TV/Sport, desc: "WWE"}
     - {id: 26, cat: Console, desc: "Xbox"}
     - {id: 12, cat: Console, desc: "XBOX360"}
@@ -78,6 +80,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "To keep records updated regularly, all inactive accounts will be deleted after 60 days of inactivity."
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -8,8 +8,6 @@ encoding: UTF-8
 requestDelay: 5
 links:
   - https://badasstorrents.com/
-  - https://badasstorrents.mrunblock.bond/
-  - https://badasstorrents.nocensor.cloud/
 legacylinks:
   - https://badasstorrents.nocensor.work/
   - https://badasstorrents.nocensor.biz/
@@ -20,6 +18,8 @@ legacylinks:
   - https://badasstorrents.mrunblock.guru/
   - https://badasstorrents.mrunblock.life/
   - https://badasstorrents.nocensor.click/
+  - https://badasstorrents.mrunblock.bond/
+  - https://badasstorrents.nocensor.cloud/
 
 caps:
   categories:
@@ -68,8 +68,12 @@ download:
 
 search:
   paths:
-    - path: "torrents{{ if .Keywords }}/search/{{ .Keywords }}{{ else }}{{ end }}"
-    - path: "torrents{{ if .Keywords }}/search/{{ .Keywords }}{{ else }}{{ end }}/26"
+    # search has 10 torrents per page, latest has 100 torrents per page.
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}latest.html{{ end }}"
+    - path: "{{ if .Keywords }}/search/{{ .Keywords }}&page=10{{ else }}{{ end }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "-"]
 
   rows:
     selector: table.table-hover > tbody > tr:has(a[href*="/torrent/"])
@@ -78,7 +82,7 @@ search:
 
   fields:
     category:
-      selector: a[href*="/cat/"]
+      selector: a[href*="/category/"]
     title:
       selector: a[href*="/torrent/"]
     details:
@@ -88,15 +92,15 @@ search:
       selector: a[href*="/torrent/"]
       attribute: href
     date:
-      selector: td:nth-child(4)
+      selector: td:nth-child(3)
       filters:
         - name: timeago
     size:
-      selector: td:nth-child(5)
+      selector: td:nth-child(4)
     seeders:
-      selector: td:nth-child(6)
+      selector: td:nth-child(5)
     leechers:
-      selector: td:nth-child(7)
+      selector: td:nth-child(6)
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/beitai.yml

@@ -1,7 +1,7 @@
 ---
 id: beitai
-name: BeiTai
-description: "BeiTai is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+name: BeiTai (备胎)
+description: "BeiTai (备胎) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8
@@ -57,6 +57,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li>Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account be deleted if they do not log in for 150 consecutive days</li><li>Users with no traffic (ie, upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/beload.yml

@@ -98,7 +98,8 @@ search:
     # does not support imdbid searches
 
   rows:
-    selector: "td.text table tbody tr:has(a[href^=\"details.php?id=\"]):not(:has(a[href=\"browse.php?cat=0\"]))"
+    selector: "div.torrents-container > table > tbody > tr > td.text > table >  tbody > tr:has(a[href^=\"details.php?id=\"]):not(:has(a[href=\"browse.php?cat=0\"]))"
+    after: 1
 
   fields:
     category:
@@ -108,11 +109,8 @@ search:
         - name: querystring
           args: cat
     title:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details.php?id="][title]
       attribute: title
-      filters:
-        - name: regexp
-          args: "Név: (.+?)(\\n|$)"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -126,34 +124,35 @@ search:
       selector: a.preview
       attribute: href
     date:
-      selector: td:nth-last-child(5)
+      selector: td:nth-last-child(6) > a
+      attribute: title
       filters:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
           args: "yyyy-MM-dd HH:mm:ss zzz"
     files:
-      selector: td:nth-last-child(7)
+      selector: td:nth-last-child(8)
     size:
-      selector: td:nth-last-child(4) b
+      selector: td:nth-last-child(5) b
     grabs:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
     seeders:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
     leechers:
-      selector: td:nth-last-child(1)
+      selector: td:nth-last-child(2)
     description:
       case:
         i.fa-check: Verified
         i.fa-question: Unverified
     downloadvolumefactor:
       case:
-        font:contains("x0"): 0
+        "span[style=\"font-size: 10px;\"]:contains(\"0x\")": 0
         "*": 1
     uploadvolumefactor:
       case:
-        font:contains("x2"): 2
-        font:contains("x4"): 4
+        "span[style=\"font-size: 10px;\"]:contains(\"2x\")": 2
+        "span[style=\"font-size: 10px;\"]:contains(\"4x\")": 4
         "*": 1
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)

src/Jackett.Common/Definitions/bestcore.yml

@@ -95,6 +95,10 @@ settings:
     type: info
     label: About login error
     default: If you get a <b>Login Failed, got redirected.</b> error during your config <i>save</i> then most likely you have used an incorrect username or password.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "<ol><li>Users who have not accessed the site for 180 days will be deleted!</li><li>If the vacation mode is set, the system will not delete the given user for 365 days.</li></ol>"
 
 login:
   path: takelogin.php
@@ -123,14 +127,15 @@ search:
       - name: andmatch
 
   fields:
-    category:
+    category_optional:
       selector: a[href^="browse.php?cat="]
       attribute: href
       optional: true
-      default: 38
       filters:
         - name: querystring
           args: cat
+    category:
+      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}38{{ end }}"
     title_default:
       # can be abbreviated
       selector: a[href^="details.php?id="]

src/Jackett.Common/Definitions/beyond-hd.yml

@@ -1,133 +0,0 @@
----
-id: beyond-hd
-name: Beyond-HD
-description: "Without BeyondHD, your HDTV is just a TV"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://beyond-hd.me/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-settings:
-  - name: info_oid
-    type: info
-    label: "About 2FA"
-    default: "If you want to enable 2FA then use the Beyond-HD (API) indexer instead."
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  captcha:
-    type: image
-    selector: img[src^="/captcha?_CAPTCHA"]
-    input: key
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: form[action$="/login"] .text-red
-    - selector: script:contains("toastr.error")
-      message:
-        selector: script:contains("toastr.error")
-#    test:
-#      path: torrents
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-
-  rows:
-    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      optional: true
-      default: 1
-      filters:
-        - name: regexp
-          args: "/categories/.*?\\.(\\d+)"
-    title:
-      selector: a.torrent-name
-    details:
-      selector: a.torrent-name
-      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    date:
-      selector: td:not(a[href$="/history"]) span.text-orange
-      filters:
-        - name: timeago
-    size:
-      selector: td span.text-blue
-    seeders:
-      selector: a[href$="/peers"] span.text-green
-    leechers:
-      selector: a[href$="/peers"] span.text-red
-    grabs:
-      selector: a[href$="/history"]
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
-      attribute: href
-    downloadvolumefactor:
-      case:
-        i[data-original-title="100% Free"]: 0
-        i[data-original-title="100% Free (Limited UL)"]: 0
-        i[data-original-title="25% Promo"]: 0.75
-        i[data-original-title="50% Promo"]: 0.5
-        i[data-original-title="75% Promo"]: 0.25
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# UNIT3D (custom)

src/Jackett.Common/Definitions/bitbazis.yml

@@ -30,7 +30,7 @@ caps:
     - {id: 71, cat: Audio/Lossless, desc: "FLAC-Eng", default: true}
     - {id: 31, cat: PC/Games, desc: "Játék", default: true}
     - {id: 81, cat: PC/0day, desc: "Program", default: true}
-    - {id: 14, cat: PC, desc: "Program-Egyéb", default: true}
+    - {id: 14, cat: Other, desc: "Egyéb", default: true}
     - {id: 66, cat: XXX/ImageSet, desc: "XXX", default: false}
     - {id: 33, cat: XXX/SD, desc: "XXX-SD", default: false}
     - {id: 89, cat: XXX/x264, desc: "XXX-HD", default: false}
@@ -73,6 +73,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>50</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "If the user does not access the site for 1 month, he will receive an e-mail notification. If you stay away for 9 months, your account will be suspended and deleted. After the 9-month absence, the user cannot register again."
 
 login:
   method: cookie

src/Jackett.Common/Definitions/bithorlo.yml

@@ -87,6 +87,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Vacation mode is used to avoid deletion due to inactivity for 90 days. You can turn it on or off in the Profile menu, set the appropriate option and save your changes."
 
 login:
   method: cookie

src/Jackett.Common/Definitions/bitmagnet.yml

@@ -0,0 +1,81 @@
+---
+id: bitmagnet
+name: BitMagnet (Local DHT)
+description: "BitMagnet is a self-hosted BitTorrent DHT search engine"
+language: en-US
+type: semi-private
+encoding: UTF-8
+links:
+  - http://127.0.0.1:3333/
+
+caps:
+  categorymappings:
+    - {id: 2000, cat: Movies, desc: "movie"}
+    - {id: 2030, cat: Movies/SD, desc: "movie_sd"} # unverified
+    - {id: 2040, cat: Movies/HD, desc: "movie_hd"} # unverified
+    - {id: 2045, cat: Movies/UHD, desc: "movie_uhd"} # unverified
+    - {id: 2060, cat: Movies/3D, desc: "movie_3d"} # unverified
+    - {id: 3000, cat: Audio, desc: "music"}
+    - {id: 3030, cat: Audio/Audiobook, desc: "audiobook"}
+    - {id: 4000, cat: PC, desc: "software"}
+    - {id: 4050, cat: PC/Games, desc: "game"} # unverified
+    - {id: 5000, cat: TV, desc: "tv_show"}
+    - {id: 5030, cat: TV/SD, desc: "tv_show_sd"} # unverified
+    - {id: 5040, cat: TV/HD, desc: "tv_show_hd"} # unverified
+    - {id: 5045, cat: TV/UHD, desc: "tv_show_uhd"} # unverified
+    - {id: 6000, cat: XXX, desc: "xxx"}
+    - {id: 6070, cat: XXX/Other, desc: "xxx_other"} # unverified
+    - {id: 7000, cat: Books, desc: "book"} # unverified
+    - {id: 7020, cat: Books/EBook, desc: "ebook"}
+    - {id: 7030, cat: Books/Comics, desc: "comic"}
+    - {id: 8000, cat: Other, desc: "Unknown"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+search:
+  paths:
+    - path: torznab/api
+      response:
+        type: xml
+  inputs:
+    t: "{{ .Query.Type }}"
+    q: "{{ .Keywords }}"
+    cat: "{{ join .Categories \",\" }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    season: "{{ .Query.Season }}"
+    ep: "{{ .Query.Ep }}"
+    limit: 100
+
+  rows:
+    selector: rss > channel > item
+
+  fields:
+    categorydesc:
+      selector: category
+    title:
+      selector: title
+    details:
+      text: /
+    date:
+      selector: pubDate
+    infohash:
+      selector: guid
+    size:
+      selector: size
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# torznab xml

src/Jackett.Common/Definitions/bitofvalor.yml

@@ -1,161 +0,0 @@
----
-id: bitofvalor
-name: Bit Of Valor
-description: "Bit Of Valor is a HUNGARIAN Private Tracker for MOVIES / TV"
-language: hu-HU
-type: private
-encoding: ISO-8859-2
-links:
-  - https://bitvalor.hu/
-
-caps:
-  categorymappings:
-    - {id: 26, cat: Books, desc: "E-Book/ENG"}
-    - {id: 27, cat: Books, desc: "E-Book/HUN"}
-    - {id: 28, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 29, cat: PC/Games, desc: "Játék/RIP"}
-    - {id: 30, cat: Movies/SD, desc: "Cam/ENG"}
-    - {id: 31, cat: Movies/SD, desc: "Cam/HUN"}
-    - {id: 32, cat: Movies/HD, desc: "HD/ENG"}
-    - {id: 33, cat: Movies/HD, desc: "HD/HUN"}
-    - {id: 34, cat: Movies/DVD, desc: "Dvd9/HUN"}
-    - {id: 35, cat: Movies/DVD, desc: "DVD/ENG"}
-    - {id: 36, cat: Movies/DVD, desc: "DVD/HUN"}
-    - {id: 37, cat: TV, desc: "Sorozat/ENG"}
-    - {id: 38, cat: TV, desc: "Sorozat/HUN"}
-    - {id: 39, cat: Movies/SD, desc: "Xvid/ENG"}
-    - {id: 40, cat: Movies/SD, desc: "Xvid/HUN"}
-    - {id: 41, cat: Audio, desc: "Zene/ENG"}
-    - {id: 42, cat: Audio, desc: "Zene/HUN"}
-    - {id: 43, cat: Other, desc: "Képek"}
-    - {id: 44, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 45, cat: PC, desc: "Program/ISO/RIP"}
-    - {id: 46, cat: XXX/WEB-DL, desc: "XXX/Film"}
-    - {id: 47, cat: XXX/ImageSet, desc: "XXX/Kép"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    book-search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search FreeLeech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      1: title
-      4: added
-      5: size
-      7: seeders
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrent oldalankén:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.error
-  test:
-    path: /
-    selector: a[href^="logout.php"]
-
-download:
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 deadonly, 3 freeleech, 4 seedless
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    # does not support imdbid search nor has imdbid link in results
-
-  rows:
-    selector: tr:has(a[onmouseover]):not(:has(td.outer))
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[onmouseover]
-    details:
-      selector: a[onmouseover]
-      attribute: href
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    download:
-      selector: a[onmouseover]
-      attribute: href
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    genre:
-      selector: i
-      filters:
-        - name: replace
-          args: ["\xA0", " "]
-        - name: validate
-          args: "Akció, Animációs, Kaland, Életrajzi, Vígjáték, Krimi, Dokumentum, Dráma, Családi, Fantasztikus, Film-noir, Bünügyi, Történelmi, Horror, Musical, Zenés, Misztikus, Hírek, Valóságshow, Romantikus, Sci-fi, Rövidfilm, Sport, Talkshow, Thriller, Háborús, Bemutató, XXX, Western, 60s, 70s, 80s, 90s, Alternative, Blues, Breaks, Classic, Country, Dance, Electronic, Folk, Funk, Hardcore, Hip.Hop, Haus, Metal, Pop, Pop.Rock, Rock, Soul, Techno, Disco, Trance, Live, Latin, Jazz"
-    description:
-      text: "{{ .Result.genre }}"
-    downloadvolumefactor:
-      case:
-        img[src="pic/free.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# Engine n/a

src/Jackett.Common/Definitions/bitporn.yml

@@ -93,6 +93,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive accounts will be deleted based on the following rules:<ul><li>Elite-ranked or higher-ranked accounts are never deleted after parking (in the control panel).</li><li>Veteran-ranked or higher-ranked accounts are never deleted.</li><li>Parked accounts are deleted if users haven't logged in for more than 400 days.</li><li>Non-parked accounts are deleted if users haven't logged in for more than 150 days.</li><li>Accounts with both uploaded and downloaded quantities at 0 will be deleted if users haven't logged in for more than 100 consecutive days.</li></ul>"
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/bitru.yml

@@ -33,7 +33,7 @@ caps:
 settings:
   - name: stripcyrillic
     type: checkbox
-    label: Strip Russian Letters
+    label: Strip Cyrillic Letters
     default: false
   - name: addrussiantotitle
     type: checkbox

src/Jackett.Common/Definitions/bitsearch.yml

@@ -8,16 +8,16 @@ encoding: UTF-8
 requestDelay: 2
 links:
   - https://bitsearch.to/
-  - https://bitsearch.nocensor.cloud/
-  - https://bitsearch.mrunblock.bond/
 legacylinks:
   - https://bitsearch.nocensor.biz/
   - https://bitsearch.nocensor.sbs/
   - https://bitsearch.nocensor.world/
   - https://bitsearch.nocensor.lol/
   - https://bitsearch.mrunblock.guru/
-  - https://bitsearch.mrunblock.life/ # This web property is not accessible via this address.
+  - https://bitsearch.mrunblock.life/
   - https://bitsearch.nocensor.click/
+  - https://bitsearch.nocensor.cloud/
+  - https://bitsearch.mrunblock.bond/
 
 caps:
   categories:
@@ -58,6 +58,10 @@ caps:
     book-search: [q]
 
 settings:
+  - name: prefer_magnet_links
+    type: checkbox
+    label: Prefer Magnet Links
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -83,6 +87,7 @@ search:
     sort: "{{ .Config.sort }}"
     order: "{{ .Config.type }}"
     limit: 100
+    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -99,9 +104,16 @@ search:
     details:
       selector: h5 a
       attribute: href
-    download:
+    download_optional:
       selector: a.dl-torrent
       attribute: href
+      optional: true
+    download:
+      text: "{{ if .Config.prefer_magnet_links }}{{ else }}{{ .Result.download_optional }}{{ end }}"
+      optional: true
+    magnet:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
     infohash:
       selector: a[href^="magnet:?xt"]
       attribute: href

src/Jackett.Common/Definitions/bitsexy.yml

@@ -1,186 +0,0 @@
----
-id: bitsexy
-name: BitSexy
-description: "BitSexy is a Private Torrent Tracker for 3X"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://bitsexy.org/
-
-caps:
-  categorymappings:
-    - {id: 33, cat: XXX, desc: "Amateur"}
-    - {id: 19, cat: XXX, desc: "Anal"}
-    - {id: 16, cat: XXX, desc: "Anime"}
-    - {id: 17, cat: XXX, desc: "Asian"}
-    - {id: 26, cat: XXX, desc: "BBW"}
-    - {id: 22, cat: XXX, desc: "BDSM"}
-    - {id: 18, cat: XXX, desc: "Big Tits"}
-    - {id: 43, cat: XXX, desc: "Black"}
-    - {id: 46, cat: XXX, desc: "Classic"}
-    - {id: 41, cat: XXX, desc: "Creampie"}
-    - {id: 28, cat: XXX, desc: "DVD-R"}
-    - {id: 21, cat: XXX, desc: "Ebony"}
-    - {id: 20, cat: XXX, desc: "Extreme"}
-    - {id: 44, cat: XXX, desc: "Feature"}
-    - {id: 31, cat: XXX, desc: "Fetish"}
-    - {id: 35, cat: XXX, desc: "Foreign"}
-    - {id: 53, cat: XXX, desc: "Gay"}
-    - {id: 30, cat: XXX, desc: "Gonzo"}
-    - {id: 51, cat: XXX, desc: "Handjob"}
-    - {id: 36, cat: XXX, desc: "Hardcore"}
-    - {id: 24, cat: XXX, desc: "Interracial"}
-    - {id: 37, cat: XXX, desc: "Latina"}
-    - {id: 25, cat: XXX, desc: "Lesbian"}
-    - {id: 52, cat: XXX, desc: "Magazines"}
-    - {id: 49, cat: XXX, desc: "Masturbation"}
-    - {id: 23, cat: XXX, desc: "Mature"}
-    - {id: 40, cat: XXX, desc: "MILF"}
-    - {id: 38, cat: XXX, desc: "Oral"}
-    - {id: 42, cat: XXX, desc: "Orgy"}
-    - {id: 29, cat: XXX, desc: "Other"}
-    - {id: 39, cat: XXX, desc: "Packs"}
-    - {id: 27, cat: XXX, desc: "PC Games"}
-    - {id: 15, cat: XXX, desc: "Pics"}
-    - {id: 48, cat: XXX, desc: "POV"}
-    - {id: 50, cat: XXX, desc: "Public"}
-    - {id: 14, cat: XXX, desc: "Reality"}
-    - {id: 47, cat: XXX, desc: "Shemale"}
-    - {id: 45, cat: XXX, desc: "Softcore"}
-    - {id: 55, cat: XXX, desc: "Solo"}
-    - {id: 54, cat: XXX, desc: "Squirt"}
-    - {id: 32, cat: XXX, desc: "Teens"}
-    - {id: 34, cat: XXX, desc: "Virtual"}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img.cimage
-    input: captcha
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table.main:contains("failed")
-  test:
-    path: my.php
-    selector: a[href$="logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead, 3 freeleech, 4 480p, 5 720p, 6 1080p, 7 4k
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", "+$1"] # prepend + to each word
-
-  rows:
-    selector: div.torrentrow:has(a[href^="download.php?torrent="])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) width"
-    files:
-      selector: div.torrenttable:nth-last-child(7)
-    date_day:
-      # Today 02:40 PM
-      # Yesterday 09:10 AM
-      selector: div.torrenttable:nth-last-child(5):contains("day")
-      # auto adjusted by site account profile
-      optional: true
-    date_year:
-      # Jul 4 2019 08:04 AM
-      selector: div.torrenttable:nth-last-child(5):not(:contains("day"))
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: dateparse
-          args: "MMM d yyyy hh:mm tt"
-    date:
-      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
-    size:
-      selector: div.torrenttable:nth-last-child(4)
-    grabs:
-      selector: div.torrenttable:nth-last-child(3)
-    seeders:
-      selector: div.torrenttable:nth-last-child(2)
-    leechers:
-      selector: div.torrenttable:nth-last-child(1)
-    downloadvolumefactor:
-      case:
-        img[src$="/pic/freeleech.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 days (as seconds = 1 x 24 x 60 x 60)
-      text: 86400
-# TBdev

src/Jackett.Common/Definitions/blutopia-api.yml

@@ -34,6 +34,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -50,6 +54,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Your membership requires that you stay active at Blutopia. To not get disabled, you are required to login to the site at least once every 30 days or be actively seeding at least 1 torrent."
 
 login:
   path: /api/torrents
@@ -95,7 +103,7 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
     details:
       selector: details_link
@@ -165,4 +173,9 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 7.1.2
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.0b

src/Jackett.Common/Definitions/broadcity.yml

@@ -1,139 +0,0 @@
----
-id: broadcity
-name: BroadCity
-description: "BroadCity is a TURKISH Private Torrent Tracker for MOVIES and TV"
-language: tr-TR
-type: private
-encoding: UTF-8
-links:
-  - https://broadcity.in/ # site is forcing to https
-legacylinks:
-  - http://broadcity.in/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies/UHD, desc: "UHD"}
-    - {id: 2, cat: Movies/UHD, desc: "UHD - BluRay"}
-    - {id: 8, cat: Movies/UHD, desc: "UHD - TV"}
-    - {id: 6, cat: Movies/WEB-DL, desc: "UHD - WEB-DL"}
-    - {id: 16, cat: Movies/UHD, desc: "UHD - WEBRip"}
-    - {id: 31, cat: Movies/BluRay, desc: "BluRay Disk"}
-    - {id: 3, cat: Movies/HD, desc: "HD"}
-    - {id: 25, cat: Movies/3D, desc: "HD - 3D"}
-    - {id: 4, cat: Movies/HD, desc: "HD - BluRay"}
-    - {id: 7, cat: Movies/HD, desc: "HD - TV"}
-    - {id: 5, cat: Movies/WEB-DL, desc: "HD - WEB-DL"}
-    - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
-    - {id: 40, cat: Movies/HD, desc: "PTer"}
-    - {id: 9, cat: Movies/SD, desc: "SD"}
-    - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}
-    - {id: 10, cat: Movies/DVD, desc: "SD - DVD"}
-    - {id: 36, cat: Movies/SD, desc: "SD - DVDRip"}
-    - {id: 12, cat: Movies/SD, desc: "SD - TV"}
-    - {id: 13, cat: Movies/WEB-DL, desc: "SD - WEB-DL"}
-    - {id: 15, cat: Movies/SD, desc: "SD - WEBRip"}
-    - {id: 17, cat: TV, desc: "TV"}
-    - {id: 26, cat: TV/Other, desc: "TV - TV Program"}
-    - {id: 19, cat: TV, desc: "TV - Yabanci Dizi"}
-    - {id: 18, cat: TV, desc: "TV - Yerli Dizi"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
-    selector: a[href*="/logout.php?logouthash="]
-
-download:
-  before:
-    path: takethanks.php
-    method: post
-    inputs:
-      torrentid: "{{ .DownloadUri.Query.id }}"
-  selectors:
-    - selector: a[href*="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    # does not support multi categories so defaulting to ALL
-    do: search
-    keywords: "{{ .Keywords }}"
-    category: 0
-    search_type: t_name
-    include_dead_torrents: yes
-
-  rows:
-    selector: "table#sortabletable tbody tr:has(div[id^=\"port-target-\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: div[id^="port-target-"] a
-    details:
-      selector: div[id^="port-target-"] a
-      attribute: href
-    download:
-      selector: div[id^="port-target-"] a
-      attribute: href
-    poster:
-      selector: div[id^="port-content-"] img
-      attribute: src
-    date:
-      selector: td:nth-child(2)
-      filters:
-        - name: regexp
-          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
-        - name: append
-          args: " +03:00" # TRT
-        - name: dateparse
-          args: "dd-MM-yyyy HH:mm zzz"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
-    minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TS Special Edition v.7.5

src/Jackett.Common/Definitions/brsociety-api.yml

@@ -30,7 +30,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://brsociety.club/\" target=\"_blank\">BrSociety</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://brsociety.club/\" target=\"_blank\">BrSociety</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -51,6 +51,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Your account will be considered inactive if it exceeds 90 days without you logging in to the Website. After 90 days of inactivity (i.e., 180 days without login) it will be deleted from the tracker."
 
 login:
   path: /api/torrents
@@ -130,14 +134,15 @@ search:
         100%: 0 # freeleech
         "*": 0 # catch errors
     uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
       selector: double_upload
       case:
-        0: 1 # normal
-        1: 2 # double
-    minimumratio:
-      text: 1.0
+        False: 1 # normal
+        True: 2 # double
+# global MR is 0.7 but torrents must be seeded for 4 days regardless of ratio
+#    minimumratio:
+#      text: 0.7
     minimumseedtime:
       # 4 days (as seconds = 4 x 24 x 60 x 60)
       text: 345600
-# json UNIT3D 6.5.0 (custom)
+# json UNIT3D 7.1.3 (custom)

src/Jackett.Common/Definitions/btarg.yml

@@ -65,6 +65,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Por página Torrents:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Those new accounts that do not register a transfer or have any movement in the forum after 4 weeks will be disabled."
 
 login:
   path: tracker/takelogin.php

src/Jackett.Common/Definitions/btschool.yml

@@ -47,6 +47,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Extreme User or above would never be deleted.</li><li>Veteran User or above would never be deleted if packed (at User CP).</li><li>Packed accounts would be deleted if users have not logged in for more than 365 days in a row.</li><li>Unpacked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 30 days in a row.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -144,6 +144,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account activity:<ol><li>Zero activity accounts (0 bytes download and 0 bytes upload) are automatically deleted after 30 days</li><li>Inactive accounts under VIP and without parked are automatically deleted after 40 days.</li></ol>"
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/byrbt.yml

@@ -58,6 +58,14 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_ipv6
+    type: info
+    label: IPv6 only
+    default: This site only accepts IPv6 addresses. If you are using IPv4 you will get a DNS Lookup Error.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Newly registered users who have not generated any traffic within 14 days (that is, the upload/download data are both 0) will be deleted</li><li>Users with a user level of Peasant that have failed to successfully improve their sharing rate within 14 days will be deleted.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/carpt.yml

@@ -62,6 +62,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account Retention Rules:<ol><li>Extreme User and above will be retained forever</li><li> Elite Users and above will not be banned after parking (in the Control Panel)</li><li>Users with a parked account will be banned if they do not log in for 360 consecutive days</li><li>Users with a non-parked account will be banned if they do not log in for 150 consecutive days</li><li> Users with no traffic (i.e., upload/download data is 0) who do not log in for 60 consecutive days will be banned.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -1,196 +0,0 @@
----
-id: cartoonchaos
-name: CartoonChaos
-description: "CartoonChaos (CC) is a Private Torrent Tracker for ANIMATED MOVIES / TV"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - http://www.cartoonchaos.org/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: info_results
-    type: info
-    label: "Search results"
-    default: "Only the <b>xBtit_Default</b> style is supported with this indexer.<br />For best results, increase the torrents number in your profile to 100.<br />Default is 15."
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      3: created
-      5: seeders
-      4: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-
-caps:
-  categorymappings:
-    - {id: 30, cat: TV, desc: "Complete Sets"}
-    - {id: 15, cat: TV, desc: "Educational"}
-    - {id: 16, cat: TV, desc: "Kids"}
-    - {id: 17, cat: TV, desc: "Mature Cartoons"}
-    - {id: 41, cat: TV, desc: "Shorts"}
-    - {id: 20, cat: TV/Anime, desc: "Anime Movies"}
-    - {id: 21, cat: TV/Anime, desc: "Anime Series"}
-    - {id: 26, cat: Movies, desc: "Animated Movies"}
-    - {id: 23, cat: Audio, desc: "Sound Tracks"}
-    - {id: 24, cat: Audio, desc: "Theme Tunes"}
-    - {id: 43, cat: Audio/Other, desc: "Misc Audio"}
-    - {id: 14, cat: TV, desc: "Banned"}
-    - {id: 29, cat: TV, desc: "Public Domain"}
-    - {id: 42, cat: TV/Foreign, desc: "Foreign Language"}
-    - {id: 28, cat: TV, desc: "Animated Adverts"}
-    - {id: 45, cat: TV/Documentary, desc: "Documentaries"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-
-login:
-  path: index.php?page=login
-  method: form
-  form: form[action^="index.php?page=login"]
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: tr td span[style="color:#FF0000;"]
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # http://www.cartoonchaos.org/index.php?page=torrents&search=transformers&category=30;21;20;26;15;16;17&options=0&active=0
-    - path: index.php
-  keywordsfilters:
-    # if searching for season packs switch S01 to season 1 #11775
-    - name: re_replace
-      args: ["(?i)(S0)(\\d{1,2})$", "season $2"]
-    - name: re_replace
-      args: ["(?i)(S)(\\d{1,3})$", "season $2"]
-  inputs:
-    page: torrents
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
-    # 0=title, 1=title&descr, 2=descr
-    options: "{{ if .Query.IMDBID }}2{{ else }}0{{ end }}"
-    # 0 all, 1 activeonly, 2 deadonly
-    active: 0
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-
-  rows:
-    selector: "table.lista tr td table.lista tr:has(a[href^=\"index.php?page=torrent-details\"]):not(:has(a[href=\"index.php?page=torrents&category=0\"])){{ if .Config.freeleech }}:has(img[src=\"gold/gold.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    title_torrent:
-      selector: a[href^="download.php?id="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-        - name: htmldecode
-        - name: re_replace
-          args: ["(?i)\\.torrent$", ""]
-    title_text:
-      selector: td a[href^="index.php?page=torrent-details"]
-    category:
-      selector: td a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      text: "{{ if .Result.title_torrent }}{{ .Result.title_torrent }}{{ else }}{{ .Result.title_text }}{{ end }}"
-      filters:
-        #  #11775
-        - name: re_replace # Seasons X-Y --> S0X-S0Y
-          args: ["(?i)\\bSeasons?[-.\\s]*(\\d)[-.\\s]*(?:-|to)[-.\\s]*(\\d)\\b", "S0$1-S0$2"]
-        - name: re_replace # Seasons X-YY --> S0X-SYY
-          args: ["(?i)\\bSeasons?[-.\\s]*(\\d)[-.\\s]*(?:-|to)[-.\\s]*(\\d+)\\b", "S0$1-S$2"]
-        - name: re_replace # Seasons XX-YY --> SXX-SYY
-          args: ["(?i)\\bSeasons?[-.\\s]*(\\d+)[-.\\s]*(?:-|to)[-.\\s]*(\\d+)\\b", "S$1-S$2"]
-        - name: re_replace # Season X --> S0X
-          args: ["(?i)\\bSeasons?[-.\\s]*(\\d)\\b", "S0$1"]
-        - name: re_replace # Season XX --> SXX
-          args: ["(?i)\\bSeasons?[-.\\s]*(\\d+)\\b", "S$1"]
-    details:
-      selector: td a[href^="index.php?page=torrent-details"]
-      attribute: href
-    download:
-      selector: td a[href^="download.php"]
-      attribute: href
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-      filters:
-        # http://anonym.to?javascript:popdetails('http://www.imdb.com/title/tt0086817');
-        - name: regexp
-          args: tt(\d+)
-    poster:
-      selector: td a[href^="index.php?page=torrent-details"]:not(a[onmouseover*="torrentimg/nocover.jpg"])
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: src=([^\s]+)
-    size:
-      selector: td:nth-child(10)
-      # two flavours of dates
-    date_day:
-      # Yesterday at 10:03:30 PM
-      selector: td:nth-child(5):contains("day")
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: re_replace
-          args: ["[ ]at|[//\xa0\\s,]+", " "]
-    date_year:
-      # February 09, 2019, 06:35:08 AM
-      selector: td:nth-child(5):not(:contains("day"))
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: re_replace
-          args: ["[//\xa0\\s,]+", " "]
-        - name: dateparse
-          args: "MMMM dd yyyy hh:mm:ss tt"
-    date:
-      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[src="gold/gold.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# xbtit 2.0.0

src/Jackett.Common/Definitions/cathoderaytube.yml

@@ -55,6 +55,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "New members must generate some torrent activity (upload, download, or cross-seed) in their account within the first 30 days of joining, otherwise their account will be automatically disabled."
 
 login:
   path: login

src/Jackett.Common/Definitions/centraltorrent.yml

@@ -72,6 +72,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "User accounts of the Power User class and lower, inactive for a period longer than 42 days, are deleted. Therefore, if for some reason you cannot access Central Torrent for some time, park your account. Although you won't be able to download torrents, you can be sure that you won't have to log in for 64 days. However, if after this time you do not log in to your account, it will be deleted."
 
 login:
   path: login.php

src/Jackett.Common/Definitions/cheggit.yml

@@ -1,165 +0,0 @@
----
-id: cheggit
-name: cheggit
-description: "cheggit is a Private site for 3X"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.cheggit.me/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: XXX, desc: "Amateur"}
-    - {id: 2, cat: XXX, desc: "Anal"}
-    - {id: 5, cat: XXX, desc: "Asian"}
-    - {id: 6, cat: XXX, desc: "BBW"}
-    - {id: 30, cat: XXX, desc: "BDSM"}
-    - {id: 36, cat: XXX, desc: "Big Ass"}
-    - {id: 8, cat: XXX, desc: "Big Tits"}
-    - {id: 7, cat: XXX, desc: "Black"}
-    - {id: 9, cat: XXX, desc: "Classic"}
-    - {id: 37, cat: XXX, desc: "Creampie"}
-    - {id: 10, cat: XXX, desc: "Cumshot"}
-    - {id: 11, cat: XXX, desc: "DVD-R"}
-    - {id: 12, cat: XXX, desc: "Fetish"}
-    - {id: 14, cat: XXX, desc: "Gang Bang / Orgy"}
-    - {id: 39, cat: XXX, desc: "Gay / Bi"}
-    - {id: 56, cat: XXX, desc: "Hairy"}
-    - {id: 35, cat: XXX, desc: "Hardcore"}
-    - {id: 44, cat: XXX, desc: "HD Porn"}
-    - {id: 3, cat: XXX, desc: "Hentai / 3D"}
-    - {id: 25, cat: XXX, desc: "Homemade"}
-    - {id: 43, cat: XXX, desc: "Interracial"}
-    - {id: 16, cat: XXX, desc: "Latina"}
-    - {id: 23, cat: XXX, desc: "Lesbian"}
-    - {id: 52, cat: XXX, desc: "Lingerie"}
-    - {id: 27, cat: XXX, desc: "Magazines"}
-    - {id: 53, cat: XXX, desc: "Manga / Comic"}
-    - {id: 18, cat: XXX, desc: "Masturbation"}
-    - {id: 26, cat: XXX, desc: "Mature"}
-    - {id: 40, cat: XXX, desc: "Megapack"}
-    - {id: 41, cat: XXX, desc: "Natural Tits"}
-    - {id: 17, cat: XXX, desc: "Oral"}
-    - {id: 29, cat: XXX, desc: "Other"}
-    - {id: 47, cat: XXX, desc: "Parody"}
-    - {id: 21, cat: XXX, desc: "Pictures / Images"}
-    - {id: 50, cat: XXX, desc: "Piss"}
-    - {id: 55, cat: XXX, desc: "Porn Music Videos"}
-    - {id: 46, cat: XXX, desc: "Pregnant / Preggo"}
-    - {id: 15, cat: XXX, desc: "Shemale / TS"}
-    - {id: 22, cat: XXX, desc: "Siterip"}
-    - {id: 20, cat: XXX, desc: "Softcore"}
-    - {id: 49, cat: XXX, desc: "Squirt"}
-    - {id: 34, cat: XXX, desc: "Straight"}
-    - {id: 19, cat: XXX, desc: "Teen"}
-    - {id: 45, cat: XXX, desc: "Voyeur"}
-    - {id: 13, cat: PC/Games, desc: "XXX Games / Apps"}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    keeplogged: 1
-  error:
-    - selector: span.warning:contains(" was incorrect.")
-  test:
-    path: index.php
-    selector: a[href^="logout.php?auth="]
-
-search:
-  paths:
-    # https://www.cheggit.me/torrents.php?filter_cat[1]=1&order_by=time&order_way=desc&filter_freeleech=1&searchtext=&search_type=0&taglist=&tags_type=0
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    order_by: "{{ .Config.sort }}"
-    order_way: "{{ .Config.type }}"
-    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    searchtext: "{{ .Keywords }}"
-    # 0=any, 1=all
-    search_type: 1
-
-  rows:
-    selector: table#torrent_table > tbody > tr:not(tr.colhead)
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?filter_cat"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: \[(\d+)\]
-    title:
-      selector: a[href^="torrents.php?id="]
-    details:
-      selector: a[href^="torrents.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="torrents.php?action=download"]
-      attribute: href
-    description:
-      selector: div.tags
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: span.time
-      attribute: title
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "MMM dd yyyy, HH:mm zzz"
-    size:
-      selector: td:nth-child(6)
-    grabs:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      case:
-        img[src$="/freedownload.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.51
-# engine n/a

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -81,6 +81,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Failure to use an account for a period of 180 days will result in the removal of the account from the CMS_ZT community."
 
 login:
   method: cookie

src/Jackett.Common/Definitions/cinematik.yml

@@ -6,121 +6,174 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://cinematik.net/
+legacylinks:
   - https://www.cinematik.net/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Comedy"}
-    - {id: 4, cat: Movies, desc: "Action"}
-    - {id: 5, cat: Movies, desc: "Horror"}
-    - {id: 6, cat: Movies, desc: "Drama"}
-    - {id: 7, cat: Movies, desc: "Documentary"}
-    - {id: 9, cat: Movies, desc: "Crime"}
-    - {id: 12, cat: Movies, desc: "Sci-Fi"}
-    - {id: 17, cat: Movies, desc: "War"}
-    - {id: 21, cat: Movies, desc: "Silent Films"}
-    - {id: 23, cat: Movies, desc: "TV-Series"}
-    - {id: 24, cat: Movies, desc: "Animation"}
-    - {id: 25, cat: Movies, desc: "Exploitation"}
-    - {id: 26, cat: Movies, desc: "Experimental"}
-    - {id: 27, cat: Movies, desc: "Fantasy"}
-    - {id: 29, cat: Movies, desc: "Short"}
-    - {id: 30, cat: Movies, desc: "Western"}
-    - {id: 32, cat: Movies, desc: "Foreign Languages"}
-    - {id: 33, cat: Movies, desc: "Thriller"}
-    - {id: 34, cat: Movies, desc: "Opera and Musical"}
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 2, cat: TV, desc: "TV"}
 
   modes:
     search: [q]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
 
 settings:
-  - name: username
+  - name: apikey
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: incldead
-    type: select
-    label: Status
-    default: 1
-    options:
-      0: Active
-      1: "Active and Inactive"
-      2: Inactive
-  - name: dropbumped
-    type: checkbox
-    label: Ignore Bumped Torrents
-    default: false
-  - name: info_results
+    label: APIKey
+  - name: info_key
     type: info
-    label: Results Per Page
-    default: "For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.<br>Default is <i>15</i>."
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://cinematik.net/\" target=\"_blank\">Cinematik</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "With 2FA enabled, there are no specific requirements for uploading, downloading, or posting. Your membership continues based on the staff's fair assessment of your overall activity and contributions."
 
 login:
-  method: form
-  path: login.php
-  submitpath: takelogin.php
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
+  path: /api/torrents
+  method: get
   error:
-    - selector: table:contains("Login failed!")
-  test:
-    path: my.php
-    selector: a[href="logout.php"]
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
 
 search:
   paths:
-    - path: browse.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    incldead: "{{ .Config.incldead }}"
-    srchdtls: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
 
   rows:
-    selector: "table[border=\"1\"] tr:not(:first-child){{ if .Config.dropbumped }}:not(:has(span.bumped)){{ else }}{{ end }}"
+    selector: data
+    attribute: attributes
 
   fields:
     category:
-      text: 1
-    title:
-      selector: td:nth-child(2) a
+      selector: category_id
+    title_optional:
+      selector: name
     details:
-      selector: a[href^="details.php?id="]
-      attribute: href
+      selector: details_link
     download:
-      selector: a[href^="details.php?id="]
-      attribute: href
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: meta.poster
       filters:
         - name: replace
-          args: ["details.php?id=", "download.php?id="]
-    files:
-      selector: td:nth-child(5)
-    size:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(8)
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    genre:
+      selector: meta.genres
       filters:
-        - name: regexp
-          args: ([\d,]+)
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: num_file
     seeders:
-      selector: td:nth-child(9)
+      selector: seeders
     leechers:
-      selector: td:nth-child(10)
+      selector: leechers
+    grabs:
+      selector: times_completed
     date:
-      selector: td:nth-child(11) div.addedtor
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
     downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
       case:
-        img[title^="Golden Torrent"]: 0
-        img[title^="Silver Torrent"]: 0.25
-        img[title^="Platinum Torrent"]: 0
-        "*": 1
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
     uploadvolumefactor:
+      # api returns False, True
+      selector: double_upload
       case:
-        img[title^="Platinum Torrent"]: 2
-        "*": 1
-# Engine n/a
+        False: 1 # normal
+        True: 2 # double
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.0

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -98,6 +98,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "If you do not log in, your account will be automatically deleted after 28 days."
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/concen.yml

@@ -1,9 +1,9 @@
 ---
 id: concen
 name: ConCen
-description: "ConCen (Conspiracy Central) is a Public conspiracy related torrent index"
+description: "ConCen (Conspiracy Central) is a Private conspiracy related torrent index"
 language: en-US
-type: public
+type: private
 encoding: UTF-8
 links:
   - https://concen.org/

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://cpasbien-vf.fr/
+  - https://cpasbien-vf.pics/
 legacylinks:
   - https://www.cpasbiens.cz/
   - https://www.cpasbiens.bz/
@@ -24,6 +24,7 @@ legacylinks:
   - https://labastidevivante.fr/
   - https://cpasbiens911.fr/
   - https://jardattraction.fr/
+  - https://cpasbien-vf.fr/
 
 caps:
   categories:
@@ -72,24 +73,34 @@ search:
   paths:
     - path: "{{ if .Keywords }}index.php?do=search&subaction=search{{ else }}{{ end }}"
       method: post
+  # postData is mandatory FlareSolverr/FlareSolverr#789
+  allowEmptyInputs: true
   inputs:
     story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
   # does not support imdbid search and does not return imdb link in results.
   keywordsfilters:
-    # if searching for season packs swith S01 to saison 1 #9712
+    # if searching for season packs with S01 to saison 1 #9712
     - name: re_replace
-      args: ["(?i)(S0)(\\d{1,2})$", "saison $2"]
-    - name: re_replace
-      args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
+      args: ["(?i)\\b(?:S0?)(\\d{1,3})\\b", "saison $1"]
 
   rows:
-    selector: div#gauche > table > tbody > tr:has(a), div#dle-content > table > tbody > tr:has(a)
+    selector: div#gauche > table > tbody > tr:has(a), div#dle-content > a.cover2
 
   fields:
     category:
       text: Other
-    title_phase1:
+    title_phase1_title:
       selector: a
+    title_phase1_url:
+      selector: a
+      attribute: href
+      filters:
+        - name: regexp
+          args: torrents\d+\/(.+?)\/
+        - name: replace
+          args: ["-", " "]
+    title_phase1:
+      text: "{{ if .Result.title_phase1_title }}{{ .Result.title_phase1_title }}{{ else }}{{ .Result.title_phase1_url }}{{ end }}"
       filters:
         - name: re_replace
           args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b(19|20\\d{2})\\b)$", "$3 $1$2"]
@@ -113,8 +124,13 @@ search:
     download:
       selector: a
       attribute: href
+    poster:
+      selector: img
+      attribute: src
     size:
       selector: div.poid
+      optional: true
+      default: "512 MB"
     date:
       text: now
     seeders:

src/Jackett.Common/Definitions/crabpt.yml

@@ -1,38 +1,31 @@
 ---
-id: 3wmg
-name: 3Wmg
-description: "3Wmg is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+id: crabpt
+name: CrabPT (蟹黄堡)
+description: "CrabPT (蟹黄堡) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
-requestDelay: 2
 links:
-  - https://www.3wmg.com/
+  - https://crabpt.vip/
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies/电影", default: true}
-    - {id: 402, cat: TV, desc: "TV Series/电视剧", default: true}
-    - {id: 403, cat: TV, desc: "TV Shows/综艺", default: true}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片", default: true}
-    - {id: 405, cat: TV/Anime, desc: "Animations/动漫", default: true}
-    - {id: 406, cat: Audio, desc: "Music/音乐", default: true}
-    - {id: 407, cat: Other/Misc, desc: "Leanrning学习", default: true}
-    - {id: 409, cat: Books, desc: "Ebook电子书", default: true}
-    - {id: 410, cat: Other, desc: "Misc/其他", default: true}
-    # special
-    - {id: 411, cat: XXX, desc: "Uncensored无码", default: false}
-    - {id: 412, cat: XXX, desc: "Censored有码", default: false}
-    - {id: 413, cat: XXX, desc: "Lgbt同志", default: false}
-    - {id: 414, cat: XXX, desc: "III三级、写真", default: false}
-    - {id: 415, cat: XXX, desc: "Animations动漫", default: false}
-    - {id: 416, cat: XXX, desc: "Other其他", default: false}
+    - {id: 408, cat: Audio, desc: "音乐"}
+    - {id: 409, cat: Other, desc: "其他"}
+    - {id: 407, cat: TV/Sport, desc: "体育竞技"}
+    - {id: 406, cat: Audio/Video, desc: "MV"}
+    - {id: 403, cat: Movies, desc: "综艺/真人秀"}
+    - {id: 402, cat: TV, desc: "电视剧"}
+    - {id: 405, cat: TV, desc: "动画"}
+    - {id: 404, cat: TV/Anime, desc: "纪录片"}
+    - {id: 401, cat: Movies, desc: "电影"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, doubanid]
     movie-search: [q, imdbid, doubanid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -47,7 +40,7 @@ settings:
   - name: info_2fa
     type: info
     label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 3Wmg Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the CrabPT Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -91,7 +84,6 @@ login:
     ssl: yes
     trackerssl: yes
   error:
-    - selector: td.embedded:has(h2:contains("失敗"))
     - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: index.php
@@ -100,9 +92,6 @@ login:
 search:
   paths:
     - path: torrents.php
-      categories: [401, 402, 403, 404, 405, 406, 407, 409, 410]
-    - path: special.php
-      categories: [411, 412, 413, 414, 415, 416]
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
@@ -141,6 +130,9 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
     imdbid:
       # site currently only has a badge and rating, the id is not present. just in case a future update.
       selector: a[href*="imdb.com/title/tt"]
@@ -194,7 +186,10 @@ search:
         "*": 1
     minimumratio:
       text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.5 2023-07-29
+# NexusPHP v1.8.8 2023-09-25

src/Jackett.Common/Definitions/crackingpatching.yml

@@ -55,7 +55,9 @@ download:
 
 search:
   paths:
-    - path: "?s={{ .Keywords }}&"
+    - path: /
+  inputs:
+    s: "{{ .Keywords }}"
 
   rows:
     selector: article.post-entry
@@ -63,14 +65,15 @@ search:
       - name: andmatch
 
   fields:
-    category:
+    category_optional:
       selector: article.post-entry
       attribute: class
       optional: true
-      default: other
       filters:
         - name: regexp
           args: "category-(.+?) "
+    category:
+      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}other{{ end }}"
     title:
       selector: h2 > a
     details:

src/Jackett.Common/Definitions/crt2fa.yml

@@ -52,6 +52,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "New members must generate some torrent activity (upload, download, or cross-seed) in their account within the first 30 days of joining, otherwise their account will be automatically disabled."
 
 login:
   method: cookie

src/Jackett.Common/Definitions/dajiao.yml

@@ -1,6 +1,6 @@
 ---
 id: dajiao
-name: Dajiao
+name: Dajiao (打胶)
 description: "Dajiao (打胶) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private

src/Jackett.Common/Definitions/danishbytes-api.yml

@@ -64,6 +64,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "If you have not logged in for 90 days, the user is automatically deleted."
 
 login:
   path: /api/torrents

src/Jackett.Common/Definitions/dariustracker.yml

@@ -0,0 +1,177 @@
+---
+id: dariustracker
+name: Darius Tracker
+description: "Darius Tracker is a HUNGARIAN Private Tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://dariustracker.hu/
+
+caps:
+  categorymappings:
+    - {id: 86, cat: Movies/SD, desc: "Film/Cam/XviD/Eng"}
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam/XviD/Hun"}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
+    - {id: 88, cat: XXX, desc: "Film/DVD/XXX"}
+    - {id: 62, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
+    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 89, cat: XXX, desc: "Film/HD/XXX"}
+    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
+    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
+    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
+    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
+    - {id: 64, cat: Movies/SD, desc: "Film/XviD/Pack"}
+    - {id: 70, cat: TV/Sport, desc: "Film/XviD/Sport"}
+    - {id: 33, cat: XXX, desc: "Film/XviD/XXX"}
+    - {id: 90, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 31, cat: PC/Games, desc: "Játék/Pc/Iso"}
+    - {id: 29, cat: PC/Games, desc: "Játék/Pc/Rip"}
+    - {id: 54, cat: Console/PS3, desc: "Játék/PS2/PS3"}
+    - {id: 32, cat: Console/XBox, desc: "Játék/XBOX"}
+    - {id: 50, cat: Books, desc: "Könyv/Eng"}
+    - {id: 27, cat: Books, desc: "Könyv/Hun"}
+    - {id: 65, cat: Other, desc: "Képek"}
+    - {id: 66, cat: XXX, desc: "Képek/XXX"}
+    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
+    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
+    - {id: 68, cat: Movies/DVD, desc: "Mese/DVD"}
+    - {id: 69, cat: Movies/SD, desc: "Mese/XviD"}
+    - {id: 67, cat: PC/Mobile-Other, desc: "Mobiltelefon"}
+    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
+    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
+    - {id: 14, cat: PC, desc: "Program/Egyéb"}
+    - {id: 81, cat: PC/ISO, desc: "Program/Iso"}
+    - {id: 49, cat: PC, desc: "Program/Rip"}
+    - {id: 58, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 22, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: name
+      5: size
+      4: added
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table[cellpadding="5"]:contains("Hiba")
+  test:
+    path: index.php
+    selector: a[href^="logout.php"]
+
+search:
+  paths:
+    # https://dariustracker.hu/browse.php?viewMode=&c68=1&c69=1&search=&incldead=1&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c[{{.}}]=1&{{end}}"
+    viewMode: ""
+    search: "{{ .Keywords }}"
+    # 0 active, 1 active and dead, 2 deadonly,  3 my torrents, 4 seedless
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: "table[cellpadding=\"5\"] > tbody > tr > td > table[cellpadding=\"5\"] > tbody > tr:has(a[href^=\"download.php?torrent=\"]){{ if .Config.freeleech }}:has(img[src$=\"/arrowdown.png\"] ~ span:contains(\"0x\")){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: title
+      filters:
+        - name: re_replace
+          args: ["(?i)(Név: |Első név: -)|Második név: -", ""]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a.preview
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    files:
+      selector: td:nth-last-child(7)
+    date:
+      selector: td:nth-last-child(5)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: td:nth-last-child(4) b
+    grabs:
+      selector: td:nth-last-child(3)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    downloadvolumefactor:
+      selector: img[src$="/arrowdown.png"] ~ span
+      filters:
+        - name: regexp
+          args: (\d+)
+    uploadvolumefactor:
+      selector: img[src$="/arrowup.png"] ~ span
+      filters:
+        - name: regexp
+          args: (\d+)
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a

src/Jackett.Common/Definitions/dark-shadow.yml

@@ -0,0 +1,207 @@
+---
+id: dark-shadow
+name: Dark-Shadow
+description: "Dark-Shadow is a GERMAN Private site for TV / MOVIES / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://dark-shadow.me/
+legacylinks:
+  - https://dark-shadow.ml/
+  - https://projekt.dark-shadow.me/
+
+caps:
+  categorymappings:
+    # Movie
+    - {id: 32, cat: Movies/HD, desc: "Filme HD"}
+    - {id: 114, cat: Movies/UHD, desc: "Filme UHD"}
+    - {id: 140, cat: Movies/BluRay, desc: "Filme BluRay"}
+    - {id: 28, cat: Movies/SD, desc: "Filme SD"}
+    - {id: 138, cat: Movies, desc: "Filme Pack's"}
+    # Serien
+    - {id: 57, cat: TV/HD, desc: "Serien HD"}
+    - {id: 139, cat: TV/UHD, desc: "Serien UHD"}
+    - {id: 60, cat: TV/SD, desc: "Serien SD"}
+    - {id: 59, cat: TV, desc: "Serien Pack's"}
+    # Audio
+    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
+    - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
+    - {id: 52, cat: Audio, desc: "Audio Pack"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Audio Hörbuch"}
+    - {id: 120, cat: Audio/Video, desc: "Audio Videos"}
+    # Apps
+    - {id: 12, cat: PC/0day, desc: "Apps Windows"}
+    - {id: 125, cat: PC/Mac, desc: "Apps Mac-OSX"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "Apps Mobil"}
+    - {id: 141, cat: PC/ISO, desc: "Apps Other"}
+    # Doku
+    - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
+    - {id: 123, cat: TV/Documentary, desc: "Doku Pack's"}
+    # Spiel
+    - {id: 17, cat: PC/Games, desc: "Spiel PC"}
+    - {id: 24, cat: Console, desc: "Spiel Konsole"}
+    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
+    - {id: 121, cat: Console, desc: "Spiel Wimmelbild"}
+    # Sport
+    - {id: 61, cat: TV/Sport, desc: "Sport HD"}
+    - {id: 62, cat: TV/Sport, desc: "Sport SD"}
+    - {id: 144, cat: TV/Sport, desc: "Sport Wrestling"}
+    # ePaper
+    - {id: 96, cat: Books/Mags, desc: "ePaper Zeitungen"}
+    - {id: 136, cat: Books/EBook, desc: "ePaper E-Book"}
+    - {id: 137, cat: Books/Comics, desc: "ePaper Comics"}
+    # XXX
+    - {id: 143, cat: XXX/x264, desc: "XXX HD / SD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX Pack's"}
+    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic's"}
+    #  Internal
+    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
+    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
+    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
+    - {id: 131, cat: TV/SD, desc: "Internal Serie SD"}
+    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive accounts will be deactivated after 7 weeks and deleted after another 3 weeks."
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div#login_error
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: selection.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both
+    blah: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+  keywordsfilters:
+    # prefix and postfix percent wildcard as well as replacing spaces between words
+    - name: re_replace
+      args: ["\\W+", "%"]
+    - name: re_replace
+      args: ["^(.+)$", "%$1%"]
+
+  rows:
+    selector: "div.selection_wrap{{ if .Config.freeleech }}:root:has(div.onlyup){{ else }}{{ end }}"
+
+  fields:
+    category_p1:
+      selector: div.kat_cat_pic_name
+    category_p2:
+      selector: div.kat_cat_pic_name_b
+    categorydesc:
+      text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
+    title:
+      selector: a.selection_a
+      filters:
+        # remove [REQ] and anything else in [] that prefixes titles
+        - name: re_replace
+          args: ["^(\\[.*\\])(.*)", "$2"]
+    details:
+      selector: a.selection_a
+      attribute: href
+    download:
+      selector: a[href^="download_ssl.php?torrent="]
+      attribute: href
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: div.selection_unter_ad
+    grabs:
+      selector: div.selection_unter_ae
+    date_day:
+      # Heute 13:30:04
+      # Gestern 09:10:10
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
+    date_year:
+      # 30.02.2018 um 23:12:50
+      selector: div.selection_unter_ab:contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: [" um", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "dd.MM.yyyy HH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    description:
+      selector: selection_unter_af
+    seeders:
+      selector: div.selection_unter_aa
+    leechers:
+      selector: div.selection_unter_aaa
+    downloadvolumefactor:
+      case:
+        ":root:has(div.onlyup)": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 36 hours (as seconds = 36 x 60 x 60)
+      text: 129600
+# 3xT

src/Jackett.Common/Definitions/dasunerwartete.yml

@@ -0,0 +1,199 @@
+---
+id: dasunerwartete
+name: Das Unerwartete
+description: "Das Unerwartete (D-U) is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://dasunerwartete.biz/
+
+caps:
+  categorymappings:
+    # Filme
+    - {id: 28, cat: Movies/SD, desc: "SD"}
+    - {id: 32, cat: Movies/HD, desc: "HD"}
+    - {id: 114, cat: Movies/UHD, desc: "UHD"}
+    - {id: 140, cat: Movies/BluRay, desc: "BluRay"}
+    - {id: 138, cat: Movies, desc: "Pack`s"}
+    # Serien
+    - {id: 60, cat: TV/SD, desc: "SD"}
+    - {id: 57, cat: TV/HD, desc: "HD"}
+    - {id: 139, cat: TV/UHD, desc: "UHD"}
+    - {id: 59, cat: TV, desc: "Pack`s"}
+    # Audio
+    - {id: 110, cat: Audio/MP3, desc: "MP3"}
+    - {id: 48, cat: Audio/Lossless, desc: "Flac"}
+    - {id: 52, cat: Audio, desc: "Pack"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
+    - {id: 120, cat: Audio/Video, desc: "Videos"}
+    # Apps
+    - {id: 12, cat: PC/0day, desc: "Windows"}
+    - {id: 125, cat: PC/Mac, desc: "Mac-OSX"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 141, cat: PC, desc: "PC"}
+    # Doku
+    - {id: 15, cat: TV/Documentary, desc: "SD"}
+    - {id: 14, cat: TV/Documentary, desc: "HD"}
+    - {id: 123, cat: TV/Documentary, desc: "Reihe"}
+    # Spiel
+    - {id: 126, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 17, cat: PC/Games, desc: "PC"}
+    - {id: 24, cat: Console, desc: "Konsole"}
+    - {id: 121, cat: Console, desc: "Wimmelbild"}
+    # Sport
+    - {id: 61, cat: TV/Sport, desc: "HD"}
+    - {id: 62, cat: TV/Sport, desc: "SD"}
+    # ePaper
+    - {id: 96, cat: Books/Mags, desc: "Zeitungen"}
+    - {id: 136, cat: Books/EBook, desc: "E-Book"}
+    - {id: 137, cat: Books/Comics, desc: "Comics"}
+    # XXX
+    - {id: 76, cat: XXX/SD, desc: "SD"}
+    - {id: 73, cat: XXX/x264, desc: "HD"}
+    - {id: 75, cat: XXX/Pack, desc: "Pack"}
+    - {id: 142, cat: XXX/ImageSet, desc: "Pic´s"}
+    # Internal
+    - {id: 129, cat: Movies/SD, desc: "Film SD"}
+    - {id: 128, cat: Movies/HD, desc: "Film HD"}
+    - {id: 131, cat: TV/SD, desc: "Serie SD"}
+    - {id: 130, cat: TV/HD, desc: "Serien HD"}
+    - {id: 132, cat: Other, desc: "Sonstiges"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About OnlyUpload at D-U
+    default: "<ul><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li></ul>"
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Anzahl der Torrents beim Durchsuchen:</b> setting to <b>60</b> on your Control Panel. The default is <i>15</i>.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive accounts will be deactivated after 7 weeks and deleted after another 3 weeks."
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div#login_error
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+search:
+  # https://dasunerwartete.biz/selection.php?scat[]=60&scat[]=15&search=&blah=0&orderby=added&sort=desc
+  path: selection.php
+  inputs:
+    $raw: "{{ range .Categories }}scat[]={{.}}&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both
+    blah: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid search from the browse.php page or return imdb links in results
+
+  rows:
+    selector: "div.selection_wrap{{ if .Config.onlyupload }}:has(img[src=\"/pic/free.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="selection.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download_ssl.php?torrent="]
+      attribute: href
+    poster:
+      selector: img[src^="cloud-data/to_cover/"]
+      attribute: src
+    size:
+      selector: div.selection_unter_ad
+    grabs:
+      selector: div.selection_unter_ae
+    seeders:
+      selector: div.selection_unter_aa > b
+    leechers:
+      selector: div.selection_unter_aaa > b
+    date_day:
+      # Heute 03:27:27
+      # Gestern 21:00:59
+      selector: div.selection_unter_ab:contains("Heute"), div.selection_unter_ab:contains("Gestern")
+      optional: true
+      filters:
+        - name: replace
+          args: ["Heute ", "Today"]
+        - name: replace
+          args: ["Gestern ", "Yesterday"]
+        - name: fuzzytime
+    date_year:
+      # 14.03.2024 um 20:43:07
+      selector: div.selection_unter_ab:not(:contains("Heute")):not(:contains("Gestern"))
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["um ", ""]
+        - name: dateparse
+          args: "dd.MM.yyyy HH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    downloadvolumefactor:
+      case:
+        img[src="/pic/free.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# THX custom

src/Jackett.Common/Definitions/datascene-api.yml

@@ -79,6 +79,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "<ul><li>Accounts with zero activity (0 bytes download and 0 bytes upload) are automatically deleted after 30 days.</li><li>Inactive VIP and unparked accounts are automatically deleted after 40 days.</li></ul>"
 
 login:
   path: /api/torrents
@@ -146,6 +150,8 @@ search:
     genre:
       selector: meta.genres
       filters:
+        - name: re_replace
+          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(All Sex)", "All_Sex"]
         - name: re_replace
@@ -196,4 +202,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 7.0.3
+# json UNIT3D 7.2.0

src/Jackett.Common/Definitions/demonoid.yml

@@ -9,24 +9,9 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.ing/
-  - https://demonoid.torrentbay.net/
-  - https://demonoid.mrunblock.bond/
-  - https://demonoid.nocensor.cloud/
+  - https://demonoid.unblockit.africa/
+  - https://demonoid.torrentbay.st/
 legacylinks:
-  - https://demonoid.nocensor.biz/
-  - https://demonoid.nocensor.sbs/
-  - https://demonoid.unblockit.cat/
-  - https://demonoid.unblockit.nz/
-  - https://demonoid.nocensor.world/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.pet/
-  - https://demonoid.unblockit.page/
-  - https://demonoid.unblockit.pet/
-  - https://demonoid.nocensor.lol/
-  - https://demonoid.unblockit.ink/
-  - https://demonoid.nocensor.art/
-  - https://demonoid.unblockit.bio/
   - https://demonoid.unblockit.boo/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.to/
@@ -43,6 +28,12 @@ legacylinks:
   - https://demonoid.unblockit.esq/
   - https://demonoid.unblockit.zip/
   - https://demonoid.unblockit.foo/
+  - https://demonoid.unblockit.ing/
+  - https://demonoid.torrentbay.net/
+  - https://demonoid.mrunblock.bond/
+  - https://demonoid.nocensor.cloud/
+  - https://demonoid.unblockit.date/
+  - https://demonoid.unblockit.dad/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/desitorrents-api.yml

@@ -51,6 +51,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "<ul><li>Accounts are regarded as inactive when users fail to sign into their accounts for more than 3 months (90 days). Inactive accounts are automatically disabled by a script that runs once every day.</li><li>For new accounts, members must generate some activity by downloading or uploading torrents in the first month (30 days) of their memberships.</li><li>Donors are exempt from automatic account disabling due to inactivity. If you wish to always maintain an active account consider donating.</li></ul>"
 
 login:
   path: /api/torrents
@@ -118,6 +122,8 @@ search:
     genre:
       selector: meta.genres
       filters:
+        - name: re_replace
+          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace

src/Jackett.Common/Definitions/devil-torrents.yml

@@ -60,6 +60,10 @@ settings:
     options:
       POLISH: POLISH
       MULTi POLISH: MULTi POLISH
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
 
 login:
   path: logowanie

src/Jackett.Common/Definitions/digitalcore.yml

@@ -95,6 +95,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "If your account is inactive (you do not sign in) for more than 60 days, your account is disabled. Park your account if you are going away for more than 60 days."
 
 login:
   method: cookie
@@ -160,7 +164,7 @@ search:
       selector: added
       filters:
         - name: append
-          args: " +02:00" # EET
+          args: " +01:00" # CET
         - name: dateparse
           args: "yyyy-MM-dd HH:mm:ss zzz"
     size:

src/Jackett.Common/Definitions/divteam.yml

@@ -86,6 +86,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "In principle, the STAFF reserves the right to delete any user who has not accessed the tracker in 90 days or has not downloaded/uploaded any contribution in the last 180 days, if you are going to be away for a while, park the account from your panel."
 
 login:
   method: cookie

src/Jackett.Common/Definitions/docspedia.yml

@@ -68,6 +68,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Accounts without activity in the first 28 days will be deleted automatically by the system."
 
 login:
   path: login.php

src/Jackett.Common/Definitions/dreamtracker.yml

@@ -106,6 +106,10 @@ caps:
     book-search: [q]
 
 settings:
+  - name: info_vip
+    type: info
+    label: VIP
+    default: "On 1st March 2024 this site became VIP only. You will not be able to access the Torrents page with this indexer if you do not have a subscription membership."
   - name: username
     type: text
     label: Username
@@ -221,8 +225,8 @@ search:
         "img[src$=\"/torrent_multiple_upload.png\"]": 2
         "*": 1
     minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
+      # 110 hours  (as seconds = 110 x 60 x 60)
+      text: 396000
     minimumratio:
       text: 1.0
 # TSUE 2.2

src/Jackett.Common/Definitions/drugari.yml

@@ -104,6 +104,10 @@ settings:
     type: info
     label: Search results
     default: "If you are getting the error <b>Found no results while trying to browse this tracker</b> then first access the site with your browser and read any new mail you may have received. You cannot browse torrents with unread mail outstanding."
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "You must log in to the Drugari web site with your browser once every 60 days to prevent your account from getting disabled."
 
 login:
   path: login.php?
@@ -211,6 +215,6 @@ search:
     minimumratio:
       text: 1.1
     minimumseedtime:
-      # 60 hours (as seconds = 60 x 60 x 60)
-      text: 216000
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # TS Special Edition v.8.0

src/Jackett.Common/Definitions/dxp.yml

@@ -92,6 +92,9 @@ download:
       attribute: href
     - selector: a[href^="magnet:?xt="]
       attribute: href
+      filters:
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", ""]
 
 search:
   # https://dxp.ru/torrents.php?search=&sort=4&type=desc
@@ -110,6 +113,9 @@ search:
     - name: re_replace
       args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
 
+  headers:
+    Referer: ["{{ .Config.sitelink }}torrents.php"]
+
   rows:
     selector: table#loading-table tbody#highlighted tr:has(a[href^="torrents.php?cat="]), table#loading-table tbody#highlighted tr:has(a[href^="details.php?id="])
     after: 1

src/Jackett.Common/Definitions/ebookbay.yml

@@ -87,11 +87,13 @@ search:
     # with just 5 results per page, try to grab up to 25 results
     # http://ebb.la/?s=teeth
     # http://ebb.la/page/2/?s=teeth
-    - path: "{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "page/2/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "page/3/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "page/4/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "page/5/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: /
+    - path: "page/2/"
+    - path: "page/3/"
+    - path: "page/4/"
+    - path: "page/5/"
+  inputs:
+    s: "{{ .Keywords }}"
 
   rows:
     selector: "div#content > div.poststuff:has(~ div.entry a.download), div#content > div.poststuff ~ div.entry:has(a.download)"

src/Jackett.Common/Definitions/ehentai.yml

@@ -26,8 +26,12 @@ download:
 
 search:
   paths:
-    - path: "torrents.php{{ if .Keywords }}?search={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "torrents.php{{ if .Keywords }}?search={{ .Keywords }}&page=1{{ else }}?page=1{{ end }}"
+    - path: torrents.php
+    - path: torrents.php
+      inputs:
+        page: 1
+  inputs:
+    search: "{{ .Keywords }}"
 
   rows:
     selector: table.itg > tbody > tr:has(td)

src/Jackett.Common/Definitions/eniahd.yml

@@ -77,9 +77,9 @@ settings:
     type: checkbox
     label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
     default: false
-  - name: freeleech
+  - name: freeleech_50
     type: checkbox
-    label: Search freeleech only
+    label: Search freeleech and 50% freeleech only
     default: false
   - name: sort
     type: select
@@ -151,7 +151,7 @@ search:
     nm: "{{ .Keywords }}"
     # search by partial word
     allw: 0
-    tor_type: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    tor_type: "{{ if .Config.freeleech_50 }}1{{ else }}{{ end }}"
 
   keywordsfilters:
     - name: diacritics

src/Jackett.Common/Definitions/estone.yml

@@ -6,7 +6,9 @@ language: hu-HU
 type: private
 encoding: UTF-8
 links:
-  - http://estone.cc/ # site does not support https ERR_CONNECTION_REFUSED
+  - https://estone.cc/
+legacylinks:
+  - http://estone.cc/
 
 caps:
   categorymappings:
@@ -66,6 +68,10 @@ settings:
     options:
       DESC: desc
       ASC: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Anyone who does not enter the site for 180 days will be automatically deleted!"
 
 login:
   path: login.php
@@ -100,7 +106,7 @@ search:
     # does not support imdbid search and does not return imdb link in results
 
   rows:
-    selector: "body > div[id^=\"torrent_\"]{{ if .Config.freeleech }}:has(img[src=\"pic/free.png\"]){{ else }}{{ end }}"
+    selector: "body > div[id=\"felsohatter2\"] > div[id^=\"torrent_\"]{{ if .Config.freeleech }}:has(img[src=\"pic/free.png\"]){{ else }}{{ end }}"
 
   fields:
     title:

src/Jackett.Common/Definitions/extratorrent-st.yml

@@ -7,18 +7,10 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.ing/
-  - https://extratorrent.mrunblock.bond/
-  - https://extratorrent.nocensor.cloud/
+  - https://extratorrent.unblockit.africa/
+  - https://extratorrent.ninjaproxy1.com/
+  - https://extratorrent.proxyninja.org/
 legacylinks:
-  - https://extratorrent.nocensor.work/
-  - https://extratorrent.nocensor.biz/
-  - https://extratorrent.nocensor.sbs/
-  - https://extratorrent.unblockit.cat/
-  - https://extratorrent.unblockit.nz/
-  - https://extratorrent.nocensor.world/
-  - https://extratorrent.unblockit.page/
-  - https://extratorrent.unblockit.pet/
   - https://extratorrent.nocensor.lol/
   - https://extratorrent.unblockit.ink/
   - https://extratorrent.nocensor.art/
@@ -35,6 +27,11 @@ legacylinks:
   - https://extratorrent.unblockit.esq/
   - https://extratorrent.unblockit.zip/
   - https://extratorrent.unblockit.foo/
+  - https://extratorrent.unblockit.ing/
+  - https://extratorrent.mrunblock.bond/
+  - https://extratorrent.nocensor.cloud/
+  - https://extratorrent.unblockit.date/
+  - https://extratorrent.unblockit.dad/
 
 caps:
   categorymappings:
@@ -90,7 +87,11 @@ caps:
     music-search: [q]
     book-search: [q]
 
-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
 
 search:
   paths:

src/Jackett.Common/Definitions/extremebits.yml

@@ -72,6 +72,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "If you don't log in, you will be deleted for inactivity after a few months."
 
 login:
   path: login.php

src/Jackett.Common/Definitions/exttorrents.yml

@@ -9,7 +9,7 @@ requestDelay: 5
 links:
   - https://ext.to/
   - https://search.extto.com/
-  - https://extranet.torrentbay.net/
+  - https://extranet.torrentbay.st/
 legacylinks:
   - https://ext.unblockninja.com/
   - https://t.extto.com/
@@ -17,6 +17,7 @@ legacylinks:
   - https://site.extto.com/
   - https://ext.torrentbay.to/
   - https://extranet.torrentbay.to/
+  - https://extranet.torrentbay.net/
 
 caps:
   categorymappings:
@@ -121,11 +122,12 @@ search:
     selector: table.table-striped > tbody > tr
 
   fields:
-    category:
+    category_optional:
       selector: td:nth-child(1) div div a:last-child
       attribute: href
       optional: true
-      default: "/other/"
+    category:
+      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}/other/{{ end }}"
     title:
       selector: td:nth-child(1) div a
     details:

src/Jackett.Common/Definitions/eztv.yml

@@ -11,27 +11,15 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv1.xyz/
-  - https://eztv.unblockit.ing/
+  - https://eztv.unblockit.africa/
   - https://eztv.unblockninja.com/
-  - https://eztv.mrunblock.bond/
-  - https://eztv.nocensor.cloud/
+  - https://eztv.ninjaproxy1.com/
+  - https://eztv.proxyninja.org/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
-  - https://eztv.nocensor.biz/
-  - https://eztv.nocensor.sbs/
-  - https://eztv.unblockit.cat/
-  - https://eztv.unblockit.nz/
-  - https://eztv.nocensor.world/
-  - https://eztv.unblockit.page/
-  - https://eztv.unblockit.pet/
-  - https://eztv.nocensor.lol/
-  - https://eztv.unblockit.ink/
-  - https://eztv.nocensor.art/
-  - https://eztv.unblockit.bio/
-  - https://eztv.unblockit.boo/
   - https://eztv.mrunblock.guru/
   - https://eztv.unblockit.click/
   - https://eztv.unblockit.asia/
@@ -45,6 +33,11 @@ legacylinks:
   - https://eztv.re/
   - https://eztv.li/
   - https://eztv.unblockit.foo/
+  - https://eztv.unblockit.ing/
+  - https://eztv.mrunblock.bond/
+  - https://eztv.nocensor.cloud/
+  - https://eztv.unblockit.date/
+  - https://eztv.unblockit.dad/
 
 caps:
   categories:

src/Jackett.Common/Definitions/falkonvisionteam.yml

@@ -59,6 +59,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "To keep records updated reguarly, all inactive accounts will be deleted after 60 days of inactivity."
 
 login:
   path: login.php?

src/Jackett.Common/Definitions/fantastiko.yml

@@ -69,6 +69,10 @@ settings:
     type: checkbox
     label: Filter freeleech only
     default: false
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Newcomers with zero offer and participation are deleted after 1 week. Those users who fall into a ratio below 1 or make 3 hit'n'runs (2 for newcomers) become a redshirt (this means limited access to the tracker, removal of invites and reset of forum statistics) and at 5, if they don't enter the seed and 15 days pass, they are banned to the nearest barren planet..."
 
 login:
   path: ?p=home&pid=1

src/Jackett.Common/Definitions/fastscene.yml

@@ -56,6 +56,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Accounts with ZERO activity (0 bytes downloaded and 0 bytes uploaded) will automatically be deleted after 90 days. Inactive accounts (Lower than VIP class) will be automatically deleted after 150 days."
 
 login:
   method: cookie

src/Jackett.Common/Definitions/fearnopeer.yml

@@ -121,6 +121,8 @@ search:
     genre:
       selector: meta.genres
       filters:
+        - name: re_replace
+          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -166,4 +168,4 @@ search:
 # Maintain global ratio above 0.5 or downloads will get disabled. No MST.
     minimumratio:
       text: 0.51
-# json UNIT3D 7.1.2
+# json UNIT3D 7.2.5

src/Jackett.Common/Definitions/femdomcult.yml

@@ -33,6 +33,7 @@ caps:
     - {id: 66, cat: XXX, desc: "Transdom"}
     - {id: 77, cat: XXX, desc: "Unknown & Low Quality"}
     - {id: 75, cat: XXX, desc: "Virtual Reality"}
+    - {id: 0, cat: XXX/Other, desc: "Other"}
 
   modes:
     search: [q]
@@ -63,6 +64,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "User classes Beginner and Perv have to be inactive (= not logged in on the site, tracker activity/seeding does not count) for 4 months before getting disabled automatically. Member class and higher are exempt."
 
 login:
   path: login.php

src/Jackett.Common/Definitions/file-tracker.yml

@@ -12,7 +12,6 @@ caps:
   categorymappings:
     # Эксклюзив
     # Exclusive
-    - {id: 697, cat: Other, desc: " |- Правила, FAQ, стол заказов, общение"}
     - {id: 387, cat: Movies/DVD, desc: " |- Отечественные фильмы DVD Master's"}
     - {id: 386, cat: Movies/DVD, desc: " |- Зарубежные фильмы DVD Master's"}
     - {id: 390, cat: TV/SD, desc: " |- Сериалы DVD Master's"}
@@ -49,7 +48,7 @@ caps:
     - {id: 250, cat: Movies, desc: " |- Советское кино (классика)"}
     - {id: 62, cat: Movies, desc: " |- Кино для детей"}
     - {id: 962, cat: Movies, desc: " |- Антология отечественного кино"}
-    - {id: 990, cat: Movies, desc: " |- Зарубежные фильмы , мультфильмы и сериалы на языках ближнего.."}
+    - {id: 990, cat: Movies, desc: " |- Фильмы , мультфильмы и сериалы на языках ближнего..."}
     - {id: 991, cat: Movies, desc: " |- Зарубежные фильмы , мультфильмы и сериалы в оригинале"}
     - {id: 74, cat: Movies, desc: " |- Зарубежные мультфильмы"}
     - {id: 73, cat: Movies, desc: " |- Отечественные мультфильмы"}
@@ -334,10 +333,10 @@ caps:
     - {id: 951, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
     - {id: 130, cat: Audio, desc: " |- Многоканальная музыка (Рэп, Хип-Хоп, R.n.B)"}
     - {id: 830, cat: Audio/Lossless, desc: " |- Lossless (Рэп, Хип-Хоп, R.n.B)"}
-    - {id: 134, cat: Audio/MP3, desc: " |- Отечественный Рэп, Хип-Хоп (mp3)"}
-    - {id: 133, cat: Audio/MP3, desc: " |- Зарубежный Рэп, Хип-Хоп (mp3)"}
-    - {id: 132, cat: Audio/MP3, desc: " |- Отечественный R.n.B (mp3)"}
-    - {id: 131, cat: Audio/MP3, desc: " |- Зарубежный R.n.B (mp3)"}
+    - {id: 134, cat: Audio/MP3, desc: " |- Отечественный Рэп, Хип-Хоп (mр3)"}
+    - {id: 133, cat: Audio/MP3, desc: " |- Зарубежный Рэп, Хип-Хоп (mр3)"}
+    - {id: 132, cat: Audio/MP3, desc: " |- Отечественный R.n.B (mр3)"}
+    - {id: 131, cat: Audio/MP3, desc: " |- Зарубежный R.n.B (mр3)"}
     - {id: 930, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
     - {id: 941, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
     - {id: 952, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
@@ -346,8 +345,7 @@ caps:
     - {id: 149, cat: Audio/MP3, desc: " |- Аltеrnаtivе, Hard, Indереndеnt (mp3)"}
     - {id: 839, cat: Audio/MP3, desc: " |- Reggae, Ska, Dub (mp3)"}
     - {id: 148, cat: Audio/MP3, desc: " |- Punk, Hardcore, Emo (mp3)"}
-    - {id: 147, cat: Audio/MP3, desc: " |- Nu Metal, Metalcore, Metal (mp3)"}
-    - {id: 150, cat: Audio/MP3, desc: " |- Post-Rock (mp3)"}
+    - {id: 147, cat: Audio/MP3, desc: " |- Rock, Metalcore, Metal (mp3)"}
     - {id: 931, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
     - {id: 942, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
     - {id: 954, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
@@ -437,13 +435,11 @@ caps:
     - {id: 586, cat: Books, desc: " |- Авто - Тюнинг, чиптюнинг, настройка, отделка и укращения"}
     - {id: 672, cat: Books, desc: " |- Литература по медицине"}
     - {id: 793, cat: Books, desc: "Журналы научно-прикладные и познавательно-образовательные"}
-    - {id: 708, cat: PC, desc: "Интерактивный и компьтерный материал"}
     - {id: 875, cat: PC, desc: " |- Интерактивные компьютерные диски для хобби"}
     - {id: 583, cat: PC, desc: " |- Интерактивные справочники и каталоги для авто/мото транспорт.."}
     - {id: 465, cat: PC, desc: " |- Интерактивные и компьютерные диски для обучения ин. языкам"}
     - {id: 674, cat: PC, desc: " |- Интерактивные и компьютерные диски по медицине"}
     - {id: 710, cat: PC, desc: " |- Прочие материалы для детей и родителей"}
-    - {id: 888, cat: Books, desc: "Литература разных направлений"}
     - {id: 897, cat: Books, desc: " |- Прочее"}
     - {id: 896, cat: Books, desc: " |- Автомобили"}
     - {id: 895, cat: Books, desc: " |- Домашним мастерам"}
@@ -465,15 +461,10 @@ caps:
     - {id: 816, cat: Audio/Audiobook, desc: " |- Современная литература"}
     - {id: 190, cat: Audio/Audiobook, desc: " |- Аудио книги для детей"}
     - {id: 191, cat: Audio/Audiobook, desc: " |- Обучающие аудиокниги и аудиоупражнения для детей"}
-    - {id: 749, cat: Audio, desc: "Аудио концерты, спектакли, пьесы"}
     - {id: 687, cat: Audio, desc: " |- Аудиоспектакли и литературные чтения"}
     - {id: 751, cat: Audio, desc: " |- Аудио юмористические концерты (выступления)"}
     # Эротика
     # Erotica
-    - {id: 483, cat: Other, desc: "Правила, FAQ и Предложения по улучшению раздела 'Эротик.."}
-    - {id: 484, cat: Other, desc: " |- Правила и FAQ"}
-    - {id: 485, cat: Other, desc: " |- Предложения по улучшению раздела 'Эротика'и форум.."}
-    - {id: 688, cat: Other, desc: " |- Ищу / Предлагаю"}
     - {id: 963, cat: XXX, desc: "Эротические художественные фильмы"}
     - {id: 964, cat: XXX, desc: "Эротические документальные фильмы"}
     - {id: 178, cat: XXX, desc: "Русская эротика"}
@@ -491,11 +482,8 @@ caps:
     - {id: 820, cat: XXX, desc: "Литература"}
     # Служебный раздел
     # Service section
-    - {id: 604, cat: Other, desc: "Открытый"}
-    - {id: 912, cat: Other, desc: "Нарушение правил оформления"}
     - {id: 57, cat: Other, desc: "Временный склад (TEMP)"}
     - {id: 433, cat: Other, desc: "Архив раздач"}
-    - {id: 378, cat: Other, desc: "Корзина"}
 
   modes:
     search: [q]