kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests 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

28
tools/benchmark.php
View File

@ -5,21 +5,21 @@
*
*/
require dirname(__FILE__) . '/inc/cli.php';
require 'inc/image.php';
require dirname(__FILE__) . '/inc/cli.php';
require 'inc/image.php';
// move back to this directory
chdir(dirname(__FILE__));
// move back to this directory
chdir(dirname(__FILE__));
if(count($argv) != 2)
if(count($argv) != 2)
die("Usage: {$argv[0]} [file]\n");
$file = $argv[1];
$extension = strtolower(substr($file, strrpos($file, '.') + 1));
$out = tempnam($config['tmp'], 'thumb');
$count = 300;
$file = $argv[1];
$extension = strtolower(substr($file, strrpos($file, '.') + 1));
$out = tempnam($config['tmp'], 'thumb');
$count = 300;
function benchmark($method) {
function benchmark($method) {
global $config, $file, $extension, $out, $count;
$config['thumb_method'] = $method;
@ -44,9 +44,9 @@
printf("Took %.2f seconds (%.2f/second; %.2f ms)\n", $end - $start, $rate = ($count / ($end - $start)), 1000 / $rate);
unlink($out);
}
}
benchmark('gd');
benchmark('imagick');
benchmark('convert');
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());
require 'inc/functions.php';
require 'inc/display.php';
require 'inc/template.php';
require 'inc/database.php';
require 'inc/user.php';
require 'inc/mod.php';
$mod = Array(

56
tools/rebuild.php
View File

@ -1,5 +1,6 @@
#!/usr/bin/php
<?php
/*
* rebuild.php - rebuilds all static files
*
@ -18,46 +19,45 @@
*
*/
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();
}
}
$start = microtime(true);
$start = microtime(true);
// parse command line
$opts = getopt('qfb:', Array('board:', 'quick', 'full', 'quiet'));
$options = Array();
// 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']);
$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";
if(!$options['quiet'])
if(!$options['quiet'])
echo "Clearing template cache...\n";
$twig = new Twig_Environment($loader, Array(
'cache' => "{$config['dir']['template']}/cache"
));
$twig->clearCacheFiles();
if(!$options['quiet'])
load_twig();
$twig->clearCacheFiles();
if(!$options['quiet'])
echo "Regenerating theme files...\n";
rebuildThemes('all');
rebuildThemes('all');
if(!$options['quiet'])
if(!$options['quiet'])
echo "Generating Javascript file...\n";
buildJavascript();
buildJavascript();
$main_js = $config['file_script'];
$main_js = $config['file_script'];
$boards = listBoards();
$boards = listBoards();
foreach($boards as &$board) {
foreach($boards as &$board) {
if($options['board'] && $board['uri'] != $options['board'])
continue;
@ -95,11 +95,11 @@
echo "Rebuilding #{$post['id']}...\n";
buildThread($post['id']);
}
}
}
if(!$options['quiet'])
if(!$options['quiet'])
printf("Complete! Took %g seconds\n", microtime(true) - $start);
unset($board);
modLog('Rebuilt everything using tools/rebuild.php');
unset($board);
modLog('Rebuilt everything using tools/rebuild.php');