mirror of
https://github.com/NNTmux/newznab-tmux.git
synced 2026-09-02 11:18:56 +00:00
Fix book and music API lookups
This commit is contained in:
DariusIII
@@ -376,8 +376,8 @@ class ApiController extends BasePageController
|
||||
break;
|
||||
|
||||
case 'music':
|
||||
if (! $request->filled('q')) {
|
||||
return showApiError(200, 'Missing parameter (q)');
|
||||
if ($request->has('q') && ! $request->filled('q')) {
|
||||
return showApiError(201, 'Incorrect parameter (q must not be empty)');
|
||||
}
|
||||
$maxAge = $this->maxAge($request);
|
||||
if (! is_int($maxAge)) {
|
||||
@@ -389,23 +389,44 @@ class ApiController extends BasePageController
|
||||
}
|
||||
$groupName = $this->group($request);
|
||||
UserRequest::addApiRequest($uid, $request->getRequestUri());
|
||||
$relData = $this->releaseSearchService->apiMusicSearch(
|
||||
(string) $request->input('q'),
|
||||
$groupName,
|
||||
$offset,
|
||||
$this->limit($request),
|
||||
$maxAge,
|
||||
$catExclusions,
|
||||
$this->categoryID($request),
|
||||
$minSize,
|
||||
$sort
|
||||
);
|
||||
$categoryID = $this->categoryID($request);
|
||||
$limit = $this->limit($request);
|
||||
|
||||
if (! $request->filled('q')) {
|
||||
if ($categoryID === [-1]) {
|
||||
$categoryID = [Category::MUSIC_ROOT];
|
||||
}
|
||||
|
||||
$relData = $this->releaseBrowseService->getBrowseRangeForApi(
|
||||
1,
|
||||
$categoryID,
|
||||
$offset,
|
||||
$limit,
|
||||
$sort,
|
||||
$maxAge,
|
||||
$catExclusions,
|
||||
$groupName,
|
||||
$minSize
|
||||
);
|
||||
} else {
|
||||
$relData = $this->releaseSearchService->apiMusicSearch(
|
||||
(string) $request->input('q'),
|
||||
$groupName,
|
||||
$offset,
|
||||
$limit,
|
||||
$maxAge,
|
||||
$catExclusions,
|
||||
$categoryID,
|
||||
$minSize,
|
||||
$sort
|
||||
);
|
||||
}
|
||||
$this->output($relData, $params, $outputXML, $offset, 'api');
|
||||
break;
|
||||
|
||||
case 'book':
|
||||
if (! $request->filled('q')) {
|
||||
return showApiError(200, 'Missing parameter (q)');
|
||||
if ($request->has('q') && ! $request->filled('q')) {
|
||||
return showApiError(201, 'Incorrect parameter (q must not be empty)');
|
||||
}
|
||||
$maxAge = $this->maxAge($request);
|
||||
if (! is_int($maxAge)) {
|
||||
@@ -417,17 +438,38 @@ class ApiController extends BasePageController
|
||||
}
|
||||
$groupName = $this->group($request);
|
||||
UserRequest::addApiRequest($uid, $request->getRequestUri());
|
||||
$relData = $this->releaseSearchService->apiBookSearch(
|
||||
(string) $request->input('q'),
|
||||
$groupName,
|
||||
$offset,
|
||||
$this->limit($request),
|
||||
$maxAge,
|
||||
$catExclusions,
|
||||
$this->categoryID($request),
|
||||
$minSize,
|
||||
$sort
|
||||
);
|
||||
$categoryID = $this->categoryID($request);
|
||||
$limit = $this->limit($request);
|
||||
|
||||
if (! $request->filled('q')) {
|
||||
if ($categoryID === [-1]) {
|
||||
$categoryID = [Category::BOOKS_ROOT];
|
||||
}
|
||||
|
||||
$relData = $this->releaseBrowseService->getBrowseRangeForApi(
|
||||
1,
|
||||
$categoryID,
|
||||
$offset,
|
||||
$limit,
|
||||
$sort,
|
||||
$maxAge,
|
||||
$catExclusions,
|
||||
$groupName,
|
||||
$minSize
|
||||
);
|
||||
} else {
|
||||
$relData = $this->releaseSearchService->apiBookSearch(
|
||||
(string) $request->input('q'),
|
||||
$groupName,
|
||||
$offset,
|
||||
$limit,
|
||||
$maxAge,
|
||||
$catExclusions,
|
||||
$categoryID,
|
||||
$minSize,
|
||||
$sort
|
||||
);
|
||||
}
|
||||
$this->output($relData, $params, $outputXML, $offset, 'api');
|
||||
break;
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ declare(strict_types=1);
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\Http\Controllers\Api\ApiController;
|
||||
use App\Models\Category;
|
||||
use App\Services\Releases\ReleaseBrowseService;
|
||||
use App\Services\Releases\ReleaseSearchService;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
@@ -194,6 +195,158 @@ class ApiRequestMatrixTest extends TestCase
|
||||
$this->assertInstanceOf(Collection::class, $controller->capturedOutput['data']);
|
||||
}
|
||||
|
||||
public function test_v1_music_without_query_browses_requested_categories(): void
|
||||
{
|
||||
$token = (string) DB::table('users')->value('api_token');
|
||||
$request = Request::create('/api/v1/api', 'GET', [
|
||||
't' => 'music',
|
||||
'cat' => '3000,3010,3020,3030,3040,3050,3060,3999',
|
||||
'extended' => '1',
|
||||
'apikey' => $token,
|
||||
]);
|
||||
|
||||
$releaseSearchService = Mockery::mock(ReleaseSearchService::class);
|
||||
$releaseSearchService->shouldNotReceive('apiMusicSearch');
|
||||
$releaseBrowseService = Mockery::mock(ReleaseBrowseService::class);
|
||||
$releaseBrowseService->shouldReceive('getBrowseRangeForApi')
|
||||
->once()
|
||||
->with(
|
||||
1,
|
||||
['3000', '3010', '3020', '3030', '3040', '3050', '3060', '3999'],
|
||||
0,
|
||||
100,
|
||||
'posted_desc',
|
||||
-1,
|
||||
[5030],
|
||||
-1,
|
||||
0
|
||||
)
|
||||
->andReturn(collect());
|
||||
|
||||
$controller = new class($releaseSearchService, $releaseBrowseService) extends ApiController
|
||||
{
|
||||
/**
|
||||
* @var array{data:mixed,params:array<string,mixed>,xml:bool,offset:int,type:string}|null
|
||||
*/
|
||||
public ?array $capturedOutput = null;
|
||||
|
||||
public function output(mixed $data, array $params, bool $xml, int $offset, string $type = '')
|
||||
{
|
||||
$this->capturedOutput = [
|
||||
'data' => $data,
|
||||
'params' => $params,
|
||||
'xml' => $xml,
|
||||
'offset' => $offset,
|
||||
'type' => $type,
|
||||
];
|
||||
}
|
||||
};
|
||||
|
||||
$controller->api($request);
|
||||
$this->assertNotNull($controller->capturedOutput);
|
||||
$this->assertSame('api', $controller->capturedOutput['type']);
|
||||
$this->assertInstanceOf(Collection::class, $controller->capturedOutput['data']);
|
||||
}
|
||||
|
||||
public function test_v1_book_without_query_browses_requested_categories(): void
|
||||
{
|
||||
$token = (string) DB::table('users')->value('api_token');
|
||||
$request = Request::create('/api/v1/api', 'GET', [
|
||||
't' => 'book',
|
||||
'cat' => '3030,7020,8010',
|
||||
'extended' => '1',
|
||||
'apikey' => $token,
|
||||
]);
|
||||
|
||||
$releaseSearchService = Mockery::mock(ReleaseSearchService::class);
|
||||
$releaseSearchService->shouldNotReceive('apiBookSearch');
|
||||
$releaseBrowseService = Mockery::mock(ReleaseBrowseService::class);
|
||||
$releaseBrowseService->shouldReceive('getBrowseRangeForApi')
|
||||
->once()
|
||||
->with(
|
||||
1,
|
||||
['3030', '7020', '8010'],
|
||||
0,
|
||||
100,
|
||||
'posted_desc',
|
||||
-1,
|
||||
[5030],
|
||||
-1,
|
||||
0
|
||||
)
|
||||
->andReturn(collect());
|
||||
|
||||
$controller = new class($releaseSearchService, $releaseBrowseService) extends ApiController
|
||||
{
|
||||
/**
|
||||
* @var array{data:mixed,params:array<string,mixed>,xml:bool,offset:int,type:string}|null
|
||||
*/
|
||||
public ?array $capturedOutput = null;
|
||||
|
||||
public function output(mixed $data, array $params, bool $xml, int $offset, string $type = '')
|
||||
{
|
||||
$this->capturedOutput = [
|
||||
'data' => $data,
|
||||
'params' => $params,
|
||||
'xml' => $xml,
|
||||
'offset' => $offset,
|
||||
'type' => $type,
|
||||
];
|
||||
}
|
||||
};
|
||||
|
||||
$controller->api($request);
|
||||
$this->assertNotNull($controller->capturedOutput);
|
||||
$this->assertSame('api', $controller->capturedOutput['type']);
|
||||
$this->assertInstanceOf(Collection::class, $controller->capturedOutput['data']);
|
||||
}
|
||||
|
||||
public function test_v1_music_and_book_without_query_default_to_their_root_categories(): void
|
||||
{
|
||||
$token = (string) DB::table('users')->value('api_token');
|
||||
|
||||
foreach ([
|
||||
'music' => [Category::MUSIC_ROOT],
|
||||
'book' => [Category::BOOKS_ROOT],
|
||||
] as $type => $expectedCategory) {
|
||||
$request = Request::create('/api/v1/api', 'GET', [
|
||||
't' => $type,
|
||||
'apikey' => $token,
|
||||
]);
|
||||
|
||||
$releaseSearchService = Mockery::mock(ReleaseSearchService::class);
|
||||
$releaseBrowseService = Mockery::mock(ReleaseBrowseService::class);
|
||||
$releaseBrowseService->shouldReceive('getBrowseRangeForApi')
|
||||
->once()
|
||||
->with(
|
||||
1,
|
||||
$expectedCategory,
|
||||
0,
|
||||
100,
|
||||
'posted_desc',
|
||||
-1,
|
||||
[5030],
|
||||
-1,
|
||||
0
|
||||
)
|
||||
->andReturn(collect());
|
||||
|
||||
$controller = new class($releaseSearchService, $releaseBrowseService) extends ApiController
|
||||
{
|
||||
public ?array $capturedOutput = null;
|
||||
|
||||
public function output(mixed $data, array $params, bool $xml, int $offset, string $type = '')
|
||||
{
|
||||
$this->capturedOutput = compact('data', 'params', 'xml', 'offset', 'type');
|
||||
}
|
||||
};
|
||||
|
||||
$controller->api($request);
|
||||
$this->assertNotNull($controller->capturedOutput);
|
||||
$this->assertSame('api', $controller->capturedOutput['type']);
|
||||
}
|
||||
}
|
||||
|
||||
public function test_v2_movie_requires_query_or_external_id(): void
|
||||
{
|
||||
$token = (string) DB::table('users')->value('api_token');
|
||||
|
||||
Reference in New Issue
Block a user