Skip to content

Commit

Permalink
feat: add support for tagging (#17)
Browse files Browse the repository at this point in the history
* feat: Add Tagging

* Apply fixes from StyleCI (#18)

* fix constructor

* tags passed as an array
  • Loading branch information
glennmichael123 committed May 15, 2021
1 parent 0b4010f commit 2884ad2
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/Contracts/Converter.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function cancelJob(string $id);
* @param int $priority
* @return \Aws\Result
*/
public function createJob(array $settings, array $metaData, int $priority);
public function createJob(array $settings, array $metaData, array $tags, int $priority);

/**
* Gets the job.
Expand Down
3 changes: 2 additions & 1 deletion src/Converters/MediaConvert.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,14 @@ public function cancelJob(string $id)
* @param int $priority
* @return \Aws\Result
*/
public function createJob(array $settings, array $metaData = [], int $priority = 0)
public function createJob(array $settings, array $metaData = [], array $tags = [], int $priority = 0)
{
return $this->client->createJob([
'Role' => config('media-converter.iam_arn'),
'Settings' => $settings,
'Queue' => config('media-converter.queue_arn'),
'UserMetadata' => $metaData,
'Tags' => $tags,
'StatusUpdateInterval' => $this->getStatusUpdateInterval(),
'Priority' => $priority,
]);
Expand Down
2 changes: 1 addition & 1 deletion src/Facades/MediaConvert.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @method static \Meema\MediaConverter\Converters\MediaConvert withThumbnails(int $framerateNumerator, int $framerateDenominator, int $maxCaptures, $width = null, $nameModifier = null, $imageQuality = 80)
* @method static \Aws\Result saveTo(string $s3Path, $s3bucket = null)
* @method static \Aws\Result cancelJob(string $id)
* @method static \Aws\Result createJob(array $settings, array $metaData = [], int $priority = 0)
* @method static \Aws\Result createJob(array $settings, array $metaData = [], array $tags = [], int $priority = 0)
* @method static \Aws\Result getJob(string $id)
* @method static \Aws\Result listJobs(array $options)
*/
Expand Down
18 changes: 16 additions & 2 deletions src/Jobs/CreateVideoConversion.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,32 @@ class CreateVideoConversion implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

/**
* @var array
*/
private array $jobSettings;

/**
* @var int
*/
private int $mediaId;

/**
* @var array
*/
private array $tags;

/**
* Create a new job instance.
*
* @param $jobSettings
* @param $tags
* @param $mediaId
*/
public function __construct($jobSettings, $mediaId = null)
public function __construct($jobSettings, $tags, $mediaId = null)
{
$this->jobSettings = $jobSettings;
$this->tags = $tags;

if ($mediaId) {
$this->mediaId = $mediaId;
Expand All @@ -40,11 +53,12 @@ public function __construct($jobSettings, $mediaId = null)
public function handle()
{
$metaData = [];
$tags = $this->tags;

if ($this->mediaId) {
$metaData = ['model_id' => $this->mediaId];
}

MediaConvert::createJob($this->jobSettings, $metaData);
MediaConvert::createJob($this->jobSettings, $metaData, $tags);
}
}

0 comments on commit 2884ad2

Please sign in to comment.