Add comprehensive logging to art provider for diagnosing missing art
All checks were successful
Build plugin / build (push) Successful in 1m11s
All checks were successful
Build plugin / build (push) Successful in 1m11s
This commit is contained in:
parent
a4834a39eb
commit
8a5dc41064
2 changed files with 37 additions and 6 deletions
|
|
@ -47,21 +47,34 @@ func get_boxart(item: LibraryItem, kind: LAYOUT) -> Texture2D:
|
||||||
|
|
||||||
var game := _itch_game(item)
|
var game := _itch_game(item)
|
||||||
if game.is_empty():
|
if game.is_empty():
|
||||||
|
logger.warn("No itch.io game metadata found for: " + item.name)
|
||||||
return null
|
return null
|
||||||
|
|
||||||
var game_id := int(game.get("id", 0))
|
var game_id := int(game.get("id", 0))
|
||||||
var title: String = game.get("title", "")
|
var title: String = game.get("title", "")
|
||||||
var cover_url := _cover_url(game)
|
var cover_url := _cover_url(game)
|
||||||
if title.is_empty() or cover_url.is_empty():
|
logger.info("get_boxart: title=%s id=%d cover_url=%s layout=%s" % [title, game_id, cover_url, str(kind)])
|
||||||
|
if title.is_empty():
|
||||||
|
logger.warn("Game title is empty for id %d" % game_id)
|
||||||
|
return null
|
||||||
|
if cover_url.is_empty():
|
||||||
|
logger.warn("No cover URL for: %s (id=%d)" % [title, game_id])
|
||||||
return null
|
return null
|
||||||
|
|
||||||
# Enrich on first access: scrape the itch.io page for screenshots.
|
# Enrich on first access: scrape the itch.io page for screenshots.
|
||||||
var meta: Dictionary = _enriched.get(game_id, {})
|
var meta: Dictionary = _enriched.get(game_id, {})
|
||||||
if meta.is_empty() and game.has("url"):
|
if meta.is_empty() and game.has("url"):
|
||||||
|
logger.info("Enriching metadata for: %s (url=%s)" % [title, game.get("url", "")])
|
||||||
meta = _fetch_game_page_metadata(game)
|
meta = _fetch_game_page_metadata(game)
|
||||||
if not meta.is_empty():
|
if meta.is_empty():
|
||||||
|
logger.warn("Page scrape returned no metadata for: %s" % title)
|
||||||
|
else:
|
||||||
_enriched[game_id] = meta
|
_enriched[game_id] = meta
|
||||||
_save_enriched_meta(game_id, meta)
|
_save_enriched_meta(game_id, meta)
|
||||||
|
elif not meta.is_empty():
|
||||||
|
logger.info("Using cached metadata for: %s (%d screenshots)" % [title, meta.get("screenshots", []).size()])
|
||||||
|
else:
|
||||||
|
logger.warn("No URL in game dict for: %s" % title)
|
||||||
|
|
||||||
var screenshots: Array = meta.get("screenshots", [])
|
var screenshots: Array = meta.get("screenshots", [])
|
||||||
var cache_flags := Cache.FLAGS.NONE
|
var cache_flags := Cache.FLAGS.NONE
|
||||||
|
|
@ -70,12 +83,13 @@ func get_boxart(item: LibraryItem, kind: LAYOUT) -> Texture2D:
|
||||||
|
|
||||||
# Banner: combine two screenshots side-by-side when available.
|
# Banner: combine two screenshots side-by-side when available.
|
||||||
if kind == LAYOUT.BANNER and screenshots.size() >= 2:
|
if kind == LAYOUT.BANNER and screenshots.size() >= 2:
|
||||||
logger.debug("Fetching itch.io banner (2 screenshots) for: " + item.name)
|
logger.info("Fetching itch.io banner (2 screenshots) for: " + item.name)
|
||||||
var tex_a := await http_image.fetch(screenshots[0], cache_flags)
|
var tex_a := await http_image.fetch(screenshots[0], cache_flags)
|
||||||
var tex_b := await http_image.fetch(screenshots[1], cache_flags)
|
var tex_b := await http_image.fetch(screenshots[1], cache_flags)
|
||||||
if tex_a != null and tex_b != null:
|
if tex_a != null and tex_b != null:
|
||||||
return _combine_side_by_side(tex_a, tex_b)
|
return _combine_side_by_side(tex_a, tex_b)
|
||||||
# Fall through to single-image path if either failed.
|
# Fall through to single-image path if either failed.
|
||||||
|
logger.warn("Banner screenshot fetch failed: tex_a=%s tex_b=%s" % [str(tex_a != null), str(tex_b != null)])
|
||||||
if tex_a != null:
|
if tex_a != null:
|
||||||
return tex_a
|
return tex_a
|
||||||
if tex_b != null:
|
if tex_b != null:
|
||||||
|
|
@ -83,23 +97,31 @@ func get_boxart(item: LibraryItem, kind: LAYOUT) -> Texture2D:
|
||||||
|
|
||||||
var url := _url_for_layout(kind, cover_url, screenshots)
|
var url := _url_for_layout(kind, cover_url, screenshots)
|
||||||
if url.is_empty():
|
if url.is_empty():
|
||||||
|
logger.warn("URL for layout %s is empty (cover=%s)" % [str(kind), cover_url])
|
||||||
return null
|
return null
|
||||||
|
|
||||||
logger.debug("Fetching itch.io box art for: " + item.name)
|
logger.info("Fetching itch.io box art for: %s layout=%s url=%s" % [item.name, str(kind), url.left(80)])
|
||||||
var texture: Texture2D = await http_image.fetch(url, cache_flags)
|
var texture: Texture2D = await http_image.fetch(url, cache_flags)
|
||||||
if texture == null:
|
if texture == null:
|
||||||
logger.debug("Image couldn't be downloaded for: " + item.name)
|
logger.warn("Image download returned null for: %s url=%s" % [item.name, url.left(80)])
|
||||||
return texture
|
return texture
|
||||||
|
|
||||||
|
|
||||||
## Finds the itch.io game dict from the library item's launch items.
|
## Finds the itch.io game dict from the library item's launch items.
|
||||||
func _itch_game(item: LibraryItem) -> Dictionary:
|
func _itch_game(item: LibraryItem) -> Dictionary:
|
||||||
|
if item.launch_items.is_empty():
|
||||||
|
logger.warn("Item has no launch items: " + item.name)
|
||||||
|
return {}
|
||||||
for launch_item in item.launch_items:
|
for launch_item in item.launch_items:
|
||||||
if launch_item._provider_id != "itch":
|
if launch_item._provider_id != "itch":
|
||||||
continue
|
continue
|
||||||
var game: Dictionary = launch_item.metadata.get("game", {})
|
var game: Dictionary = launch_item.metadata.get("game", {})
|
||||||
if not game.is_empty():
|
if not game.is_empty():
|
||||||
return game
|
return game
|
||||||
|
logger.warn("No itch.io launch item found for: %s (providers: %s)" % [
|
||||||
|
item.name,
|
||||||
|
PackedStringArray(item.launch_items.map(func(l): return l._provider_id))
|
||||||
|
])
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -151,22 +173,27 @@ func _combine_side_by_side(a: Texture2D, b: Texture2D) -> Texture2D:
|
||||||
func _fetch_game_page_metadata(game: Dictionary) -> Dictionary:
|
func _fetch_game_page_metadata(game: Dictionary) -> Dictionary:
|
||||||
var page_url: String = game.get("url", "")
|
var page_url: String = game.get("url", "")
|
||||||
if page_url.is_empty():
|
if page_url.is_empty():
|
||||||
|
logger.warn("No page URL in game dict")
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
|
logger.info("Scraping page for screenshots: " + page_url)
|
||||||
var http := HTTPClient.new()
|
var http := HTTPClient.new()
|
||||||
var parts := page_url.split("/")
|
var parts := page_url.split("/")
|
||||||
var use_tls := parts[0] == "https:"
|
var use_tls := parts[0] == "https:"
|
||||||
var err := http.connect_to_host(parts[2], 443 if use_tls else 80, TLSOptions.client() if use_tls else null)
|
var err := http.connect_to_host(parts[2], 443 if use_tls else 80, TLSOptions.client() if use_tls else null)
|
||||||
if err != OK:
|
if err != OK:
|
||||||
|
logger.warn("HTTP connect failed for %s: %d" % [page_url, err])
|
||||||
return {}
|
return {}
|
||||||
var deadline := Time.get_ticks_msec() + 15000
|
var deadline := Time.get_ticks_msec() + 15000
|
||||||
while http.get_status() == HTTPClient.STATUS_CONNECTING or http.get_status() == HTTPClient.STATUS_RESOLVING:
|
while http.get_status() == HTTPClient.STATUS_CONNECTING or http.get_status() == HTTPClient.STATUS_RESOLVING:
|
||||||
http.poll()
|
http.poll()
|
||||||
if Time.get_ticks_msec() > deadline:
|
if Time.get_ticks_msec() > deadline:
|
||||||
http.close()
|
http.close()
|
||||||
|
logger.warn("HTTP connect timed out for: " + page_url)
|
||||||
return {}
|
return {}
|
||||||
OS.delay_msec(50)
|
OS.delay_msec(50)
|
||||||
if http.get_status() != HTTPClient.STATUS_CONNECTED:
|
if http.get_status() != HTTPClient.STATUS_CONNECTED:
|
||||||
|
logger.warn("HTTP not connected for %s: status=%d" % [page_url, http.get_status()])
|
||||||
http.close()
|
http.close()
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
|
|
@ -176,6 +203,7 @@ func _fetch_game_page_metadata(game: Dictionary) -> Dictionary:
|
||||||
http.poll()
|
http.poll()
|
||||||
if Time.get_ticks_msec() > deadline:
|
if Time.get_ticks_msec() > deadline:
|
||||||
http.close()
|
http.close()
|
||||||
|
logger.warn("HTTP request timed out for: " + page_url)
|
||||||
return {}
|
return {}
|
||||||
OS.delay_msec(10)
|
OS.delay_msec(10)
|
||||||
|
|
||||||
|
|
@ -186,6 +214,7 @@ func _fetch_game_page_metadata(game: Dictionary) -> Dictionary:
|
||||||
if chunk.is_empty():
|
if chunk.is_empty():
|
||||||
if Time.get_ticks_msec() > deadline:
|
if Time.get_ticks_msec() > deadline:
|
||||||
http.close()
|
http.close()
|
||||||
|
logger.warn("HTTP body read timed out for: " + page_url)
|
||||||
return {}
|
return {}
|
||||||
OS.delay_msec(10)
|
OS.delay_msec(10)
|
||||||
continue
|
continue
|
||||||
|
|
@ -194,6 +223,7 @@ func _fetch_game_page_metadata(game: Dictionary) -> Dictionary:
|
||||||
|
|
||||||
var html := body.get_string_from_utf8()
|
var html := body.get_string_from_utf8()
|
||||||
if html.is_empty():
|
if html.is_empty():
|
||||||
|
logger.warn("Empty HTML response for: " + page_url)
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
var shot_re := RegEx.new()
|
var shot_re := RegEx.new()
|
||||||
|
|
@ -206,6 +236,7 @@ func _fetch_game_page_metadata(game: Dictionary) -> Dictionary:
|
||||||
continue
|
continue
|
||||||
screenshots.append(url)
|
screenshots.append(url)
|
||||||
|
|
||||||
|
logger.info("Found %d screenshots for page %s" % [screenshots.size(), page_url])
|
||||||
return {"screenshots": screenshots}
|
return {"screenshots": screenshots}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"plugin.id": "itch-artprovider",
|
"plugin.id": "itch-artprovider",
|
||||||
"plugin.name": "itch.io Art Provider",
|
"plugin.name": "itch.io Art Provider",
|
||||||
"plugin.version": "0.1.2",
|
"plugin.version": "0.1.3",
|
||||||
"plugin.min-api-version": "1.1.0",
|
"plugin.min-api-version": "1.1.0",
|
||||||
"plugin.link": "https://forge.thergic.ar/jose/itchio-opengamepadui-artprovider-plugin",
|
"plugin.link": "https://forge.thergic.ar/jose/itchio-opengamepadui-artprovider-plugin",
|
||||||
"plugin.source": "https://forge.thergic.ar/jose/itchio-opengamepadui-artprovider-plugin",
|
"plugin.source": "https://forge.thergic.ar/jose/itchio-opengamepadui-artprovider-plugin",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue