refactoring parameters

Author: fcamp

DependencyInjection/AxeleroAwsTranscoderExtension.php

@@ -21,8 +21,7 @@ public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
-        $container->setParameter('axelero_aws_transcoder.input_bucket', $config['input_bucket']);
-        $container->setParameter('axelero_aws_transcoder.output_bucket', $config['output_bucket']);
+        $container->setParameter('axelero_aws_transcoder.pipeline_id', $config['pipeline_id']);
         $container->setParameter('axelero_aws_transcoder.key', $config['key']);
         $container->setParameter('axelero_aws_transcoder.region', $config['region']);
         $container->setParameter('axelero_aws_transcoder.secret', $config['secret']);

DependencyInjection/Configuration.php

@@ -22,7 +22,7 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->children()
-                ->scalarNode('input_bucket')
+                ->scalarNode('pipeline_id')
                     ->isRequired()
             ->end()
                 ->scalarNode('key')
@@ -34,9 +34,6 @@ public function getConfigTreeBuilder()
                 ->scalarNode('region')
                     ->isRequired()
             ->end()
-                ->scalarNode('output_bucket')
-                    ->isRequired()
-            ->end()
         ;
 
         // Here you should define the parameters that are allowed to

Resources/config/services.xml

@@ -21,8 +21,7 @@
         </service>
 
         <service id="axelero_aws_transcoder.gummy" class="%axelero_aws_transcoder.class%">
-            <argument>%axelero_aws_transcoder.input_bucket%</argument>
-            <argument>%axelero_aws_transcoder.output_bucket%</argument>
+            <argument>%axelero_aws_transcoder.pipeline_id%</argument>
             <argument type="service" id="axelero_aws_transcoder.services.preset_provider"/>
             <argument type="service" id="axelero_aws_transcoder.client"/>
         </service>

Services/GummyTranscoder.php

@@ -15,17 +15,7 @@ class GummyTranscoder
     /**
      * @var string
      */
-    private $baseFolder;
-
-    /**
-     * @var string
-     */
-    private $inputBucket;
-
-    /**
-     * @var string
-     */
-    private $outputBucket;
+    private $pipelineId;
 
     /**
      * @var PresetProvider
@@ -34,29 +24,26 @@ class GummyTranscoder
 
     /**
      * GummyTranscoder constructor.
-     * @param $inputBucket
-     * @param $outputBucket
+     * @param string $pipelineId
      * @param \Axelero\AwsTranscoderBundle\Services\PresetProvider $presetProvider
      * @param ElasticTranscoderClient $client
      */
-    public function __construct($inputBucket, $outputBucket, PresetProvider $presetProvider, ElasticTranscoderClient $client)
+    public function __construct($pipelineId, PresetProvider $presetProvider, ElasticTranscoderClient $client)
     {
         $this->client = $client;
-        $this->inputBucket = $inputBucket;
-        $this->outputBucket = $outputBucket;
+        $this->pipelineId = $pipelineId;
         $this->presetProvider = $presetProvider;
     }
 
     /**
      * @param string $path the file path in the input bucket (the same path will be written used in the output one)
-     * @param string $pipelineId the pipeline id
      * @param array $outputs the Output arrays
      * @return \Guzzle\Service\Resource\Model
      */
-    public function encode($path, $pipelineId, array $outputs)
+    public function encode($path, array $outputs)
     {
         $result = $this->client->createJob([
-            'PipelineId' => $pipelineId,
+            'PipelineId' => $this->pipelineId,
             'Input' => [
                 'Key' => $this->cleanPath($path),
                 'FrameRate' => 'auto',
@@ -88,7 +75,7 @@ private function processOutputs($path, array $outputs)
             //if used a preset and no Key has been defined for output file
             //then the same path is used
             if ($detail && !$output['Key']) {
-                $output['Key'] = $this->cleanPath($info['dirname']) . '/' . $info['filename'] . '.' . $detail;
+                $output['Key'] = $this->cleanPath($info['dirname'] . '/' . $info['filename'] . '.' . $detail);
             }
         });