Skip to content

Fix: Images not downloading when url has trailing slash #57

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
TomDotBat merged 2 commits into from
Nov 18, 2024
Merged

Fix: Images not downloading when url has trailing slash #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb105b1
fix: Images not downloading if url has trailing slash
Lythium4848 Nov 18, 2024
ff06ed6
fix: Wrong config options
Lythium4848 Nov 18, 2024
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
21 changes: 14 additions & 7 deletions lua/pixelui/core/cl_images.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,26 @@ end

function PIXEL.GetImage(url, callback, matSettings)
local protocol = url:match("^([%a]+://)")
local urlWithoutProtocol = url
if not protocol then
protocol = "http://"
else
urlWithoutProtocol = string.gsub(url, protocol, "")

local hasTrailingSlash = url:sub(-1) == "/"
local urlWithoutTrailingSlash = url
if hasTrailingSlash then
urlWithoutTrailingSlash = url:sub(1, -2)
end

local fileNameStart = url:find("[^/]+$")
local fileNameStart = urlWithoutTrailingSlash:find("[^/]+$")
if not fileNameStart then
return
end

local urlWithoutFileName = url:sub(protocol:len() + 1, fileNameStart - 1)
local urlWithoutProtocol = url
if not protocol then
protocol = "http://"
else
urlWithoutProtocol = string.gsub(urlWithoutTrailingSlash, protocol, "")
end

local urlWithoutFileName = urlWithoutTrailingSlash:sub(protocol:len() + 1, fileNameStart - 1)

local dirPath = PIXEL.DownloadPath .. urlWithoutFileName
local filePath = PIXEL.DownloadPath .. urlWithoutProtocol
Expand Down