Merge branch 'release/1.0.9'

nystudio107 · Jan 25, 2018 · bca23d8 · bca23d8
2 parents 8b7f2fc + 6e8985d
commit bca23d8
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Transcoder Changelog
 
+## 1.0.9 - 2018.01.25
+### Changed
+* Handle Asset Volumes that use aliases
+* Updated DocBlock comments
+
 ## 1.0.8 - 2017.12.06
 ### Changed
 * Updated to require craftcms/cms `^3.0.0-RC1`

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "nystudio107/craft3-transcoder",
     "description": "Transcode video & audio files to various formats, and provide video thumbnails",
     "type": "craft-plugin",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php
@@ -45,6 +45,8 @@ class DefaultController extends Controller
      * from downloading things that are outside of the server root.
      *
      * @param $url
+     *
+     * @throws \yii\base\ExitException
      */
     public function actionDownloadFile($url)
     {

diff --git a/src/services/Transcode.php b/src/services/Transcode.php
@@ -83,6 +83,7 @@ class Transcode extends Component
      * @param $videoOptions array   of options for the video
      *
      * @return string       URL of the transcoded video or ""
+     * @throws Exception
      */
     public function getVideoUrl($filePath, $videoOptions): string
     {
@@ -201,6 +202,7 @@ public function getVideoUrl($filePath, $videoOptions): string
      * @param $thumbnailOptions array   of options for the thumbnail
      *
      * @return string           URL of the video thumbnail
+     * @throws Exception
      */
     public function getVideoThumbnailUrl($filePath, $thumbnailOptions): string
     {
@@ -262,6 +264,7 @@ public function getVideoThumbnailUrl($filePath, $thumbnailOptions): string
      * @param $audioOptions array of options for the audio file
      *
      * @return string       URL of the transcoded audio file or ""
+     * @throws Exception
      */
     public function getAudioUrl($filePath, $audioOptions): string
     {
@@ -357,6 +360,7 @@ public function getAudioUrl($filePath, $audioOptions): string
      * @param bool $summary
      *
      * @return array
+     * @throws Exception
      */
     public function getFileInfo($filePath, $summary = false): array
     {
@@ -427,6 +431,7 @@ public function getFileInfo($filePath, $summary = false): array
      * @param $videoOptions
      *
      * @return string
+     * @throws Exception
      */
     public function getVideoFilename($filePath, $videoOptions): string
     {
@@ -451,6 +456,7 @@ public function getVideoFilename($filePath, $videoOptions): string
      * @param $audioOptions
      *
      * @return string
+     * @throws Exception
      */
     public function getAudioFilename($filePath, $audioOptions): string
     {
@@ -478,6 +484,7 @@ public function getAudioFilename($filePath, $audioOptions): string
      * @param $options
      *
      * @return string
+     * @throws Exception
      */
     protected function getFilename($filePath, $options)
     {
@@ -539,7 +546,7 @@ protected function getAssetPath($filePath): string
             $filePath = $sourcePath . $folderPath . $asset->filename;
         }
 
-        return $filePath;
+        return Craft::getAlias($filePath);
     }
 
     /**

diff --git a/src/variables/TranscoderVariable.php b/src/variables/TranscoderVariable.php
@@ -12,7 +12,6 @@
 
 use nystudio107\transcoder\Transcoder;
 
-use Craft;
 use craft\helpers\UrlHelper;
 
 /**
@@ -33,6 +32,7 @@ class TranscoderVariable
      * @param $videoOptions
      *
      * @return string
+     * @throws \yii\base\Exception
      */
     public function getVideoUrl($filePath, $videoOptions): string
     {
@@ -48,6 +48,7 @@ public function getVideoUrl($filePath, $videoOptions): string
      * @param $thumbnailOptions
      *
      * @return string
+     * @throws \yii\base\Exception
      */
     public function getVideoThumbnailUrl($filePath, $thumbnailOptions): string
     {
@@ -64,6 +65,7 @@ public function getVideoThumbnailUrl($filePath, $thumbnailOptions): string
      * @param $audioOptions
      *
      * @return string
+     * @throws \yii\base\Exception
      */
     public function getAudioUrl($filePath, $audioOptions): string
     {
@@ -79,6 +81,7 @@ public function getAudioUrl($filePath, $audioOptions): string
      * @param bool $summary
      *
      * @return array
+     * @throws \yii\base\Exception
      */
     public function getFileInfo($filePath, $summary = false): array
     {
@@ -94,6 +97,7 @@ public function getFileInfo($filePath, $summary = false): array
      * @param $videoOptions
      *
      * @return string
+     * @throws \yii\base\Exception
      */
     public function getVideoProgressUrl($filePath, $videoOptions): string
     {
@@ -116,6 +120,7 @@ public function getVideoProgressUrl($filePath, $videoOptions): string
      * @param $audioOptions
      *
      * @return string
+     * @throws \yii\base\Exception
      */
     public function getAudioProgressUrl($filePath, $audioOptions): string
     {