ohmj/ohmj2
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[FIX] Fix the issue withe percu.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2026-09-15 12:11:32 +02:00
parent 71d3b71362
commit 46b2d0630e
7 changed files with 116 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/lib/ScoreScanner.php
+1 -1
View File
@@ -680,7 +680,7 @@ class ScoreScanner {
$instName = $instrumentNames[$instrument] ?? $instrument;
if (in_array($instrument, ['sup', 'par'], true) && $combined !== null && trim($combined) !== '') {
if (in_array($instrument, ['sup', 'par', 'per'], true) && $combined !== null && trim($combined) !== '') {
// Combined/superposed parts keep their real instrument names (e.g. "contrebasse-1+clarinette-1")
$combined = strtolower(trim($combined));
if (!$this->isValidSegment($combined, '/^[a-z0-9_+.-]+$/')) {
api/tests.php
+11
View File
@@ -693,6 +693,17 @@ class APITest {
$this->test('Upload sup combined returns 200', $supUp['code'] === 200);
$this->test('Upload sup combined filename', str_contains($supUp['body']['path'] ?? '', 'contrebasse-1+clarinette-1.pdf'));
// Percussion parts are named after the real instrument(s)
$perUp = $this->multipartRequest("admin/scores/$scoreId/upload", [
['name' => 'file', 'file' => $tmpPdf],
['name' => 'piece', 'data' => '1'],
['name' => 'instrument', 'data' => 'per'],
['name' => 'version', 'data' => '1'],
['name' => 'combined', 'data' => 'glockenspiel-1+xylophone-1'],
]);
$this->test('Upload per combined returns 200', $perUp['code'] === 200);
$this->test('Upload per combined filename', str_contains($perUp['body']['path'] ?? '', 'glockenspiel-1+xylophone-1.pdf'));
// Instruments (list + filter)
$instr = $this->request('GET', "scores/$scoreId/instruments");
$this->test('Instruments returns 200', $instr['code'] === 200);