james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjusted cron upload for new merged flag, and to make sure tags merge properly

Browse Source
This commit is contained in:
Matthew Barbour 2019-06-19 20:14:19 -05:00 committed by matthew
parent 5eb4a66ab7
commit 921ec9a7bb
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/cron_uploader/main.php
View File

@ -305,7 +305,7 @@ class CronUploader extends Extension
$result = $this->add_image($img[0], $img[1], $img[2]); $result = $this->add_image($img[0], $img[1], $img[2]);
$database->commit(); $database->commit();
$this->move_uploaded($img[0], $img[1], $output_subdir, false); $this->move_uploaded($img[0], $img[1], $output_subdir, false);
if ($result == null) { if ($result->merged) {
$merged++; $merged++;
} else { } else {
$added++; $added++;
@ -369,17 +369,22 @@ class CronUploader extends Extension
/** /**
* Generate the necessary DataUploadEvent for a given image and tags. * Generate the necessary DataUploadEvent for a given image and tags.
*/ */
private function add_image(string $tmpname, string $filename, string $tags) private function add_image(string $tmpname, string $filename, string $tags): DataUploadEvent
{ {
assert(file_exists($tmpname)); assert(file_exists($tmpname));
$tagArray = Tag::explode($tags);
if(count($tagArray)==0) {
$tagArray[] = "tagme";
}
$pathinfo = pathinfo($filename); $pathinfo = pathinfo($filename);
$metadata = []; $metadata = [];
$metadata ['filename'] = $pathinfo ['basename']; $metadata ['filename'] = $pathinfo ['basename'];
if (array_key_exists('extension', $pathinfo)) { if (array_key_exists('extension', $pathinfo)) {
$metadata ['extension'] = $pathinfo ['extension']; $metadata ['extension'] = $pathinfo ['extension'];
} }
$metadata ['tags'] = Tag::explode($tags); // doesn't work when not logged in here, handled below $metadata ['tags'] = $tagArray; // doesn't work when not logged in here, handled below
$metadata ['source'] = null; $metadata ['source'] = null;
$event = new DataUploadEvent($tmpname, $metadata); $event = new DataUploadEvent($tmpname, $metadata);
send_event($event); send_event($event);
@ -397,11 +402,9 @@ class CronUploader extends Extension
// Set tags // Set tags
$img = Image::by_id($event->image_id); $img = Image::by_id($event->image_id);
if(count($img->get_tag_array())==0) { $img->set_tags(array_merge($tagArray, $img->get_tag_array()));
$img->set_tags(Tag::explode($tags));
}
return $event->image_id; return $event;
} }
private function generate_image_queue(): void private function generate_image_queue(): void