Add "json" option

[shpub.git] / src / shpub / Command / Note.php

diff --git a/src/shpub/Command/Note.php b/src/shpub/Command/Note.php
index cc3a5c178aba0e3081d3331321d3f167238baaf4..c7683f3b7a289f5052e571b2e3754b0ba6e77db7 100644 (file)
--- a/src/shpub/Command/Note.php
+++ b/src/shpub/Command/Note.php
@@ -1,75 +1,12 @@
 <?php
 namespace shpub;
 
 <?php
 namespace shpub;
 

-class Command_Note
+class Command_Note extends Command_AbstractProps

 {
 {

-    /**
-     * @var Config
-     */
-    protected $cfg;
-
-    public function __construct($cfg)
-    {
-        $this->cfg = $cfg;
-    }
-

     public static function opts(\Console_CommandLine $optParser)
     {
         $cmd = $optParser->addCommand('note');
     public static function opts(\Console_CommandLine $optParser)
     {
         $cmd = $optParser->addCommand('note');

-        $cmd->addOption(
-            'categories',
-            array(
-                'short_name'  => '-c',
-                'long_name'   => '--category',
-                'description' => 'Categories',
-                'help_name'   => 'CAT',
-                'action'      => 'StoreArray',
-                'default'     => [],
-            )
-        );
-        $cmd->addOption(
-            'files',
-            array(
-                'short_name'  => '-f',
-                'long_name'   => '--files',
-                'description' => 'Files to upload',
-                'help_name'   => 'PATH',
-                'action'      => 'StoreArray',
-                'default'     => [],
-            )
-        );
-        $cmd->addOption(
-            'published',
-            array(
-                'long_name'   => '--published',
-                'description' => 'Publish date',
-                'help_name'   => 'DATE',
-                'action'      => 'StoreString',
-                'default'     => null,
-            )
-        );
-        $cmd->addOption(
-            'syndication',
-            array(
-                'short_name'  => '-s',
-                'long_name'   => '--syndication',
-                'description' => 'Syndication URL(s)',
-                'help_name'   => 'URL',
-                'action'      => 'StoreArray',
-                'default'     => [],
-            )
-        );
-        $cmd->addOption(
-            'x',
-            array(
-                'short_name'  => '-x',
-                'long_name'   => '--xprop',
-                'description' => 'Additional property',
-                'help_name'   => 'key=value',
-                'action'      => 'StoreArray',
-                'default'     => [],
-            )
-        );
+        static::optsGeneric($cmd);

         $cmd->addArgument(
             'text',
             [
         $cmd->addArgument(
             'text',
             [


@@ -80,103 +17,17 @@ class Command_Note
         );
     }
 
         );
     }
 

-    public function run($command)
+    public function run(\Console_CommandLine_Result $cmdRes)

     {
         $req = new Request($this->cfg->host, $this->cfg);
     {
         $req = new Request($this->cfg->host, $this->cfg);

-        $req->req->addPostParameter('h', 'entry');
-        $req->req->addPostParameter('content', $command->args['text']);
-        if ($command->options['published'] !== null) {
-            $req->req->addPostParameter(
-                'published', $command->options['published']
-            );
-        }
-        if (count($command->options['categories'])) {
-            $req->addPostParameter(
-                'category', $command->options['categories']
-            );
-        }
-        if (count($command->options['syndication'])) {
-            $req->addPostParameter(
-                'syndication', $command->options['syndication']
-            );
-        }
-
-        $files = $command->options['files'];
-        $fileList = $urlList = [
-            'audio' => [],
-            'image' => [],
-            'video' => [],
-        ];
-
-        foreach ($files as $filePath) {
-            if (strpos($filePath, '://') !== false) {
-                //url
-                $mte      = new \MIME_Type_Extension();
-                $mimetype = $mte->getMIMEType($filePath);
-                $media    = \MIME_Type::getMedia($mimetype);
-                if (!isset($urlList[$media])) {
-                    Log::err('File type not allowed: ' . $mimetype);
-                    exit(20);
-                }
-                $urlList[$media][] = $filePath;
-            } else if (file_exists($filePath)) {
-                //file
-                $mimetype = \MIME_Type::autoDetect($filePath);
-                $media    = \MIME_Type::getMedia($mimetype);
-                if (!isset($urlList[$media])) {
-                    Log::err('File type not allowed: ' . $mimetype);
-                    exit(20);
-                }
-                $fileList[$media][] = $filePath;
-            } else {
-                Log::err('File does not exist: ' . $filePath);
-                exit(20);
-            }
-        }
-        foreach ($urlList as $type => $urls) {
-            if ($type == 'image') {
-                $type = 'photo';
-            }
-            if (count($urls) == 1) {
-                $req->req->addPostParameter($type, reset($urls));
-            } else if (count($urls) > 1) {
-                $n = 0;
-                foreach ($urls as $url) {
-                    $req->req->addPostParameter(
-                        $type . '[' . $n++ . ']', $url
-                    );
-                }
-            }
-        }
-        foreach ($fileList as $type => $filePaths) {
-            if ($type == 'image') {
-                $type = 'photo';
-            }
-            if (count($filePaths) == 1) {
-                $req->addUpload($type, reset($filePaths));
-            } else if (count($filePaths) > 0) {
-                $req->addUpload($type, $filePaths);
-            }
-        }
-
-        if (count($command->options['x'])) {
-            $postParams = [];
-            foreach ($command->options['x'] as $xproperty) {
-                list($propkey, $propval) = explode('=', $xproperty, 2);
-                if (!isset($postParams[$propkey] )) {
-                    $postParams[$propkey] = [];
-                }
-                $postParams[$propkey][] = $propval;
-            }
-            foreach ($postParams as $propkey => $propvals) {
-                $req->addPostParameter($propkey, $propvals);
-            }
-        }
+        $req->setType('entry');
+        $req->addProperty('content', $cmdRes->args['text']);
+        $this->handleGenericOptions($cmdRes, $req);

 
         $res = $req->send();
         $postUrl = $res->getHeader('Location');
 
         $res = $req->send();
         $postUrl = $res->getHeader('Location');

-        echo "Post created at server\n";
-        echo $postUrl . "\n";
+        Log::info('Post created at server');
+        Log::msg($postUrl);

     }
 }
 ?>
     }
 }
 ?>