From 178584220adde1eea2dc16b25ccb6f7e6a5868ed Mon Sep 17 00:00:00 2001
From: Norbaev <timnrbv@gmail.com>
Date: Wed, 26 Jun 2024 15:50:03 +0500
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20getNowplaying=20=D0=B2=D0=BD?=
 =?UTF-8?q?=D1=83=D1=82=D1=80=D1=8C=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/.env.development          |  2 +-
 client/src/components/player.vue |  5 ++++-
 client/src/services/app.js       | 17 +++++++++++++++++
 client/src/services/audio.js     |  9 ++++++++-
 client/src/settings/index.js     |  2 +-
 client/src/store/index.js        |  2 --
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/client/.env.development b/client/.env.development
index 13507e3..fd0530c 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -8,7 +8,7 @@ ROBOTS_ALLOW=
 ROBOTS_DISALLOW=["/"]
 SERVICE_SELF_URL=//it-radio.flexidev.ru
 SERVICE_URL=//it-radio.flexidev.ru
-SERVICE_URL_AUDIO=//azuracast.itradio.team
+SERVICE_URL_AUDIO=//82.97.242.49:10084
 SERVICE_PROTOCOL=http
 SERVICE_PORT=8000
 SERVICE_API=/api
diff --git a/client/src/components/player.vue b/client/src/components/player.vue
index 1436dbb..709e1bf 100644
--- a/client/src/components/player.vue
+++ b/client/src/components/player.vue
@@ -159,7 +159,7 @@ export default {
     this.connectionPlayer();
   },
   mounted() {
-    console.log(this.currentPlay);
+    this.initializationInfo();
     this.$store.dispatch('initPlayer');
     if (this.user?.id) {
       this.checkSongIsFavorite();
@@ -188,6 +188,9 @@ export default {
     }
   },
   methods: {
+    async initializationInfo() {
+      return app.getNowplaying().then((responce) => responce.now_playing.song);
+    },
     connectionPlayer() {
       if (this.connection) {
         this.connection.removePlay();
diff --git a/client/src/services/app.js b/client/src/services/app.js
index dfee8cb..f0c3050 100644
--- a/client/src/services/app.js
+++ b/client/src/services/app.js
@@ -1,6 +1,8 @@
 import { urlPath as settings } from '@/settings';
 import { REST, RESTError } from './rest';
 
+// запросы на сервер Django
+
 export default class extends REST {
   static get settings() {
     return settings;
@@ -213,4 +215,19 @@ export default class extends REST {
         throw new RESTError(error, 'Ошибка при получении плейлистов');
       });
   }
+
+  static getNowplaying(station, params) {
+    return this._get('/radio/song/get_nowplaying/', params, {})
+      .then((data) => {
+        return data;
+      })
+      .catch((error) => {
+        throw new RESTError(
+          error,
+          'Ошибка при получении информации о текущем треке',
+        );
+      });
+  }
 }
+
+// console.log(Django.getNowplaying());
diff --git a/client/src/services/audio.js b/client/src/services/audio.js
index 3907068..ed180db 100644
--- a/client/src/services/audio.js
+++ b/client/src/services/audio.js
@@ -1,13 +1,18 @@
-import { urlPathAudio as settings, urlPathAudio } from '@/settings';
+import { urlPathAudio as settings } from '@/settings';
 import { REST, RESTError } from './rest';
 
+// запросы на AzuraCast
+
 export default class extends REST {
+  connection = {};
+
   static get settings() {
     return settings;
   }
 
   init() {
     const sseBaseUri = `${settings}/api/live/nowplaying/sse`;
+    // console.log('sseBaseUri', sseBaseUri);
     const sseUriParams = new URLSearchParams({
       cf_connect: JSON.stringify({
         subs: {
@@ -15,6 +20,7 @@ export default class extends REST {
         },
       }),
     });
+    // console.log('sseUriParams', sseUriParams.toString());
     this.connection = new EventSource(
       sseBaseUri + '?' + sseUriParams.toString(),
     );
@@ -58,6 +64,7 @@ export default class extends REST {
     // return this._get(`station/${station}/playlists`, params, {}).then((data) => {
     return this._get(`radio.mp3`, params, {})
       .then((data) => {
+        console.log(data);
         return data;
       })
       .catch((error) => {
diff --git a/client/src/settings/index.js b/client/src/settings/index.js
index 15eeedb..705a3fc 100644
--- a/client/src/settings/index.js
+++ b/client/src/settings/index.js
@@ -41,5 +41,5 @@ const robotsTxt = {
     },
   ],
 };
-
+console.log(urlPath);
 export { selfUrl, ajax, cache, urlPath, urlPathAudio, selfPath, robotsTxt };
diff --git a/client/src/store/index.js b/client/src/store/index.js
index 3d1c56c..52ed48e 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -67,7 +67,6 @@ export default createStore({
       state.player.target.preload = 'auto';
       state.player.target.controls = true;
       state.player.target.volume = 0.5;
-      console.log('initPlayer', state.player.target);
     },
     changePlayer(state, params) {
       const awaitPlay = () => {
@@ -84,7 +83,6 @@ export default createStore({
 
       state.player.target.src = params;
       state.player.src = params;
-      console.log(state.player.target.src);
       // state.currentPlay.isLoader = true;
       state.player.target.addEventListener('canplaythrough', awaitPlay);
     },