efront 4.13.2 → 4.14.0

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

@@ -1,3 +1,6 @@
+- zh-CN: $1不是有效的色彩信息
+  en: $1 is not a valid color
+
 - zh-CN: 加载失败
   en:    Loading failed
 
@@ -316,8 +319,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/data.js

@@ -815,12 +815,20 @@ var data = {
             return createApiMap(o);
         }
     },
+    fromAll(refs, params, parse) {
+        return this.createResponse(Promise.all(refs.map(r => this.from(r, params, parse))).then(datas => {
+            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/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/format-singer-names.js

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

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/player.js

@@ -37,14 +37,15 @@ var patchMusicInfo = async function (info) {
             info.songName = info.songname;
             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 +141,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;

package/coms/kugou/player.less

@@ -130,13 +130,14 @@
         border-color: @main-color;
         box-shadow: 0 0 6px -3px @main-color;
     }
-    
+
     >.track {
+        background: @main-color;
         opacity: .7;
         transition: height .3s, opacity .3s;
         top: 12px;
     }
-    
+
     >.avatar {
         opacity: 1;
         top: 0;

package/coms/reptile/colored_console.js

@@ -1,4 +1,5 @@
 "use strict";
+var EOL = require("os").EOL;
 var colored = Object.create(null);
 var lazy = require("../basic/lazy");
 var colors = require("./colors");
@@ -40,12 +41,17 @@ var renderColor = function (obj) {
 var write = function (hasNewLine, str) {
     process.stdout.cork();
     var hasNextLine = /[\r\n\u2028\u2029]$/.test(str);
+    var width = process.stdout.columns;
     if (process.stdout.isTTY) {
         if (lastLogLength) {
-            var width = process.stdout.columns;
-            var dx = lastLogLength % width;
-            var dy = (lastLogLength - 1) / width | 0;
-            process.stdout.moveCursor(-dx, -dy);
+            var loged = lastLogLength;
+            lastLogLength = 0;
+            loged.forEach(lastLogLength => {
+                var dx = lastLogLength % width;
+                var dy = (lastLogLength - 1) / width | 0;
+                process.stdout.moveCursor(- dx, -1 - dy);
+            });
+            process.stdout.moveCursor(0, 1);
             process.stdout.clearScreenDown();
         }
     }
@@ -67,8 +73,13 @@ var write = function (hasNewLine, str) {
     if (hasNewLine) {
         lastLogLength = 0;
     } else {
-        str = String(str).replace(/\x1b\[\d+m/g, '').replace(/\b/g, '');
-        lastLogLength = str.length + str.replace(/[\x20-\xff]/g, "").length;
+        var rs = String(str).split(/\r\n|\r|\n|\u2028|\u2029/);
+        var cr = r => {
+            if (!r) return r;
+            r = r.replace(/\x1b\[\d+m/g, '').replace(/\b/g, '');
+            return r.length + r.replace(/[\x20-\xff]/g, "").length;
+        };
+        lastLogLength = rs.map(cr).reverse();
     }
     process.stdout.uncork();
 };
@@ -88,7 +99,11 @@ var write = function (hasNewLine, str) {
     var logger = function () {
         var label = logger.tip ? fgColor + bgColor + logger.tip + reset : '';
         var time_stamp = '';
-        var str = [time_stamp, label].filter(a => !!a).concat(Array.prototype.map.call(arguments, a => renderColor(a))).join(" ");
+        var mark = [time_stamp, label].filter(a => !!a)
+        var str = Array.prototype.map.call(arguments, a => renderColor(a)).join(" ").split(/\r\n|\r|\n/).map(a => {
+            if (a) return mark.concat(a).join(' ');
+            else return a;
+        }).join(EOL);
         write1(hasNewLine, str);
     };
     logger.tip = info;
@@ -121,7 +136,7 @@ var formatRows = function (arg, rows, deep, entry, leave) {
     var hasNextLine = false;
     var isArray = arg instanceof Array;
     for (var r of rows) {
-        if (/[\r\n\u2028\u2029]/.test(r)) {
+        if (/[\r\n\u2028\u2029]$/.test(r)) {
             itemcount = 1;
             hasNextLine = true;
             break;
@@ -262,10 +277,15 @@ colored.line = function () {
 };
 var _log = console.log;
 colored.log = function () {
-    if (lastLogLength > 0) write1(false, '');
+    if (lastLogLength) write1(false, '');
     if (needNextLine) needNextLine = false;
     _log.apply(console, arguments);
 };
+colored.wrap = function (c, content) {
+    var c = getColor(c);
+    if (!c) throw new Error(i18n`${c}不是有效的色彩信息`);
+    return c + content + colors.Reset;
+}
 colored.begin = function (c) {
     return write1(false, getColor(c));
 };

package/coms/zimoli/menuList.less

@@ -2,7 +2,6 @@
     display: inline-block;
     width: auto;
     height: auto;
-    background-color: #fff;
     box-shadow: 0 0 20px -6px rgba(0, 0, 0, .1);
     border: 1px solid #0003;
     padding: 6px 0;

package/coms/zimoli/vbox.js

@@ -159,6 +159,10 @@ function ybox(generator) {
                 box = getTargetIn(e => e === _box || /^(?:auto|scroll)$/i.test(getComputedStyle(e).overflowY) && e.scrollHeight - e.scrollTop > e.clientHeight, event.target);
             }
             if (box === _box) {
+                var wheelDelta = event.wheelDelta;
+                if (wheelDelta && wheelDelta !== deltay) {
+                    deltay /= 6;
+                }
                 scrollY.call(_box, -deltay, false);
                 stop2();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.13.2",
+    "version": "4.14.0",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {