groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-03-01 12:59:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Refactored BarcodeRedirector logic to be more universal

Browse source
This commit is contained in:
Jan Böhmer 2026-02-22 01:28:41 +01:00
parent e0345076c1
commit f45960e4be
3 changed files with 101 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Controller/ScanController.php
View file

@ -43,7 +43,7 @@ namespace App\Controller;
use App\Form\LabelSystem\ScanDialogType;
use App\Services\InfoProviderSystem\Providers\LCSCProvider;
use App\Services\LabelSystem\BarcodeScanner\BarcodeRedirector;
use App\Services\LabelSystem\BarcodeScanner\BarcodeScanResultHandler;
use App\Services\LabelSystem\BarcodeScanner\BarcodeScanHelper;
use App\Services\LabelSystem\BarcodeScanner\BarcodeScanResultInterface;
use App\Services\LabelSystem\BarcodeScanner\BarcodeSourceType;
@ -71,7 +71,7 @@ use \App\Entity\Parts\StorageLocation;
class ScanController extends AbstractController
{
public function __construct(
protected BarcodeRedirector $barcodeParser,
protected BarcodeScanResultHandler $barcodeParser,
protected BarcodeScanHelper $barcodeNormalizer,
private readonly ProviderRegistry $providerRegistry,
private readonly PartInfoRetriever $infoRetriever,
@ -103,7 +103,7 @@ class ScanController extends AbstractController
// If not in info mode, mimic “normal scan” behavior: redirect if possible.
if (!$infoMode) {
try {
$url = $this->barcodeParser->getRedirectURL($scan);
$url = $this->barcodeParser->getInfoURL($scan);
return $this->redirect($url);
} catch (EntityNotFoundException) {
// Decoded OK, but no part is found. If it’s a vendor code, redirect to create.
@ -153,7 +153,7 @@ class ScanController extends AbstractController
source_type: BarcodeSourceType::INTERNAL
);
return $this->redirect($this->barcodeParser->getRedirectURL($scan_result));
return $this->redirect($this->barcodeParser->getInfoURL($scan_result));
} catch (EntityNotFoundException) {
$this->addFlash('success', 'scan.qr_not_found');
@ -338,7 +338,7 @@ class ScanController extends AbstractController
$targetFound = false;
try {
$redirectUrl = $this->barcodeParser->getRedirectURL($scan);
$redirectUrl = $this->barcodeParser->getInfoURL($scan);
$targetFound = true;
} catch (EntityNotFoundException) {
}
@ -350,7 +350,7 @@ class ScanController extends AbstractController
$locations = [];
if ($targetFound) {
$part = $this->barcodeParser->resolvePartOrNull($scan);
$part = $this->barcodeParser->resolvePart($scan);
if ($part instanceof Part) {
$partName = $part->getName();