X-Git-Url: https://git.cweiske.de/bdrem.git/blobdiff_plain/83afda94b7d5fc2be341712e2661f6095f608e0d..95681cad57a3bb6198162d0e94dc8f700ced60af:/src/bdrem/UserInterface.php

diff --git a/src/bdrem/UserInterface.php b/src/bdrem/UserInterface.php
index 4e27d5d..2827415 100644
--- a/src/bdrem/UserInterface.php
+++ b/src/bdrem/UserInterface.php
@@ -9,17 +9,20 @@ abstract class UserInterface
     {
         try {
             $this->config = new Config();
-            $this->config->load();
-            setlocale(LC_TIME, $this->config->locale);
-
             $parser = $this->loadParameters();
             $res = $this->parseParameters($parser);
-            $this->handleCommands($res);
 
+            $this->config->load();
             if (!$this->config->cfgFileExists) {
-                throw new \Exception('No config file found');
+                throw new \Exception(
+                    "No config file found. Looked at the following places:\n"
+                    . '- ' . implode ("\n- ", $this->config->cfgFiles)
+                );
             }
 
+            setlocale(LC_TIME, $this->config->locale);
+            $this->handleCommands($res);
+
             $source = $this->config->loadSource();
             $arEvents = $source->getEvents(
                 $this->config->date,
@@ -29,7 +32,7 @@ abstract class UserInterface
             $this->render($arEvents);
         } catch (\Exception $e) {
             $this->preRenderParameterError();
-            echo 'Exception: ' . $e->getCode() . ' - ' . $e->getMessage() . "\n";
+            echo 'Error: ' . $e->getMessage() . "\n";
             exit(1);
         }
     }
@@ -48,7 +51,7 @@ abstract class UserInterface
                 'description' => 'Show NUM days after date',
                 'help_name'   => 'NUM',
                 'action'      => 'StoreInt',
-                'default'     => $this->config->daysNext,
+                'default'     => null,
             )
         );
         $parser->addOption(
@@ -59,7 +62,7 @@ abstract class UserInterface
                 'description' => 'Show NUM days before date',
                 'help_name'   => 'NUM',
                 'action'      => 'StoreInt',
-                'default'     => $this->config->daysPrev,
+                'default'     => null,
             )
         );
         $parser->addOption(
@@ -98,6 +101,17 @@ abstract class UserInterface
                 'action'      => 'StoreString'
             )
         );
+        $parser->addOption(
+            'configfile',
+            array(
+                'short_name'  => '-c',
+                'long_name'   => '--config',
+                'help_name'   => 'FILE',
+                'description' => 'Path to configuration file',
+                'action'      => 'StoreString'
+            )
+        );
+
         return $parser;
     }
 
@@ -105,7 +119,11 @@ abstract class UserInterface
     {
         try {
             $result = $parser->parse();
-            // do something with the result object
+
+            if ($result->options['configfile'] !== null) {
+                $this->config->cfgFiles = array($result->options['configfile']);
+            }
+
             $this->config->daysNext    = $result->options['daysNext'];
             $this->config->daysPrev    = $result->options['daysPrev'];
             $this->config->renderer    = $result->options['renderer'];