From 666b18964f74a5e6d762b16857cd7123cc863b9e Mon Sep 17 00:00:00 2001 From: Shyim Date: Wed, 25 Apr 2018 19:05:00 +0200 Subject: [PATCH] Added simple Setup guide --- .../src/components/ReCast/Streams/List.vue | 3 +- .../components/ReCast/Streams/SetupStream.vue | 42 +++++++++++++++++++ public/theme/src/routes/routes.js | 6 +++ src/Controller/Streams.php | 6 ++- src/Entity/Queue.php | 2 +- 5 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 public/theme/src/components/ReCast/Streams/SetupStream.vue diff --git a/public/theme/src/components/ReCast/Streams/List.vue b/public/theme/src/components/ReCast/Streams/List.vue index a0eacef..2bbe402 100644 --- a/public/theme/src/components/ReCast/Streams/List.vue +++ b/public/theme/src/components/ReCast/Streams/List.vue @@ -12,7 +12,6 @@ Live Name Endpoints - Stream Key Action @@ -21,8 +20,8 @@ {{ stream.name }} {{ getProviders(stream) }} - {{ stream.streamKey }} + Setup Endpoints Edit Regenerate Stream Key diff --git a/public/theme/src/components/ReCast/Streams/SetupStream.vue b/public/theme/src/components/ReCast/Streams/SetupStream.vue new file mode 100644 index 0000000..17066fe --- /dev/null +++ b/public/theme/src/components/ReCast/Streams/SetupStream.vue @@ -0,0 +1,42 @@ + + + diff --git a/public/theme/src/routes/routes.js b/public/theme/src/routes/routes.js index 4b96556..f6909c6 100644 --- a/public/theme/src/routes/routes.js +++ b/public/theme/src/routes/routes.js @@ -11,6 +11,7 @@ import NotFound from '../components/GeneralViews/NotFoundPage.vue' import Overview from 'src/components/ReCast/Overview.vue' import ListStreams from 'src/components/ReCast/Streams/List.vue' import EditStream from 'src/components/ReCast/Streams/EditStream.vue' +import SetupStream from 'src/components/ReCast/Streams/SetupStream.vue' import ListEndpoints from 'src/components/ReCast/Endpoints/List.vue' import EditEndpoint from 'src/components/ReCast/Endpoints/EditEndpoint.vue' @@ -52,6 +53,11 @@ const routes = [ component: ListEndpoints, meta: {auth: true}, }, + { + path: 'streams/:id/setup', + component: SetupStream, + meta: {auth: true}, + }, { path: 'streams/:streamId/endpoints/:id', component: EditEndpoint, diff --git a/src/Controller/Streams.php b/src/Controller/Streams.php index ef27f6a..b9ef629 100644 --- a/src/Controller/Streams.php +++ b/src/Controller/Streams.php @@ -71,7 +71,11 @@ class Streams extends Controller return new Response('Access denied', 401); } - return new JsonResponse($stream); + $host = parse_url($this->container->getParameter('appHost'), PHP_URL_HOST); + $data = $stream->jsonSerialize(); + $data['streamUrl'] = sprintf('rtmp://%s/%s', $host, $stream->getUser()->getUsername() . '_' . $stream->getId()); + + return new JsonResponse($data); } /** diff --git a/src/Entity/Queue.php b/src/Entity/Queue.php index 6c4e689..cd4f53c 100644 --- a/src/Entity/Queue.php +++ b/src/Entity/Queue.php @@ -18,7 +18,7 @@ class Queue private $id; /** - * @ORM\Column(type="string", length=100, unique=true) + * @ORM\Column(type="string", length=100) * @var string */ private $task;