diff --git a/README.md b/README.md
index a01dfeb..3148ec8 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ uv run --no-project --python 3.12 --with-requirements requirements.txt python ap
## 终止、恢复与冲突
+- 队列支持勾选单篇或全选可移除文章，然后点击“移除所选文章”。请先暂停流程；移除只删除队列记录，原始文章、图片、已受理去重记录和计数保留。当前任务或提交结果未核对的文章须先核对并处理；未受理文章移除后可通过扫描目录重新入队。
- 网站左下角悬浮窗提供“跳过本文章”：将当前未提交文章标记为“已跳过”，保留队列记录、不计发表篇数，并打开新的发帖页继续导入排版下一篇。导入中会先取消并等待回滚；已上传附件可能仍保留在网站。最后一篇跳过后流程结束。已点击发表或结果不明的文章不能直接跳过，须先人工核对。已跳过文章不会自动重新入队，需要重试时可在暂停后通过队列“人工核对 / 处理”重新排队。
- 网站左下角常驻“终止流程”，点击后立即取消本标签可取消的导入，并通知其他安装脚本的标签和换号插件；持久状态禁止继续领取任务。
- 控制台“终止流程”还会停止下载，浏览器在下一次连接检查时停止（正常轮询约 2 秒）。网络断开时无法承诺固定延迟；网站按钮可立即停止本标签。已到达网站的图片、登录或发帖请求无法撤回。
diff --git a/app.py b/app.py
index 82b073e..fabfbf1 100644
--- a/app.py
+++ b/app.py
@@ -91,6 +91,8 @@ class Controller:
return self.store.reconcile(body)
if route == 'resolve':
return self.store.resolve(body)
+ if route == 'remove':
+ return self.store.remove(body)
if route == 'history':
records = body.get('records')
if not isinstance(records, list):
diff --git a/static/app.js b/static/app.js
index 74923f8..4394c6a 100644
--- a/static/app.js
+++ b/static/app.js
@@ -1,6 +1,24 @@
'use strict';
const $=id=>document.getElementById(id);
let token='',state=null,loadedKey='',refreshing=false;
+const selectedJobs=new Set();
+let removing=false;
+function removalBlocked(job,run){
+ if(job.id===run.active)return '当前任务请先通过“人工核对 / 处理”核对并移出';
+ if(['user_submitting','submit_unknown'].includes(job.state)||(job.submitted_at&&!['published','accepted_pending_moderation'].includes(job.state)))return '请先核对提交结果并处理';
+ return '';
+}
+function updateSelection(){
+ if(!state)return;
+ const eligible=state.jobs.filter(job=>!removalBlocked(job,state.run));
+ const eligibleIds=new Set(eligible.map(job=>job.id));
+ $('selected-count').textContent=`已选 ${selectedJobs.size} 篇`;
+ $('remove-selected').disabled=removing||state.run.running||!selectedJobs.size;
+ $('select-all').disabled=removing||!eligible.length;
+ $('select-all').checked=eligible.length>0&&eligible.every(job=>selectedJobs.has(job.id));
+ $('select-all').indeterminate=selectedJobs.size>0&&!$('select-all').checked;
+ document.querySelectorAll('.job-select').forEach(input=>{input.checked=selectedJobs.has(input.value);input.disabled=removing||!eligibleIds.has(input.value);});
+}
const labels={queued:'待处理',preparing:'准备中',importing:'上传与导入',formatting:'排版中',awaiting_user_review:'等待人工审核',user_submitting:'已观察到人工提交',submit_unknown:'发布结果待核对',accepted_pending_moderation:'已受理 · 审核中',published:'已确认公开',needs_attention:'需要处理',cancelled:'已移出',skipped:'已跳过',rejected:'网站明确拒绝'};
function notice(message){$('notice').hidden=!message;$('notice').textContent=message;}
async function api(route,body={}) {
@@ -11,12 +29,18 @@ function action(id,fn){$(id).addEventListener('click',async()=>{const button=$(i
function text(tag,value,className){const e=document.createElement(tag);e.textContent=value;if(className)e.className=className;return e;}
function render(data){
state=data;const {jobs,run,download}=data;
+ const eligibleIds=new Set(jobs.filter(job=>!removalBlocked(job,run)).map(job=>job.id));
+ for(const id of selectedJobs)if(!eligibleIds.has(id))selectedJobs.delete(id);
$('total').textContent=jobs.length;$('review').textContent=jobs.filter(j=>j.state==='awaiting_user_review').length;
$('accepted').textContent=jobs.filter(j=>['published','accepted_pending_moderation'].includes(j.state)).length;
$('batch').textContent=run.batch?`${run.batch.count} / ${run.batch.target}`:'—';$('account').textContent=run.batch?run.batch.account.name:'尚未绑定账号';
$('run-state').textContent=run.running?'流程运行中':'流程已暂停';$('run-reason').textContent=run.reason;
$('run-light').classList.toggle('gray',!run.running);$('empty').hidden=jobs.length>0;
$('jobs').replaceChildren(...jobs.map(job=>{
+ const selection=document.createElement('td'),checkbox=document.createElement('input');
+ checkbox.type='checkbox';checkbox.className='job-select';checkbox.value=job.id;
+ checkbox.setAttribute('aria-label','选择文章：'+job.title);checkbox.title=removalBlocked(job,run)||'选择此文章';
+ checkbox.onchange=()=>{checkbox.checked?selectedJobs.add(job.id):selectedJobs.delete(job.id);updateSelection();};selection.append(checkbox);
const tr=document.createElement('tr'),title=document.createElement('td');title.append(text('div',job.title),text('small',`${job.image_count} 张配图 · ${job.source}`));if(job.original_title!==job.title)title.append(text('small','已缩短标题，原题：'+job.original_title));
const status=document.createElement('td');status.append(text('span',labels[job.state]||job.state,'badge'));if(job.error)status.append(text('small',job.error));
for(const issue of job.integrity_issues||[])status.append(text('small',issue));
@@ -45,8 +69,9 @@ function render(data){
try{await api('resolve',{id:job.id,confirmed_not_accepted:true,retry:again});await refresh();}catch(error){notice(error.message);}
};result.append(retry);
}
- tr.append(title,status,account,result);return tr;
+ tr.append(selection,title,status,account,result);return tr;
}));
+ updateSelection();
const dlLabels={idle:'等待开始',running:'下载中',completed:'下载完成',partial:'未达到目标',cancelled:'已停止',error:'下载出错'};
$('download-state').textContent=dlLabels[download.status]||download.status;$('download-progress').textContent=`已保存 ${download.saved}/${download.target} 篇 · 跳过 ${download.skipped} · 失败 ${download.failed}`;
$('progress').value=download.target?Math.floor(download.saved/download.target*100):0;
@@ -55,6 +80,21 @@ function render(data){
$('clients').textContent=data.clients.map(c=>`${c.account?.name||'未识别账号'} · 换号插件${c.extension?.ready?'已就绪':'未连接或需更新'}`).join('\n')||'没有在线执行标签';
}
async function refresh(){if(refreshing||!token)return;refreshing=true;try{render(await api('state'));}catch(error){notice(error.message);$('run-state').textContent='本地服务连接中断';}finally{refreshing=false;}}
+$('select-all').onchange=()=>{
+ const checked=$('select-all').checked;
+ for(const job of state?.jobs||[])if(!removalBlocked(job,state.run)){checked?selectedJobs.add(job.id):selectedJobs.delete(job.id);}
+ updateSelection();
+};
+$('remove-selected').onclick=async()=>{
+ if(removing||!selectedJobs.size)return;
+ if(state.run.running){notice('请先暂停流程，再移除文章');return;}
+ const ids=[...selectedJobs];
+ if(!confirm(`确定从文章队列移除所选的 ${ids.length} 篇文章？\n原始文章和图片文件、已受理去重记录会保留。未受理文章以后可通过扫描目录重新加入。`))return;
+ removing=true;updateSelection();
+ try{const result=await api('remove',{ids});for(const id of ids)selectedJobs.delete(id);notice(`已从队列移除 ${result.removed} 篇文章`);await refresh();}
+ catch(error){notice(error.message);}
+ finally{removing=false;updateSelection();}
+};
action('pair',async()=>{const value=await api('pair');$('pair-code').hidden=false;$('pair-code').type='text';$('pair-code').value=value.token;$('pair-code').select();});
action('channels',async()=>{const value=await api('channels',{key:$('key').value.trim()});loadedKey=$('key').value.trim();$('channel').replaceChildren(...value.channels.map(c=>new Option(c,c)));});
$('key').oninput=()=>{loadedKey='';$('channel').replaceChildren(new Option('请重新获取频道',''));};
diff --git a/static/index.html b/static/index.html
index 9c6d6bb..9f07535 100644
--- a/static/index.html
+++ b/static/index.html
@@ -19,7 +19,7 @@
每个账号只抽取一次目标篇数；只有明确受理的文章才计数。历史演示去重记录会自动读取。
-＋从第一篇文章开始下载新闻，或检查已有文章目录。准备好的文章会出现在这里。
＋从第一篇文章开始下载新闻，或检查已有文章目录。准备好的文章会出现在这里。
- 在油猴中安装以下两个脚本，并停用原导入、排版脚本。
- 重新加载原目录中的换号插件，然后刷新网站。
- 在网站左下角展开连接设置，填入本地端口和连接码。
下载日志
暂无日志