Added SSL support using QSslSocket, including added a dialog box for it to be enabled/disabled | Made irc_client.py use logger.py to log to a file and the terminal(if ran via terminal) | renamed release to 0.0.1-alpha.1

Author: ComputerTech312

__init__.py

@@ -1 +0,0 @@
-

logs/irc_client.log

@@ -9,8 +9,8 @@
 
     dialog = ConnectDialog()
     if dialog.exec() == QDialog.DialogCode.Accepted:
-        host, port, nick, realname, channel = dialog.get_values()
-        client = IRCClient(host, port, nick, realname, channel)
+        host, port, nick, realname, channel, use_ssl = dialog.get_values()
+        client = IRCClient(host, port, nick, realname, channel, use_ssl)
         client.connect_to_host()
 
         window = MainWindow(client)

main.py

@@ -1,4 +1,4 @@
-from PyQt6.QtWidgets import QDialog, QVBoxLayout, QLineEdit, QDialogButtonBox, QLabel, QApplication
+from PyQt6.QtWidgets import QDialog, QVBoxLayout, QLineEdit, QDialogButtonBox, QLabel, QApplication, QCheckBox
 
 class ConnectDialog(QDialog):
     def __init__(self, parent=None):
@@ -38,13 +38,18 @@ def __init__(self, parent=None):
         self.channel_input.setText("#pyechat")
         self.layout.addWidget(self.channel_input)
 
+        self.ssl_label = QLabel("Use SSL:", self)
+        self.layout.addWidget(self.ssl_label)
+        self.ssl_checkbox = QCheckBox(self)
+        self.layout.addWidget(self.ssl_checkbox)
+
         self.buttons = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel, self)
         self.buttons.accepted.connect(self.accept)
         self.buttons.rejected.connect(self.reject)
         self.layout.addWidget(self.buttons)
 
     def get_values(self):
-        return self.host_input.text(), int(self.port_input.text()), self.nick_input.text(), self.realname_input.text(), self.channel_input.text()
-    
+        return self.host_input.text(), int(self.port_input.text()), self.nick_input.text(), self.realname_input.text(), self.channel_input.text(), self.ssl_checkbox.isChecked()
+
     def closeEvent(self, event):
         QApplication.quit()

src/gui/connect_dialog.py

@@ -1,27 +1,46 @@
 from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot
-from PyQt6.QtNetwork import QTcpSocket
-from PyQt6.QtWidgets import QApplication, QVBoxLayout, QLineEdit, QDialogButtonBox, QDialog, QLabel
-    
+from PyQt6.QtNetwork import QSslSocket
+from src.irc.logger import Logger
+import datetime
+
 class IRCClient(QObject):
     received_message = pyqtSignal(str)
 
-    def __init__(self, server, port, nickname, realname, channel):
+    def __init__(self, server, port, nickname, realname, channel, use_ssl=False):
         super().__init__()
 
-        self.socket = QTcpSocket()
+        self.socket = QSslSocket()
         self.socket.readyRead.connect(self.on_ready_read)
         self.socket.errorOccurred.connect(self.on_error_occurred)
+        self.socket.connected.connect(self.start_encryption)
 
         self.server = server
         self.port = port
         self.nickname = nickname
         self.realname = realname
         self.channel = channel
+        self.use_ssl = use_ssl
+
+        self.logger = Logger('logs/irc_client.log')  # Create an instance of Logger
+        self.logger.info(f'Initialized IRCClient with server={server}, port={port}, nickname={nickname}, realname={realname}, channel={channel}, use_ssl={use_ssl}')
+
+    @pyqtSlot()
+    def start_encryption(self):
+        pass
 
     def connect_to_host(self):
-        self.socket.connectToHost(self.server, self.port)
+        if self.use_ssl and not QSslSocket.supportsSsl():
+            self.logger.error("This system does not support SSL.")
+            return
+
+        self.logger.info(f'Connecting to host {self.server}:{self.port}')
+        if self.use_ssl:
+            self.socket.connectToHostEncrypted(self.server, self.port)
+        else:
+            self.socket.connectToHost(self.server, self.port)
         self.send_command(f'NICK {self.nickname}')
         self.send_command(f'USER {self.nickname} 0 * :{self.realname}')
+        self.logger.info(f'Connected to host {self.server}:{self.port} with SSL={self.use_ssl}')
 
     def decode(self, bytes):
         encodings = ['utf-8', 'latin1', 'iso-8859-1', 'cp1252']
@@ -30,12 +49,22 @@ def decode(self, bytes):
                 return bytes.decode(encoding)
             except UnicodeDecodeError:
                 continue
+        self.logger.error('None of the encodings could decode the bytes.')
         raise UnicodeDecodeError("None of the encodings could decode the bytes.")
 
     def parse_message(self, message):
+
+        tags = {}
+        server_time = None
+        if message.startswith('@'):
+            tags_str, message = message[1:].split(' ', 1)
+            tags = dict(tag.split('=') for tag in tags_str.split(';'))
+            if 'time' in tags:
+                server_time = datetime.datetime.fromisoformat(tags['time'].replace('Z', '+00:00'))
+
         parts = message.split()
         if len(parts) < 2:
-            return None, None, []
+            return None, None, [], tags, server_time
         source = parts[0][1:] if parts[0].startswith(':') else None
         command = parts[1] if source else parts[0]
         args_start = 2 if source else 1
@@ -49,16 +78,17 @@ def parse_message(self, message):
                 args.append(part)
         if trailing_arg_start is not None:
             args.append(' '.join(parts[trailing_arg_start:])[1:])
-        return source, command, args
+        return source, command, args, tags, server_time
 
     @pyqtSlot()
     def on_ready_read(self):
         while self.socket.canReadLine():
             line = self.socket.readLine().data()
             line = self.decode(line).strip()
             self.received_message.emit(line)
+            self.logger.debug(f'Received line: {line}')
 
-            source, command, args = self.parse_message(line)
+            source, command, args, _, _ = self.parse_message(line)
 
             if command == 'NICK' and source.split('!')[0] == self.nickname:
                 self.nickname = args[0]
@@ -70,15 +100,18 @@ def on_ready_read(self):
             elif 'End of /MOTD command.' in line:
                 self.send_command(f'JOIN {self.channel}')
 
-    @pyqtSlot(QTcpSocket.SocketError)
+    @pyqtSlot(QSslSocket.SocketError)
     def on_error_occurred(self, socket_error):
-        print(f'Error occurred: {self.socket.errorString()}')
+        self.logger.error(f'Error occurred on the socket: {self.socket.errorString()}')
 
     def send_command(self, command):
+        self.logger.info(f'Sending command: {command}')
         if ' ' in command:
             cmd, args = command.split(' ', 1)
             if cmd in ['JOIN', 'PART']:
                 args = args.split(' ', 1)[0]
             self.socket.write(f'{cmd} {args}\r\n'.encode())
+            self.logger.info(f'Sent command: {cmd} {args}')  # Log the command sent
         else:
-            self.socket.write(f'{command}\r\n'.encode())
+            self.socket.write(f'{command}\r\n'.encode())
+            self.logger.info(f'Sent command: {command}')  # Log the command sent