Apply changes from PathOfBuildingCommunity/PathOfBuilding#9188

Author: Nightblade

runtime/lua/xml.lua.rej

@@ -0,0 +1,10 @@
+diff a/runtime/lua/xml.lua b/runtime/lua/xml.lua	(rejected hunks)
+@@ -102,7 +102,7 @@ function xml.LoadXMLFile(fileName)
+ 	local fileText = fileHnd:read("*a")
+ 	fileHnd:close()
+ 	if not fileText then
+-		return nil, fileName.." file returns nil.  OneDrive?"
++		return nil, fileName.." file returns nil"
+ 	elseif fileText == "" then
+ 		return nil, fileName.." file is empty"
+ 	end

src/HeadlessWrapper.lua.rej

@@ -0,0 +1,25 @@
+diff a/src/HeadlessWrapper.lua b/src/HeadlessWrapper.lua	(rejected hunks)
+@@ -146,7 +146,7 @@ function PCall(func, ...)
+ 		return nil, unpack(ret)
+ 	else
+ 		return ret[2]
+-	end	
++	end
+ end
+ function ConPrintf(fmt, ...)
+ 	-- Optional
+@@ -162,6 +162,14 @@ function Restart() end
+ function Exit() end
+ function TakeScreenshot() end
+ 
++---@return string? provider
++---@return string? version
++---@return number? status
++function GetCloudProvider(fullPath)
++	return nil, nil, nil
++end
++
++
+ local l_require = require
+ function require(name)
+ 	-- Hack to stop it looking for lcurl, which we don't really need

src/Modules/Build.lua.rej

@@ -0,0 +1,22 @@
+diff a/src/Modules/Build.lua b/src/Modules/Build.lua	(rejected hunks)
+@@ -1814,7 +1814,7 @@ do
+ 			if int and (int > 14 or int > self.calcsTab.mainOutput.Int) then
+ 				t_insert(req, s_format("%s%d ^x7F7F7FInt", main:StatColor(int, intBase, self.calcsTab.mainOutput.Int), int))
+ 			end
+-		end	
++		end
+ 		if req[1] then
+ 			local fontSizeBig = main.showFlavourText and 18 or 16
+ 			tooltip:AddLine(fontSizeBig, "^x7F7F7FRequires "..table.concat(req, "^x7F7F7F, "), "FONTIN SC")
+@@ -1828,10 +1828,9 @@ function buildMode:LoadDB(xmlText, fileName)
+ 	-- Parse the XML
+ 	local dbXML, errMsg = common.xml.ParseXML(xmlText)
+ 	if errMsg and errMsg:match(".*file returns nil") then
+-		main:OpenOneDriveErrPopup(fileName)
++		main:OpenCloudErrorPopup(fileName)
+ 		return true
+ 	elseif errMsg then
+-		ConPrintf("Error: '%s'", errMsg)
+ 		launch:ShowErrMsg("^1"..errMsg)
+ 		return true
+ 	elseif dbXML[1].elem ~= "PathOfBuilding" then

src/Modules/BuildList.lua.rej

@@ -0,0 +1,10 @@
+diff a/src/Modules/BuildList.lua b/src/Modules/BuildList.lua	(rejected hunks)
+@@ -217,7 +217,7 @@ function listMode:BuildList()
+ 			local fileText = fileHnd:read("*a")
+ 			fileHnd:close()
+ 			if not fileText then
+-				main:OpenOneDriveErrPopup(build.fullFileName)
++				main:OpenCloudErrorPopup(build.fullFileName)
+ 				return
+ 			end
+ 			fileText = fileText:match("(<Build.->)")

src/Modules/Main.lua.rej

@@ -0,0 +1,9 @@
+diff a/src/Modules/Main.lua b/src/Modules/Main.lua	(rejected hunks)
+@@ -718,7 +718,6 @@ function main:LoadSharedItems()
+ end
+ 
+ function main:SaveSettings()
+-	ConPrintf("self.errorReadingSettings: %s", self.errorReadingSettings)
+ 	if self.errorReadingSettings then
+ 		return
+ 	end