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

API tests

Browse Source
This commit is contained in:
Shish 2012-03-10 09:52:52 +00:00
parent b34cb84e92
commit 924eb98238
2 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
contrib/shimmie_api/main.php
View File

@ -37,7 +37,7 @@ class _SafeImage {
class ShimmieApi extends Extension { class ShimmieApi extends Extension {
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
global $database, $page; global $database, $page, $user;
if($event->page_matches("api/shimmie")) { if($event->page_matches("api/shimmie")) {
$page->set_mode("data"); $page->set_mode("data");
@ -55,7 +55,7 @@ class ShimmieApi extends Extension {
"SELECT tag FROM tags WHERE tag LIKE ?", "SELECT tag FROM tags WHERE tag LIKE ?",
array($arg."%")); array($arg."%"));
} }
elseif(isset($_GET['id'])){ elseif(isset($_GET['tag'])){
$all = $database->get_all( $all = $database->get_all(
"SELECT tag FROM tags WHERE tag LIKE ?", "SELECT tag FROM tags WHERE tag LIKE ?",
array($_GET['tag']."%")); array($_GET['tag']."%"));
@ -76,9 +76,7 @@ class ShimmieApi extends Extension {
elseif(isset($_GET['id'])){ elseif(isset($_GET['id'])){
$image = Image::by_id(int_escape($_GET['id'])); $image = Image::by_id(int_escape($_GET['id']));
} }
else{ // FIXME: handle null image
$image = Image::by_id(int_escape("1")); //Default to id=1
}
$image->get_tag_array(); // tag data isn't loaded into the object until necessary $image->get_tag_array(); // tag data isn't loaded into the object until necessary
$safe_image = new _SafeImage($image); $safe_image = new _SafeImage($image);
$page->set_data(json_encode($safe_image)); $page->set_data(json_encode($safe_image));
@ -98,29 +96,24 @@ class ShimmieApi extends Extension {
} }
if($event->page_matches("api/shimmie/get_user")) { if($event->page_matches("api/shimmie/get_user")) {
if(isset($_GET['name'])){ $query = $user->id;
$all = $database->get_all( if($event->count_args() == 1) {
"SELECT id,name,joindate,class FROM users WHERE name=?", $query = $event->get_arg(0);
array($_GET['name'])); }
if(isset($_GET['name'])) {
$query = $_GET['name'];
}
if(isset($_GET['id'])) {
$query = $_GET['id'];
} }
if(isset($_GET['id'])){ $all = $database->get_row(
$all = $database->get_all( "SELECT id,name,joindate,class FROM users WHERE name=? OR id=?",
"SELECT id,name,joindate,class FROM users WHERE id=?", array($_GET['name'], int_escape($_GET['id'])));
array($_GET['id']));
}
if(!isset($_GET['id']) && !isset($_GET['name'])){
$all = $database->get_all(
"SELECT id,name,joindate,class FROM users WHERE id=?",
array("2")); //In 99% of cases, this will be the admin.
}
$all = $all[0];
//FIXME?: For some weird reason, get_all seems to return twice. Unsetting second value to make things look nice.. //FIXME?: For some weird reason, get_all seems to return twice. Unsetting second value to make things look nice..
// - it returns data as eg array(0=>1234, 'id'=>1234, 1=>'bob', 'name'=>bob, ...);
for($i=0; $i<4; $i++) unset($all[$i]); for($i=0; $i<4; $i++) unset($all[$i]);
/*TODO: Might be worth making it possible just to get a certain stat (Using &stat=uploadcount or something)
This would lessen strain on DB? */
$all['uploadcount'] = Image::count_images(array("user_id=".$all['id'])); $all['uploadcount'] = Image::count_images(array("user_id=".$all['id']));
$all['uploadperday'] = sprintf("%.1f", ($all['uploadcount'] / (((time() - strtotime($all['joindate'])) / 86400) + 1))); $all['uploadperday'] = sprintf("%.1f", ($all['uploadcount'] / (((time() - strtotime($all['joindate'])) / 86400) + 1)));
$all['commentcount'] = $database->get_one( $all['commentcount'] = $database->get_one(

29
contrib/shimmie_api/test.php Normal file
View File

@ -0,0 +1,29 @@
<?php
class ShimmieApiTest extends ShimmieWebTestCase {
function testAPI() {
$this->log_in_as_user();
$image_id = $this->post_image("ext/simpletest/data/pbx_screenshot.jpg", "pbx");
$this->get_page("api/shimmie/get_tags");
$this->get_page("api/shimmie/get_tags/pb");
$this->get_page("api/shimmie/get_tags?tag=pb");
$this->get_page("api/shimmie/get_image/$image_id");
$this->get_page("api/shimmie/get_image?id=$image_id");
$this->get_page("api/shimmie/find_images");
$this->get_page("api/shimmie/find_images/pbx");
$this->get_page("api/shimmie/find_images/pbx/1");
$this->get_page("api/shimmie/get_user/demo");
$this->get_page("api/shimmie/get_user?name=demo");
$this->get_page("api/shimmie/get_user?id=2");
// FIXME: test unspecified / bad values
// FIXME: test that json is encoded properly
$this->log_out();
$this->log_in_as_admin();
$this->delete_image($image_id);
$this->log_out();
}
}
?>