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

Removed extra tag set from cron uploader, no longer needed now that it runs as a user

Browse Source
This commit is contained in:
Matthew Barbour 2020-06-02 17:53:35 -05:00 committed by Shish
parent 8b407e3df3
commit 12c331cbd2
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/cron_uploader/main.php
View File

@ -131,9 +131,9 @@ class CronUploader extends Extension
return; return;
} }
foreach ($results as $result) { foreach ($results as $result) {
$new_path = join_path($queue_dir, substr($result,strlen($stage_dir))); $new_path = join_path($queue_dir, substr($result, strlen($stage_dir)));
if(file_exists($new_path)) { if (file_exists($new_path)) {
$page->flash("File already exists in queue folder: " .$result); $page->flash("File already exists in queue folder: " .$result);
return; return;
} }
@ -141,22 +141,22 @@ class CronUploader extends Extension
$success = true; $success = true;
foreach ($results as $result) { foreach ($results as $result) {
$new_path = join_path($queue_dir, substr($result,strlen($stage_dir))); $new_path = join_path($queue_dir, substr($result, strlen($stage_dir)));
$dir = dirname($new_path); $dir = dirname($new_path);
if(!is_dir($dir)) { if (!is_dir($dir)) {
mkdir($dir, 0775, true); mkdir($dir, 0775, true);
} }
if(rename($result, $new_path)===false){ if (rename($result, $new_path)===false) {
$page->flash("Could not move file: " .$result); $page->flash("Could not move file: " .$result);
$success = false; $success = false;
} }
} }
if($success===true) { if ($success===true) {
$page->flash("Re-staged $folder to queue"); $page->flash("Re-staged $folder to queue");
if(remove_empty_dirs($stage_dir)===false) { if (remove_empty_dirs($stage_dir)===false) {
$page->flash("Could not remove $folder"); $page->flash("Could not remove $folder");
} }
} }
@ -317,7 +317,7 @@ class CronUploader extends Extension
// Upload the file(s) // Upload the file(s)
foreach ($image_queue as $img) { foreach ($image_queue as $img) {
$execution_time = microtime(true) - $_shm_load_start; $execution_time = microtime(true) - $_shm_load_start;
if($execution_time>$max_time) { if ($execution_time>$max_time) {
break; break;
} }
try { try {
@ -410,7 +410,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'] = $tagArray; // doesn't work when not logged in here, handled below $metadata ['tags'] = $tagArray;
$metadata ['source'] = null; $metadata ['source'] = null;
$event = new DataUploadEvent($tmpname, $metadata); $event = new DataUploadEvent($tmpname, $metadata);
send_event($event); send_event($event);
@ -425,10 +425,6 @@ class CronUploader extends Extension
} }
$this->log_message(SCORE_LOG_INFO, $infomsg); $this->log_message(SCORE_LOG_INFO, $infomsg);
// Set tags
$img = Image::by_id($event->image_id);
$img->set_tags(array_merge($tagArray, $img->get_tag_array()));
return $event; return $event;
} }