Merge branch 'release/1.2.1' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Transcoder Changelog
 
+## 1.2.1 - 2018.08.23
+### Changed
+* Fixed namespacing issues
+
 ## 1.2.0 - 2018.08.22
 ### Added
 * Added the ability to encode to animated `.gif` files

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-transcoder",
     "description": "Transcode video & audio files to various formats, and provide video thumbnails",
     "type": "craft-plugin",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "keywords": [
         "craft",
         "cms",

src/assetbundles/transcoder/src/js/Transcoder.js

@@ -1,14 +1,7 @@
-/**
- * Image Optimize plugin for Craft CMS
- *
- * Image Optimize JS
- *
- * @author    nystudio107
- * @copyright Copyright (c) 2017 nystudio107
- * @link      https://nystudio107.com
- * @package   ImageOptimize
- * @since     1.2.0
- */
-
 // Import our CSS
 import styles from '../css/app.pcss';
+
+const main = async () => {
+};
+
+main().then({});

src/services/Transcode.php

@@ -187,7 +187,7 @@ public function getVideoUrl($filePath, $videoOptions): string
             }
 
             // If the video file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
-            if (file_exists($destVideoPath) && (filemtime($destVideoPath) >= filemtime($filePath))) {
+            if (file_exists($destVideoPath) && (@filemtime($destVideoPath) >= @filemtime($filePath))) {
                 $url = $settings['transcoderUrls']['video'] ?? $settings['transcoderUrls']['default'];
                 $result = Craft::getAlias($url).$destVideoFile;
             } else {
@@ -371,7 +371,7 @@ public function getAudioUrl($filePath, $audioOptions): string
             }
 
             // If the audio file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
-            if (file_exists($destAudioPath) && (filemtime($destAudioPath) >= filemtime($filePath))) {
+            if (file_exists($destAudioPath) && (@filemtime($destAudioPath) >= @filemtime($filePath))) {
                 $url = $settings['transcoderUrls']['audio'] ?? $settings['transcoderUrls']['default'];
                 $result = Craft::getAlias($url).$destAudioFile;
             } else {
@@ -614,7 +614,7 @@ public function getGifUrl($filePath, $gifOptions): string
             }
 
             // If the video file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
-            if (file_exists($destVideoPath) && (filemtime($destVideoPath) >= filemtime($filePath))) {
+            if (file_exists($destVideoPath) && (@filemtime($destVideoPath) >= @filemtime($filePath))) {
                 $url = $settings['transcoderUrls']['gif'] ?? $settings['transcoderUrls']['default'];
                 $result = Craft::getAlias($url).$destVideoFile;
             } else {

src/templates/_includes/macros.twig

@@ -8,13 +8,13 @@
 {%- endmacro %}
 
 {% macro includeCssModule(cssModuleName) -%}
-    {% from "image-optimize/_includes/include-css-module.twig" import includeCssModule %}
+    {% from "transcoder/_includes/include-css-module.twig" import includeCssModule %}
     {{ includeCssModule(cssModuleName) }}
 {%- endmacro includeCssModule %}
 
 {% macro includeJsModule(jsModuleName) -%}
-    {% from "image-optimize/_includes/include-modern-module.twig" import includeModernModule %}
-    {% from "image-optimize/_includes/include-legacy-module.twig" import includeLegacyModule %}
+    {% from "transcoder/_includes/include-modern-module.twig" import includeModernModule %}
+    {% from "transcoder/_includes/include-legacy-module.twig" import includeLegacyModule %}
     {# Browsers with ES module support load this file. #}
     {{ includeModernModule(jsModuleName) }}
     {# Older browsers load this file (and module-supporting #}

src/templates/_layouts/transcoder-cp.twig

@@ -3,12 +3,12 @@
 {% set welcomeJs = "welcome" %}
 {% set welcomeLegacyJs = "welcome-legacy" %}
 
-{% from "image-optimize/_includes/macros.twig" import includeJsModule %}
-{% from "image-optimize/_includes/macros.twig" import includeCssModule %}
+{% from "transcoder/_includes/macros.twig" import includeJsModule %}
+{% from "transcoder/_includes/macros.twig" import includeCssModule %}
 
 {% block head %}
     {{ parent() }}
-    {{ includeCssModule("imageoptimize") }}
-    {% include "image-optimize/_includes/safari-nomodule-fix.twig" %}
-    {{ includeJsModule("imageoptimize") }}
+    {{ includeCssModule("transcoder") }}
+    {% include "transcoder/_includes/safari-nomodule-fix.twig" %}
+    {{ includeJsModule("transcoder") }}
 {% endblock %}