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));card.querySelector('.actions').append(star);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('download');card.querySelector('.actions').append(download);download.onclick=busy(()=>downloadImage(item.url,item.name));if(state.tab==='local'){const edit=document.createElement('button');edit.textContent=t('continueEdit');card.querySelector('.actions').append(edit);edit.onclick=busy(async()=>{const meta=await api('/api/v1/assets/'+item.asset_id+'/source');if(meta.source?.type==='template')await editTemplateSource(meta.source);else toast(t('templateSourceUnavailable'));});}});
+ 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));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)));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.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('download');card.querySelector('.actions').append(download);download.onclick=busy(()=>downloadImage(item.url,item.name));if(state.tab==='local'){const edit=document.createElement('button');edit.textContent=t('continueEdit');card.querySelector('.actions').append(edit);edit.onclick=busy(async()=>{const meta=await api('/api/v1/assets/'+item.asset_id+'/source');if(meta.source?.type==='template')await editTemplateSource(meta.source);else toast(t('templateSourceUnavailable'));});}});
$('#gallery-search').value=state.galleryQuery||'';$('#gallery-sort').value=state.galleryOrder||'newest';$('#gallery-search').oninput();$('#gallery-sort').onchange();
}
async function weatherSettings(){
@@ -157,7 +157,8 @@ async function photoSourceForm(source=null){
}
async function browseSource(id,offset=0,refresh=false){
const result=await api('/api/v1/photo-sources/'+id+'/images?device_id='+encodeURIComponent(state.device)+'&offset='+offset+'&limit=50&refresh='+refresh);const box=$('#source-browser');if(!box)return;
- box.innerHTML=`${t('sourceImages')} · ${result.total}${result.total>=result.catalog_limit?' (limit)':''}
${t('sourceBrowseHint')}
${result.items.map((x,i)=>``).join('')||t('noSourcePhotos')}
${buttons('source-refresh','refresh')}
`;
+ box.innerHTML=`${t('sourceImages')} · ${result.total}${result.total>=result.catalog_limit?' (limit)':''}
${t('sourceBrowseHint')} ${t('excludePhotoHelp')}
${result.items.map((x,i)=>`
${x.excluded?`${t('photoExcluded')}`:''}`).join('')||t('noSourcePhotos')}
${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);}));
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){
diff --git a/pigway_frame_flow/web/i18n.js b/pigway_frame_flow/web/i18n.js
index 274cb65..6cf026e 100644
--- a/pigway_frame_flow/web/i18n.js
+++ b/pigway_frame_flow/web/i18n.js
@@ -152,3 +152,6 @@ Object.assign(MESSAGES.en,{RESTORE_IMAGE_PROTECTED:'This image is still needed t
Object.assign(MESSAGES.zh,{searchHistory:'搜索图片名称、请求 ID、任务 ID 或来源',allStatuses:'全部状态',allActions:'全部操作',allDevices:'全部设备',startDate:'开始日期',endDate:'结束日期',filter:'筛选',resetFilters:'重置筛选',dateRangeInvalid:'结束日期不能早于开始日期',historyTotal:'共 {count} 条',pageSize:'每页条数',historySelected:'已选 {count} 条（仅当前页）',selectHistory:'选择记录',deleteHistoryConfirm:'确认删除这 {count} 条历史记录？记录将从历史列表移除，不会删除图片或取消任务。此操作无法撤销。'});
Object.assign(MESSAGES.en,{searchHistory:'Search image name, request ID, operation ID or client',allStatuses:'All statuses',allActions:'All actions',allDevices:'All devices',startDate:'Start date',endDate:'End date',filter:'Filter',resetFilters:'Reset filters',dateRangeInvalid:'End date must not precede start date',historyTotal:'{count} records',pageSize:'Rows per page',historySelected:'{count} selected (current page only)',selectHistory:'Select record',deleteHistoryConfirm:'Delete these {count} history records? This removes them from history without deleting images or cancelling tasks. This cannot be undone.'});
+
+Object.assign(MESSAGES.zh,{excludePhoto:'不再选用',includePhoto:'恢复选用',photoExcluded:'已标记不再选用',excludePhotoHelp:'不再选用的图片将被后续自动选图和自动拼图跳过；图片不删除，星标独立保留，仍可手动使用或恢复选用。标记按图库独立保存。'});
+Object.assign(MESSAGES.en,{excludePhoto:'Exclude from selection',includePhoto:'Allow selection',photoExcluded:'Excluded from selection',excludePhotoHelp:'Excluded photos are skipped by future automatic selection and collages. Photos and stars are retained; manual use and restoring eligibility remain available. Preferences are saved separately per library.'});
diff --git a/pigway_frame_flow/web/style.css b/pigway_frame_flow/web/style.css
index 0811fc3..f29829d 100644
--- a/pigway_frame_flow/web/style.css
+++ b/pigway_frame_flow/web/style.css
@@ -247,3 +247,8 @@ form#history-filters{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));
.history-pagination select{width:auto}
@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}
diff --git a/tests/contract.json b/tests/contract.json
index c446f08..6a74c2c 100644
--- a/tests/contract.json
+++ b/tests/contract.json
@@ -1478,5 +1478,37 @@
"502",
"503"
]
+ },
+ "/api/v1/assets/{asset_id}/exclusion": {
+ "put": [
+ "200",
+ "400",
+ "401",
+ "403",
+ "404",
+ "409",
+ "413",
+ "422",
+ "429",
+ "500",
+ "502",
+ "503"
+ ]
+ },
+ "/api/v1/photo-sources/{source_id}/preferences": {
+ "put": [
+ "200",
+ "400",
+ "401",
+ "403",
+ "404",
+ "409",
+ "413",
+ "422",
+ "429",
+ "500",
+ "502",
+ "503"
+ ]
}
}
diff --git a/tests/schema-contract.json b/tests/schema-contract.json
index 195db6c..480d577 100644
--- a/tests/schema-contract.json
+++ b/tests/schema-contract.json
@@ -1246,6 +1246,16 @@
},
"PhotoItem": {
"properties": {
+ "starred": {
+ "type": "boolean",
+ "title": "Starred",
+ "default": false
+ },
+ "excluded": {
+ "type": "boolean",
+ "title": "Excluded",
+ "default": false
+ },
"id": {
"type": "string",
"title": "Id"
diff --git a/tests/test_photo_preferences.py b/tests/test_photo_preferences.py
new file mode 100644
index 0000000..6818913
--- /dev/null
+++ b/tests/test_photo_preferences.py
@@ -0,0 +1,122 @@
+import json
+from io import BytesIO
+
+import pytest
+from PIL import Image
+
+from pigway_frame_flow.core.photo_preferences import eligible, flags, set_flags
+from pigway_frame_flow.errors import FlowError
+from pigway_frame_flow.models import AutoCollageContent, PhotoSourceContent
+from pigway_frame_flow.providers.photo_sources import PhotoSourceInput
+
+
+def photo(service, name, color):
+ data = BytesIO()
+ Image.new("RGB", (320, 240), color).save(data, "JPEG")
+ return service.assets.put(data.getvalue(), name)
+
+
+def test_local_exclusion_star_and_restore(client, service):
+ excluded = photo(service, "excluded.jpg", "red")["asset_id"]
+ allowed = photo(service, "allowed.jpg", "blue")["asset_id"]
+ assert (
+ client.put(
+ f"/api/v1/assets/{excluded}/star", json={"starred": True}
+ ).status_code
+ == 200
+ )
+ result = client.put(f"/api/v1/assets/{excluded}/exclusion", json={"excluded": True})
+ assert (
+ result.status_code == 200
+ and result.json()["excluded"]
+ and result.json()["starred"]
+ )
+ assert next(
+ x for x in client.get("/api/v1/assets").json() if x["asset_id"] == excluded
+ )["excluded"]
+ asset = service.content_asset(
+ AutoCollageContent(type="auto_collage", count=1, use_ai=False)
+ )
+ saved = json.loads(
+ service.db.one(
+ "SELECT payload FROM asset_sources WHERE asset_id=?", (asset["asset_id"],)
+ )["payload"]
+ )
+ assert [r["asset_id"] for r in saved["data"]["layout"]["regions"]] == [allowed]
+ assert service.assets.path(excluded).is_file()
+ assert (
+ client.post(
+ "/api/v1/assets/batch", json={"asset_ids": [allowed], "action": "exclude"}
+ ).json()["results"][0]["status"]
+ == "completed"
+ )
+ with pytest.raises(FlowError):
+ service.content_asset(
+ AutoCollageContent(type="auto_collage", count=1, use_ai=False)
+ )
+ restored = client.put(
+ f"/api/v1/assets/{excluded}/exclusion", json={"excluded": False}
+ ).json()
+ assert not restored["excluded"] and restored["starred"]
+ assert service.content_asset(
+ AutoCollageContent(type="auto_collage", count=1, use_ai=False)
+ )
+
+
+def test_source_preferences_are_scoped_and_do_not_mutate_cached_catalog(
+ client, service, monkeypatch
+):
+ source = PhotoSourceInput(
+ name="Drive", kind="webdav", location="https://photos.example.test/dav"
+ )
+ items = [{"id": "folder/photo.jpg", "name": "photo.jpg"}]
+ monkeypatch.setattr(service.photo_sources, "get", lambda _: source)
+ monkeypatch.setattr(service.photo_sources, "catalog", lambda *args, **kwargs: items)
+ url = "/api/v1/photo-sources/drive/preferences"
+ assert (
+ client.put(url, json={"item_id": items[0]["id"], "starred": True}).status_code
+ == 200
+ )
+ assert client.put(
+ url, json={"item_id": items[0]["id"], "excluded": True}
+ ).json() == {"starred": True, "excluded": True}
+ result = client.get("/api/v1/photo-sources/drive/images").json()["items"][0]
+ assert result["starred"] and result["excluded"]
+ assert "excluded" not in items[0]
+ assert eligible(service.db, "drive", items) == []
+ assert eligible(service.db, "another-drive", items) == items
+ assert (
+ client.put(url, json={"item_id": "missing", "excluded": True}).status_code
+ == 404
+ )
+ with pytest.raises(FlowError):
+ service.content_asset(
+ AutoCollageContent(
+ type="auto_collage", source_id="drive", count=1, use_ai=False
+ )
+ )
+ with pytest.raises(FlowError):
+ service.photo_sources.read("drive")
+ with pytest.raises(FlowError):
+ service.content_asset(
+ PhotoSourceContent(type="photo_source", source_id="drive")
+ )
+ client.put(url, json={"item_id": items[0]["id"], "excluded": False})
+ assert eligible(service.db, "drive", items) == items
+ assert flags(service.db, "drive", items[0]["id"]) == {
+ "starred": True,
+ "excluded": False,
+ }
+
+
+def test_preference_persistence(settings):
+ from pigway_frame_flow.storage.database import Database
+
+ path = settings.data_dir / "preferences.db"
+ path.parent.mkdir(parents=True, exist_ok=True)
+ db = Database(path)
+ set_flags(db, "drive", "item", excluded=True)
+ db.conn.close()
+ reopened = Database(path)
+ assert flags(reopened, "drive", "item")["excluded"]
+ reopened.conn.close()