efront 4.13.2 → 4.14.2

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,36 @@
+- zh-CN: 未知错误！
+  en:    Unknown error!
+
+- zh-CN: 文件系统
+  en:    file system
+
+- zh-CN: 网络
+  en:    network
+
+- zh-CN: 无法访问$1
+  en:    Unable to access $1
+
+- zh-CN: Cookie解析异常!
+  en:    Cookie parsing exception!
+
+- zh-CN: 数据无法解析！
+  en:    Data cannot be parsed!
+
+- zh-CN: 无法连接可加密的服务器！
+  en:    Unable to connect to an encrypted server!
+
+- zh-CN: 无可用的数据源
+  en:    No available data source
+
+- zh-CN: 通道不存在！
+  en:    The channel does not exist!
+
+- zh-CN: 服务器忙!
+  en:    The server is busy!
+
+- zh-CN: $1不是有效的色彩信息
+  en:    $1 is not a valid color
+
 - zh-CN: 加载失败
   en:    Loading failed
 
@@ -316,8 +349,8 @@
 - zh-CN: 检查到两个菜单项使用了相同的快捷键
   en:    Checked that two menu items used the same shortcut key
 
-- zh-CN: 如您需要使用参数--SCITER或--QUICKJS或--QJS，请购买炸毛授权
-  en:    "If you need to use the parameters --SCITER or --QUICKJS or --QJS, please purchase the authorization for explosion"
+- zh-CN: 如您需要使用参数--SCITER或--QUICKJS或--QJS，请联系作者购买授权（暂定50元人民币）
+  en:    "If you need to use the parameters --SCITER or --QUICKJS or --QJS, please concat the author and purchase the authorization, it costs 50 CNY now."
 
 - zh-CN: 检测到错误，无法建立代码关联：$1
   en:    "Error detected, unable to establish code association: $1"

package/apps/kugou/search/search.js

@@ -35,7 +35,7 @@ function main(params, from) {
         resultMap: null,
         addResult(info) {
             var resultMap = this.resultMap;
-            var singerName = sortname(String(info.singername || '').split(/[\&\,，、]/)).join('、');
+        var singerName = sortname(String(info.singername || '').split(/[\&\,，、]/)).join('、');
             var songName = info.songname;
             var id = `${singerName}:${info.songname}`;
             if (!resultMap[id]) resultMap[id] = Object.assign([], { singer: singerName, song: songName });

package/apps/kugou/singer/list.jsp

@@ -0,0 +1,6 @@
+<script serverside>
+    var fs = require("fs").promises;
+    var names = await fs.readdir(__dirname);
+    names = names.filter(a => /\.(jpe?g|png|gif)$/i.test(names));
+    return JSON.stringify(names);
+</script>

package/apps/kugou/song/list.js

@@ -1 +1 @@
-buildList('songs-list');
+buildList(['song/list.jsp', 'songs-list']);

package/apps/kugou/song/list.jsp

@@ -0,0 +1,6 @@
+<script serverside>
+    var fs = require("fs").promises;
+    var names = await fs.readdir(__dirname);
+    names = names.filter(a => /\.(flac|mp3|wav)$/i.test(a));
+    return JSON.stringify(names);
+</script>

package/coms/basic/cross_.js

@@ -143,16 +143,22 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     var onerror1 = function (e) {
         if (!~requests.indexOf(_xhr)) return;
         removeFromList(requests, _xhr);
-        errored = e || "未知错误！";
+        errored = e || i18n`未知错误！`;
         if (typeof errored === 'string') {
             errored = createResponse(e, xhr.status);
         }
         flush();
         digest();
     };
+    var getErrorSystem = function () {
+        if (!/^(\w+\:|\/\/)/.test(url) && /^file\:/i.test(location.href) || /^file\:/i.test(url)) return i18n`文件系统`;
+        if (navigator.onLine) return i18n`网络`;
+        return i18n`服务器`;
+    };
+
     var onerror = async function (e) {
         if (e.type === 'error') {
-            e = createResponse("无法访问服务器！");
+            e = createResponse(i18n`无法访问${getErrorSystem()}`);
         }
         headers = extend({}, _headers);
         for (var r of reforms) {
@@ -212,7 +218,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                             if (isencrypt) cookie = encode62.safedecode(cookie, xhr.encrypt);
                         }
                         catch (e) {
-                            onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse });
+                            onerror({ status: xhr.status, response: i18n`Cookie解析异常!`, toString: toResponse });
                             return;
                         }
                         cookie_.addCookie(cookie, originDomain);
@@ -233,13 +239,13 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                     xhr.responseText = xhr.response;
                 }
                 catch (e) {
-                    return onerror("数据无法解析！")
+                    return onerror(i18n`数据无法解析！`);
                 }
             };
             switch (xhr.status) {
                 case 0:
                     if (!xhr.response) {
-                        onerror("无法访问服务器");
+                        onerror(i18n`无法访问${getErrorSystem()}`);
                         break;
                     }
                 case 200:
@@ -493,7 +499,7 @@ function addReform(r) {
 function getCode() {
     return new Promise((ok, oh) => {
         this('get', base + "!").then((xhr) => { return ok(encode62.timedecode(xhr.response || xhr.responseText)) }, () => {
-            return oh('无法连接可加密的服务器！');
+            return oh(i18n`无法连接可加密的服务器！`);
         });
     });
 }

package/coms/basic/data.js

@@ -815,12 +815,22 @@ var data = {
             return createApiMap(o);
         }
     },
+    fromAll(refs, params, parse) {
+        return this.createResponse(Promise.all(refs.map(r => this.from(r, params, parse).loading_promise.catch(e => []))).then(datas => {
+            datas = datas.filter(a => !!a);
+            if (!datas.length) throw new Error(i18n`无可用的数据源`);
+            return datas.concat.apply([], datas);
+        }));
+    },
     from(ref, params, parse) {
         if (params instanceof Function) {
             parse = params;
             params = {};
         }
-        if (isObject(ref)) {
+        if (isArray(ref)) {
+            return this.fromAll(ref, params, parse);
+        }
+        else if (isObject(ref)) {
             return this.fromApi(ref, params, parse);
         }
         else if (/^\.*\/|\.\w+$/.test(ref)) {

package/coms/compile//347/264/240/351/246/250.js

@@ -488,14 +488,28 @@ var Method = function () {
     return body;
 }
 var vlist = [], mlist = [macros], clist = [], base = '';
+var killneg = function (v, n) {
+    if (n === "-") {
+        if (/^\-/.test(v)) {
+            v = v.slice(1);
+        }
+        else {
+            v = n + v;
+        }
+    }
+    return v;
+};
 var calcvars = function (v) {
     var decode = /^['"`]/.test(v) ? strings.decode : a => a;
-    return v.replace(/@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\}/g, function (m) {
+    return v.replace(/(^\-)?(@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\})/g, function (_, n, m) {
         var value = getFromScopeList(m, vlist, m);
         value = decode(value);
+        value = killneg(value, n);
         return value;
-    }).replace(/(^|\s|[\]\)\(\[\-\+\*\/,;])(?:var\s*\(([\s\S]*?)\)|(--\S+))/g, function (m, q, a, b) {
-        return q + getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
+    }).replace(/(^|\s|[\]\)\(\[\+\*\/,;]|^\-)(?:var\s*\(([\s\S]*?)\)|(--\S+))/g, function (m, q, a, b) {
+        var v = getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
+        v = killneg(v, q);
+        return v;
     });
 };
 var initvars = function (vars) {

package/coms/compile//347/264/240/351/246/250_test.js

@@ -86,6 +86,7 @@ assert(素馨(`a{a:extract(2,3,2)}`), `a{a:3;}`);
 assert(素馨(`a{a:extract(2 3,2)}`), `a{a:3;}`);
 assert(素馨(`value: range(10px, 30px, 10);`, '', true), `value:10px 20px 30px;`);
 assert(素馨(`value: range(4);`, '', true), `value:1 2 3 4;`);
+assert(素馨(`@a:-1;b{a:-@a}`, '', true), `b{a:1;}`);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].text, '-0.2em');
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].isdigit, true);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].text, ".3em");

package/coms/kugou/buildList.js

@@ -6,7 +6,7 @@ function main(dataid, datapath) {
         padding,
         song,
         loading,
-        musicList:kugou$musicList,
+        musicList: kugou$musicList,
         async run(s) {
             if (!s.hash && s.hashid) {
                 await data.from("song-mix", s, function (a) {
@@ -14,7 +14,7 @@ function main(dataid, datapath) {
                     if (m) s.hash = m[3];
                 });
             }
-            if (s.hash) {
+            if (s.hash || s.url) {
                 kugou$player.play(s);
             } else {
                 go(datapath, s);

package/coms/kugou/dance.js

@@ -1,4 +1,5 @@
 var activeDevice, ratio = 1;
+var strokeColor = '#096';
 function line(buffer, style, lineWidth = window.devicePixelRatio || 1) {
     var canvas = this;
     var context = canvas.getContext("2d");
@@ -27,7 +28,7 @@ function line(buffer, style, lineWidth = window.devicePixelRatio || 1) {
         var [x, y] = buffer[cx];
         context.lineTo(x * width, y * height);
     }
-    context.strokeStyle = style || "#00bd7bd4";
+    context.strokeStyle = style || strokeColor;
     context.lineWidth = lineWidth;
     context.stroke();
 }
@@ -69,7 +70,7 @@ function draw(buffer) {
     if (canvas.height !== canvas.offsetHeight * devicePixelRatio) canvas.height = canvas.offsetHeight * devicePixelRatio;
     context.clearRect(0, 0, canvas.width, canvas.height);
     context.beginPath();
-    context.strokeStyle = "#00bd7bd4";
+    context.strokeStyle = strokeColor;
     context.lineWidth = window.devicePixelRatio || 1;
     var max = 2;
     var v = (this.volume >= 0 ? this.volume : 1) * buffer.length - .5;
@@ -91,7 +92,7 @@ function draw(buffer) {
             }
         });
         context.lineWidth = 1;
-        context.strokeStyle = "#00bd7bd4";
+        context.strokeStyle = strokeColor;
         context.stroke();
         if (this === activeDevice) {
             context.beginPath();

package/coms/kugou/format-singer-names.js

@@ -0,0 +1 @@
+a => a.split(/[\&\,，、]/).join('、');

package/coms/kugou/musicList.js

@@ -9,7 +9,8 @@ var isSameSong = function (m1, m2) {
         m1.hash && m1.hash === m2.hash || // 酷狗
         m1.id && m1.id === m2.id || // 网易云 千千静听
         m1.rid && m1.rid === m2.rid || // 酷我
-        m1.mid && m1.mid === m2.mid; // 酷我
+        m1.mid && m1.mid === m2.mid ||// 酷我
+        m1.url && m1.url === m2.url;
 };
 
 function addMethod(name, func) {

package/coms/kugou/parseSongsList.js

@@ -1,4 +1,11 @@
-a => {
+var singerPhotosMap = Object.create(null);
+data.from("singer/list.jsp", function (a) {
+    a.forEach(a => {
+        var b = a.replace(/\.\w+$/, '');
+        singerPhotosMap[b] = a;
+    })
+})
+return a => {
     if (isElement(a)) {
         var m = /songsdata\s*=\s*(\[[\s\S]*\])/.exec(a.innerText);
         if (!m) throw new Error(i18n`无法加载数据！`);
@@ -7,16 +14,31 @@ a => {
     }
     if (a) return a.map(b => {
         var data = {};
+
         if (b.data) extend(data, {
             name: b.data.filename.replace(/^[\s\S]*?\s*\-\s*/, ''),
             singer: b.data.filename.replace(/\s*\-\s*[\s\S]*?$/, '')
         }, b.data);
-        else extend(data, b);
-        if (!data.singer) {
+        else if (isObject(b)) extend(data, b);
+        if (typeof b === 'string') {
+            var [name, singer] = b.replace(/\.\w+$/, '').split(/\s*-\s*/);
+            data.name = name;
+            data.singer = singer;
+            data.url = "song/" + b;
+
+        } if (!data.singer) {
             data.singer = data.author_name;
         }
         if (!data.name) data.name = data.audio_name;
         if (data.hash) data.hash = data.hash.replace(/^songs\_/i, '');
+        if (data.singer) data.singer = formatSingerNames(data.singer);
+        if (!data.avatar && data.singer) {
+            var singer0 = data.singer.split("、")[0];
+            console.log(singer0)
+            if (singer0 in singerPhotosMap) data.avatar = `singer/` + singerPhotosMap[singer0];
+        }
+        if (!data.singerName) data.singerName = data.singer;
+        if (!data.songName) data.songName = data.name;
         return data;
     });
 

package/coms/kugou/playList.less

@@ -6,8 +6,6 @@
     right: 0;
     max-width: 460px;
     box-shadow: 0 0 20px -6px rgba(0, 0, 0, .6);
-    margin-bottom: 10px;
-    overflow: visible;
     background: #131416;
     margin-top: 0;
     transition: margin .2s ease-out;

package/coms/kugou/player.html

@@ -5,21 +5,18 @@
 </div>
 <div class="track"></div>
 <div class="avatar" ng-style="{'background-image': info.avatarUrl,transform:currentRotate}"></div>
-<div class="info">
-    <div class="time">
-        <span ng-bind="currentTime"></span>&nbsp;/&nbsp;
-        <span ng-bind="totalTime"></span>
-    </div>
-    <div class="song">
-        <span class="name" ng-bind=getSongName()></span>
-        <span class="spliter" ng-if="getSongName()&&getSingerName()">&nbsp;-&nbsp;</span>
-        <span class="singer" ng-bind=getSingerName()></span>
-    </div>
+<btn class="play"></btn>
+<div class="time">
+    <span ng-bind="currentTime"></span>
 </div>
+<div class="total">
+    <span ng-bind="totalTime"></span>
+</div>
+<div class="song" ng-bind=getSongName()></div>
+<div class="singer" ng-bind=getSingerName()></div>
 <btn class="prev" ng-click=play(index-1)></btn>
-<btn class="play" ng-click="playing?pause():play()"></btn>
 <btn class="next" ng-click=play(index+1)></btn>
-<sbtn class="list"></sbtn>
+<!-- <sbtn class="list"></sbtn> -->
 <krc elementid=krcpad></krc>
 <canvas elementid="dance"></canvas>
-<div class="avatar" ng-click="effectPage()"></div>
+<div class="avatar" ng-click="playing?pause():play()" ng-click="effectPage()"></div>

package/coms/kugou/player.js

@@ -38,13 +38,15 @@ var patchMusicInfo = async function (info) {
             break;
         case "kugo":
         default:
-            res = await data.from("song-info", info);
-            krc = await data.from("search-krc", res);
-            krc = await data.from("download-krc", krc);
-            info.krc = fromBase64(krc);
-            if (res.fail_process === 12) res.priced = true;
-            if (res.imgUrl) {
-                res.avatar = res.imgUrl.replace(/\{size\}/ig, 200);
+            if (info.hash) {
+                res = await data.from("song-info", info);
+                krc = await data.from("search-krc", res);
+                krc = await data.from("download-krc", krc);
+                info.krc = fromBase64(krc);
+                if (res.fail_process === 12) res.priced = true;
+                if (res.imgUrl) {
+                    res.avatar = res.imgUrl.replace(/\{size\}/ig, 200);
+                }
             }
             break;
     }
@@ -140,10 +142,10 @@ var $scope = {
     activeList: playList,
     index: 0,
     getSongName() {
-        return this.info.singername || this.info.singerName;
+        return this.info.songname || this.info.songName;
     },
     getSingerName() {
-        return this.info.songname || this.info.songName;
+        return this.info.singername || this.info.singerName;
     },
     update() {
         if (touching) return;
@@ -207,8 +209,12 @@ var $scope = {
         var { sin, cos } = Math;
         var { currentTheta } = $scope;
         if (player.offsetHeight <= calcPixel(80)) {
-            var centerx = 44 / width, centery = .5;
-            var start = 11 * ratio | 0, end = 77 * ratio | 0;
+            var avatar = player.querySelector(".avatar");
+            var { clientTop, clientWidth, offsetLeft } = avatar;
+            var offsetWidth = clientWidth;
+            offsetLeft += clientTop;
+            var centerx = (offsetWidth / 2 + offsetLeft) / width, centery = .5;
+            var start = offsetLeft * ratio | 0, end = (offsetLeft + offsetWidth) * ratio | 0;
             var cost = cos(currentTheta);
             var sint = sin(currentTheta);
             for (var cx = start, dx = end; cx < dx; cx++) {
@@ -430,6 +436,13 @@ var createControls = function () {
 };
 
 var player = function (player) {
+    var savatar = player.querySelector('canvas');
+    var switchPlayList = function () {
+        if (onclick.preventClick) return;
+        onclick.preventClick = true;
+        if (playList.parentNode) remove(playList);
+        else popup(playList, savatar);
+    }
     render(player, $scope);
     player.play = function (hash) {
         $scope.play(hash);
@@ -438,5 +451,17 @@ var player = function (player) {
         $scope.pause();
     };
     appendChild.before(document.body, player);
+    on("contextmenu")(player, e => e.preventDefault());
+    on("click.self")(player, function (a) {
+        if ($scope.playing) $scope.pause();
+        else $scope.play();
+    });
+    var timeout = 0;
+    on("pointerdown")(player, function () {
+        timeout = setTimeout(switchPlayList, 600);
+    });
+    on("pointerup")(player, function () {
+        clearTimeout(timeout);
+    })
     return player;
 }(createControls());