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

Reverted removal of latter tag write

Browse Source
This commit is contained in:
Matthew Barbour 2019-06-19 18:59:18 -05:00 committed by matthew
parent 826c623538
commit 5a30ce1c83
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/cron_uploader/main.php
View File

@ -64,10 +64,10 @@ class CronUploader extends Extension
$this->set_dir(); $this->set_dir();
$lockfile = fopen($this->root_dir . "/.lock", "w"); $lockfile = fopen($this->root_dir . "/.lock", "w");
try {
if (!flock($lockfile, LOCK_EX | LOCK_NB)) { if (!flock($lockfile, LOCK_EX | LOCK_NB)) {
throw new Exception("Cron upload process is already running"); throw new Exception("Cron upload process is already running");
} }
try {
$this->process_upload(); // Start upload $this->process_upload(); // Start upload
} finally { } finally {
flock($lockfile, LOCK_UN); flock($lockfile, LOCK_UN);
@ -301,6 +301,7 @@ class CronUploader extends Extension
try { try {
$database->beginTransaction(); $database->beginTransaction();
$this->add_upload_info("Adding file: {$img[1]} - tags: {$img[2]}");
$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);
@ -378,7 +379,7 @@ class CronUploader extends Extension
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); $metadata ['tags'] = Tag::explode($tags); // 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);
@ -393,6 +394,13 @@ class CronUploader extends Extension
$infomsg = "Image uploaded. ID: {$event->image_id} - Filename: {$filename}"; $infomsg = "Image uploaded. ID: {$event->image_id} - Filename: {$filename}";
} }
$msgNumber = $this->add_upload_info($infomsg); $msgNumber = $this->add_upload_info($infomsg);
// Set tags
$img = Image::by_id($event->image_id);
if(count($img->get_tag_array())==0) {
$img->set_tags(Tag::explode($tags));
}
return $event->image_id; return $event->image_id;
} }