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

Adjusted graphic extension settings

Browse Source
This commit is contained in:
Matthew Barbour 2019-06-18 13:55:18 -05:00 committed by matthew
parent 3859e27839
commit e98e63f836
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/graphics/main.php
View File

@ -167,6 +167,9 @@ class Graphics extends Extension
{ {
global $config; global $config;
$config->set_default_string(GraphicsConfig::FFPROBE_PATH, 'ffprobe'); $config->set_default_string(GraphicsConfig::FFPROBE_PATH, 'ffprobe');
$config->set_default_int(GraphicsConfig::MEM_LIMIT, parse_shorthand_int('8MB'));
$config->set_default_string(GraphicsConfig::FFMPEG_PATH, '');
$config->set_default_string(GraphicsConfig::CONVERT_PATH, '');
if ($config->get_int(GraphicsConfig::VERSION) < 1) { if ($config->get_int(GraphicsConfig::VERSION) < 1) {
@ -178,8 +181,6 @@ class Graphics extends Extension
if (is_executable(strtok($ffmpeg, PHP_EOL))) { if (is_executable(strtok($ffmpeg, PHP_EOL))) {
$config->set_default_string(GraphicsConfig::FFMPEG_PATH, 'ffmpeg'); $config->set_default_string(GraphicsConfig::FFMPEG_PATH, 'ffmpeg');
} }
} else {
$config->set_default_string(GraphicsConfig::FFMPEG_PATH, '');
} }
$current_value = $config->get_string("thumb_convert_path"); $current_value = $config->get_string("thumb_convert_path");
@ -190,8 +191,6 @@ class Graphics extends Extension
if (is_executable(strtok($convert, PHP_EOL))) { if (is_executable(strtok($convert, PHP_EOL))) {
$config->set_default_string(GraphicsConfig::CONVERT_PATH, 'convert'); $config->set_default_string(GraphicsConfig::CONVERT_PATH, 'convert');
} }
} else {
$config->set_default_string(GraphicsConfig::CONVERT_PATH, '');
} }
$current_value = $config->get_int("thumb_mem_limit"); $current_value = $config->get_int("thumb_mem_limit");
@ -199,9 +198,6 @@ class Graphics extends Extension
$config->set_int(GraphicsConfig::MEM_LIMIT, $current_value); $config->set_int(GraphicsConfig::MEM_LIMIT, $current_value);
} }
$config->set_int(GraphicsConfig::VERSION, 1); $config->set_int(GraphicsConfig::VERSION, 1);
log_info("graphics", "extension installed"); log_info("graphics", "extension installed");
} }