Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Fieldtypes/Assets/Assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,19 @@ protected function getColumns()
->defaultVisibility(false)
->sortable(true);

$duration = Column::make('duration')
->label(__('Duration'))
->value('duration_formatted')
->visible(true)
->defaultVisibility(false)
->sortable(true);

$columns->put('basename', $basename);
$columns->put('size', $size);
$columns->put('last_modified', $lastModified);
$columns->put('width', $width);
$columns->put('height', $height);
$columns->put('duration', $duration);

$columns->setPreferred("assets.{$this->container()->handle()}.columns");

Expand Down
8 changes: 8 additions & 0 deletions src/Http/Controllers/CP/Assets/BrowserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,19 @@ public function setColumns($container)
->defaultVisibility(false)
->sortable(true);

$duration = Column::make('duration')
->label(__('Duration'))
->value('duration_formatted')
->visible(true)
->defaultVisibility(false)
->sortable(true);

$columns->put('basename', $basename);
$columns->put('size', $size);
$columns->put('last_modified', $lastModified);
$columns->put('width', $width);
$columns->put('height', $height);
$columns->put('duration', $duration);

$columns->setPreferred("assets.{$container->handle()}.columns");

Expand Down
1 change: 1 addition & 0 deletions src/Http/Resources/CP/Assets/FolderAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public function toArray($request)
'url' => $this->absoluteUrl(),
'width' => $this->width(),
'height' => $this->height(),
'duration_formatted' => $this->duration() ? Str::durationForHumans($this->duration()) : null,
'size_formatted' => Str::fileSizeForHumans($this->size(), 0),
'last_modified_relative' => $this->lastModified()->diffForHumans(),
'editable' => User::current()->can('edit', $this->resource),
Expand Down
8 changes: 8 additions & 0 deletions src/Http/Resources/CP/Assets/SearchedAssetsCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,19 @@ public function setColumns()
->defaultVisibility(false)
->sortable(true);

$duration = Column::make('duration')
->label(__('Duration'))
->value('duration_formatted')
->visible(true)
->defaultVisibility(false)
->sortable(true);

$columns->put('basename', $basename);
$columns->put('size', $size);
$columns->put('last_modified', $lastModified);
$columns->put('width', $width);
$columns->put('height', $height);
$columns->put('duration', $duration);

if ($key = $this->columnPreferenceKey) {
$columns->setPreferred($key);
Expand Down
8 changes: 8 additions & 0 deletions src/Support/Str.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,14 @@ public static function fileSizeForHumans($bytes, $decimals = 2)
return trans('statamic::messages.units.B', ['count' => $bytes]);
}

public static function durationForHumans($s)
{
$mins = floor($s / 60);
$secs = $s % 60;

return sprintf('%01d:%02d', $mins, $secs);
}

public static function timeForHumans($ms)
{
if ($ms < 1000) {
Expand Down
13 changes: 13 additions & 0 deletions tests/Support/StrTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,19 @@ public function it_gets_time_for_humans()
$this->assertEquals('1.57s', Str::timeForHumans(1570));
}

#[Test]
public function it_gets_duration_for_humans()
{
$this->assertEquals('0:00', Str::durationForHumans(0));
$this->assertEquals('0:01', Str::durationForHumans(1));
$this->assertEquals('0:12', Str::durationForHumans(12));
$this->assertEquals('0:59', Str::durationForHumans(59));
$this->assertEquals('1:00', Str::durationForHumans(60));
$this->assertEquals('2:01', Str::durationForHumans(121));
$this->assertEquals('16:40', Str::durationForHumans(1000));
$this->assertEquals('130:00', Str::durationForHumans(7800));
}

#[Test]
public function it_widonts()
{
Expand Down