Skip to content

Some fixes #1250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcelklehr merged 5 commits into from
Mar 11, 2025
Merged

Some fixes #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75e2084
fix(amphp/parallel): Bump version
marcelklehr Mar 10, 2025
91d283d
fix(psalm): Catch false return values
marcelklehr Mar 10, 2025
37efd12
fix(cluster-faces-test): Update download link
marcelklehr Mar 10, 2025
b919f0a
fix: Run cs:fix
marcelklehr Mar 10, 2025
830abbf
fix(cluster-faces-test)
marcelklehr Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/cluster-faces-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,21 +140,21 @@ jobs:
id: photos-cache
with:
path: data/admin/files/
key: https://cloud.nextcloud.com/s/4JqQdPy3dicQRPr/download/IMDb-Face.zip
key: https://cloud.nextcloud.com/public.php/dav/files/wfDk23DBsXYrd4S/IMDb-Face.zip

- name: Upload photos
if: steps.photos-cache.outputs.cache-hit != 'true'
run: |
mkdir -p data/admin/files/
cd data/admin/files
wget https://cloud.nextcloud.com/s/4JqQdPy3dicQRPr/download/IMDb-Face.zip
wget https://cloud.nextcloud.com/public.php/dav/files/wfDk23DBsXYrd4S/IMDb-Face.zip
unzip IMDb-Face.zip
rm IMDb-Face.zip

- uses: actions/cache/save@v3
with:
path: data/admin/files/
key: https://cloud.nextcloud.com/s/4JqQdPy3dicQRPr/download/IMDb-Face.zip
key: https://cloud.nextcloud.com/public.php/dav/files/wfDk23DBsXYrd4S/IMDb-Face.zip

- name: Set config
run: |
Expand Down Expand Up @@ -259,7 +259,7 @@ jobs:
- name: Download IMDb-Face.csv
working-directory: apps/${{ env.APP_NAME }}/tests/res
run: |
wget https://cloud.nextcloud.com/s/4JqQdPy3dicQRPr/download/IMDb-Face-csv.zip
wget https://cloud.nextcloud.com/public.php/dav/files/wfDk23DBsXYrd4S/IMDb-Face-csv.zip
unzip IMDb-Face-csv.zip
rm IMDb-Face-csv.zip

Expand Down
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"ext-json": "*",
"ext-pdo": "*",
"rubix/ml": "2.x",
"amphp\/parallel": "1.4.x",
"bamarni/composer-bin-plugin": "^1.8"
},
"autoload": {
Expand Down
8 changes: 8 additions & 0 deletions lib/Classifiers/Classifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@ public function generatePreviewWithProvider(File $file): string {
// Create a temporary file *with the correct extension*
$tmpname = $this->tempManager->getTemporaryFile('.jpg');

if ($tmpname === false) {
throw new \OCA\Recognize\Exception\Exception('Could not create tmpfile');
}

$tmpfile = fopen($tmpname, 'wb');

if ($tmpfile === false) {
Expand Down Expand Up @@ -385,6 +389,10 @@ public function generatePreviewWithGD(string $path): string {
// Create a temporary file *with the correct extension*
$tmpname = $this->tempManager->getTemporaryFile('.jpg');

if ($tmpname === false) {
throw new \OCA\Recognize\Exception\Exception('Could not create tmpfile');
}

$use_gd_quality = (int)\OCP\Server::get(IConfig::class)->getSystemValue('recognize.preview.quality', '100');
if (imagejpeg($previewImage, $tmpname, $use_gd_quality) === false) {
imagedestroy($image);
Expand Down
Loading