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

merge cron_uploader changes manually

Browse Source
This commit is contained in:
Shish 2013-09-23 13:43:39 +01:00
parent a7c39105e7
commit 827ce2e0fe
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ext/cron_uploader/main.php
View File

@ -8,6 +8,9 @@
* Documentation: Installation guide: activate this extension and navigate to www.yoursite.com/cron_upload * Documentation: Installation guide: activate this extension and navigate to www.yoursite.com/cron_upload
*/ */
class CronUploader extends Extension { class CronUploader extends Extension {
// TODO: Checkbox option to only allow localhost + a list of additional IP adresses that can be set in /cron_upload
// TODO: Change logging to MySQL + display log at /cron_upload
// TODO: Move stuff to theme.php
/** /**
* Lists all log events this session * Lists all log events this session
@ -40,16 +43,11 @@ class CronUploader extends Extension {
// If the key is in the url, upload // If the key is in the url, upload
if ($key != "" && $event->get_arg ( 0 ) == $key) { if ($key != "" && $event->get_arg ( 0 ) == $key) {
set_time_limit ( 0 ); // log in as admin
// Set vars
$this->root_dir = $config->get_string("cron_uploader_dir", "");
// Process upload & log
$this->process_upload(); // Start upload $this->process_upload(); // Start upload
$this->handle_log(); // Display & save upload log }
} // else explain how it works
else if ($user->is_admin()) { else if ($user->is_admin()) {
$this->set_dir();
$this->display_documentation(); $this->display_documentation();
} }
@ -58,8 +56,9 @@ class CronUploader extends Extension {
private function display_documentation() { private function display_documentation() {
global $config, $page; global $config, $page;
$this->set_dir(); // Determines path to cron_uploader_dir
$this->root_dir = $this->set_dir();
$queue_dir = $this->root_dir . "/queue"; $queue_dir = $this->root_dir . "/queue";
$uploaded_dir = $this->root_dir . "/uploaded"; $uploaded_dir = $this->root_dir . "/uploaded";
$failed_dir = $this->root_dir . "/failed_to_upload"; $failed_dir = $this->root_dir . "/failed_to_upload";
@ -69,7 +68,7 @@ class CronUploader extends Extension {
$failed_dirinfo = $this->scan_dir($failed_dir); $failed_dirinfo = $this->scan_dir($failed_dir);
$cron_url = make_http(make_link("/cron_upload/" . $config->get_string('cron_uploader_key', 'invalid key' ))); $cron_url = make_http(make_link("/cron_upload/" . $config->get_string('cron_uploader_key', 'invalid key' )));
$cron_cmd = "wget $cron_url"; $cron_cmd = "curl -f $cron_url";
$log_path = $this->root_dir . "/uploads.log"; $log_path = $this->root_dir . "/uploads.log";
$info_html = "<b>Information</b> $info_html = "<b>Information</b>
@ -137,14 +136,16 @@ class CronUploader extends Extension {
global $config; global $config;
// Set default values // Set default values
$key = $this->generate_key (); $key = $this->generate_key ();
$dir = $this->set_dir ();
$config->set_default_int ( 'cron_uploader_count', 1 ); $config->set_default_int ( 'cron_uploader_count', 1 );
$config->set_default_string ( 'cron_uploader_key', $key ); $config->set_default_string ( 'cron_uploader_key', $key );
$this->set_dir();
} }
public function onSetupBuilding(SetupBuildingEvent $event) { public function onSetupBuilding(SetupBuildingEvent $event) {
global $config; global $config;
$this->root_dir = $this->set_dir(); $this->set_dir();
$cron_url = make_http(make_link("/cron_upload/" . $config->get_string('cron_uploader_key', 'invalid key' ))); $cron_url = make_http(make_link("/cron_upload/" . $config->get_string('cron_uploader_key', 'invalid key' )));
$cron_cmd = "wget $cron_url"; $cron_cmd = "wget $cron_url";
$documentation_link = make_http(make_link("cron_upload")); $documentation_link = make_http(make_link("cron_upload"));
@ -182,12 +183,13 @@ class CronUploader extends Extension {
private function set_dir() { private function set_dir() {
global $config; global $config;
// Determine directory (none = default) // Determine directory (none = default)
$dir = $this->root_dir;
if ($dir == "") $dir = $config->get_string("cron_uploader_dir", "");
{
// Sets new default dir if not in config yet/anymore
if ($dir == "") {
$dir = $_SERVER ['DOCUMENT_ROOT'] . "/data/cron_uploader"; $dir = $_SERVER ['DOCUMENT_ROOT'] . "/data/cron_uploader";
$config->set_default_string ('cron_uploader_dir', $dir); $config->set_string ('cron_uploader_dir', $dir);
} }
// Make the directory if it doesn't exist yet // Make the directory if it doesn't exist yet
@ -198,6 +200,7 @@ class CronUploader extends Extension {
if (!is_dir($dir . "/failed_to_upload/")) if (!is_dir($dir . "/failed_to_upload/"))
mkdir ( $dir . "/failed_to_upload/", 0755, true ); mkdir ( $dir . "/failed_to_upload/", 0755, true );
$this->root_dir = $dir;
return $dir; return $dir;
} }
@ -224,15 +227,17 @@ class CronUploader extends Extension {
/** /**
* Uploads the image & handles everything * Uploads the image & handles everything
* @param number $count to upload a non-config amount of imgs * @param number $upload_count to upload a non-config amount of imgs
* @return boolean returns true if the upload was successful * @return boolean returns true if the upload was successful
*/ */
public function process_upload($count = 0) { public function process_upload($upload_count = 0) {
global $config; global $config;
$this->generate_image_queue (); set_time_limit(0);
$this->set_dir();
$this->generate_image_queue();
// Gets amount of imgs to upload // Gets amount of imgs to upload
if ($count == 0) $count = $config->get_int ( "cron_uploader_count", 1 ); if ($upload_count == 0) $upload_count = $config->get_int ("cron_uploader_count", 1);
// Throw exception if there's nothing in the queue // Throw exception if there's nothing in the queue
if (count($this->image_queue) == 0) { if (count($this->image_queue) == 0) {
@ -243,9 +248,8 @@ class CronUploader extends Extension {
// Randomize Images // Randomize Images
shuffle($this->image_queue); shuffle($this->image_queue);
// Upload the file(s) // Upload the file(s)
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $upload_count; $i++) {
$img = $this->image_queue[$i]; $img = $this->image_queue[$i];
try { try {
@ -261,11 +265,12 @@ class CronUploader extends Extension {
unset($this->image_queue[$i]); unset($this->image_queue[$i]);
} }
// Display & save upload log
$this->handle_log();
return true; return true;
} }
private $attempt_count = 0;
private function move_uploaded($path, $filename, $corrupt = false) { private function move_uploaded($path, $filename, $corrupt = false) {
global $config; global $config;
@ -290,7 +295,6 @@ class CronUploader extends Extension {
$this->add_upload_info($info . "Image \"$filename\" moved from queue to \"$newPath\"."); $this->add_upload_info($info . "Image \"$filename\" moved from queue to \"$newPath\".");
} }
/** /**
* moves a directory up or gets the directory of a file * moves a directory up or gets the directory of a file
* *
@ -315,6 +319,7 @@ 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($tmpname, $filename, $tags) { private function add_image($tmpname, $filename, $tags) {
global $user, $image;
assert ( file_exists ( $tmpname ) ); assert ( file_exists ( $tmpname ) );
$pathinfo = pathinfo ( $filename ); $pathinfo = pathinfo ( $filename );
@ -323,7 +328,7 @@ class CronUploader extends Extension {
} }
$metadata ['filename'] = $pathinfo ['basename']; $metadata ['filename'] = $pathinfo ['basename'];
$metadata ['extension'] = $pathinfo ['extension']; $metadata ['extension'] = $pathinfo ['extension'];
$metadata ['tags'] = $tags; $metadata ['tags'] = ""; // = $tags; doesn't work when not logged in here
$metadata ['source'] = null; $metadata ['source'] = null;
$event = new DataUploadEvent ( $tmpname, $metadata ); $event = new DataUploadEvent ( $tmpname, $metadata );
send_event ( $event ); send_event ( $event );
@ -335,13 +340,17 @@ class CronUploader extends Extension {
else $infomsg = "Image uploaded. ID: {$event->image_id} - Filename: {$filename} - Tags: {$tags}"; else $infomsg = "Image uploaded. ID: {$event->image_id} - Filename: {$filename} - Tags: {$tags}";
$msgNumber = $this->add_upload_info($infomsg); $msgNumber = $this->add_upload_info($infomsg);
// Set tags
$img = Image::by_id($event->image_id);
$img->set_tags($tags);
} }
private function generate_image_queue($base = "", $subdir = "") { private function generate_image_queue($base = "", $subdir = "") {
global $config; global $config;
if ($base == "") if ($base == "")
$base = $this->set_dir() . "/queue"; $base = $this->root_dir . "/queue";
if (! is_dir ( $base )) { if (! is_dir ( $base )) {
$this->add_upload_info("Image Queue Directory could not be found at \"$base\"."); $this->add_upload_info("Image Queue Directory could not be found at \"$base\".");