tilderadio
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
4
0
Fork 0
Code Issues Releases Wiki Activity

List custom fields as selectable columns in the music files manager.

This commit is contained in:
Buster "Silver Eagle" Neece 2018-04-17 00:52:39 -05:00
parent 378948dc27
commit c9492827c5
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/Controller/Stations/Files/FilesController.php
View File

@ -32,11 +32,21 @@ class FilesController extends FilesControllerAbstract
$space_total = disk_total_space($media_dir);
$space_used = $space_total - $space_free;
// Get list of custom fields.
$custom_fields_raw = $this->em->createQuery('SELECT cf.id, cf.name FROM Entity\CustomField cf ORDER BY cf.name ASC')
->getArrayResult();
$custom_fields = [];
foreach($custom_fields_raw as $row) {
$custom_fields['media_custom_'.$row['id']] = $row['name'];
}
/** @var View $view */
$view = $request->getAttribute('view');
return $view->renderToResponse($response, 'stations/files/index', [
'playlists' => $playlists,
'custom_fields' => $custom_fields,
'space_free' => Utilities::bytes_to_text($space_free),
'space_used' => Utilities::bytes_to_text($space_used),
'space_total' => Utilities::bytes_to_text($space_total),
@ -117,9 +127,10 @@ class FilesController extends FilesControllerAbstract
if (is_dir($file_path)) {
$media_in_dir_raw = $this->em->createQuery('SELECT
partial sm.{id, unique_id, path, length, length_text, artist, title, album}, partial sp.{id, name}
partial sm.{id, unique_id, path, length, length_text, artist, title, album}, partial sp.{id, name}, partial smcf.{id, field_id, value}
FROM Entity\StationMedia sm
LEFT JOIN sm.playlists sp
LEFT JOIN sm.custom_fields smcf
WHERE sm.station_id = :station_id
AND sm.path LIKE :path')
->setParameter('station_id', $station_id)
@ -133,6 +144,11 @@ class FilesController extends FilesControllerAbstract
$playlists[] = $playlist_row['name'];
}
$custom_fields = [];
foreach($media_row['custom_fields'] as $custom_field) {
$custom_fields['custom_'.$custom_field['field_id']] = $custom_field['value'];
}
$media_in_dir[$media_row['path']] = [
'is_playable' => ($media_row['length'] !== 0),
'length' => $media_row['length'],
@ -145,7 +161,7 @@ class FilesController extends FilesControllerAbstract
'edit_url' => $this->url->named('stations:files:edit', ['station' => $station_id, 'id' => $media_row['id']]),
'play_url' => $this->url->named('stations:files:download', ['station' => $station_id]) . '?file=' . urlencode($media_row['path']),
'playlists' => $playlists,
];
] + $custom_fields;
}
// Search all recursive files

2
app/src/Entity/CustomField.php
View File

@ -54,7 +54,7 @@ class CustomField
*/
public function setName(string $name): void
{
$this->name = $this->_truncateString($name, 100);
$this->name = $this->_truncateString($name);
if (empty($this->short_name) && !empty($name)) {
$this->setShortName(Station::getStationShortName($name));

3
app/templates/stations/files/index.phtml
View File

@ -76,6 +76,9 @@ $assets
<th data-column-id="media_artist" data-visible="false"><?=__('Artist') ?></th>
<th data-column-id="media_album" data-visible="false"><?=__('Album') ?></th>
<th data-column-id="media_length" data-formatter="file_length"><?=__('Length') ?></th>
<?php foreach($custom_fields as $field_key => $field_label): ?>
<th data-column-id="<?=$field_key ?>" data-visible="false"><?=$this->e($field_label) ?></th>
<?php endforeach; ?>
<th data-column-id="size" data-formatter="file_size"><?=__('Size') ?></th>
<th data-column-id="mtime" data-formatter="file_mtime"><?=__('Modified') ?></th>
<th data-column-id="media_playlists" data-formatter="playlists"><?=__('Playlists') ?></th>