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

Danbooru API fixes from AtomicDryad

Browse Source
This commit is contained in:
Shish 2010-12-22 21:38:04 +00:00
parent 5f00999f87
commit 6ddd0b3e6f
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/danbooru_api/main.php
View File

@ -64,7 +64,8 @@ class DanbooruApi implements Extension
if(preg_match("/^md5:([0-9a-fA-F]*)$/i", $event->term, $matches)) if(preg_match("/^md5:([0-9a-fA-F]*)$/i", $event->term, $matches))
{ {
$hash = strtolower($matches[1]); $hash = strtolower($matches[1]);
$event->set_querylet(new Querylet("images.hash = '$hash'")); $event->add_querylet(new Querylet("images.hash = '$hash'")); // :-O
// $event->set_querylet(new Querylet("images.hash = '$hash'"));
} }
} }
} }
@ -83,6 +84,8 @@ class DanbooruApi implements Extension
$results = array(); $results = array();
$danboorup_kludge=1; // danboorup for firefox makes broken links out of location: /path
/* /*
add_post() add_post()
Adds a post to the database. Adds a post to the database.
@ -116,6 +119,7 @@ class DanbooruApi implements Extension
$this->authenticate_user(); $this->authenticate_user();
// Now we check if a file was uploaded or a url was provided to transload // Now we check if a file was uploaded or a url was provided to transload
// Much of this code is borrowed from /ext/upload // Much of this code is borrowed from /ext/upload
if($config->get_bool("upload_anon") || !$user->is_anonymous()) if($config->get_bool("upload_anon") || !$user->is_anonymous())
{ {
$file = null; $file = null;
@ -216,7 +220,9 @@ class DanbooruApi implements Extension
header("HTTP/1.0 409 Conflict"); header("HTTP/1.0 409 Conflict");
header("X-Danbooru-Errors: duplicate"); header("X-Danbooru-Errors: duplicate");
$existinglink = make_link("post/view/" . $existing->id); $existinglink = make_link("post/view/" . $existing->id);
if($danboorup_kludge) $existinglink=make_http($existinglink);
header("X-Danbooru-Location: $existinglink"); header("X-Danbooru-Location: $existinglink");
return; // wut!
} }
// Fire off an event which should process the new file and add it to the db // Fire off an event which should process the new file and add it to the db
@ -225,13 +231,18 @@ class DanbooruApi implements Extension
$metadata['extension'] = $fileinfo['extension']; $metadata['extension'] = $fileinfo['extension'];
$metadata['tags'] = $posttags; $metadata['tags'] = $posttags;
$metadata['source'] = $source; $metadata['source'] = $source;
//log_debug("danbooru_api","========== NEW($filename) =========");
//log_debug("danbooru_api", "upload($filename): fileinfo(".var_export($fileinfo,TRUE)."), metadata(".var_export($metadata,TRUE).")...");
try { try {
$nevent = new DataUploadEvent($user, $file, $metadata); $nevent = new DataUploadEvent($user, $file, $metadata);
//log_debug("danbooru_api", "send_event(".var_export($nevent,TRUE).")");
send_event($nevent); send_event($nevent);
// If it went ok, grab the id for the newly uploaded image and pass it in the header // If it went ok, grab the id for the newly uploaded image and pass it in the header
$newimg = Image::by_hash($hash); $newimg = Image::by_hash($hash); // FIXME: Unsupported file doesn't throw an error?
$newid = make_link("post/view/" . $newimg->id); $newid = make_link("post/view/" . $newimg->id);
if($danboorup_kludge) $newid=make_http($newid);
// Did we POST or GET this call? // Did we POST or GET this call?
if($_SERVER['REQUEST_METHOD'] == 'POST') if($_SERVER['REQUEST_METHOD'] == 'POST')
{ {
@ -243,7 +254,7 @@ class DanbooruApi implements Extension
catch(UploadException $ex) { catch(UploadException $ex) {
// Did something screw up? // Did something screw up?
header("HTTP/1.0 409 Conflict"); header("HTTP/1.0 409 Conflict");
header("X-Danbooru-Errors: ". $ex->getMessage()); header("X-Danbooru-Errors: exception - " . $ex->getMessage());
return; return;
} }
} else } else