From 6e1fbf6b169552a7e8605d3a72293aa6ce2afc84 Mon Sep 17 00:00:00 2001 From: Norbaev Date: Fri, 28 Jun 2024 09:41:56 +0500 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20getPlaying.=20=D0=94=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BA=D0=B0=D1=81=D1=82=D0=BE=D0=BC?= =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=BE?= =?UTF-8?q?=20=D0=B2=20.eslintrc.cjs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/.eslintrc.cjs | 3 +++ client/src/components/player.vue | 13 +++++++------ client/src/services/audio.js | 3 +-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/client/.eslintrc.cjs b/client/.eslintrc.cjs index 91c823b..32b5b72 100644 --- a/client/.eslintrc.cjs +++ b/client/.eslintrc.cjs @@ -83,5 +83,8 @@ module.exports = { 'vue/multi-word-component-names': 'off', // allow debugger during development only 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + + // Custom + 'no-console': 'warn', }, }; diff --git a/client/src/components/player.vue b/client/src/components/player.vue index 6546f4f..cfb7a93 100644 --- a/client/src/components/player.vue +++ b/client/src/components/player.vue @@ -239,20 +239,21 @@ export default { getPlaying(e) { // console.log('getPlaying', e); const jsonData = JSON.parse(e.data); - console.log('jsonData', jsonData); + // console.log('jsonData', jsonData); const data = // Второй ответ jsonData?.pub?.data || // Первый ответ jsonData?.connect?.subs?.['station:it-radio']?.publications?.[0]?.data; - console.log('getPlaying', data); + // console.log('getPlaying', data); if (!data) return; if (this.currentPlay.live) { const dataUrl = data.np.station.listen_url; - if (data.np.station.listen_url !== this.player.target.src) { - console.log('data.np.station.listen_url', data.np.station.listen_url); - this.$store.dispatch('changePlayer', data.np.station.listen_url); + const playerUrl = this.player.target.src; + if (dataUrl !== playerUrl) { + // console.log('data.np.station.listen_url', dataUrl); + this.$store.dispatch('changePlayer', dataUrl); console.log(this.player); const params = { ...this.currentPlay, @@ -262,9 +263,9 @@ export default { live: true, currentIndex: null, }; + console.log('params in getPlaying ', params); delete params.unique_id; this.$store.dispatch('setCurrentPlay', params); - console.log(this.$store.state); } } }, diff --git a/client/src/services/audio.js b/client/src/services/audio.js index 6ab2f17..08abe19 100644 --- a/client/src/services/audio.js +++ b/client/src/services/audio.js @@ -25,7 +25,7 @@ export default class extends REST { sseBaseUri + '?' + sseUriParams.toString(), ); // window.connection = this.connection; - this.connection.onopen = (e) => console.log('connected', e); + // this.connection.onopen = (e) => console.log('connected', e); } removePlay() { @@ -66,7 +66,6 @@ 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) => {