tests: Trim .nim files trailing whitespace
via OSX: find . -name '*.nim' -exec sed -i '' -E 's/[[:space:]]+$//' {} +
This commit is contained in:
Adam Strzelecki
parent
ac9c1cd6b9
commit
e80465dacf
372 changed files with 4486 additions and 4486 deletions
|
|
@ -78,11 +78,11 @@ proc poll(serv: PServer; timeout: cuint = 30) =
|
|||
case event.kind
|
||||
of EvtReceive:
|
||||
var buf = newBuffer(event.packet)
|
||||
|
||||
|
||||
serv.handlePackets(buf)
|
||||
|
||||
|
||||
event.packet.destroy()
|
||||
of EvtDisconnect:
|
||||
of EvtDisconnect:
|
||||
dispMessage "Disconnected"
|
||||
serv.connected = false
|
||||
event.peer.data = nil
|
||||
|
|
@ -111,8 +111,8 @@ proc tryConnect*(b: PButton) =
|
|||
if not dirServer.connected:
|
||||
var error: string
|
||||
if not dirServer.connect(
|
||||
clientSettings.dirServer.host,
|
||||
clientSettings.dirServer.port,
|
||||
clientSettings.dirServer.host,
|
||||
clientSettings.dirServer.port,
|
||||
error):
|
||||
dispError(error)
|
||||
else:
|
||||
|
|
@ -143,16 +143,16 @@ proc lobbyInit*() =
|
|||
clientSettings.website = s["website"].str
|
||||
zonelist.setPosition(vec2f(200.0, 100.0))
|
||||
connectionButtons = @[]
|
||||
|
||||
|
||||
var pos = vec2f(10, 10)
|
||||
u_alias = gui.newTextEntry(
|
||||
if s.hasKey("alias"): s["alias"].str else: "alias",
|
||||
if s.hasKey("alias"): s["alias"].str else: "alias",
|
||||
pos)
|
||||
pos.y += 20
|
||||
u_passwd = gui.newTextEntry("buzz", pos)
|
||||
pos.y += 20
|
||||
connectionButtons.add(gui.newButton(
|
||||
text = "Login",
|
||||
text = "Login",
|
||||
position = pos,
|
||||
onClick = tryLogin,
|
||||
startEnabled = false))
|
||||
|
|
@ -171,16 +171,16 @@ proc lobbyInit*() =
|
|||
connectionButtons.add(gui.newButton(
|
||||
text = "Test Chat",
|
||||
position = pos,
|
||||
onClick = (proc(b: PButton) =
|
||||
onClick = (proc(b: PButton) =
|
||||
var pkt = newCsChat(text = "ohai")
|
||||
dirServer.send HChat, pkt),
|
||||
startEnabled = false))
|
||||
pos.y += 20
|
||||
downloadProgress.setPosition(pos)
|
||||
downloadProgress.setPosition(pos)
|
||||
downloadProgress.bg.setFillColor(color(34, 139, 34))
|
||||
downloadProgress.bg.setSize(vec2f(0, 0))
|
||||
gui.add(downloadProgress)
|
||||
|
||||
|
||||
playBtn = gui.newButton(
|
||||
text = "Play",
|
||||
position = vec2f(680.0, 8.0),
|
||||
|
|
@ -193,20 +193,20 @@ proc lobbyInit*() =
|
|||
discard """gui.newButton(text = "Scrollback + 1", position = vec2f(185, 10), onClick = proc(b: PButton) =
|
||||
messageArea.scrollBack += 1
|
||||
update(messageArea))
|
||||
gui.newButton(text = "Scrollback - 1", position = vec2f(185+160, 10), onClick = proc(b: PButton) =
|
||||
gui.newButton(text = "Scrollback - 1", position = vec2f(185+160, 10), onClick = proc(b: PButton) =
|
||||
messageArea.scrollBack -= 1
|
||||
update(messageArea))
|
||||
gui.newButton(text = "Flood msg area", position = vec2f(185, 30), onClick = proc(b: PButton) =
|
||||
for i in 0.. <30:
|
||||
for i in 0.. <30:
|
||||
dispMessage($i))"""
|
||||
dirServer = newServer()
|
||||
dirServer = newServer()
|
||||
dirServer.addHandler HChat, handleChat
|
||||
dirServer.addHandler HLogin, handlePlayerLogin
|
||||
dirServer.addHandler HFileTransfer, client_helpers.handleFilePartRecv
|
||||
dirServer.addHandler HChallengeResult, client_helpers.handleFileChallengeResult
|
||||
dirServer.addHandler HFileChallenge, client_helpers.handleFileChallenge
|
||||
|
||||
proc lobbyReady*() =
|
||||
proc lobbyReady*() =
|
||||
kc.setActive()
|
||||
gui.setActive(u_alias)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import enet, strutils, idgen, tables, math_helpers,
|
||||
import enet, strutils, idgen, tables, math_helpers,
|
||||
estreams, sg_packets, server_utils, sg_assets, client_helpers
|
||||
when appType == "gui":
|
||||
import sfml, sfml_colors, sg_gui,
|
||||
|
|
@ -14,7 +14,7 @@ var
|
|||
event: enet.TEvent
|
||||
clientID = newIDGen[int32]()
|
||||
clients = initTable[int32, PClient](64)
|
||||
handlers = initTable[char, TCallback](32)
|
||||
handlers = initTable[char, TCallback](32)
|
||||
|
||||
when appType == "gui":
|
||||
var
|
||||
|
|
@ -67,7 +67,7 @@ proc flushPubChat() =
|
|||
|
||||
handlers[HChat] = proc(client: PClient; buffer: PBuffer) =
|
||||
var chat = readCsChat(buffer)
|
||||
|
||||
|
||||
if not client.auth:
|
||||
client.sendError("You are not logged in.")
|
||||
return
|
||||
|
|
@ -75,7 +75,7 @@ handlers[HChat] = proc(client: PClient; buffer: PBuffer) =
|
|||
# if alias2client.hasKey(chat.target):
|
||||
# alias2client[chat.target].forwardPrivate(client, chat.text)
|
||||
#else:
|
||||
|
||||
|
||||
dispmessage("<", client.alias, "> ", chat.text)
|
||||
queuePub(client, chat)
|
||||
|
||||
|
|
@ -104,20 +104,20 @@ handlers[HZoneJoinReq] = proc(client: PClient; buffer: PBuffer) =
|
|||
|
||||
when isMainModule:
|
||||
import parseopt, matchers, os, json
|
||||
|
||||
|
||||
|
||||
|
||||
if enetInit() != 0:
|
||||
quit "Could not initialize ENet"
|
||||
|
||||
|
||||
var address: enet.TAddress
|
||||
|
||||
|
||||
block:
|
||||
var zoneCfgFile = "./server_settings.json"
|
||||
for kind, key, val in getOpt():
|
||||
case kind
|
||||
of cmdShortOption, cmdLongOption:
|
||||
case key
|
||||
of "f", "file":
|
||||
of "f", "file":
|
||||
if existsFile(val):
|
||||
zoneCfgFile = val
|
||||
else:
|
||||
|
|
@ -127,45 +127,45 @@ when isMainModule:
|
|||
else:
|
||||
echo("Unknown option: ", key, " ", val)
|
||||
var jsonSettings = parseFile(zoneCfgFile)
|
||||
let
|
||||
let
|
||||
port = uint16(jsonSettings["port"].num)
|
||||
zoneFile = jsonSettings["settings"].str
|
||||
dirServerInfo = jsonSettings["dirserver"]
|
||||
|
||||
|
||||
address.host = EnetHostAny
|
||||
address.port = port
|
||||
|
||||
|
||||
var path = getAppDir()/../"data"/zoneFile
|
||||
if not existsFile(path):
|
||||
echo("Zone settings file does not exist: ../data/", zoneFile)
|
||||
echo(path)
|
||||
quit(1)
|
||||
|
||||
|
||||
discard """block:
|
||||
var
|
||||
var
|
||||
TestFile: FileChallengePair
|
||||
contents = repeat("abcdefghijklmnopqrstuvwxyz", 2)
|
||||
testFile.challenge = newScFileChallenge("foobar.test", FZoneCfg, contents.len.int32)
|
||||
testFile.challenge = newScFileChallenge("foobar.test", FZoneCfg, contents.len.int32)
|
||||
testFile.file = checksumStr(contents)
|
||||
myAssets.add testFile"""
|
||||
|
||||
|
||||
setCurrentDir getAppDir().parentDir()
|
||||
let zonesettings = readFile(path)
|
||||
var
|
||||
var
|
||||
errors: seq[string] = @[]
|
||||
if not loadSettings(zoneSettings, errors):
|
||||
echo("You have errors in your zone settings:")
|
||||
for e in errors: echo("**", e)
|
||||
quit(1)
|
||||
errors.setLen 0
|
||||
|
||||
|
||||
var pair: FileChallengePair
|
||||
pair.challenge.file = zoneFile
|
||||
pair.challenge.assetType = FZoneCfg
|
||||
pair.challenge.fullLen = zoneSettings.len.int32
|
||||
pair.file = checksumStr(zoneSettings)
|
||||
myAssets.add pair
|
||||
|
||||
|
||||
allAssets:
|
||||
if not load(asset):
|
||||
echo "Invalid or missing file ", file
|
||||
|
|
@ -177,11 +177,11 @@ when isMainModule:
|
|||
expandPath(assetType, file)).int32
|
||||
pair.file = asset.contents
|
||||
myAssets.add pair
|
||||
|
||||
|
||||
echo "Zone has ", myAssets.len, " associated assets"
|
||||
|
||||
|
||||
dirServer = newServer()
|
||||
|
||||
|
||||
dirServer.addHandler HDsMsg, proc(serv: PServer; buffer: PBuffer) =
|
||||
var m = readDsMsg(buffer)
|
||||
dispMessage("<DirServer> ", m.msg)
|
||||
|
|
@ -189,20 +189,20 @@ when isMainModule:
|
|||
let loggedIn = readDsZoneLogin(buffer).status
|
||||
if loggedIn:
|
||||
#dirServerConnected = true
|
||||
|
||||
|
||||
if dirServerInfo.kind == JArray:
|
||||
var error: string
|
||||
if not dirServer.connect(dirServerInfo[0].str, dirServerInfo[1].num.int16, error):
|
||||
dispError("<DirServer> "&error)
|
||||
|
||||
|
||||
|
||||
|
||||
server = enet.createHost(address, 32, 2, 0, 0)
|
||||
if server == nil:
|
||||
quit "Could not create the server!"
|
||||
|
||||
|
||||
dispMessage("Listening on port ", address.port)
|
||||
|
||||
var
|
||||
|
||||
var
|
||||
serverRunning = true
|
||||
when appType == "gui":
|
||||
var frameRate = newClock()
|
||||
|
|
@ -210,11 +210,11 @@ when isMainModule:
|
|||
else:
|
||||
var frameRate = epochTime()
|
||||
var pubChatDelay = frameRate
|
||||
|
||||
|
||||
while serverRunning:
|
||||
when appType == "gui":
|
||||
let dt = frameRate.restart.asMilliseconds().float / 1000.0
|
||||
|
||||
|
||||
for event in window.filterEvents():
|
||||
case event.kind
|
||||
of sfml.EvtClosed:
|
||||
|
|
@ -225,7 +225,7 @@ when isMainModule:
|
|||
else:
|
||||
let dt = epochTime() - frameRate ##is this right? probably not
|
||||
frameRate = epochTime()
|
||||
|
||||
|
||||
while server.hostService(event, 10) > 0:
|
||||
case event.kind
|
||||
of EvtConnect:
|
||||
|
|
@ -234,27 +234,27 @@ when isMainModule:
|
|||
|
||||
event.peer.data = addr client.id
|
||||
client.peer = event.peer
|
||||
|
||||
|
||||
dispMessage("New client connected ", client)
|
||||
|
||||
|
||||
var
|
||||
msg = "hello"
|
||||
msg = "hello"
|
||||
resp = createPacket(cstring(msg), msg.len + 1, FlagReliable)
|
||||
|
||||
|
||||
if event.peer.send(0.cuchar, resp) < 0:
|
||||
echo "FAILED"
|
||||
else:
|
||||
echo "Replied"
|
||||
of EvtReceive:
|
||||
let client = clients[cast[ptr int32](event.peer.data)[]]
|
||||
|
||||
let client = clients[cast[ptr int32](event.peer.data)[]]
|
||||
|
||||
var buf = newBuffer(event.packet)
|
||||
let k = buf.readChar()
|
||||
if handlers.hasKey(k):
|
||||
handlers[k](client, buf)
|
||||
else:
|
||||
dispError("Unknown packet from ", client)
|
||||
|
||||
|
||||
destroy(event.packet)
|
||||
of EvtDisconnect:
|
||||
var
|
||||
|
|
@ -267,11 +267,11 @@ when isMainModule:
|
|||
dispMessage(clients[id], " disconnected")
|
||||
GCUnref(clients[id])
|
||||
clients.del id
|
||||
|
||||
|
||||
event.peer.data = nil
|
||||
else:
|
||||
discard
|
||||
|
||||
|
||||
when appType == "gui":
|
||||
fpsText.setString(ff(1.0/dt))
|
||||
if pubChatDelay.getElapsedTime.asSeconds > 0.25:
|
||||
|
|
@ -281,14 +281,14 @@ when isMainModule:
|
|||
pubChatDelay -= dt
|
||||
if frameRate - pubChatDelay > 0.25:
|
||||
flushPubChat()
|
||||
|
||||
|
||||
when appType == "gui":
|
||||
window.clear(Black)
|
||||
window.draw(GUI)
|
||||
window.draw chatbox
|
||||
window.draw mousePos
|
||||
window.draw fpstext
|
||||
window.display()
|
||||
window.display()
|
||||
|
||||
server.destroy()
|
||||
enetDeinit()
|
||||
enetDeinit()
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ type
|
|||
auth*: bool
|
||||
alias*: string
|
||||
peer*: PPeer
|
||||
|
||||
|
||||
FileChallengePair* = tuple[challenge: ScFileChallenge; file: TChecksumFile]
|
||||
PFileChallengeSequence* = ref TFileChallengeSequence
|
||||
PFileChallengeSequence* = ref TFileChallengeSequence
|
||||
TFileChallengeSequence = object
|
||||
index: int #which file is active
|
||||
transfer: ScFileTransfer
|
||||
|
|
@ -73,7 +73,7 @@ proc sendChunk*(challenge: PFileChallengeSequence, client: PClient) =
|
|||
let size = min(FileChunkSize, challenge.transfer.fileSize - challenge.transfer.pos)
|
||||
challenge.transfer.data.setLen size
|
||||
copyMem(
|
||||
addr challenge.transfer.data[0],
|
||||
addr challenge.transfer.data[0],
|
||||
addr challenge.file.file.compressed[challenge.transfer.pos],
|
||||
size)
|
||||
client.send HFileTransfer, challenge.transfer
|
||||
|
|
@ -90,7 +90,7 @@ proc startSend*(challenge: PFileChallengeSequence, client: PClient) =
|
|||
## HFileTransfer
|
||||
proc handleFilePartAck*(client: PClient; buffer: PBuffer) =
|
||||
echo "got filepartack"
|
||||
var
|
||||
var
|
||||
ftrans = readCsFilepartAck(buffer)
|
||||
fcSeq = fileChallenges[client.id]
|
||||
fcSeq.transfer.pos = ftrans.lastPos
|
||||
|
|
@ -99,7 +99,7 @@ proc handleFilePartAck*(client: PClient; buffer: PBuffer) =
|
|||
## HFileCHallenge
|
||||
proc handleFileChallengeResp*(client: PClient; buffer: PBuffer) =
|
||||
echo "got file challenge resp"
|
||||
var
|
||||
var
|
||||
fcResp = readCsFileChallenge(buffer)
|
||||
fcSeq = fileChallenges[client.id]
|
||||
let index = $(fcSeq.index + 1) / $(myAssets.len)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue