Ticket #166: privatechat.py.diff

privatechat.py

@@ -111 +111 @@
                 self.chats = chats
                 self.frame = chats.frame
                 self.logfile = None
+                self.reopened = False
+                self.temp_logsdir = os.path.join(os.path.dirname(self.frame.np.config.filename), "logs")
+                self.temp_logfile = None
                 self.autoreplied = 0
                 self.offlinemessage = 0
                 self.status = -1
@@ -178 +181 @@
 
                 self.UpdateColours()
                 
-                # Read log file
-                log = os.path.join(self.frame.np.config.sections["logging"]["logsdir"], fixpath(self.user.replace(os.sep, "-")) + ".log")
-                try:
-                        f = open(log, "r")
-                        d = f.read()
-                        f.close()
-                        s = d.split("\n")
-                        for l in s[-8:-1]:
-                                AppendLine(self.ChatScroll, l + "\n", self.tag_hilite, "", username=self.user, usertag=self.tag_hilite)
+                previous_log = os.path.join(self.temp_logsdir, self.user.replace(os.sep, "-") + ".log")
+
+                if os.path.exists(previous_log):
+                        self.reopened = True
+
+                        try:
+                                f = open(previous_log, 'r')
+                                d = f.read()
+                                f.close()
+                                s = d.split('\n')
+                                for l in s:
+                                        AppendLine(self.ChatScroll, l + '\n', self.tag_hilite, "", self.user, self.tag_hilite)
+
+
+                        except IOError, e:
+                                pass
+
+                else:
+                        # Read log file
+                        log = os.path.join(self.frame.np.config.sections["logging"]["logsdir"], self.user.replace(os.sep, "-") + ".log")
+                        try:
+                                f = open(log, "r")
+                                d = f.read()
+                                f.close()
+                                s = d.split("\n")
+                                for l in s[-8:-1]:
+                                        AppendLine(self.ChatScroll, l + "\n", self.tag_hilite, "", username=self.user, usertag=self.tag_hilite)
                                 
-                except IOError, e:
-                        pass
+                        except IOError, e:
+                                pass
 
-                
         def destroy(self):
                 if self.frame.translux:
                         self.frame.translux.unsubscribe(self.tlux_chat)
@@ -250 +270 @@
                 AppendLine(self.ChatScroll, line, tag, "%c", username=self.user, usertag=self.tag_my_username)
                 if self.Log.get_active():
                         self.logfile = WriteLog(self.logfile, self.frame.np.config.sections["logging"]["logsdir"], self.user, line)
+
+                self.temp_logfile = WriteLog(self.temp_logfile, self.temp_logsdir, self.user, line)
                 
                 autoreply = self.frame.np.config.sections["server"]["autoreply"]
                 if self.frame.away and not self.autoreplied and autoreply:
@@ -279 +301 @@
                 AppendLine(self.ChatScroll, message, tag, "%c", username=my_username, usertag=usertag)
                 if self.Log.get_active():
                         self.logfile = WriteLog(self.logfile, self.frame.np.config.sections["logging"]["logsdir"], self.user, message)
+                self.temp_logfile = WriteLog(self.temp_logfile, self.temp_logsdir, self.user, message)
                 
                 if self.PeerPrivateMessages.get_active():
                         # not in the soulseek protocol
@@ -540 +563 @@
                 self.chats.RemoveTab(self)
                 self.destroy()
 
+                if self.reopened:
+                        if self.temp_logfile is not None:
+                                self.temp_logfile.close()
+                        try:
+                                os.remove(os.path.join(self.temp_logsdir, self.user.replace(os.sep, "-") + ".log"))
+                        except:
+                                pass
+
         def OnKeyPress(self, widget, event):
                 if event.keyval == gtk.gdk.keyval_from_name("Prior"):
                         scrolled = self.ChatScroll.get_parent()