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

Make NZB XML data newzbin spec compatible: Fixes #1843

Browse Source
This commit is contained in:
DariusIII
2026-03-09 22:03:32 +01:00
parent 836aa07199
commit 6061cab27b
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Nzb/NzbService.php
+40 -3
View File
@@ -127,7 +127,7 @@ class NzbService
return false;
}
$subject = $binary->name.'(1/'.$binary->totalparts.')';
$subject = $this->buildBinarySubject($binary->name, $binary->totalparts);
$XMLWriter->startElement('file');
$XMLWriter->writeAttribute('poster', (string) $poster);
$XMLWriter->writeAttribute('date', (string) $collection->udate);
@@ -149,13 +149,14 @@ class NzbService
$XMLWriter->endElement(); // groups
$XMLWriter->startElement('segments');
foreach ($parts as $part) {
$messageId = $this->normalizeSegmentMessageId($part->messageid);
if ($nzb_guid === '') {
$nzb_guid = $part->messageid;
$nzb_guid = $messageId;
}
$XMLWriter->startElement('segment');
$XMLWriter->writeAttribute('bytes', (string) $part->size);
$XMLWriter->writeAttribute('number', (string) $part->partnumber);
$XMLWriter->text($part->messageid);
$XMLWriter->text($messageId);
$XMLWriter->endElement();
}
$XMLWriter->endElement(); // segments
@@ -306,4 +307,40 @@ class NzbService
{
return $this->siteNzbPath;
}
/**
* Build the NZB subject line in the shape expected by downstream parsers.
*/
private function buildBinarySubject(string $binaryName, int $totalParts): string
{
return rtrim($binaryName).' (1/'.$totalParts.')';
}
/**
* Normalize stored message IDs before writing them into NZB segments.
*/
private function normalizeSegmentMessageId(string $messageId): string
{
$messageId = trim($messageId);
if ($messageId === '') {
return '';
}
if (
\strlen($messageId) >= 2
&& (($messageId[0] === '"' && str_ends_with($messageId, '"'))
|| ($messageId[0] === "'" && str_ends_with($messageId, "'")))
) {
$messageId = substr($messageId, 1, -1);
}
$messageId = trim($messageId);
if (str_starts_with($messageId, '<') && str_ends_with($messageId, '>')) {
$messageId = substr($messageId, 1, -1);
}
return trim($messageId);
}
}