+
-
+
-
+
diff --git a/src/api/album.js b/src/api/album.js
index ef39d14..18425d4 100644
--- a/src/api/album.js
+++ b/src/api/album.js
@@ -1,5 +1,6 @@
-import request from "@/utils/request";
-import { mapTrackPlayableStatus } from "@/utils/common";
+import request from '@/utils/request';
+import { mapTrackPlayableStatus } from '@/utils/common';
+import { cacheAlbum, getAlbumFromCache } from '@/utils/db';
/**
* 获取专辑内容
@@ -7,15 +8,23 @@ import { mapTrackPlayableStatus } from "@/utils/common";
* @param {number} id
*/
export function getAlbum(id) {
- return request({
- url: "/album",
- method: "get",
- params: {
- id,
- },
- }).then((data) => {
- data.songs = mapTrackPlayableStatus(data.songs);
- return data;
+ const fetchLatest = () => {
+ return request({
+ url: '/album',
+ method: 'get',
+ params: {
+ id,
+ },
+ }).then(data => {
+ cacheAlbum(id, data);
+ data.songs = mapTrackPlayableStatus(data.songs);
+ return data;
+ });
+ };
+ fetchLatest();
+
+ return getAlbumFromCache(id).then(result => {
+ return result ?? fetchLatest();
});
}
@@ -32,8 +41,8 @@ export function getAlbum(id) {
*/
export function newAlbums(params) {
return request({
- url: "/album/new",
- method: "get",
+ url: '/album/new',
+ method: 'get',
params,
});
}
@@ -46,8 +55,8 @@ export function newAlbums(params) {
*/
export function albumDynamicDetail(id) {
return request({
- url: "/album/detail/dynamic",
- method: "get",
+ url: '/album/detail/dynamic',
+ method: 'get',
params: { id, timestamp: new Date().getTime() },
});
}
@@ -63,8 +72,8 @@ export function albumDynamicDetail(id) {
*/
export function likeAAlbum(params) {
return request({
- url: "/album/sub",
- method: "post",
+ url: '/album/sub',
+ method: 'post',
params,
});
}
diff --git a/src/api/artist.js b/src/api/artist.js
index 31b0742..925df45 100644
--- a/src/api/artist.js
+++ b/src/api/artist.js
@@ -1,5 +1,7 @@
-import request from "@/utils/request";
-import { mapTrackPlayableStatus } from "@/utils/common";
+import request from '@/utils/request';
+import { mapTrackPlayableStatus } from '@/utils/common';
+import { isAccountLoggedIn } from '@/utils/auth';
+import { getTrackDetail } from '@/api/track';
/**
* 获取歌手单曲
@@ -8,13 +10,19 @@ import { mapTrackPlayableStatus } from "@/utils/common";
*/
export function getArtist(id) {
return request({
- url: "/artists",
- method: "get",
+ url: '/artists',
+ method: 'get',
params: {
id,
timestamp: new Date().getTime(),
},
- }).then((data) => {
+ }).then(async data => {
+ if (!isAccountLoggedIn()) {
+ const trackIDs = data.hotSongs.map(t => t.id);
+ const tracks = await getTrackDetail(trackIDs.join(','));
+ data.hotSongs = tracks.songs;
+ return data;
+ }
data.hotSongs = mapTrackPlayableStatus(data.hotSongs);
return data;
});
@@ -33,8 +41,8 @@ export function getArtist(id) {
*/
export function getArtistAlbum(params) {
return request({
- url: "/artist/album",
- method: "get",
+ url: '/artist/album',
+ method: 'get',
params,
});
}
@@ -50,12 +58,14 @@ export function getArtistAlbum(params) {
* @param {number=} type
*/
export function toplistOfArtists(type = null) {
+ let params = {};
+ if (type) {
+ params.type = type;
+ }
return request({
- url: "/toplist/artist",
- method: "get",
- params: {
- type,
- },
+ url: '/toplist/artist',
+ method: 'get',
+ params,
});
}
/**
@@ -67,8 +77,8 @@ export function toplistOfArtists(type = null) {
*/
export function artistMv(params) {
return request({
- url: "/artist/mv",
- method: "get",
+ url: '/artist/mv',
+ method: 'get',
params,
});
}
@@ -84,8 +94,8 @@ export function artistMv(params) {
*/
export function followAArtist(params) {
return request({
- url: "/artist/sub",
- method: "post",
+ url: '/artist/sub',
+ method: 'post',
params,
});
}
@@ -98,8 +108,8 @@ export function followAArtist(params) {
*/
export function similarArtists(id) {
return request({
- url: "/simi/artist",
- method: "post",
+ url: '/simi/artist',
+ method: 'post',
params: { id },
});
}
diff --git a/src/api/auth.js b/src/api/auth.js
index 461ac01..294f551 100644
--- a/src/api/auth.js
+++ b/src/api/auth.js
@@ -1,4 +1,4 @@
-import request from "@/utils/request";
+import request from '@/utils/request';
/**
* 手机登录
@@ -14,11 +14,12 @@ import request from "@/utils/request";
*/
export function loginWithPhone(params) {
return request({
- url: "/login/cellphone",
- method: "post",
+ url: '/login/cellphone',
+ method: 'post',
params,
});
}
+
/**
* 邮箱登录
* - email: 163 网易邮箱
@@ -31,12 +32,60 @@ export function loginWithPhone(params) {
*/
export function loginWithEmail(params) {
return request({
- url: "/login",
- method: "post",
+ url: '/login',
+ method: 'post',
params,
});
}
+/**
+ * 二维码key生成接口
+ */
+export function loginQrCodeKey() {
+ return request({
+ url: '/login/qr/key',
+ method: 'get',
+ params: {
+ timestamp: new Date().getTime(),
+ },
+ });
+}
+
+/**
+ * 二维码生成接口
+ * 说明: 调用此接口传入上一个接口生成的key可生成二维码图片的base64和二维码信息,
+ * 可使用base64展示图片,或者使用二维码信息内容自行使用第三方二维码生产库渲染二维码
+ * @param {Object} params
+ * @param {string} params.key
+ * @param {string=} params.qrimg 传入后会额外返回二维码图片base64编码
+ */
+export function loginQrCodeCreate(params) {
+ return request({
+ url: '/login/qr/create',
+ method: 'get',
+ params: {
+ ...params,
+ timestamp: new Date().getTime(),
+ },
+ });
+}
+
+/**
+ * 二维码检测扫码状态接口
+ * 说明: 轮询此接口可获取二维码扫码状态,800为二维码过期,801为等待扫码,802为待确认,803为授权登录成功(803状态码下会返回cookies)
+ * @param {string} key
+ */
+export function loginQrCodeCheck(key) {
+ return request({
+ url: '/login/qr/check',
+ method: 'get',
+ params: {
+ key,
+ timestamp: new Date().getTime(),
+ },
+ });
+}
+
/**
* 刷新登录
* 说明 : 调用此接口 , 可刷新登录状态
@@ -44,8 +93,8 @@ export function loginWithEmail(params) {
*/
export function refreshCookie() {
return request({
- url: "/login/refresh",
- method: "post",
+ url: '/login/refresh',
+ method: 'post',
});
}
@@ -55,7 +104,7 @@ export function refreshCookie() {
*/
export function logout() {
return request({
- url: "/logout",
- method: "post",
+ url: '/logout',
+ method: 'post',
});
}
diff --git a/src/api/lastfm.js b/src/api/lastfm.js
new file mode 100644
index 0000000..41ad9c5
--- /dev/null
+++ b/src/api/lastfm.js
@@ -0,0 +1,80 @@
+// Last.fm API documents 👉 https://www.last.fm/api
+
+import axios from 'axios';
+import md5 from 'crypto-js/md5';
+
+const apiKey = process.env.VUE_APP_LASTFM_API_KEY;
+const apiSharedSecret = process.env.VUE_APP_LASTFM_API_SHARED_SECRET;
+const baseUrl = window.location.origin;
+const url = 'https://ws.audioscrobbler.com/2.0/';
+
+const sign = params => {
+ const sortParamsKeys = Object.keys(params).sort();
+ const sortedParams = sortParamsKeys.reduce((acc, key) => {
+ acc[key] = params[key];
+ return acc;
+ }, {});
+ let signature = '';
+ for (const [key, value] of Object.entries(sortedParams)) {
+ signature += `${key}${value}`;
+ }
+ return md5(signature + apiSharedSecret).toString();
+};
+
+export function auth() {
+ const url = process.env.IS_ELECTRON
+ ? `https://www.last.fm/api/auth/?api_key=${apiKey}&cb=${baseUrl}/#/lastfm/callback`
+ : `https://www.last.fm/api/auth/?api_key=${apiKey}&cb=${baseUrl}/lastfm/callback`;
+ window.open(url);
+}
+
+export function authGetSession(token) {
+ const signature = md5(
+ `api_key${apiKey}methodauth.getSessiontoken${token}${apiSharedSecret}`
+ ).toString();
+ return axios({
+ url,
+ method: 'GET',
+ params: {
+ method: 'auth.getSession',
+ format: 'json',
+ api_key: apiKey,
+ api_sig: signature,
+ token,
+ },
+ });
+}
+
+export function trackUpdateNowPlaying(params) {
+ params.api_key = apiKey;
+ params.method = 'track.updateNowPlaying';
+ params.sk = JSON.parse(localStorage.getItem('lastfm'))['key'];
+ const signature = sign(params);
+
+ return axios({
+ url,
+ method: 'POST',
+ params: {
+ ...params,
+ api_sig: signature,
+ format: 'json',
+ },
+ });
+}
+
+export function trackScrobble(params) {
+ params.api_key = apiKey;
+ params.method = 'track.scrobble';
+ params.sk = JSON.parse(localStorage.getItem('lastfm'))['key'];
+ const signature = sign(params);
+
+ return axios({
+ url,
+ method: 'POST',
+ params: {
+ ...params,
+ api_sig: signature,
+ format: 'json',
+ },
+ });
+}
diff --git a/src/api/mv.js b/src/api/mv.js
index f294785..ecd2b10 100644
--- a/src/api/mv.js
+++ b/src/api/mv.js
@@ -1,4 +1,4 @@
-import request from "@/utils/request";
+import request from '@/utils/request';
/**
* 获取 mv 数据
@@ -9,8 +9,8 @@ import request from "@/utils/request";
*/
export function mvDetail(mvid) {
return request({
- url: "/mv/detail",
- method: "get",
+ url: '/mv/detail',
+ method: 'get',
params: {
mvid,
timestamp: new Date().getTime(),
@@ -30,8 +30,8 @@ export function mvDetail(mvid) {
*/
export function mvUrl(params) {
return request({
- url: "/mv/url",
- method: "get",
+ url: '/mv/url',
+ method: 'get',
params,
});
}
@@ -43,8 +43,8 @@ export function mvUrl(params) {
*/
export function simiMv(mvid) {
return request({
- url: "/simi/mv",
- method: "get",
+ url: '/simi/mv',
+ method: 'get',
params: { mvid },
});
}
@@ -62,8 +62,8 @@ export function simiMv(mvid) {
export function likeAMV(params) {
params.timestamp = new Date().getTime();
return request({
- url: "/mv/sub",
- method: "post",
+ url: '/mv/sub',
+ method: 'post',
params,
});
}
diff --git a/src/api/others.js b/src/api/others.js
index d1027c1..5c3cd63 100644
--- a/src/api/others.js
+++ b/src/api/others.js
@@ -1,5 +1,5 @@
-import request from "@/utils/request";
-import { mapTrackPlayableStatus } from "@/utils/common";
+import request from '@/utils/request';
+import { mapTrackPlayableStatus } from '@/utils/common';
/**
* 搜索
@@ -18,12 +18,33 @@ import { mapTrackPlayableStatus } from "@/utils/common";
*/
export function search(params) {
return request({
- url: "/search",
- method: "get",
+ url: '/search',
+ method: 'get',
params,
- }).then((data) => {
+ }).then(data => {
if (data.result?.song !== undefined)
data.result.song.songs = mapTrackPlayableStatus(data.result.song.songs);
return data;
});
}
+
+export function personalFM() {
+ return request({
+ url: '/personal_fm',
+ method: 'get',
+ params: {
+ timestamp: new Date().getTime(),
+ },
+ });
+}
+
+export function fmTrash(id) {
+ return request({
+ url: '/fm_trash',
+ method: 'post',
+ params: {
+ timestamp: new Date().getTime(),
+ id,
+ },
+ });
+}
diff --git a/src/api/playlist.js b/src/api/playlist.js
index b0e5994..08177ea 100644
--- a/src/api/playlist.js
+++ b/src/api/playlist.js
@@ -1,5 +1,5 @@
-import request from "@/utils/request";
-import { mapTrackPlayableStatus } from "@/utils/common";
+import request from '@/utils/request';
+import { mapTrackPlayableStatus } from '@/utils/common';
/**
* 推荐歌单
@@ -11,8 +11,8 @@ import { mapTrackPlayableStatus } from "@/utils/common";
*/
export function recommendPlaylist(params) {
return request({
- url: "/personalized",
- method: "get",
+ url: '/personalized',
+ method: 'get',
params,
});
}
@@ -24,9 +24,12 @@ export function recommendPlaylist(params) {
*/
export function dailyRecommendPlaylist(params) {
return request({
- url: "/recommend/resource",
- method: "get",
- params,
+ url: '/recommend/resource',
+ method: 'get',
+ params: {
+ params,
+ timestamp: Date.now(),
+ },
});
}
/**
@@ -43,14 +46,16 @@ export function getPlaylistDetail(id, noCache = false) {
let params = { id };
if (noCache) params.timestamp = new Date().getTime();
return request({
- url: "/playlist/detail",
- method: "get",
+ url: '/playlist/detail',
+ method: 'get',
params,
- }).then((data) => {
- data.playlist.tracks = mapTrackPlayableStatus(
- data.playlist.tracks,
- data.privileges || []
- );
+ }).then(data => {
+ if (data.playlist) {
+ data.playlist.tracks = mapTrackPlayableStatus(
+ data.playlist.tracks,
+ data.privileges || []
+ );
+ }
return data;
});
}
@@ -67,8 +72,8 @@ export function getPlaylistDetail(id, noCache = false) {
*/
export function highQualityPlaylist(params) {
return request({
- url: "/top/playlist/highquality",
- method: "get",
+ url: '/top/playlist/highquality',
+ method: 'get',
params,
});
}
@@ -86,8 +91,8 @@ export function highQualityPlaylist(params) {
*/
export function topPlaylist(params) {
return request({
- url: "/top/playlist",
- method: "get",
+ url: '/top/playlist',
+ method: 'get',
params,
});
}
@@ -98,8 +103,8 @@ export function topPlaylist(params) {
*/
export function playlistCatlist() {
return request({
- url: "/playlist/catlist",
- method: "get",
+ url: '/playlist/catlist',
+ method: 'get',
});
}
@@ -109,8 +114,8 @@ export function playlistCatlist() {
*/
export function toplists() {
return request({
- url: "/toplist",
- method: "get",
+ url: '/toplist',
+ method: 'get',
});
}
@@ -126,8 +131,8 @@ export function toplists() {
export function subscribePlaylist(params) {
params.timestamp = new Date().getTime();
return request({
- url: "/playlist/subscribe",
- method: "post",
+ url: '/playlist/subscribe',
+ method: 'post',
params,
});
}
@@ -140,8 +145,8 @@ export function subscribePlaylist(params) {
*/
export function deletePlaylist(id) {
return request({
- url: "/playlist/delete",
- method: "post",
+ url: '/playlist/delete',
+ method: 'post',
params: { id },
});
}
@@ -160,8 +165,8 @@ export function deletePlaylist(id) {
export function createPlaylist(params) {
params.timestamp = new Date().getTime();
return request({
- url: "/playlist/create",
- method: "post",
+ url: '/playlist/create',
+ method: 'post',
params,
});
}
@@ -178,8 +183,47 @@ export function createPlaylist(params) {
export function addOrRemoveTrackFromPlaylist(params) {
params.timestamp = new Date().getTime();
return request({
- url: "/playlist/tracks",
- method: "post",
+ url: '/playlist/tracks',
+ method: 'post',
+ params,
+ });
+}
+
+/**
+ * 每日推荐歌曲
+ * 说明 : 调用此接口 , 可获得每日推荐歌曲 ( 需要登录 )
+ * @param {Object} params
+ * @param {string} params.op
+ * @param {string} params.pid
+ */
+export function dailyRecommendTracks() {
+ return request({
+ url: '/recommend/songs',
+ method: 'get',
+ params: { timestamp: new Date().getTime() },
+ }).then(result => {
+ result.data.dailySongs = mapTrackPlayableStatus(
+ result.data.dailySongs,
+ result.data.privileges
+ );
+ return result;
+ });
+}
+
+/**
+ * 心动模式/智能播放
+ * 说明 : 登录后调用此接口 , 可获取心动模式/智能播放列表 必选参数 : id : 歌曲 id
+ * - id : 歌曲 id
+ * - pid : 歌单 id
+ * - sid : 要开始播放的歌曲的 id (可选参数)
+ * @param {Object} params
+ * @param {number=} params.id
+ * @param {number=} params.pid
+ */
+export function intelligencePlaylist(params) {
+ return request({
+ url: '/playmode/intelligence/list',
+ method: 'get',
params,
});
}
diff --git a/src/api/track.js b/src/api/track.js
index 43a7d2a..490c91c 100644
--- a/src/api/track.js
+++ b/src/api/track.js
@@ -1,6 +1,13 @@
-import store from "@/store";
-import request from "@/utils/request";
-import { mapTrackPlayableStatus } from "@/utils/common";
+import store from '@/store';
+import request from '@/utils/request';
+import { mapTrackPlayableStatus } from '@/utils/common';
+import {
+ cacheTrackDetail,
+ getTrackDetailFromCache,
+ cacheLyric,
+ getLyricFromCache,
+} from '@/utils/db';
+
/**
* 获取音乐 url
* 说明 : 使用歌单详情接口后 , 能得到的音乐的 id, 但不能得到的音乐 url, 调用此接口, 传入的音乐 id( 可多个 , 用逗号隔开 ), 可以获取对应的音乐的 url,
@@ -8,51 +15,85 @@ import { mapTrackPlayableStatus } from "@/utils/common";
* @param {string} id - 音乐的 id，例如 id=405998841,33894312
*/
export function getMP3(id) {
- let br =
- store.state.settings?.musicQuality !== undefined
- ? store.state.settings.musicQuality
- : 320000;
+ const getBr = () => {
+ // 当返回的 quality >= 400000时，就会优先返回 hi-res
+ const quality = store.state.settings?.musicQuality ?? '320000';
+ return quality === 'flac' ? '350000' : quality;
+ };
+
return request({
- url: "/song/url",
- method: "get",
+ url: '/song/url',
+ method: 'get',
params: {
id,
- br,
+ br: getBr(),
},
});
}
+
/**
* 获取歌曲详情
* 说明 : 调用此接口 , 传入音乐 id(支持多个 id, 用 , 隔开), 可获得歌曲详情(注意:歌曲封面现在需要通过专辑内容接口获取)
* @param {string} ids - 音乐 id, 例如 ids=405998841,33894312
*/
export function getTrackDetail(ids) {
- return request({
- url: "/song/detail",
- method: "get",
- params: {
- ids,
- },
- }).then((data) => {
- data.songs = mapTrackPlayableStatus(data.songs, data.privileges);
- return data;
+ const fetchLatest = () => {
+ return request({
+ url: '/song/detail',
+ method: 'get',
+ params: {
+ ids,
+ },
+ }).then(data => {
+ data.songs.map(song => {
+ const privileges = data.privileges.find(t => t.id === song.id);
+ cacheTrackDetail(song, privileges);
+ });
+ data.songs = mapTrackPlayableStatus(data.songs, data.privileges);
+ return data;
+ });
+ };
+ fetchLatest();
+
+ let idsInArray = [String(ids)];
+ if (typeof ids === 'string') {
+ idsInArray = ids.split(',');
+ }
+
+ return getTrackDetailFromCache(idsInArray).then(result => {
+ if (result) {
+ result.songs = mapTrackPlayableStatus(result.songs, result.privileges);
+ }
+ return result ?? fetchLatest();
});
}
+
/**
* 获取歌词
* 说明 : 调用此接口 , 传入音乐 id 可获得对应音乐的歌词 ( 不需要登录 )
* @param {number} id - 音乐 id
*/
-
export function getLyric(id) {
- return request({
- url: "/lyric",
- method: "get",
- params: {
- id,
- },
+ const fetchLatest = () => {
+ return request({
+ url: '/lyric',
+ method: 'get',
+ params: {
+ id,
+ },
+ }).then(result => {
+ cacheLyric(id, result);
+ return result;
+ });
+ };
+
+ fetchLatest();
+
+ return getLyricFromCache(id).then(result => {
+ return result ?? fetchLatest();
});
}
+
/**
* 新歌速递
* 说明 : 调用此接口 , 可获取新歌速递
@@ -60,13 +101,14 @@ export function getLyric(id) {
*/
export function topSong(type) {
return request({
- url: "/top/song",
- method: "get",
+ url: '/top/song',
+ method: 'get',
params: {
type,
},
});
}
+
/**
* 喜欢音乐
* 说明 : 调用此接口 , 传入音乐 id, 可喜欢该音乐
@@ -79,8 +121,8 @@ export function topSong(type) {
export function likeATrack(params) {
params.timestamp = new Date().getTime();
return request({
- url: "/like",
- method: "get",
+ url: '/like',
+ method: 'get',
params,
});
}
@@ -99,8 +141,8 @@ export function likeATrack(params) {
export function scrobble(params) {
params.timestamp = new Date().getTime();
return request({
- url: "/scrobble",
- method: "get",
+ url: '/scrobble',
+ method: 'get',
params,
});
}
diff --git a/src/api/user.js b/src/api/user.js
index aeeb719..ec02014 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,4 +1,4 @@
-import request from "@/utils/request";
+import request from '@/utils/request';
/**
* 获取用户详情
@@ -8,10 +8,25 @@ import request from "@/utils/request";
*/
export function userDetail(uid) {
return request({
- url: "/user/detail",
- method: "get",
+ url: '/user/detail',
+ method: 'get',
params: {
uid,
+ timestamp: new Date().getTime(),
+ },
+ });
+}
+
+/**
+ * 获取账号详情
+ * 说明 : 登录后调用此接口 ,可获取用户账号信息
+ */
+export function userAccount() {
+ return request({
+ url: '/user/account',
+ method: 'get',
+ params: {
+ timestamp: new Date().getTime(),
},
});
}
@@ -29,8 +44,25 @@ export function userDetail(uid) {
*/
export function userPlaylist(params) {
return request({
- url: "/user/playlist",
- method: "get",
+ url: '/user/playlist',
+ method: 'get',
+ params,
+ });
+}
+
+/**
+ * 获取用户播放记录
+ * 说明 : 登录后调用此接口 , 传入用户 id, 可获取用户播放记录
+ * - uid : 用户 id
+ * - type : type=1 时只返回 weekData, type=0 时返回 allData
+ * @param {Object} params
+ * @param {number} params.uid
+ * @param {number} params.type
+ */
+export function userPlayHistory(params) {
+ return request({
+ url: '/user/record',
+ method: 'get',
params,
});
}
@@ -43,8 +75,8 @@ export function userPlaylist(params) {
*/
export function userLikedSongsIDs(uid) {
return request({
- url: "/likelist",
- method: "get",
+ url: '/likelist',
+ method: 'get',
params: {
uid,
timestamp: new Date().getTime(),
@@ -60,8 +92,8 @@ export function userLikedSongsIDs(uid) {
*/
export function dailySignin(type = 0) {
return request({
- url: "/daily_signin",
- method: "post",
+ url: '/daily_signin',
+ method: 'post',
params: {
type,
timestamp: new Date().getTime(),
@@ -72,17 +104,18 @@ export function dailySignin(type = 0) {
/**
* 获取收藏的专辑（需要登录）
* 说明 : 调用此接口可获取到用户收藏的专辑
- * - limit : 返回数量 , 默认为 30
- * - offset : 偏移数量，用于分页 , 如 :( 页数 -1)*30, 其中 30 为 limit 的值 , 默认为 0
+ * - limit : 返回数量 , 默认为 25
+ * - offset : 偏移数量，用于分页 , 如 :( 页数 -1)*25, 其中 25 为 limit 的值 , 默认为 0
* @param {Object} params
* @param {number} params.limit
* @param {number=} params.offset
*/
-export function likedAlbums() {
+export function likedAlbums(params) {
return request({
- url: "/album/sublist",
- method: "get",
+ url: '/album/sublist',
+ method: 'get',
params: {
+ limit: params.limit,
timestamp: new Date().getTime(),
},
});
@@ -92,11 +125,12 @@ export function likedAlbums() {
* 获取收藏的歌手（需要登录）
* 说明 : 调用此接口可获取到用户收藏的歌手
*/
-export function likedArtists() {
+export function likedArtists(params) {
return request({
- url: "/artist/sublist",
- method: "get",
+ url: '/artist/sublist',
+ method: 'get',
params: {
+ limit: params.limit,
timestamp: new Date().getTime(),
},
});
@@ -106,12 +140,82 @@ export function likedArtists() {
* 获取收藏的MV（需要登录）
* 说明 : 调用此接口可获取到用户收藏的MV
*/
-export function likedMVs() {
+export function likedMVs(params) {
return request({
- url: "/mv/sublist",
- method: "get",
+ url: '/mv/sublist',
+ method: 'get',
params: {
+ limit: params.limit,
timestamp: new Date().getTime(),
},
});
}
+
+/**
+ * 上传歌曲到云盘（需要登录）
+ */
+export function uploadSong(file) {
+ let formData = new FormData();
+ formData.append('songFile', file);
+ return request({
+ url: '/cloud',
+ method: 'post',
+ params: {
+ timestamp: new Date().getTime(),
+ },
+ data: formData,
+ headers: {
+ 'Content-Type': 'multipart/form-data',
+ },
+ timeout: 200000,
+ }).catch(error => {
+ alert(`上传失败，Error: ${error}`);
+ });
+}
+
+/**
+ * 获取云盘歌曲（需要登录）
+ * 说明 : 登录后调用此接口 , 可获取云盘数据 , 获取的数据没有对应 url, 需要再调用一 次 /song/url 获取 url
+ * - limit : 返回数量 , 默认为 200
+ * - offset : 偏移数量，用于分页 , 如 :( 页数 -1)*200, 其中 200 为 limit 的值 , 默认为 0
+ * @param {Object} params
+ * @param {number} params.limit
+ * @param {number=} params.offset
+ */
+export function cloudDisk(params = {}) {
+ params.timestamp = new Date().getTime();
+ return request({
+ url: '/user/cloud',
+ method: 'get',
+ params,
+ });
+}
+
+/**
+ * 获取云盘歌曲详情（需要登录）
+ */
+export function cloudDiskTrackDetail(id) {
+ return request({
+ url: '/user/cloud/detail',
+ method: 'get',
+ params: {
+ timestamp: new Date().getTime(),
+ id,
+ },
+ });
+}
+
+/**
+ * 删除云盘歌曲（需要登录）
+ * @param {Array} id
+ */
+export function cloudDiskTrackDelete(id) {
+ return request({
+ url: '/user/cloud/del',
+ method: 'get',
+ params: {
+ timestamp: new Date().getTime(),
+ id,
+ },
+ });
+}
diff --git a/src/assets/css/global.scss b/src/assets/css/global.scss
new file mode 100644
index 0000000..00c3915
--- /dev/null
+++ b/src/assets/css/global.scss
@@ -0,0 +1,135 @@
+@font-face {
+ font-family: 'Barlow';
+ font-weight: normal;
+ src: url('~@/assets/fonts/Barlow-Regular.woff2') format('woff2'),
+ url('~@/assets/fonts/Barlow-Regular.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Barlow';
+ font-weight: medium;
+ src: url('~@/assets/fonts/Barlow-Medium.woff2') format('woff2'),
+ url('~@/assets/fonts/Barlow-Medium.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Barlow';
+ font-weight: 600;
+ src: url('~@/assets/fonts/Barlow-SemiBold.woff2') format('woff2'),
+ url('~@/assets/fonts/Barlow-SemiBold.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Barlow';
+ font-weight: bold;
+ src: url('~@/assets/fonts/Barlow-Bold.woff2') format('woff2'),
+ url('~@/assets/fonts/Barlow-Bold.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Barlow';
+ font-weight: 800;
+ src: url('~@/assets/fonts/Barlow-ExtraBold.woff2') format('woff2'),
+ url('~@/assets/fonts/Barlow-ExtraBold.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Barlow';
+ font-weight: 900;
+ src: url('~@/assets/fonts/Barlow-Black.woff2') format('woff2'),
+ url('~@/assets/fonts/Barlow-Black.ttf') format('truetype');
+}
+
+:root {
+ --color-body-bg: #ffffff;
+ --color-text: #000;
+ --color-primary: #335eea;
+ --color-primary-bg: #eaeffd;
+ --color-secondary: #7a7a7b;
+ --color-secondary-bg: #f5f5f7;
+ --color-navbar-bg: rgba(255, 255, 255, 0.86);
+ --color-primary-bg-for-transparent: rgba(189, 207, 255, 0.28);
+ --color-secondary-bg-for-transparent: rgba(209, 209, 214, 0.28);
+ --html-overflow-y: overlay;
+}
+
+[data-theme='dark'] {
+ --color-body-bg: #222222;
+ --color-text: #ffffff;
+ --color-primary: #335eea;
+ --color-primary-bg: #bbcdff;
+ --color-secondary: #7a7a7b;
+ --color-secondary-bg: #323232;
+ --color-navbar-bg: rgba(34, 34, 34, 0.86);
+ --color-primary-bg-for-transparent: rgba(255, 255, 255, 0.12);
+ --color-secondary-bg-for-transparent: rgba(255, 255, 255, 0.08);
+}
+
+#app,
+input {
+ font-family: 'Barlow', ui-sans-serif, system-ui, -apple-system,
+ BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei,
+ Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif,
+ microsoft uighur;
+}
+body {
+ background-color: var(--color-body-bg);
+}
+
+html {
+ overflow-y: var(--html-overflow-y);
+ min-width: 768px;
+ overscroll-behavior: none;
+}
+
+select,
+button {
+ font-family: inherit;
+}
+button {
+ background: none;
+ border: none;
+ cursor: pointer;
+ user-select: none;
+}
+input,
+button {
+ &:focus {
+ outline: none;
+ }
+}
+a {
+ color: inherit;
+ text-decoration: none;
+ cursor: pointer;
+ &:hover {
+ text-decoration: underline;
+ }
+}
+
+[data-electron='yes'] {
+ button,
+ .navigation-links a,
+ .playlist-info .description {
+ cursor: default !important;
+ }
+}
+
+::-webkit-scrollbar {
+ width: 8px;
+}
+
+::-webkit-scrollbar-track {
+ background: transparent;
+ border-left: 1px solid rgba(128, 128, 128, 0.18);
+ background: var(--color-body-bg);
+}
+
+::-webkit-scrollbar-thumb {
+ -webkit-border-radius: 10px;
+ border-radius: 10px;
+ background: rgba(128, 128, 128, 0.38);
+}
+
+[data-theme='dark'] ::-webkit-scrollbar-thumb {
+ background: var(--color-secondary-bg);
+}
+
+.user-select-none {
+ user-select: none;
+}
diff --git a/src/assets/css/plyr.css b/src/assets/css/plyr.css
index 584ba89..1a128f0 100644
--- a/src/assets/css/plyr.css
+++ b/src/assets/css/plyr.css
@@ -265,17 +265,17 @@ a.plyr__control::before {
display: none;
}
-.plyr [data-plyr="airplay"],
-.plyr [data-plyr="captions"],
-.plyr [data-plyr="fullscreen"],
-.plyr [data-plyr="pip"] {
+.plyr [data-plyr='airplay'],
+.plyr [data-plyr='captions'],
+.plyr [data-plyr='fullscreen'],
+.plyr [data-plyr='pip'] {
display: none;
}
-.plyr--airplay-supported [data-plyr="airplay"],
-.plyr--captions-enabled [data-plyr="captions"],
-.plyr--fullscreen-enabled [data-plyr="fullscreen"],
-.plyr--pip-supported [data-plyr="pip"] {
+.plyr--airplay-supported [data-plyr='airplay'],
+.plyr--captions-enabled [data-plyr='captions'],
+.plyr--fullscreen-enabled [data-plyr='fullscreen'],
+.plyr--pip-supported [data-plyr='pip'] {
display: inline-block;
}
@@ -288,11 +288,11 @@ a.plyr__control::before {
transition: transform 0.3s ease;
}
-.plyr__menu .plyr__control[aria-expanded="true"] svg {
+.plyr__menu .plyr__control[aria-expanded='true'] svg {
transform: rotate(90deg);
}
-.plyr__menu .plyr__control[aria-expanded="true"] .plyr__tooltip {
+.plyr__menu .plyr__control[aria-expanded='true'] .plyr__tooltip {
display: none;
}
@@ -327,7 +327,7 @@ a.plyr__control::before {
border: var(--plyr-menu-arrow-size, 4px) solid transparent;
border-top-color: rgba(255, 255, 255, 0.9);
border-top-color: var(--plyr-menu-background, rgba(255, 255, 255, 0.9));
- content: "";
+ content: '';
height: 0;
position: absolute;
right: calc(((18px / 2) + calc(10px * 0.7)) - (4px / 2));
@@ -341,18 +341,18 @@ a.plyr__control::before {
width: 0;
}
-.plyr__menu__container [role="menu"] {
+.plyr__menu__container [role='menu'] {
padding: calc(10px * 0.7);
padding: calc(var(--plyr-control-spacing, 10px) * 0.7);
}
-.plyr__menu__container [role="menuitem"],
-.plyr__menu__container [role="menuitemradio"] {
+.plyr__menu__container [role='menuitem'],
+.plyr__menu__container [role='menuitemradio'] {
margin-top: 2px;
}
-.plyr__menu__container [role="menuitem"]:first-child,
-.plyr__menu__container [role="menuitemradio"]:first-child {
+.plyr__menu__container [role='menuitem']:first-child,
+.plyr__menu__container [role='menuitemradio']:first-child {
margin-top: 0;
}
@@ -386,7 +386,7 @@ a.plyr__control::before {
.plyr__menu__container .plyr__control::after {
border: 4px solid transparent;
border: var(--plyr-menu-item-arrow-size, 4px) solid transparent;
- content: "";
+ content: '';
position: absolute;
top: 50%;
transform: translateY(-50%);
@@ -441,7 +441,7 @@ a.plyr__control::before {
background: var(--plyr-menu-back-border-color, #dcdfe5);
box-shadow: 0 1px 0 #fff;
box-shadow: 0 1px 0 var(--plyr-menu-back-border-shadow-color, #fff);
- content: "";
+ content: '';
height: 1px;
left: 0;
margin-top: calc(calc(10px * 0.7) / 2);
@@ -457,19 +457,19 @@ a.plyr__control::before {
border-right-color: currentColor;
}
-.plyr__menu__container .plyr__control[role="menuitemradio"] {
+.plyr__menu__container .plyr__control[role='menuitemradio'] {
padding-left: calc(10px * 0.7);
padding-left: calc(var(--plyr-control-spacing, 10px) * 0.7);
}
-.plyr__menu__container .plyr__control[role="menuitemradio"]::after,
-.plyr__menu__container .plyr__control[role="menuitemradio"]::before {
+.plyr__menu__container .plyr__control[role='menuitemradio']::after,
+.plyr__menu__container .plyr__control[role='menuitemradio']::before {
border-radius: 100%;
}
-.plyr__menu__container .plyr__control[role="menuitemradio"]::before {
+.plyr__menu__container .plyr__control[role='menuitemradio']::before {
background: rgba(0, 0, 0, 0.1);
- content: "";
+ content: '';
display: block;
flex-shrink: 0;
height: 16px;
@@ -479,7 +479,7 @@ a.plyr__control::before {
width: 16px;
}
-.plyr__menu__container .plyr__control[role="menuitemradio"]::after {
+.plyr__menu__container .plyr__control[role='menuitemradio']::after {
background: #fff;
border: 0;
height: 6px;
@@ -492,7 +492,7 @@ a.plyr__control::before {
}
.plyr__menu__container
- .plyr__control[role="menuitemradio"][aria-checked="true"]::before {
+ .plyr__control[role='menuitemradio'][aria-checked='true']::before {
background: #00b3ff;
background: var(
--plyr-control-toggle-checked-background,
@@ -501,14 +501,14 @@ a.plyr__control::before {
}
.plyr__menu__container
- .plyr__control[role="menuitemradio"][aria-checked="true"]::after {
+ .plyr__control[role='menuitemradio'][aria-checked='true']::after {
opacity: 1;
transform: translateY(-50%) scale(1);
}
.plyr__menu__container
- .plyr__control[role="menuitemradio"].plyr__tab-focus::before,
-.plyr__menu__container .plyr__control[role="menuitemradio"]:hover::before {
+ .plyr__control[role='menuitemradio'].plyr__tab-focus::before,
+.plyr__menu__container .plyr__control[role='menuitemradio']:hover::before {
background: rgba(35, 40, 47, 0.1);
}
@@ -524,7 +524,7 @@ a.plyr__control::before {
pointer-events: none;
}
-.plyr--full-ui input[type="range"] {
+.plyr--full-ui input[type='range'] {
-webkit-appearance: none;
background: 0 0;
border: 0;
@@ -547,7 +547,7 @@ a.plyr__control::before {
width: 100%;
}
-.plyr--full-ui input[type="range"]::-webkit-slider-runnable-track {
+.plyr--full-ui input[type='range']::-webkit-slider-runnable-track {
background: 0 0;
border: 0;
border-radius: calc(5px / 2);
@@ -566,7 +566,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui input[type="range"]::-webkit-slider-thumb {
+.plyr--full-ui input[type='range']::-webkit-slider-thumb {
background: #fff;
background: var(--plyr-range-thumb-background, #fff);
border: 0;
@@ -596,7 +596,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui input[type="range"]::-moz-range-track {
+.plyr--full-ui input[type='range']::-moz-range-track {
background: 0 0;
border: 0;
border-radius: calc(5px / 2);
@@ -608,7 +608,7 @@ a.plyr__control::before {
user-select: none;
}
-.plyr--full-ui input[type="range"]::-moz-range-thumb {
+.plyr--full-ui input[type='range']::-moz-range-thumb {
background: #fff;
background: var(--plyr-range-thumb-background, #fff);
border: 0;
@@ -628,7 +628,7 @@ a.plyr__control::before {
width: var(--plyr-range-thumb-height, 13px);
}
-.plyr--full-ui input[type="range"]::-moz-range-progress {
+.plyr--full-ui input[type='range']::-moz-range-progress {
background: currentColor;
border-radius: calc(5px / 2);
border-radius: calc(var(--plyr-range-track-height, 5px) / 2);
@@ -636,7 +636,7 @@ a.plyr__control::before {
height: var(--plyr-range-track-height, 5px);
}
-.plyr--full-ui input[type="range"]::-ms-track {
+.plyr--full-ui input[type='range']::-ms-track {
background: 0 0;
border: 0;
border-radius: calc(5px / 2);
@@ -650,7 +650,7 @@ a.plyr__control::before {
color: transparent;
}
-.plyr--full-ui input[type="range"]::-ms-fill-upper {
+.plyr--full-ui input[type='range']::-ms-fill-upper {
background: 0 0;
border: 0;
border-radius: calc(5px / 2);
@@ -663,7 +663,7 @@ a.plyr__control::before {
user-select: none;
}
-.plyr--full-ui input[type="range"]::-ms-fill-lower {
+.plyr--full-ui input[type='range']::-ms-fill-lower {
background: 0 0;
border: 0;
border-radius: calc(5px / 2);
@@ -677,7 +677,7 @@ a.plyr__control::before {
background: currentColor;
}
-.plyr--full-ui input[type="range"]::-ms-thumb {
+.plyr--full-ui input[type='range']::-ms-thumb {
background: #fff;
background: var(--plyr-range-thumb-background, #fff);
border: 0;
@@ -698,20 +698,20 @@ a.plyr__control::before {
margin-top: 0;
}
-.plyr--full-ui input[type="range"]::-ms-tooltip {
+.plyr--full-ui input[type='range']::-ms-tooltip {
display: none;
}
-.plyr--full-ui input[type="range"]:focus {
+.plyr--full-ui input[type='range']:focus {
outline: 0;
}
-.plyr--full-ui input[type="range"]::-moz-focus-outer {
+.plyr--full-ui input[type='range']::-moz-focus-outer {
border: 0;
}
.plyr--full-ui
- input[type="range"].plyr__tab-focus::-webkit-slider-runnable-track {
+ input[type='range'].plyr__tab-focus::-webkit-slider-runnable-track {
outline-color: #00b3ff;
outline-color: var(
--plyr-tab-focus-color,
@@ -722,7 +722,7 @@ a.plyr__control::before {
outline-width: 3px;
}
-.plyr--full-ui input[type="range"].plyr__tab-focus::-moz-range-track {
+.plyr--full-ui input[type='range'].plyr__tab-focus::-moz-range-track {
outline-color: #00b3ff;
outline-color: var(
--plyr-tab-focus-color,
@@ -733,7 +733,7 @@ a.plyr__control::before {
outline-width: 3px;
}
-.plyr--full-ui input[type="range"].plyr__tab-focus::-ms-track {
+.plyr--full-ui input[type='range'].plyr__tab-focus::-ms-track {
outline-color: #00b3ff;
outline-color: var(
--plyr-tab-focus-color,
@@ -769,7 +769,7 @@ a.plyr__control::before {
}
.plyr__time + .plyr__time::before {
- content: "\2044";
+ content: '\2044';
margin-right: 10px;
margin-right: var(--plyr-control-spacing, 10px);
}
@@ -821,7 +821,7 @@ a.plyr__control::before {
var(--plyr-tooltip-background, rgba(255, 255, 255, 0.9));
bottom: calc(4px * -1);
bottom: calc(var(--plyr-tooltip-arrow-size, 4px) * -1);
- content: "";
+ content: '';
height: 0;
left: 50%;
position: absolute;
@@ -906,7 +906,7 @@ a.plyr__control::before {
position: relative;
}
-.plyr__progress input[type="range"],
+.plyr__progress input[type='range'],
.plyr__progress__buffer {
margin-left: calc(13px * -0.5);
margin-left: calc(var(--plyr-range-thumb-height, 13px) * -0.5);
@@ -916,7 +916,7 @@ a.plyr__control::before {
width: calc(100% + var(--plyr-range-thumb-height, 13px));
}
-.plyr__progress input[type="range"] {
+.plyr__progress input[type='range'] {
position: relative;
z-index: 2;
}
@@ -1024,7 +1024,7 @@ a.plyr__control::before {
width: 20%;
}
-.plyr__volume input[type="range"] {
+.plyr__volume input[type='range'] {
margin-left: calc(10px / 2);
margin-left: calc(var(--plyr-control-spacing, 10px) / 2);
margin-right: calc(10px / 2);
@@ -1054,7 +1054,7 @@ a.plyr__control::before {
.plyr--audio .plyr__control.plyr__tab-focus,
.plyr--audio .plyr__control:hover,
-.plyr--audio .plyr__control[aria-expanded="true"] {
+.plyr--audio .plyr__control[aria-expanded='true'] {
background: #00b3ff;
background: var(
--plyr-audio-control-background-hover,
@@ -1064,7 +1064,7 @@ a.plyr__control::before {
color: var(--plyr-audio-control-color-hover, #fff);
}
-.plyr--full-ui.plyr--audio input[type="range"]::-webkit-slider-runnable-track {
+.plyr--full-ui.plyr--audio input[type='range']::-webkit-slider-runnable-track {
background-color: rgba(193, 200, 209, 0.6);
background-color: var(
--plyr-audio-range-track-background,
@@ -1072,7 +1072,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui.plyr--audio input[type="range"]::-moz-range-track {
+.plyr--full-ui.plyr--audio input[type='range']::-moz-range-track {
background-color: rgba(193, 200, 209, 0.6);
background-color: var(
--plyr-audio-range-track-background,
@@ -1080,7 +1080,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui.plyr--audio input[type="range"]::-ms-track {
+.plyr--full-ui.plyr--audio input[type='range']::-ms-track {
background-color: rgba(193, 200, 209, 0.6);
background-color: var(
--plyr-audio-range-track-background,
@@ -1088,7 +1088,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui.plyr--audio input[type="range"]:active::-webkit-slider-thumb {
+.plyr--full-ui.plyr--audio input[type='range']:active::-webkit-slider-thumb {
box-shadow: 0 1px 1px rgba(35, 40, 47, 0.15), 0 0 0 1px rgba(35, 40, 47, 0.2),
0 0 0 3px rgba(35, 40, 47, 0.1);
box-shadow: var(
@@ -1100,7 +1100,7 @@ a.plyr__control::before {
var(--plyr-audio-range-thumb-active-shadow-color, rgba(35, 40, 47, 0.1));
}
-.plyr--full-ui.plyr--audio input[type="range"]:active::-moz-range-thumb {
+.plyr--full-ui.plyr--audio input[type='range']:active::-moz-range-thumb {
box-shadow: 0 1px 1px rgba(35, 40, 47, 0.15), 0 0 0 1px rgba(35, 40, 47, 0.2),
0 0 0 3px rgba(35, 40, 47, 0.1);
box-shadow: var(
@@ -1112,7 +1112,7 @@ a.plyr__control::before {
var(--plyr-audio-range-thumb-active-shadow-color, rgba(35, 40, 47, 0.1));
}
-.plyr--full-ui.plyr--audio input[type="range"]:active::-ms-thumb {
+.plyr--full-ui.plyr--audio input[type='range']:active::-ms-thumb {
box-shadow: 0 1px 1px rgba(35, 40, 47, 0.15), 0 0 0 1px rgba(35, 40, 47, 0.2),
0 0 0 3px rgba(35, 40, 47, 0.1);
box-shadow: var(
@@ -1207,7 +1207,7 @@ a.plyr__control::before {
.plyr--video .plyr__control.plyr__tab-focus,
.plyr--video .plyr__control:hover,
-.plyr--video .plyr__control[aria-expanded="true"] {
+.plyr--video .plyr__control[aria-expanded='true'] {
background: #00b3ff;
background: var(
--plyr-video-control-background-hover,
@@ -1258,7 +1258,7 @@ a.plyr__control::before {
display: block;
}
-.plyr--full-ui.plyr--video input[type="range"]::-webkit-slider-runnable-track {
+.plyr--full-ui.plyr--video input[type='range']::-webkit-slider-runnable-track {
background-color: rgba(255, 255, 255, 0.25);
background-color: var(
--plyr-video-range-track-background,
@@ -1266,7 +1266,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui.plyr--video input[type="range"]::-moz-range-track {
+.plyr--full-ui.plyr--video input[type='range']::-moz-range-track {
background-color: rgba(255, 255, 255, 0.25);
background-color: var(
--plyr-video-range-track-background,
@@ -1274,7 +1274,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui.plyr--video input[type="range"]::-ms-track {
+.plyr--full-ui.plyr--video input[type='range']::-ms-track {
background-color: rgba(255, 255, 255, 0.25);
background-color: var(
--plyr-video-range-track-background,
@@ -1282,7 +1282,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui.plyr--video input[type="range"]:active::-webkit-slider-thumb {
+.plyr--full-ui.plyr--video input[type='range']:active::-webkit-slider-thumb {
box-shadow: 0 1px 1px rgba(35, 40, 47, 0.15), 0 0 0 1px rgba(35, 40, 47, 0.2),
0 0 0 3px rgba(255, 255, 255, 0.5);
box-shadow: var(
@@ -1297,7 +1297,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui.plyr--video input[type="range"]:active::-moz-range-thumb {
+.plyr--full-ui.plyr--video input[type='range']:active::-moz-range-thumb {
box-shadow: 0 1px 1px rgba(35, 40, 47, 0.15), 0 0 0 1px rgba(35, 40, 47, 0.2),
0 0 0 3px rgba(255, 255, 255, 0.5);
box-shadow: var(
@@ -1312,7 +1312,7 @@ a.plyr__control::before {
);
}
-.plyr--full-ui.plyr--video input[type="range"]:active::-ms-thumb {
+.plyr--full-ui.plyr--video input[type='range']:active::-ms-thumb {
box-shadow: 0 1px 1px rgba(35, 40, 47, 0.15), 0 0 0 1px rgba(35, 40, 47, 0.2),
0 0 0 3px rgba(255, 255, 255, 0.5);
box-shadow: var(
@@ -1713,7 +1713,7 @@ a.plyr__control::before {
var(--plyr-tooltip-background, rgba(255, 255, 255, 0.9));
bottom: calc(4px * -1);
bottom: calc(var(--plyr-tooltip-arrow-size, 4px) * -1);
- content: "";
+ content: '';
height: 0;
left: 50%;
position: absolute;
diff --git a/src/assets/css/slider.css b/src/assets/css/slider.css
index 2e5f40d..071210b 100644
--- a/src/assets/css/slider.css
+++ b/src/assets/css/slider.css
@@ -89,7 +89,7 @@
}
.nyancat .vue-slider-dot-handle {
- background: url("/img/logos/nyancat.gif");
+ background: url('/img/logos/nyancat.gif');
background-size: 36px;
width: 36px;
height: 24px;
@@ -100,6 +100,11 @@
visibility: visible;
}
+.nyancat-stop .vue-slider-dot-handle {
+ background-image: url('/img/logos/nyancat-stop.png');
+ transition: 300ms;
+}
+
/* lyrics */
.lyrics-page .vue-slider-rail {
background-color: rgba(128, 128, 128, 0.18);
@@ -121,10 +126,19 @@
display: none;
}
-body[data-theme="dark"] .lyrics-page .vue-slider-process {
+body[data-theme='dark'] .lyrics-page .vue-slider-process {
background-color: #fafafa;
}
-body[data-theme="dark"] .lyrics-page .vue-slider-dot-handle {
+body[data-theme='dark'] .lyrics-page .vue-slider-dot-handle {
+ background-color: #fff;
+}
+
+.lyrics-page[data-theme='dark'] .vue-slider-rail {
+ background-color: rgba(255, 255, 255, 0.18);
+}
+
+.lyrics-page[data-theme='dark'] .vue-slider-process,
+.lyrics-page[data-theme='dark'] .vue-slider-dot-handle {
background-color: #fff;
}
diff --git a/src/assets/fonts/Barlow-Black.ttf b/src/assets/fonts/Barlow-Black.ttf
new file mode 100755
index 0000000..c4a4b05
Binary files /dev/null and b/src/assets/fonts/Barlow-Black.ttf differ
diff --git a/src/assets/fonts/Barlow-Black.woff2 b/src/assets/fonts/Barlow-Black.woff2
new file mode 100644
index 0000000..b3b05b0
Binary files /dev/null and b/src/assets/fonts/Barlow-Black.woff2 differ
diff --git a/src/assets/fonts/Barlow-Bold.ttf b/src/assets/fonts/Barlow-Bold.ttf
new file mode 100755
index 0000000..cf78fd4
Binary files /dev/null and b/src/assets/fonts/Barlow-Bold.ttf differ
diff --git a/src/assets/fonts/Barlow-Bold.woff2 b/src/assets/fonts/Barlow-Bold.woff2
new file mode 100644
index 0000000..1e3542c
Binary files /dev/null and b/src/assets/fonts/Barlow-Bold.woff2 differ
diff --git a/src/assets/fonts/Barlow-ExtraBold.ttf b/src/assets/fonts/Barlow-ExtraBold.ttf
new file mode 100755
index 0000000..3d5f061
Binary files /dev/null and b/src/assets/fonts/Barlow-ExtraBold.ttf differ
diff --git a/src/assets/fonts/Barlow-ExtraBold.woff2 b/src/assets/fonts/Barlow-ExtraBold.woff2
new file mode 100644
index 0000000..d5789b2
Binary files /dev/null and b/src/assets/fonts/Barlow-ExtraBold.woff2 differ
diff --git a/src/assets/fonts/Barlow-Medium.ttf b/src/assets/fonts/Barlow-Medium.ttf
new file mode 100755
index 0000000..1ed9192
Binary files /dev/null and b/src/assets/fonts/Barlow-Medium.ttf differ
diff --git a/src/assets/fonts/Barlow-Medium.woff2 b/src/assets/fonts/Barlow-Medium.woff2
new file mode 100644
index 0000000..93e9bcb
Binary files /dev/null and b/src/assets/fonts/Barlow-Medium.woff2 differ
diff --git a/src/assets/fonts/Barlow-Regular.ttf b/src/assets/fonts/Barlow-Regular.ttf
new file mode 100755
index 0000000..8bc6a2e
Binary files /dev/null and b/src/assets/fonts/Barlow-Regular.ttf differ
diff --git a/src/assets/fonts/Barlow-Regular.woff2 b/src/assets/fonts/Barlow-Regular.woff2
new file mode 100644
index 0000000..65b4987
Binary files /dev/null and b/src/assets/fonts/Barlow-Regular.woff2 differ
diff --git a/src/assets/fonts/Barlow-SemiBold.ttf b/src/assets/fonts/Barlow-SemiBold.ttf
new file mode 100755
index 0000000..7b7320b
Binary files /dev/null and b/src/assets/fonts/Barlow-SemiBold.ttf differ
diff --git a/src/assets/fonts/Barlow-SemiBold.woff2 b/src/assets/fonts/Barlow-SemiBold.woff2
new file mode 100644
index 0000000..3f582a0
Binary files /dev/null and b/src/assets/fonts/Barlow-SemiBold.woff2 differ
diff --git a/src/assets/icons/arrow-down.svg b/src/assets/icons/arrow-down.svg
new file mode 100644
index 0000000..333ce72
--- /dev/null
+++ b/src/assets/icons/arrow-down.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/arrow-up-alt.svg b/src/assets/icons/arrow-up-alt.svg
new file mode 100644
index 0000000..1980837
--- /dev/null
+++ b/src/assets/icons/arrow-up-alt.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/arrow-up.svg b/src/assets/icons/arrow-up.svg
new file mode 100644
index 0000000..bc5a0bd
--- /dev/null
+++ b/src/assets/icons/arrow-up.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/circle.svg b/src/assets/icons/circle.svg
deleted file mode 100644
index eb210da..0000000
--- a/src/assets/icons/circle.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/icons/dropdown.svg b/src/assets/icons/dropdown.svg
new file mode 100644
index 0000000..e1d0723
--- /dev/null
+++ b/src/assets/icons/dropdown.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/expand.svg b/src/assets/icons/expand.svg
deleted file mode 100644
index 41efe24..0000000
--- a/src/assets/icons/expand.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/icons/fm.svg b/src/assets/icons/fm.svg
new file mode 100644
index 0000000..fe760cd
--- /dev/null
+++ b/src/assets/icons/fm.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/fullscreen-exit.svg b/src/assets/icons/fullscreen-exit.svg
new file mode 100644
index 0000000..f76f601
--- /dev/null
+++ b/src/assets/icons/fullscreen-exit.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/fullscreen.svg b/src/assets/icons/fullscreen.svg
new file mode 100644
index 0000000..e6128c0
--- /dev/null
+++ b/src/assets/icons/fullscreen.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index 70c0243..ee45a56 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -1,8 +1,7 @@
-import Vue from "vue";
-import SvgIcon from "@/components/SvgIcon";
+import Vue from 'vue';
+import SvgIcon from '@/components/SvgIcon';
-Vue.component("svg-icon", SvgIcon);
-const requireAll = (requireContext) =>
- requireContext.keys().map(requireContext);
-const req = require.context("./", true, /\.svg$/);
+Vue.component('svg-icon', SvgIcon);
+const requireAll = requireContext => requireContext.keys().map(requireContext);
+const req = require.context('./', true, /\.svg$/);
requireAll(req);
diff --git a/src/assets/icons/login.svg b/src/assets/icons/login.svg
new file mode 100644
index 0000000..b4acd61
--- /dev/null
+++ b/src/assets/icons/login.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/plus.svg b/src/assets/icons/plus.svg
new file mode 100644
index 0000000..e254d52
--- /dev/null
+++ b/src/assets/icons/plus.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/sort-up.svg b/src/assets/icons/sort-up.svg
new file mode 100644
index 0000000..3efe4cf
--- /dev/null
+++ b/src/assets/icons/sort-up.svg
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/assets/icons/thumbs-down.svg b/src/assets/icons/thumbs-down.svg
new file mode 100644
index 0000000..02fe63b
--- /dev/null
+++ b/src/assets/icons/thumbs-down.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/translation.svg b/src/assets/icons/translation.svg
deleted file mode 100644
index 9cbd770..0000000
--- a/src/assets/icons/translation.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/background.js b/src/background.js
index 3f46503..94dbbc0 100644
--- a/src/background.js
+++ b/src/background.js
@@ -1,37 +1,105 @@
-"use strict";
-import { app, protocol, BrowserWindow, shell, dialog } from "electron";
-import { createProtocol } from "vue-cli-plugin-electron-builder/lib";
-import { startNeteaseMusicApi } from "./electron/services";
-import { initIpcMain } from "./electron/ipcMain.js";
-import { createMenu } from "./electron/menu";
-import { createTray } from "@/electron/tray";
-import { createTouchBar } from "./electron/touchBar";
-import { createDockMenu } from "./electron/dockMenu";
-import { autoUpdater } from "electron-updater";
-import installExtension, { VUEJS_DEVTOOLS } from "electron-devtools-installer";
-import express from "express";
-import expressProxy from "express-http-proxy";
-import Store from "electron-store";
+'use strict';
+import {
+ app,
+ protocol,
+ BrowserWindow,
+ shell,
+ dialog,
+ globalShortcut,
+ nativeTheme,
+ screen,
+} from 'electron';
+import {
+ isWindows,
+ isMac,
+ isLinux,
+ isDevelopment,
+ isCreateTray,
+ isCreateMpris,
+} from '@/utils/platform';
+import { createProtocol } from 'vue-cli-plugin-electron-builder/lib';
+import { startNeteaseMusicApi } from './electron/services';
+import { initIpcMain } from './electron/ipcMain.js';
+import { createMenu } from './electron/menu';
+import { createTray } from '@/electron/tray';
+import { createTouchBar } from './electron/touchBar';
+import { createDockMenu } from './electron/dockMenu';
+import { registerGlobalShortcut } from './electron/globalShortcut';
+import { autoUpdater } from 'electron-updater';
+import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer';
+import { EventEmitter } from 'events';
+import express from 'express';
+import expressProxy from 'express-http-proxy';
+import Store from 'electron-store';
+import { createMpris, createDbus } from '@/electron/mpris';
+import { spawn } from 'child_process';
+const clc = require('cli-color');
+const log = text => {
+ console.log(`${clc.blueBright('[background.js]')} ${text}`);
+};
+
+const closeOnLinux = (e, win, store) => {
+ let closeOpt = store.get('settings.closeAppOption');
+ if (closeOpt !== 'exit') {
+ e.preventDefault();
+ }
+
+ if (closeOpt === 'ask') {
+ dialog
+ .showMessageBox({
+ type: 'info',
+ title: 'Information',
+ cancelId: 2,
+ defaultId: 0,
+ message: '确定要关闭吗？',
+ buttons: ['最小化到托盘', '直接退出'],
+ checkboxLabel: '记住我的选择',
+ })
+ .then(result => {
+ if (result.checkboxChecked && result.response !== 2) {
+ win.webContents.send(
+ 'rememberCloseAppOption',
+ result.response === 0 ? 'minimizeToTray' : 'exit'
+ );
+ }
+
+ if (result.response === 0) {
+ win.hide(); //调用 最小化实例方法
+ } else if (result.response === 1) {
+ win = null;
+ app.exit(); //exit()直接关闭客户端，不会执行quit();
+ }
+ })
+ .catch(err => {
+ log(err);
+ });
+ } else if (closeOpt === 'exit') {
+ win = null;
+ app.quit();
+ } else {
+ win.hide();
+ }
+};
class Background {
constructor() {
this.window = null;
- this.tray = null;
+ this.ypmTrayImpl = null;
this.store = new Store({
windowWidth: {
- width: { type: "number", default: 1440 },
- height: { type: "number", default: 840 },
+ width: { type: 'number', default: 1440 },
+ height: { type: 'number', default: 840 },
},
});
this.neteaseMusicAPI = null;
this.expressApp = null;
- this.willQuitApp = process.platform === "darwin" ? false : true;
+ this.willQuitApp = !isMac;
this.init();
}
init() {
- console.log("initializing");
+ log('initializing');
// Make sure the app is singleton.
if (!app.requestSingleInstanceLock()) return app.quit();
@@ -42,16 +110,21 @@ class Background {
// create Express app
this.createExpressApp();
- // init ipcMain
- initIpcMain(this.window, this.store);
-
// Scheme must be registered before the app is ready
protocol.registerSchemesAsPrivileged([
- { scheme: "app", privileges: { secure: true, standard: true } },
+ { scheme: 'app', privileges: { secure: true, standard: true } },
]);
// handle app events
this.handleAppEvents();
+
+ // disable chromium mpris
+ if (isCreateMpris) {
+ app.commandLine.appendSwitch(
+ 'disable-features',
+ 'HardwareMediaKeyHandling,MediaSessionService'
+ );
+ }
}
async initDevtools() {
@@ -59,162 +132,320 @@ class Background {
try {
await installExtension(VUEJS_DEVTOOLS);
} catch (e) {
- console.error("Vue Devtools failed to install:", e.toString());
+ console.error('Vue Devtools failed to install:', e.toString());
}
// Exit cleanly on request from parent process in development mode.
- if (process.platform === "win32") {
- process.on("message", (data) => {
- if (data === "graceful-exit") {
+ if (isWindows) {
+ process.on('message', data => {
+ if (data === 'graceful-exit') {
app.quit();
}
});
} else {
- process.on("SIGTERM", () => {
+ process.on('SIGTERM', () => {
app.quit();
});
}
}
createExpressApp() {
- console.log("creating express app");
+ log('creating express app');
const expressApp = express();
- expressApp.use("/", express.static(__dirname + "/"));
- expressApp.use("/api", expressProxy("http://127.0.0.1:10754"));
- this.expressApp = expressApp.listen(27232);
+ expressApp.use('/', express.static(__dirname + '/'));
+ expressApp.use('/api', expressProxy('http://127.0.0.1:10754'));
+ expressApp.use('/player', (req, res) => {
+ this.window.webContents
+ .executeJavaScript('window.yesplaymusic.player')
+ .then(result => {
+ res.send({
+ currentTrack: result._isPersonalFM
+ ? result._personalFMTrack
+ : result._currentTrack,
+ progress: result._progress,
+ });
+ });
+ });
+ this.expressApp = expressApp.listen(27232, '127.0.0.1');
}
createWindow() {
- console.log("creating app window");
+ log('creating app window');
- this.window = new BrowserWindow({
- width: this.store.get("window.width") | 1440,
- height: this.store.get("window.height") | 840,
+ const appearance = this.store.get('settings.appearance');
+ const showLibraryDefault = this.store.get('settings.showLibraryDefault');
+
+ const options = {
+ width: this.store.get('window.width') || 1440,
+ height: this.store.get('window.height') || 840,
minWidth: 1080,
minHeight: 720,
- titleBarStyle: "hiddenInset",
+ titleBarStyle: 'hiddenInset',
+ frame: !(
+ isWindows ||
+ (isLinux && this.store.get('settings.linuxEnableCustomTitlebar'))
+ ),
+ title: 'YesPlayMusic',
+ show: false,
webPreferences: {
webSecurity: false,
nodeIntegration: true,
+ enableRemoteModule: true,
+ contextIsolation: false,
},
- });
+ backgroundColor:
+ ((appearance === undefined || appearance === 'auto') &&
+ nativeTheme.shouldUseDarkColors) ||
+ appearance === 'dark'
+ ? '#222'
+ : '#fff',
+ };
+
+ if (this.store.get('window.x') && this.store.get('window.y')) {
+ let x = this.store.get('window.x');
+ let y = this.store.get('window.y');
+
+ let displays = screen.getAllDisplays();
+ let isResetWindiw = false;
+ if (displays.length === 1) {
+ let { bounds } = displays[0];
+ if (
+ x < bounds.x ||
+ x > bounds.x + bounds.width - 50 ||
+ y < bounds.y ||
+ y > bounds.y + bounds.height - 50
+ ) {
+ isResetWindiw = true;
+ }
+ } else {
+ isResetWindiw = true;
+ for (let i = 0; i < displays.length; i++) {
+ let { bounds } = displays[i];
+ if (
+ x > bounds.x &&
+ x < bounds.x + bounds.width &&
+ y > bounds.y &&
+ y < bounds.y - bounds.height
+ ) {
+ // 检测到APP窗口当前处于一个可用的屏幕里，break
+ isResetWindiw = false;
+ break;
+ }
+ }
+ }
+
+ if (!isResetWindiw) {
+ options.x = x;
+ options.y = y;
+ }
+ }
+
+ this.window = new BrowserWindow(options);
// hide menu bar on Microsoft Windows and Linux
this.window.setMenuBarVisibility(false);
if (process.env.WEBPACK_DEV_SERVER_URL) {
// Load the url of the dev server if in development mode
- this.window.loadURL(process.env.WEBPACK_DEV_SERVER_URL);
+ this.window.loadURL(
+ showLibraryDefault
+ ? `${process.env.WEBPACK_DEV_SERVER_URL}/#/library`
+ : process.env.WEBPACK_DEV_SERVER_URL
+ );
if (!process.env.IS_TEST) this.window.webContents.openDevTools();
} else {
- createProtocol("app");
- this.window.loadURL("http://localhost:27232");
+ createProtocol('app');
+ this.window.loadURL(
+ showLibraryDefault
+ ? 'http://localhost:27232/#/library'
+ : 'http://localhost:27232'
+ );
}
}
checkForUpdates() {
+ if (isDevelopment) return;
+ log('checkForUpdates');
autoUpdater.checkForUpdatesAndNotify();
- const showNewVersionMessage = (info) => {
+ const showNewVersionMessage = info => {
dialog
.showMessageBox({
- title: "发现新版本 v" + info.version,
- message: "发现新版本 v" + info.version,
- detail: "是否前往 Github 下载新版本安装包？",
- buttons: ["下载", "取消"],
- type: "question",
+ title: '发现新版本 v' + info.version,
+ message: '发现新版本 v' + info.version,
+ detail: '是否前往 GitHub 下载新版本安装包？',
+ buttons: ['下载', '取消'],
+ type: 'question',
noLink: true,
})
- .then((result) => {
+ .then(result => {
if (result.response === 0) {
shell.openExternal(
- "https://github.com/qier222/YesPlayMusic/releases"
+ 'https://github.com/qier222/YesPlayMusic/releases'
);
}
});
};
- if (process.platform === "darwin") {
- autoUpdater.on("update-available", (info) => {
- showNewVersionMessage(info);
- });
- }
+ autoUpdater.on('update-available', info => {
+ showNewVersionMessage(info);
+ });
}
handleWindowEvents() {
- this.window.once("ready-to-show", () => {
- console.log("windows ready-to-show event");
+ this.window.once('ready-to-show', () => {
+ log('window ready-to-show event');
this.window.show();
+ this.store.set('window', this.window.getBounds());
});
- this.window.on("close", (e) => {
- console.log("windows close event");
- if (this.willQuitApp) {
- /* the user tried to quit the app */
- this.window = null;
- app.quit();
+ this.window.on('close', e => {
+ log('window close event');
+
+ if (isLinux) {
+ closeOnLinux(e, this.window, this.store);
+ } else if (isMac) {
+ if (this.willQuitApp) {
+ this.window = null;
+ app.quit();
+ } else {
+ e.preventDefault();
+ this.window.hide();
+ }
} else {
- /* the user only tried to close the window */
- e.preventDefault();
- this.window.hide();
+ let closeOpt = this.store.get('settings.closeAppOption');
+ if (this.willQuitApp && (closeOpt === 'exit' || closeOpt === 'ask')) {
+ this.window = null;
+ app.quit();
+ } else {
+ e.preventDefault();
+ this.window.hide();
+ }
}
});
- this.window.on("resize", () => {
- let { height, width } = this.window.getBounds();
- this.store.set("window", { height, width });
+ this.window.on('resized', () => {
+ this.store.set('window', this.window.getBounds());
});
- this.window.on("minimize", () => {
- if (
- ["win32", "linux"].includes(process.platform) &&
- this.store.get("settings.minimizeToTray")
- ) {
- this.tray = createTray(this.window);
- this.window.hide();
- }
+ this.window.on('moved', () => {
+ this.store.set('window', this.window.getBounds());
});
- this.window.webContents.on("new-window", function (e, url) {
+ this.window.on('maximize', () => {
+ this.window.webContents.send('isMaximized', true);
+ });
+
+ this.window.on('unmaximize', () => {
+ this.window.webContents.send('isMaximized', false);
+ });
+
+ this.window.webContents.on('new-window', function (e, url) {
e.preventDefault();
+ log('open url');
+ const excludeHosts = ['www.last.fm'];
+ const exclude = excludeHosts.find(host => url.includes(host));
+ if (exclude) {
+ const newWindow = new BrowserWindow({
+ width: 800,
+ height: 600,
+ titleBarStyle: 'default',
+ title: 'YesPlayMusic',
+ webPreferences: {
+ webSecurity: false,
+ nodeIntegration: true,
+ enableRemoteModule: true,
+ contextIsolation: false,
+ },
+ });
+ newWindow.loadURL(url);
+ return;
+ }
shell.openExternal(url);
});
}
handleAppEvents() {
- app.on("ready", async () => {
+ app.on('ready', async () => {
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs.
- console.log("app ready event");
+ log('app ready event');
// for development
- if (process.env.NODE_ENV !== "production") {
+ if (isDevelopment) {
this.initDevtools();
}
// create window
this.createWindow();
+ this.window.once('ready-to-show', () => {
+ this.window.show();
+ });
this.handleWindowEvents();
+ // create tray
+ if (isCreateTray) {
+ this.trayEventEmitter = new EventEmitter();
+ this.ypmTrayImpl = createTray(this.window, this.trayEventEmitter);
+ }
+
+ // init ipcMain
+ initIpcMain(this.window, this.store, this.trayEventEmitter);
+
+ // set proxy
+ const proxyRules = this.store.get('proxy');
+ if (proxyRules) {
+ this.window.webContents.session.setProxy({ proxyRules }, result => {
+ log('finished setProxy', result);
+ });
+ }
+
// check for updates
this.checkForUpdates();
// create menu
- createMenu(this.window);
+ createMenu(this.window, this.store);
// create dock menu for macOS
- app.dock.setMenu(createDockMenu(this.window));
+ const createdDockMenu = createDockMenu(this.window);
+ if (createDockMenu && app.dock) app.dock.setMenu(createdDockMenu);
// create touch bar
- this.window.setTouchBar(createTouchBar(this.window));
+ const createdTouchBar = createTouchBar(this.window);
+ if (createdTouchBar) this.window.setTouchBar(createdTouchBar);
+
+ // register global shortcuts
+ if (this.store.get('settings.enableGlobalShortcut') !== false) {
+ registerGlobalShortcut(this.window, this.store);
+ }
+
+ // try to start osdlyrics process on start
+ if (this.store.get('settings.enableOsdlyricsSupport')) {
+ await createDbus(this.window);
+ log('try to start osdlyrics process');
+ const osdlyricsProcess = spawn('osdlyrics');
+
+ osdlyricsProcess.on('error', err => {
+ log(`failed to start osdlyrics: ${err.message}`);
+ });
+
+ osdlyricsProcess.on('exit', (code, signal) => {
+ log(`osdlyrics process exited with code ${code}, signal ${signal}`);
+ });
+ }
+
+ // create mpris
+ if (isCreateMpris) {
+ createMpris(this.window);
+ }
});
- app.on("activate", () => {
+ app.on('activate', () => {
// On macOS it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
- console.log("app activate event");
+ log('app activate event');
if (this.window === null) {
this.createWindow();
} else {
@@ -222,19 +453,36 @@ class Background {
}
});
- app.on("window-all-closed", () => {
- if (process.platform !== "darwin") {
+ app.on('window-all-closed', () => {
+ if (!isMac) {
app.quit();
}
});
- app.on("before-quit", () => {
+ app.on('before-quit', () => {
this.willQuitApp = true;
});
- app.on("quit", () => {
+ app.on('quit', () => {
this.expressApp.close();
});
+
+ app.on('will-quit', () => {
+ // unregister all global shortcuts
+ globalShortcut.unregisterAll();
+ });
+
+ if (!isMac) {
+ app.on('second-instance', (e, cl, wd) => {
+ if (this.window) {
+ this.window.show();
+ if (this.window.isMinimized()) {
+ this.window.restore();
+ }
+ this.window.focus();
+ }
+ });
+ }
}
}
diff --git a/src/components/ArtistsInLine.vue b/src/components/ArtistsInLine.vue
index b834f47..e2c619d 100644
--- a/src/components/ArtistsInLine.vue
+++ b/src/components/ArtistsInLine.vue
@@ -1,16 +1,21 @@
{{ computedPrefix }}
-
-