Fix AdvDupe2.SanitizeFilename not catching all cases, sanitize in GetFilename too

lua/advdupe2/cl_file.lua

@@ -1,7 +1,7 @@
 function AdvDupe2.ReceiveFile(data, autoSave)
 	AdvDupe2.RemoveProgressBar()
 	if not data then
-		AdvDupe2.Notify("File was not saved!",NOTIFY_ERROR,5)
+		AdvDupe2.Notify("File was not saved! (No data)",NOTIFY_ERROR,5)
 		return
 	end
 	local path
@@ -18,7 +18,7 @@ function AdvDupe2.ReceiveFile(data, autoSave)
 	path = AdvDupe2.SanitizeFilename(path)
 	local dupefile = file.Open(path, "wb", "DATA")
 	if not dupefile then
-		AdvDupe2.Notify("File was not saved!",NOTIFY_ERROR,5)
+		AdvDupe2.Notify("File was not saved! (Could not open file for writing)",NOTIFY_ERROR,5)
 		return
 	end
 	dupefile:Write(data)
@@ -32,7 +32,7 @@ function AdvDupe2.ReceiveFile(data, autoSave)
 		if not readFile then AdvDupe2.Notify("File could not be read", NOTIFY_ERROR) return end
 		local readData = readFile:Read(readFile:Size())
 		readFile:Close()
-		local success,dupe,info,moreinfo = AdvDupe2.Decode(readData)
+		local success, dupe, _info, _moreinfo = AdvDupe2.Decode(readData)
 		if(success)then
 			AdvDupe2.Notify("DEBUG CHECK: File successfully opens. No EOF errors.")
 		else
@@ -60,7 +60,7 @@ function AdvDupe2.ReceiveFile(data, autoSave)
 		AdvDupe2.FileBrowser.Browser.pnlCanvas.ActionNode:AddFile(filename)
 		AdvDupe2.FileBrowser.Browser.pnlCanvas:Sort(AdvDupe2.FileBrowser.Browser.pnlCanvas.ActionNode)
 	end
-	if(!errored)then
+	if not errored then
 		AdvDupe2.Notify("File successfully saved!",NOTIFY_GENERIC, 5)
 	end
 end

lua/advdupe2/file_browser.lua

@@ -11,7 +11,7 @@
 local History = {}
 local Narrow = {}
 
 local switch = true
 local count = 0
 
 local function AddHistory(txt)
@@ -257,6 +257,7 @@
 end
 
 function AdvDupe2.GetFilename(path, overwrite)
+	path = AdvDupe2.SanitizeFilename(path)
 	if not overwrite and file.Exists(path .. ".txt", "DATA") then
 		for i = 1, AdvDupe2.FileRenameTryLimit do
 			local p = string.format("%s_%03d.txt", path, i)
@@ -273,7 +274,7 @@
 	local path, area = GetNodePath(node)
 	if (area == 0) then
 		path = AdvDupe2.DataFolder .. "/" .. path .. "/"
 	elseif (area == 1) then
 
 	else
 		path = "adv_duplicator/" .. path .. "/"
@@ -339,8 +340,6 @@
 		return
 	end
 	local base = AdvDupe2.DataFolder
-	local ParentNode
-
 	local node2 = node.Control.ActionNode
 	local path, area = GetNodePath(node2)
 	local path2, area2 = GetNodePath(node)
@@ -519,17 +518,17 @@
 			end)
 			Menu:AddOption("Delete", function()
 				parent.Submit:SetMaterial("icon16/bin_empty.png")
 				parent.Submit:SetTooltip("Delete File")
 				parent.FileName:SetVisible(false)
 				parent.Desc:SetVisible(false)
 				if (#node.Label:GetText() > 22) then
 					parent.Info:SetText(
 						'Are you sure that you want to delete \nthe FILE, "' ..
 							node.Label:GetText() .. '" \nfrom your CLIENT?')
 				else
 					parent.Info:SetText(
 						'Are you sure that you want to delete \nthe FILE, "' ..
 							node.Label:GetText() .. '" from your CLIENT?')
 				end
 				parent.Info:SizeToContents()
 				parent.Info:SetVisible(true)
@@ -537,7 +536,7 @@
 				parent.Submit.DoClick = function()
 					local path, area = GetNodePath(node)
 					if (area == 1) then
 						path = "-Public-/" .. path
 					end
 					if (area == 2) then
 						path = "adv_duplicator/" .. path .. ".txt"
@@ -643,10 +642,10 @@
 				AddHistory(parent.FileName:GetValue())
 				parent.FileName:SetVisible(false)
 				parent.Submit:SetMaterial("icon16/arrow_undo.png")
 				parent.Submit:SetTooltip("Return to Browser")
 				parent.Info:SetVisible(true)
 				parent.Info:SetText(#parent.Search.pnlCanvas.Files ..
 										' files found searching for, "' ..
 										parent.FileName:GetValue() .. '"')
 				parent.Info:SizeToContents()
 				parent.Submit.DoClick = function()
@@ -663,7 +662,7 @@
 		if (node.Label:GetText()[1] ~= "-") then
 			Menu:AddOption("Delete", function()
 				parent.Submit:SetMaterial("icon16/bin_empty.png")
 				parent.Submit:SetTooltip("Delete Folder")
 				parent.FileName:SetVisible(false)
 				parent.Desc:SetVisible(false)
 				if (#node.Label:GetText() > 22) then

lua/advdupe2/sh_codec.lua

@@ -16,18 +16,11 @@
 AddCSLuaFile( "sh_codec_legacy.lua" )
 
 local pairs = pairs
-local type = type
 local error = error
 local Vector = Vector
 local Angle = Angle
 local format = string.format
 local char = string.char
-local byte = string.byte
-local sub = string.sub
-local gsub = string.gsub
-local find = string.find
-local gmatch = string.gmatch
-local match = string.match
 local concat = table.concat
 local compress = util.Compress
 local decompress = util.Decompress
@@ -49,7 +42,10 @@
 end
 
 function AdvDupe2.SanitizeFilename(filename)
-	return string.gsub(string.gsub(filename, "[\":]", "_"), "%s+", " ")
+	filename = string.gsub( filename, "[\":]", "_" )
+	filename = string.gsub( filename, "%s+", " " )
+	filename = string.gsub( filename, "%s*([\\/%.])%s*", "%1" )
+	return filename
 end
 
 local function makeInfo(tbl)
@@ -536,7 +532,7 @@
 		if not readFile then print("File could not be read or found! ("..readFileName..")") return end
 		local readData = readFile:Read(readFile:Size())
 		readFile:Close()
 		local ok, tbl = AdvDupe2.Decode(readData)
 		local writeFile = file.Open(writeFileName, "wb", "DATA")
 		if not writeFile then print("File could not be written! ("..writeFileName..")") return end
 		writeFile:Write(util.TableToJSON(tbl))