@@ -452,6 +462,7 @@ const webuiHTML = `
+
@@ -862,23 +873,31 @@ var pickField = ""; // 选中的路径填回哪个输入框
var pickKind = "dir"; // dir 选文件夹，file 选文件
var pickCur = ""; // 当前所在目录
var pickParent = ""; // 上一级
-var pickFile = ""; // 选文件时选中的那个
-var recDir = ""; // 录播目录，挑弹幕文件时从它开始
+var pickFile = ""; // 单选时选中的那个
+var pickMulti = false; // 多选模式（视频框这种一行一个、可以选多个的）
+var pickSel = []; // 多选已勾选的绝对路径，换目录也不清，所以能跨文件夹/跨盘攒
+var recDir = ""; // 录播目录，挑弹幕和视频时从它开始
var lastPickKey = "", lastPickAt = 0; // 列表里连点同一项只算一次
var lastNavAt = 0; // 刚跳转过目录的这段时间里忽略列表上的点击，双击文件夹才不会连进两层
-function openPick(id, kind){
+function openPick(id, kind, multi){
var el = document.getElementById(id);
pickField = id;
pickKind = kind === "file" ? "file" : "dir";
+ pickMulti = !!multi && pickKind === "file";
pickFile = "";
- document.getElementById("pickTitle").textContent = pickKind === "file" ? "选择文件" : "选择文件夹";
- document.getElementById("pickOk").textContent = pickKind === "file" ? "选用这个文件" : "选用这个文件夹";
+ pickSel = [];
+ document.getElementById("pickTitle").textContent = pickMulti ? "选择文件（可多选）" : (pickKind === "file" ? "选择文件" : "选择文件夹");
+ document.getElementById("pickDesc").textContent = pickMulti
+ ? "点一下文件名即勾选，再点一下取消；可以进到别的文件夹继续勾。选好后点下面的按钮追加到框里，已经填好的内容不会被清掉。"
+ : "逐级点选即可；也可以直接在地址栏里填或粘贴路径后按回车。选好后点下面的按钮填进设置框。";
document.getElementById("pickHidden").checked = false;
+ document.getElementById("pick").classList.toggle("multi", pickMulti);
document.getElementById("pick").classList.add("on");
- var start = el ? el.value.trim() : "";
- // 框里是文件名而不是路径时（弹幕名这种）不算路径：弹幕框从录播目录开始，其它从程序所在目录开始
- if(start.indexOf("/") < 0 && start.indexOf("\\") < 0) start = id === "mrgDanmu" ? recDir : "";
+ // 多行框（视频）取第一行当起点，整段拿去当路径会解析出一个乱七八糟的目录
+ var start = el ? el.value.split("\n")[0].trim() : "";
+ // 框里是文件名而不是路径时（弹幕名、视频名这种）不算路径：这两个框从录播目录开始，其它从程序所在目录开始
+ if(start.indexOf("/") < 0 && start.indexOf("\\") < 0) start = (id === "mrgDanmu" || id === "mrgVideos") ? recDir : "";
pickGo(start);
}
function closePick(){ document.getElementById("pick").classList.remove("on"); }
@@ -905,8 +924,8 @@ async function pickGo(path){
var items = d.entries || [];
pickCur = d.path || "";
pickParent = d.parent || "";
- // 换了目录之后之前选中的文件就不在当前视图里了，清掉
- if(pickFile && !items.some(function(x){ return x.path === pickFile; })) pickFile = "";
+ // 单选时换了目录、之前选中的文件就不在当前视图里了，清掉；多选是故意跨目录攒的，不动
+ if(!pickMulti && pickFile && !items.some(function(x){ return x.path === pickFile; })) pickFile = "";
document.getElementById("pickPath").value = pickCur;
document.getElementById("pickUp").disabled = !pickParent;
document.getElementById("pickRoots").innerHTML = (d.roots || []).map(function(x){
@@ -917,13 +936,17 @@ async function pickGo(path){
list.innerHTML = '
' + (pickKind === "file" ? "这里没有可选项" : "这里没有子文件夹") + '
';
}else{
list.innerHTML = items.map(function(x){
- var on = (!x.dir && x.path === pickFile) ? " on" : "";
+ var on = "";
+ if(!x.dir){
+ on = (pickMulti ? pickSel.indexOf(x.path) >= 0 : x.path === pickFile) ? " on" : "";
+ }
return '
'
+ + ''
+ '' + esc(x.name) + ''
+ '' + (x.dir ? "文件夹" : fmtSize(x.size)) + '
';
}).join("");
}
- document.getElementById("pickOk").disabled = pickKind === "file" && !pickFile;
+ updatePickBar();
if(d.error){
msg.textContent = d.error;
}else if(fellBack){
@@ -932,11 +955,67 @@ async function pickGo(path){
msg.textContent = "条目太多，只列出了前 2000 项";
}
}
+// 按钮文案和「已选 N 项」都跟着当前模式与勾选情况走
+function updatePickBar(){
+ var ok = document.getElementById("pickOk");
+ var sel = document.getElementById("pickSel");
+ if(pickMulti){
+ ok.disabled = !pickSel.length;
+ ok.textContent = pickSel.length ? ("选用这 " + pickSel.length + " 个文件") : "选用选中的文件";
+ sel.innerHTML = pickSel.length
+ ? ("已选 " + pickSel.length + " 项（
清空）")
+ : "点文件名即勾选，可换目录继续勾";
+ }else{
+ ok.disabled = pickKind === "file" && !pickFile;
+ ok.textContent = pickKind === "file" ? "选用这个文件" : "选用这个文件夹";
+ sel.innerHTML = "";
+ }
+}
+// 只重画高亮，不重新拉目录
+function paintPickSel(){
+ var all = document.querySelectorAll("#pickList .pi");
+ for(var i = 0; i < all.length; i++){
+ var it = all[i];
+ if(it.dataset.dir === "1") continue;
+ it.classList.toggle("on", pickMulti ? pickSel.indexOf(it.dataset.path) >= 0 : it.dataset.path === pickFile);
+ }
+ updatePickBar();
+}
+function pickClearSel(){ pickSel = []; paintPickSel(); }
+// 录播目录下的文件就只填文件名，框里清爽，保存目录以后改了也还认得；别处的填绝对路径
+function pickFillValue(p){
+ if(!recDir) return p;
+ var parent = p.replace(/[\\/][^\\/]*$/, "");
+ if(parent.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase() === recDir.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase()){
+ return p.split(/[\\/]/).pop();
+ }
+ return p;
+}
function pickConfirm(){
+ var el = document.getElementById(pickField);
+ if(pickMulti){
+ if(!pickSel.length) return;
+ if(el){
+ // 追加：已有行原样留着，只把这次勾的加进去（同名/同路径不重复）
+ var lines = el.value.split("\n").map(function(s){ return s.trim(); }).filter(function(s){ return s; });
+ pickSel.forEach(function(p){
+ var name = pickFillValue(p);
+ if(lines.indexOf(name) < 0 && lines.indexOf(p) < 0) lines.push(name);
+ });
+ el.value = lines.join("\n");
+ // 手动合并的视频/弹幕框不进配置，标了「未保存」也永远清不掉，所以只对设置表单里的框标记
+ if(settingFields.indexOf(pickField) >= 0) markDirty(pickField);
+ }
+ closePick();
+ return;
+ }
var v = pickKind === "file" ? pickFile : pickCur;
if(!v) return;
- var el = document.getElementById(pickField);
- if(el){ el.value = v; markDirty(pickField); }
+ if(pickKind === "file") v = pickFillValue(v);
+ if(el){
+ el.value = v;
+ if(settingFields.indexOf(pickField) >= 0) markDirty(pickField);
+ }
closePick();
}
document.getElementById("pickList").addEventListener("click", function(e){
@@ -948,15 +1027,20 @@ document.getElementById("pickList").addEventListener("click", function(e){
lastPickKey = it.dataset.path;
lastPickAt = Date.now();
if(it.dataset.dir === "1"){ pickGo(it.dataset.path); return; }
- pickFile = it.dataset.path;
- var all = this.querySelectorAll(".pi");
- for(var i = 0; i < all.length; i++) all[i].classList.toggle("on", all[i] === it);
- document.getElementById("pickOk").disabled = false;
+ if(pickMulti){
+ var i = pickSel.indexOf(it.dataset.path);
+ if(i >= 0) pickSel.splice(i, 1); else pickSel.push(it.dataset.path);
+ }else{
+ pickFile = it.dataset.path;
+ }
+ paintPickSel();
});
-// 文件双击直接选用
+// 文件双击直接选用（多选时把双击的这个也算上，再连同已勾的一起追加）
document.getElementById("pickList").addEventListener("dblclick", function(e){
var it = e.target.closest(".pi");
- if(it && it.dataset.dir === "0") pickConfirm();
+ if(!it || it.dataset.dir === "1") return;
+ if(pickMulti && pickSel.indexOf(it.dataset.path) < 0) pickSel.push(it.dataset.path);
+ pickConfirm();
});
document.getElementById("pickRoots").addEventListener("click", function(e){
var b = e.target.closest("button");