Merge branch 'develop' of https://github.com/CapsAdmin/pac3 into develop

Author: pingu7867

lua/pac3/core/client/util.lua

@@ -440,7 +440,7 @@ function pac.Handleurltex(part, url, callback, shader, additionalData)
 	if not url:match("https?://.+/%S*") then return false end
 
 	pac.urltex.GetMaterialFromURL(
-		pac.FixUrl(url),
+		pac.FixUrl(url, "image"),
 
 		function(mat, tex)
 			if not part:IsValid() then return end

lua/pac3/core/shared/http.lua

@@ -62,7 +62,7 @@ local function http(method, url, headers, cb, failcb)
 	})
 end
 
-function pac.FixUrl(url)
+function pac.FixUrl(url, expectedContentType)
 	url = url:Trim()
 	url = url:gsub("[\"'<>\n\\]+", "")
 
@@ -75,14 +75,21 @@ function pac.FixUrl(url)
 		return url
 	end
 
-	if url:find("drive.google.com", 1, true) and not url:find("export=download", 1, true) then
+	if url:find("drive.google.com", 1, true) then
 		local id =
 			url:match("https://drive.google.com/file/d/(.-)/") or
 			url:match("https://drive.google.com/file/d/(.-)$") or
-			url:match("https://drive.google.com/open%?id=(.-)$")
+			url:match("https://drive.google.com/open%?id=(.-)$") or
+			url:match("https://drive.google.com/uc%?export=download&id=(.-)$") or
+			url:match("https://drive.google.com/uc%?id=(.-)&export=download$")
 
 		if id then
-			return "https://drive.google.com/uc?export=download&id=" .. id
+			if expectedContentType == "image" then
+				local thumbnailSize = math.Clamp( pac.urltex.TextureSize, 32, 4096 )
+				return "https://drive.google.com/thumbnail?id=" .. id .. "&sz=s" .. string.format("%.0f", thumbnailSize)
+			elseif not url:find("export=download", 1, true) then
+				return "https://drive.google.com/uc?export=download&id=" .. id
+			end
 		end
 		return url
 	end

lua/pac3/editor/client/panels/browser.lua

@@ -54,7 +54,7 @@ function PANEL:AddOutfits(folder, callback)
 				local filenode = self:AddLine(
 					name:gsub("%.txt", ""),
 					raw_size:GetBool() and file.Size(outfit, "DATA") or string.NiceSize(file.Size(outfit, "DATA")),
-					os.date("%m/%d/%Y %H:%M", file.Time(outfit, "DATA"))
+					raw_size:GetBool() and file.Time(outfit, "DATA") or os.date("%m/%d/%Y %H:%M", file.Time(outfit, "DATA"))
 				)
 				filenode.FileName = name
 				filenode.OnSelect = callback
@@ -72,7 +72,7 @@ function PANEL:AddOutfits(folder, callback)
 			local filenode = self:AddLine(
 				name,
 				"<folder>",
-				os.date("%m/%d/%Y %H:%M", file.Time(folder2, "DATA"))
+				raw_size:GetBool() and file.Time(folder2, "DATA") or os.date("%m/%d/%Y %H:%M", file.Time(folder2, "DATA"))
 			)
 			filenode.FileName = name
 			filenode.OnSelect = function() self:SetDir(string.sub(folder2, 6, #folder2)) end
@@ -107,4 +107,4 @@ function PANEL.OnRowRightClick(_self,id, self)
 	m:Open()
 end
 
-pace.RegisterPanel(PANEL)
+pace.RegisterPanel(PANEL)

lua/pac3/editor/client/saved_parts.lua

@@ -96,7 +96,7 @@ end
 
 local last_backup
 local maxBackups = CreateConVar("pac_backup_limit", "100", {FCVAR_ARCHIVE}, "Maximal amount of backups")
-local autoload_prompt = CreateConVar("pac_prompt_for_autoload", "1", {FCVAR_ARCHIVE}, "Whether to ask before loading autoload. The prompt can let you choose to not load, pick autoload or the newest backup")
+local autoload_prompt = CreateConVar("pac_prompt_for_autoload", "0", {FCVAR_ARCHIVE}, "Whether to ask before loading autoload. The prompt can let you choose to not load, pick autoload or the newest backup")
 local auto_spawn_prop = CreateConVar("pac_autoload_preferred_prop", "2", {FCVAR_ARCHIVE}, "When loading a pac with an owner name suggesting a prop, notify you and then wait before auto-applying the outfit next time you spawn a prop.\n" ..
 																								"0 : do not check\n1 : check if only 1 such group is present\n2 : check if multiple such groups are present and queue one group at a time")
 

lua/pac3/editor/client/wear.lua

@@ -306,7 +306,7 @@ do
 			local backup_files, directories = file.Find( "pac3/__backup/*.txt", "DATA", "datedesc")
 			local latest_outfit = cookie.GetString( "pac_last_loaded_outfit", "" )
 			if not backup_files then
-				local pnl = Derma_Query("Do you want to load your autoload outfit?", "PAC3 autoload (pac_prompt_for_autoload)",
+				local pnl = Derma_Query("Do you want to load your autoload outfit?\nclick outside the window to cancel", "PAC3 autoload (pac_prompt_for_autoload)",
 					"load pac3/autoload.txt : " .. string.NiceSize(file.Size("pac3/autoload.txt", "DATA")), function()
 						pac.Message("Wearing autoload...")
 						pace.LoadParts("autoload")
@@ -322,13 +322,13 @@ do
 						end
 					end,
 
-					"cancel", function() pac.Message("Not loading autoload or backups...")  end
+					"don't show this again", function() GetConVar("pac_prompt_for_autoload"):SetBool(false) end
 				)
 				pnl.Think = function() if not pnl:HasFocus() or (input.IsMouseDown(MOUSE_LEFT) and not (pnl:IsHovered() or pnl:IsChildHovered())) then pnl:Remove() end end
 			else
 				if backup_files[1] then
 					local latest_autosave = "pac3/__backup/" .. backup_files[1]
-					local pnl = Derma_Query("Do you want to load an outfit?", "PAC3 autoload (pac_prompt_for_autoload)",
+					local pnl = Derma_Query("Do you want to load an outfit?\nclick outside the window to cancel", "PAC3 autoload (pac_prompt_for_autoload)",
 						"load pac3/autoload.txt : " .. string.NiceSize(file.Size("pac3/autoload.txt", "DATA")), function()
 							pac.Message("Wearing autoload...")
 							pace.LoadParts("autoload")
@@ -349,18 +349,18 @@ do
 							end
 						end,
 
-						"cancel", function() pac.Message("Not loading autoload or backups...")  end
+						"don't show this again", function() GetConVar("pac_prompt_for_autoload"):SetBool(false) end
 					)
 					pnl.Think = function() if not pnl:HasFocus() or (input.IsMouseDown(MOUSE_LEFT) and not (pnl:IsHovered() or pnl:IsChildHovered())) then pnl:Remove() end end
 				else
-					local pnl = Derma_Query("Do you want to load your autoload outfit?", "PAC3 autoload (pac_prompt_for_autoload)",
+					local pnl = Derma_Query("Do you want to load your autoload outfit?\nclick outside the window to cancel", "PAC3 autoload (pac_prompt_for_autoload)",
 						"load pac3/autoload.txt : " .. string.NiceSize(file.Size("pac3/autoload.txt", "DATA")), function()
 							pac.Message("Wearing autoload...")
 							pace.LoadParts("autoload")
 							pace.WearParts()
 						end,
 
-						"cancel", function() pac.Message("Not loading autoload or backups...")  end
+						"don't show this again", function() GetConVar("pac_prompt_for_autoload"):SetBool(false) end
 					)
 					pnl.Think = function() if not pnl:HasFocus() or (input.IsMouseDown(MOUSE_LEFT) and not (pnl:IsHovered() or pnl:IsChildHovered())) then pnl:Remove() end end
 				end

lua/pac3/libraries/resource.lua

@@ -139,6 +139,7 @@ local function download(from, to, callback, on_fail, on_header, check_etag, etag
 
 	local allowed = {
 		[".txt"] = true,
+		[".jpeg"] = true,
 		[".jpg"] = true,
 		[".png"] = true,
 		[".vtf"] = true,
@@ -150,7 +151,20 @@ local function download(from, to, callback, on_fail, on_header, check_etag, etag
 		function(body, len, header)
 			do
 				if need_extension then
-					local ext = header["Content-Type"] and (header["Content-Type"]:match(".-/(.-);") or header["Content-Type"]:match(".-/(.+)")) or "dat"
+					local ext = "dat"
+					if header["Content-Type"] then
+						for _, mime in ipairs( string.Split(header["Content-Type"], ',') ) do -- some common services, including google, serve multi-item mime strings like "image/png,application/binary"
+							subtype = mime:match(".-/(.-);") or mime:match(".-/(.+)")
+							if subtype then
+								subtype = subtype:lower()
+								if allowed['.' .. subtype] then
+									ext = subtype
+									break -- take the first subtype (if any) found in our whitelist
+								end
+							end
+						end
+					end
+					
 					if ext == "jpeg" then ext = "jpg" end
 
 					if body:StartWith("VTF") then

lua/pac3/libraries/urltex.lua

@@ -113,7 +113,7 @@ function urltex.StartDownload(url, data)
 		urltex.ActivePanel:Remove()
 	end
 
-	url = pac.FixUrl(url)
+	url = pac.FixUrl(url, "image")
 	local size = tonumber(data.size or urltex.TextureSize)
 	local id = "urltex_download_" .. url
 	local pnl