git.cweiske.de
/
bdrem.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
commands to show readme and extract config template
[bdrem.git]
/
src
/
bdrem
/
UserInterface.php
diff --git
a/src/bdrem/UserInterface.php
b/src/bdrem/UserInterface.php
index 7e6bf9a141f6a9fd436dc382df31c9b6580234f8..4e27d5da12715475e61e2d6ed0c5509965e785be 100644
(file)
--- a/
src/bdrem/UserInterface.php
+++ b/
src/bdrem/UserInterface.php
@@
-11,11
+11,16
@@
abstract class UserInterface
$this->config = new Config();
$this->config->load();
setlocale(LC_TIME, $this->config->locale);
$this->config = new Config();
$this->config->load();
setlocale(LC_TIME, $this->config->locale);
- $source = $this->config->loadSource();
$parser = $this->loadParameters();
$parser = $this->loadParameters();
- $this->parseParameters($parser);
+ $res = $this->parseParameters($parser);
+ $this->handleCommands($res);
+
+ if (!$this->config->cfgFileExists) {
+ throw new \Exception('No config file found');
+ }
+ $source = $this->config->loadSource();
$arEvents = $source->getEvents(
$this->config->date,
$this->config->daysPrev, $this->config->daysNext
$arEvents = $source->getEvents(
$this->config->date,
$this->config->daysPrev, $this->config->daysNext
@@
-24,7
+29,7
@@
abstract class UserInterface
$this->render($arEvents);
} catch (\Exception $e) {
$this->preRenderParameterError();
$this->render($arEvents);
} catch (\Exception $e) {
$this->preRenderParameterError();
- echo 'Exception: ' . $e->getCode() . ' ' . $e->getMessage() . "\n";
+ echo 'Exception: ' . $e->getCode() . '
-
' . $e->getMessage() . "\n";
exit(1);
}
}
exit(1);
}
}
@@
-93,15
+98,6
@@
abstract class UserInterface
'action' => 'StoreString'
)
);
'action' => 'StoreString'
)
);
- $parser->addOption(
- 'quiet',
- array(
- 'short_name' => '-q',
- 'long_name' => '--quiet',
- 'description' => "Don't print status messages to stdout",
- 'action' => 'StoreTrue'
- )
- );
return $parser;
}
return $parser;
}
@@
-113,9
+109,9
@@
abstract class UserInterface
$this->config->daysNext = $result->options['daysNext'];
$this->config->daysPrev = $result->options['daysPrev'];
$this->config->renderer = $result->options['renderer'];
$this->config->daysNext = $result->options['daysNext'];
$this->config->daysPrev = $result->options['daysPrev'];
$this->config->renderer = $result->options['renderer'];
- $this->config->quiet = $result->options['quiet'];
$this->config->stopOnEmpty = $result->options['stopOnEmpty'];
$this->config->setDate($result->options['date']);
$this->config->stopOnEmpty = $result->options['stopOnEmpty'];
$this->config->setDate($result->options['date']);
+ return $result;
} catch (\Exception $exc) {
$this->preRenderParameterError();
$parser->displayError($exc->getMessage());
} catch (\Exception $exc) {
$this->preRenderParameterError();
$parser->displayError($exc->getMessage());
@@
-144,6
+140,10
@@
abstract class UserInterface
return new $class();
}
return new $class();
}
+ protected function handleCommands($res)
+ {
+ }
+
protected function preRenderParameterError()
{
}
protected function preRenderParameterError()
{
}