refactor: make code slightly cleaner

merge_srt.py

@@ -4,29 +4,25 @@ import shlex
 class SRTMerger:
     def __init__(self, srt1_filename, srt2_filename, commands_filename, output_filename):
         self.errors = []
-        self.srt1, srt1_errors = self.parse_srt(srt1_filename)
-        self.errors.extend(srt1_errors)
-        self.srt2, srt2_errors = self.parse_srt(srt2_filename)
-        self.errors.extend(srt2_errors)
-        self.commands, cmd_errors = self.read_commands(commands_filename)
-        self.errors.extend(cmd_errors)
+        self.srt1 = self.parse_srt(srt1_filename)
+        self.srt2 = self.parse_srt(srt2_filename)
+        self.commands = self.read_commands(commands_filename)
         self.output = []
         self.output_filename = output_filename
 
     def parse_srt(self, filename):
         entries = []
-        errors = []
         try:
             with open(filename, 'r', encoding='utf-8-sig') as f:
                 content = f.read().strip()
         except IOError as e:
-            errors.append(f"Error reading {filename}: {e}")
-            return entries, errors
+            self.errors.append(f"Error reading {filename}: {e}")
+            return entries
         blocks = content.split('\n\n')
         for block_number, block in enumerate(blocks, start=1):
             lines = block.split('\n')
             if len(lines) < 3:
-                errors.append(f"Block {block_number} in {filename} has less than 3 lines.")
+                self.errors.append(f"Block {block_number} in {filename} has less than 3 lines.")
                 continue
             try:
                 timestamp_line = lines[1]
@@ -36,18 +32,17 @@ class SRTMerger:
                     'text': text,
                 })
             except Exception as e:
-                errors.append(f"Error parsing block {block_number} in {filename}: {e}")
-        return entries, errors
+                self.errors.append(f"Error parsing block {block_number} in {filename}: {e}")
+        return entries
 
     def read_commands(self, filename):
         commands = []
-        errors = []
         try:
             with open(filename, 'r', encoding='utf-8') as f:
                 lines = f.readlines()
         except IOError as e:
-            errors.append(f"Error reading {filename}: {e}")
-            return commands, errors
+            self.errors.append(f"Error reading {filename}: {e}")
+            return commands
         supported = {
             'COPY': self.parse_copy,
             'MAP': self.parse_map,
@@ -60,14 +55,14 @@ class SRTMerger:
                 continue
             command = parts[0].upper()
             if command not in supported:
-                errors.append(f"Line {line_number}: unknown command '{command}'.")
+                self.errors.append(f"Line {line_number}: unknown command '{command}'.")
                 continue
             parsed = supported[command](parts)
             if parsed is None:
-                errors.append(f"Line {line_number}: invalid {command} command.")
+                self.errors.append(f"Line {line_number}: invalid {command} command.")
             else:
                 commands.append(parsed)
-        return commands, errors
+        return commands
 
     @staticmethod
     def split_line(line):
@@ -160,15 +155,14 @@ class SRTMerger:
         return ('PUT', source, index, text)
 
     def process_commands(self):
+        supported = {
+            'COPY': self.handle_copy,
+            'MAP': self.handle_map,
+            'SYNC': self.handle_sync,
+            'PUT': self.handle_put,
+        }
         for cmd in self.commands:
-            if cmd[0] == 'COPY':
-                self.handle_copy(*cmd[1:])
-            elif cmd[0] == 'MAP':
-                self.handle_map(*cmd[1:])
-            elif cmd[0] == 'SYNC':
-                self.handle_sync(*cmd[1:])
-            elif cmd[0] == 'PUT':
-                self.handle_put(*cmd[1:])
+            supported[cmd[0]](*cmd[1])
 
     def handle_copy(self, source, start, end):
         source_list = self.srt1 if source == 1 else self.srt2