public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Optimizations. Still fairly ugly code, but it's quicker ugly code now.

Browse Source
This commit is contained in:
Kriss Andsten 2010-12-17 00:16:24 +08:00 committed by Bharat Mediratta
parent 8dc2bf9a0a
commit c6e73030d9
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
3.0/modules/unrest/helpers/unrest_rest.php
View File

@ -1,14 +1,14 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
class unrest_rest_Core { class unrest_rest_Core {
private function resolveLimitOption($string) private static function resolveLimitOption($string)
{ {
$items = split(',', $string); $items = split(',', $string);
if (count($items) == 1) { return $string; } if (count($items) == 1) { return $string; }
return $items; return $items;
} }
private function getFreetextLimiters($request, $limit = array()) private static function getFreetextLimiters($request, $limit = array())
{ {
$likeMapping = array( $likeMapping = array(
'name' => 'name', 'name' => 'name',
@ -22,7 +22,7 @@ class unrest_rest_Core {
return $limit; return $limit;
} }
private function getBasicLimiters($request, $limit = array()) private static function getBasicLimiters($request, $limit = array())
{ {
$directMapping = array( $directMapping = array(
'type' => 'type', 'type' => 'type',
@ -37,7 +37,7 @@ class unrest_rest_Core {
return $limit; return $limit;
} }
private function albumsICanAccess() private static function albumsICanAccess()
{ {
$db = db::build(); $db = db::build();
$gids = identity::group_ids_for_active_user(); $gids = identity::group_ids_for_active_user();
@ -136,7 +136,7 @@ class unrest_rest_Core {
} }
} }
static function addChildren($request, $db, $filler, $permitted, $display, &$return) static function addChildren($request, $db, $filler, $permitted, $display, &$return, $rest_base)
{ {
$children = $db->select('parent_id', 'id')->from('items')->where('parent_id', 'IN', $filler['children_of']); $children = $db->select('parent_id', 'id')->from('items')->where('parent_id', 'IN', $filler['children_of']);
if (isset($request->params->childtypes)) if (isset($request->params->childtypes))
@ -165,7 +165,7 @@ class unrest_rest_Core {
else { else {
$members = array(); $members = array();
foreach ($childBlock[ $data['entity']['id'] ] as $child) { foreach ($childBlock[ $data['entity']['id'] ] as $child) {
$members[] = unrest_rest::makeRestURL('item', $child); $members[] = unrest_rest::makeRestURL('item', $child, $rest_base);
} }
$data['members'] = $members; $data['members'] = $members;
} }
@ -177,13 +177,13 @@ class unrest_rest_Core {
} }
} }
private function makeRestURL($resource, $identifier) private static function makeRestURL($resource, $identifier, $base)
{ {
return url::abs_site("rest") . '/' . $resource . '/' . $identifier; return $base . '/' . $resource . '/' . $identifier;
} }
public function size_url($size, $relative_path_cache, $type) { public static function size_url($size, $relative_path_cache, $type, $file_base) {
$base = url::abs_file('var/' . $size . '/' ) . $relative_path_cache; $base = $file_base . 'var/' . $size . '/' . $relative_path_cache;
if ($type == 'photo') { if ($type == 'photo') {
return $base; return $base;
} else if ($type == 'album') { } else if ($type == 'album') {
@ -193,17 +193,18 @@ class unrest_rest_Core {
return preg_replace("/...$/", "jpg", $base); return preg_replace("/...$/", "jpg", $base);
} }
} }
static function get($request) { static function get($request) {
$db = db::build(); $db = db::build();
$start = microtime(true);
$rest_base = url::abs_site("rest");
$file_base = url::abs_file(''); #'var/' . $size . '/'
/* Build basic limiters */ /* Build basic limiters */
$limit = unrest_rest::getBasicLimiters($request); $limit = unrest_rest::getBasicLimiters($request);
$limit = unrest_rest::getFreetextLimiters($request,$limit); $limit = unrest_rest::getFreetextLimiters($request,$limit);
error_log(print_r($limit,1));
/* Build numeric limiters */ /* Build numeric limiters */
/* ...at some point. */ /* ...at some point. */
@ -257,21 +258,21 @@ class unrest_rest_Core {
'thumb_width' => $item->resize_width 'thumb_width' => $item->resize_width
); );
$ui['thumb_url_public'] = unrest_rest::size_url('thumbs', $item->relative_path_cache, $item->type); $ui['thumb_url_public'] = unrest_rest::size_url('thumbs', $item->relative_path_cache, $item->type, $file_base);
$public = $item->view_1?true:false; $public = $item->view_1?true:false;
$fullPublic = $item->view_full_1?true:false; $fullPublic = $item->view_full_1?true:false;
if ($item->type != 'album') if ($item->type != 'album')
{ {
$ui['file_url'] = unrest_rest::makeRestURL('data', $item->id . '?size=full'); $ui['file_url'] = unrest_rest::makeRestURL('data', $item->id . '?size=full', $rest_base);
$ui['thumb_url'] = unrest_rest::makeRestURL('data', $item->id . '?size=thumb'); $ui['thumb_url'] = unrest_rest::makeRestURL('data', $item->id . '?size=thumb', $rest_base);
$ui['resize_url'] = unrest_rest::makeRestURL('data', $item->id . '?size=resize'); $ui['resize_url'] = unrest_rest::makeRestURL('data', $item->id . '?size=resize', $rest_base);
if ($public) { if ($public) {
$ui['resize_url_public'] = unrest_rest::size_url('resizes', $item->relative_path_cache, $item->type); $ui['resize_url_public'] = unrest_rest::size_url('resizes', $item->relative_path_cache, $item->type, $file_base);
if ($fullPublic) { if ($fullPublic) {
$ui['file_url_public'] = unrest_rest::size_url('albums', $item->relative_path_cache, $item->type); $ui['file_url_public'] = unrest_rest::size_url('albums', $item->relative_path_cache, $item->type, $file_base);
} }
} }
} }
@ -284,7 +285,7 @@ class unrest_rest_Core {
} }
$return[] = array( $return[] = array(
'url' => unrest_rest::makeRestURL('item', $item->id ), 'url' => unrest_rest::makeRestURL('item', $item->id, $rest_base ),
'entity' => $data 'entity' => $data
); );
} }
@ -293,9 +294,12 @@ class unrest_rest_Core {
/* Do we need to fetch children? */ /* Do we need to fetch children? */
if (array_key_exists('children_of', $filler)) if (array_key_exists('children_of', $filler))
{ {
unrest_rest::addChildren($request, $db, $filler, $permitted, $display, &$return); unrest_rest::addChildren($request, $db, $filler, $permitted, $display, &$return, $rest_base);
} }
$end = microtime(true);
error_log("Inner " . ($end - $start) . " seconds taken");
return $return; return $return;
} }
} }