Support --html everywhere

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

diff --git a/src/shpub/Command/Note.php b/src/shpub/Command/Note.php
index d5231a9d62160fa5723d47ec61391273a20cdf2b..1694243ef9cb3fa534900bffadb4b713d20c77c6 100644 (file)
--- a/src/shpub/Command/Note.php
+++ b/src/shpub/Command/Note.php
@@ -1,42 +1,13 @@
 <?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');
-        $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,
-            )
-        );
+        static::addOptHtml($cmd);
+        static::optsGeneric($cmd);
         $cmd->addArgument(
             'text',
             [
@@ -47,60 +18,17 @@ class Command_Note
         );
     }
 
-    public function run($command)
+    public function run(\Console_CommandLine_Result $cmdRes)
     {
         $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']
-            );
-        }
-
-        $files = $command->options['files'];
-        $fileList = [
-            'audio' => [],
-            'photo' => [],
-            'video' => [],
-        ];
-        $urls = [];
-        foreach ($files as $filePath) {
-            if (file_exists($filePath)) {
-                $type = 'photo';
-                $fileList[$type][] = $filePath;
-            } else if (strpos($filePath, '://') !== false) {
-                //url
-                $urls[] = $filePath;
-            } else {
-                Log::err('File does not exist: ' . $filePath);
-                exit(20);
-            }
-        }
-        if (count($urls)) {
-            if (count($urls) == 1) {
-                $req->req->addPostParameter('photo', reset($urls));
-            } else {
-                $n = 0;
-                foreach ($urls as $url) {
-                    $req->req->addPostParameter(
-                        'photo[' . $n++ . ']', reset($urls)
-                    );
-                }
-            }
-        }
-        foreach ($fileList as $type => $filePaths) {
-            if (count($filePaths) == 1) {
-                $req->addUpload($type, reset($filePaths));
-            } else if (count($filePaths) > 0) {
-                $req->addUpload($type, $filePaths);
-            }
-        }
+        $req->setType('entry');
+        $req->addContent($cmdRes->args['text'], $cmdRes->options['html']);
+        $this->handleGenericOptions($cmdRes, $req);
 
         $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);
     }
 }
 ?>