xib: irclib.py annotate

annotate irclib.py @ 225:da8fbaf69242

fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Signed-off-by: Charly COSTE <changaco@changaco.net>

author	Charly COSTE <changaco@changaco.net>
date	Sun, 07 Mar 2010 19:01:57 +0100
parents	8e6a0b60eed1
children	5f1e9211af03

rev	line source
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1 # Copyright (C) 1999--2002 Joel Rosdahl
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	2 #
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	3 # This library is free software; you can redistribute it and/or
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	4 # modify it under the terms of the GNU Lesser General Public
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	5 # License as published by the Free Software Foundation; either
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	6 # version 2.1 of the License, or (at your option) any later version.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	7 #
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	8 # This library is distributed in the hope that it will be useful,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	11 # Lesser General Public License for more details.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	12 #
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	13 # You should have received a copy of the GNU Lesser General Public
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	14 # License along with this library; if not, write to the Free Software
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	15 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	16 #
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	17 # keltus <keltus@users.sourceforge.net>
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	18 #
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	19 # $Id: irclib.py,v 1.47 2008/09/25 22:00:59 keltus Exp $
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	20
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	21 """irclib -- Internet Relay Chat (IRC) protocol client library.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	22
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	23 This library is intended to encapsulate the IRC protocol at a quite
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	24 low level. It provides an event-driven IRC client framework. It has
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	25 a fairly thorough support for the basic IRC protocol, CTCP, DCC chat,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	26 but DCC file transfers is not yet supported.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	27
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	28 In order to understand how to make an IRC client, I'm afraid you more
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	29 or less must understand the IRC specifications. They are available
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	30 here: [IRC specifications].
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	31
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	32 The main features of the IRC client framework are:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	33
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	34 * Abstraction of the IRC protocol.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	35 * Handles multiple simultaneous IRC server connections.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	36 * Handles server PONGing transparently.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	37 * Messages to the IRC server are done by calling methods on an IRC
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	38 connection object.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	39 * Messages from an IRC server triggers events, which can be caught
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	40 by event handlers.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	41 * Reading from and writing to IRC server sockets are normally done
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	42 by an internal select() loop, but the select()ing may be done by
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	43 an external main loop.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	44 * Functions can be registered to execute at specified times by the
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	45 event-loop.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	46 * Decodes CTCP tagging correctly (hopefully); I haven't seen any
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	47 other IRC client implementation that handles the CTCP
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	48 specification subtilties.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	49 * A kind of simple, single-server, object-oriented IRC client class
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	50 that dispatches events to instance methods is included.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	51
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	52 Current limitations:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	53
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	54 * The IRC protocol shines through the abstraction a bit too much.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	55 * Data is not written asynchronously to the server, i.e. the write()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	56 may block if the TCP buffers are stuffed.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	57 * There are no support for DCC file transfers.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	58 * The author haven't even read RFC 2810, 2811, 2812 and 2813.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	59 * Like most projects, documentation is lacking...
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	60
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	61 .. [IRC specifications] http://www.irchelp.org/irchelp/rfc/
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	62 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	63
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	64 import bisect
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	65 import re
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	66 import select
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	67 import socket
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	68 import string
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	69 import sys
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	70 import time
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	71 import types
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	72 import threading
69 0a2b9e84bbde Strip colors from IRC messages Charly COSTE <changaco@changaco.net> parents: 68 diff changeset	73 import traceback
115 0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	74 import math
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	75
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	76 import say_levels
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	77
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	78 VERSION = 0, 4, 8
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	79 DEBUG = 0
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	80
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	81 # TODO
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	82 # ----
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	83 # (maybe) thread safety
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	84 # (maybe) color parser convenience functions
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	85 # documentation (including all event types)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	86 # (maybe) add awareness of different types of ircds
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	87 # send data asynchronously to the server (and DCC connections)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	88 # (maybe) automatically close unused, passive DCC connections after a while
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	89
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	90 # NOTES
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	91 # -----
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	92 # connection.quit() only sends QUIT to the server.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	93 # ERROR from the server triggers the error event and the disconnect event.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	94 # dropping of the connection triggers the disconnect event.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	95
89 94fc538cdf65 Better format stripping for IRC messages Charly COSTE <changaco@changaco.net> parents: 87 diff changeset	96 strip_formatting_re = re.compile('(?:\x03[0-9]*(?:,[0-9]+)?\|\x02\|\x1f)')
69 0a2b9e84bbde Strip colors from IRC messages Charly COSTE <changaco@changaco.net> parents: 68 diff changeset	97
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	98 class IRCError(Exception):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	99 """Represents an IRC exception."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	100 pass
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	101
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	102
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	103 class IRC:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	104 """Class that handles one or several IRC server connections.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	105
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	106 When an IRC object has been instantiated, it can be used to create
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	107 Connection objects that represent the IRC connections. The
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	108 responsibility of the IRC object is to provide an event-driven
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	109 framework for the connections and to keep the connections alive.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	110 It runs a select loop to poll each connection's TCP socket and
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	111 hands over the sockets with incoming data for processing by the
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	112 corresponding connection.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	113
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	114 The methods of most interest for an IRC client writer are server,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	115 add_global_handler, remove_global_handler, execute_at,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	116 execute_delayed, process_once and process_forever.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	117
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	118 Here is an example:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	119
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	120 irc = irclib.IRC()
125 efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	121 server = irc.open_connection(\"irc.some.where\", 6667, \"my_nickname\")
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	122 server.connect()
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	123 server.privmsg(\"a_nickname\", \"Hi there!\")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	124 irc.process_forever()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	125
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	126 This will connect to the IRC server irc.some.where on port 6667
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	127 using the nickname my_nickname and send the message \"Hi there!\"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	128 to the nickname a_nickname.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	129 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	130
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	131 def __init__(self, fn_to_add_socket=None,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	132 fn_to_remove_socket=None,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	133 fn_to_add_timeout=None):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	134 """Constructor for IRC objects.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	135
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	136 Optional arguments are fn_to_add_socket, fn_to_remove_socket
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	137 and fn_to_add_timeout. The first two specify functions that
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	138 will be called with a socket object as argument when the IRC
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	139 object wants to be notified (or stop being notified) of data
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	140 coming on a new socket. When new data arrives, the method
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	141 process_data should be called. Similarly, fn_to_add_timeout
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	142 is called with a number of seconds (a floating point number)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	143 as first argument when the IRC object wants to receive a
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	144 notification (by calling the process_timeout method). So, if
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	145 e.g. the argument is 42.17, the object wants the
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	146 process_timeout method to be called after 42 seconds and 170
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	147 milliseconds.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	148
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	149 The three arguments mainly exist to be able to use an external
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	150 main loop (for example Tkinter's or PyGTK's main app loop)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	151 instead of calling the process_forever method.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	152
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	153 An alternative is to just call ServerConnection.process_once()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	154 once in a while.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	155 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	156
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	157 if fn_to_add_socket and fn_to_remove_socket:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	158 self.fn_to_add_socket = fn_to_add_socket
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	159 self.fn_to_remove_socket = fn_to_remove_socket
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	160 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	161 self.fn_to_add_socket = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	162 self.fn_to_remove_socket = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	163
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	164 self.fn_to_add_timeout = fn_to_add_timeout
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	165 self.connections = []
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	166 self.handlers = {}
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	167 self.delayed_commands = [] # list of tuples in the format (time, function, arguments)
172 64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	168 self.charsets = {'': ['utf-8']}
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	169 self.connection_intervals = {'': 1}
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	170 self.connection_stacks = {}
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	171
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	172 self.add_global_handler("ping", _ping_ponger, -42)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	173
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	174
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	175 def _connection_loop(self, server_str):
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	176 stack = self.connection_stacks[server_str]
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	177 if len(stack) > 0:
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	178 stack[0][0](*stack[0][1])
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	179 stack.pop(0)
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	180 delay = self.connection_interval(server=server_str)
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	181 self.bot.error(2, 'waiting '+str(delay)+' seconds before next connection on '+server_str, debug=True)
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	182 self.execute_delayed(delay, self._connection_loop, (server_str,))
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	183 else:
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	184 self.connection_stacks.pop(server_str)
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	185
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	186
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	187 def connection_interval(self, server='', seconds=None):
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	188 if seconds:
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	189 self.connection_intervals[server] = seconds
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	190 return seconds
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	191 elif self.connection_intervals.has_key(server):
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	192 return self.connection_intervals[server]
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	193 else:
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	194 return self.connection_intervals['']
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	195
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	196
125 efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	197 def get_connection(self, server, port, nickname):
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	198 for c in self.connections:
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	199 if c.server == server and c.port == port and nickname in [c.nickname, c.real_nickname]:
125 efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	200 return c
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	201 return None
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	202
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	203 def has_connection(self, server, port, nickname):
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	204 if self.get_connection(server, port, nickname):
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	205 return True
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	206 return False
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	207
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	208 def open_connection(self, server, port, nickname, delay=None):
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	209 """Creates or returns an existing ServerConnection object for nickname at server:port.
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	210
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	211 server -- Server name.
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	212
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	213 port -- Port number.
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	214
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	215 nickname -- The nickname."""
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	216
125 efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	217 c = self.get_connection(server, port, nickname)
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	218 if c:
efdc038e757a fixed participant.changeNickname(), renamed IRC.server() to IRC.open_connection(), created IRC.get_connection() and IRC.has_connection(), removed irclib.SimpleIRCClient (we don't need it) Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	219 return c
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	220 c = ServerConnection(self, server, port, nickname)
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	221 server_str = c._server_str()
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	222 if not self.connection_stacks.has_key(server_str):
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	223 self.connection_stacks[server_str] = []
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	224 delay = self.connection_interval(server=server_str, seconds=delay)
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	225 self.execute_delayed(delay, self._connection_loop, (server_str,))
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	226 self.connections.append(c)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	227 return c
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	228
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	229 def process_data(self, sockets):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	230 """Called when there is more data to read on connection sockets.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	231
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	232 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	233
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	234 sockets -- A list of socket objects.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	235
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	236 See documentation for IRC.__init__.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	237 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	238 for s in sockets:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	239 for c in self.connections:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	240 if s == c._get_socket():
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	241 c.lock.acquire()
57 ebd4278e472f Some thread safety for irclib.py Charly COSTE <changaco@changaco.net> parents: 56 diff changeset	242 if hasattr(c, 'socket'):
210 fb0cf6bf9eab (irclib) moved ServerNotConnectedError handling from IRC.process_data() to IRC.process_forever() in order to always catch it Charly COSTE <changaco@changaco.net> parents: 209 diff changeset	243 c.process_data()
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	244 c.lock.release()
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	245
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	246 def process_timeout(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	247 """Called when a timeout notification is due.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	248
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	249 See documentation for IRC.__init__.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	250 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	251 t = time.time()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	252 while self.delayed_commands:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	253 if t >= self.delayed_commands[0][0]:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	254 self.delayed_commands[0][1](*self.delayed_commands[0][2])
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	255 del self.delayed_commands[0]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	256 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	257 break
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	258
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	259 def process_once(self, timeout=0):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	260 """Process data from connections once.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	261
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	262 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	263
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	264 timeout -- How long the select() call should wait if no
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	265 data is available.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	266
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	267 This method should be called periodically to check and process
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	268 incoming data, if there are any. If that seems boring, look
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	269 at the process_forever method.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	270 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	271 sockets = map(lambda x: x._get_socket(), self.connections)
146 229a59acde0f fixes in irclib, needed because ServerConnection.socket can be a string since 42d7b622776196149c9a9a05da134a85ee9509c6 Charly COSTE <changaco@changaco.net> parents: 140 diff changeset	272 sockets = filter(lambda x: x and not isinstance(x, basestring), sockets)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	273 if sockets:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	274 (i, o, e) = select.select(sockets, [], [], timeout)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	275 self.process_data(i)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	276 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	277 time.sleep(timeout)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	278 self.process_timeout()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	279
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	280 def process_forever(self, timeout=0.2):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	281 """Run an infinite loop, processing data from connections.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	282
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	283 This method repeatedly calls process_once.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	284
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	285 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	286
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	287 timeout -- Parameter to pass to process_once.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	288 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	289 while 1:
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 149 diff changeset	290 if self.bot.halt:
63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 149 diff changeset	291 self.disconnect_all(message='Stopping bot')
63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 149 diff changeset	292 break
147 0aa31a2b9316 moved exception handling in IRC thread from process_data() to process_forever() where it belongs Charly COSTE <changaco@changaco.net> parents: 146 diff changeset	293 try:
0aa31a2b9316 moved exception handling in IRC thread from process_data() to process_forever() where it belongs Charly COSTE <changaco@changaco.net> parents: 146 diff changeset	294 self.process_once(timeout)
218 ca22fdea1c17 (irclib) minor fixes for 9e494bf91d13f165af272b7bef9422a4ea9100eb (auto-reconnection improvement) Charly COSTE <changaco@changaco.net> parents: 210 diff changeset	295 except ServerNotConnectedError as e:
ca22fdea1c17 (irclib) minor fixes for 9e494bf91d13f165af272b7bef9422a4ea9100eb (auto-reconnection improvement) Charly COSTE <changaco@changaco.net> parents: 210 diff changeset	296 if len(e.args) > 0:
ca22fdea1c17 (irclib) minor fixes for 9e494bf91d13f165af272b7bef9422a4ea9100eb (auto-reconnection improvement) Charly COSTE <changaco@changaco.net> parents: 210 diff changeset	297 c = e.args[0]
ca22fdea1c17 (irclib) minor fixes for 9e494bf91d13f165af272b7bef9422a4ea9100eb (auto-reconnection improvement) Charly COSTE <changaco@changaco.net> parents: 210 diff changeset	298 else:
ca22fdea1c17 (irclib) minor fixes for 9e494bf91d13f165af272b7bef9422a4ea9100eb (auto-reconnection improvement) Charly COSTE <changaco@changaco.net> parents: 210 diff changeset	299 self.bot.error(say_levels.error, 'Unkonwn exception on IRC thread:\n'+str(e.args))
ca22fdea1c17 (irclib) minor fixes for 9e494bf91d13f165af272b7bef9422a4ea9100eb (auto-reconnection improvement) Charly COSTE <changaco@changaco.net> parents: 210 diff changeset	300 continue
210 fb0cf6bf9eab (irclib) moved ServerNotConnectedError handling from IRC.process_data() to IRC.process_forever() in order to always catch it Charly COSTE <changaco@changaco.net> parents: 209 diff changeset	301 if c.real_nickname == self.bot.nickname:
fb0cf6bf9eab (irclib) moved ServerNotConnectedError handling from IRC.process_data() to IRC.process_forever() in order to always catch it Charly COSTE <changaco@changaco.net> parents: 209 diff changeset	302 self.bot.restart(message='Lost bot IRC connection')
fb0cf6bf9eab (irclib) moved ServerNotConnectedError handling from IRC.process_data() to IRC.process_forever() in order to always catch it Charly COSTE <changaco@changaco.net> parents: 209 diff changeset	303 else:
fb0cf6bf9eab (irclib) moved ServerNotConnectedError handling from IRC.process_data() to IRC.process_forever() in order to always catch it Charly COSTE <changaco@changaco.net> parents: 209 diff changeset	304 c.disconnect(volontary=True)
fb0cf6bf9eab (irclib) moved ServerNotConnectedError handling from IRC.process_data() to IRC.process_forever() in order to always catch it Charly COSTE <changaco@changaco.net> parents: 209 diff changeset	305 c.connect()
147 0aa31a2b9316 moved exception handling in IRC thread from process_data() to process_forever() where it belongs Charly COSTE <changaco@changaco.net> parents: 146 diff changeset	306 except:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	307 self.bot.error(say_levels.error, 'Unkonwn exception on IRC thread:\n'+traceback.format_exc(), send_to_admins=True)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	308
158 73b6c8d20da7 fixed IRC.disconnect_all() (added "volontary" argument) Charly COSTE <changaco@changaco.net> parents: 155 diff changeset	309 def disconnect_all(self, message="", volontary=True):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	310 """Disconnects all connections."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	311 for c in self.connections:
158 73b6c8d20da7 fixed IRC.disconnect_all() (added "volontary" argument) Charly COSTE <changaco@changaco.net> parents: 155 diff changeset	312 c.disconnect(message, volontary=volontary)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	313
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	314 def add_global_handler(self, event, handler, priority=0):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	315 """Adds a global handler function for a specific event type.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	316
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	317 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	318
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	319 event -- Event type (a string). Check the values of the
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	320 numeric_events dictionary in irclib.py for possible event
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	321 types.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	322
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	323 handler -- Callback function.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	324
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	325 priority -- A number (the lower number, the higher priority).
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	326
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	327 The handler function is called whenever the specified event is
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	328 triggered in any of the connections. See documentation for
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	329 the Event class.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	330
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	331 The handler functions are called in priority order (lowest
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	332 number is highest priority). If a handler function returns
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	333 \"NO MORE\", no more handlers will be called.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	334 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	335 if not event in self.handlers:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	336 self.handlers[event] = []
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	337 bisect.insort(self.handlers[event], ((priority, handler)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	338
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	339 def remove_global_handler(self, event, handler):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	340 """Removes a global handler function.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	341
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	342 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	343
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	344 event -- Event type (a string).
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	345
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	346 handler -- Callback function.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	347
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	348 Returns 1 on success, otherwise 0.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	349 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	350 if not event in self.handlers:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	351 return 0
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	352 for h in self.handlers[event]:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	353 if handler == h[1]:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	354 self.handlers[event].remove(h)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	355 return 1
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	356
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	357 def execute_at(self, at, function, arguments=()):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	358 """Execute a function at a specified time.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	359
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	360 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	361
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	362 at -- Execute at this time (standard \"time_t\" time).
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	363
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	364 function -- Function to call.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	365
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	366 arguments -- Arguments to give the function.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	367 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	368 self.execute_delayed(at-time.time(), function, arguments)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	369
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	370 def execute_delayed(self, delay, function, arguments=()):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	371 """Execute a function after a specified time.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	372
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	373 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	374
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	375 delay -- How many seconds to wait.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	376
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	377 function -- Function to call.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	378
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	379 arguments -- Arguments to give the function.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	380 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	381 bisect.insort(self.delayed_commands, (delay+time.time(), function, arguments))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	382 if self.fn_to_add_timeout:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	383 self.fn_to_add_timeout(delay)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	384
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	385 def dcc(self, dcctype="chat"):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	386 """Creates and returns a DCCConnection object.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	387
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	388 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	389
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	390 dcctype -- "chat" for DCC CHAT connections or "raw" for
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	391 DCC SEND (or other DCC types). If "chat",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	392 incoming data will be split in newline-separated
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	393 chunks. If "raw", incoming data is not touched.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	394 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	395 c = DCCConnection(self, dcctype)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	396 self.connections.append(c)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	397 return c
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	398
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	399 def _handle_event(self, connection, event):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	400 """[Internal]"""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	401 h = self.handlers
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	402 for handler in h.get("all_events", []) + h.get(event.eventtype(), []):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	403 if handler[1](connection, event) == "NO MORE":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	404 return
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	405
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	406 def _remove_connection(self, connection):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	407 """[Internal]"""
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	408 if connection in self.connections:
4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	409 self.connections.remove(connection)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	410 if self.fn_to_remove_socket:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	411 self.fn_to_remove_socket(connection._get_socket())
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	412
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	413 _rfc_1459_command_regexp = re.compile("^(:(?P<prefix>[^ ]+) +)?(?P<command>[^ ]+)( *(?P<argument> .+))?")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	414
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	415 class Connection:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	416 """Base class for IRC connections.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	417
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	418 Must be overridden.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	419 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	420 def __init__(self, irclibobj):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	421 self.irclibobj = irclibobj
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	422
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	423 def _get_socket():
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	424 raise IRCError, "Not overridden"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	425
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	426 ##############################
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	427 ### Convenience wrappers.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	428
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	429 def execute_at(self, at, function, arguments=()):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	430 self.irclibobj.execute_at(at, function, arguments)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	431
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	432 def execute_delayed(self, delay, function, arguments=()):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	433 self.irclibobj.execute_delayed(delay, function, arguments)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	434
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	435
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	436 class ServerConnectionError(IRCError):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	437 pass
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	438
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	439 class ServerNotConnectedError(ServerConnectionError):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	440 pass
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	441
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	442
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	443 # Huh!? Crrrrazy EFNet doesn't follow the RFC: their ircd seems to
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	444 # use \n as message separator! :P
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	445 _linesep_regexp = re.compile("\r?\n")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	446
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	447 class ServerConnection(Connection):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	448 """This class represents an IRC server connection.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	449
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	450 ServerConnection objects are instantiated by calling the server
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	451 method on an IRC object.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	452 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	453
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	454 def __init__(self, irclibobj, server, port, nickname):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	455 Connection.__init__(self, irclibobj)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	456 self.connected = False # Not connected yet.
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	457 self.logged_in = False
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	458 self.used_by = 0
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	459 self.socket = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	460 self.ssl = None
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	461 self.server = server
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	462 self.port = port
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	463 self.nickname = nickname
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	464 self.nick_callbacks = []
224 8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	465 self.join_callbacks = {}
43 9f72353e4064 Minor change to irclib.py Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	466 self.lock = threading.RLock()
131 46af7f2744a9 added irclib.ServerConnection.left_channels Charly COSTE <changaco@changaco.net> parents: 128 diff changeset	467 self.left_channels = []
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	468
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	469
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	470 def __str__(self):
172 64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	471 return self.real_nickname+' at '+self._server_str()
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	472
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	473
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	474 def _decode(self, bytes):
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	475 charsets = self.irclibobj.charsets[self._server_str()] or self.irclibobj.charsets['']
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	476 for codec in charsets:
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	477 try:
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	478 return bytes.decode(codec)
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	479 except (UnicodeEncodeError, UnicodeDecodeError):
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	480 pass
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	481 raise Exception, 'no suitable codec found for: '+repr(bytes)+'\ntried: '+' '.join(charsets)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	482
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	483
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 74 diff changeset	484 def _ping(self):
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 74 diff changeset	485 self.irclibobj.execute_delayed(60, self._ping)
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 74 diff changeset	486 if self.connected == False:
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 74 diff changeset	487 return
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	488 self.irclibobj.bot.error(1, 'sending IRC ping', debug=True)
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 74 diff changeset	489 self.ping(self.get_server_name())
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 74 diff changeset	490
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 74 diff changeset	491
172 64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	492 def _server_str(self):
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	493 return self.server+':'+str(self.port)
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	494
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	495
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	496 def connect(self, password=None, username=None,
172 64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	497 ircname=None, localaddress="", localport=0, ssl=False, ipv6=False, nick_callback=None, charsets=None):
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	498 """Connect to the server.
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	499
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	500 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	501
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	502 password -- Password (if any).
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	503
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	504 username -- The username.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	505
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	506 ircname -- The IRC name ("realname").
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	507
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	508 localaddress -- Bind the connection to a specific local IP address.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	509
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	510 localport -- Bind the connection to a specific local port.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	511
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	512 ssl -- Enable support for ssl.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	513
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	514 ipv6 -- Enable support for ipv6.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	515
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	516 This function can be called to reconnect a closed connection.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	517
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	518 Returns the ServerConnection object.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	519 """
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	520
43 9f72353e4064 Minor change to irclib.py Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	521 self.lock.acquire()
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	522
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	523 if nick_callback:
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	524 self.add_nick_callback(nick_callback)
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	525
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	526 if self.used_by > 0:
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	527 self.used_by += 1
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	528 self.irclibobj.bot.error(3, 'using existing IRC connection for '+self.__str__()+', this connection is now used by '+str(self.used_by)+' bridges', debug=True)
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	529 if self.logged_in:
68 7aa1f59800b0 Fixed IRC nick callback Charly COSTE <changaco@changaco.net> parents: 67 diff changeset	530 self._call_nick_callbacks(None)
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	531 self.lock.release()
4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	532 return self
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	533
136 7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	534 if self.socket != 'closed':
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	535 self.used_by = 1
172 64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	536 if charsets or not self.irclibobj.charsets.has_key(self._server_str()):
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	537 self.irclibobj.charsets[self._server_str()] = charsets
196 4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	538 self.channels = []
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	539 self.channels_keys = {}
136 7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	540 self.irc_id = None
7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	541 self.previous_buffer = ""
7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	542 self.handlers = {}
7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	543 self.real_server_name = ""
7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	544 self.real_nickname = self.nickname
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	545 self.new_nickname = None
136 7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	546 self.username = username or self.nickname
7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	547 self.ircname = ircname or self.nickname
7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	548 self.password = password
7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	549 self.localaddress = localaddress
7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	550 self.localport = localport
7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	551 self.localhost = socket.gethostname()
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	552 self.ssl = ssl
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	553 self.ipv6 = ipv6
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	554
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	555 self.irclibobj.connection_stacks[self._server_str()].append( (self._connect, ()) )
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	556
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	557 self.lock.release()
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	558 return self
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	559
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	560
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	561 def _connect(self):
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	562
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	563 self._ping()
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	564
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	565 self.lock.acquire()
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	566
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	567 if self.socket != 'closed':
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	568 self.irclibobj.bot.error(3, 'opening new IRC connection for '+self.__str__(), debug=True)
136 7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	569 else:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	570 self.irclibobj.bot.error(3, 'reopening IRC connection for '+self.__str__(), debug=True)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	571
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	572 if self.ipv6:
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	573 self.socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	574 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	575 self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	576 try:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	577 self.socket.bind((self.localaddress, self.localport))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	578 self.socket.connect((self.server, self.port))
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	579 if self.ssl:
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	580 self.ssl = socket.ssl(self.socket)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	581 except socket.error, x:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	582 self.socket.close()
136 7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	583 self.socket = 'closed'
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	584 raise ServerConnectionError, "Couldn't connect to socket: %s" % x
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	585 self.connected = True
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	586 if self.irclibobj.fn_to_add_socket:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	587 self.irclibobj.fn_to_add_socket(self.socket)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	588
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	589 # Log on...
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	590 if self.password:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	591 self.pass_(self.password)
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	592 if self.nick(self.nickname):
56 b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	593 self.user(self.username, self.ircname)
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	594
196 4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	595 # Rejoin channels
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	596 if len(self.channels) > 0:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	597 for channel in self.channels:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	598 if self.channels_keys.has_key(channel):
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	599 key = self.channels_keys[channel]
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	600 else:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	601 key = ''
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	602 self.join(channel, key=key)
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	603
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	604 self.lock.release()
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	605 return self
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	606
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	607
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	608 def _call_nick_callbacks(self, error):
222 1439d3274e6a (irclib) minor changes to _call_nick_callbacks Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	609 if len(self.nick_callbacks) == 0:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	610 self.irclibobj.bot.error(1, 'no nick callback for "'+self.__str__()+'"', debug=True)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	611 else:
222 1439d3274e6a (irclib) minor changes to _call_nick_callbacks Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	612 self.irclibobj.bot.error(1, 'calling '+str(len(self.nick_callbacks))+' nick callback(s) for "'+self.__str__()+'"', debug=True)
1439d3274e6a (irclib) minor changes to _call_nick_callbacks Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	613 for f in self.nick_callbacks:
1439d3274e6a (irclib) minor changes to _call_nick_callbacks Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	614 f(error)
1439d3274e6a (irclib) minor changes to _call_nick_callbacks Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	615 self.nick_callbacks = []
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	616
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	617
224 8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	618 def _call_join_callbacks(self, channel, error):
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	619 self.lock.acquire()
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	620 m = 'channel "'+channel+'" on connection "'+str(self)+'"'
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	621 if not self.join_callbacks.has_key(channel) or len(self.join_callbacks[channel]) == 0:
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	622 self.irclibobj.bot.error(1, 'no join callback for '+m, debug=True)
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	623 else:
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	624 self.irclibobj.bot.error(1, 'calling '+str(len(self.join_callbacks[channel]))+' join callback(s) for '+m, debug=True)
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	625 for f in self.join_callbacks[channel]:
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	626 f(channel, error)
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	627 self.join_callbacks.pop(channel, None)
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	628 self.lock.release()
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	629
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	630
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	631 def add_nick_callback(self, callback):
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	632 self.nick_callbacks.append(callback)
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	633
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	634
224 8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	635 def add_join_callback(self, channel, callback):
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	636 self.lock.acquire()
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	637 if not self.join_callbacks.has_key(channel):
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	638 self.join_callbacks[channel] = []
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	639 self.join_callbacks[channel].append(callback)
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	640 self.lock.release()
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	641
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	642
64 8fc496eaa17b Handle IRC "nickcollision" event Charly COSTE <changaco@changaco.net> parents: 63 diff changeset	643 def close(self, message, volontary=True):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	644 """Close the connection.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	645
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	646 This method closes the connection permanently; after it has
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	647 been called, the object is unusable.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	648 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	649
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	650 self.irclibobj._remove_connection(self)
128 e1e66c563d08 minor fixes in irclib Charly COSTE <changaco@changaco.net> parents: 125 diff changeset	651 self.disconnect(message=message, volontary=volontary)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	652
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	653 def _get_socket(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	654 """[Internal]"""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	655 return self.socket
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	656
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	657 def get_server_name(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	658 """Get the (real) server name.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	659
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	660 This method returns the (real) server name, or, more
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	661 specifically, what the server calls itself.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	662 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	663
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	664 if self.real_server_name:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	665 return self.real_server_name
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	666 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	667 return ""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	668
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	669 def process_data(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	670 """[Internal]"""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	671
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	672 try:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	673 if self.ssl:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	674 new_data = self.ssl.read(2**14)
159 da2f2dc61e74 fix in irclib, needed because ServerConnection.socket can be a string since 42d7b622776196149c9a9a05da134a85ee9509c6 Charly COSTE <changaco@changaco.net> parents: 158 diff changeset	675 elif self.socket and hasattr(self.socket, 'recv'):
128 e1e66c563d08 minor fixes in irclib Charly COSTE <changaco@changaco.net> parents: 125 diff changeset	676 new_data = self.socket.recv(2**14)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	677 else:
128 e1e66c563d08 minor fixes in irclib Charly COSTE <changaco@changaco.net> parents: 125 diff changeset	678 return
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	679 except socket.error, x:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	680 # The server hung up.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	681 self.disconnect("Connection reset by peer")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	682 return
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	683 if not new_data:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	684 # Read nothing: connection must be down.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	685 self.disconnect("Connection reset by peer")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	686 return
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	687
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	688 lines = _linesep_regexp.split(self.previous_buffer + new_data)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	689
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	690 # Save the last, unfinished line.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	691 self.previous_buffer = lines.pop()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	692
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	693 for line in lines:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	694 if DEBUG:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	695 print "FROM SERVER:", line
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	696
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	697 if not line:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	698 continue
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	699
172 64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	700 line = self._decode(line)
64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 167 diff changeset	701
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	702 prefix = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	703 command = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	704 arguments = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	705 self._handle_event(Event("all_raw_messages",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	706 self.get_server_name(),
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	707 None,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	708 [line]))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	709
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	710 m = _rfc_1459_command_regexp.match(line)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	711 if m.group("prefix"):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	712 prefix = m.group("prefix")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	713 if not self.real_server_name:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	714 self.real_server_name = prefix
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	715
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	716 if m.group("command"):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	717 command = m.group("command").lower()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	718
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	719 if m.group("argument"):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	720 a = m.group("argument").split(" :", 1)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	721 arguments = a[0].split()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	722 if len(a) == 2:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	723 arguments.append(a[1])
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	724
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	725 # Translate numerics into more readable strings.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	726 if command in numeric_events:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	727 command = numeric_events[command]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	728
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	729 if command in ["nick", "welcome"]:
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	730 self.logged_in = True
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	731 self.real_nickname = arguments[0]
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	732 if self.new_nickname != arguments[0]:
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	733 if len(self.new_nickname) > len(arguments[0]):
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	734 self._handle_event(Event('nicknametoolong', None, None, None))
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	735 else:
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	736 self._handle_event(Event('erroneusnickname', None, None, None))
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	737 else:
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	738 self._call_nick_callbacks(None)
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	739 self.new_nickname = None
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	740
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	741 if command in ["privmsg", "notice"]:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	742 target, message = arguments[0], arguments[1]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	743 messages = _ctcp_dequote(message)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	744
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	745 if command == "privmsg":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	746 if is_channel(target):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	747 command = "pubmsg"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	748 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	749 if is_channel(target):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	750 command = "pubnotice"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	751 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	752 command = "privnotice"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	753
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	754 for m in messages:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	755 if type(m) is types.TupleType:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	756 if command in ["privmsg", "pubmsg"]:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	757 command = "ctcp"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	758 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	759 command = "ctcpreply"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	760
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	761 m = list(m)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	762 if DEBUG:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	763 print "command: %s, source: %s, target: %s, arguments: %s" % (
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	764 command, prefix, target, m)
69 0a2b9e84bbde Strip colors from IRC messages Charly COSTE <changaco@changaco.net> parents: 68 diff changeset	765
74 676c2d2bf240 Strip bold character from IRC messages Charly COSTE <changaco@changaco.net> parents: 71 diff changeset	766 # Remove formatting
69 0a2b9e84bbde Strip colors from IRC messages Charly COSTE <changaco@changaco.net> parents: 68 diff changeset	767 for i in range(len(m)):
74 676c2d2bf240 Strip bold character from IRC messages Charly COSTE <changaco@changaco.net> parents: 71 diff changeset	768 m[i] = strip_formatting_re.sub('', m[i])
69 0a2b9e84bbde Strip colors from IRC messages Charly COSTE <changaco@changaco.net> parents: 68 diff changeset	769
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	770 self._handle_event(Event(command, prefix, target, m))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	771 if command == "ctcp" and m[0] == "ACTION":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	772 self._handle_event(Event("action", prefix, target, m[1:]))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	773 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	774 if DEBUG:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	775 print "command: %s, source: %s, target: %s, arguments: %s" % (
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	776 command, prefix, target, [m])
74 676c2d2bf240 Strip bold character from IRC messages Charly COSTE <changaco@changaco.net> parents: 71 diff changeset	777 self._handle_event(Event(command, prefix, target, [strip_formatting_re.sub('', m)]))
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	778 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	779 target = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	780
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	781 if command == "quit":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	782 arguments = [arguments[0]]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	783 elif command == "ping":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	784 target = arguments[0]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	785 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	786 target = arguments[0]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	787 arguments = arguments[1:]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	788
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	789 if command == "mode":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	790 if not is_channel(target):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	791 command = "umode"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	792
221 1a82d5d40d90 moved irc_id handling to irclib Charly COSTE <changaco@changaco.net> parents: 219 diff changeset	793 if command == "join":
223 3da85bf56bdf (irclib) minor fix, only show the irc_id once in the debug log Charly COSTE <changaco@changaco.net> parents: 222 diff changeset	794 if self.irc_id != prefix:
3da85bf56bdf (irclib) minor fix, only show the irc_id once in the debug log Charly COSTE <changaco@changaco.net> parents: 222 diff changeset	795 self.irc_id = prefix
3da85bf56bdf (irclib) minor fix, only show the irc_id once in the debug log Charly COSTE <changaco@changaco.net> parents: 222 diff changeset	796 if DEBUG:
3da85bf56bdf (irclib) minor fix, only show the irc_id once in the debug log Charly COSTE <changaco@changaco.net> parents: 222 diff changeset	797 print "irc_id: %s" % (prefix)
224 8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	798 channel = target.lower()
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	799 if not channel in self.channels:
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	800 self.channels.append(channel)
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	801 if channel in self.left_channels:
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	802 self.left_channels.remove(channel)
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	803 self._call_join_callbacks(channel, None)
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	804
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	805 if command in ['inviteonlychan', 'bannedfromchan', 'channelisfull', 'badchannelkey']:
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	806 self._call_join_callbacks(arguments[0].lower(), command)
221 1a82d5d40d90 moved irc_id handling to irclib Charly COSTE <changaco@changaco.net> parents: 219 diff changeset	807
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	808 if DEBUG:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	809 print "command: %s, source: %s, target: %s, arguments: %s" % (
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	810 command, prefix, target, arguments)
69 0a2b9e84bbde Strip colors from IRC messages Charly COSTE <changaco@changaco.net> parents: 68 diff changeset	811
74 676c2d2bf240 Strip bold character from IRC messages Charly COSTE <changaco@changaco.net> parents: 71 diff changeset	812 # Remove formatting
69 0a2b9e84bbde Strip colors from IRC messages Charly COSTE <changaco@changaco.net> parents: 68 diff changeset	813 for i in range(len(arguments)):
74 676c2d2bf240 Strip bold character from IRC messages Charly COSTE <changaco@changaco.net> parents: 71 diff changeset	814 arguments[i] = strip_formatting_re.sub('', arguments[i])
69 0a2b9e84bbde Strip colors from IRC messages Charly COSTE <changaco@changaco.net> parents: 68 diff changeset	815
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	816 self._handle_event(Event(command, prefix, target, arguments))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	817
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	818 def _handle_event(self, event):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	819 """[Internal]"""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	820 self.irclibobj._handle_event(self, event)
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	821 if event.eventtype() in ['disconnect', 'nicknameinuse', 'nickcollision', 'erroneusnickname', 'nicknametoolong']:
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	822 self._call_nick_callbacks(event.eventtype())
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	823 if event.eventtype() in self.handlers:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	824 for fn in self.handlers[event.eventtype()]:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	825 fn(self, event)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	826
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	827 def is_connected(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	828 """Return connection status.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	829
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	830 Returns true if connected, otherwise false.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	831 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	832 return self.connected
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	833
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	834 def add_global_handler(self, *args):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	835 """Add global handler.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	836
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	837 See documentation for IRC.add_global_handler.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	838 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	839 self.irclibobj.add_global_handler(*args)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	840
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	841 def remove_global_handler(self, *args):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	842 """Remove global handler.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	843
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	844 See documentation for IRC.remove_global_handler.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	845 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	846 self.irclibobj.remove_global_handler(*args)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	847
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	848 def action(self, target, action):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	849 """Send a CTCP ACTION command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	850 self.ctcp("ACTION", target, action)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	851
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	852 def admin(self, server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	853 """Send an ADMIN command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	854 self.send_raw(" ".join(["ADMIN", server]).strip())
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	855
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	856 def ctcp(self, ctcptype, target, parameter=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	857 """Send a CTCP command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	858 ctcptype = ctcptype.upper()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	859 self.privmsg(target, "\001%s%s\001" % (ctcptype, parameter and (" " + parameter) or ""))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	860
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	861 def ctcp_reply(self, target, parameter):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	862 """Send a CTCP REPLY command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	863 self.notice(target, "\001%s\001" % parameter)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	864
63 71508f22edb4 Fixed unjustified switching to limited mode Charly COSTE <changaco@changaco.net> parents: 57 diff changeset	865 def disconnect(self, message="", volontary=False):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	866 """Hang up the connection.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	867
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	868 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	869
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	870 message -- Quit message.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	871 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	872
57 ebd4278e472f Some thread safety for irclib.py Charly COSTE <changaco@changaco.net> parents: 56 diff changeset	873 self.lock.acquire()
ebd4278e472f Some thread safety for irclib.py Charly COSTE <changaco@changaco.net> parents: 56 diff changeset	874
163 54c0e77370fd fixed irclib.ServerConnection.disconnect() Charly COSTE <changaco@changaco.net> parents: 159 diff changeset	875 if self.connected:
54c0e77370fd fixed irclib.ServerConnection.disconnect() Charly COSTE <changaco@changaco.net> parents: 159 diff changeset	876 self.connected = False
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	877 if self.logged_in:
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	878 self.logged_in = False
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	879
163 54c0e77370fd fixed irclib.ServerConnection.disconnect() Charly COSTE <changaco@changaco.net> parents: 159 diff changeset	880 if self.socket and self.socket != 'closed':
167 f4997d50e93b fixed an infinite loop and an indentation error in irclib Charly COSTE <changaco@changaco.net> parents: 166 diff changeset	881 if message and message != 'Connection reset by peer':
f4997d50e93b fixed an infinite loop and an indentation error in irclib Charly COSTE <changaco@changaco.net> parents: 166 diff changeset	882 self.quit(message)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	883
163 54c0e77370fd fixed irclib.ServerConnection.disconnect() Charly COSTE <changaco@changaco.net> parents: 159 diff changeset	884 try:
54c0e77370fd fixed irclib.ServerConnection.disconnect() Charly COSTE <changaco@changaco.net> parents: 159 diff changeset	885 self.socket.close()
54c0e77370fd fixed irclib.ServerConnection.disconnect() Charly COSTE <changaco@changaco.net> parents: 159 diff changeset	886 except socket.error, x:
54c0e77370fd fixed irclib.ServerConnection.disconnect() Charly COSTE <changaco@changaco.net> parents: 159 diff changeset	887 pass
54c0e77370fd fixed irclib.ServerConnection.disconnect() Charly COSTE <changaco@changaco.net> parents: 159 diff changeset	888 self.socket = 'closed'
54c0e77370fd fixed irclib.ServerConnection.disconnect() Charly COSTE <changaco@changaco.net> parents: 159 diff changeset	889
57 ebd4278e472f Some thread safety for irclib.py Charly COSTE <changaco@changaco.net> parents: 56 diff changeset	890 self.lock.release()
63 71508f22edb4 Fixed unjustified switching to limited mode Charly COSTE <changaco@changaco.net> parents: 57 diff changeset	891
71508f22edb4 Fixed unjustified switching to limited mode Charly COSTE <changaco@changaco.net> parents: 57 diff changeset	892 if volontary == False:
71508f22edb4 Fixed unjustified switching to limited mode Charly COSTE <changaco@changaco.net> parents: 57 diff changeset	893 self._handle_event(Event("disconnect", self.server, "", [message]))
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	894
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	895 def globops(self, text):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	896 """Send a GLOBOPS command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	897 self.send_raw("GLOBOPS :" + text)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	898
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	899 def info(self, server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	900 """Send an INFO command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	901 self.send_raw(" ".join(["INFO", server]).strip())
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	902
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	903 def invite(self, nick, channel):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	904 """Send an INVITE command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	905 self.send_raw(" ".join(["INVITE", nick, channel]).strip())
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	906
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	907 def ison(self, nicks):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	908 """Send an ISON command.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	909
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	910 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	911
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	912 nicks -- List of nicks.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	913 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	914 self.send_raw("ISON " + " ".join(nicks))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	915
224 8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	916 def join(self, channel, callback=None, key=""):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	917 """Send a JOIN command."""
224 8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	918 if callback:
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	919 self.add_join_callback(channel, callback)
8e6a0b60eed1 (irclib) created a callback mechanism for join Charly COSTE <changaco@changaco.net> parents: 223 diff changeset	920 if key:
196 4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	921 self.channels_keys[channel] = key
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	922 self.send_raw("JOIN %s%s" % (channel, (key and (" " + key))))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	923
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	924 def kick(self, channel, nick, comment=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	925 """Send a KICK command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	926 self.send_raw("KICK %s %s%s" % (channel, nick, (comment and (" :" + comment))))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	927
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	928 def links(self, remote_server="", server_mask=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	929 """Send a LINKS command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	930 command = "LINKS"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	931 if remote_server:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	932 command = command + " " + remote_server
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	933 if server_mask:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	934 command = command + " " + server_mask
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	935 self.send_raw(command)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	936
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	937 def list(self, channels=None, server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	938 """Send a LIST command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	939 command = "LIST"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	940 if channels:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	941 command = command + " " + ",".join(channels)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	942 if server:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	943 command = command + " " + server
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	944 self.send_raw(command)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	945
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	946 def lusers(self, server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	947 """Send a LUSERS command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	948 self.send_raw("LUSERS" + (server and (" " + server)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	949
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	950 def mode(self, target, command):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	951 """Send a MODE command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	952 self.send_raw("MODE %s %s" % (target, command))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	953
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	954 def motd(self, server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	955 """Send an MOTD command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	956 self.send_raw("MOTD" + (server and (" " + server)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	957
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	958 def names(self, channels=None):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	959 """Send a NAMES command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	960 self.send_raw("NAMES" + (channels and (" " + ",".join(channels)) or ""))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	961
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	962 def nick(self, newnick, callback=None):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	963 """Send a NICK command."""
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	964 if callback != None:
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	965 self.add_nick_callback(callback)
166 0fc24e232997 some fixes related to IRC nicknames Charly COSTE <changaco@changaco.net> parents: 165 diff changeset	966 if re.search('[ \.\']', newnick) != None:
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	967 self._call_nick_callbacks('erroneusnickname')
56 b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	968 return False
b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	969 try:
b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	970 str(newnick)
b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	971 except:
b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	972 self._call_nick_callbacks('erroneusnickname')
b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	973 return False
219 63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in Charly COSTE <changaco@changaco.net> parents: 218 diff changeset	974 self.new_nickname = newnick
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	975 self.send_raw("NICK " + newnick)
56 b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	976 return True
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	977
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	978 def notice(self, target, text):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	979 """Send a NOTICE command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	980 # Should limit len(text) here!
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	981 self.send_raw("NOTICE %s :%s" % (target, text))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	982
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	983 def oper(self, nick, password):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	984 """Send an OPER command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	985 self.send_raw("OPER %s %s" % (nick, password))
196 4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	986
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	987 def _remove_channel(self, channel):
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	988 if channel in self.channels:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	989 self.channels.remove(channel)
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	990 if not channel in self.left_channels:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	991 self.left_channels.append(channel)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	992
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	993 def part(self, channels, message=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	994 """Send a PART command."""
196 4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	995 try:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	996 if isinstance(channels, basestring):
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	997 self._remove_channel(channels)
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	998 self.send_raw("PART " + channels + (message and (" " + message)))
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	999 else:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1000 for channel in channels:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1001 self._remove_channel(channel)
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1002 self.send_raw("PART " + ",".join(channels) + (message and (" " + message)))
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1003 except ServerNotConnectedError:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1004 self.disconnect(volontary=True)
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1005 self.connect()
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1006
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1007 def pass_(self, password):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1008 """Send a PASS command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1009 self.send_raw("PASS " + password)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1010
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1011 def ping(self, target, target2=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1012 """Send a PING command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1013 self.send_raw("PING %s%s" % (target, target2 and (" " + target2)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1014
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1015 def pong(self, target, target2=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1016 """Send a PONG command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1017 self.send_raw("PONG %s%s" % (target, target2 and (" " + target2)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1018
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1019 def privmsg(self, target, text):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1020 """Send a PRIVMSG command."""
9 4b2faa511f01 Fixed multi-line message bug Charly COSTE <changaco@changaco.net> parents: 5 diff changeset	1021 for l in text.split('\n'):
115 0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1022 l_size = len(l.encode('utf-8'))
0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1023 available_size = float(510-len('%s PRIVMSG %s :' % (self.irc_id, target))) # 510 is the size limit for IRC messages defined in RFC 2812
0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1024 e = 0
138 f3a9c891f7c0 fixed a DeprecationWarning in irclib Charly COSTE <changaco@changaco.net> parents: 136 diff changeset	1025 for i in range(int(math.ceil(l_size/available_size))):
115 0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1026 s = e
0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1027 e = s+int(available_size)
0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1028 while len(l[s:e].encode('utf-8')) >= available_size:
0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1029 e -= 1
0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1030 self.send_raw("PRIVMSG %s :%s" % (target, l[s:e]))
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1031
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1032 def privmsg_many(self, targets, text):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1033 """Send a PRIVMSG command to multiple targets."""
115 0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1034 # Size of targets should be limited
0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 89 diff changeset	1035 self.privmsg(','.join(targets), text)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1036
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1037 def quit(self, message=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1038 """Send a QUIT command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1039 # Note that many IRC servers don't use your QUIT message
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1040 # unless you've been connected for at least 5 minutes!
196 4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1041 try:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1042 self.send_raw("QUIT" + (message and (" :" + message)))
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1043 except ServerNotConnectedError:
4011838e098e [irclib] handle ServerNotConnectedError in part() and quit(), we now keep track of channels we're in and rejoin them after a disconnection Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	1044 pass
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1045
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1046 def send_raw(self, string):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1047 """Send raw string to the server.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1048
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1049 The string will be padded with appropriate CR LF.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1050 """
146 229a59acde0f fixes in irclib, needed because ServerConnection.socket can be a string since 42d7b622776196149c9a9a05da134a85ee9509c6 Charly COSTE <changaco@changaco.net> parents: 140 diff changeset	1051 if not self.socket or isinstance(self.socket, basestring):
136 7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	1052 raise ServerNotConnectedError, self
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1053 try:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1054 if self.ssl:
56 b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	1055 self.ssl.write(string.encode('utf-8') + "\r\n")
146 229a59acde0f fixes in irclib, needed because ServerConnection.socket can be a string since 42d7b622776196149c9a9a05da134a85ee9509c6 Charly COSTE <changaco@changaco.net> parents: 140 diff changeset	1056 else:
56 b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 43 diff changeset	1057 self.socket.send(string.encode('utf-8') + "\r\n")
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1058 if DEBUG:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1059 print "TO SERVER:", string
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1060 except socket.error, x:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1061 # Ouch!
165 12d564cd0203 minor fix in irclib, always use exactly the same message when server hung up Charly COSTE <changaco@changaco.net> parents: 164 diff changeset	1062 self.disconnect("Connection reset by peer")
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1063
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1064 def squit(self, server, comment=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1065 """Send an SQUIT command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1066 self.send_raw("SQUIT %s%s" % (server, comment and (" :" + comment)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1067
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1068 def stats(self, statstype, server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1069 """Send a STATS command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1070 self.send_raw("STATS %s%s" % (statstype, server and (" " + server)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1071
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1072 def time(self, server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1073 """Send a TIME command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1074 self.send_raw("TIME" + (server and (" " + server)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1075
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1076 def topic(self, channel, new_topic=None):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1077 """Send a TOPIC command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1078 if new_topic is None:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1079 self.send_raw("TOPIC " + channel)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1080 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1081 self.send_raw("TOPIC %s :%s" % (channel, new_topic))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1082
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1083 def trace(self, target=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1084 """Send a TRACE command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1085 self.send_raw("TRACE" + (target and (" " + target)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1086
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1087 def user(self, username, realname):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1088 """Send a USER command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1089 self.send_raw("USER %s 0 * :%s" % (username, realname))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1090
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1091 def userhost(self, nicks):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1092 """Send a USERHOST command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1093 self.send_raw("USERHOST " + ",".join(nicks))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1094
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1095 def users(self, server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1096 """Send a USERS command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1097 self.send_raw("USERS" + (server and (" " + server)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1098
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1099 def version(self, server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1100 """Send a VERSION command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1101 self.send_raw("VERSION" + (server and (" " + server)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1102
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1103 def wallops(self, text):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1104 """Send a WALLOPS command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1105 self.send_raw("WALLOPS :" + text)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1106
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1107 def who(self, target="", op=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1108 """Send a WHO command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1109 self.send_raw("WHO%s%s" % (target and (" " + target), op and (" o")))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1110
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1111 def whois(self, targets):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1112 """Send a WHOIS command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1113 self.send_raw("WHOIS " + ",".join(targets))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1114
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1115 def whowas(self, nick, max="", server=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1116 """Send a WHOWAS command."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1117 self.send_raw("WHOWAS %s%s%s" % (nick,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1118 max and (" " + max),
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1119 server and (" " + server)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1120
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1121 class DCCConnectionError(IRCError):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1122 pass
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1123
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1124
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1125 class DCCConnection(Connection):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1126 """This class represents a DCC connection.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1127
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1128 DCCConnection objects are instantiated by calling the dcc
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1129 method on an IRC object.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1130 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1131 def __init__(self, irclibobj, dcctype):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1132 Connection.__init__(self, irclibobj)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	1133 self.connected = False
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1134 self.passive = 0
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1135 self.dcctype = dcctype
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1136 self.peeraddress = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1137 self.peerport = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1138
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1139 def connect(self, address, port):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1140 """Connect/reconnect to a DCC peer.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1141
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1142 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1143 address -- Host/IP address of the peer.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1144
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1145 port -- The port number to connect to.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1146
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1147 Returns the DCCConnection object.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1148 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1149 self.peeraddress = socket.gethostbyname(address)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1150 self.peerport = port
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1151 self.socket = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1152 self.previous_buffer = ""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1153 self.handlers = {}
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1154 self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1155 self.passive = 0
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1156 try:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1157 self.socket.connect((self.peeraddress, self.peerport))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1158 except socket.error, x:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1159 raise DCCConnectionError, "Couldn't connect to socket: %s" % x
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	1160 self.connected = True
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1161 if self.irclibobj.fn_to_add_socket:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1162 self.irclibobj.fn_to_add_socket(self.socket)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1163 return self
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1164
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1165 def listen(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1166 """Wait for a connection/reconnection from a DCC peer.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1167
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1168 Returns the DCCConnection object.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1169
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1170 The local IP address and port are available as
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1171 self.localaddress and self.localport. After connection from a
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1172 peer, the peer address and port are available as
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1173 self.peeraddress and self.peerport.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1174 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1175 self.previous_buffer = ""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1176 self.handlers = {}
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1177 self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1178 self.passive = 1
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1179 try:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1180 self.socket.bind((socket.gethostbyname(socket.gethostname()), 0))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1181 self.localaddress, self.localport = self.socket.getsockname()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1182 self.socket.listen(10)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1183 except socket.error, x:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1184 raise DCCConnectionError, "Couldn't bind socket: %s" % x
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1185 return self
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1186
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1187 def disconnect(self, message=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1188 """Hang up the connection and close the object.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1189
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1190 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1191
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1192 message -- Quit message.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1193 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1194 if not self.connected:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1195 return
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1196
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	1197 self.connected = False
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1198 try:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1199 self.socket.close()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1200 except socket.error, x:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1201 pass
136 7dc6a1764c4f handle irclib.ServerNotConnectedError Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	1202 self.socket = 'closed'
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1203 self.irclibobj._handle_event(
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1204 self,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1205 Event("dcc_disconnect", self.peeraddress, "", [message]))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1206 self.irclibobj._remove_connection(self)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1207
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1208 def process_data(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1209 """[Internal]"""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1210
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1211 if self.passive and not self.connected:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1212 conn, (self.peeraddress, self.peerport) = self.socket.accept()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1213 self.socket.close()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1214 self.socket = conn
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	1215 self.connected = True
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1216 if DEBUG:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1217 print "DCC connection from %s:%d" % (
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1218 self.peeraddress, self.peerport)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1219 self.irclibobj._handle_event(
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1220 self,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1221 Event("dcc_connect", self.peeraddress, None, None))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1222 return
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1223
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1224 try:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1225 new_data = self.socket.recv(2**14)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1226 except socket.error, x:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1227 # The server hung up.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1228 self.disconnect("Connection reset by peer")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1229 return
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1230 if not new_data:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1231 # Read nothing: connection must be down.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1232 self.disconnect("Connection reset by peer")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1233 return
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1234
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1235 if self.dcctype == "chat":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1236 # The specification says lines are terminated with LF, but
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1237 # it seems safer to handle CR LF terminations too.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1238 chunks = _linesep_regexp.split(self.previous_buffer + new_data)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1239
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1240 # Save the last, unfinished line.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1241 self.previous_buffer = chunks[-1]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1242 if len(self.previous_buffer) > 2**14:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1243 # Bad peer! Naughty peer!
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1244 self.disconnect()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1245 return
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1246 chunks = chunks[:-1]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1247 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1248 chunks = [new_data]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1249
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1250 command = "dccmsg"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1251 prefix = self.peeraddress
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1252 target = None
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1253 for chunk in chunks:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1254 if DEBUG:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1255 print "FROM PEER:", chunk
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1256 arguments = [chunk]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1257 if DEBUG:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1258 print "command: %s, source: %s, target: %s, arguments: %s" % (
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1259 command, prefix, target, arguments)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1260 self.irclibobj._handle_event(
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1261 self,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1262 Event(command, prefix, target, arguments))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1263
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1264 def _get_socket(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1265 """[Internal]"""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1266 return self.socket
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1267
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1268 def privmsg(self, string):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1269 """Send data to DCC peer.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1270
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1271 The string will be padded with appropriate LF if it's a DCC
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1272 CHAT session.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1273 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1274 try:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1275 self.socket.send(string)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1276 if self.dcctype == "chat":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1277 self.socket.send("\n")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1278 if DEBUG:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1279 print "TO PEER: %s\n" % string
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1280 except socket.error, x:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1281 # Ouch!
165 12d564cd0203 minor fix in irclib, always use exactly the same message when server hung up Charly COSTE <changaco@changaco.net> parents: 164 diff changeset	1282 self.disconnect("Connection reset by peer")
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1283
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1284
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1285 class Event:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1286 """Class representing an IRC event."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1287 def __init__(self, eventtype, source, target, arguments=None):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1288 """Constructor of Event objects.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1289
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1290 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1291
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1292 eventtype -- A string describing the event.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1293
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1294 source -- The originator of the event (a nick mask or a server).
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1295
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1296 target -- The target of the event (a nick or a channel).
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1297
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1298 arguments -- Any event specific arguments.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1299 """
149 332bb2e8e71e Revert "strip events' properties" Charly COSTE <changaco@changaco.net> parents: 148 diff changeset	1300 self._eventtype = eventtype
332bb2e8e71e Revert "strip events' properties" Charly COSTE <changaco@changaco.net> parents: 148 diff changeset	1301 self._source = source
332bb2e8e71e Revert "strip events' properties" Charly COSTE <changaco@changaco.net> parents: 148 diff changeset	1302 self._target = target
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1303 if arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1304 self._arguments = arguments
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1305 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1306 self._arguments = []
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1307
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1308 def eventtype(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1309 """Get the event type."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1310 return self._eventtype
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1311
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1312 def source(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1313 """Get the event source."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1314 return self._source
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1315
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1316 def target(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1317 """Get the event target."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1318 return self._target
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1319
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1320 def arguments(self):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1321 """Get the event arguments."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1322 return self._arguments
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1323
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1324 _LOW_LEVEL_QUOTE = "\020"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1325 _CTCP_LEVEL_QUOTE = "\134"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1326 _CTCP_DELIMITER = "\001"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1327
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1328 _low_level_mapping = {
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1329 "0": "\000",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1330 "n": "\n",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1331 "r": "\r",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1332 _LOW_LEVEL_QUOTE: _LOW_LEVEL_QUOTE
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1333 }
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1334
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1335 _low_level_regexp = re.compile(_LOW_LEVEL_QUOTE + "(.)")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1336
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1337 def mask_matches(nick, mask):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1338 """Check if a nick matches a mask.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1339
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1340 Returns true if the nick matches, otherwise false.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1341 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1342 nick = irc_lower(nick)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1343 mask = irc_lower(mask)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1344 mask = mask.replace("\\", "\\\\")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1345 for ch in ".$\|[](){}+":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1346 mask = mask.replace(ch, "\\" + ch)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1347 mask = mask.replace("?", ".")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1348 mask = mask.replace("", ".")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1349 r = re.compile(mask, re.IGNORECASE)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1350 return r.match(nick)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1351
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1352 _special = "-[]\\`^{}"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1353 nick_characters = string.ascii_letters + string.digits + _special
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1354 _ircstring_translation = string.maketrans(string.ascii_uppercase + "[]\\^",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1355 string.ascii_lowercase + "{}\|~")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1356
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1357 def irc_lower(s):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1358 """Returns a lowercased string.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1359
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1360 The definition of lowercased comes from the IRC specification (RFC
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1361 1459).
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1362 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1363 return s.translate(_ircstring_translation)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1364
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1365 def _ctcp_dequote(message):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1366 """[Internal] Dequote a message according to CTCP specifications.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1367
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1368 The function returns a list where each element can be either a
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1369 string (normal message) or a tuple of one or two strings (tagged
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1370 messages). If a tuple has only one element (ie is a singleton),
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1371 that element is the tag; otherwise the tuple has two elements: the
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1372 tag and the data.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1373
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1374 Arguments:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1375
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1376 message -- The message to be decoded.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1377 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1378
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1379 def _low_level_replace(match_obj):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1380 ch = match_obj.group(1)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1381
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1382 # If low_level_mapping doesn't have the character as key, we
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1383 # should just return the character.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1384 return _low_level_mapping.get(ch, ch)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1385
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1386 if _LOW_LEVEL_QUOTE in message:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1387 # Yup, there was a quote. Release the dequoter, man!
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1388 message = _low_level_regexp.sub(_low_level_replace, message)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1389
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1390 if _CTCP_DELIMITER not in message:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1391 return [message]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1392 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1393 # Split it into parts. (Does any IRC client actually use
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1394 # CTCP stacking like this?)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1395 chunks = message.split(_CTCP_DELIMITER)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1396
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1397 messages = []
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1398 i = 0
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1399 while i < len(chunks)-1:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1400 # Add message if it's non-empty.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1401 if len(chunks[i]) > 0:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1402 messages.append(chunks[i])
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1403
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1404 if i < len(chunks)-2:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1405 # Aye! CTCP tagged data ahead!
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1406 messages.append(tuple(chunks[i+1].split(" ", 1)))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1407
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1408 i = i + 2
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1409
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1410 if len(chunks) % 2 == 0:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1411 # Hey, a lonely _CTCP_DELIMITER at the end! This means
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1412 # that the last chunk, including the delimiter, is a
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1413 # normal message! (This is according to the CTCP
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1414 # specification.)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1415 messages.append(_CTCP_DELIMITER + chunks[-1])
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1416
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1417 return messages
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1418
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1419 def is_channel(string):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1420 """Check if a string is a channel name.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1421
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1422 Returns true if the argument is a channel name, otherwise false.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1423 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1424 return string and string[0] in "#&+!"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1425
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1426 def ip_numstr_to_quad(num):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1427 """Convert an IP number as an integer given in ASCII
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1428 representation (e.g. '3232235521') to an IP address string
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1429 (e.g. '192.168.0.1')."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1430 n = long(num)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1431 p = map(str, map(int, [n >> 24 & 0xFF, n >> 16 & 0xFF,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1432 n >> 8 & 0xFF, n & 0xFF]))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1433 return ".".join(p)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1434
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1435 def ip_quad_to_numstr(quad):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1436 """Convert an IP address string (e.g. '192.168.0.1') to an IP
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1437 number as an integer given in ASCII representation
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1438 (e.g. '3232235521')."""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1439 p = map(long, quad.split("."))
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1440 s = str((p[0] << 24) \| (p[1] << 16) \| (p[2] << 8) \| p[3])
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1441 if s[-1] == "L":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1442 s = s[:-1]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1443 return s
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1444
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1445 def nm_to_n(s):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1446 """Get the nick part of a nickmask.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1447
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1448 (The source of an Event is a nickmask.)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1449 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1450 return s.split("!")[0]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1451
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1452 def nm_to_uh(s):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1453 """Get the userhost part of a nickmask.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1454
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1455 (The source of an Event is a nickmask.)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1456 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1457 return s.split("!")[1]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1458
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1459 def nm_to_h(s):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1460 """Get the host part of a nickmask.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1461
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1462 (The source of an Event is a nickmask.)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1463 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1464 return s.split("@")[1]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1465
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1466 def nm_to_u(s):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1467 """Get the user part of a nickmask.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1468
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1469 (The source of an Event is a nickmask.)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1470 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1471 s = s.split("!")[1]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1472 return s.split("@")[0]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1473
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1474 def parse_nick_modes(mode_string):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1475 """Parse a nick mode string.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1476
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1477 The function returns a list of lists with three members: sign,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1478 mode and argument. The sign is \"+\" or \"-\". The argument is
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1479 always None.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1480
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1481 Example:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1482
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1483 >>> irclib.parse_nick_modes(\"+ab-c\")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1484 [['+', 'a', None], ['+', 'b', None], ['-', 'c', None]]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1485 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1486
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1487 return _parse_modes(mode_string, "")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1488
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1489 def parse_channel_modes(mode_string):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1490 """Parse a channel mode string.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1491
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1492 The function returns a list of lists with three members: sign,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1493 mode and argument. The sign is \"+\" or \"-\". The argument is
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1494 None if mode isn't one of \"b\", \"k\", \"l\", \"v\" or \"o\".
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1495
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1496 Example:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1497
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1498 >>> irclib.parse_channel_modes(\"+ab-c foo\")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1499 [['+', 'a', None], ['+', 'b', 'foo'], ['-', 'c', None]]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1500 """
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1501
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1502 return _parse_modes(mode_string, "bklvo")
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1503
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1504 def _parse_modes(mode_string, unary_modes=""):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1505 """[Internal]"""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1506 modes = []
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1507 arg_count = 0
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1508
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1509 # State variable.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1510 sign = ""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1511
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1512 a = mode_string.split()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1513 if len(a) == 0:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1514 return []
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1515 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1516 mode_part, args = a[0], a[1:]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1517
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1518 if mode_part[0] not in "+-":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1519 return []
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1520 for ch in mode_part:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1521 if ch in "+-":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1522 sign = ch
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1523 elif ch == " ":
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1524 collecting_arguments = 1
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1525 elif ch in unary_modes:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1526 if len(args) >= arg_count + 1:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1527 modes.append([sign, ch, args[arg_count]])
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1528 arg_count = arg_count + 1
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1529 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1530 modes.append([sign, ch, None])
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1531 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1532 modes.append([sign, ch, None])
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1533 return modes
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1534
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1535 def _ping_ponger(connection, event):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1536 """[Internal]"""
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1537 connection.pong(event.target())
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1538
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1539 # Numeric table mostly stolen from the Perl IRC module (Net::IRC).
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1540 numeric_events = {
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1541 "001": "welcome",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1542 "002": "yourhost",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1543 "003": "created",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1544 "004": "myinfo",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1545 "005": "featurelist", # XXX
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1546 "200": "tracelink",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1547 "201": "traceconnecting",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1548 "202": "tracehandshake",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1549 "203": "traceunknown",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1550 "204": "traceoperator",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1551 "205": "traceuser",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1552 "206": "traceserver",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1553 "207": "traceservice",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1554 "208": "tracenewtype",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1555 "209": "traceclass",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1556 "210": "tracereconnect",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1557 "211": "statslinkinfo",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1558 "212": "statscommands",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1559 "213": "statscline",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1560 "214": "statsnline",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1561 "215": "statsiline",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1562 "216": "statskline",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1563 "217": "statsqline",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1564 "218": "statsyline",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1565 "219": "endofstats",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1566 "221": "umodeis",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1567 "231": "serviceinfo",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1568 "232": "endofservices",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1569 "233": "service",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1570 "234": "servlist",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1571 "235": "servlistend",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1572 "241": "statslline",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1573 "242": "statsuptime",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1574 "243": "statsoline",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1575 "244": "statshline",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1576 "250": "luserconns",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1577 "251": "luserclient",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1578 "252": "luserop",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1579 "253": "luserunknown",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1580 "254": "luserchannels",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1581 "255": "luserme",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1582 "256": "adminme",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1583 "257": "adminloc1",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1584 "258": "adminloc2",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1585 "259": "adminemail",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1586 "261": "tracelog",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1587 "262": "endoftrace",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1588 "263": "tryagain",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1589 "265": "n_local",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1590 "266": "n_global",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1591 "300": "none",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1592 "301": "away",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1593 "302": "userhost",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1594 "303": "ison",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1595 "305": "unaway",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1596 "306": "nowaway",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1597 "311": "whoisuser",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1598 "312": "whoisserver",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1599 "313": "whoisoperator",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1600 "314": "whowasuser",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1601 "315": "endofwho",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1602 "316": "whoischanop",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1603 "317": "whoisidle",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1604 "318": "endofwhois",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1605 "319": "whoischannels",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1606 "321": "liststart",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1607 "322": "list",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1608 "323": "listend",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1609 "324": "channelmodeis",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1610 "329": "channelcreate",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1611 "331": "notopic",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1612 "332": "currenttopic",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1613 "333": "topicinfo",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1614 "341": "inviting",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1615 "342": "summoning",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1616 "346": "invitelist",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1617 "347": "endofinvitelist",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1618 "348": "exceptlist",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1619 "349": "endofexceptlist",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1620 "351": "version",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1621 "352": "whoreply",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1622 "353": "namreply",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1623 "361": "killdone",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1624 "362": "closing",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1625 "363": "closeend",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1626 "364": "links",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1627 "365": "endoflinks",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1628 "366": "endofnames",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1629 "367": "banlist",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1630 "368": "endofbanlist",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1631 "369": "endofwhowas",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1632 "371": "info",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1633 "372": "motd",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1634 "373": "infostart",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1635 "374": "endofinfo",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1636 "375": "motdstart",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1637 "376": "endofmotd",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1638 "377": "motd2", # 1997-10-16 -- tkil
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1639 "381": "youreoper",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1640 "382": "rehashing",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1641 "384": "myportis",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1642 "391": "time",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1643 "392": "usersstart",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1644 "393": "users",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1645 "394": "endofusers",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1646 "395": "nousers",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1647 "401": "nosuchnick",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1648 "402": "nosuchserver",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1649 "403": "nosuchchannel",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1650 "404": "cannotsendtochan",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1651 "405": "toomanychannels",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1652 "406": "wasnosuchnick",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1653 "407": "toomanytargets",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1654 "409": "noorigin",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1655 "411": "norecipient",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1656 "412": "notexttosend",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1657 "413": "notoplevel",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1658 "414": "wildtoplevel",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1659 "421": "unknowncommand",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1660 "422": "nomotd",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1661 "423": "noadmininfo",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1662 "424": "fileerror",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1663 "431": "nonicknamegiven",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1664 "432": "erroneusnickname", # Thiss iz how its speld in thee RFC.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1665 "433": "nicknameinuse",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1666 "436": "nickcollision",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1667 "437": "unavailresource", # "Nick temporally unavailable"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1668 "441": "usernotinchannel",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1669 "442": "notonchannel",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1670 "443": "useronchannel",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1671 "444": "nologin",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1672 "445": "summondisabled",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1673 "446": "usersdisabled",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1674 "451": "notregistered",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1675 "461": "needmoreparams",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1676 "462": "alreadyregistered",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1677 "463": "nopermforhost",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1678 "464": "passwdmismatch",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1679 "465": "yourebannedcreep", # I love this one...
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1680 "466": "youwillbebanned",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1681 "467": "keyset",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1682 "471": "channelisfull",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1683 "472": "unknownmode",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1684 "473": "inviteonlychan",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1685 "474": "bannedfromchan",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1686 "475": "badchannelkey",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1687 "476": "badchanmask",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1688 "477": "nochanmodes", # "Channel doesn't support modes"
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1689 "478": "banlistfull",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1690 "481": "noprivileges",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1691 "482": "chanoprivsneeded",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1692 "483": "cantkillserver",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1693 "484": "restricted", # Connection is restricted
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1694 "485": "uniqopprivsneeded",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1695 "491": "nooperhost",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1696 "492": "noservicehost",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1697 "501": "umodeunknownflag",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1698 "502": "usersdontmatch",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1699 }
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1700
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1701 generated_events = [
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1702 # Generated events
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1703 "dcc_connect",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1704 "dcc_disconnect",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1705 "dccmsg",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1706 "disconnect",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1707 "ctcp",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1708 "ctcpreply",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1709 ]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1710
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1711 protocol_events = [
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1712 # IRC protocol events
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1713 "error",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1714 "join",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1715 "kick",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1716 "mode",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1717 "part",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1718 "ping",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1719 "privmsg",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1720 "privnotice",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1721 "pubmsg",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1722 "pubnotice",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1723 "quit",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1724 "invite",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1725 "pong",
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1726 ]
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1727
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1728 all_events = generated_events + protocol_events + numeric_events.values()

Mercurial > xib

annotate irclib.py @ 225:da8fbaf69242