efront 4.19.6 → 4.20.0

package/apps/kugou/singer/keywords.less

@@ -28,7 +28,11 @@
 @media (max-width:720px) {
 
     song .bg {
-        display: none;
+
+        &:after,
+        &:before {
+            background-color: transparent;
+        }
     }
 
     song {

package/apps/kugou/song/list.jsp

@@ -1,6 +1,20 @@
 <script serverside>
     var fs = require("fs").promises;
     var names = await fs.readdir(__dirname);
+    var namesMap = Object.create(null);
+    names.filter(a => /\.[gkl]rc$/i.test(a)).forEach(a => {
+        var k = a.replace(/\.\w+$/, '');
+        if (k in namesMap) {
+            if (!/^lrc$/i.test(namesMap[k])) return;
+        }
+        namesMap[k] = a.slice(k.length + 1);
+    });
     names = names.filter(a => /\.(flac|mp3|wav)$/i.test(a));
+    names = names.map(n => {
+        var k = n.replace(/\.\w+$/i, '');
+        var m = namesMap[k];
+        if (m) n += '#' + m;
+        return n;
+    });
     return JSON.stringify(names);
 </script>

package/coms/basic/Table.js

@@ -1,4 +1,4 @@
-Promise.resolve(init("pinyin")).then(py =>mark.setPinyin(py));
+Promise.resolve(init("pinyin")).then(py => mark.setPinyin(py));
 
 function minusPower(a, b) {
     return a.$power - b.$power >= 0;
@@ -122,12 +122,13 @@ class Table extends Array {
             if (name === searchtext) this.hasFullmatch = true;
             var [p, m] = mark.power(name, searchtext);
             if (p > power) power = p;
-            if (p >= searchtext.length) this.coverCount++;
             if (!isEmpty(f.key) && !isFunction(f.key)) o[f.key] = m;
             else o.name = m, o.toString = returnName, o.valueOf = returnName;
         }
+        if (power >= searchtext.length) this.coverCount++;
         o.$power = power;
-        if (o.$power > 0) {
+        var cp = searchtext.length;
+        if (o.$power > cp * .6) {
             var summary = this.$summaryData;
             if (!summary.length) saveToOrderedArray(this, o, minusPower);
             else this.summary(o);

package/coms/basic/data.js

@@ -98,19 +98,31 @@ var seekFromSource = function (obj, base) {
     }
     return obj;
 };
+var getkey = [
+    a => a.toUpperCase(),
+    a => a.charAt(0).toUpperCase() + a.slice(1),
+    a => a,
+]
 function getErrorMessage(error = this) {
     if (!isObject(error)) return String(error);
     if (error instanceof Error) return String(error);
     var words = "reason,message,desc,descption,msg,err,error,detail,data".split(',');
-    while (words.length) {
+    w: while (words.length) {
         var a = words.shift();
-        if (error[a]) {
-            return String(error[a]);
+        var keys = getkey.slice();
+        while (keys.length) {
+            a = keys.pop()(a);
+            var e = error[a];
+            if (typeof e === 'string') {
+                return e;
+            }
+            if (isObject(e)) {
+                var s = String(e);
+                if (!/^\[object\s/i.test(s)) return s;
+                error = e;
+                continue w;
+            }
         }
-        a = a.charAt(0).toUpperCase() + a.slice(1);
-        if (error[a]) return String(error[a]);
-        a = a.toUpperCase();
-        if (error[a]) return String(error[a]);
     }
     return Object.keys(error).map(k => `${k}: ${error[k]}`).join(',\r\n');
 }

package/coms/basic/isSubpath.js

@@ -0,0 +1,33 @@
+var normalize = function (url) {
+    var normal = [];
+    var protocol = /^\w+\:/.exec(url);
+    if (protocol) {
+        url = url.slice(protocol[0].length).replace(/^[\\\/]+/, '');
+    }
+    url = url.split(/[\/\\]+/);
+    while (url.length) {
+        var u = url.pop();
+        switch (u) {
+            case ".":
+                break;
+            case "..":
+                normal.pop();
+                break;
+            default:
+                normal.push(u);
+        }
+    }
+    if (protocol) {
+        normal.unshift(protocol[0].toUpperCase());
+    }
+    return normal;
+}
+function isSubpath(path, root) {
+    path = normalize(path);
+    root = normalize(root);
+    if (path.length <= root.length) return false;
+    for (var cx = 0, dx = root.length; cx < dx; cx++) {
+        if (root[cx] !== path[cx]) return false;
+    }
+    return true;
+}

package/coms/basic/mark.js

@@ -28,14 +28,12 @@ var couple = function (source, marker, pinyin) {
     var begin1 = len1, begin2 = len2;
     var end1 = begin1;
     var end2 = begin2;
-    for (var cx = -len1, dx = len2; cx < dx; cx++) {
-        var c1 = cx >= 0 ? 0 : -cx;
-        var c2 = cx >= 0 ? cx : 0;
+    var run = function () {
         var cc = c2;
         var start = 0, end = 0;
-        for (var ct = 0, dt = setDt(); ct < dt; ct++) {
-            var s = source[c1 + ct];
-            var m = marker[c2 + ct];
+        for (ct = 0, dt = setDt(); ct < dt; ct++) {
+            s = source[c1 + ct];
+            m = marker[c2 + ct];
             if (s === m || pinyin && isLike()) {
                 end = ct + 1;
                 if (end === dt && c2 + end - cc - start > end2 - begin2) {
@@ -55,7 +53,10 @@ var couple = function (source, marker, pinyin) {
                 start = ct + 1;
             }
         }
-    }
+    };
+    var s, m, ct, dt;
+    for (var c1 = 0, c2 = 0; c1 < len1; c1++) run();
+    for (var c1 = 0, c2 = 1; c2 < len2; c2++) run();
     return [source.slice(begin1, end1), begin1, begin2, end2];
 };
 var MARK_PRE1, MARK_PRE2, _PRE1, _PRE2 = _PRE1 = "<b>";
@@ -78,28 +79,60 @@ var pair = function (source, search, t1, t2, t3, t4) {
     }
     return power2(source, search);
 }
+var searchText = '';
 var power = function (source, search) {
+    searchText = search;
+    var res = power_(source, search);
+    searchText = '';
+    return res;
+};
+var power_p = function () { };
+var power_f = function () { };
+var power_ = function (source, search, func, mp) {
     if (!search || !source) {
         return [0, source];
     }
     var matchers = couple(source, search, _pinyin);
     var match_text = matchers[0];
     var match_start = matchers[1];
-    var match_length = matchers[3] - matchers[2];
+    var search_start = matchers[2];
+    var search_end = matchers[3];
+    var match_length = search_end - search_start;
     if (match_length >= 1) {
         var match_text_pre = source.slice(0, match_start);
         var match_text_aft = source.slice(match_start + match_text.length);
         var pp = 0, ap = 0;
         var p = match_length !== match_text.length ? match_length - .1 : match_length;
-        if (match_start) p += .1 / match_start - .2;
-        if (match_text_pre.length > 1) {
-            [pp, match_text_pre] = power(match_text_pre, search);
+        if (match_start) p += .1 / (1 + match_start) - .1;
+        if (match_text_aft.length) p += .01 / (match_text_aft.length + 1) - .01;
+        if (!mp) mp = p;
+        var pw = null;
+        if (match_text_pre.length > 1 && !(func === power_f && search_start === 0)) {
+            pw = power_(match_text_pre, search_start > 0 ? search.slice(0, search_start) : searchText, search_start > 0 ? power_p : null, p);
+            pp = pw[0];
+            if (search_start !== 0) match_text_pre = pw[1];
+            else {
+                if (pp >= mp - .6) {
+                    match_text_pre = pw[1];
+                }
+                pp = 0;
+            }
         }
-        if (match_text_aft.length > 1) {
-            [ap, match_text_aft] = power(match_text_aft, search);
+
+        var isend = search_end === search.length;
+        if (match_text_aft.length > 1 && !(func === power_p && isend)) {
+            pw = power_(match_text_aft, isend ? searchText : search.slice(search_end), isend ? null : power_f, p);
+            var ap = pw[0];
+            if (search_end !== search.length) match_text_aft = pw[1];
+            else {
+                if (ap >= mp - .6) {
+                    match_text_aft = pw[1];
+                }
+                ap = 0;
+            }
         }
         if (match_length !== search.length) {
-            p += (pp + ap) / source.length / search.length * .01 - .2;
+            p += (pp + ap) * .86;
         }
         else if (pp >= p) {
             p += pp / source.length / search.length * .01 - .2;

package/coms/basic/mark_test.js

@@ -2,8 +2,16 @@ var test = function (t1, t2) {
     var a = mark.power(t1, t2)
     console.log(t1, t2, a);
 }
+test("live", 'lvie');
+test("listenv", 'lvie');
+test("simple", 'il');
+test("build", 'il');
 test("11234", '1234');
 test("1234", '1234');
+test('kugou', 'kug');
+test('kuugou', 'kug');
+test('kugoukuugou', 'kug');
+test('kugoukugou', 'kugu');
 mark.setPinyin(await init('pinyin'));
 test('我们', 'women');
 test('我们', 'wm');

package/coms/basic/spaces.js

@@ -28,6 +28,8 @@ spaceDefined.avoid = function (extra_tokens) {
 var reg = new RegExp(`(?:[${spaceDefined.join('')}]|${unicode.join('|')})+`);
 var is_reg = new RegExp(`^${reg.source}$`);
 var trim_reg = new RegExp(`^${reg.source}|${reg.source}$`, 'g');
+var trim_start_reg = new RegExp(`^${reg.source}`);
+var trim_end_reg = new RegExp(`${reg.source}$`);
 var format_reg = new RegExp(reg.source, 'g');
 spaceDefined.reg = reg;
 spaceDefined.is_reg = is_reg;
@@ -40,6 +42,12 @@ spaceDefined.exec = function (a) {
 spaceDefined.trim = function (a) {
     return a.replace(trim_reg, '');
 };
+spaceDefined.trimStart = function (a) {
+    return a.replace(trim_start_reg, '');
+};
+spaceDefined.trimEnd = function (a) {
+    return a.replace(trim_end_reg, '');
+};
 var formatter = function (a) {
     if (/[ \u2002\u00a0\u3000]/.test(a)) return ' ';
     return '';

package/coms/compile/Html.js

@@ -30,6 +30,33 @@ var parseProperty = function (a) {
 }
 
 var fixElement = function (o) {
+    if (o.length) {
+        var o0 = o[0];
+        if (o0.type & (PIECE | SPACE)) {
+            var text = spaces.trimStart(o0.text);
+            if (!text) {
+                o.shift();
+                o0 = o[0];
+                o.first = o0;
+                if (o0) o0.prev = null;
+            }
+            else o0.text = text;
+        }
+    }
+    if (o.length) {
+        var o1 = o[o.length - 1];
+        if (o1.type & (PIECE | SPACE)) {
+            var text = spaces.trimEnd(o1.text);
+            if (!text) {
+                o.pop();
+                o1 = o[o.length - 1];
+                o.last = o1;
+                if (o1) o1.next = null;
+            }
+            else o1.text = text;
+        }
+    }
+
     if (!o.attributes) return;
     var attributes = [];
     var needValue = false;
@@ -114,7 +141,7 @@ Html.prototype.createScoped = function (code) {
             case ELEMENT:
                 var v = toCamelCase(c.tag);
                 c.tagName = c.tag.toUpperCase();
-                if (!/^(script|style|template)$/i.test(c.tagName)) {
+                if (!/^(script|style)$/i.test(c.tagName)) {
                     fixElement(c);
                     noTag = false;
                     if (c.attributes) c.attributes.forEach(run);
@@ -153,6 +180,10 @@ Html.prototype.createScoped = function (code) {
                         var id = c.text.slice(1);
                         vars[toCamelCase(id)] = true;
                     }
+                    else if (/\#$/.test(c.text)) {
+                        var id = c.text.slice(0, c.text.length - 1);
+                        vars[toCamelCase(id)] = true;
+                    }
                 }
                 break;
             case QUOTED:

package/coms/compile/Html_test.js

@@ -15,8 +15,10 @@ var test2 = function (source) {
     var s = scanner2(source, 'html');
     assert(s.toString(), source);
 }
-test("<h><a #c>b</a><c b=x>d</c><d/><e>2px</e></h>");
+test("<h><a #c>b</a><c b=x>d</c><d/><e>2px</e></h>", "<h><a #c>b</a><c b=x>d</c><d></d><e>2px</e></h>");
 test("<a>Let's Encrypt</a>");
+test("<a> </a>", 'scoped.outerHTML', "<a></a>");
+test("<a> Let's Encrypt</a>", 'scoped.outerHTML', "<a>Let's Encrypt</a>");
 test("<style>{a-b:2}</style>");
 assert(scanner2("<a>Let's Encrypt</a>", Html).length, 1);
 test('<a href="${i18n``}">Let\'s Encrypt</a>');

package/coms/compile/common.js

@@ -1403,10 +1403,15 @@ var createString = function (parsed) {
                         if (o.length) {
                             o.forEach(run);
                         }
-                        result.push(o.tag_entry);
-                        result.push(o.tag);
+                        result.push(o.tag_entry, o.tag, o.leave);
                     }
-                    result.push(o.leave);
+                    else if (o.tag && o.leave === '/>') {
+                        if (/^(input|img|meta|br|hr|link|area|base|basefont|param|col|frame|embed|keygen)$/i.test(o.tag)) {
+                            result.push('/>');
+                        }
+                        else result.push(`></`, o.tag, '>');
+                    }
+                    else result.push(o.leave);
                 }
                 else {
                     if (o.tag_leave) result.push(o.tag_leave);

package/coms/explorer/edit.js

@@ -33,7 +33,7 @@ function main({ path: root, rename, isfolder, add, name, hasName }) {
         var path = root + "/" + a.$scope.data.name;
         if (origin) {
             var to = path;
-            path = origin;
+            path = root + '/' + origin;
         }
         if (origin) await rename(path, to);
         else await add(path)

package/coms/kugou/bg.less

@@ -1,4 +1,4 @@
-:active>& {
+.active>& {
     &:after {
         width: 300px;
         height: 140px;
@@ -42,7 +42,7 @@
     &:after,
     &:before {
         content: "";
-        background-color: #2873;
+        background-color: #9cb1;
         position: absolute;
         border-radius: 50%;
         // backdrop-filter: invert(1);

package/coms/kugou/dance.js

@@ -1,5 +1,5 @@
 var activeDevice, ratio = 1;
-var strokeColor = '#096';
+var strokeColor = '#acb';
 function line(buffer, style, lineWidth = window.devicePixelRatio || 1) {
     var canvas = this;
     var context = canvas.getContext("2d");

package/coms/kugou/krc.js

@@ -2,7 +2,8 @@ var secret = [64, 71, 97, 119, 94, 50, 116, 71, 81, 54, 49, 45, 206, 210, 110, 1
 var isTrident = /Trident/i.test(navigator.userAgent);
 function krc(list = div()) {
     care(list, function (info) {
-        if (!info.krc) {
+        list.info = info;
+        if (!info.grc && !info.krc) {
             remove(list.children);
             if (info.lrc) {
                 var children = createLRC(info.lrc);
@@ -15,14 +16,61 @@ function krc(list = div()) {
             }
             return;
         }
-        var content = info.krc.slice(4).map((a, i) => a ^ secret[i % 16]);
-        var bufff = thirdParty$inflate(content.slice(2));
-        var krc = decodeUTF8(bufff);
+        var krc = info.grc || info.krc_text;
+        if (!krc) {
+            var content = info.krc.slice(4).map((a, i) => a ^ secret[i % 16]);
+            var bufff = thirdParty$inflate(content.slice(2));
+            krc = decodeUTF8(bufff);
+            info.krc_text = krc;
+        }
         remove(list.children);
         var children = createKRC(krc);
+        list.extra = children.extra;
         appendChild(list, children);
         list.process = children.process;
-    })
+    });
+    contextmenu(list, [
+        {
+            name: "编辑歌词",
+            hidden: true,
+            do() {
+                popup('歌词编辑器', list.info, true);
+            }
+        },
+        {
+            name: "调整时间",
+            async do() {
+                var delta = await prompt('输入时间差值（毫秒）以调整整首歌词', a => +a === (a | 0));
+                delta = +delta;
+                var extra = list.extra;
+                if (extra.offset) extra.offset += +delta;
+                else extra.offset = +delta;
+            }
+        },
+        {
+            name: '保存歌词',
+            do() {
+                if (!list.info) return;
+                var a = document.createElement('a');
+                if (!("download" in a)) {
+                    alert('当前浏览器无法保存', 'warn');
+                    return;
+                }
+                var { grc, krc_text = grc, lrc, songname, songName, singername, singerName } = list.info;
+                if (krc_text) {
+                    var kp = krc_parse(krc_text);
+                    kp.extra.offset = list.extra.offset;
+                    var grc = krc_stringify(kp);
+                }
+                if (!grc && !lrc) {
+                    alert('当前歌曲没有可保存的歌词！', 'warn');
+                    return;
+                }
+                a.href = 'data:application/octet-stream;base64,' + toBase64(encodeUTF8(grc || lrc));
+                a.download = `${songname || songName}-${singername || singerName}.${krc_text ? 'grc' : 'lrc'}`;
+                a.click();
+            }
+        }])
     return list;
 }
 function createLRC(lrc) {
@@ -78,6 +126,7 @@ function createLRC(lrc) {
             }
         }
     };
+    krcList.rows = saved_rows;
     return krcList;
 }
 
@@ -97,39 +146,16 @@ function setClass(krcList, index) {
     });
     if (index + 2 < krcList.length) addClass(krcList[index + 1], 'after-active');
 }
+
 function createKRC(krc) {
-    var saved_rows = [];
-    krc.split(/[\r\n]+/).map(function (row) {
-        var data = /^\s*\[(.*?),(.*?)\](.*?)$/.exec(row);
-        if (data) {
-            var [, startTime, schedule, words] = data;
-            var wordReg = /<(.*?),(.*?),.*?>([^<]*)/g;
-            var saved_words = [];
-            do {
-                var word = wordReg.exec(words);
-                if (word) {
-                    var [, timeBegin, timeLength, label] = word;
-                    saveToOrderedArray(saved_words, {
-                        value: +timeBegin,
-                        timeBegin: +timeBegin,
-                        timeLength: +timeLength,
-                        label
-                    });
-                }
-            } while (word);
-            saveToOrderedArray(saved_rows, {
-                value: +startTime,
-                startTime: +startTime,
-                schedule: +schedule,
-                words: saved_words
-            });
-        } else {
-            if (!isProduction) console.info("%c未解析%c", "color:#c28", "color:#333", row, data);
-        }
-    });
+    var saved_rows = krc_parse(krc);
+    var extra = saved_rows.extra;
     var krcList = saved_rows.map(createRow);
     krcList.process = function (offset, length) {
         var offsetMTime = offset * 1000 | 0;
+        if (extra.offset) {
+            offsetMTime -= extra.offset;
+        }
         var index = getIndexFromOrderedArray(saved_rows, offsetMTime);
         var current_row = saved_rows[index];
         if (current_row) {
@@ -170,6 +196,7 @@ function createKRC(krc) {
         }
     };
     var markerLabel = document.createElement("div");
+    krcList.extra = extra;
     return krcList;
 }
 function createCell(word) {

package/coms/kugou/krc.less

@@ -9,6 +9,7 @@
     display: block;
     text-align: center;
     >div {
+        pointer-events: none;
         white-space: nowrap;
         position: relative;
         transition: margin-top .2s ease-out;

package/coms/kugou/krc_parse.js

@@ -0,0 +1,56 @@
+var extra_func = {
+    total(a) {
+        return +a
+    },
+    offset(a) {
+        return +a
+    },
+    language(a) {
+        a = atob(a);
+        a = JSON.parse(a);
+    }
+}
+var krc_parse = function (krc_text) {
+    var saved_rows = [];
+    var extra = {};
+    krc_text = krc_text.trim();
+    krc_text.split(/[\r\n]+/).map(function (row) {
+        var data = /^\s*\[(.*?),(.*?)\](.*?)$/.exec(row);
+        if (data) {
+            var [, startTime, schedule, words] = data;
+            var wordReg = /<(.*?),(.*?)(?:,.*?)?>([^<]*)/g;
+            var saved_words = [];
+            do {
+                var word = wordReg.exec(words);
+                if (word) {
+                    var [, timeBegin, timeLength, label] = word;
+                    saveToOrderedArray(saved_words, {
+                        value: +timeBegin,
+                        timeBegin: +timeBegin,
+                        timeLength: +timeLength,
+                        label
+                    });
+                }
+            } while (word);
+            saveToOrderedArray(saved_rows, {
+                value: +startTime,
+                startTime: +startTime,
+                schedule: +schedule,
+                words: saved_words
+            });
+        } else {
+            var data = /^\[([^\]\:,]+)[\:,]([^,\:\]]*)\]$/.exec(row);
+            if (data) {
+                var [, key, value] = data;
+                if (!value) value = null;
+                else if (extra_func.hasOwnProperty(key)) {
+                    value = extra_func[key](value);
+                }
+                extra[key] = value;
+            }
+            else if (!isProduction) console.info("%c未解析%c", "color:#c28", "color:#333", row, data);
+        }
+    });
+    saved_rows.extra = extra;
+    return saved_rows;
+}

package/coms/kugou/krc_stringify.js

@@ -0,0 +1,16 @@
+function krc_stringify(krc_rows) {
+    var extra = krc_rows.extra;
+    var e = Object.keys(extra).map(k => {
+        if (k === 'id') return;
+        if (k === 'hash') return;
+        var a = extra[k];
+        if (!isHandled(a)) return;
+        if (typeof a === 'object') return;
+        return `[${k}:${a}]`;
+    }).filter(a => !!a).join('\r\n');
+    var a = krc_rows.map(r => {
+        var w = r.words.map(w => `<${w.timeBegin},${w.timeLength}>${w.label}`).join('');
+        return `[${r.startTime},${r.schedule}]${w}`;
+    }).join('\r\n');
+    return e + "\r\n\r\n" + a;
+}

package/coms/kugou/musicList.js

@@ -13,7 +13,7 @@ var isSameSong = function (m1, m2) {
         m1.id && m1.id === m2.id || // 网易云 千千静听
         m1.rid && m1.rid === m2.rid || // 酷我
         m1.mid && m1.mid === m2.mid ||// 酷我
-        m1.url && m1.url === m2.url;
+        m1.url && String(m1.url).replace(/#[\s\S]*$/, '') === String(m2.url).replace(/#[\s\S]*$/, '');
 };
 
 function addMethod(name, func) {

package/coms/kugou/parseSongsList.js

@@ -6,7 +6,7 @@ await data.from("efront-singer", function (a) {
     })
 });
 var parseFileName = function (b) {
-    var [name, singer] = String(b).replace(/\.\w+$/, '')
+    var [name, singer] = String(b).replace(/\.[\w#]+$/, '')
         .replace(/^\s*\d+[\s\.,\-]+(\S+)($|\W\s*\-)/, "$1$2")
         .replace(/^\s*\d+[\.]+\s*([\s\S]+)/, "$1")
         .replace(/^\s*\d+\s+(\W+)/, "$1")

package/coms/kugou/playList.html

@@ -1,9 +1,10 @@
 <div class="head">
-    播放列表（<span ng-bind="musicList.length"></span>）
-    <a ng-click="switchMode()"><span ng-bind="mode.name"></span></a>
 </div>
 <list class="body" ng-src="(p,i) in musicList" min-width=480>
     <padding ng-delete="remove(i)">
         <song ng-click="play(i)" ng-class="{activate:musicList.isActived(p)}" ng-src=p></song>
     </padding>
 </list>
+<div class="foot">
+    <a ng-click="switchMode()"><span ng-bind="mode.name"></span></a>
+</div>

package/coms/kugou/playList.less

@@ -61,6 +61,11 @@ list>padding {
     }
 }
 
+.ylife-touch-delete {
+    border-radius: 30px 0 0 30px;
+}
+
+
 .page.player+body>& {
     margin-bottom: 0;
     margin-top: 10px;

package/coms/kugou/player.html

@@ -1,4 +1,5 @@
 <div class="background" ng-style="{'background-image':info.avatarUrl}"></div>
+<container -src="activeList"></container>
 <div class="progress" ng-style="currentProcess">
     <div class="track"></div>
     <div class="avatar"></div>