Changeset 3:48f51eae9e71 in misc

Timestamp:

02/10/07 06:35:43 (5 years ago)

Author:

Eriol

Branch:

misc

Convert:

svn:e60e002c-0983-44b9-b2ae-8842d539f768/misc@6

Message:

Changed save file format of the graph: now it's a dot file.
Added caching in both channels and nicks to avoid flood.
There is a problem with SwircBot?.knownchannels.append(channel)

File:

• swirc.py (modified) (9 diffs)

swirc.py

@@ -29 +29 @@
 
 import sys
+import pydot
 from twisted.words.protocols import irc
 from twisted.internet import reactor, protocol
@@ -43 +44 @@
 
     def addNode(self, node, reachable):
-        print node, reachable
         try:
             self.data[node]
@@ -49 +49 @@
             self.data[node] = reachable
         else:
-            self.data[node] += reachable
+            for e in reachable:
+                if e not in self.data[node]:
+                    self.data[node] += reachable
 
 class MakeGraph(object):
@@ -56 +58 @@
         self.graph = Graph()
 
-    def fromList(self, params):
-        ''' ['swircbot', '=', '#etna', 'swircbot @mancausoft
-            @Eriol @KatolaZ @substa @AlpT_ '] '''
-
-        nickslist = []
-        for nick in params[3].split():
-            if nick == BOT_NICKNAME:
-                continue
-            if nick[0] in '@+':
-                nick = nick[1:]
-
-            nickslist.append(nick)
+    def addNick(self, nickslist):
 
         for nick in nickslist:
@@ -73 +64 @@
                                [node for node in nickslist if node != nick])
 
-    def toPicture(self):
-        import pydot
-        edges = [(nick, x) for nick in self.graph.data for x in self.graph.data[nick]]
+    def _cleanEdges(self):
+        edges = [(nick, x) for nick in self.graph.data
+                             for x in self.graph.data[nick]]
 
-        bon = edges[:]
+        cleanedEdges = list(edges)
 
         for x in edges:
-            if (x[1], x[0]) in bon:
-                del bon[bon.index(x)]
+            if (x[1], x[0]) in cleanedEdges:
+                del cleanedEdges[cleanedEdges.index(x)]
 
-        gr = pydot.graph_from_edges(bon)
-        gr.write_jpeg('swirc.jpg', prog='dot')
+        return cleanedEdges
 
-mgi = MakeGraph() #ugly hack to make the picture of the graph after CTRL + C
+    def saveDot(self, fname):
+        gr = pydot.graph_from_edges(self._cleanEdges())
+        gr.write_dot(fname, prog='dot')
+
+mgi = MakeGraph() #ugly hack to make the dot file of the graph after CTRL + C
 
 class SwircBot(irc.IRCClient):
@@ -93 +87 @@
 
     knownchannels = []
+    knownnicks = []
     maxdepth = 10
 
@@ -108 +103 @@
         SwircBot.knownchannels.append(channel)
 
+    def irc_RPL_ENDOFWHOIS(self, prefix, params):
+        nick = params[1]
+        SwircBot.knownnicks.append(nick)
+
     def irc_RPL_WHOISCHANNELS(self, prefix, params):
         for channel in params[2].split():
@@ -116 +115 @@
                 len(SwircBot.knownchannels) < SwircBot.maxdepth):
                 self.join(channel[1:])
+                #print channel
+                #print SwircBot.knownchannels
+
 
     def irc_RPL_NAMREPLY(self, prefix, params):
-        self.graphmaker.fromList(params)
+        ''' ['swirc', '=', '#etna', 'swirc @Eriol @AlpT @mancausoft @markgreene '] '''
+        nickslist = []
+        for nick in params[3].split():
+            if nick == BOT_NICKNAME:
+                continue
+            if nick[0] in '@+':
+                nick = nick[1:]
 
-        #print self.graphmaker.graph.data
+            nickslist.append(nick)
 
-        for nick in self.graphmaker.graph.data:
-            self.sendLine("WHOIS %s" % nick)
+        self.graphmaker.addNick(nickslist)
+
+        for nick in nickslist:
+            if nick not in SwircBot.knownnicks:
+                self.sendLine("WHOIS %s" % nick)
 
 class SwircBotFactory(protocol.ClientFactory):
@@ -147 +158 @@
     reactor.run()
 
-    mgi.toPicture()
+    mgi.saveDot('swirc.dot')