jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:Araq/Nimrod

Browse source
This commit is contained in:
Araq 2012-11-18 01:41:28 +01:00
commit 1c17d3e841
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/pure/irc.nim
View file

@ -33,7 +33,12 @@ type
address: string address: string
port: TPort port: TPort
nick, user, realname, serverPass: string nick, user, realname, serverPass: string
sock: TSocket case isAsync: bool
of false:
sock: TSocket
of true:
handleEvent: proc (irc: var TAsyncIRC, ev: TIRCEvent) {.closure.}
asyncSock: PAsyncSocket
status: TInfo status: TInfo
lastPing: float lastPing: float
lastPong: float lastPong: float
@ -44,8 +49,6 @@ type
PAsyncIRC* = ref TAsyncIRC PAsyncIRC* = ref TAsyncIRC
TAsyncIRC* = object of TIRC TAsyncIRC* = object of TIRC
handleEvent: proc (irc: var TAsyncIRC, ev: TIRCEvent) {.closure.}
asyncSock: PAsyncSocket
TIRCMType* = enum TIRCMType* = enum
MUnknown, MUnknown,
@ -92,7 +95,10 @@ proc send*(irc: var TIRC, message: string, sendImmediately = false) =
if sendMsg: if sendMsg:
try: try:
irc.sock.send(message & "\c\L") if irc.isAsync:
irc.asyncSock.send(message & "\c\L")
else:
irc.sock.send(message & "\c\L")
except EOS: except EOS:
# Assuming disconnection of every EOS could be bad, # Assuming disconnection of every EOS could be bad,
# but I can't exactly check for EBrokenPipe. # but I can't exactly check for EBrokenPipe.
@ -255,9 +261,16 @@ proc processLine(irc: var TIRC, line: string): TIRCEvent =
irc.lastPong = epochTime() irc.lastPong = epochTime()
if result.cmd == MNumeric: if result.cmd == MNumeric:
if result.numeric == "001": if result.numeric == "001":
# Check the nickname.
if irc.nick != result.params[0]:
assert ' ' notin result.params[0]
irc.nick = result.params[0]
for chan in items(irc.channelsToJoin): for chan in items(irc.channelsToJoin):
irc.join(chan) irc.join(chan)
if result.cmd == MNick:
if result.nick == irc.nick:
irc.nick = result.params[0]
proc processOther(irc: var TIRC, ev: var TIRCEvent): bool = proc processOther(irc: var TIRC, ev: var TIRCEvent): bool =
result = false result = false
if epochTime() - irc.lastPing >= 20.0: if epochTime() - irc.lastPing >= 20.0:
@ -313,6 +326,10 @@ proc isConnected*(irc: var TIRC): bool =
## Returns whether this IRC client is connected to an IRC server. ## Returns whether this IRC client is connected to an IRC server.
return irc.status == SockConnected return irc.status == SockConnected
proc getNick*(irc: var TIRC): string =
## Returns the current nickname of the client.
return irc.nick
# -- Asyncio dispatcher # -- Asyncio dispatcher
proc connect*(irc: PAsyncIRC) = proc connect*(irc: PAsyncIRC) =
@ -348,10 +365,10 @@ proc handleRead(s: PAsyncSocket, irc: PAsyncIRC) =
var ev: TIRCEvent var ev: TIRCEvent
irc[].close() irc[].close()
ev.typ = EvDisconnected ev.typ = EvDisconnected
irc.handleEvent(irc[], ev) irc[].handleEvent(irc[], ev)
else: else:
var ev = irc[].processLine(line.string) var ev = irc[].processLine(line.string)
irc.handleEvent(irc[], ev) irc[].handleEvent(irc[], ev)
discard """proc handleRead(h: PObject) = discard """proc handleRead(h: PObject) =
var irc = PAsyncIRC(h) var irc = PAsyncIRC(h)
@ -398,6 +415,7 @@ proc asyncIRC*(address: string, port: TPort = 6667.TPort,
## synchronous IRC client implementation, use ``irc`` for that. ## synchronous IRC client implementation, use ``irc`` for that.
new(result) new(result)
result.isAsync = true
result.address = address result.address = address
result.port = port result.port = port
result.nick = nick result.nick = nick