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

Switch to message queue playlist writing for all playlist changes.

This commit is contained in:
Buster "Silver Eagle" Neece 2019-10-29 15:58:55 -05:00
parent 0112568041
commit 6a9d351d64
No known key found for this signature in database
GPG Key ID: 6D9E12FF03411F4E
3 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Controller/Api/Stations/Files/BatchAction.php
View File

@ -69,6 +69,7 @@ class BatchAction
if ($media instanceof Entity\StationMedia) {
$em->remove($media);
$em->flush($media);
}
} catch (Exception $e) {
$errors[] = $file . ': ' . $e->getMessage();
@ -99,9 +100,11 @@ class BatchAction
$backend = $request->getStationBackend();
if ($backend instanceof Liquidsoap) {
foreach ($affected_playlists as $playlist) {
/** @var Entity\StationPlaylist $playlist */
$backend->writePlaylistFile($playlist);
foreach ($affected_playlists as $playlist_id => $playlist_row) {
// Instruct the message queue to start a new "write playlist to file" task.
$message = new WritePlaylistFileMessage;
$message->playlist_id = $playlist_id;
$messageQueue->produce($message);
}
}
break;
@ -129,7 +132,7 @@ class BatchAction
'name' => $playlist->getName(),
];
$affected_playlists[$playlist->getId()] = $playlist;
$affected_playlists[$playlist->getId()] = $playlist->getId();
$playlists[] = $playlist;
$playlist_weights[$playlist->getId()] = 0;
} else {
@ -139,7 +142,7 @@ class BatchAction
]);
if ($playlist instanceof Entity\StationPlaylist) {
$affected_playlists[$playlist->getId()] = $playlist;
$affected_playlists[$playlist->getId()] = $playlist->getId();
$playlists[] = $playlist;
$playlist_weights[$playlist->getId()] = $playlistMediaRepo->getHighestSongWeight($playlist);
}
@ -179,10 +182,10 @@ class BatchAction
$backend = $request->getStationBackend();
if ($backend instanceof Liquidsoap) {
foreach ($affected_playlists as $playlist) {
foreach ($affected_playlists as $playlist_id => $playlist_row) {
// Instruct the message queue to start a new "write playlist to file" task.
$message = new WritePlaylistFileMessage;
$message->playlist_id = $playlist->getId();
$message->playlist_id = $playlist_id;
$messageQueue->produce($message);
}
}

24
src/Controller/Api/Stations/FilesController.php
View File

@ -5,6 +5,8 @@ use App\Entity;
use App\Exception\ValidationException;
use App\Http\Response;
use App\Http\ServerRequest;
use App\Message\WritePlaylistFileMessage;
use App\MessageQueue;
use App\Radio\Adapters;
use App\Radio\Backend\Liquidsoap;
use App\Radio\Filesystem;
@ -28,6 +30,9 @@ class FilesController extends AbstractStationApiCrudController
/** @var Adapters */
protected $adapters;
/** @var MessageQueue */
protected $messageQueue;
/** @var Entity\Repository\CustomFieldRepository */
protected $custom_fields_repo;
@ -49,6 +54,7 @@ class FilesController extends AbstractStationApiCrudController
* @param ValidatorInterface $validator
* @param Filesystem $filesystem
* @param Adapters $adapters
* @param MessageQueue $messageQueue
* @param Entity\Repository\CustomFieldRepository $custom_fields_repo
* @param Entity\Repository\SongRepository $song_repo
* @param Entity\Repository\StationMediaRepository $media_repo
@ -61,6 +67,7 @@ class FilesController extends AbstractStationApiCrudController
ValidatorInterface $validator,
Filesystem $filesystem,
Adapters $adapters,
MessageQueue $messageQueue,
Entity\Repository\CustomFieldRepository $custom_fields_repo,
Entity\Repository\SongRepository $song_repo,
Entity\Repository\StationMediaRepository $media_repo,
@ -71,6 +78,7 @@ class FilesController extends AbstractStationApiCrudController
$this->filesystem = $filesystem;
$this->adapters = $adapters;
$this->messageQueue = $messageQueue;
$this->custom_fields_repo = $custom_fields_repo;
$this->media_repo = $media_repo;
@ -299,9 +307,11 @@ class FilesController extends AbstractStationApiCrudController
// Handle playlist changes.
$backend = $this->adapters->getBackendAdapter($station);
if ($backend instanceof Liquidsoap) {
foreach ($affected_playlists as $playlist) {
/** @var Entity\StationPlaylist $playlist */
$backend->writePlaylistFile($playlist);
foreach ($affected_playlists as $playlist_id => $playlist_row) {
// Instruct the message queue to start a new "write playlist to file" task.
$message = new WritePlaylistFileMessage;
$message->playlist_id = $playlist_id;
$this->messageQueue->produce($message);
}
}
}
@ -340,9 +350,11 @@ class FilesController extends AbstractStationApiCrudController
// Write new PLS playlist configuration.
$backend = $this->adapters->getBackendAdapter($station);
if ($backend instanceof Liquidsoap) {
foreach ($affected_playlists as $playlist) {
/** @var Entity\StationPlaylist $playlist */
$backend->writePlaylistFile($playlist);
foreach ($affected_playlists as $playlist_id => $playlist_row) {
// Instruct the message queue to start a new "write playlist to file" task.
$message = new WritePlaylistFileMessage;
$message->playlist_id = $playlist_id;
$this->messageQueue->produce($message);
}
}

5
src/Entity/Repository/StationPlaylistMediaRepository.php
View File

@ -93,7 +93,10 @@ class StationPlaylistMediaRepository extends Repository
foreach ($playlists as $row) {
/** @var Entity\StationPlaylistMedia $row */
$playlist = $row->getPlaylist();
$affected_playlists[$playlist->getId()] = $playlist;
$affected_playlists[$playlist->getId()] = $playlist->getId();
$this->em->detach($row);
$this->em->detach($playlist);
}
// Clear the playback queue.