fix(tw): Reloaded tasks into object array for refresh

- chore(tw): Wrapped import function in try catch and logged error

.gitignore

@@ -1,3 +1,4 @@
 vendor/
 main.uml
 composer.lock
+.phpunit.result.cache

lib/Configs/ConfigBuilder.php

@@ -27,15 +27,16 @@ class ConfigBuilder implements ConfigurationInterface {
         ->arrayNode('logger')
           ->canBeEnabled()
               ->children()
-                ->scalarNode('file')
+                ->scalarNode('file')->end()
-                ->end()
                 ->scalarNode('level')
                   ->defaultValue('ERROR')
                   ->validate()
                     ->IfNotInArray(['DEBUG', 'INFO', 'NOTICE', 'WARNING', 'ERROR', 'CRITICAL', 'ALERT', 'EMERGENCY'])
                       ->thenInvalid('Invalid log level %s')
-                    ->end()
+                  ->end()
-                  ->end();
+                ->end()
+              ->end()
+            ->end();
     
     foreach ($this->configs as $config) {
       $ref = $ref->append($config->get());

lib/Configs/TaskwarriorConfig.php

@@ -2,24 +2,24 @@
 
 namespace Aerex\BaikalStorage\Configs;
 
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
 class TaskwarriorConfig {
   public function get() {
-    $treeBuilder = new TreeBuilder();
+    $node = new ArrayNodeDefinition('taskwarrior');
-    $node = $treeBuilder->root('taskwarrior');
+    $node->canBeEnabled()
-    $node->children()
+              ->children()
-            ->scalarNode('taskdata')
+                ->scalarNode('taskdata')
-              ->defaultValue('~/.task')
+                  ->defaultValue('~/.task')
-            ->end()
+                ->end()
-            ->scalarNode('taskrc')
+                ->scalarNode('taskrc')
-              ->defaultValue('~/.taskrc')
+                  ->defaultValue('~/.taskrc')
-            ->end()
+                ->end()
-            ->scalarNode('project_tag_suffix')
+                ->scalarNode('project_tag_suffix')
-              ->defaultValue('project_')
+                  ->defaultValue('project_')
-            ->end()
+                ->end()
-    ->end();
+              ->end();
-        
+
     return $node;
   }
 }

lib/Console.php

@@ -23,7 +23,7 @@ class Console extends AbstractConsole {
     $stdin = array_merge($stdin, $this->defaultArgs, $args); 
 
     if (isset($input)) {
-      $stdin[] = $this->convertToString($input);
+      $input = $this->convertToString($input);
     }
     $process = new Process(implode(' ', $stdin), $input, $envs);
     $process->inheritEnvironmentVariables();
@@ -32,7 +32,6 @@ class Console extends AbstractConsole {
       $process->mustRun();
       return $process->getOutput();
     } catch (ProcessFailedException $error) {
-      echo $error->getMessage();
       throw $error;
     }
   }

lib/Storages/Taskwarrior.php

@@ -26,6 +26,13 @@ class Taskwarrior implements IStorage {
   public function refresh() {
     $output = $this->console->execute('task', ['sync'], null, 
       ['TASKRC' => $this->configs['taskrc'],'TASKDATA' => $this->configs['taskdata']]);
+      $tasks = json_decode($this->console->execute('task', ['export'], null,
+        ['TASKRC' => $this->configs['taskrc'], 'TASKDATA' => $this->configs['taskdata']]), true);
+      foreach ($tasks as $task) {
+        if (isset($task['uid'])) {
+          $this->tasks[$task['uid']] = $task;
+        }
+      }
     $this->logger->info($output);
   }
 
@@ -37,7 +44,7 @@ class Taskwarrior implements IStorage {
       $task['uid'] = (string)$vtodo->UID;
     }
 
-    if (isset($vtodo->SUMMARY) && !isset($vtodo->DESCRIPTION)){
+    if (isset($vtodo->SUMMARY)){
       $task['description'] = (string)$vtodo->SUMMARY;
     } else if(isset($vtodo->DESCRIPTION)) {
       $task['description'] = (string)$vtodo->DESCRIPTION;
@@ -108,8 +115,8 @@ class Taskwarrior implements IStorage {
       $task['tags'] = [];
         foreach ($vtodo->CATEGORIES as $category) {
           if (isset($this->configs['project_tag_suffix'])) {
-            $projTagSuffixRegExp = sprintf('/^%s_/', $this->configs['project_tag_suffix']);
+            $projTagSuffixRegExp = sprintf('/^%s/', $this->configs['project_tag_suffix']);
-            if (preg_match($category, $projTagSuffixRegExp)) {
+            if (preg_match($projTagSuffixRegExp, $category)) {
               $task['project'] = preg_replace($projTagSuffixRegExp, '', $category);
               continue;
             }
@@ -122,19 +129,23 @@ class Taskwarrior implements IStorage {
   }
 
   public function save(Calendar $c) {
-    if (!isset($c->VTODO)){
+    try {
-      throw new \Exception('Calendar event does not contain VTODO');
+      if (!isset($c->VTODO)){
-      $this->logger->error('Calendar event does not contain VTODO');
+        throw new \Exception('Calendar event does not contain VTODO');
+      }
+      $this->logger->info(json_encode($c->jsonSerialize()));
+      $this->refresh();
+      $task = $this->vObjectToTask($c->VTODO);
+      $this->logger->info(json_encode($task));
+      $this->logger->info(
+        sprintf('Executing TASKRC = %s TASKDATA = %s task import %s', $this->configs['taskrc'], $this->configs['taskdata'], json_encode($task))
+      );
+      $output = $this->console->execute('task', ['import'], $task, 
+        ['TASKRC' => $this->configs['taskrc'],'TASKDATA' => $this->configs['taskdata']]);
+      $this->logger->info($output);
+    } catch (\Exception $e) {
+      $this->logger->error($e->getTraceAsString());
+      throw $e;
     }
-    $this->logger->info($c->VTODO->getJsonValue());
-    $this->refresh();
-    $task = $this->vObjectToTask($c->VTODO);
-    $this->logger->info(json_encode($task));
-    $this->logger->info(
-      sprintf('Executing TASKRC = %s TASKDATA = %s task import %s', $this->configs['taskrc'], $this->configs['taskdata'], $task)
-    );
-    $output = $this->console->execute('task', ['import'], $task, 
-      ['TASKRC' => $this->configs['taskrc'],'TASKDATA' => $this->configs['taskdata']]);
-     $this->logger->info($output);
   }
 }

tests/Configs/ConfigTest.php

@@ -3,6 +3,7 @@ namespace Aerex\BaikalStorage;
 
 use PHPUnit\Framework\TestCase;
 use Aerex\BaikalStorage\Configs\ConfigBuilder;
+use Aerex\BaikalStorage\Configs\TaskwarriorConfig;
 
 class ConfigTest extends TestCase {
 
@@ -26,6 +27,24 @@ class ConfigTest extends TestCase {
 
   }
 
+  public function testTaskwarriorConfig() {
+    $configs = new ConfigBuilder(__DIR__ . '/Fixtures/TaskwarriorConfig.yaml');
+    $configs->add(new TaskwarriorConfig());
+    $contents = $configs->loadYaml();
+    $this->assertEquals(sizeof($contents), 2);
+    $this->assertArrayHasKey('logger', $contents, 'config missing logger property');
+    $this->assertArrayHasKey('file', $contents['logger'], 'config missing logger.file property');
+    $this->assertArrayHasKey('level', $contents['logger'], 'config missing logger.level property');
+    $this->assertArrayHasKey('enabled', $contents['logger'], 'config missing logger.enabled property');
+    $this->assertArrayHasKey('taskwarrior', $contents, 'config missing taskwarrior property');
+    $this->assertArrayHasKey('taskrc', $contents['taskwarrior'], 'config missing taskwarrior.taskrc property');
+    $this->assertEquals($contents['taskwarrior']['taskrc'], '/home/aerex/.taskrc');
+    $this->assertArrayHasKey('taskdata', $contents['taskwarrior'], 'config missing taskwarrior.taskdata property');
+    $this->assertEquals($contents['taskwarrior']['taskdata'], '/home/aerex/.task');
+    $this->assertArrayHasKey('project_tag_suffix', $contents['taskwarrior'], 'config missing taskwarrior.taskdata property');
+    $this->assertEquals($contents['taskwarrior']['project_tag_suffix'], 'project_');
+  }
+
 
 }