foobar/kiss.py

@@ -1,49 +0,0 @@
-import queue
-import time
-import threading
-
-def main():
-    print("Hello There")
-
-    que = queue.Queue()
-    event = threading.Event()
-
-    #input(que)
-    input_thread = threading.Thread(target=input, args=(que,event))
-    input_thread.daemon = True
-    input_thread.start()
-
-    #output(que)
-    output_thread = threading.Thread(target=output, args=(que,event))
-    output_thread.daemon = True
-    output_thread.start()
-
-    for num in range(21):
-        print(f"wait till full: {num}/20", end='\r')
-        time.sleep(0.5)
-    print("\nDone!")
-    event.set()
-
-def input(que, event):
-    loop = 0
-    while not event:
-        message = f"{time.time()} | Hi! {loop}"
-        que.put(message)
-        loop = loop + 1
-        time.sleep(1)
-
-def output(que, event):
-    file = '/tmp/test_out'
-    with open(file, 'a') as out_file:
-        while not event:
-            message = que.get()
-            out_file.write(f"{message}\r\n")
-            out_file.flush()
-            time.sleep(1)
-        out_file.close()
-
-
-if __name__ == "__main__":
-    main()
-    print("Bye now!")
-    exit(0)

ircthing.py

@@ -1,65 +1,54 @@
-"""
+import threading
-My attempt to mimic Suckless.org's ii (irc it) software
+import os
-"""
 import sys
 import time
-import multiprocessing
+import socket
 from ircthing_core import irc_router, connect_to_irc_server
-from ircthing_utils import read_config, cli_args, base_path
+from ircthing_utils import read_config
 
-Processes = {}
+Threads = {}
-Stop_Toggle = multiprocessing.Event()
+Stop_Toggle = threading.Event()
 
-
+def clean_exit(fifo_files, socket):
-def clean_exit():
+    socket.send(bytes(f"QUIT :Bye\r\n", "UTF-8"))
-    """
-    Sets the Stop_Toggle event to signal clean exit.
-    """
     Stop_Toggle.set()
-
+    for file in fifo_files:
+        try:
+            os.unlink(file)
+        except FileNotFoundError:
+            # We are okay if some fifo files has been removed before this.
+            pass
 
 def main():
-    """
+    my_name = sys.argv[0]
-    Main function to initialize irc connections specified on the configuration file.
+    my_name_pyless, _ = os.path.splitext(my_name)
+    base_path = f'/tmp/{my_name_pyless}'
 
-    This will run each irc server connection in invidual sub process.
+    config_path = '../ircthing3.ini'
-    Hold the process handlers on list.
-    Kill them with Stop_Toggle.
-    """
-    root_path = base_path()
 
-    # Get configuration file path if given
+    # Read configurations for all topics
-    config_path = "config.ini"
-    argument = cli_args()
-    if argument:
-        config_path = argument
-    # Read configuration
     network_configs = read_config(config_path)
 
     ## Get irc socket for each network in configuration
     ## Start thread for each socket 
+    
     for network in network_configs:
         net_name = network["net_name"]
+        print(f"{time.time()} | Found configs for {net_name} network.")
         server = network["server"]
         port = network["port"]
         nickname = network["nickname"]
         password = network["password"]
+        irc_socket, fifo_files = connect_to_irc_server(base_path, net_name, server, port, nickname, password)
 
-        print(f"{time.time()} | Found configs for {net_name} network.")
+        router_instance = irc_router(fifo_files, irc_socket, server, nickname)
-        irc_socket, fifo_files, network_dir = connect_to_irc_server(
+        Threads[net_name] = threading.Thread(target=router_instance.start)
-            root_path, net_name, server, port, nickname, password
+        Threads[net_name].daemon = True
-        )
+        Threads[net_name].start()
 
-        router_instance = irc_router(
+    for thread in Threads.values():
-            fifo_files, irc_socket, server, nickname, network_dir
+        print(thread)
-        )
+        thread.join()
-        Processes[net_name] = multiprocessing.Process(target=router_instance.start)
-        Processes[net_name].daemon = True
-        Processes[net_name].start()
-
-    # Wait for all the sub processes to end.
-    for process in Processes.values():
-        process.join()
 
 
 if __name__ == "__main__":
@@ -69,6 +58,5 @@ if __name__ == "__main__":
     except Exception as e:
         print(f"Got error {e}")
     finally:
-        clean_exit()
         print(f"{time.time()} | Bye!")
-        sys.exit(0)
+        exit(0)

ircthing_core.py

@@ -1,10 +1,9 @@
 import time
 import re
+import asyncio
 import socket
 import os
 from ircthing_utils import make_files
-from threading import Thread, Event
-
 
 def connect_to_irc_server(
     base_path,
@@ -30,112 +29,95 @@ def connect_to_irc_server(
     irc_socket.send(bytes(f"NICK {nickname}\r\n", "UTF-8"))
 
     # Create directories for the server and channel
-    fifo_files, network_path = make_files(base_path, net_name)
+    fifo_files = make_files(base_path, net_name)
 
-    return irc_socket, fifo_files, network_path
+    return irc_socket, fifo_files
 
 
 class irc_router:
-
+    def __init__(self, fifo_files, irc_socket, server, nickname):
-    def __init__(self, fifo_files, irc_socket, server, nickname, network_dir):
         self.fifo_files = fifo_files
         self.irc_socket = irc_socket
         self.server = server
         self.nickname = nickname
-        self.network_dir = network_dir
         self.channels = []
-        self.threads = []
+        self._loop = asyncio.new_event_loop()
-        self.disconnect_toggle = Event()
 
     def start(self):
-        self.start_threads()
+        try:
+            asyncio.set_event_loop(self._loop)
+            tasks = [self.user_listener(), self.irc_message_loop()]
+            self._loop.run_until_complete(asyncio.gather(*tasks))
+        finally:
+            for file in self.fifo_files:
+                try:
+                    os.close(file)
+                except:
+                    # Errors are okay at this point.
+                    pass
+            self._loop.close()
 
-        for file in self.fifo_files:
+    ## Main loop for reading irc inflow and routing to correct _out fifos.
-            try:
+    ## Also handle ping/pong here
-                os.close(file)
+    async def irc_message_loop(self):
-            except:
+        output_files=[]
-                # Errors are okay at this point.
+        loop = asyncio.get_running_loop()
-                pass
+        while True:
-        self.irc_send("QUIT")
 
-    def start_threads(self):
+            for output in self.fifo_files:
-        user_listener_thread = Thread(target=self.user_listener)
+                if output.endswith('out'):
-        irc_listener_thread = Thread(target=self.irc_message_loop)
+                    if output not in output_files:
-
+                        print(f"{time.time()} | {self.server} has output file: {output}")
-        self.threads.append(user_listener_thread)
+                        output_files.append(output)   
-        self.threads.append(irc_listener_thread)
-
-        # start the threads
-        for thread in self.threads:
-            thread.start()
-
-        # wait for all the threads to reach end
-        for thread in self.threads:
-            thread.join()
-
-    def get_output_fifos(self):
-        output_fifos = []
-        for fifo in self.fifo_files:
-            if fifo.endswith("out") and fifo not in output_fifos:
-                output_fifos.append(fifo)
-        return output_fifos
-
-    def write_to_server_out(self, message):
-        server_out = os.path.join(self.network_dir, "out")
-        if os.access(server_out, os.W_OK):
-            self.write_to_out(server_out, message)
-        else:
-            print(f"{time.time()} | {self.server} | {message}")
-
-    def irc_message_loop(self):
-        while not self.disconnect_toggle.is_set():
 
             try:
-                irc_input = self.irc_socket.recv(2048)
+                irc_input = await loop.sock_recv(self.irc_socket, 2048)
                 irc_input = irc_input.decode("utf-8")
             except Exception as e:
                 print(f"Error reading from socket: {e}")
                 continue
 
             if irc_input:
-                self.handle_irc_input(irc_input)
+                ## 
-            time.sleep(0.5)
+                ## The main logic hapens here.
+                ## support for channel joins
+                ## and spliting the input to channel specifig channel/[in, out] locations
+                ##
+                if "PING" in irc_input:
+                    self.irc_send(f"PONG :{self.server}")
+                    self.write_to_out(output_files[0], f"{time.time()} | ping/pong")
+                    continue
 
-    def handle_irc_input(self, irc_input):
+                if f":{self.server} 353" in irc_input:
-        if "PING" in irc_input:
+                    ## We have joined a channel!
-            self.irc_send(f"PONG :{self.server}")
+                    match = re.search(r'353 \S+ = (#\S+)', irc_input)
-            self.write_to_server_out("ping/pong")
+                    channel_join = match.group(1)
-        elif f":{self.server} 353" in irc_input:
+                    await self.make_files(channel_join)
-            self.handle_channel_join(irc_input)
+                    continue
-        elif "PRIVMSG" in irc_input:
-            self.handle_privmsg(irc_input)
-        else:
-            self.write_to_server_out(irc_input)
 
-    def handle_channel_join(self, irc_input):
+                if "PRIVMSG" in irc_input:
-        ## We have joined a channel!
+                    if self.if_input_belongs_to_channel(irc_input):
-        channel = re.search(r"353 \S+ = (#\S+)", irc_input).group(1)
+                        continue
-        self.make_files(channel)
 
-    def handle_privmsg(self, irc_input):
+                self.write_to_out(output_files[0], irc_input)
-        if not self.input_belongs_to_channel(irc_input):
-            self.write_to_server_out(irc_input)
 
-    def input_belongs_to_channel(self, input):
+            await asyncio.sleep(0.1)
-        output_files = self.get_output_fifos()
+
+    def if_input_belongs_to_channel(self, input):
         # We know that input includes "PRIVMSG"
         # But to where it shoudl go?
-        message = re.search(r":.*:(.*)", input).group(1)
+        message = re.search(r':.*:(.*)', input).group(1)
-        input_user = re.search(r"^:(\S+)", input).group(1)
+        input_user = re.search(r'^:(\S+)', input).group(1)
-        input_channel = re.search(r"PRIVMSG (\S+) :", input).group(1)
+        input_channel = re.search(r'PRIVMSG (\S+) :', input)
-        done = False
+        done=False
-        for file in output_files:
+        for file in self.fifo_files:
-            if input_channel in file:
+            if input_channel.group(1) in file:
-                self.write_to_out(file, f"{input_user}: {message}")
+                if file.endswith("out"):
-                done = True
+                    self.write_to_out(file, f"{input_user}: {message}")
+                    done=True
         return done
 
-    def make_files(self, channel):
+    async def make_files(self, channel):
         network_path = os.path.dirname(self.fifo_files[1])
         channel_dir = os.path.join(network_path, channel)
         os.makedirs(channel_dir, exist_ok=True)
@@ -151,6 +133,7 @@ class irc_router:
         fifo_files.append(f"{channel_dir}/in")
         fifo_files.append(f"{channel_dir}/out")
         self.fifo_files.extend(fifo_files)
+        await asyncio.sleep(1)
 
     def write_to_out(self, file, input):
         if file == None:
@@ -165,28 +148,29 @@ class irc_router:
         self.irc_socket.send(bytes(f"{message}\r\n", "utf-8"))
         print(f"{time.time()} | Send: {message}")
 
-    def async_readline(self, file, queue):
+    async def async_readline(self, file, queue):
         print(f"Trying to read from file {file}")
         try:
             while True:
-                with open(file, mode="r") as in_file:
+                with open(file, mode='r') as in_file:
                     line = in_file.readline().strip()
                     if not line:
                         print("There was no line!")
                         continue
-                    queue.put(line)
+                    await queue.put(line)
                     in_file.close()
+                await asyncio.sleep(0.5)
         except Exception as e:
             print(f"ERROR IN async_readline func: {e}")
 
-    def process_user_input(self, queue):
+    async def process_user_input(self, queue):
         print("Processing of user input may start!")
         while True:
             line = await queue.get()
             print(f"{time.time()} | trying to send: {line} to {self.server}")
 
             self.irc_send(line)
-            time.sleep(0.5)
+            await asyncio.sleep(0.2)
 
     async def user_listener(self):
         print("User Listener is HERE!")
@@ -204,4 +188,5 @@ class irc_router:
             # Wait for all tasks to complete
             await asyncio.gather(*tasks)
         finally:
-            self.irc_send("QUIT")
+           self.irc_send('QUIT') 
+

ircthing_utils.py

@@ -1,53 +1,7 @@
-"""
-ircthing_utils
-
-Some functions that make life nicer.
-"""
-
 import configparser
-import argparse
 import os
-import sys
-from typing import Union, List, Tuple
 
-
+def read_config(config_path):
-def base_path() -> str:
-    """
-    Returns location that the script will use as root for its dir structure
-    Returns:
-        str: path for run time files
-    """
-    my_name = sys.argv[0]
-    my_name_pyless, _ = os.path.splitext(my_name)
-    return f"/tmp/{my_name_pyless}"
-
-
-def cli_args() -> Union[str, None]:
-    """
-    Parse arguments and provide small usage message
-    Returns:
-        str or None: path to config file
-    """
-    parser = argparse.ArgumentParser(
-        description="Usage: python3.11 ircthing.py /myconfig.ini"
-    )
-    parser.add_argument("config", help="Path to the configuration file.")
-
-    args = parser.parse_args()
-    if args.config:
-        return args.config
-    return None
-
-
-def read_config(config_path: str) -> List[dict]:
-    """
-    Read configuration file and return list of dicts.
-    Dictionaries hold information about irc networks/server to connecto to.
-    args:
-        str: Path to the configuration file.
-    Returns:
-        list[{}, {}]: List of dictionaries.
-    """
     config = configparser.ConfigParser()
     config.read(config_path)
 
@@ -73,21 +27,12 @@ def read_config(config_path: str) -> List[dict]:
             }
             network_configs.append(network_config)
         return network_configs
-    except Exception as config_read_error:
+    except Exception as e:
-        print(f"Failure while reading configuration file. {config_read_error}")
+        print(f"Failure while reading configuration file. {e}")
-        sys.exit(1)
+        exit(1)
 
+def make_files(path, net_name):
 
-def make_files(path: str, net_name: str) -> Tuple[List[str], str]:
-    """
-    Make directories and fifo files need to make irc server connection.
-    Args:
-        str: The root path for run time files.
-        str: The network name of the irc server we are joining
-    Returns:
-        list: List containing the fio files created.
-        str: Path to the directory created for the network connection.
-    """
     os.makedirs(path, exist_ok=True)
     server_dir = os.path.join(path, net_name)
     os.makedirs(server_dir, exist_ok=True)
@@ -102,4 +47,5 @@ def make_files(path: str, net_name: str) -> Tuple[List[str], str]:
     fifo_files = []
     fifo_files.append(f"{server_dir}/in")
     fifo_files.append(f"{server_dir}/out")
-    return fifo_files, server_dir
+    return fifo_files
+