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

move warehouse directory creation into a single place

Browse Source
This commit is contained in:
Shish 2010-04-23 05:46:07 +01:00
parent ee292c2a25
commit 2c1fa2fd7f
6 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/handle_flash/main.php
View File

@ -8,7 +8,6 @@
class FlashFileHandler extends DataHandlerExtension { class FlashFileHandler extends DataHandlerExtension {
protected function create_thumb($hash) { protected function create_thumb($hash) {
// FIXME: scale image, as not all boards use 192x192 // FIXME: scale image, as not all boards use 192x192
mkdir(dirname(warehouse_path("thumbs", $hash)), 0755, true);
copy("ext/handle_flash/thumb.jpg", warehouse_path("thumbs", $hash)); copy("ext/handle_flash/thumb.jpg", warehouse_path("thumbs", $hash));
} }

1
contrib/handle_ico/main.php
View File

@ -99,7 +99,6 @@ class IcoFileHandler extends SimpleExtension {
$q = $config->get_int("thumb_quality"); $q = $config->get_int("thumb_quality");
$mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB $mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB
mkdir(dirname($outname), 0755, true);
if($config->get_bool("ico_convert")) { if($config->get_bool("ico_convert")) {
// "-limit memory $mem" broken? // "-limit memory $mem" broken?
exec("convert {$inname}[0] -geometry {$w}x{$h} -quality {$q} jpg:$outname"); exec("convert {$inname}[0] -geometry {$w}x{$h} -quality {$q} jpg:$outname");

1
contrib/handle_mp3/main.php
View File

@ -8,7 +8,6 @@
class MP3FileHandler extends DataHandlerExtension { class MP3FileHandler extends DataHandlerExtension {
protected function create_thumb($hash) { protected function create_thumb($hash) {
// FIXME: scale image, as not all boards use 192x192 // FIXME: scale image, as not all boards use 192x192
mkdir(dirname(warehouse_path("thumbs", $hash)), 0755, true);
copy("ext/handle_mp3/thumb.jpg", warehouse_path("thumbs", $hash)); copy("ext/handle_mp3/thumb.jpg", warehouse_path("thumbs", $hash));
} }

1
contrib/handle_svg/main.php
View File

@ -41,7 +41,6 @@ class SVGFileHandler implements Extension {
// } // }
// else { // else {
// FIXME: scale image, as not all boards use 192x192 // FIXME: scale image, as not all boards use 192x192
mkdir(dirname(warehouse_path("thumbs", $hash)), 0755, true);
copy("ext/handle_svg/thumb.jpg", warehouse_path("thumbs", $hash)); copy("ext/handle_svg/thumb.jpg", warehouse_path("thumbs", $hash));
// } // }
} }

6
core/util.inc.php
View File

@ -485,9 +485,11 @@ function format_text($string) {
return $tfe->formatted; return $tfe->formatted;
} }
function warehouse_path($base, $hash) { function warehouse_path($base, $hash, $create=true) {
$ab = substr($hash, 0, 2); $ab = substr($hash, 0, 2);
return "$base/$ab/$hash"; $pa = "$base/$ab/$hash";
if($create && !file_exists(dirname($pa))) mkdir(dirname($pa), 0755, true);
return $pa;
} }
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\

1
ext/handle_pixel/main.php
View File

@ -48,7 +48,6 @@ class PixelFileHandler extends DataHandlerExtension {
$ok = false; $ok = false;
mkdir(dirname($outname), 0755, true);
switch($config->get_string("thumb_engine")) { switch($config->get_string("thumb_engine")) {
default: default:
case 'gd': case 'gd':