Skip to content

Only use one map download table #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plally merged 3 commits into from
Dec 14, 2025
Merged

Only use one map download table #66

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc8a054
Only use one map download table
wrefgtzweve Dec 8, 2025
7252e4d
Fix workshop request func
wrefgtzweve Dec 14, 2025
3f204cf
Update lua/mapvote/client/modules/thumb_downloader.lua
wrefgtzweve Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 20 additions & 24 deletions lua/mapvote/client/modules/thumb_downloader.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ local ThumbDownloader = MapVote.ThumbDownloader or {
workshopIDLookup = {},
mapsToDownload = {},
---@type table<string, fun( filepath: string )>
mapDownloadCallbacks = {},
urlOverrides = {},
searchPaths = {
"materials/mapvote/thumb_overrides/",
Expand Down Expand Up @@ -55,8 +54,7 @@ function ThumbDownloader:QueueDownload( map, callback )
end

print( "MapVote: Queued map thumb for download", map )
self.mapDownloadCallbacks[map] = callback
table.insert( self.mapsToDownload, map )
table.insert( self.mapsToDownload, { map = map, callback = callback } )
end

---@param map string
Expand All @@ -68,31 +66,37 @@ end
function ThumbDownloader:RequestWorkshopIDs()
if #self.mapsToDownload == 0 then return end

MapVote.Net.requestWorskhopIDs( self.mapsToDownload )
local mapsNeedingIDs = {}
for _, mapData in pairs( self.mapsToDownload ) do
local map = mapData.map
if not self.urlOverrides[map] then
table.insert( mapsNeedingIDs, map )
end
end

MapVote.Net.requestWorskhopIDs( mapsNeedingIDs )
end

function ThumbDownloader:DownloadAll()
print( "MapVote: Downloading all queued map thumbs" )

for _, map in pairs( self.mapsToDownload ) do
for _, mapData in pairs( self.mapsToDownload ) do
local map = mapData.map
local callback = mapData.callback

local wsid = self.workshopIDLookup[map]
if self.urlOverrides[map] then
self:DownloadThumbnailURL( map, self.urlOverrides[map] )
self:DownloadThumbnailURL( map, self.urlOverrides[map], callback )
elseif wsid then
self:DownloadThumbnailSteam( map, wsid )
self:DownloadThumbnailSteam( wsid, callback )
else
local callback = self.mapDownloadCallbacks[map]
self.mapDownloadCallbacks[map] = nil
callback( Material( self.noIcon ) )
end
end
self.mapsToDownload = {}
end

function ThumbDownloader:DownloadThumbnailSteam( name, wsid )
local callback = self.mapDownloadCallbacks[name]
self.mapDownloadCallbacks[name] = nil

function ThumbDownloader:DownloadThumbnailSteam( wsid, callback )
local MAT_ERROR = Material( self.noIcon )
steamworks.FileInfo( wsid, function( result )
if not result then
Expand All @@ -119,16 +123,12 @@ function ThumbDownloader:DownloadThumbnailSteam( name, wsid )
end )
end

function ThumbDownloader:DownloadThumbnailURL( name, url )
function ThumbDownloader:DownloadThumbnailURL( name, url, callback )
file.CreateDir( "mapvote/thumb_cache" )
local request = {
failed = function( err )
print( "MapVote: Failed to download map thumb", err )
local callback = self.mapDownloadCallbacks[name]
if callback then
self.mapDownloadCallbacks[name] = nil
callback( Material( self.noIcon ) )
end
callback( Material( self.noIcon ) )
end,
success = function( code, body, headers )
if code < 200 or code > 299 then
Expand All @@ -144,11 +144,7 @@ function ThumbDownloader:DownloadThumbnailURL( name, url )
print( "MapVote: Downloaded map thumb", name, filepath )
file.Write( filepath, body )

local callback = self.mapDownloadCallbacks[name]
if callback then
self.mapDownloadCallbacks[name] = nil
callback( Material( "data/" .. filepath ) )
end
callback( Material( "data/" .. filepath ) )
end,
method = "GET",
url = url,
Expand Down