wiremod/advdupe2
1
0
Fork 0
mirror of https://github.com/wiremod/advdupe2.git synced 2025-03-04 03:03:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improvements

Browse Source
This commit is contained in:
Garrett 2018-12-06 02:35:09 -05:00
parent b5be7b668a
commit 53777ff57f
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lua/advdupe2/cl_networking.lua
View File

@ -35,7 +35,8 @@ local function AdvDupe2_ReceiveFile(len, ply, len2)
local status = net.ReadInt(8)
if(status==1)then AdvDupe2.NetFile = "" end
AdvDupe2.NetFile=AdvDupe2.NetFile..net.ReadData(len/8-1)
local datalen = net.ReadUInt(32)
AdvDupe2.NetFile=AdvDupe2.NetFile..net.ReadData(datalen)
if(status==2)then
local path = ""
@ -46,21 +47,25 @@ local function AdvDupe2_ReceiveFile(len, ply, len2)
else
path = CheckFileNameCl(AdvDupe2.SavePath)
end
file.Write(path..".txt", AdvDupe2.NetFile)
if(!file.Exists(path..".txt", "DATA"))then
local dupefile = file.Open(path..".txt", "wb", "DATA")
if(!dupefile)then
AdvDupe2.NetFile = ""
AdvDupe2.Notify("File was not saved!",NOTIFY_ERROR,5)
return
end
dupefile:Write(AdvDupe2.NetFile)
dupefile:Close()
local errored = false
if(LocalPlayer():GetInfo("advdupe2_debug_openfile")=="1")then
if(not file.Exists(path..".txt", "DATA"))then AdvDupe2.Notify("File does not exist", NOTIFY_ERROR) return end
local read = file.Read(path..".txt")
if not read then AdvDupe2.Notify("File could not be read", NOTIFY_ERROR) return end
local success,dupe,info,moreinfo = AdvDupe2.Decode(read)
local readFile = file.Open(path..".txt", "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
AdvDupe2.Notify("DEBUG CHECK: File successfully opens. No EOF errors.")
else
@ -270,7 +275,8 @@ local function SendFileToServer(eof)
net.Start("AdvDupe2_ReceiveFile")
net.WriteInt(AdvDupe2.LastPos>=AdvDupe2.Length and 1 or 0, 8)
net.WriteString(data)
net.WriteUInt(data, 32)
net.WriteData(data, #data)
net.SendToServer()
end

6
lua/advdupe2/sv_networking.lua
View File

@ -94,7 +94,8 @@ function AdvDupe2_SendFile(ID)
net.Start("AdvDupe2_ReceiveFile")
net.WriteInt(status, 8)
net.WriteString(data)
net.WriteUInt(#data, 32)
net.WriteData(data, #data)
net.Send(Net.Player)
AdvDupe2.UpdateProgressBar(Net.Player, math.floor((Net.LastPos/Net.Length)*100))
@ -284,7 +285,8 @@ local function AdvDupe2_ReceiveFile(len, ply, len2)
end
local status = net.ReadInt(8)
Net.Data = Net.Data..net.ReadData(len/8-1)
local datalen = net.ReadUInt(32)
Net.Data = Net.Data..net.ReadData(datalen)
if(status==1)then
AdvDupe2.LoadDupe(ply, AdvDupe2.Decode(Net.Data))