Update nzb and nfo import

2026-08-28 17:01:16 +00:00 · 2026-07-14 20:18:04 +02:00
parent 567a614a02
commit de005d3e7e
13 changed files with 1082 additions and 216 deletions
@@ -690,14 +690,61 @@ class ApiRequestMatrixTest extends TestCase
            ->assertJsonPath('password', 0);
    }

-    public function test_v2_nzbadd_stages_a_paired_nzb_and_nfo(): void
+    public function test_v1_nzbadd_stages_differently_named_nzb_and_nfo_fields(): void
+    {
+        $token = (string) DB::table('users')->value('api_token');
+
+        $this->post('/api/v1/api?t=nzbadd&apikey='.$token, [
+            'cat' => '5040',
+            'nzb' => UploadedFile::fake()->createWithContent(
+                'Release.nzb',
+                '<?xml version="1.0"?><nzb xmlns="http://www.newzbin.com/DTD/2003/nzb"></nzb>',
+            ),
+            'nfo' => UploadedFile::fake()->createWithContent('scene-info.nfo', 'release information'),
+        ])->assertOk()
+            ->assertHeader('Content-Type', 'text/xml; charset=UTF-8')
+            ->assertSee('<success id="0" guid="" categoryid="5040" name="Release" />', false);
+
+        $this->assertNotNull($this->findStagedFile('Release.nzb'));
+        $this->assertNotNull($this->findStagedFile('scene-info.nfo'));
+        $this->assertNotNull($this->findStagedFile('nntmux-upload.json'));
+    }
+
+    public function test_v1_nzbadd_preserves_legacy_file_fallback_and_rejects_mixed_contracts(): void
+    {
+        $token = (string) DB::table('users')->value('api_token');
+
+        $this->post('/api/v1/api?t=nzbadd&apikey='.$token, [
+            'file' => UploadedFile::fake()->createWithContent(
+                'Legacy.nzb',
+                '<?xml version="1.0"?><nzb xmlns="http://www.newzbin.com/DTD/2003/nzb"></nzb>',
+            ),
+        ])->assertOk()
+            ->assertSee('name="Legacy"', false);
+
+        $this->assertNotNull($this->findStagedFile('Legacy.nzb'));
+
+        $this->post('/api/v1/api?t=nzbadd&apikey='.$token, [
+            'file' => UploadedFile::fake()->createWithContent(
+                'Mixed.nzb',
+                '<?xml version="1.0"?><nzb xmlns="http://www.newzbin.com/DTD/2003/nzb"></nzb>',
+            ),
+            'nzb' => UploadedFile::fake()->createWithContent(
+                'Modern.nzb',
+                '<?xml version="1.0"?><nzb xmlns="http://www.newzbin.com/DTD/2003/nzb"></nzb>',
+            ),
+        ])->assertBadRequest()
+            ->assertSee('<error code="201"', false);
+    }
+
+    public function test_v2_nzbadd_stages_a_differently_named_nzb_and_nfo(): void
    {
        $token = (string) DB::table('users')->value('api_token');
        $nzb = UploadedFile::fake()->createWithContent(
            'Release.nzb',
            '<?xml version="1.0"?><nzb xmlns="http://www.newzbin.com/DTD/2003/nzb"></nzb>',
        );
-        $nfo = UploadedFile::fake()->createWithContent('Release.nfo', 'release information');
+        $nfo = UploadedFile::fake()->createWithContent('scene-info.nfo', 'release information');

        $this->post('/api/v2/nzbadd', [
            'api_token' => $token,
@@ -710,10 +757,11 @@ class ApiRequestMatrixTest extends TestCase
            ->assertJsonPath('name', 'Release')
            ->assertJsonPath('category', '5040')
            ->assertJsonPath('files.nzb.filename', 'Release.nzb')
-            ->assertJsonPath('files.nfo.filename', 'Release.nfo');
+            ->assertJsonPath('files.nfo.filename', 'scene-info.nfo');

-        $this->assertFileExists($this->nzbUploadFolder.'/Release.nzb');
-        $this->assertFileExists($this->nzbUploadFolder.'/Release.nfo');
+        $this->assertNotNull($this->findStagedFile('Release.nzb'));
+        $this->assertNotNull($this->findStagedFile('scene-info.nfo'));
+        $this->assertNotNull($this->findStagedFile('nntmux-upload.json'));
        $this->assertSame(0, DB::table('user_requests')->count());
    }

@@ -737,7 +785,7 @@ class ApiRequestMatrixTest extends TestCase
        ])->assertCreated();

        $this->assertSame(1, DB::table('user_requests')->count());
-        $this->assertFileExists($this->nzbUploadFolder.'/QuotaExempt.nzb');
+        $this->assertNotNull($this->findStagedFile('QuotaExempt.nzb'));
    }

    public function test_v2_nzbadd_requires_posting_privileges(): void
@@ -926,6 +974,17 @@ class ApiRequestMatrixTest extends TestCase
        });
    }

+    private function findStagedFile(string $filename): ?string
+    {
+        foreach ((new Filesystem)->allFiles($this->nzbUploadFolder) as $file) {
+            if ($file->getFilename() === $filename) {
+                return $file->getPathname();
+            }
+        }
+
+        return null;
+    }
+
    private function setEnvironmentValue(string $key, ?string $value): void
    {
        if ($value === null) {
@@ -0,0 +1,230 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit;
+
+use App\Enums\NzbImportStatus;
+use App\Services\NfoService;
+use App\Services\Nzb\NfoImportService;
+use App\Services\Nzb\NzbUploadManifestService;
+use Illuminate\Contracts\Console\Kernel;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use PDO;
+use Tests\TestCase;
+
+final class NfoImportServiceTest extends TestCase
+{
+    private string $databasePath;
+
+    private string $uploadFolder;
+
+    /** @var array<string, string|false> */
+    private array $originalEnvironment = [];
+
+    public function createApplication()
+    {
+        $this->databasePath = sys_get_temp_dir().'/nntmux-nfo-import-test.sqlite';
+        $this->originalEnvironment = [
+            'APP_ENV' => getenv('APP_ENV'),
+            'DB_CONNECTION' => getenv('DB_CONNECTION'),
+            'DB_DATABASE' => getenv('DB_DATABASE'),
+        ];
+
+        if (file_exists($this->databasePath)) {
+            unlink($this->databasePath);
+        }
+
+        $pdo = new PDO('sqlite:'.$this->databasePath);
+        $pdo->exec('CREATE TABLE settings (name VARCHAR PRIMARY KEY, value TEXT NULL)');
+        $pdo->exec("INSERT INTO settings (name, value) VALUES
+            ('categorizeforeign', '0'),
+            ('catwebdl', '0'),
+            ('innerfileblacklist', ''),
+            ('timeoutseconds', '60')");
+
+        $this->setEnvironmentValue('APP_ENV', 'testing');
+        $this->setEnvironmentValue('DB_CONNECTION', 'sqlite');
+        $this->setEnvironmentValue('DB_DATABASE', $this->databasePath);
+
+        $app = require __DIR__.'/../../bootstrap/app.php';
+        $app->make(Kernel::class)->bootstrap();
+
+        return $app;
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config([
+            'database.default' => 'sqlite',
+            'database.connections.sqlite.database' => $this->databasePath,
+            'nntmux.tmp_unrar_path' => sys_get_temp_dir().'/nntmux-nfo-import-tmp',
+        ]);
+        DB::purge();
+        DB::reconnect();
+
+        Schema::dropAllTables();
+        Schema::create('settings', function (Blueprint $table): void {
+            $table->string('name')->primary();
+            $table->text('value')->nullable();
+        });
+        Schema::create('releases', function (Blueprint $table): void {
+            $table->increments('id');
+            $table->string('guid')->unique();
+            $table->integer('nfostatus')->default(-1);
+        });
+        Schema::create('release_nfos', function (Blueprint $table): void {
+            $table->unsignedInteger('releases_id')->primary();
+            $table->binary('nfo')->nullable();
+        });
+        DB::table('settings')->insert([
+            ['name' => 'timeoutseconds', 'value' => '60'],
+        ]);
+
+        $this->uploadFolder = sys_get_temp_dir().'/nntmux-nfo-import-'.bin2hex(random_bytes(6));
+        (new Filesystem)->makeDirectory($this->uploadFolder, 0775, true);
+    }
+
+    protected function tearDown(): void
+    {
+        (new Filesystem)->deleteDirectory($this->uploadFolder);
+        (new Filesystem)->deleteDirectory(sys_get_temp_dir().'/nntmux-nfo-import-tmp');
+
+        if (file_exists($this->databasePath)) {
+            unlink($this->databasePath);
+        }
+
+        parent::tearDown();
+
+        foreach ($this->originalEnvironment as $key => $value) {
+            $this->setEnvironmentValue($key, $value === false ? null : $value);
+        }
+    }
+
+    public function test_it_replaces_an_existing_nfo_for_the_manifest_release(): void
+    {
+        $guid = '11111111-1111-4111-8111-111111111111';
+        DB::table('releases')->insert(['id' => 1, 'guid' => $guid, 'nfostatus' => -1]);
+        DB::table('release_nfos')->insert([
+            'releases_id' => 1,
+            'nfo' => "\x1f\x8b\x08\x00".gzcompress('old information'),
+        ]);
+
+        [$manifestPath, $nfoPath, $manifests] = $this->makeResolvedUpload($guid);
+        $service = new NfoImportService(new Filesystem, $manifests, new NfoService);
+
+        $result = $service->importManifest($manifestPath);
+
+        $this->assertSame('imported', $result['status']);
+        $stored = DB::table('release_nfos')->where('releases_id', 1)->value('nfo');
+        $this->assertIsString($stored);
+        $this->assertSame('new release information', gzuncompress(substr($stored, 4)));
+        $this->assertSame(1, DB::table('releases')->where('id', 1)->value('nfostatus'));
+        $this->assertSame(NzbUploadManifestService::STATE_NFO_IMPORTED, $manifests->read($manifestPath)['state']);
+        $this->assertFileExists($nfoPath);
+    }
+
+    public function test_it_deletes_a_successfully_imported_nfo_when_requested(): void
+    {
+        $guid = '22222222-2222-4222-8222-222222222222';
+        DB::table('releases')->insert(['id' => 1, 'guid' => $guid, 'nfostatus' => -1]);
+        [$manifestPath, $nfoPath, $manifests] = $this->makeResolvedUpload($guid);
+
+        $result = (new NfoImportService(new Filesystem, $manifests, new NfoService))
+            ->importManifest($manifestPath, delete: true);
+
+        $this->assertSame('imported', $result['status']);
+        $this->assertFileDoesNotExist($nfoPath);
+        $this->assertFileExists($manifestPath);
+    }
+
+    public function test_duplicate_nzb_manifest_is_not_linked_and_can_delete_its_nfo(): void
+    {
+        $filesystem = new Filesystem;
+        $manifests = new NzbUploadManifestService($filesystem);
+        $directory = $this->uploadFolder.'/duplicate';
+        $filesystem->makeDirectory($directory, 0775, true);
+        $filesystem->put($directory.'/Release.nzb', '<nzb></nzb>');
+        $filesystem->put($directory.'/different.nfo', 'duplicate release information');
+        $manifestPath = $directory.'/'.NzbUploadManifestService::FILENAME;
+        $manifests->create($directory, 'duplicate', 'Release.nzb', 'different.nfo');
+        $manifests->recordNzbOutcome(
+            $directory.'/Release.nzb',
+            NzbImportStatus::Duplicate,
+            null,
+            null,
+        );
+
+        $result = (new NfoImportService($filesystem, $manifests, new NfoService))
+            ->importManifest($manifestPath, deleteFailed: true);
+
+        $this->assertSame('skipped', $result['status']);
+        $this->assertFileDoesNotExist($directory.'/different.nfo');
+        $this->assertSame(NzbUploadManifestService::STATE_NZB_DUPLICATE, $manifests->read($manifestPath)['state']);
+    }
+
+    public function test_it_rejects_a_manifest_path_that_escapes_the_upload_directory(): void
+    {
+        $filesystem = new Filesystem;
+        $directory = $this->uploadFolder.'/unsafe';
+        $filesystem->makeDirectory($directory, 0775, true);
+        $outsidePath = $this->uploadFolder.'/outside.nfo';
+        $filesystem->put($outsidePath, 'outside information');
+        $manifestPath = $directory.'/'.NzbUploadManifestService::FILENAME;
+        $filesystem->put($manifestPath, json_encode([
+            'version' => 1,
+            'upload_id' => 'unsafe',
+            'state' => NzbUploadManifestService::STATE_NZB_IMPORTED,
+            'nzb' => ['filename' => 'Release.nzb'],
+            'nfo' => ['filename' => '../outside.nfo'],
+            'release_id' => 1,
+            'release_guid' => 'unsafe-guid',
+        ], JSON_THROW_ON_ERROR));
+
+        $manifests = new NzbUploadManifestService($filesystem);
+        $result = (new NfoImportService($filesystem, $manifests, new NfoService))
+            ->importManifest($manifestPath, deleteFailed: true);
+
+        $this->assertSame('failed', $result['status']);
+        $this->assertFileExists($outsidePath);
+    }
+
+    /**
+     * @return array{string,string,NzbUploadManifestService}
+     */
+    private function makeResolvedUpload(string $guid): array
+    {
+        $filesystem = new Filesystem;
+        $manifests = new NzbUploadManifestService($filesystem);
+        $directory = $this->uploadFolder.'/resolved';
+        $filesystem->makeDirectory($directory, 0775, true);
+        $nzbPath = $directory.'/Release.nzb';
+        $nfoPath = $directory.'/different.nfo';
+        $filesystem->put($nzbPath, '<nzb></nzb>');
+        $filesystem->put($nfoPath, 'new release information');
+        $manifestPath = $directory.'/'.NzbUploadManifestService::FILENAME;
+        $manifests->create($directory, 'resolved', 'Release.nzb', 'different.nfo');
+        $manifests->recordNzbOutcome($nzbPath, NzbImportStatus::Inserted, 1, $guid);
+
+        return [$manifestPath, $nfoPath, $manifests];
+    }
+
+    private function setEnvironmentValue(string $key, ?string $value): void
+    {
+        if ($value === null) {
+            putenv($key);
+            unset($_ENV[$key], $_SERVER[$key]);
+
+            return;
+        }
+
+        putenv($key.'='.$value);
+        $_ENV[$key] = $value;
+        $_SERVER[$key] = $value;
+    }
+}
@@ -5,11 +5,11 @@ declare(strict_types=1);
 namespace Tests\Unit;

 use App\Exceptions\NzbUploadException;
+use App\Services\Nzb\NzbUploadManifestService;
 use App\Services\Nzb\NzbUploadStagingService;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Http\UploadedFile;
-use Mockery;
 use PDO;
 use Tests\TestCase;

@@ -75,41 +75,59 @@ final class NzbUploadStagingServiceTest extends TestCase
        }
    }

-    public function test_it_stages_a_matching_nzb_and_nfo_pair(): void
+    public function test_it_stages_an_nzb_and_arbitrarily_named_nfo_with_a_manifest(): void
    {
        $result = (new NzbUploadStagingService(new Filesystem))->stage(
            $this->nzb('Release.nzb'),
-            UploadedFile::fake()->createWithContent('Release.nfo', 'release information'),
+            UploadedFile::fake()->createWithContent('scene-info.nfo', 'release information'),
+        );
+
+        $uploadDirectory = $this->onlyUploadDirectory();
+        $manifest = json_decode(
+            (string) file_get_contents($uploadDirectory.'/'.NzbUploadManifestService::FILENAME),
+            true,
+            flags: JSON_THROW_ON_ERROR,
        );

        $this->assertSame('Release', $result['name']);
        $this->assertSame('Release.nzb', $result['files']['nzb']['filename']);
-        $this->assertSame('Release.nfo', $result['files']['nfo']['filename']);
-        $this->assertFileExists($this->uploadFolder.'/Release.nzb');
-        $this->assertFileExists($this->uploadFolder.'/Release.nfo');
+        $this->assertSame('scene-info.nfo', $result['files']['nfo']['filename']);
+        $this->assertFileExists($uploadDirectory.'/Release.nzb');
+        $this->assertFileExists($uploadDirectory.'/scene-info.nfo');
+        $this->assertSame(NzbUploadManifestService::STATE_STAGED, $manifest['state']);
+        $this->assertSame('Release.nzb', $manifest['nzb']['filename']);
+        $this->assertSame('scene-info.nfo', $manifest['nfo']['filename']);
+        $this->assertSame(basename($uploadDirectory), $manifest['upload_id']);
    }

    public function test_it_stages_an_nzb_without_an_nfo(): void
    {
        $result = (new NzbUploadStagingService(new Filesystem))->stage($this->nzb('Solo.nzb'));

+        $uploadDirectory = $this->onlyUploadDirectory();
+
        $this->assertNull($result['files']['nfo']);
-        $this->assertFileExists($this->uploadFolder.'/Solo.nzb');
+        $this->assertFileExists($uploadDirectory.'/Solo.nzb');
+        $this->assertFileExists($uploadDirectory.'/'.NzbUploadManifestService::FILENAME);
    }

-    public function test_it_rejects_mismatched_pair_names_before_writing(): void
+    public function test_it_isolates_repeated_generic_nfo_names(): void
    {
-        try {
-            (new NzbUploadStagingService(new Filesystem))->stage(
-                $this->nzb('Release.nzb'),
-                UploadedFile::fake()->createWithContent('Different.nfo', 'release information'),
-            );
-            $this->fail('Expected a mismatched pair to be rejected.');
-        } catch (NzbUploadException $exception) {
-            $this->assertSame(400, $exception->status);
-        }
+        $service = new NzbUploadStagingService(new Filesystem);
+        $service->stage(
+            $this->nzb('First.nzb'),
+            UploadedFile::fake()->createWithContent('info.nfo', 'first release information'),
+        );
+        $service->stage(
+            $this->nzb('Second.nzb'),
+            UploadedFile::fake()->createWithContent('info.nfo', 'second release information'),
+        );

-        $this->assertDirectoryDoesNotExist($this->uploadFolder);
+        $directories = (new Filesystem)->directories($this->uploadFolder);
+        $this->assertCount(2, $directories);
+        foreach ($directories as $directory) {
+            $this->assertFileExists($directory.'/info.nfo');
+        }
    }

    public function test_it_rejects_an_invalid_nzb_payload(): void
@@ -133,37 +151,19 @@ final class NzbUploadStagingServiceTest extends TestCase
        );
    }

-    public function test_it_rejects_a_collision_without_writing_either_file(): void
-    {
-        (new Filesystem)->makeDirectory($this->uploadFolder, 0775, true);
-        file_put_contents($this->uploadFolder.'/Release.nfo', 'pending');
-
-        try {
-            (new NzbUploadStagingService(new Filesystem))->stage(
-                $this->nzb('Release.nzb'),
-                UploadedFile::fake()->createWithContent('Release.nfo', 'new information'),
-            );
-            $this->fail('Expected an existing staged file to be rejected.');
-        } catch (NzbUploadException $exception) {
-            $this->assertSame(409, $exception->status);
-        }
-
-        $this->assertFileDoesNotExist($this->uploadFolder.'/Release.nzb');
-        $this->assertSame('pending', file_get_contents($this->uploadFolder.'/Release.nfo'));
-    }
-
    public function test_it_rolls_back_the_nzb_when_the_nfo_write_fails(): void
    {
-        $nzbPath = $this->uploadFolder.'/Release.nzb';
-        $nfoPath = $this->uploadFolder.'/Release.nfo';
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('isDirectory')->once()->with($this->uploadFolder)->andReturnTrue();
-        $filesystem->shouldReceive('exists')->once()->with($nzbPath)->andReturnFalse();
-        $filesystem->shouldReceive('exists')->once()->with($nfoPath)->andReturnFalse();
-        $filesystem->shouldReceive('put')->once()->with($nzbPath, Mockery::type('string'))->andReturn(100);
-        $filesystem->shouldReceive('put')->once()->with($nfoPath, 'release information')->andReturnFalse();
-        $filesystem->shouldReceive('exists')->once()->with($nzbPath)->andReturnTrue();
-        $filesystem->shouldReceive('delete')->once()->with($nzbPath)->andReturnTrue();
+        $filesystem = new class extends Filesystem
+        {
+            public function put($path, $contents, $lock = false): int|bool
+            {
+                if (str_ends_with((string) $path, '.nfo')) {
+                    return false;
+                }
+
+                return parent::put($path, $contents, $lock);
+            }
+        };

        $this->expectException(NzbUploadException::class);
        $this->expectExceptionMessage('Failed to write Release.nfo to disk');
@@ -174,6 +174,29 @@ final class NzbUploadStagingServiceTest extends TestCase
        );
    }

+    public function test_rollback_removes_the_partial_upload_directory(): void
+    {
+        $filesystem = new class extends Filesystem
+        {
+            public function put($path, $contents, $lock = false): int|bool
+            {
+                return str_ends_with((string) $path, '.nfo')
+                    ? false
+                    : parent::put($path, $contents, $lock);
+            }
+        };
+
+        try {
+            (new NzbUploadStagingService($filesystem))->stage(
+                $this->nzb('Release.nzb'),
+                UploadedFile::fake()->createWithContent('Release.nfo', 'release information'),
+            );
+            $this->fail('Expected staged pair write to fail.');
+        } catch (NzbUploadException) {
+            $this->assertSame([], $filesystem->directories($this->uploadFolder));
+        }
+    }
+
    private function nzb(string $name): UploadedFile
    {
        return UploadedFile::fake()->createWithContent(
@@ -182,6 +205,14 @@ final class NzbUploadStagingServiceTest extends TestCase
        );
    }

+    private function onlyUploadDirectory(): string
+    {
+        $directories = (new Filesystem)->directories($this->uploadFolder);
+        $this->assertCount(1, $directories);
+
+        return $directories[0];
+    }
+
    private function setEnvironmentValue(string $key, ?string $value): void
    {
        if ($value === null) {