Set variable "uncompressed" in WeeChat decoded message when compression is off (using...

[irc/weechat/qweechat.git] / src / qweechat / network.py

diff --git a/src/qweechat/network.py b/src/qweechat/network.py
index 2f97fff728043d99913e4fb68d029849fb5235dc..2a5184e7acfc9c20220940c24d8af912ea8ad8f7 100644 (file)
--- a/src/qweechat/network.py
+++ b/src/qweechat/network.py
@@ -1,7 +1,9 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011 Sebastien Helleu <flashcode@flashtux.org>
+# network.py - I/O with WeeChat/relay
+#
+# Copyright (C) 2011-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of QWeeChat, a Qt remote GUI for WeeChat.
 #
@@ -19,17 +21,13 @@
 # along with QWeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-#
-# I/O with WeeChat/relay.
-#
-
 import struct
 import qt_compat
 QtCore = qt_compat.import_module('QtCore')
 QtNetwork = qt_compat.import_module('QtNetwork')
 
-_PROTO_INIT_CMDS = ['init password=%(password)s,compression=gzip',
-                    '(listbuffers) hdata buffer:gui_buffers(*) number,full_name,short_name,nicklist,title',
+_PROTO_INIT_CMD  = ['init password=%(password)s,compression=gzip']
+_PROTO_SYNC_CMDS = ['(listbuffers) hdata buffer:gui_buffers(*) number,full_name,short_name,type,nicklist,title,local_variables',
                     '(listlines) hdata buffer:gui_buffers(*)/own_lines/first_line(*)/data date,displayed,prefix,message',
                     '(nicklist) nicklist',
                     'sync',
@@ -43,15 +41,16 @@ class Network(QtCore.QObject):
     messageFromWeechat = qt_compat.Signal(QtCore.QByteArray)
 
     def __init__(self, *args):
-        apply(QtCore.QObject.__init__, (self,) + args)
+        QtCore.QObject.__init__(*(self,) + args)
         self.status_disconnected = 'disconnected'
         self.status_connecting = 'connecting...'
         self.status_connected = 'connected'
         self._server = None
         self._port = None
+        self._ssl = None
         self._password = None
         self._buffer = QtCore.QByteArray()
-        self._socket = QtNetwork.QTcpSocket()
+        self._socket = QtNetwork.QSslSocket()
         self._socket.connected.connect(self._socket_connected)
         self._socket.error.connect(self._socket_error)
         self._socket.readyRead.connect(self._socket_read)
@@ -61,7 +60,7 @@ class Network(QtCore.QObject):
         """Slot: socket connected."""
         self.statusChanged.emit(self.status_connected, None)
         if self._password:
-            self._socket.write('\n'.join(_PROTO_INIT_CMDS) % {'password': str(self._password)})
+            self.send_to_weechat('\n'.join(_PROTO_INIT_CMD + _PROTO_SYNC_CMDS) % {'password': str(self._password)})
 
     def _socket_error(self, error):
         """Slot: socket error."""
@@ -69,8 +68,7 @@ class Network(QtCore.QObject):
 
     def _socket_read(self):
         """Slot: data available on socket."""
-        avail = self._socket.bytesAvailable()
-        bytes = self._socket.read(avail)
+        bytes = self._socket.readAll()
         self._buffer.append(bytes)
         while len(self._buffer) >= 4:
             remainder = None
@@ -84,6 +82,8 @@ class Network(QtCore.QObject):
                 remainder = self._buffer[length:]
                 self._buffer = self._buffer[0:length]
             self.messageFromWeechat.emit(self._buffer)
+            if not self.is_connected():
+                return
             self._buffer.clear()
             if remainder:
                 self._buffer.append(remainder)
@@ -92,34 +92,51 @@ class Network(QtCore.QObject):
         """Slot: socket disconnected."""
         self._server = None
         self._port = None
+        self._ssl = None
         self._password = None
         self.statusChanged.emit(self.status_disconnected, None)
 
     def is_connected(self):
         return self._socket.state() == QtNetwork.QAbstractSocket.ConnectedState
 
-    def connect_weechat(self, server, port, password):
+    def is_ssl(self):
+        return self._ssl
+
+    def connect_weechat(self, server, port, ssl, password):
         self._server = server
         try:
             self._port = int(port)
         except:
             self._port = 0
+        self._ssl = ssl
         self._password = password
         if self._socket.state() == QtNetwork.QAbstractSocket.ConnectedState:
             return
         if self._socket.state() != QtNetwork.QAbstractSocket.UnconnectedState:
             self._socket.abort()
         self._socket.connectToHost(self._server, self._port)
+        if self._ssl:
+            self._socket.ignoreSslErrors()
+            self._socket.startClientEncryption()
         self.statusChanged.emit(self.status_connecting, None)
 
     def disconnect_weechat(self):
         if self._socket.state() != QtNetwork.QAbstractSocket.UnconnectedState:
-            if self._socket.state() != QtNetwork.QAbstractSocket.ConnectedState:
+            if self._socket.state() == QtNetwork.QAbstractSocket.ConnectedState:
+                self.send_to_weechat('quit\n')
+                self._socket.waitForBytesWritten(1000)
+            else:
                 self.statusChanged.emit(self.status_disconnected, None)
             self._socket.abort()
 
     def send_to_weechat(self, message):
-        self._socket.write(str(message))
+        self._socket.write(message.encode('utf-8'))
+
+    def desync_weechat(self):
+        self.send_to_weechat('desync\n')
+
+    def sync_weechat(self):
+        self.send_to_weechat('\n'.join(_PROTO_SYNC_CMDS))
 
     def status_icon(self, status):
         icon = {self.status_disconnected: 'dialog-close.png',