Merge pull request #1202 from njam/wowza-bin-cm

Import wowza thumbnails+archive to app with CLI tool
cargomedia · May 12, 2014 · f1e13c2 · f1e13c2
2 parents 9ebb66e + 353ac3f
commit f1e13c2
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 64 deletions.
diff --git a/library/CM/Model/StreamChannel/Video.php b/library/CM/Model/StreamChannel/Video.php
@@ -97,6 +97,16 @@ public function getThumbnailCount() {
         return (int) $this->_get('thumbnailCount');
     }
 
+    /**
+     * @param int $index
+     * @return CM_File_UserContent
+     */
+    public function getThumbnail($index) {
+        $index = (int) $index;
+        $filename = $this->getId() . '-' . $this->getHash() . '-thumbs' . DIRECTORY_SEPARATOR . $index . '.png';
+        return new CM_File_UserContent('streamChannels', $filename, $this->getId());
+    }
+
     /**
      * @return CM_Paging_FileUserContent_StreamChannelVideoThumbnails
      */

diff --git a/library/CM/Model/StreamChannelArchive/Video.php b/library/CM/Model/StreamChannelArchive/Video.php
@@ -52,6 +52,16 @@ public function getThumbnailCount() {
         return (int) $this->_get('thumbnailCount');
     }
 
+    /**
+     * @param int $index
+     * @return CM_File_UserContent
+     */
+    public function getThumbnail($index) {
+        $index = (int) $index;
+        $filename = $this->getId() . '-' . $this->getHash() . '-thumbs' . DIRECTORY_SEPARATOR . $index . '.png';
+        return new CM_File_UserContent('streamChannels', $filename, $this->getId());
+    }
+
     /**
      * @return CM_Paging_FileUserContent_StreamChannelArchiveVideoThumbnails
      */

diff --git a/library/CM/Paging/FileUserContent/Abstract.php b/library/CM/Paging/FileUserContent/Abstract.php
@@ -2,25 +2,4 @@
 
 abstract class CM_Paging_FileUserContent_Abstract extends CM_Paging_Abstract {
 
-    /**
-     * @param mixed $item
-     * @return string
-     */
-    abstract protected function _getFilename($item);
-
-    /**
-     * @param mixed $item
-     * @return string
-     */
-    abstract protected function _getFileNamespace($item);
-
-    /**
-     * @param mixed $item
-     * @return int
-     */
-    abstract protected function _getSequence($item);
-
-    protected function _processItem($item) {
-        return new CM_File_UserContent($this->_getFileNamespace($item), $this->_getFilename($item), $this->_getSequence($item));
-    }
 }
diff --git a/library/CM/Paging/FileUserContent/StreamChannelArchiveVideoThumbnails.php b/library/CM/Paging/FileUserContent/StreamChannelArchiveVideoThumbnails.php
@@ -17,16 +17,7 @@ public function __construct(CM_Model_StreamChannelArchive_Video $streamChannelAr
         parent::__construct($source);
     }
 
-    protected function _getFilename($item) {
-        return
-            $this->_streamChannelArchive->getId() . '-' . $this->_streamChannelArchive->getHash() . '-thumbs' . DIRECTORY_SEPARATOR . $item . '.png';
-    }
-
-    protected function _getFileNamespace($item) {
-        return 'streamChannels';
-    }
-
-    protected function _getSequence($item) {
-        return (int) $this->_streamChannelArchive->getId();
+    protected function _processItem($item) {
+        return $this->_streamChannelArchive->getThumbnail($item);
     }
 }
diff --git a/library/CM/Paging/FileUserContent/StreamChannelVideoThumbnails.php b/library/CM/Paging/FileUserContent/StreamChannelVideoThumbnails.php
@@ -17,15 +17,7 @@ public function __construct(CM_Model_StreamChannel_Video $streamChannel) {
         parent::__construct($source);
     }
 
-    protected function _getFilename($item) {
-        return $this->_streamChannel->getId() . '-' . $this->_streamChannel->getHash() . '-thumbs' . DIRECTORY_SEPARATOR . $item . '.png';
-    }
-
-    protected function _getFileNamespace($item) {
-        return 'streamChannels';
-    }
-
-    protected function _getSequence($item) {
-        return (int) $this->_streamChannel->getId();
+    protected function _processItem($item) {
+        return $this->_streamChannel->getThumbnail($item);
     }
 }
diff --git a/library/CM/Stream/Adapter/Video/Abstract.php b/library/CM/Stream/Adapter/Video/Abstract.php
@@ -70,20 +70,18 @@ public function stopStream(CM_Model_Stream_Abstract $stream) {
      * @param int    $width
      * @param int    $height
      * @param int    $serverId
-     * @param int    $thumbnailCount
      * @param string $data
      * @throws CM_Exception
      * @throws CM_Exception_NotAllowed
      * @return int
      */
-    public function publish($streamName, $clientKey, $start, $width, $height, $serverId, $thumbnailCount, $data) {
+    public function publish($streamName, $clientKey, $start, $width, $height, $serverId, $data) {
         $streamName = (string) $streamName;
         $clientKey = (string) $clientKey;
         $start = (int) $start;
         $width = (int) $width;
         $height = (int) $height;
         $serverId = (int) $serverId;
-        $thumbnailCount = (int) $thumbnailCount;
         $data = (string) $data;
         $params = CM_Params::factory(CM_Params::decode($data, true));
         $streamChannelType = $params->getInt('streamChannelType');
@@ -97,7 +95,7 @@ public function publish($streamName, $clientKey, $start, $width, $height, $serve
             'width'          => $width,
             'height'         => $height,
             'serverId'       => $serverId,
-            'thumbnailCount' => $thumbnailCount,
+            'thumbnailCount' => 0,
         ));
         try {
             CM_Model_Stream_Publish::createStatic(array(
@@ -115,22 +113,16 @@ public function publish($streamName, $clientKey, $start, $width, $height, $serve
 
     /**
      * @param string   $streamName
-     * @param int|null $thumbnailCount
      * @return null
      */
-    public function unpublish($streamName, $thumbnailCount = null) {
+    public function unpublish($streamName) {
         $streamName = (string) $streamName;
-        $thumbnailCount = (int) $thumbnailCount;
         /** @var CM_Model_StreamChannel_Abstract $streamChannel */
         $streamChannel = CM_Model_StreamChannel_Abstract::findByKeyAndAdapter($streamName, $this->getType());
         if (!$streamChannel) {
             return;
         }
 
-        if (null !== $thumbnailCount && $streamChannel instanceof CM_Model_StreamChannel_Video) {
-            /** @var CM_Model_StreamChannel_Video $streamChannel */
-            $streamChannel->setThumbnailCount($thumbnailCount);
-        }
         $streamChannel->getStreamPublish()->delete();
         if (!$streamChannel->hasStreams()) {
             $streamChannel->delete();

diff --git a/library/CM/Stream/Adapter/Video/Wowza.php b/library/CM/Stream/Adapter/Video/Wowza.php
@@ -22,11 +22,6 @@ public function synchronize() {
                 $this->_stopClient($publish['clientId'], $publish['serverHost']);
             }
 
-            if ($streamChannel instanceof CM_Model_StreamChannel_Video) {
-                /** @var CM_Model_StreamChannel_Video $streamChannel */
-                $streamChannel->setThumbnailCount($publish['thumbnailCount']);
-            }
-
             foreach ($publish['subscribers'] as $clientId => $subscribe) {
                 if (!$streamChannel || !$streamChannel->getStreamSubscribes()->findKey($clientId)) {
                     $this->_stopClient($clientId, $publish['serverHost']);

diff --git a/library/CM/Stream/Cli.php b/library/CM/Stream/Cli.php
@@ -9,6 +9,32 @@ public function startMessageSynchronization() {
         CM_Stream_Message::getInstance()->startSynchronization();
     }
 
+    /**
+     * @param int     $streamChannelId
+     * @param CM_File $thumbnailSource
+     */
+    public function importVideoThumbnail($streamChannelId, CM_File $thumbnailSource) {
+        $streamChannel = CM_Model_StreamChannel_Video::factory($streamChannelId);
+        $thumbnailCount = $streamChannel->getThumbnailCount();
+        $thumbnailDestination = $streamChannel->getThumbnail($thumbnailCount + 1);
+        if (0 == $thumbnailCount) {
+            $thumbnailDestination->ensureParentDirectory();
+        }
+        $thumbnailSource->copyToFile($thumbnailDestination);
+        $streamChannel->setThumbnailCount($thumbnailCount + 1);
+    }
+
+    /**
+     * @param int     $streamChannelId
+     * @param CM_File $archiveSource
+     */
+    public function importVideoArchive($streamChannelId, CM_File $archiveSource) {
+        $streamChannelArchive = new CM_Model_StreamChannelArchive_Video($streamChannelId);
+        $archiveDestination = $streamChannelArchive->getVideo();
+        $archiveDestination->ensureParentDirectory();
+        $archiveSource->copyToFile($archiveDestination);
+    }
+
     public static function getPackageName() {
         return 'stream';
     }

diff --git a/library/CM/Stream/Video.php b/library/CM/Stream/Video.php
@@ -59,27 +59,25 @@ public function getAdapter() {
      * @param int    $start
      * @param int    $width
      * @param int    $height
-     * @param int    $thumbnailCount
      * @param string $data
      * @return int
      */
-    public static function rpc_publish($streamName, $clientKey, $start, $width, $height, $thumbnailCount, $data) {
+    public static function rpc_publish($streamName, $clientKey, $start, $width, $height, $data) {
         $request = CM_Request_Abstract::getInstance();
         $serverId = self::getInstance()->getAdapter()->getServerId($request);
 
-        $channelId = self::getInstance()->getAdapter()->publish($streamName, $clientKey, $start, $width, $height, $serverId, $thumbnailCount, $data);
+        $channelId = self::getInstance()->getAdapter()->publish($streamName, $clientKey, $start, $width, $height, $serverId, $data);
         return $channelId;
     }
 
     /**
      * @param string $streamName
-     * @param int    $thumbnailCount
      * @return bool
      */
-    public static function rpc_unpublish($streamName, $thumbnailCount) {
+    public static function rpc_unpublish($streamName) {
         $adapter = self::getInstance()->getAdapter();
         $adapter->getServerId(CM_Request_Abstract::getInstance());
-        $adapter->unpublish($streamName, $thumbnailCount);
+        $adapter->unpublish($streamName);
         return true;
     }
 

diff --git a/tests/library/CM/Model/StreamChannel/VideoTest.php b/tests/library/CM/Model/StreamChannel/VideoTest.php
@@ -130,5 +130,16 @@ public function testGetThumbnails() {
             $streamChannel->getId() . '-' . $streamChannel->getHash() . '-thumbs/2.png', $streamChannel->getId());
         $this->assertEquals(array($thumb1, $thumb2), $streamChannel->getThumbnails()->getItems());
     }
+
+    public function testGetThumbnail() {
+        /** @var CM_Model_StreamChannel_Video $streamChannel */
+        $streamChannel = CMTest_TH::createStreamChannel();
+        CMTest_TH::createStreamPublish(null, $streamChannel);
+        $thumbnail = $streamChannel->getThumbnail(3);
+        $this->assertInstanceOf('CM_File_UserContent', $thumbnail);
+        $this->assertSame(
+            'streamChannels/' . $streamChannel->getId() . '/' . $streamChannel->getId() . '-' . $streamChannel->getHash() . '-thumbs/3.png',
+            $thumbnail->getPathRelative());
+    }
 }
 
diff --git a/tests/library/CM/Model/StreamChannelArchive/VideoTest.php b/tests/library/CM/Model/StreamChannelArchive/VideoTest.php
@@ -79,6 +79,15 @@ public function testGetThumbnails() {
         $this->assertEquals(array($thumb1, $thumb2), $archive->getThumbnails()->getItems());
     }
 
+    public function testGetThumbnail() {
+        $archive = CMTest_TH::createStreamChannelVideoArchive();
+        $thumbnail = $archive->getThumbnail(3);
+        $this->assertInstanceOf('CM_File_UserContent', $thumbnail);
+        $this->assertSame(
+            'streamChannels/' . $archive->getId() . '/' . $archive->getId() . '-' . $archive->getHash() . '-thumbs/3.png',
+            $thumbnail->getPathRelative());
+    }
+
     public function testOnDelete() {
         /** @var CM_Model_StreamChannel_Video $streamChannel */
         $streamChannel = CMTest_TH::createStreamChannel();