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

accelerate counts as well as the actual results

Browse Source
This commit is contained in:
Shish 2018-06-30 14:28:52 +01:00
parent c9d7bd1ae3
commit 9e3e37a209
1 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
core/imageboard.pack.php
View File

@ -159,52 +159,38 @@ class Image {
return $images; return $images;
} }
public static function validate_accel(array $tags): bool { /*
* Accelerator stuff
*/
public static function get_acceleratable(array $tags) {
$ret = array(
"yays" => array(),
"nays" => array(),
);
$yays = 0; $yays = 0;
$nays = 0; $nays = 0;
foreach($tags as $tag) { foreach($tags as $tag) {
if(!preg_match("/^-?[a-zA-Z0-9_-]+$/", $tag)) { if(!preg_match("/^-?[a-zA-Z0-9_-]+$/", $tag)) {
return false; return false;
} }
if($tag[0] == "-") $nays++; if($tag[0] == "-") {$nays++; $ret["nays"][] = substr($tag, 1);}
else $yays++; else {$yays++; $ret["yays"][] = $tag;}
} }
return ($yays > 1 || $nays > 0); if($yays > 1 || $nays > 0) {
return $ret;
}
return false;
} }
public static function get_accelerated_result(array $tags, int $offset, int $limit) { public static function get_accelerated_result(array $tags, int $offset, int $limit) {
global $database; global $database;
if(!Image::validate_accel($tags)) { $req = Image::get_acceleratable($tags);
return null; if(!$req) {return null;}
} $req["offset"] = $offset;
$req["limit"] = $limit;
$yays = array(); $response = Image::query_accelerator($req);
$nays = array();
foreach($tags as $tag) {
if($tag[0] == "-") {
$nays[] = substr($tag, 1);
}
else {
$yays[] = $tag;
}
}
$req = array(
"yays" => $yays,
"nays" => $nays,
"offset" => $offset,
"limit" => $limit,
);
$fp = fsockopen("127.0.0.1", 21212);
if (!$fp) {
return null;
}
fwrite($fp, json_encode($req));
$data = fgets($fp, 1024);
fclose($fp);
$response = json_decode($data);
$list = implode(",", $response); $list = implode(",", $response);
if($list) { if($list) {
$result = $database->execute("SELECT * FROM images WHERE id IN ($list) ORDER BY images.id DESC"); $result = $database->execute("SELECT * FROM images WHERE id IN ($list) ORDER BY images.id DESC");
@ -215,6 +201,25 @@ class Image {
return $result; return $result;
} }
public static function get_accelerated_count(array $tags) {
$req = Image::get_acceleratable($tags);
if(!$req) {return null;}
$req["count"] = true;
return Image::query_accelerator($req);
}
public static function query_accelerator($req) {
$fp = fsockopen("127.0.0.1", 21212);
if (!$fp) {
return null;
}
fwrite($fp, json_encode($req));
$data = fgets($fp, 1024);
fclose($fp);
return json_decode($data);
}
/* /*
* Image-related utility functions * Image-related utility functions
*/ */
@ -242,8 +247,11 @@ class Image {
array("tag"=>$tags[0])); array("tag"=>$tags[0]));
} }
else { else {
$querylet = Image::build_search_querylet($tags); $total = Image::get_accelerated_count($tags);
$total = $database->get_one("SELECT COUNT(*) AS cnt FROM ($querylet->sql) AS tbl", $querylet->variables); if(is_null($total)) {
$querylet = Image::build_search_querylet($tags);
$total = $database->get_one("SELECT COUNT(*) AS cnt FROM ($querylet->sql) AS tbl", $querylet->variables);
}
} }
if(is_null($total)) return 0; if(is_null($total)) return 0;
return $total; return $total;