stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-19 13:25:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the relative_path_cache to look up items which should be a faster

Browse Source 
query than using the level + the components.
This commit is contained in:
Bharat Mediratta
2009-05-29 21:23:08 -07:00
parent cbec883d8a
commit ce285b8feb
2 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/controllers/file_proxy.php
+34 -35
View File
@@ -41,56 +41,55 @@ class File_Proxy_Controller extends Controller {
kohana::show_404();
}
$file = substr($request_uri, strlen($var_uri));
$file_uri = substr($request_uri, strlen($var_uri));
// Make sure that we don't leave the var dir
if (strpos($file, "..") !== false) {
if (strpos($file_uri, "..") !== false) {
kohana::show_404();
}
// We only handle var/resizes and var/albums
$paths = explode("/", $file);
$type = $paths[0];
list ($type, $path) = explode("/", $file_uri, 2);
if ($type != "resizes" && $type != "albums" && $type != "thumbs") {
kohana::show_404();
}
// If the last element is .album.jpg, pop that off since it's not a real item
if ($paths[count($paths)-1] == ".album.jpg") {
array_pop($paths);
}
if ($paths[count($paths)-1] == "") {
array_pop($paths);
}
$path = preg_replace("|/.album.jpg$|", "", $path);
// Find all items that match the level and name, then iterate over those to find a match.
// In most cases we'll get it in one. Note that for the level calculation, we just count the
// size of $paths. $paths includes the type ("thumbs", etc) but it doesn't include the root,
// so it's a wash.
$count = count($paths);
$compare_file = VARPATH . $file;
$item = null;
foreach (ORM::factory("item")
->where("name", $paths[$count - 1])
->where("level", $count)
->find_all() as $match) {
if ($type == "albums") {
$match_file = $match->file_path();
} else if ($type == "resizes") {
$match_file = $match->resize_path();
} else {
$match_file = $match->thumb_path();
}
if ($match_file == $compare_file) {
$item = $match;
break;
// We now have the relative path to the item. Search for it in the path cache
$item = ORM::factory("item")->where("relative_path_cache", $path)->find();
if (!$item->loaded) {
// We didn't turn it up. This may mean that the path cache is out of date, so look it up
// the hard way.
//
// Find all items that match the level and name, then iterate over those to find a match.
// In most cases we'll get it in one. Note that for the level calculation, we just count the
// size of $paths.
$paths = explode("/", $path);
$count = count($paths);
foreach (ORM::factory("item")
->where("name", $paths[$count - 1])
->where("level", $count + 1)
->find_all() as $match) {
if ($match->relative_path() == $path) {
$item = $match;
break;
}
}
}
if (!$item) {
if (!$item->loaded) {
kohana::show_404();
}
if ($type == "albums") {
$file = $item->file_path();
} else if ($type == "resizes") {
$file = $item->resize_path();
} else {
$file = $item->thumb_path();
}
// Make sure we have access to the item
if (!access::can("view", $item)) {
kohana::show_404();
@@ -106,14 +105,14 @@ class File_Proxy_Controller extends Controller {
kohana::show_404();
}
if (!file_exists($match_file)) {
if (!file_exists($file)) {
kohana::show_404();
}
// Dump out the image
header("Content-Type: $item->mime_type");
Kohana::close_buffers(false);
$fd = fopen($match_file, "rb");
$fd = fopen($file, "rb");
fpassthru($fd);
fclose($fd);
}