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

more warehouse_path use

Browse Source
This commit is contained in:
Shish 2010-02-02 01:04:38 +00:00
parent 181bbcc9b7
commit 3df4c712fa
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/handle_flash/main.php
View File

@ -7,9 +7,8 @@
class FlashFileHandler extends DataHandlerExtension { class FlashFileHandler extends DataHandlerExtension {
protected function create_thumb($hash) { protected function create_thumb($hash) {
$ha = substr($hash, 0, 2);
// FIXME: scale image, as not all boards use 192x192 // FIXME: scale image, as not all boards use 192x192
copy("ext/handle_flash/thumb.jpg", "thumbs/$ha/$hash"); copy("ext/handle_flash/thumb.jpg", warehouse_path("thumbs", $hash));
} }
protected function supported_ext($ext) { protected function supported_ext($ext) {

5
contrib/handle_ico/main.php
View File

@ -91,9 +91,8 @@ class IcoFileHandler extends SimpleExtension {
private function create_thumb($hash) { private function create_thumb($hash) {
global $config; global $config;
$ha = substr($hash, 0, 2); $inname = warehouse_path("images", $hash);
$inname = "images/$ha/$hash"; $outname = warehouse_path("thumbs", $hash);
$outname = "thumbs/$ha/$hash";
$w = $config->get_int("thumb_width"); $w = $config->get_int("thumb_width");
$h = $config->get_int("thumb_height"); $h = $config->get_int("thumb_height");

3
contrib/handle_mp3/main.php
View File

@ -7,9 +7,8 @@
class MP3FileHandler extends DataHandlerExtension { class MP3FileHandler extends DataHandlerExtension {
protected function create_thumb($hash) { protected function create_thumb($hash) {
$ha = substr($hash, 0, 2);
// FIXME: scale image, as not all boards use 192x192 // FIXME: scale image, as not all boards use 192x192
copy("ext/handle_mp3/thumb.jpg", "thumbs/$ha/$hash"); copy("ext/handle_mp3/thumb.jpg", warehouse_path("thumbs", $hash));
} }
protected function supported_ext($ext) { protected function supported_ext($ext) {

7
contrib/handle_svg/main.php
View File

@ -16,7 +16,7 @@ class SVGFileHandler implements Extension {
$ha = substr($hash, 0, 2); $ha = substr($hash, 0, 2);
if(!move_upload_to_archive($event)) return; if(!move_upload_to_archive($event)) return;
send_event(new ThumbnailGenerationEvent($event->hash, $event->type)); send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
$image = $this->create_image_from_data("images/$ha/$hash", $event->metadata); $image = $this->create_image_from_data(warehouse_path("images", $hash), $event->metadata);
if(is_null($image)) { if(is_null($image)) {
throw new UploadException("SVG handler failed to create image object from data"); throw new UploadException("SVG handler failed to create image object from data");
} }
@ -41,7 +41,7 @@ class SVGFileHandler implements Extension {
// } // }
// else { // else {
// FIXME: scale image, as not all boards use 192x192 // FIXME: scale image, as not all boards use 192x192
copy("ext/handle_svg/thumb.jpg", "thumbs/$ha/$hash"); copy("ext/handle_svg/thumb.jpg", warehouse_path("thumbs", $hash));
// } // }
} }
@ -55,11 +55,10 @@ class SVGFileHandler implements Extension {
$id = int_escape($event->get_arg(0)); $id = int_escape($event->get_arg(0));
$image = Image::by_id($id); $image = Image::by_id($id);
$hash = $image->hash; $hash = $image->hash;
$ha = substr($hash, 0, 2);
$page->set_type("image/svg+xml"); $page->set_type("image/svg+xml");
$page->set_mode("data"); $page->set_mode("data");
$page->set_data(file_get_contents("images/$ha/$hash")); $page->set_data(file_get_contents(warehouse_path("images", $hash)));
} }
} }

4
ext/handle_pixel/main.php
View File

@ -43,8 +43,8 @@ class PixelFileHandler extends DataHandlerExtension {
protected function create_thumb($hash) { protected function create_thumb($hash) {
$ha = substr($hash, 0, 2); $ha = substr($hash, 0, 2);
$inname = "images/$ha/$hash"; $inname = warehouse_path("images", $hash);
$outname = "thumbs/$ha/$hash"; $outname = warehouse_path("thumbs", $hash);
global $config; global $config;
$ok = false; $ok = false;