starred/newznab-tmux-NNTmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve CollectionHandler

Browse Source
This commit is contained in:
DariusIII
2026-04-28 15:47:36 +02:00
parent 68cf69a641
commit b58ec52d35
1 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Binaries/CollectionHandler.php
+52 -19
View File
@@ -141,6 +141,7 @@ final class CollectionHandler
$resolved = [];
$pending = [];
$indexByCollectionKey = [];
$xrefsToPrefetch = [];
foreach ($headers as $index => $header) {
$totalFiles = (int) ($totalFilesByIndex[$index] ?? 0);
@@ -164,9 +165,7 @@ final class CollectionHandler
$collectionHash = sha1($collectionKey);
$this->batchCollectionHashes[$collectionHash] = true;
if (! array_key_exists($collectionKey, $this->existingXrefs)) {
$this->existingXrefs[$collectionKey] = Collection::whereCollectionhash($collectionHash)->value('xref');
}
$xrefsToPrefetch[$collectionKey] = $collectionHash;
$headerDate = is_numeric($header['Date']) ? (int) $header['Date'] : strtotime($header['Date']);
$now = now()->timestamp;
@@ -178,7 +177,7 @@ final class CollectionHandler
'fromname' => Utf8::clean($header['From']),
'unixtime' => $unixtime,
'xref' => implode(' ', $headerTokens),
'xref_append' => implode(' ', $this->xrefService->diffNewTokens($this->existingXrefs[$collectionKey], $header['Xref'] ?? '')),
'header_xref' => $header['Xref'] ?? '',
'groups_id' => $groupId,
'totalfiles' => $totalFiles,
'collectionhash' => $collectionHash,
@@ -191,6 +190,16 @@ final class CollectionHandler
return $resolved;
}
$this->prefetchExistingXrefs($xrefsToPrefetch);
foreach ($pending as $collectionKey => &$row) {
$row['xref_append'] = implode(' ', $this->xrefService->diffNewTokens(
$this->existingXrefs[$collectionKey],
$row['header_xref']
));
unset($row['header_xref']);
}
unset($row);
try {
$idsByHash = $this->bulkInsertAndResolve($pending);
foreach ($pending as $collectionKey => $row) {
@@ -213,6 +222,31 @@ final class CollectionHandler
return $resolved;
}
/**
* @param array<string, string> $collectionHashByKey
*/
private function prefetchExistingXrefs(array $collectionHashByKey): void
{
$missing = array_filter(
$collectionHashByKey,
fn (string $hash, string $collectionKey): bool => ! array_key_exists($collectionKey, $this->existingXrefs),
ARRAY_FILTER_USE_BOTH
);
if ($missing === []) {
return;
}
$rows = Collection::query()
->whereIn('collectionhash', array_values($missing))
->pluck('xref', 'collectionhash')
->all();
foreach ($missing as $collectionKey => $hash) {
$this->existingXrefs[$collectionKey] = isset($rows[$hash]) ? (string) $rows[$hash] : null;
}
}
/**
* @param array<string, array<string, mixed>> $rowsByCollectionKey
* @return array<string, int> Collection ids keyed by collectionhash
@@ -312,7 +346,8 @@ final class CollectionHandler
foreach ($rowsByCollectionKey as $row) {
if ($row['xref_append'] !== '' && isset($existingHashes[$row['collectionhash']])) {
DB::update('UPDATE collections SET xref = CONCAT(xref, "\n", ?) WHERE collectionhash = ?', [
DB::update('UPDATE collections SET xref = CONCAT(xref, ?, ?) WHERE collectionhash = ?', [
"\n",
$row['xref_append'],
$row['collectionhash'],
]);
@@ -395,20 +430,18 @@ final class CollectionHandler
int $regexId,
string $batchNoise
): int {
$affected = DB::affectingStatement(
'INSERT OR IGNORE INTO collections (subject, fromname, date, xref, groups_id, totalfiles, collectionhash, collection_regexes_id, dateadded, noise) VALUES (?, ?, datetime(?, "unixepoch"), ?, ?, ?, ?, ?, datetime("now"), ?)',
[
$subject,
$fromName,
$unixtime,
implode(' ', $headerTokens),
$groupId,
$totalFiles,
$collectionHash,
$regexId,
$batchNoise,
]
);
$affected = DB::table('collections')->insertOrIgnore([
'subject' => $subject,
'fromname' => $fromName,
'date' => date('Y-m-d H:i:s', $unixtime),
'xref' => implode(' ', $headerTokens),
'groups_id' => $groupId,
'totalfiles' => $totalFiles,
'collectionhash' => $collectionHash,
'collection_regexes_id' => $regexId,
'dateadded' => now(),
'noise' => $batchNoise,
]);
if ($affected > 0 && ($lastId = (int) DB::connection()->getPdo()->lastInsertId()) > 0) {
$this->insertedCollectionIds[$lastId] = true;