PrivateCoffee/alltube
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move YAML parsing to Config::getInstance()

Browse source 
Make Config::__construct() public
This commit is contained in:
Pierre Rudloff 2016-10-18 09:54:08 +02:00
parent f549cc8ce3
commit a3dee17b2a
1 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
classes/Config.php
View file

@ -84,18 +84,24 @@ class Config
/** /**
* Config constructor. * Config constructor.
* *
* @param string $yamlfile YAML config file path * Available options:
* * youtubedl: youtube-dl binary path
* * python: Python binary path
* * avconv: avconv or ffmpeg binary path
* * rtmpdump: rtmpdump binary path
* * curl: curl binary path
* * params: Array of youtube-dl parameters
* * curl_params: Array of curl parameters
* * convert: Enable conversion?
*
* @param array $options Options
*/ */
private function __construct($yamlfile) public function __construct(array $options)
{ {
$this->file = $yamlfile; if (isset($options) && is_array($options)) {
if (is_file($yamlfile)) { foreach ($options as $option => $value) {
$yaml = Yaml::parse(file_get_contents($yamlfile)); if (isset($this->$option) && isset($value)) {
if (isset($yaml) && is_array($yaml)) { $this->$option = $value;
foreach ($yaml as $param => $value) {
if (isset($this->$param) && isset($value)) {
$this->$param = $value;
}
} }
} }
} }
@ -105,7 +111,7 @@ class Config
} }
/** /**
* Get singleton instance. * Get Config singleton instance from YAML config file.
* *
* @param string $yamlfile YAML config file name * @param string $yamlfile YAML config file name
* *
@ -113,9 +119,21 @@ class Config
*/ */
public static function getInstance($yamlfile = 'config.yml') public static function getInstance($yamlfile = 'config.yml')
{ {
$yamlfile = __DIR__.'/../'.$yamlfile; $yamlPath = __DIR__.'/../'.$yamlfile;
if (is_null(self::$instance) || self::$instance->file != $yamlfile) { if (is_null(self::$instance) || self::$instance->file != $yamlfile) {
self::$instance = new self($yamlfile); if (is_file($yamlfile)) {
$options = Yaml::parse(file_get_contents($yamlPath));
} elseif ($yamlfile == 'config.yml') {
/*
Allow for the default file to be missing in order to
not surprise users that did not create a config file
*/
$options = [];
} else {
throw new \Exception("Can't find config file at ".$yamlPath);
}
self::$instance = new self($options);
self::$instance->file = $yamlfile;
} }
return self::$instance; return self::$instance;