cross-seed 6.0.0-3 → 6.0.0-31

package/dist/logger.js

@@ -1,4 +1,5 @@
 import { join } from "path";
+import stripAnsi from "strip-ansi";
 import winston from "winston";
 import DailyRotateFile from "winston-daily-rotate-file";
 import { appDir, createAppDir } from "./configuration.js";
@@ -10,6 +11,7 @@ export var Label;
     Label["TRANSMISSION"] = "transmission";
     Label["DELUGE"] = "deluge";
     Label["DECIDE"] = "decide";
+    Label["INJECT"] = "inject";
     Label["PREFILTER"] = "prefilter";
     Label["CONFIGDUMP"] = "configdump";
     Label["TORZNAB"] = "torznab";
@@ -18,8 +20,12 @@ export var Label;
     Label["SCHEDULER"] = "scheduler";
     Label["SEARCH"] = "search";
     Label["RSS"] = "rss";
+    Label["ANNOUNCE"] = "announce";
+    Label["WEBHOOK"] = "webhook";
     Label["PERF"] = "perf";
-    Label["REVERSE_LOOKUP"] = "reverselookup";
+    Label["ARRS"] = "arrs";
+    Label["RADARR"] = "radarr";
+    Label["SONARR"] = "sonarr";
 })(Label || (Label = {}));
 export let logger;
 const redactionMsg = "[REDACTED]";
@@ -46,8 +52,11 @@ function redactMessage(message, options) {
     }
     const runtimeConfig = options ?? getRuntimeConfig();
     let ret = message;
-    // redact torznab api keys
-    ret = ret.replace(/apikey=[a-zA-Z0-9]+/g, `apikey=${redactionMsg}`);
+    ret = ret.replace(/key=[a-zA-Z0-9]+/g, `key=${redactionMsg}`);
+    ret = ret.replace(/pass=[a-zA-Z0-9]+/g, `pass=${redactionMsg}`);
+    ret = ret.replace(/(?:(?:auto|download)[./]\d+[./])([a-zA-Z0-9]+)/g, (match, key) => match.replace(key, redactionMsg));
+    ret = ret.replace(/(?:\d+[./](?:auto|download)[./])([a-zA-Z0-9]+)/g, (match, key) => match.replace(key, redactionMsg));
+    ret = ret.replace(/apiKey: '.+'/g, `apiKey: ${redactionMsg}`);
     ret = ret.replace(/\/notification\/crossSeed\/[a-zA-Z-0-9_-]+/g, `/notification/crossSeed/${redactionMsg}`);
     for (const [key, urlStr] of Object.entries(runtimeConfig)) {
         if (key.endsWith("Url") && urlStr) {
@@ -56,6 +65,12 @@ function redactMessage(message, options) {
     }
     return ret;
 }
+function stripAnsiChars(message) {
+    if (typeof message !== "string") {
+        return message;
+    }
+    return stripAnsi(message);
+}
 const logOnceCache = [];
 export function logOnce(cacheKey, cb) {
     if (!logOnceCache.includes(cacheKey)) {
@@ -69,8 +84,8 @@ export function initializeLogger(options) {
         level: "info",
         format: winston.format.combine(winston.format.timestamp({
             format: "YYYY-MM-DD HH:mm:ss",
-        }), winston.format.errors({ stack: true }), winston.format.splat(), winston.format.colorize(), winston.format.printf(({ level, message, label, timestamp }) => {
-            return `${timestamp} ${level}: ${label ? `[${label}] ` : ""}${redactMessage(message, options)}`;
+        }), winston.format.errors({ stack: true }), winston.format.splat(), winston.format.printf(({ level, message, label, timestamp, stack }) => {
+            return `${timestamp} ${level}: ${label ? `[${label}] ` : ""}${stripAnsiChars(redactMessage(stack ? stack : message, options))}`;
         })),
         transports: [
             new DailyRotateFile({

package/dist/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}

package/dist/migrations/05-caps.js

@@ -0,0 +1,16 @@
+async function up(knex) {
+    await knex.schema.alterTable("indexer", (table) => {
+        table.json("tv_id_caps");
+        table.json("movie_id_caps");
+        table.json("cat_caps");
+    });
+}
+async function down(knex) {
+    return knex.schema.table("indexer", function (table) {
+        table.dropColumn("tv_id_caps");
+        table.dropColumn("movie_id_caps");
+        table.dropColumn("cat_caps");
+    });
+}
+export default { name: "05-caps", up, down };
+//# sourceMappingURL=05-caps.js.map

package/dist/migrations/05-caps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"05-caps.js","sourceRoot":"","sources":["../../src/migrations/05-caps.ts"],"names":[],"mappings":"AAEA,KAAK,UAAU,EAAE,CAAC,IAAe;IAChC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;QACjD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzB,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAe;IAClC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,KAAK;QAClD,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAC/B,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAClC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACJ,CAAC;AACD,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC"}

package/dist/migrations/06-uniqueDecisions.js

@@ -0,0 +1,29 @@
+async function up(knex) {
+    // Remove null info_hash as we may run out of memory if too many entries
+    await knex("decision").whereNull("info_hash").del();
+    // Remove duplicate decisions preserving the most recent one
+    await knex.raw(`
+        DELETE FROM decision
+        WHERE id NOT IN (
+            SELECT id
+            FROM (
+                SELECT id, ROW_NUMBER() OVER (PARTITION BY searchee_id, guid ORDER BY last_seen DESC) AS row_num
+                FROM decision
+            ) AS subquery
+            WHERE row_num = 1
+        )
+    `);
+    // Add unique constraint to prevent duplicates and add fuzzy_size_factor
+    await knex.schema.alterTable("decision", (table) => {
+        table.float("fuzzy_size_factor").defaultTo(0.02);
+        table.unique(["searchee_id", "guid"]);
+    });
+}
+async function down(knex) {
+    return knex.schema.alterTable("decision", (table) => {
+        table.dropColumn("fuzzy_size_factor");
+        table.dropUnique(["searchee_id", "guid"]);
+    });
+}
+export default { name: "06-uniqueDecisions", up, down };
+//# sourceMappingURL=06-uniqueDecisions.js.map

package/dist/migrations/06-uniqueDecisions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"06-uniqueDecisions.js","sourceRoot":"","sources":["../../src/migrations/06-uniqueDecisions.ts"],"names":[],"mappings":"AAEA,KAAK,UAAU,EAAE,CAAC,IAAe;IAChC,wEAAwE;IACxE,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC;IAEpD,4DAA4D;IAC5D,MAAM,IAAI,CAAC,GAAG,CAAC;;;;;;;;;;KAUX,CAAC,CAAC;IAEN,wEAAwE;IACxE,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;QAClD,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACjD,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAe;IAClC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;QACnD,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;QACtC,KAAK,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,eAAe,EAAE,IAAI,EAAE,oBAAoB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC"}

package/dist/migrations/migrations.js

@@ -3,8 +3,18 @@ import jobs from "./01-jobs.js";
 import timestamps from "./02-timestamps.js";
 import rateLimits from "./03-rateLimits.js";
 import auth from "./04-auth.js";
+import caps from "./05-caps.js";
+import uniqueDecisions from "./06-uniqueDecisions.js";
 export const migrations = {
-    getMigrations: () => Promise.resolve([initialSchema, jobs, timestamps, rateLimits, auth]),
+    getMigrations: () => Promise.resolve([
+        initialSchema,
+        jobs,
+        timestamps,
+        rateLimits,
+        auth,
+        caps,
+        uniqueDecisions,
+    ]),
     getMigrationName: (migration) => migration.name,
     getMigration: (migration) => migration,
 };

package/dist/migrations/migrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../src/migrations/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,uBAAuB,CAAC;AAClD,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,IAAI,MAAM,cAAc,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG;IACzB,aAAa,EAAE,GAAG,EAAE,CACnB,OAAO,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACrE,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI;IAC/C,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS;CACtC,CAAC"}
+{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../src/migrations/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,uBAAuB,CAAC;AAClD,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,eAAe,MAAM,yBAAyB,CAAC;AAEtD,MAAM,CAAC,MAAM,UAAU,GAAG;IACzB,aAAa,EAAE,GAAG,EAAE,CACnB,OAAO,CAAC,OAAO,CAAC;QACf,aAAa;QACb,IAAI;QACJ,UAAU;QACV,UAAU;QACV,IAAI;QACJ,IAAI;QACJ,eAAe;KACf,CAAC;IACH,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI;IAC/C,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS;CACtC,CAAC"}

package/dist/parseTorrent.js

@@ -1,6 +1,7 @@
 import bencode from "bencode";
 import { createHash } from "crypto";
 import { join } from "path";
+import { parseTitle } from "./searchee.js";
 import { fallback } from "./utils.js";
 function sumLength(sum, file) {
     return sum + file.length;
@@ -18,6 +19,10 @@ export class Metafile {
     infoHash;
     length;
     name;
+    /**
+     * Always name, exists for compatibility with Searchee
+     */
+    title;
     pieceLength;
     files;
     isSingleFileTorrent;
@@ -72,6 +77,7 @@ export class Metafile {
             this.length = this.files.reduce(sumLength, 0);
             this.isSingleFileTorrent = false;
         }
+        this.title = parseTitle(this.name, this.files) ?? this.name;
     }
     static decode(buf) {
         return new Metafile(bencode.decode(buf));

package/dist/parseTorrent.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseTorrent.js","sourceRoot":"","sources":["../src/parseTorrent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parseTorrent.js","sourceRoot":"","sources":["../src/parseTorrent.ts"],"names":[],"mappings":"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"}

package/dist/pipeline.js

@@ -3,46 +3,48 @@ import fs from "fs";
 import { zip } from "lodash-es";
 import ms from "ms";
 import { performAction, performActions } from "./action.js";
-import { Decision, InjectionResult, } from "./constants.js";
+import { Decision, InjectionResult, isAnyMatchedDecision, SaveResult, } from "./constants.js";
 import { findPotentialNestedRoots, findSearcheesFromAllDataDirs, } from "./dataFiles.js";
 import { db } from "./db.js";
-import { assessCandidate } from "./decide.js";
+import { assessCandidateCaching } from "./decide.js";
 import { IndexerStatus, updateIndexerStatus, updateSearchTimestamps, } from "./indexers.js";
 import { Label, logger } from "./logger.js";
-import { filterByContent, filterDupes, filterTimestamps } from "./preFilter.js";
+import { filterByContent, filterDupesFromSimilar, filterTimestamps, } from "./preFilter.js";
 import { sendResultsNotification } from "./pushNotifier.js";
+import { isOk } from "./Result.js";
 import { getRuntimeConfig } from "./runtimeConfig.js";
 import { createSearcheeFromMetafile, createSearcheeFromPath, createSearcheeFromTorrentFile, } from "./searchee.js";
-import { getInfoHashesToExclude, getTorrentByCriteria, getTorrentByFuzzyName, indexNewTorrents, loadTorrentDirLight, } from "./torrent.js";
-import { queryRssFeeds, searchTorznab } from "./torznab.js";
-import { filterAsync, isTruthy, stripExtension } from "./utils.js";
+import { getInfoHashesToExclude, getTorrentByCriteria, getSimilarTorrentsByName, indexNewTorrents, loadTorrentDirLight, } from "./torrent.js";
+import { getSearchString, queryRssFeeds, searchTorznab, } from "./torznab.js";
+import { getLogString, isTruthy, wait } from "./utils.js";
 async function assessCandidates(candidates, searchee, hashesToExclude) {
     const assessments = [];
     for (const result of candidates) {
-        const assessment = await assessCandidate(result, searchee, hashesToExclude);
+        const assessment = await assessCandidateCaching(result, searchee, hashesToExclude);
         assessments.push({ assessment, tracker: result.tracker });
     }
     return assessments;
 }
-async function findOnOtherSites(searchee, hashesToExclude) {
+async function findOnOtherSites(searchee, hashesToExclude, cachedSearch, progress) {
     // make sure searchee is in database
     await db("searchee")
-        .insert({ name: searchee.name })
+        .insert({ name: searchee.title })
         .onConflict("name")
         .ignore();
-    let response;
-    try {
-        response = await searchTorznab(searchee);
-    }
-    catch (e) {
-        logger.error(`error searching for ${searchee.name}`);
-        logger.debug(e);
-        return { searchedIndexers: 0, matches: 0 };
-    }
+    const response = await searchTorznab(searchee, cachedSearch, progress);
+    const cachedIndexers = cachedSearch.indexerCandidates.length;
+    const searchedIndexers = response.length - cachedIndexers;
+    cachedSearch.indexerCandidates = response;
     const results = response.flatMap((e) => e.candidates.map((candidate) => ({
         ...candidate,
         indexerId: e.indexerId,
     })));
+    if (response.length) {
+        logger.verbose({
+            label: Label.DECIDE,
+            message: `Assessing ${results.length} candidates for ${searchee.title} from ${searchedIndexers}|${cachedIndexers} indexers by search|cache`,
+        });
+    }
     const assessments = await assessCandidates(results, searchee, hashesToExclude);
     const { rateLimited, notRateLimited } = assessments.reduce((acc, cur, idx) => {
         const candidate = results[idx];
@@ -55,141 +57,245 @@ async function findOnOtherSites(searchee, hashesToExclude) {
         rateLimited: new Set(),
         notRateLimited: new Set(response.map((r) => r.indexerId)),
     });
-    const matches = assessments.filter((e) => e.assessment.decision === Decision.MATCH ||
-        e.assessment.decision === Decision.MATCH_SIZE_ONLY ||
-        e.assessment.decision === Decision.MATCH_PARTIAL);
+    const matches = assessments.filter((e) => isAnyMatchedDecision(e.assessment.decision));
     const actionResults = await performActions(searchee, matches);
-    if (actionResults.includes(InjectionResult.TORRENT_NOT_COMPLETE)) {
-        // If the torrent is not complete, "cancel the search"
-        return { matches: 0, searchedIndexers: 0 };
-    }
-    await updateSearchTimestamps(searchee.name, Array.from(notRateLimited));
+    await updateSearchTimestamps(searchee.title, Array.from(notRateLimited));
     await updateIndexerStatus(IndexerStatus.RATE_LIMITED, Date.now() + ms("1 hour"), Array.from(rateLimited));
     const zipped = zip(matches.map((m) => m.assessment), matches.map((m) => m.tracker), actionResults);
-    sendResultsNotification(searchee, zipped, Label.SEARCH);
-    return { matches: matches.length, searchedIndexers: response.length };
+    sendResultsNotification(searchee, zipped);
+    return { searchedIndexers, matches: matches.length };
 }
-async function findMatchesBatch(samples, hashesToExclude) {
+async function findMatchesBatch(searchees, hashesToExclude) {
     const { delay } = getRuntimeConfig();
     let totalFound = 0;
-    for (const [i, sample] of samples.entries()) {
+    let prevSearchTime = 0;
+    const cachedSearch = { q: null, indexerCandidates: [] };
+    for (const [i, searchee] of searchees.entries()) {
+        const progress = chalk.blue(`(${i + 1}/${searchees.length}) `);
         try {
-            const sleep = new Promise((r) => setTimeout(r, delay * 1000));
-            const progress = chalk.blue(`[${i + 1}/${samples.length}]`);
-            const name = stripExtension(sample.name);
-            logger.info("%s %s %s", progress, chalk.dim("Searching for"), name);
-            const { matches, searchedIndexers } = await findOnOtherSites(sample, hashesToExclude);
+            const sleepTime = delay * 1000 - (Date.now() - prevSearchTime);
+            if (sleepTime > 0) {
+                await wait(sleepTime);
+            }
+            const searchTime = Date.now();
+            const { searchedIndexers, matches } = await findOnOtherSites(searchee, hashesToExclude, cachedSearch, progress);
             totalFound += matches;
-            // if all indexers were rate limited, don't sleep
+            // if all indexers were rate limited or cached, don't sleep
             if (searchedIndexers === 0)
                 continue;
-            await sleep;
+            prevSearchTime = searchTime;
         }
         catch (e) {
-            logger.error(`error searching for ${sample.name}`);
+            const searcheeLog = getLogString(searchee, chalk.bold.white);
+            logger.error({
+                label: searchee.label,
+                message: `${progress}Error searching for ${searcheeLog}`,
+            });
             logger.debug(e);
         }
     }
     return totalFound;
 }
 export async function searchForLocalTorrentByCriteria(criteria) {
-    const { maxDataDepth } = getRuntimeConfig();
-    let searchees;
-    if (criteria.path) {
-        const searcheeResults = await Promise.all(findPotentialNestedRoots(criteria.path, maxDataDepth).map(createSearcheeFromPath));
-        searchees = searcheeResults.map((t) => t.unwrapOrThrow());
+    const { delay, maxDataDepth } = getRuntimeConfig();
+    const rawSearchees = [];
+    if (criteria.infoHash || !criteria.path) {
+        const res = createSearcheeFromMetafile(await getTorrentByCriteria(criteria));
+        if (res.isOk())
+            rawSearchees.push(res.unwrap());
     }
     else {
-        searchees = [await getTorrentByCriteria(criteria)];
+        const searcheeResults = await Promise.all(findPotentialNestedRoots(criteria.path, maxDataDepth).map(createSearcheeFromPath));
+        rawSearchees.push(...searcheeResults.filter(isOk).map((r) => r.unwrap()));
     }
+    const searchees = rawSearchees.map((searchee) => ({
+        ...searchee,
+        label: Label.WEBHOOK,
+    }));
+    const includeEpisodes = searchees.length === 1;
     const hashesToExclude = await getInfoHashesToExclude();
-    let matches = 0;
-    for (let i = 0; i < searchees.length; i++) {
-        if (!filterByContent(searchees[i]))
-            return null;
-        const foundOnOtherSites = await findOnOtherSites(searchees[i], hashesToExclude);
-        matches += foundOnOtherSites.matches;
-    }
-    return matches;
+    let totalFound = 0;
+    let filtered = 0;
+    const cachedSearch = { q: null, indexerCandidates: [] };
+    for (const [i, searchee] of searchees.entries()) {
+        const progress = chalk.blue(`(${i + 1}/${searchees.length}) `);
+        try {
+            if (!filterByContent(searchee, includeEpisodes)) {
+                filtered++;
+                continue;
+            }
+            const sleep = wait(delay * 1000);
+            const { matches, searchedIndexers } = await findOnOtherSites(searchee, hashesToExclude, cachedSearch, progress);
+            totalFound += matches;
+            // if all indexers were rate limited, don't sleep
+            if (searchedIndexers === 0 || i === searchees.length - 1)
+                continue;
+            await sleep;
+        }
+        catch (e) {
+            const searcheeLog = getLogString(searchee, chalk.bold.white);
+            logger.error({
+                label: searchee.label,
+                message: `${progress}Error searching for ${searcheeLog}`,
+            });
+            logger.debug(e);
+        }
+    }
+    if (filtered === searchees.length)
+        return null;
+    return totalFound;
 }
-export async function checkNewCandidateMatch(candidate) {
-    const meta = await getTorrentByFuzzyName(candidate.name);
-    if (meta === null) {
+export async function checkNewCandidateMatch(candidate, searcheeLabel) {
+    const candidateLog = `${chalk.bold.white(candidate.name)} from ${candidate.tracker}`;
+    const { keys, metas } = await getSimilarTorrentsByName(candidate.name);
+    const method = keys.length ? `[${keys}]` : "Fuse fallback";
+    if (!metas.length) {
         logger.verbose({
-            label: Label.REVERSE_LOOKUP,
-            message: `Did not find an existing entry for ${candidate.name}`,
+            label: searcheeLabel,
+            message: `Did not find an existing entry using ${method} for ${candidateLog}`,
         });
-        return null;
+        return { decision: null, actionResult: null };
+    }
+    const searchees = filterDupesFromSimilar(metas
+        .map(createSearcheeFromMetafile)
+        .filter(isOk)
+        .map((r) => r.unwrap())
+        .map((searchee) => ({ ...searchee, label: searcheeLabel }))
+        .filter((searchee) => filterByContent(searchee)));
+    if (!searchees.length) {
+        logger.verbose({
+            label: searcheeLabel,
+            message: `No valid entries found using ${method} for ${candidateLog}`,
+        });
+        return { decision: null, actionResult: null };
     }
+    logger.verbose({
+        label: searcheeLabel,
+        message: `Unique entries [${searchees.map((m) => m.title)}] using ${method} for ${candidateLog}`,
+    });
     const hashesToExclude = await getInfoHashesToExclude();
-    if (!filterByContent(meta))
-        return null;
-    const searchee = createSearcheeFromMetafile(meta);
-    // make sure searchee is in database
-    await db("searchee")
-        .insert({ name: searchee.name })
-        .onConflict("name")
-        .ignore();
-    const assessment = await assessCandidate(candidate, searchee, hashesToExclude);
-    if (assessment.decision !== Decision.MATCH &&
-        assessment.decision !== Decision.MATCH_SIZE_ONLY &&
-        assessment.decision !== Decision.MATCH_PARTIAL) {
-        return null;
+    let decision = null;
+    let actionResult = null;
+    searchees.sort((a, b) => b.files.length - a.files.length);
+    for (const searchee of searchees) {
+        await db("searchee")
+            .insert({ name: searchee.title })
+            .onConflict("name")
+            .ignore();
+        const assessment = await assessCandidateCaching(candidate, searchee, hashesToExclude);
+        if (!isAnyMatchedDecision(assessment.decision)) {
+            if (assessment.decision === Decision.SAME_INFO_HASH) {
+                decision = null;
+                break;
+            }
+            if (assessment.decision === Decision.INFO_HASH_ALREADY_EXISTS &&
+                (!decision || !isAnyMatchedDecision(decision))) {
+                decision = assessment.decision;
+            }
+            continue;
+        }
+        decision = assessment.decision;
+        ({ actionResult } = await performAction(assessment.metafile, assessment.decision, searchee, candidate.tracker));
+        sendResultsNotification(searchee, [
+            [assessment, candidate.tracker, actionResult],
+        ]);
+        if (actionResult === SaveResult.SAVED ||
+            actionResult === InjectionResult.SUCCESS ||
+            actionResult === InjectionResult.ALREADY_EXISTS) {
+            break;
+        }
     }
-    const result = await performAction(assessment.metafile, assessment.decision, searchee, candidate.tracker);
-    await sendResultsNotification(searchee, [[assessment, candidate.tracker, result]], Label.REVERSE_LOOKUP);
-    return result;
+    return { decision, actionResult };
 }
-async function findSearchableTorrents() {
-    const { torrents, dataDirs, torrentDir, searchLimit } = getRuntimeConfig();
-    let allSearchees = [];
+export async function findAllSearchees(searcheeLabel) {
+    const { torrents, dataDirs, torrentDir } = getRuntimeConfig();
+    const rawSearchees = [];
     if (Array.isArray(torrents)) {
         const searcheeResults = await Promise.all(torrents.map(createSearcheeFromTorrentFile));
-        allSearchees = searcheeResults
-            .filter((t) => t.isOk())
-            .map((t) => t.unwrapOrThrow());
+        rawSearchees.push(...searcheeResults.filter(isOk).map((r) => r.unwrap()));
     }
     else {
         if (typeof torrentDir === "string") {
-            allSearchees.push(...(await loadTorrentDirLight(torrentDir)));
+            rawSearchees.push(...(await loadTorrentDirLight(torrentDir)));
         }
         if (Array.isArray(dataDirs)) {
             const searcheeResults = await Promise.all(findSearcheesFromAllDataDirs().map(createSearcheeFromPath));
-            allSearchees.push(...searcheeResults
-                .filter((t) => t.isOk())
-                .map((t) => t.unwrapOrThrow()));
+            rawSearchees.push(...searcheeResults.filter(isOk).map((r) => r.unwrap()));
         }
     }
-    const hashesToExclude = allSearchees
+    return rawSearchees.map((searchee) => ({
+        ...searchee,
+        label: searcheeLabel,
+    }));
+}
+async function findSearchableTorrents() {
+    const { searchLimit } = getRuntimeConfig();
+    const realSearchees = await findAllSearchees(Label.SEARCH);
+    const hashesToExclude = realSearchees
         .map((t) => t.infoHash)
         .filter(isTruthy);
-    let filteredTorrents = await filterAsync(filterDupes(allSearchees).filter(filterByContent), filterTimestamps);
+    // Group the exact same search queries together for easy cache use later
+    const grouping = new Map();
+    for (const searchee of realSearchees.filter((s) => filterByContent(s))) {
+        const key = await getSearchString(searchee);
+        if (!grouping.has(key)) {
+            grouping.set(key, []);
+        }
+        grouping.get(key).push(searchee);
+    }
+    const keysToDelete = [];
+    for (const [key, groupedSearchees] of grouping) {
+        // If one searchee needs to be searched, use the candidates for all
+        const filteredSearchees = filterDupesFromSimilar(groupedSearchees);
+        const results = await Promise.all(filteredSearchees.map(filterTimestamps));
+        if (!results.some(isTruthy)) {
+            keysToDelete.push(key);
+            continue;
+        }
+        // Prefer infoHash
+        filteredSearchees.sort((a, b) => {
+            if (a.infoHash && !b.infoHash)
+                return -1;
+            if (!a.infoHash && b.infoHash)
+                return 1;
+            return 0;
+        });
+        // Sort by most number files (less chance of partial)
+        filteredSearchees.sort((a, b) => {
+            return b.files.length - a.files.length;
+        });
+        grouping.set(key, filteredSearchees);
+    }
+    for (const key of keysToDelete) {
+        grouping.delete(key);
+    }
+    let finalSearchees = Array.from(grouping.values()).flat();
     logger.info({
         label: Label.SEARCH,
-        message: `Found ${allSearchees.length} torrents, ${filteredTorrents.length} suitable to search for matches`,
+        message: `Found ${realSearchees.length} torrents, ${finalSearchees.length} suitable to search for matches using ${grouping.size} unique queries`,
     });
-    if (searchLimit && filteredTorrents.length > searchLimit) {
+    if (searchLimit && finalSearchees.length > searchLimit) {
         logger.info({
             label: Label.SEARCH,
             message: `Limited to ${searchLimit} searches`,
         });
-        filteredTorrents = filteredTorrents.slice(0, searchLimit);
+        finalSearchees = finalSearchees.slice(0, searchLimit);
     }
-    return { samples: filteredTorrents, hashesToExclude };
+    return { searchees: finalSearchees, hashesToExclude };
 }
 export async function main() {
     const { outputDir, linkDir } = getRuntimeConfig();
-    const { samples, hashesToExclude } = await findSearchableTorrents();
+    const { searchees, hashesToExclude } = await findSearchableTorrents();
     if (!fs.existsSync(outputDir)) {
         fs.mkdirSync(outputDir, { recursive: true });
     }
     if (linkDir && !fs.existsSync(linkDir)) {
         fs.mkdirSync(linkDir, { recursive: true });
     }
-    const totalFound = await findMatchesBatch(samples, hashesToExclude);
+    const totalFound = await findMatchesBatch(searchees, hashesToExclude);
     logger.info({
         label: Label.SEARCH,
-        message: chalk.cyan(`Found ${chalk.bold.white(totalFound)} cross seeds from ${chalk.bold.white(samples.length)} original torrents`),
+        message: chalk.cyan(`Found ${chalk.bold.white(totalFound)} cross seeds from ${chalk.bold.white(searchees.length)} original torrents`),
     });
 }
 export async function scanRssFeeds() {
@@ -211,11 +317,12 @@ export async function scanRssFeeds() {
         });
         await indexNewTorrents();
         for (const [i, candidate] of candidatesSinceLastTime.entries()) {
+            const candidateLog = `${chalk.bold.white(candidate.name)} from ${candidate.tracker}`;
             logger.verbose({
                 label: Label.RSS,
-                message: `Processing release ${i + 1}/${candidatesSinceLastTime.length}`,
+                message: `(${i + 1}/${candidatesSinceLastTime.length}) ${candidateLog}`,
             });
-            await checkNewCandidateMatch(candidate);
+            await checkNewCandidateMatch(candidate, Label.RSS);
         }
         logger.info({ label: Label.RSS, message: "Scan complete" });
     }