Skip to content

Commit df9eaaf

Browse files
committed
Fix ScreenScraper scraping not working on search (again)
1 parent 02b84ae commit df9eaaf

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

source/scraper/ScreenScraperScraper.gd

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ func _process(_delta):
230230
else:
231231
_curr_requests[game_data] = [req]
232232

233+
if not req._http.is_inside_tree():
234+
await get_tree().process_frame
233235
req.perform_request(req.type == RequestDetails.Type.MEDIA)
234236
await req._http.request_completed
235237
#warning-ignore:return_value_discarded
@@ -418,7 +420,7 @@ func scrape_game_by_hash(game_data: RetroHubGameData, type: int = RequestDetails
418420

419421
var http_client := HTTPClient.new()
420422

421-
var req : RequestDetails = await _new_request_details(game_data)
423+
var req := _new_request_details(game_data)
422424
req.type = type
423425
req.url = "https://www.screenscraper.fr/api2/jeuInfos.php?" + http_client.query_string_from_dict(header_data)
424426
req.data = md5
@@ -447,7 +449,7 @@ func scrape_game_by_search(game_data: RetroHubGameData, search_term: String, typ
447449

448450
var http_client := HTTPClient.new()
449451

450-
var req : RequestDetails = await _new_request_details(game_data)
452+
var req := _new_request_details(game_data)
451453
req.type = type
452454
req.url = "https://www.screenscraper.fr/api2/jeuRecherche.php?" + http_client.query_string_from_dict(header_data)
453455
return OK
@@ -498,7 +500,7 @@ func scrape_media(game_data: RetroHubGameData, media_type: int) -> int:
498500
#warning-ignore:return_value_discarded
499501
_req_semaphore.wait()
500502

501-
var req : RequestDetails = await _new_request_details(game_data)
503+
var req := _new_request_details(game_data)
502504
req.type = RequestDetails.Type.MEDIA
503505
req.url = res["url"]
504506
req.data = {"format": res["format"], "type": media_type}
@@ -510,7 +512,7 @@ func scrape_media_from_search(orig_game_data: RetroHubGameData, search_game_data
510512
#warning-ignore:return_value_discarded
511513
_cached_search_data.erase(orig_game_data)
512514

513-
return await scrape_media(orig_game_data, media_type)
515+
return scrape_media(orig_game_data, media_type)
514516

515517
func scrape_completed(game_data: RetroHubGameData) -> void:
516518
#warning-ignore:return_value_discarded

0 commit comments

Comments
 (0)