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

Merge pull request #301 from vomitcuddle/dapi

Browse Source 
Danbooru API changes
This commit is contained in:
Shish 2013-06-19 11:37:50 -07:00
commit c64a43eb2b
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/danbooru_api/main.php
View File

@ -265,7 +265,7 @@ class DanbooruApi extends Extension {
* id: id to search for (comma delimited) * id: id to search for (comma delimited)
* tags: what tags to search for * tags: what tags to search for
* limit: limit * limit: limit
* offset: offset * page: page number
* after_id: limit results to posts added after this id * after_id: limit results to posts added after this id
*/ */
if(($event->get_arg(1) == 'find_posts') || (($event->get_arg(1) == 'post') && ($event->get_arg(2) == 'index.xml'))) if(($event->get_arg(1) == 'find_posts') || (($event->get_arg(1) == 'post') && ($event->get_arg(2) == 'index.xml')))
@ -288,14 +288,23 @@ class DanbooruApi extends Extension {
} else } else
{ {
$limit = isset($_GET['limit']) ? int_escape($_GET['limit']) : 100; $limit = isset($_GET['limit']) ? int_escape($_GET['limit']) : 100;
$start = (isset($_GET['page']) ? int_escape($_GET['page'])-1 : 0) * $limit;
// Calculate start offset.
if (isset($_GET['page'])) // Danbooru API uses 'page' >= 1
$start = (int_escape($_GET['page'])-1) * $limit;
else if (isset($_GET['pid'])) // Gelbooru API uses 'pid' >= 0
$start = int_escape($_GET['pid']) * $limit;
else
$start = 0;
$tags = isset($_GET['tags']) ? Tag::explode($_GET['tags']) : array(); $tags = isset($_GET['tags']) ? Tag::explode($_GET['tags']) : array();
$count = Image::count_images($tags);
$results = Image::find_images(max($start, 0), min($limit, 100), $tags); $results = Image::find_images(max($start, 0), min($limit, 100), $tags);
} }
// Now we have the array $results filled with Image objects // Now we have the array $results filled with Image objects
// Let's display them // Let's display them
$xml = "<posts>\n"; $xml = "<posts count=\"$count\" offset=\"$start\">\n";
foreach($results as $img) foreach($results as $img)
{ {
// Sanity check to see if $img is really an image object // Sanity check to see if $img is really an image object
@ -304,6 +313,7 @@ class DanbooruApi extends Extension {
continue; continue;
$taglist = $img->get_tag_list(); $taglist = $img->get_tag_list();
$owner = $img->get_owner(); $owner = $img->get_owner();
$previewsize = get_thumbnail_size($img->width, $img->height);
$xml .= xml_tag("post", array( $xml .= xml_tag("post", array(
"id" => $img->id, "id" => $img->id,
"md5" => $img->hash, "md5" => $img->hash,
@ -312,6 +322,8 @@ class DanbooruApi extends Extension {
"height" => $img->height, "height" => $img->height,
"width" => $img->width, "width" => $img->width,
"preview_url" => $img->get_thumb_link(), "preview_url" => $img->get_thumb_link(),
"preview_height" => $previewsize[1],
"preview_width" => $previewsize[0],
"rating" => "u", "rating" => "u",
"date" => $img->posted, "date" => $img->posted,
"is_warehoused" => false, "is_warehoused" => false,