Cavemanon/cavepaintings
8
Fork 2
Code Issues 3 Pull Requests Projects Releases Wiki Activity

[core] remove add_image, send_event(DataUpload) is much clearer as to what it's actually doing

Browse Source
This commit is contained in:
Shish
2024-01-09 19:24:56 +00:00
parent c16aeca4d8
commit 4d011fa5e5
6 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/imageboard/misc.php
View File

@@ -24,7 +24,11 @@ function add_dir(string $base, ?array $extra_tags = []): array
$tags = array_merge(path_to_tags($short_path), $extra_tags);
try {
$dae = add_image($full_path, $filename, $tags);
$dae = send_event(new DataUploadEvent($full_path, [
'filename' => pathinfo($filename, PATHINFO_BASENAME),
'tags' => $tags,
'source' => null,
]));
foreach($dae->images as $image) {
$results[] = new UploadSuccess($filename, $image->id);
}
@@ -36,18 +40,6 @@ function add_dir(string $base, ?array $extra_tags = []): array
return $results;
}
/**
* Sends a DataUploadEvent for a file.
*/
function add_image(string $tmpname, string $filename, array $tags, ?string $source = null): DataUploadEvent
{
return send_event(new DataUploadEvent($tmpname, [
'filename' => pathinfo($filename, PATHINFO_BASENAME),
'tags' => $tags,
'source' => $source,
]));
}
function get_file_ext(string $filename): ?string
{
return pathinfo($filename)['extension'] ?? null;