Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-28 01:10:51 +01:00
Code Releases Wiki Activity

fix fatal errors. works with v0.9.6

Browse Source
This commit is contained in:
Michael Save 2012-04-12 12:53:45 +10:00
parent 1758f750fd
commit e056b1eb70
3 changed files with 111 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
tools/benchmark.php
View File

@ -5,48 +5,48 @@
* *
*/ */
require dirname(__FILE__) . '/inc/cli.php'; require dirname(__FILE__) . '/inc/cli.php';
require 'inc/image.php'; require 'inc/image.php';
// move back to this directory // move back to this directory
chdir(dirname(__FILE__)); chdir(dirname(__FILE__));
if(count($argv) != 2) if(count($argv) != 2)
die("Usage: {$argv[0]} [file]\n"); die("Usage: {$argv[0]} [file]\n");
$file = $argv[1]; $file = $argv[1];
$extension = strtolower(substr($file, strrpos($file, '.') + 1)); $extension = strtolower(substr($file, strrpos($file, '.') + 1));
$out = tempnam($config['tmp'], 'thumb'); $out = tempnam($config['tmp'], 'thumb');
$count = 300; $count = 300;
function benchmark($method) { function benchmark($method) {
global $config, $file, $extension, $out, $count; global $config, $file, $extension, $out, $count;
$config['thumb_method'] = $method; $config['thumb_method'] = $method;
printf("Method: %s\nThumbnailing %d times... ", $method, $count); printf("Method: %s\nThumbnailing %d times... ", $method, $count);
$start = microtime(true); $start = microtime(true);
for($i = 0; $i < $count; $i++) { for($i = 0; $i < $count; $i++) {
$image = new Image($file, $extension); $image = new Image($file, $extension);
$thumb = $image->resize( $thumb = $image->resize(
$config['thumb_ext'] ? $config['thumb_ext'] : $extension, $config['thumb_ext'] ? $config['thumb_ext'] : $extension,
$config['thumb_width'], $config['thumb_width'],
$config['thumb_height'] $config['thumb_height']
); );
$thumb->to($out); $thumb->to($out);
$thumb->_destroy(); $thumb->_destroy();
$image->destroy(); $image->destroy();
}
$end = microtime(true);
printf("Took %.2f seconds (%.2f/second; %.2f ms)\n", $end - $start, $rate = ($count / ($end - $start)), 1000 / $rate);
unlink($out);
} }
$end = microtime(true);
benchmark('gd'); printf("Took %.2f seconds (%.2f/second; %.2f ms)\n", $end - $start, $rate = ($count / ($end - $start)), 1000 / $rate);
benchmark('imagick');
benchmark('convert'); unlink($out);
}
benchmark('gd');
benchmark('imagick');
benchmark('convert');

4
tools/inc/cli.php
View File

@ -33,10 +33,6 @@ if(!getenv('TINYBOARD_PATH')) {
putenv('TINYBOARD_PATH=' . getcwd()); putenv('TINYBOARD_PATH=' . getcwd());
require 'inc/functions.php'; require 'inc/functions.php';
require 'inc/display.php';
require 'inc/template.php';
require 'inc/database.php';
require 'inc/user.php';
require 'inc/mod.php'; require 'inc/mod.php';
$mod = Array( $mod = Array(

140
tools/rebuild.php
View File

@ -1,5 +1,6 @@
#!/usr/bin/php #!/usr/bin/php
<?php <?php
/* /*
* rebuild.php - rebuilds all static files * rebuild.php - rebuilds all static files
* *
@ -18,88 +19,87 @@
* *
*/ */
require dirname(__FILE__) . '/inc/cli.php'; require dirname(__FILE__) . '/inc/cli.php';
if(!is_writable($config['file_script'])) { if(!is_writable($config['file_script'])) {
get_httpd_privileges(); get_httpd_privileges();
}
$start = microtime(true);
// parse command line
$opts = getopt('qfb:', Array('board:', 'quick', 'full', 'quiet'));
$options = Array();
$options['board'] = isset($opts['board']) ? $opts['board'] : (isset($opts['b']) ? $opts['b'] : false);
$options['quiet'] = isset($opts['q']) || isset($opts['quiet']);
$options['quick'] = isset($opts['quick']);
$options['full'] = isset($opts['full']) || isset($opts['f']);
if(!$options['quiet'])
echo "== Tinyboard {$config['version']} ==\n";
if(!$options['quiet'])
echo "Clearing template cache...\n";
load_twig();
$twig->clearCacheFiles();
if(!$options['quiet'])
echo "Regenerating theme files...\n";
rebuildThemes('all');
if(!$options['quiet'])
echo "Generating Javascript file...\n";
buildJavascript();
$main_js = $config['file_script'];
$boards = listBoards();
foreach($boards as &$board) {
if($options['board'] && $board['uri'] != $options['board'])
continue;
if(!$options['quiet'])
echo "Opening board /{$board['uri']}/...\n";
openBoard($board['uri']);
if($config['file_script'] != $main_js) {
// different javascript file
if(!$options['quiet'])
echo "Generating Javascript file...\n";
buildJavascript();
} }
$start = microtime(true);
// parse command line
$opts = getopt('qfb:', Array('board:', 'quick', 'full', 'quiet'));
$options = Array();
$options['board'] = isset($opts['board']) ? $opts['board'] : (isset($opts['b']) ? $opts['b'] : false);
$options['quiet'] = isset($opts['q']) || isset($opts['quiet']);
$options['quick'] = isset($opts['quick']);
$options['full'] = isset($opts['full']) || isset($opts['f']);
if(!$options['quiet']) if(!$options['quiet'])
echo "== Tinyboard {$config['version']} ==\n"; echo "Creating index pages...\n";
buildIndex();
if(!$options['quiet']) if($options['quick'])
echo "Clearing template cache...\n"; continue; // do no more
$twig = new Twig_Environment($loader, Array(
'cache' => "{$config['dir']['template']}/cache"
));
$twig->clearCacheFiles();
if(!$options['quiet']) if($options['full']) {
echo "Regenerating theme files...\n"; $query = query(sprintf("SELECT `id` FROM `posts_%s`", $board['uri'])) or error(db_error());
rebuildThemes('all');
if(!$options['quiet'])
echo "Generating Javascript file...\n";
buildJavascript();
$main_js = $config['file_script'];
$boards = listBoards();
foreach($boards as &$board) {
if($options['board'] && $board['uri'] != $options['board'])
continue;
if(!$options['quiet'])
echo "Opening board /{$board['uri']}/...\n";
openBoard($board['uri']);
if($config['file_script'] != $main_js) {
// different javascript file
if(!$options['quiet'])
echo "Generating Javascript file...\n";
buildJavascript();
}
if(!$options['quiet'])
echo "Creating index pages...\n";
buildIndex();
if($options['quick'])
continue; // do no more
if($options['full']) {
$query = query(sprintf("SELECT `id` FROM `posts_%s`", $board['uri'])) or error(db_error());
while($post = $query->fetch()) {
if(!$options['quiet'])
echo "Rebuilding #{$post['id']}...\n";
rebuildPost($post['id']);
}
}
$query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
while($post = $query->fetch()) { while($post = $query->fetch()) {
if(!$options['quiet']) if(!$options['quiet'])
echo "Rebuilding #{$post['id']}...\n"; echo "Rebuilding #{$post['id']}...\n";
buildThread($post['id']); rebuildPost($post['id']);
} }
} }
if(!$options['quiet']) $query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
printf("Complete! Took %g seconds\n", microtime(true) - $start); while($post = $query->fetch()) {
if(!$options['quiet'])
echo "Rebuilding #{$post['id']}...\n";
buildThread($post['id']);
}
}
unset($board); if(!$options['quiet'])
modLog('Rebuilt everything using tools/rebuild.php'); printf("Complete! Took %g seconds\n", microtime(true) - $start);
unset($board);
modLog('Rebuilt everything using tools/rebuild.php');