${buttons('modal-cancel','cancel')}${buttons('show-name-confirm','display',true)}
`);bind('show-name-confirm',async()=>{const name=$('#image-name').value;$('#modal').close();displayDialog({type:'image',image_name:name});});});enhanceGallery();guardDeviceButtons();hydrateImages();document.querySelectorAll('[data-show]').forEach(b=>b.onclick=busy(()=>{const x=items[b.dataset.show];if(x.current)return;return displayDialog(state.tab==='cloud'?{type:'image',image_id:x.image_id}:{type:'image',asset_id:x.asset_id});}));document.querySelectorAll('[data-original]').forEach(b=>b.onclick=busy(async()=>{const x=items[b.dataset.original];await openImageViewer(x.url,x.name);}));document.querySelectorAll('[data-delete]').forEach(b=>b.onclick=()=>{const x=items[b.dataset.delete];confirmDialog(state.tab==='local'?t('localDeleteConfirm'):x.current?t('deleteCurrent'):t('cloudDeleteConfirm'),async()=>{if(state.tab==='local'){await api('/api/v1/assets/'+x.asset_id,{method:'DELETE'});}else{const result=await api(`/api/v1/devices/${state.device}/images/${x.image_id}?confirm_current=${x.current}`,{method:'DELETE',headers:{'Idempotency-Key':'web-'+clientUUID()}});await waitOperation(result.operation_id);}await navigate();});});};
- render(cached||[],!cached);
- try{
- const items=state.tab==='cloud'?await api('/api/v1/devices/'+state.device+'/images'):await api('/api/v1/assets?limit=200&offset='+(state.assetOffset||0)+'&origin='+encodeURIComponent(state.assetOrigin||'all')+(state.assetJob?'&job_id='+encodeURIComponent(state.assetJob):''));
- if(epoch!==state.epoch)return;cache.set(key,items);
- if(!cached||JSON.stringify(cached)!==JSON.stringify(items))render(items);
- }catch(error){
- if(epoch!==state.epoch)return;if(!state.token)throw error;
- const status=$('#gallery-list-status');status.hidden=false;status.setAttribute('role','alert');status.textContent=error.message;
- $('.gallery')?.setAttribute('aria-busy','false');
- }
- },
- async upload(){state.preview=null;$('#main').innerHTML=notice()+`${buttons('modal-cancel','cancel')}${r.resolved?'':buttons('acknowledge','acknowledge')}
`);bind('acknowledge',async()=>{await api('/api/v1/operations/'+o.operation_id+'/reconcile',{method:'POST',body:{acknowledge:true}});$('#modal').close();await navigate();});}));},
@@ -158,7 +132,7 @@ const views={
};
function jobPayload(j,changes={}){return {name:j.name,enabled:j.enabled,device_id:j.device_id,schedule:j.schedule,source:j.source,display_duration:j.display_duration,restore_previous:j.restore_previous,priority:j.priority,library_pipeline:j.library_pipeline||false,cleanup_unstarred:j.cleanup_unstarred||false,generate_thumbnail:j.generate_thumbnail||false,thumbnail_plan_id:j.thumbnail_plan_id||null,...changes};}
async function playlistEditor(p){p=p||{name:'',image_ids:[],interval_minutes:60,mode:'queue',enabled:false};showModal(`x.status==='failed');if(failed.length)toast(t('batchFailed')+' '+failed.length);await navigate();});}}
- const cards=[...grid.querySelectorAll('.image-card')];$('#gallery-search').oninput=()=>{state.galleryQuery=$('#gallery-search').value;const query=state.galleryQuery.toLowerCase();cards.forEach(card=>card.hidden=!card.textContent.toLowerCase().includes(query));};$('#gallery-sort').onchange=()=>{const order=$('#gallery-sort').value;state.galleryOrder=order;const indexes=cards.map((card,index)=>({card,item:state.gallery[index]}));indexes.sort((a,b)=>order==='name'?a.item.name.localeCompare(b.item.name):order==='oldest'?String(a.item.created_at).localeCompare(String(b.item.created_at)):String(b.item.created_at).localeCompare(String(a.item.created_at)));indexes.forEach(x=>grid.append(x.card));};
- cards.forEach((card,i)=>{const item=state.gallery[i];if(state.tab==='local'){const star=document.createElement('button');star.textContent=t(item.starred?'unstar':'star');star.setAttribute('aria-pressed',String(item.starred));star.disabled=Boolean(item.excluded);star.title=item.excluded?t('clearExclusionFirst'):'';card.querySelector('.actions').append(star);const exclude=document.createElement('button');exclude.textContent=t(item.excluded?'includePhoto':'excludePhoto');exclude.setAttribute('aria-pressed',String(Boolean(item.excluded)));exclude.disabled=Boolean(item.starred);exclude.title=item.starred?t('clearStarFirst'):'';card.querySelector('.actions').append(exclude);exclude.onclick=busy(async()=>{await api('/api/v1/assets/'+item.asset_id+'/exclusion',{method:'PUT',body:{excluded:!item.excluded}});await navigate();});if(item.starred){const kept=document.createElement('small');kept.className='photo-mark';kept.textContent=t('photoStarred');card.querySelector('h3').after(kept);}if(item.excluded){const badge=document.createElement('small');badge.className='excluded-photo';badge.textContent=t('photoExcluded');card.querySelector('h3').after(badge);}star.onclick=busy(async()=>{await api('/api/v1/assets/'+item.asset_id+'/star',{method:'PUT',body:{starred:!item.starred}});await navigate();});const label=document.createElement('small');label.textContent=item.origin==='task'?t('taskOrigin')+' · '+(item.job_name||item.job_id):t('origin_'+item.origin);card.querySelector('h3').after(label);const select=document.createElement('input');select.type='checkbox';select.className='asset-select';select.dataset.asset=item.asset_id;select.setAttribute('aria-label',t('selectImage'));card.prepend(select);}if(item.width&&item.height){const dimensions=document.createElement('small');dimensions.textContent=item.width+' × '+item.height;card.querySelector('h3').after(dimensions);}const download=document.createElement('button');download.textContent=t(state.tab==='local'?'downloadShort':'download');card.querySelector('.actions').append(download);download.onclick=busy(()=>downloadImage(item.url,item.name));if(state.tab==='local')card.querySelector('.actions').append(card.querySelector('[data-delete]'));});
- if(state.tab==='local'){
- const updateMarks=()=>{const selected=[...grid.querySelectorAll('.asset-select:checked')].map(box=>state.gallery.find(item=>item.asset_id===box.dataset.asset));const starred=selected.some(item=>item?.starred),excluded=selected.some(item=>item?.excluded);$('#asset-batch-star').disabled=!selected.length||excluded;$('#asset-batch-star').title=!selected.length?t('selectImagesFirst'):excluded?t('clearExclusionFirst'):'';$('#asset-batch-exclude').disabled=!selected.length||starred;$('#asset-batch-exclude').title=!selected.length?t('selectImagesFirst'):starred?t('clearStarFirst'):'';disabledMarkHints(grid.parentElement);};
- grid.querySelectorAll('.asset-select').forEach(box=>box.onchange=updateMarks);
- for(const id of ['asset-all','asset-invert']){const previous=$('#'+id).onclick;$('#'+id).onclick=event=>{previous(event);updateMarks();};}updateMarks();
- }
- disabledMarkHints(grid);
- $('#gallery-search').value=state.galleryQuery||'';$('#gallery-sort').value=state.galleryOrder||'newest';$('#gallery-search').oninput();$('#gallery-sort').onchange();
-}
async function weatherSettings(){
const weather=await api('/api/v1/providers/weather');const box=document.createElement('section');box.className='card';box.innerHTML=`${t('weatherSettings')}
`;$('#main').append(box);$('#weather-provider').value=weather.config.provider;
function result(w){$('#weather-result').innerHTML=`${esc(w.current.temperature)} · ${esc(w.current.summary)}
${w.current.mock?t('weatherMock'):t('weatherAttribution')}${w.current.stale?' · '+t('stale'):''}
${t('forecast')} ${w.forecast.map(x=>`${esc(x.date)} · ${esc(x.summary)} · ${x.minimum_c}–${x.maximum_c}°C · ${x.rain_probability}%
`).join('')}`;}
@@ -147,13 +133,13 @@ function photosLoginDialog(){
async function photoSourcesPanel(){
const section=document.createElement('section');section.className='card photo-sources-panel';$('#main').append(section);
const sources=await api('/api/v1/photo-sources');if(!section.isConnected)return;
- section.innerHTML=`${t('photoSources')} ${t('sourceHint')}
${buttons('add-photo-source','addSource')}
${sources.length?sources.map(s=>`
${esc(s.name)} ${t('sourceIdLabel')}: ${esc(s.id)} · ${t('sourceLocation')}: ${esc(s.location)}
${s.kind==='synology-photos'?t('sourcePhotosAPI'):t('sourceOwnCredentials')}
${esc(s.kind==='synology-photos'?'Synology Photos':s.kind)} · ${t(s.enabled?'enabled':'disabled')}${s.people_filter?' · '+t('peopleFilter'):''}${s.orientation?' · '+t({auto:'orientationAuto',landscape:'orientationLandscape',portrait:'orientationPortrait'}[s.orientation]):''}
${t('browse')} ${t('randomPreview')} ${t('sourceJob')} ${t('edit')} ${t('remove')}
`).join(''):`
${t('noSources')}
`}
`;
+ section.innerHTML=`${t('photoSources')} ${t('sourceHint')}
${buttons('add-photo-source','addSource')}
${sources.length?sources.map(s=>`
${esc(s.name)} ${t('sourceIdLabel')}: ${esc(s.id)} · ${t('sourceLocation')}: ${esc(s.location)}
${s.kind==='synology-photos'?t('sourcePhotosAPI'):t('sourceOwnCredentials')}
${esc(s.kind==='synology-photos'?'Synology Photos':s.kind)} · ${t(s.enabled?'enabled':'disabled')}${s.people_filter?' · '+t('peopleFilter'):''}${s.orientation?' · '+t({auto:'orientationAuto',landscape:'orientationLandscape',portrait:'orientationPortrait'}[s.orientation]):''}
${t('browse')} ${t('randomPreview')} ${t('sourceJob')} ${t('edit')} ${t('remove')}
`).join(''):`
${t('noSources')}
`}
${t('sourceImages')} · ${result.total}${result.total>=result.catalog_limit?' (limit)':''} ${t('sourceBrowseHint')} ${t('excludePhotoHelp')}
${result.items.map((x,i)=>`
${esc(x.name)}${x.width?`${x.width} × ${x.height} `:''}${x.caption?`${esc([x.caption.date,x.caption.people,x.caption.title,x.caption.place,x.caption.filename].filter(Boolean).join(' · '))} `:''} ${t(x.starred?'unstar':'star')} ${t(x.excluded?'includePhoto':'excludePhoto')}
${x.starred?`${t('photoStarred')} `:''}${x.excluded?`${t('photoExcluded')} `:''}`).join('')||t('noSourcePhotos')}
${t('previousPage')} ${t('nextPage')} ${buttons('source-refresh','refresh')}
`;
- for(const key of ['star','exclude'])box.querySelectorAll('[data-source-'+key+']').forEach(button=>button.onclick=busy(async()=>{const item=result.items[Number(button.dataset[key==='star'?'sourceStar':'sourceExclude'])],field=key==='star'?'starred':'excluded';await api('/api/v1/photo-sources/'+id+'/preferences?device_id='+encodeURIComponent(state.device),{method:'PUT',body:{item_id:item.id,[field]:!item[field]}});await browseSource(id,offset);}));
- disabledMarkHints(box);
- box.querySelectorAll('[data-source-item]').forEach(b=>b.onclick=busy(()=>previewSource(id,result.items[Number(b.dataset.sourceItem)].id)));bind('source-prev',()=>browseSource(id,Math.max(0,offset-50)));bind('source-next',()=>browseSource(id,offset+50));bind('source-refresh',()=>browseSource(id,0,true));
-}
async function previewSource(id,item_id=null){
const acceptedResult=await api('/api/v1/devices/'+state.device+'/upload',{method:'POST',body:{type:'photo_source',source_id:id,item_id,fit:'contain',profile:'color'},headers:{'Idempotency-Key':clientUUID()}});const op=await waitOperation(acceptedResult.operation_id);
showModal(`${t('preview')} ${t('sourcePreviewHint')}
${buttons('modal-cancel','cancel')}${buttons('source-display','display',true)}
`);await blobImage($('#source-preview'),op.result.url);$('#source-display').disabled=!liveWriteAllowed();bind('source-display',()=>displayDialog({type:'image',asset_id:op.result.asset_id}));
diff --git a/pigway_frame_flow/web/libraries.js b/pigway_frame_flow/web/libraries.js
index c7759d7..ac3a03a 100644
--- a/pigway_frame_flow/web/libraries.js
+++ b/pigway_frame_flow/web/libraries.js
@@ -1,25 +1,13 @@
'use strict';
-// Keep older assets and APIs accessible without interpreting frame products as sources.
-Object.assign(MESSAGES.zh,{'legacy-plans':'旧版小图方案',libraryOutputPartial:'部分终端输出失败，源画面与成功版本已保留，可单独重试失败目标。',libraryGenerateFirst:'请先按终端生成方案生成成品，源画面不能直接推送。',librarySourceMismatch:'方案不属于所选来源图库，请重新选择。',librarySizeMismatch:'方案尺寸与终端屏幕不匹配；相框使用设备屏幕尺寸，当前手表为 410×502。',libraryPlanBound:'此方案正在被终端使用，请先解除绑定或更换方案。',libraryBindFirst:'请先在终端图库中绑定此来源及其中的生成方案。',libraryBindingChanged:'终端绑定已改变，此版本不再匹配，已停止推送。'});Object.assign(MESSAGES.en,{'legacy-plans':'Legacy thumbnail plans',libraryOutputPartial:'Some outputs failed. Source pixels and successful versions are kept; retry failed targets individually.',libraryGenerateFirst:'Generate a terminal version before sending source pixels.',librarySourceMismatch:'The plan belongs to another source library.',librarySizeMismatch:'Plan dimensions must match the terminal screen. The current watch uses 410×502.',libraryPlanBound:'Unbind terminals or select another plan first.',libraryBindFirst:'Bind a terminal to this source and one of its plans first.',libraryBindingChanged:'The terminal binding changed; this version was not sent.'});
-Object.assign(MESSAGES.zh,{gallery:'来源图库','terminal-gallery':'终端图库','legacy-gallery':'历史图库'});
-Object.assign(MESSAGES.en,{gallery:'Source library','terminal-gallery':'Terminal library','legacy-gallery':'Legacy gallery'});
-icons['legacy-gallery']='▧';
-const legacyGalleryView=views.gallery;
-const legacyPlanView=views.thumbnails;
-delete icons.thumbnails;
-icons['legacy-plans']='▧';
-views['legacy-plans']=legacyPlanView;
+// Source pixels, generated versions and terminal bindings share one gallery model.
+Object.assign(MESSAGES.zh,{libraryOutputPartial:'部分终端输出失败，源画面与成功版本已保留，可单独重试失败目标。',libraryGenerateFirst:'请先按终端生成方案生成成品，源画面不能直接推送。',librarySourceMismatch:'方案不属于所选来源图库，请重新选择。',librarySizeMismatch:'方案尺寸与终端屏幕不匹配；相框使用设备屏幕尺寸，当前手表为 410×502。',libraryPlanBound:'此方案正在被终端使用，请先解除绑定或更换方案。',libraryBindFirst:'请先在终端图库中绑定此来源及其中的生成方案。',libraryBindingChanged:'终端绑定已改变，此版本不再匹配，已停止推送。'});Object.assign(MESSAGES.en,{libraryOutputPartial:'Some outputs failed. Source pixels and successful versions are kept; retry failed targets individually.',libraryGenerateFirst:'Generate a terminal version before sending source pixels.',librarySourceMismatch:'The plan belongs to another source library.',librarySizeMismatch:'Plan dimensions must match the terminal screen. The current watch uses 410×502.',libraryPlanBound:'Unbind terminals or select another plan first.',libraryBindFirst:'Bind a terminal to this source and one of its plans first.',libraryBindingChanged:'The terminal binding changed; this version was not sent.'});
+Object.assign(MESSAGES.zh,{gallery:'来源图库','terminal-gallery':'终端图库'});
+Object.assign(MESSAGES.en,{gallery:'Source library','terminal-gallery':'Terminal library'});
const libraryUI={kind:'source',source:null,plan:null,terminal:null,offset:0};
function libraryStatus(status){return ({GENERATED:tr('已生成','Generated'),QUEUED:tr('待推送','Queued'),RENDERING:tr('准备推送','Preparing'),UPLOADING:tr('上传中','Uploading'),SYNCING:tr('等待设备确认','Awaiting confirmation'),COMPLETED:tr('已确认显示','Display confirmed'),FAILED:tr('推送失败','Failed'),UNKNOWN:tr('结果待核对','Outcome unknown')})[status]||status;}
function terminalLabel(terminal){return terminal.id==='watch'?tr('手表','Watch'):deviceNameForId(terminal.id);}
function librarySelectOptions(items,selected,label){return `${label} `+items.map(p=>`${esc(p.name)} `).join('');}
-function libraryLegacy(tab){state.tab=tab;return navigate('legacy-gallery');}
-
-views['legacy-gallery']=async function(epoch){
- await legacyGalleryView(epoch);if(epoch!==state.epoch)return;
- const back=document.createElement('button');back.textContent=tr('返回来源图库','Back to source library');back.onclick=()=>navigate('gallery');$('#main').prepend(back);
-};
views.gallery=epoch=>libraryPage(epoch,'source');
views['terminal-gallery']=epoch=>libraryPage(epoch,'terminal');
async function libraryPage(epoch,kind){
@@ -34,23 +22,23 @@ async function libraryPage(epoch,kind){
async function sourceLibraryPage(epoch,sources,terminals){
const panel=$('#library-content');
- if(!sources.length){panel.innerHTML=`${tr('先在“照片数据源”中添加来源，再建立该来源的生成方案。','Add a photo source, then create generation plans in its library.')}
${tr('添加照片来源','Add photo source')} ${tr('查看历史本地成品','View legacy local images')} ${tr('先在“照片数据源”中添加来源，再建立该来源的生成方案。','Add a photo source, then create generation plans in its library.')}
${tr('添加照片来源','Add photo source')} ${tr('源画面先保存到本地；同一张照片按不同方案生成版本，多个终端可共用一份版本。Photos 画面可能是源预览。','Source pixels are stored locally first. Plans create versions of the same photo; terminals may share one version. Photos may supply source previews.')}
${tr('使用终端：','Used by: ')}${uses.map(terminalLabel).map(esc).join('、')||tr('尚未绑定','No terminals bound')}
${page.items.map((picture,i)=>{
+ panel.innerHTML=`
${tr('源画面先保存到本地；同一张照片按不同方案生成版本，多个终端可共用一份版本。Photos 画面可能是源预览。','Source pixels are stored locally first. Plans create versions of the same photo; terminals may share one version. Photos may supply source previews.')}
${tr('使用终端：','Used by: ')}${uses.map(terminalLabel).map(esc).join('、')||tr('尚未绑定','No terminals bound')}
${page.items.map((picture,i)=>{
const version=plan?picture.versions.find(v=>v.plan_id===plan.id):picture;
return `
${version?`${tr('此方案尚未生成','Not generated for this plan')}
`}${esc(picture.name)} ${plan?version?`${esc(version.plan.name)} · ${version.plan.width} × ${version.plan.height}`:tr('未生成','Not generated'):tr('无叠加的源画面','Source pixels without overlays')} ${esc(fmt(version?.created_at||picture.created_at))} ${version?.terminal_uses?.length?`${version.terminal_uses.map(u=>esc(terminalLabel(terminals.find(t=>t.id===u.terminal_id)||{id:u.terminal_id}))+' · '+esc(libraryStatus(u.status))).join(' / ')} `:''}${version?`${tr('预览','Preview')} ${tr('下载图片','Download image')} ${plan?`${tr('生成参数','Generation settings')} `:''}`:''}${!plan?.archived?`${plan?tr('按此方案生成','Generate this plan'):tr('生成各方案版本','Generate plan versions')} `:''}${!plan?`${t(picture.starred?'unstar':'star')} ${t(picture.excluded?'includePhoto':'excludePhoto')} `:''}${t('delete')}
`;
- }).join('')}
${page.items.length?'':`
${tr('尚未选入源画面。先从来源选入照片，再按方案生成。旧成品保留在“历史本地成品”。','No source pixels imported yet. Import a photo, then generate its versions. Older products remain under Legacy local images.')} `}
`;
+ }).join('')}
${page.items.length?'':`
${tr('尚未选入源画面。先从来源选入照片，再按方案生成。','No source pixels imported yet. Import a photo, then generate its versions.')} `}
${tr('来源图库生成方案','Source-library generation plan')} `);
+ showModal(`${tr('来源图库生成方案','Source-library generation plan')} `);
$('#generation-fit').value=p.fit;$('#generation-profile').value=p.profile;
const fill=values=>{for(const key of ['name','width','height','quality','center_x','center_y','fit'])$('#generation-'+key).value=values[key];$('#generation-caption').checked=values.caption||false;$('#generation-profile').value=values.profile||'color';};
document.querySelectorAll('[data-generation-preset]').forEach(b=>b.onclick=()=>{const type=b.dataset.generationPreset;fill({...p,name:type==='watch'?tr('手表','Watch'):type==='frame-portrait'?tr('相框竖版','Portrait frame'):tr('相框横版','Landscape frame'),width:type==='watch'?410:type==='frame-portrait'?1200:1600,height:type==='watch'?502:type==='frame-portrait'?1600:1200,caption:type!=='watch'});});
- if($('#generation-legacy'))$('#generation-legacy').onchange=()=>{const old=oldPlans.find(p=>p.id===$('#generation-legacy').value);if(old)fill(old);};
const read=()=>({source_id:sourceId,name:$('#generation-name').value,width:Number($('#generation-width').value),height:Number($('#generation-height').value),quality:Number($('#generation-quality').value),center_x:Number($('#generation-center_x').value),center_y:Number($('#generation-center_y').value),fit:$('#generation-fit').value,profile:$('#generation-profile').value,caption:$('#generation-caption').checked});
bind('generation-preview',async()=>{if(!$('#generation-form').reportValidity())return;const id=$('#generation-picture').value;if(!id)throw new Error(tr('请先选入源画面','Import a source picture first'));const blob=await api('/api/v1/source-images/'+id+'/preview',{method:'POST',body:read(),binary:true});if(!$('#generation-preview-box'))return;const url=URL.createObjectURL(blob);state.blobs.push(url);$('#generation-preview-box').innerHTML=`${terminals.map(t=>`${esc(terminalLabel(t))} `).join('')}
${esc(terminalLabel(terminal))} ${tr('来源图库：','Source library: ')}${esc(source?.name||tr('未绑定','Not bound'))} · ${tr('生成方案：','Generation plan: ')}${esc(plan?.name||tr('未选择','Not selected'))}
${terminal.transport_supported?tr('生成、上传和设备确认分别记录；已生成不等于已显示。','Generation, upload and device confirmation are tracked separately. Generated does not mean displayed.'):tr('当前手表屏幕 410×502，传输尚未接入；这里管理生成成品。','Current watch screen: 410×502. Transfer is not connected; this library manages generated versions.')}
${tr('设置来源与方案（各单选）','Bind one source and one plan')} ${terminal.binding?`${tr('解除绑定','Unbind')} ${tr('查看来源与生成版本','View source and versions')} `:''}${terminal.kind==='watch'?tr('旧版小图图库','Legacy watch gallery'):tr('设备已有云端图片','Existing device cloud images')}
${page.items.map((v,i)=>`
${esc(v.name)} ${v.plan.width} × ${v.plan.height} · ${esc(v.plan.name)} ${esc(libraryStatus(v.delivery_status))} · ${esc(fmt(v.created_at))} ${tr('预览','Preview')} ${tr('下载图片','Download image')} ${tr('生成参数','Generation settings')} ${v.operation?`${tr('推送记录','Delivery history')} `:''}${tr('推送到终端','Send to terminal')}
`).join('')}
${tr('尚无对应成品。绑定来源与方案后，在来源图库选入照片并生成。','No matching versions. Bind a source and plan, then import and generate in the source library.')} `}`;
+ $('#library-content').innerHTML=`${terminals.map(t=>`${esc(terminalLabel(t))} `).join('')}
${esc(terminalLabel(terminal))} ${tr('来源图库：','Source library: ')}${esc(source?.name||tr('未绑定','Not bound'))} · ${tr('生成方案：','Generation plan: ')}${esc(plan?.name||tr('未选择','Not selected'))}
${terminal.transport_supported?tr('生成、上传和设备确认分别记录；已生成不等于已显示。','Generation, upload and device confirmation are tracked separately. Generated does not mean displayed.'):tr('当前手表屏幕 410×502，传输尚未接入；这里管理生成成品。','Current watch screen: 410×502. Transfer is not connected; this library manages generated versions.')}
${tr('设置来源与方案（各单选）','Bind one source and one plan')} ${terminal.binding?`${tr('解除绑定','Unbind')} ${tr('查看来源与生成版本','View source and versions')} `:''}
${page.items.map((v,i)=>`
${esc(v.name)} ${v.plan.width} × ${v.plan.height} · ${esc(v.plan.name)} ${esc(libraryStatus(v.delivery_status))} · ${esc(fmt(v.created_at))} ${tr('预览','Preview')} ${tr('下载图片','Download image')} ${tr('生成参数','Generation settings')} ${v.operation?`${tr('推送记录','Delivery history')} `:''}${tr('推送到终端','Send to terminal')}
`).join('')}
${tr('尚无对应成品。绑定来源与方案后，在来源图库选入照片并生成。','No matching versions. Bind a source and plan, then import and generate in the source library.')} `}`;
document.querySelectorAll('[data-library-terminal]').forEach(b=>b.onclick=()=>{if(b.dataset.libraryTerminal===libraryUI.terminal)return;libraryUI.terminal=b.dataset.libraryTerminal;libraryUI.offset=0;state.tab=libraryUI.terminal==='watch'?'watch':'cloud';if(libraryUI.terminal!=='watch')state.device=libraryUI.terminal;return navigate();});
- bind('library-binding',()=>terminalBindingEditor(terminal,sources));bind('library-unbind',()=>confirmDialog(tr('解除终端绑定？已有图片保留，后续来源任务不再向此终端输出。','Unbind this terminal? Images are kept; future source tasks will not output to it.'),async()=>{await api('/api/v1/library-terminals/'+encodeURIComponent(terminal.id)+'/binding',{method:'DELETE'});await navigate();}));
+ bind('library-binding',()=>terminalBindingEditor(terminal,sources));bind('library-unbind',()=>confirmDialog(tr(`确认解除“${terminalLabel(terminal)}”与来源图库及生成方案的绑定？已有图片保留，后续来源任务不再向此终端输出。`,`Unbind “${terminalLabel(terminal)}” from its source library and generation plan? Images are kept; future source tasks will not output to it.`),async()=>{await api('/api/v1/library-terminals/'+encodeURIComponent(terminal.id)+'/binding',{method:'DELETE'});await navigate();}));
bind('library-to-source',()=>{libraryUI.source=terminal.binding.source_id;libraryUI.plan=terminal.binding.plan_id;libraryUI.offset=0;state.tab='local';return navigate('gallery');});
- bind('library-old-terminal',()=>{if(terminal.id!=='watch')state.device=terminal.id;return libraryLegacy(terminal.id==='watch'?'watch':'cloud');});
bind('terminal-prev',()=>{libraryUI.offset=Math.max(0,libraryUI.offset-30);return navigate();});bind('terminal-next',()=>{libraryUI.offset+=30;return navigate();});
document.querySelectorAll('[data-terminal-preview]').forEach(b=>b.onclick=busy(()=>{const v=page.items[b.dataset.terminalPreview];return openImageViewer(v.url,v.name);}));
document.querySelectorAll('[data-terminal-download]').forEach(b=>b.onclick=busy(()=>{const v=page.items[b.dataset.terminalDownload];return downloadImage(v.url,v.name);}));
@@ -107,13 +92,13 @@ async function terminalBindingEditor(terminal,sources){
$('#binding-source').onchange=busy(()=>load(null));$('#terminal-binding-form').onsubmit=busy(async e=>{e.preventDefault();await api('/api/v1/library-terminals/'+encodeURIComponent(terminal.id)+'/binding',{method:'PUT',body:{source_id:$('#binding-source').value,plan_id:$('#binding-plan').value}});$('#modal').close();await navigate();});await load(terminal.binding?.plan_id);
}
-$('#device').onchange=()=>{const id=$('#device').value;if(id==='@watch'||['terminal-gallery','legacy-gallery'].includes(state.page)){libraryUI.kind='terminal';libraryUI.terminal=id==='@watch'?'watch':id;libraryUI.offset=0;state.tab=id==='@watch'?'watch':'cloud';if(id!=='@watch')state.device=id;return navigate('terminal-gallery');}state.device=id;return navigate();};
+$('#device').onchange=()=>{const id=$('#device').value;if(id==='@watch'||state.page==='terminal-gallery'){libraryUI.kind='terminal';libraryUI.terminal=id==='@watch'?'watch':id;libraryUI.offset=0;state.tab=id==='@watch'?'watch':'cloud';if(id!=='@watch')state.device=id;return navigate('terminal-gallery');}state.device=id;return navigate();};
async function libraryJobFields(job,isNew){
const box=document.createElement('section');box.innerHTML=`${tr('选一次照片并保存源画面，按来源内的终端绑定分别生成；同一方案共用成品。相框继续走上传和显示确认，手表仅生成。此模式不再单独选择“小图方案”。旧任务默认保留原模式，勾选后切换。','Select one photo, save source pixels and generate each bound plan. Terminals sharing a plan share its version. Frames upload and confirm display; watches generate only. Legacy tasks keep their old mode until enabled.')}
`;
$('#job-form .modal-actions').before(box);
const kind=$('#job-content-type'),pipeline=$('#job-library-pipeline');
- const update=()=>{const supported=kind.value==='photo_source';box.hidden=!supported;$('#legacy-thumbnail-job-fields').hidden=!supported||pipeline.checked;pipeline.disabled=!supported;if(!supported)pipeline.checked=false;if(pipeline.checked){$('#job-thumbnail').checked=false;$('#job-thumbnail').disabled=true;$('#job-thumbnail-plan').required=false;$('#job-thumbnail-plan').disabled=true;}else{ $('#job-thumbnail').disabled=!supported;}};
+ const update=()=>{const supported=kind.value==='photo_source';box.hidden=!supported;$('#legacy-thumbnail-job-fields').hidden=!supported||pipeline.checked||(!job.generate_thumbnail&&!job.thumbnail_plan_id);pipeline.disabled=!supported;if(!supported)pipeline.checked=false;if(pipeline.checked){$('#job-thumbnail').checked=false;$('#job-thumbnail').disabled=true;$('#job-thumbnail-plan').required=false;$('#job-thumbnail-plan').disabled=true;}else{ $('#job-thumbnail').disabled=!supported;}};
kind.addEventListener('change',()=>{if(isNew&&kind.value==='photo_source')pipeline.checked=true;update();});pipeline.onchange=update;update();
}
diff --git a/pigway_frame_flow/web/style.css b/pigway_frame_flow/web/style.css
index b579ec0..775f21c 100644
--- a/pigway_frame_flow/web/style.css
+++ b/pigway_frame_flow/web/style.css
@@ -172,12 +172,6 @@ body.login-mode header,body.login-mode footer{flex-shrink:0}
.image-card .actions{gap:6px}
.image-card .actions button{white-space:nowrap}
-.gallery-filters{align-items:end}
-.gallery-filters-local{grid-template-columns:repeat(4,minmax(0,1fr))}
-.gallery-filters .field{min-width:0}
-@media(max-width:1050px){.gallery-filters{grid-template-columns:repeat(2,minmax(0,1fr))}}
-@media(max-width:720px){.gallery-filters{grid-template-columns:minmax(0,1fr)}}
-.gallery-filters input,.gallery-filters select{height:46px}
.automation-status{color:var(--accent)}
.automation-table td{vertical-align:middle}
@@ -248,16 +242,12 @@ form#history-filters{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));
@media(max-width:1050px){form#history-filters{grid-template-columns:repeat(2,minmax(0,1fr))}}
@media(max-width:720px){form#history-filters{grid-template-columns:minmax(0,1fr)}}
-.source-photo{min-width:0;display:flex;flex-direction:column;gap:12px;padding:14px;border:1px solid var(--border);border-radius:12px}
-.source-photo>[data-source-item]{width:100%;text-align:left;overflow-wrap:anywhere}
-.source-photo .actions{margin-top:auto}
.excluded-photo{display:block;color:var(--muted);font-size:12px}
.image-card>small{display:block}
.photo-mark{display:block;color:var(--accent);font-size:12px}
.image-card{display:flex;flex-direction:column}
-.image-card>.asset-select{align-self:flex-start}
.image-card>.actions{margin-top:auto;padding-top:12px;justify-content:flex-start}
.disabled-mark-hint{display:inline-flex;max-width:100%;cursor:help}
diff --git a/pigway_frame_flow/web/thumbnails.js b/pigway_frame_flow/web/thumbnails.js
index b3ba8f0..88fe8ea 100644
--- a/pigway_frame_flow/web/thumbnails.js
+++ b/pigway_frame_flow/web/thumbnails.js
@@ -1,48 +1,9 @@
'use strict';
-Object.assign(MESSAGES.zh, {thumbnails:'小图方案',thumbnailPlanInUse:'此方案已被任务或待处理操作使用，请先取消关联或更换方案。'});
-Object.assign(MESSAGES.en, {thumbnails:'Thumbnail plans',thumbnailPlanInUse:'This plan is used by a task or pending operation. Unlink it or select another plan first.'});
-
-views.thumbnails=async function(epoch){
- const [plans,sources]=await Promise.all([api('/api/v1/thumbnail-plans'),api('/api/v1/photo-sources')]);
- if(epoch!==state.epoch)return;
- $('#main').innerHTML=`${tr('新建方案','New plan')} ${plans.map(p=>`${esc(p.name)} · ${p.width}×${p.height} `).join('')}${t('delete')}
${tr('预览与生成','Preview and generate')} ${t('source')} ${tr('选择照片数据源','Choose photo source')} ${sources.map(s=>`${esc(s.name)} `).join('')}
${tr('源图片','Source image')}
${tr('上一页','Previous page')} ${tr('下一页','Next page')} ${tr('预览小图','Preview thumbnail')} ${tr('生成并保存到小图图库','Generate and save to thumbnail gallery')}
${tr('查看手表小图图库','Open watch thumbnail gallery')}
${esc(i.name)} `).join('');$('#thumb-prev').disabled=offset===0;$('#thumb-next').disabled=offset+50>=page.total;}
- $('#thumb-source').onchange=busy(async()=>{offset=0;await images();});
- bind('thumb-prev',async()=>{offset=Math.max(0,offset-50);await images();});bind('thumb-next',async()=>{offset+=50;await images();});
- function payload(){if(!$('#thumb-form').reportValidity())throw new Error(tr('请补全方案参数','Complete the plan parameters'));if(!$('#thumb-item').value)throw new Error(tr('请选择源图片','Choose a source image'));return {source_id:$('#thumb-source').value,item_id:$('#thumb-item').value,plan:read()};}
- bind('thumb-preview',async()=>{const blob=await api('/api/v1/thumbnails/preview',{method:'POST',body:payload(),binary:true});if(epoch!==state.epoch)return;const url=URL.createObjectURL(blob);state.blobs.push(url);$('#thumb-image').src=url;$('#thumb-image').hidden=false;$('#thumb-result').textContent=tr('预览未保存','Preview is not saved');});
- bind('thumb-generate',async()=>{const asset=await api('/api/v1/thumbnails/generate',{method:'POST',body:payload()});if(epoch!==state.epoch)return;$('#thumb-image').hidden=false;await blobImage($('#thumb-image'),asset.url);$('#thumb-result').textContent=tr('已保存到手表小图图库：','Saved to watch thumbnail gallery: ')+asset.name;});
-};
-
+// Compatibility controls for existing thumbnail tasks; legacy gallery pages are retired.
async function thumbnailJobFields(job){
const plans=await api('/api/v1/thumbnail-plans');if(!$('#job-form'))return;
- const box=document.createElement('section');box.id='legacy-thumbnail-job-fields';box.innerHTML=`${tr('小图生成方案（单选）','Thumbnail plan (choose one)')} ${tr('请选择已保存方案','Choose a saved plan')} ${plans.map(p=>`${esc(p.name)} · ${p.width}×${p.height} `).join('')}
${tr('仅支持照片数据源任务；上传成功后使用源画面生成。请先在“小图方案”中保存方案。','For photo-source tasks only; generates from source pixels after upload succeeds. Save a plan in Thumbnail plans first.')}
`;
+ const box=document.createElement('section');box.id='legacy-thumbnail-job-fields';box.hidden=!job.generate_thumbnail&&!job.thumbnail_plan_id;box.innerHTML=`${tr('小图生成方案（单选）','Thumbnail plan (choose one)')} ${tr('请选择已保存方案','Choose a saved plan')} ${plans.map(p=>`${esc(p.name)} · ${p.width}×${p.height} `).join('')}
${tr('仅支持照片数据源任务；上传成功后使用源画面生成。新任务请使用来源图库生成方案与终端绑定。','For photo-source tasks only; generates from source pixels after upload succeeds. New tasks should use source-library plans and terminal bindings.')}
`;
$('#job-form .modal-actions').before(box);
const update=()=>{const supported=$('#job-content-type')?.value==='photo_source';$('#job-thumbnail').disabled=!supported;if(!supported)$('#job-thumbnail').checked=false;$('#job-thumbnail-plan').disabled=!$('#job-thumbnail').checked;$('#job-thumbnail-plan').required=$('#job-thumbnail').checked;};
$('#job-thumbnail').onchange=update;$('#job-content-type')?.addEventListener('change',update);update();
}
-
-async function watchGalleryPage(epoch,destinations){
- const offset=state.watchOffset||0;
- const [page,devices]=await Promise.all([api('/api/v1/thumbnails?limit=50&offset='+offset),api('/api/v1/thumbnail-devices')]);
- if(epoch!==state.epoch)return;
- const watch=devices.find(d=>d.id==='watch');
- $('#main').innerHTML=`${destinations.map(d=>`${esc(galleryDestinationName(d))} `).join('')}
${t('refresh')} ${tr('手表','Watch')} · ${watch.width} × ${watch.height} ${tr('独立小图设备 · 图片已保存在服务器；设备传输尚未接入。','Separate thumbnail device · Images are saved on the server; device transfer is not connected.')}
${tr('管理小图方案 / 生成图片','Manage plans / Generate images')} ${tr('上一页','Previous page')} =page.total?'disabled':''}>${tr('下一页','Next page')} ${tr('共','Total')} ${page.total} ${tr('张小图','thumbnails')}
${page.items.map((x,i)=>`
${esc(x.name)} ${x.thumbnail.width} × ${x.thumbnail.height} · ${esc(x.thumbnail.plan?.name||tr('默认手表方案','Default watch plan'))} ${esc(fmt(x.thumbnail.generated_at||x.created_at))} ${tr('预览','Preview')} ${tr('下载图片','Download image')} ${t('delete')}
`).join('')}
${tr('还没有小图','No thumbnails yet')} ${tr('在“小图方案”中生成，或为照片任务勾选生成小图。旧版手动生成的小图仍在原本地图库。','Generate one in Thumbnail plans or enable thumbnails on a photo task. Older manually generated images remain in the original local gallery.')}