# HG changeset patch
# User Tero Marttila <terom@fixme.fi>
# Date 1234306022 -7200
# Node ID 275a675712f130afb79247a858ddfa8e35544938
# Parent  2dc6de43f317d96caf226f707c10bf56e0d4e496
clean up repr(LogLine) output

diff -r 2dc6de43f317 -r 275a675712f1 log_channel.py
--- a/log_channel.py	Wed Feb 11 00:33:21 2009 +0200
+++ b/log_channel.py	Wed Feb 11 00:47:02 2009 +0200
@@ -38,3 +38,17 @@
 
         return log_search.index.search_simple(self, query)
 
+    def __str__ (self) :
+        """
+            Returns self.title
+        """
+
+        return self.title
+
+    def __repr__ (self) :
+        """
+            Uses self.id
+        """
+
+        return "LogChannel(%s)" % (self.id, )
+
diff -r 2dc6de43f317 -r 275a675712f1 log_line.py
--- a/log_line.py	Wed Feb 11 00:33:21 2009 +0200
+++ b/log_line.py	Wed Feb 11 00:47:02 2009 +0200
@@ -130,8 +130,29 @@
         self.target = target
         self.data = data
     
-    def __repr__ (self) :
-        return "channel=%s, offset=%s, type=%s, timestamp=%s, source=%s, target=%s, data=%s" % (
-            self.channel, self.offset, LogTypes.name_from_code(self.type), self.timestamp, self.source, self.target, self.data
+    def format_type (self) :
+        """
+            Formats type as a string code
+        """
+
+        return LogTypes.name_from_code(self.type)
+
+    def format_source (self) :
+        """
+            Formats source as <nickname>:<chanflags>!<username>@<hostname>, omitting those parts that are missing
+        """
+
+        nick, user, host, flags = self.source
+
+        return "%s%s%s%s" % (
+            nick if nick else '',
+            ':' + flags if flags else '',
+            '!' + user if user else '',
+            '@' + host if host else ''
         )
 
+    def __repr__ (self) :
+        return "LogLine(%r, %s, %-12s, %s, %-35s, %-10s, %r)" % (
+            self.channel, self.offset, self.format_type(), self.timestamp, self.format_source(), self.target, self.data
+        )
+