File browser V2

lua/advdupe2/cl_file.lua

@@ -1,6 +1,6 @@
 local invalidCharacters = { "\"", ":"}
 function AdvDupe2.SanitizeFilename(filename)
-	for i=1, #invalidCharacters do
+	for i = 1, #invalidCharacters do
 		filename = string.gsub(filename, invalidCharacters[i], "_")
 	end
 	filename = string.gsub(filename, "%s+", " ")
@@ -16,15 +16,15 @@ function AdvDupe2.ReceiveFile(data, autoSave)
 	end
 	local path
 	if autoSave then
-		if(LocalPlayer():GetInfo("advdupe2_auto_save_overwrite")~="0")then
+		if LocalPlayer():GetInfo("advdupe2_auto_save_overwrite") ~= "0" then
 			path = AdvDupe2.GetFilename(AdvDupe2.AutoSavePath, true)
 		else
 			path = AdvDupe2.GetFilename(AdvDupe2.AutoSavePath)
 		end
 	else
 		path = AdvDupe2.GetFilename(AdvDupe2.SavePath)
 	end
-
+	local OriginalPath = AdvDupe2.SavePath .. ".txt"
 	path = AdvDupe2.SanitizeFilename(path)
 	local dupefile = file.Open(path, "wb", "DATA")
 	if not dupefile then
@@ -35,15 +35,15 @@ function AdvDupe2.ReceiveFile(data, autoSave)
 	dupefile:Close()
 
 	local errored = false
-	if(LocalPlayer():GetInfo("advdupe2_debug_openfile")=="1")then
-		if(not file.Exists(path, "DATA"))then AdvDupe2.Notify("File does not exist", NOTIFY_ERROR) return end
+	if LocalPlayer():GetInfo("advdupe2_debug_openfile") == "1" then
+		if not file.Exists(path, "DATA") then AdvDupe2.Notify("File does not exist", NOTIFY_ERROR) return end
 
 		local readFile = file.Open(path, "rb", "DATA")
 		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)
-		if(success)then
+		local success, dupe = AdvDupe2.Decode(readData)
+		if success then
 			AdvDupe2.Notify("DEBUG CHECK: File successfully opens. No EOF errors.")
 		else
 			AdvDupe2.Notify("DEBUG CHECK: " .. dupe, NOTIFY_ERROR)
@@ -52,25 +52,29 @@ function AdvDupe2.ReceiveFile(data, autoSave)
 	end
 
 	local filename = string.StripExtension(string.GetFileFromFilename( path ))
+
+	local Browser = AdvDupe2.FileBrowser.Browser
+
 	if autoSave then
-		if(IsValid(AdvDupe2.FileBrowser.AutoSaveNode))then
+		if IsValid(AdvDupe2.FileBrowser.AutoSaveNode) then
 			local add = true
-			for i=1, #AdvDupe2.FileBrowser.AutoSaveNode.Files do
-				if(filename==AdvDupe2.FileBrowser.AutoSaveNode.Files[i].Label:GetText())then
-					add=false
+			for i = 1, #AdvDupe2.FileBrowser.AutoSaveNode.Files do
+				if filename == AdvDupe2.FileBrowser.AutoSaveNode.Files[i].Label:GetText() then
+					add = false
 					break
 				end
 			end
-			if(add)then
-				AdvDupe2.FileBrowser.AutoSaveNode:AddFile(filename)
-				AdvDupe2.FileBrowser.Browser.pnlCanvas:Sort(AdvDupe2.FileBrowser.AutoSaveNode)
+			if add then
+				error "Not implemented yet"
+				-- AutoSaveNode:AddFile(filename)
+				-- Browser.pnlCanvas:Sort(AdvDupe2.FileBrowser.AutoSaveNode)
 			end
 		end
 	else
-		AdvDupe2.FileBrowser.Browser.pnlCanvas.ActionNode:AddFile(filename)
-		AdvDupe2.FileBrowser.Browser.pnlCanvas:Sort(AdvDupe2.FileBrowser.Browser.pnlCanvas.ActionNode)
+		Browser:IncomingFile(OriginalPath, path)
 	end
-	if(!errored)then
+
+	if not errored then
 		AdvDupe2.Notify("File successfully saved!",NOTIFY_GENERIC, 5)
 	end
 end
@@ -94,17 +98,20 @@ function AdvDupe2.SendFile(name, data)
 	net.SendToServer()
 end
 
+local ADVDUPE2_AREA_ADVDUPE2 = AdvDupe2.AREA_ADVDUPE2
+local ADVDUPE2_AREA_PUBLIC   = AdvDupe2.AREA_PUBLIC
+
 function AdvDupe2.UploadFile(ReadPath, ReadArea)
 	if AdvDupe2.Uploading then AdvDupe2.Notify("Already opening file, please wait.", NOTIFY_ERROR) return end
-	if(ReadArea==0)then
-		ReadPath = AdvDupe2.DataFolder.."/"..ReadPath..".txt"
-	elseif(ReadArea==1)then
-		ReadPath = AdvDupe2.DataFolder.."/-Public-/"..ReadPath..".txt"
+	if ReadArea == ADVDUPE2_AREA_ADVDUPE2 then
+		ReadPath = AdvDupe2.DataFolder .. "/" .. ReadPath .. ".txt"
+	elseif ReadArea == ADVDUPE2_AREA_PUBLIC then
+		ReadPath = AdvDupe2.DataFolder .. "/-Public-/" .. ReadPath .. ".txt"
 	else
-		ReadPath = "adv_duplicator/"..ReadPath..".txt"
+		ReadPath = "adv_duplicator/" .. ReadPath .. ".txt"
 	end
 
-	if(not file.Exists(ReadPath, "DATA"))then AdvDupe2.Notify("File does not exist", NOTIFY_ERROR) return end
+	if not file.Exists(ReadPath, "DATA") then AdvDupe2.Notify("File does not exist", NOTIFY_ERROR) return end
 
 	local read = file.Read(ReadPath)
 	if not read then AdvDupe2.Notify("File could not be read", NOTIFY_ERROR) return end
@@ -113,11 +120,11 @@ function AdvDupe2.UploadFile(ReadPath, ReadArea)
 	name = string.sub(name, 1, #name-4)
 
 	local success, dupe, info, moreinfo = AdvDupe2.Decode(read)
-	if(success)then
+	if success then
 		AdvDupe2.SendFile(name, read)
 
 		AdvDupe2.LoadGhosts(dupe, info, moreinfo, name)
 	else
-		AdvDupe2.Notify("File could not be decoded. ("..dupe..") Upload Canceled.", NOTIFY_ERROR)
+		AdvDupe2.Notify("File could not be decoded. (" .. dupe .. ") Upload Canceled.", NOTIFY_ERROR)
 	end
 end