Skip to content

Skip writing uncompressedFile if denied access, and skip reading changelog.txt if it doesn't exist #4588

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
merged 3 commits into from
Jul 15, 2022
Merged

Skip writing uncompressedFile if denied access, and skip reading changelog.txt if it doesn't exist #4588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9c78c4
Skip writing uncompressedFile if denied access
Lothrik Jul 13, 2022
4a0c668
Skip reading changelog.txt if it doesn't exist
Lothrik Jul 13, 2022
25506a4
Fix bizarre typo
Lothrik Jul 13, 2022
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
8 changes: 5 additions & 3 deletions src/Modules/Data.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ local function loadJewelFile(jewelTypeName)
local uncompressedFile = io.open(scriptPath .. jewelTypeName .. ".bin", "rb")
if uncompressedFile then
jewelData = uncompressedFile:read("*a")
uncompressedFile.close()
uncompressedFile:close()
end
if jewelData then
return jewelData
Expand All @@ -541,8 +541,10 @@ local function loadJewelFile(jewelTypeName)
ConPrintf("Failed to load either file: " .. jewelTypeName .. ".zip, " .. jewelTypeName .. ".bin")
else
local uncompressedFile = io.open(scriptPath .. jewelTypeName .. ".bin", "wb+")
uncompressedFile:write(jewelData)
uncompressedFile:close()
if uncompressedFile then
uncompressedFile:write(jewelData)
uncompressedFile:close()
end
end
return jewelData
end
Expand Down
52 changes: 30 additions & 22 deletions src/Modules/Main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,18 +818,22 @@ end
function main:OpenUpdatePopup()
local changeList = { }
local changelogName = launch.devMode and "../changelog.txt" or "changelog.txt"
for line in io.lines(changelogName) do
local ver, date = line:match("^VERSION%[(.+)%]%[(.+)%]$")
if ver then
if ver == launch.versionNumber then
break
end
if #changeList > 0 then
t_insert(changeList, { height = 12 })
local changelogFile = io.open(changelogName, "r")
if changelogFile then
changelogFile:close()
for line in io.lines(changelogName) do
local ver, date = line:match("^VERSION%[(.+)%]%[(.+)%]$")
if ver then
if ver == launch.versionNumber then
break
end
if #changeList > 0 then
t_insert(changeList, { height = 12 })
end
t_insert(changeList, { height = 20, "^7Version "..ver.." ("..date..")" })
else
t_insert(changeList, { height = 14, "^7"..line })
end
t_insert(changeList, { height = 20, "^7Version "..ver.." ("..date..")" })
else
t_insert(changeList, { height = 14, "^7"..line })
end
end
local controls = { }
Expand All @@ -850,24 +854,28 @@ end
function main:OpenAboutPopup()
local changeList = { }
local changelogName = launch.devMode and "../changelog.txt" or "changelog.txt"
for line in io.lines(changelogName) do
local ver, date = line:match("^VERSION%[(.+)%]%[(.+)%]$")
if ver then
if #changeList > 0 then
t_insert(changeList, { height = 10 })
local changelogFile = io.open(changelogName, "r")
if changelogFile then
changelogFile:close()
for line in io.lines(changelogName) do
local ver, date = line:match("^VERSION%[(.+)%]%[(.+)%]$")
if ver then
if #changeList > 0 then
t_insert(changeList, { height = 10 })
end
t_insert(changeList, { height = 18, "^7Version "..ver.." ("..date..")" })
else
t_insert(changeList, { height = 12, "^7"..line })
end
t_insert(changeList, { height = 18, "^7Version "..ver.." ("..date..")" })
else
t_insert(changeList, { height = 12, "^7"..line })
end
end
local controls = { }
controls.close = new("ButtonControl", {"TOPRIGHT",nil,"TOPRIGHT"}, -10, 10, 50, 20, "Close", function()
self:ClosePopup()
end)
controls.version = new("LabelControl", nil, 0, 18, 0, 18, "Path of Building Community Fork v"..launch.versionNumber)
controls.forum = new("LabelControl", nil, 0, 36, 0, 18, "Based on Openarl's Path of Building")
controls.github = new("ButtonControl", nil, 0, 62, 438, 18, "GitHub page: ^x4040FFhttps://github.com/PathOfBuildingCommunity/PathOfBuilding", function(control)
controls.version = new("LabelControl", nil, 0, 18, 0, 18, "^7Path of Building Community Fork v"..launch.versionNumber)
controls.forum = new("LabelControl", nil, 0, 36, 0, 18, "^7Based on Openarl's Path of Building")
controls.github = new("ButtonControl", nil, 0, 62, 438, 18, "^7GitHub page: ^x4040FFhttps://github.com/PathOfBuildingCommunity/PathOfBuilding", function(control)
OpenURL("https://github.com/PathOfBuildingCommunity/PathOfBuilding")
end)
controls.verLabel = new("LabelControl", { "TOPLEFT", nil, "TOPLEFT" }, 10, 82, 0, 18, "^7Version history:")
Expand Down