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);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(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]'));});
+ 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=excluded?t('clearExclusionFirst'):'';$('#asset-batch-exclude').disabled=!selected.length||starred;$('#asset-batch-exclude').title=starred?t('clearStarFirst'):'';};
+ 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();
+ }
$('#gallery-search').value=state.galleryQuery||'';$('#gallery-sort').value=state.galleryOrder||'newest';$('#gallery-search').oninput();$('#gallery-sort').onchange();
}
async function weatherSettings(){
@@ -157,7 +162,7 @@ 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')} ${t('excludePhotoHelp')}
${result.items.map((x,i)=>`
${x.excluded?`${t('photoExcluded')}`:''}`).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.starred?`${t('photoStarred')}`:''}${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));
}
diff --git a/pigway_frame_flow/web/i18n.js b/pigway_frame_flow/web/i18n.js
index 1afc130..f1b8a02 100644
--- a/pigway_frame_flow/web/i18n.js
+++ b/pigway_frame_flow/web/i18n.js
@@ -153,7 +153,9 @@ 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.'});
+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 are retained; manual use and restoring eligibility remain available. Starred and excluded states are mutually exclusive; clear the current mark before switching. Preferences are saved separately per library.'});
Object.assign(MESSAGES.zh,{downloadShort:'下载图片'});Object.assign(MESSAGES.en,{downloadShort:'Download'});
+
+Object.assign(MESSAGES.zh,{photoStarred:'已星标保留',clearExclusionFirst:'请先恢复选用，再设置星标保留',clearStarFirst:'请先取消星标，再设置不再选用'});Object.assign(MESSAGES.en,{photoStarred:'Starred for retention',clearExclusionFirst:'Allow selection before starring',clearStarFirst:'Remove the star before excluding'});
diff --git a/pigway_frame_flow/web/style.css b/pigway_frame_flow/web/style.css
index f29829d..25bd893 100644
--- a/pigway_frame_flow/web/style.css
+++ b/pigway_frame_flow/web/style.css
@@ -252,3 +252,6 @@ form#history-filters{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));
.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}
diff --git a/tests/test_photo_preferences.py b/tests/test_photo_preferences.py
index 6818913..136eb6b 100644
--- a/tests/test_photo_preferences.py
+++ b/tests/test_photo_preferences.py
@@ -26,10 +26,26 @@ def test_local_exclusion_star_and_restore(client, service):
== 200
)
result = client.put(f"/api/v1/assets/{excluded}/exclusion", json={"excluded": True})
+ assert result.status_code == 409
+ client.put(f"/api/v1/assets/{excluded}/star", json={"starred": False})
+ 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"]
+ and not result.json()["starred"]
+ )
+ assert (
+ client.put(
+ f"/api/v1/assets/{excluded}/star", json={"starred": True}
+ ).status_code
+ == 409
+ )
+ batch = client.post(
+ "/api/v1/assets/batch", json={"asset_ids": [excluded], "action": "star"}
+ ).json()
+ assert (
+ batch["results"][0]["status"] == "failed"
+ and batch["results"][0]["code"] == "CONFLICT"
)
assert next(
x for x in client.get("/api/v1/assets").json() if x["asset_id"] == excluded
@@ -57,7 +73,13 @@ def test_local_exclusion_star_and_restore(client, service):
restored = client.put(
f"/api/v1/assets/{excluded}/exclusion", json={"excluded": False}
).json()
- assert not restored["excluded"] and restored["starred"]
+ assert not restored["excluded"] and not restored["starred"]
+ assert (
+ client.put(
+ f"/api/v1/assets/{excluded}/star", json={"starred": True}
+ ).status_code
+ == 200
+ )
assert service.content_asset(
AutoCollageContent(type="auto_collage", count=1, use_ai=False)
)
@@ -77,11 +99,21 @@ def test_source_preferences_are_scoped_and_do_not_mutate_cached_catalog(
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}).status_code
+ == 409
+ )
+ assert (
+ client.put(
+ url, json={"item_id": items[0]["id"], "starred": True, "excluded": True}
+ ).status_code
+ == 409
+ )
assert client.put(
- url, json={"item_id": items[0]["id"], "excluded": True}
- ).json() == {"starred": True, "excluded": True}
+ url, json={"item_id": items[0]["id"], "starred": False, "excluded": True}
+ ).json() == {"starred": False, "excluded": True}
result = client.get("/api/v1/photo-sources/drive/images").json()["items"][0]
- assert result["starred"] and result["excluded"]
+ assert not 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
@@ -104,7 +136,7 @@ def test_source_preferences_are_scoped_and_do_not_mutate_cached_catalog(
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,
+ "starred": False,
"excluded": False,
}
@@ -120,3 +152,86 @@ def test_preference_persistence(settings):
reopened = Database(path)
assert flags(reopened, "drive", "item")["excluded"]
reopened.conn.close()
+
+
+@pytest.mark.parametrize("value", ["true", "false", 1, 0, [], {}])
+def test_marks_reject_non_boolean_payloads(client, service, value):
+ key = photo(service, "fixture.jpg", "red")["asset_id"]
+ assert (
+ client.put(f"/api/v1/assets/{key}/star", json={"starred": value}).status_code
+ == 422
+ )
+ assert (
+ client.put(
+ f"/api/v1/assets/{key}/exclusion", json={"excluded": value}
+ ).status_code
+ == 422
+ )
+ assert (
+ client.put(
+ "/api/v1/photo-sources/drive/preferences",
+ json={"item_id": "fixture", "starred": value},
+ ).status_code
+ == 422
+ )
+
+
+def test_asset_marks_are_mutually_exclusive_under_concurrent_requests(client, service):
+ from concurrent.futures import ThreadPoolExecutor
+
+ key = photo(service, "fixture.jpg", "blue")["asset_id"]
+
+ def request_star():
+ return client.put(
+ f"/api/v1/assets/{key}/star", json={"starred": True}
+ ).status_code
+
+ def request_exclusion():
+ return client.put(
+ f"/api/v1/assets/{key}/exclusion", json={"excluded": True}
+ ).status_code
+
+ with ThreadPoolExecutor(max_workers=2) as pool:
+ first = pool.submit(request_star)
+ second = pool.submit(request_exclusion)
+ assert sorted([first.result(), second.result()]) == [200, 409]
+ final = service.assets.info(key)
+ assert final["starred"] != final["excluded"]
+
+
+def test_source_marks_are_mutually_exclusive_under_concurrent_requests(service):
+ from concurrent.futures import ThreadPoolExecutor
+
+ def change(**mark):
+ try:
+ set_flags(service.db, "drive", "fixture", **mark)
+ return 200
+ except FlowError as error:
+ return error.status
+
+ with ThreadPoolExecutor(max_workers=2) as pool:
+ first = pool.submit(change, starred=True)
+ second = pool.submit(change, excluded=True)
+ assert sorted([first.result(), second.result()]) == [200, 409]
+ final = flags(service.db, "drive", "fixture")
+ assert final["starred"] != final["excluded"]
+
+
+def test_batch_exclusion_rejects_starred_and_unknown_payload_fields(client, service):
+ key = photo(service, "fixture.jpg", "red")["asset_id"]
+ assert (
+ client.put(
+ f"/api/v1/assets/{key}/star", json={"starred": True, "excluded": False}
+ ).status_code
+ == 422
+ )
+ client.put(f"/api/v1/assets/{key}/star", json={"starred": True})
+ result = client.post(
+ "/api/v1/assets/batch", json={"asset_ids": [key], "action": "exclude"}
+ ).json()
+ assert (
+ result["results"][0]["status"] == "failed"
+ and result["results"][0]["code"] == "CONFLICT"
+ )
+ final = service.assets.info(key)
+ assert final["starred"] and not final["excluded"]