STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #50 from STEMMechanics/shift-91887

Browse Source 
Laravel Consolidate Namespaces Shift
This commit was merged in pull request #50.
This commit is contained in:
James Collins
2023-05-25 07:38:32 +10:00
committed by GitHub
parent 41147b26f2 c6c639afc2
commit 95395d1da7
7 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Enum/CurlErrorCodes.php
View File

@@ -80,7 +80,7 @@ class CurlErrorCodes extends Enum
public const CURLE_RTSP_SESSION_ERROR = 86;
public const CURLE_FTP_BAD_FILE_LIST = 87;
public const CURLE_CHUNK_FAILED = 88;
/**
* Curl Error messages
@@ -163,7 +163,7 @@ class CurlErrorCodes extends Enum
86 => 'CURLE_RTSP_SESSION_ERROR.',
87 => 'CURLE_FTP_BAD_FILE_LIST.',
88 => 'CURLE_CHUNK_FAILED.',
];
}

6
app/Enum/Enum.php
View File

@@ -8,7 +8,7 @@ class Enum
{
/**
* Message list
*
*
* @var array<string<static>>
*/
public static $messages = [];
@@ -57,12 +57,12 @@ class Enum
/**
* Returns a message from the enum subclass
*
*
* @return string
*/
public static function getMessage(int $messageIndex, string $defaultMessage = 'Unknown'): string
{
if(array_key_exists($messageIndex, self::$messages) === true) {
if (array_key_exists($messageIndex, self::$messages) === true) {
return self::$messages[$messageIndex];
}

16
app/Http/Controllers/Api/AttachmentController.php
View File

@@ -29,7 +29,7 @@ class AttachmentController extends ApiController
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
@@ -40,7 +40,7 @@ class AttachmentController extends ApiController
/**
* Display the specified resource.
*
* @param \App\Models\Attachment $attachment
* @param \App\Models\Attachment $attachment
* @return \Illuminate\Http\Response
*/
public function show(Attachment $attachment)
@@ -51,7 +51,7 @@ class AttachmentController extends ApiController
/**
* Show the form for editing the specified resource.
*
* @param \App\Models\Attachment $attachment
* @param \App\Models\Attachment $attachment
* @return \Illuminate\Http\Response
*/
public function edit(Attachment $attachment)
@@ -62,11 +62,11 @@ class AttachmentController extends ApiController
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Models\Attachment $attachment
* @param \Illuminate\Http\Request $request
* @param \App\Models\Attachment $attachment
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Attachment $attachment)
public function update(Request $request, Attachment $attachment)
{
//
}
@@ -74,10 +74,10 @@ class AttachmentController extends ApiController
/**
* Remove the specified resource from storage.
*
* @param \App\Models\Attachment $attachment
* @param \App\Models\Attachment $attachment
* @return \Illuminate\Http\Response
*/
public function destroy(Attachment $attachment)
public function destroy(Attachment $attachment)
{
//
}

38
app/Http/Controllers/Api/OCRController.php
View File

@@ -32,7 +32,7 @@ class OCRController extends ApiController
$data = ['ocr' => []];
$filters = $request->get('filters', ['tesseract']);
if(is_array($filters) === false) {
if (is_array($filters) === false) {
$filters = explode(',', $filters);
}
@@ -52,9 +52,12 @@ class OCRController extends ApiController
// We need progress updates to break the connection mid-way
curl_setopt($ch, CURLOPT_BUFFERSIZE, 128); // more progress info
curl_setopt($ch, CURLOPT_NOPROGRESS, false);
curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function(
$downloadSize, $downloaded, $uploadSize, $uploaded
) use($maxDownloadSize) {
curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function (
$downloadSize,
$downloaded,
$uploadSize,
$uploaded
) use ($maxDownloadSize) {
return ($downloaded > $maxDownloadSize) ? 1 : 0;
});
@@ -62,9 +65,9 @@ class OCRController extends ApiController
$curlError = curl_errno($ch);
$curlSize = curl_getinfo($ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD);
curl_close($ch);
if($curlError !== 0) {
if ($curlError !== 0) {
$error = 'File size is larger then allowed';
if($curlError !== CurlErrorCodes::CURLE_ABORTED_BY_CALLBACK) {
if ($curlError !== CurlErrorCodes::CURLE_ABORTED_BY_CALLBACK) {
$error = CurlErrorCodes::getMessage($curlError);
}
@@ -77,8 +80,8 @@ class OCRController extends ApiController
// tesseract (overall)
$ocr = null;
foreach($filters as $filterItem) {
if(str_starts_with($filterItem, 'tesseract') === true) {
foreach ($filters as $filterItem) {
if (str_starts_with($filterItem, 'tesseract') === true) {
$ocr = new TesseractOCR();
$ocr->image($urlDownloadFilePath);
if ($tesseractOEM !== null) {
@@ -95,11 +98,10 @@ class OCRController extends ApiController
}
// Image Filter Function
$tesseractImageFilterFunc = function($filter, $options = null) use($curlResult, $curlSize, $ocr) {
$tesseractImageFilterFunc = function ($filter, $options = null) use ($curlResult, $curlSize, $ocr) {
$result = '';
$img = imagecreatefromstring($curlResult);
if ($img !== false && (($options !== null && imagefilter($img, $filter, $options) === true) || ($options === null && imagefilter($img, $filter) === true))) {
ob_start();
imagepng($img);
$imgData = ob_get_contents();
@@ -108,7 +110,7 @@ class OCRController extends ApiController
$ocr->imageData($imgData, $imgDataSize);
imagedestroy($img);
$result = $ocr->run(500);
}
@@ -116,7 +118,7 @@ class OCRController extends ApiController
};
// Image Scale Function
$tesseractImageScaleFunc = function($scaleFunc) use ($curlResult, $ocr) {
$tesseractImageScaleFunc = function ($scaleFunc) use ($curlResult, $ocr) {
$result = '';
$srcImage = imagecreatefromstring($curlResult);
$srcWidth = imagesx($srcImage);
@@ -133,7 +135,7 @@ class OCRController extends ApiController
$imgData = ob_get_contents();
ob_end_clean();
$imgDataSize = strlen($imgData);
imagedestroy($srcImage);
imagedestroy($dstImage);
@@ -143,7 +145,7 @@ class OCRController extends ApiController
};
// filter: tesseract
if(in_array('tesseract', $filters) === true) {
if (in_array('tesseract', $filters) === true) {
$data['ocr']['tesseract'] = $ocr->run(500);
}
@@ -154,14 +156,14 @@ class OCRController extends ApiController
// filter: tesseract.double_scale
if (in_array('tesseract.double_scale', $filters) === true) {
$data['ocr']['tesseract.double_scale'] = $tesseractImageScaleFunc(function($size) {
$data['ocr']['tesseract.double_scale'] = $tesseractImageScaleFunc(function ($size) {
return $size * 2;
});
}
// filter: tesseract.half_scale
if (in_array('tesseract.half_scale', $filters) === true) {
$data['ocr']['tesseract.half_scale'] = $tesseractImageScaleFunc(function($size) {
$data['ocr']['tesseract.half_scale'] = $tesseractImageScaleFunc(function ($size) {
return $size / 2;
});
}
@@ -187,12 +189,12 @@ class OCRController extends ApiController
}
// filter: keras
if(in_array('keras', $filters) === true) {
if (in_array('keras', $filters) === true) {
$cmd = '/usr/bin/python3 ' . base_path() . '/scripts/keras_oc.py ' . urlencode($url);
$command = escapeshellcmd($cmd);
$output = shell_exec($cmd);
if ($output !== null && strlen($output) > 0) {
$output = substr($output, strpos($output, '----------START----------') + 25);
$output = substr($output, (strpos($output, '----------START----------') + 25));
} else {
$output = '';
}

3
app/Http/Controllers/Api/SubscriptionController.php
View File

@@ -35,7 +35,8 @@ class SubscriptionController extends ApiController
return $this->respondAsResource(
$collection,
['isCollection' => true,
'appendData' => ['total' => $total]]
'appendData' => ['total' => $total]
]
);
}

1
app/Models/Permission.php
View File

@@ -21,6 +21,7 @@ class Permission extends Model
'user',
];
/**
* Get the User associated with this model
*

2
tests/Feature/ContactFormTest.php
View File

@@ -1,4 +1,5 @@
<?php
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
@@ -6,6 +7,7 @@ class ContactFormTest extends TestCase
{
use RefreshDatabase;
public function testContactForm()
{
$formData = [