introduce UserInterface class, add simple parameter support for web and cli

diff --git a/src/bdrem/Cli.php b/src/bdrem/Cli.php
index 807f33679b1f0f7e13726e7f728e4a4c29e86471..c38e1735f06721b8fac1944e500d48294e8aedc7 100644 (file)
--- a/src/bdrem/Cli.php
+++ b/src/bdrem/Cli.php
@@ -1,23 +1,32 @@
 <?php
 namespace bdrem;
 
 <?php
 namespace bdrem;
 

-class Cli
+class Cli extends UserInterface

 {
 {

-    public function run()
+    protected function loadParameters($cfg)

     {
     {

-        $cfg = new Config();
-        $cfg->load();
-        setlocale(LC_TIME, $cfg->locale);
-        $source = $cfg->loadSource();
+        $params = $GLOBALS['argv'];
+        array_shift($params);
+        $storeInto = null;
+        foreach ($params as $param) {
+            if ($storeInto !== null) {
+                $cfg->$storeInto = (int)$param;
+                $storeInto = null;
+                continue;
+            }

 
 

-        $arEvents = $source->getEvents(
-            date('Y-m-d'), $cfg->daysBefore, $cfg->daysAfter
-        );
-        usort($arEvents, '\\bdrem\\Event::compare');
-        $this->render($arEvents);
+            if ($param == '--days-after' || $param == '-a') {
+                $storeInto = 'daysAfter';
+                continue;
+            } else if ($param == '--days-before' || $param == '-b') {
+                $storeInto = 'daysBefore';
+                continue;
+            }
+            $storeInto = null;
+        }

     }
 
     }
 

-    public function render($arEvents)
+    protected function render($arEvents)

     {
         $r = new Renderer_Console();
         echo $r->render($arEvents);
     {
         $r = new Renderer_Console();
         echo $r->render($arEvents);

diff --git a/src/bdrem/UserInterface.php b/src/bdrem/UserInterface.php
new file mode 100644 (file)
index 0000000..ffaa279
--- /dev/null
+++ b/src/bdrem/UserInterface.php
@@ -0,0 +1,27 @@
+<?php
+namespace bdrem;
+
+abstract class UserInterface
+{
+    public function run()
+    {
+        $cfg = new Config();
+        $cfg->load();
+        setlocale(LC_TIME, $cfg->locale);
+        $source = $cfg->loadSource();
+
+        $this->loadParameters($cfg);
+        $arEvents = $source->getEvents(
+            date('Y-m-d'), $cfg->daysBefore, $cfg->daysAfter
+        );
+        usort($arEvents, '\\bdrem\\Event::compare');
+        $this->render($arEvents);
+    }
+
+    protected function loadParameters($cfg)
+    {
+    }
+
+    abstract protected function render($arEvents);
+}
+?>
\ No newline at end of file

diff --git a/src/bdrem/Web.php b/src/bdrem/Web.php
index ac619ce796bfb63e182d87308b6bc66a995fd09c..ab3973a6745fe30cca81bf605fda86851496fce5 100644 (file)
--- a/src/bdrem/Web.php
+++ b/src/bdrem/Web.php
@@ -1,26 +1,22 @@
 <?php
 namespace bdrem;
 
 <?php
 namespace bdrem;
 

-class Web
+class Web extends UserInterface

 {
 {

-    public function run()
+    protected function render($arEvents)

     {
     {

-        $cfg = new Config();
-        $cfg->load();
-        setlocale(LC_TIME, $cfg->locale);
-        $source = $cfg->loadSource();
-
-        $arEvents = $source->getEvents(
-            date('Y-m-d'), $cfg->daysBefore, $cfg->daysAfter
-        );
-        usort($arEvents, '\\bdrem\\Event::compare');
-        $this->render($arEvents);
+        $r = new Renderer_Html();
+        echo $r->render($arEvents);

     }
 
     }
 

-    public function render($arEvents)
+    protected function loadParameters($cfg)

     {
     {

-        $r = new Renderer_Html();
-        echo $r->render($arEvents);
+        if (isset($_GET['daysBefore'])) {
+            $cfg->daysBefore = (int) $_GET['daysBefore'];
+        }
+        if (isset($_GET['daysAfter'])) {
+            $cfg->daysAfter = (int) $_GET['daysAfter'];
+        }

     }
 }
 ?>
     }
 }
 ?>

diff --git a/src/bdrem/WebText.php b/src/bdrem/WebText.php
index 8f3ff8a18220925d0bc2b64c3900d10a29c0cfcb..aaace51145f6cac202e215961f0810137ecb7b73 100644 (file)
--- a/src/bdrem/WebText.php
+++ b/src/bdrem/WebText.php
@@ -3,7 +3,7 @@ namespace bdrem;
 
 class WebText extends Web
 {
 
 class WebText extends Web
 {

-    public function render($arEvents)
+    protected function render($arEvents)

     {
         header('Content-type: text/plain; charset=utf-8');
         $r = new Renderer_Console();
     {
         header('Content-type: text/plain; charset=utf-8');
         $r = new Renderer_Console();