fix(catalog): ensure variant_image falls back to verified existing product images on disk
This commit is contained in:
parent
f2cc4f36f8
commit
fa9b058914
1 changed files with 24 additions and 4 deletions
|
|
@ -981,19 +981,39 @@ def get_products(
|
||||||
return " ".join(vals)
|
return " ".join(vals)
|
||||||
|
|
||||||
def _variant_image(v, product) -> Optional[str]:
|
def _variant_image(v, product) -> Optional[str]:
|
||||||
"""Variant-specific image with product-level fallback."""
|
"""Variant-specific image with verified file existence and product-level fallback."""
|
||||||
if v.images:
|
if v.images:
|
||||||
return v.images[0].image_url
|
for vi in v.images:
|
||||||
|
if vi.image_url:
|
||||||
|
rel_path = vi.image_url.lstrip('/')
|
||||||
|
if not rel_path.startswith('uploads/') or os.path.exists(os.path.join(os.getcwd(), rel_path)):
|
||||||
|
return vi.image_url
|
||||||
|
|
||||||
if product.images:
|
if product.images:
|
||||||
|
for pi in product.images:
|
||||||
|
if pi.image_url:
|
||||||
|
rel_path = pi.image_url.lstrip('/')
|
||||||
|
if not rel_path.startswith('uploads/') or os.path.exists(os.path.join(os.getcwd(), rel_path)):
|
||||||
|
return pi.image_url
|
||||||
banner_img = next((img.image_url for img in product.images if img.is_banner), product.images[0].image_url)
|
banner_img = next((img.image_url for img in product.images if img.is_banner), product.images[0].image_url)
|
||||||
return banner_img
|
return banner_img
|
||||||
|
|
||||||
|
if v.images and v.images[0].image_url:
|
||||||
|
return v.images[0].image_url
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def _build_card(p, first_var, price, compare_price, discount_percent, stock_count) -> ProductCardResponse:
|
def _build_card(p, first_var, price, compare_price, discount_percent, stock_count) -> ProductCardResponse:
|
||||||
thumbnail_url = None
|
thumbnail_url = None
|
||||||
if p.images:
|
if p.images:
|
||||||
banner_img = next((img.image_url for img in p.images if img.is_banner), p.images[0].image_url)
|
for pi in p.images:
|
||||||
thumbnail_url = banner_img
|
if pi.image_url:
|
||||||
|
rel_path = pi.image_url.lstrip('/')
|
||||||
|
if not rel_path.startswith('uploads/') or os.path.exists(os.path.join(os.getcwd(), rel_path)):
|
||||||
|
thumbnail_url = pi.image_url
|
||||||
|
break
|
||||||
|
if not thumbnail_url:
|
||||||
|
banner_img = next((img.image_url for img in p.images if img.is_banner), p.images[0].image_url)
|
||||||
|
thumbnail_url = banner_img
|
||||||
elif first_var and first_var.images:
|
elif first_var and first_var.images:
|
||||||
thumbnail_url = first_var.images[0].image_url
|
thumbnail_url = first_var.images[0].image_url
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue