From 50e9075bb50f99bff878266ebf8648da5bb72f51 Mon Sep 17 00:00:00 2001
From: dekzter <kappa118@gmail.com>
Date: Sat, 25 Oct 2025 08:15:39 -0400
Subject: [PATCH 001/172] initial run of a binary and encoded redis client - no
 more encoding / decoding data into redis, huge PITA (still some outstanding
 spots I need to patch)

---
 apps/channels/api_views.py                    |   6 +-
 apps/channels/tasks.py                        |   4 +-
 apps/proxy/tasks.py                           |   2 +-
 apps/proxy/ts_proxy/channel_status.py         | 208 ++++++------------
 apps/proxy/ts_proxy/server.py                 |  75 +++----
 .../ts_proxy/services/channel_service.py      |  20 +-
 apps/proxy/ts_proxy/stream_manager.py         |  14 +-
 apps/proxy/ts_proxy/url_utils.py              |   8 +-
 .../multi_worker_connection_manager.py        |  14 +-
 apps/proxy/vod_proxy/views.py                 |  16 +-
 core/redis_pubsub.py                          |   4 -
 core/tasks.py                                 |   2 +-
 core/utils.py                                 | 192 ++++++++--------
 dispatcharr/persistent_lock.py                |   2 +-
 14 files changed, 253 insertions(+), 314 deletions(-)

diff --git a/apps/channels/api_views.py b/apps/channels/api_views.py
index 862de7f9..aa25ca85 100644
--- a/apps/channels/api_views.py
+++ b/apps/channels/api_views.py
@@ -1849,14 +1849,12 @@ class RecordingViewSet(viewsets.ModelViewSet):
                 client_set_key = RedisKeys.clients(channel_uuid)
                 client_ids = r.smembers(client_set_key) or []
                 stopped = 0
-                for raw_id in client_ids:
+                for cid in client_ids:
                     try:
-                        cid = raw_id.decode("utf-8") if isinstance(raw_id, (bytes, bytearray)) else str(raw_id)
                         meta_key = RedisKeys.client_metadata(channel_uuid, cid)
                         ua = r.hget(meta_key, "user_agent")
-                        ua_s = ua.decode("utf-8") if isinstance(ua, (bytes, bytearray)) else (ua or "")
                         # Identify DVR recording client by its user agent
-                        if ua_s and "Dispatcharr-DVR" in ua_s:
+                        if ua and "Dispatcharr-DVR" in ua:
                             try:
                                 ChannelService.stop_client(channel_uuid, cid)
                                 stopped += 1
diff --git a/apps/channels/tasks.py b/apps/channels/tasks.py
index 3943cf16..28da31b3 100755
--- a/apps/channels/tasks.py
+++ b/apps/channels/tasks.py
@@ -1875,14 +1875,14 @@ def run_recording(recording_id, channel_id, start_time_str, end_time_str):
                 md = r.hgetall(metadata_key)
                 if md:
                     def _gv(bkey):
-                        return md.get(bkey.encode('utf-8'))
+                        return md.get(bkey)
 
                     def _d(bkey, cast=str):
                         v = _gv(bkey)
                         try:
                             if v is None:
                                 return None
-                            s = v.decode('utf-8')
+                            s = v
                             return cast(s) if cast is not str else s
                         except Exception:
                             return None
diff --git a/apps/proxy/tasks.py b/apps/proxy/tasks.py
index 68843712..d42e4d9a 100644
--- a/apps/proxy/tasks.py
+++ b/apps/proxy/tasks.py
@@ -31,7 +31,7 @@ def fetch_channel_stats():
         while True:
             cursor, keys = redis_client.scan(cursor, match=channel_pattern)
             for key in keys:
-                channel_id_match = re.search(r"ts_proxy:channel:(.*):metadata", key.decode('utf-8'))
+                channel_id_match = re.search(r"ts_proxy:channel:(.*):metadata", key)
                 if channel_id_match:
                     ch_id = channel_id_match.group(1)
                     channel_info = ChannelStatus.get_basic_channel_info(ch_id)
diff --git a/apps/proxy/ts_proxy/channel_status.py b/apps/proxy/ts_proxy/channel_status.py
index 8f1d0649..015d5ca2 100644
--- a/apps/proxy/ts_proxy/channel_status.py
+++ b/apps/proxy/ts_proxy/channel_status.py
@@ -38,19 +38,19 @@ class ChannelStatus:
 
         info = {
             'channel_id': channel_id,
-            'state': metadata.get(ChannelMetadataField.STATE.encode('utf-8'), b'unknown').decode('utf-8'),
-            'url': metadata.get(ChannelMetadataField.URL.encode('utf-8'), b'').decode('utf-8'),
-            'stream_profile': metadata.get(ChannelMetadataField.STREAM_PROFILE.encode('utf-8'), b'').decode('utf-8'),
-            'started_at': metadata.get(ChannelMetadataField.INIT_TIME.encode('utf-8'), b'0').decode('utf-8'),
-            'owner': metadata.get(ChannelMetadataField.OWNER.encode('utf-8'), b'unknown').decode('utf-8'),
-            'buffer_index': int(buffer_index_value.decode('utf-8')) if buffer_index_value else 0,
+            'state': metadata.get(ChannelMetadataField.STATE, 'unknown'),
+            'url': metadata.get(ChannelMetadataField.URL, ''),
+            'stream_profile': metadata.get(ChannelMetadataField.STREAM_PROFILE, ''),
+            'started_at': metadata.get(ChannelMetadataField.INIT_TIME, '0'),
+            'owner': metadata.get(ChannelMetadataField.OWNER, 'unknown'),
+            'buffer_index': int(buffer_index_value) if buffer_index_value else 0,
         }
 
         # Add stream ID and name information
-        stream_id_bytes = metadata.get(ChannelMetadataField.STREAM_ID.encode('utf-8'))
+        stream_id_bytes = metadata.get(ChannelMetadataField.STREAM_ID)
         if stream_id_bytes:
             try:
-                stream_id = int(stream_id_bytes.decode('utf-8'))
+                stream_id = int(stream_id_bytes)
                 info['stream_id'] = stream_id
 
                 # Look up stream name from database
@@ -65,10 +65,10 @@ class ChannelStatus:
                 logger.warning(f"Invalid stream_id format in Redis: {stream_id_bytes}")
 
         # Add M3U profile information
-        m3u_profile_id_bytes = metadata.get(ChannelMetadataField.M3U_PROFILE.encode('utf-8'))
+        m3u_profile_id_bytes = metadata.get(ChannelMetadataField.M3U_PROFILE)
         if m3u_profile_id_bytes:
             try:
-                m3u_profile_id = int(m3u_profile_id_bytes.decode('utf-8'))
+                m3u_profile_id = int(m3u_profile_id_bytes)
                 info['m3u_profile_id'] = m3u_profile_id
 
                 # Look up M3U profile name from database
@@ -83,22 +83,22 @@ class ChannelStatus:
                 logger.warning(f"Invalid m3u_profile_id format in Redis: {m3u_profile_id_bytes}")
 
         # Add timing information
-        state_changed_field = ChannelMetadataField.STATE_CHANGED_AT.encode('utf-8')
+        state_changed_field = ChannelMetadataField.STATE_CHANGED_AT
         if state_changed_field in metadata:
-            state_changed_at = float(metadata[state_changed_field].decode('utf-8'))
+            state_changed_at = float(metadata[state_changed_field])
             info['state_changed_at'] = state_changed_at
             info['state_duration'] = time.time() - state_changed_at
 
-        init_time_field = ChannelMetadataField.INIT_TIME.encode('utf-8')
+        init_time_field = ChannelMetadataField.INIT_TIME
         if init_time_field in metadata:
-            created_at = float(metadata[init_time_field].decode('utf-8'))
+            created_at = float(metadata[init_time_field])
             info['started_at'] = created_at
             info['uptime'] = time.time() - created_at
 
         # Add data throughput information
-        total_bytes_field = ChannelMetadataField.TOTAL_BYTES.encode('utf-8')
+        total_bytes_field = ChannelMetadataField.TOTAL_BYTES
         if total_bytes_field in metadata:
-            total_bytes = int(metadata[total_bytes_field].decode('utf-8'))
+            total_bytes = int(metadata[total_bytes_field])
             info['total_bytes'] = total_bytes
 
             # Format total bytes in human-readable form
@@ -128,40 +128,40 @@ class ChannelStatus:
         clients = []
 
         for client_id in client_ids:
-            client_id_str = client_id.decode('utf-8')
+            client_id_str = client_id
             client_key = RedisKeys.client_metadata(channel_id, client_id_str)
             client_data = proxy_server.redis_client.hgetall(client_key)
 
             if client_data:
                 client_info = {
                     'client_id': client_id_str,
-                    'user_agent': client_data.get(b'user_agent', b'unknown').decode('utf-8'),
-                    'worker_id': client_data.get(b'worker_id', b'unknown').decode('utf-8'),
+                    'user_agent': client_data.get('user_agent', 'unknown'),
+                    'worker_id': client_data.get('worker_id', 'unknown'),
                 }
 
-                if b'connected_at' in client_data:
-                    connected_at = float(client_data[b'connected_at'].decode('utf-8'))
+                if 'connected_at' in client_data:
+                    connected_at = float(client_data['connected_at'])
                     client_info['connected_at'] = connected_at
                     client_info['connection_duration'] = time.time() - connected_at
 
-                if b'last_active' in client_data:
-                    last_active = float(client_data[b'last_active'].decode('utf-8'))
+                if 'last_active' in client_data:
+                    last_active = float(client_data['last_active'])
                     client_info['last_active'] = last_active
                     client_info['last_active_ago'] = time.time() - last_active
 
                 # Add transfer rate statistics
-                if b'bytes_sent' in client_data:
-                    client_info['bytes_sent'] = int(client_data[b'bytes_sent'].decode('utf-8'))
+                if 'bytes_sent' in client_data:
+                    client_info['bytes_sent'] = int(client_data['bytes_sent'])
 
                 # Add average transfer rate
-                if b'avg_rate_KBps' in client_data:
-                    client_info['avg_rate_KBps'] = float(client_data[b'avg_rate_KBps'].decode('utf-8'))
-                elif b'transfer_rate_KBps' in client_data:  # For backward compatibility
-                    client_info['avg_rate_KBps'] = float(client_data[b'transfer_rate_KBps'].decode('utf-8'))
+                if 'avg_rate_KBps' in client_data:
+                    client_info['avg_rate_KBps'] = float(client_data['avg_rate_KBps'])
+                elif 'transfer_rate_KBps' in client_data:  # For backward compatibility
+                    client_info['avg_rate_KBps'] = float(client_data['transfer_rate_KBps'])
 
                 # Add current transfer rate
-                if b'current_rate_KBps' in client_data:
-                    client_info['current_rate_KBps'] = float(client_data[b'current_rate_KBps'].decode('utf-8'))
+                if 'current_rate_KBps' in client_data:
+                    client_info['current_rate_KBps'] = float(client_data['current_rate_KBps'])
 
                 clients.append(client_info)
 
@@ -235,7 +235,7 @@ class ChannelStatus:
                     while True:
                         cursor, keys = proxy_server.redis_client.scan(cursor, match=buffer_key_pattern, count=100)
                         if keys:
-                            all_buffer_keys.extend([k.decode('utf-8') for k in keys])
+                            all_buffer_keys.extend([k for k in keys])
                         if cursor == 0 or len(all_buffer_keys) >= 20:  # Limit to 20 keys
                             break
 
@@ -265,61 +265,22 @@ class ChannelStatus:
             }
 
         # Add FFmpeg stream information
-        video_codec = metadata.get(ChannelMetadataField.VIDEO_CODEC.encode('utf-8'))
-        if video_codec:
-            info['video_codec'] = video_codec.decode('utf-8')
-
-        resolution = metadata.get(ChannelMetadataField.RESOLUTION.encode('utf-8'))
-        if resolution:
-            info['resolution'] = resolution.decode('utf-8')
-
-        source_fps = metadata.get(ChannelMetadataField.SOURCE_FPS.encode('utf-8'))
-        if source_fps:
-            info['source_fps'] = float(source_fps.decode('utf-8'))
-
-        pixel_format = metadata.get(ChannelMetadataField.PIXEL_FORMAT.encode('utf-8'))
-        if pixel_format:
-            info['pixel_format'] = pixel_format.decode('utf-8')
-
-        source_bitrate = metadata.get(ChannelMetadataField.SOURCE_BITRATE.encode('utf-8'))
-        if source_bitrate:
-            info['source_bitrate'] = float(source_bitrate.decode('utf-8'))
-
-        audio_codec = metadata.get(ChannelMetadataField.AUDIO_CODEC.encode('utf-8'))
-        if audio_codec:
-            info['audio_codec'] = audio_codec.decode('utf-8')
-
-        sample_rate = metadata.get(ChannelMetadataField.SAMPLE_RATE.encode('utf-8'))
-        if sample_rate:
-            info['sample_rate'] = int(sample_rate.decode('utf-8'))
-
-        audio_channels = metadata.get(ChannelMetadataField.AUDIO_CHANNELS.encode('utf-8'))
-        if audio_channels:
-            info['audio_channels'] = audio_channels.decode('utf-8')
-
-        audio_bitrate = metadata.get(ChannelMetadataField.AUDIO_BITRATE.encode('utf-8'))
-        if audio_bitrate:
-            info['audio_bitrate'] = float(audio_bitrate.decode('utf-8'))
+        info['video_codec'] = metadata.get(ChannelMetadataField.VIDEO_CODEC)
+        info['resolution'] = metadata.get(ChannelMetadataField.RESOLUTION)
+        info['source_fps'] = metadata.get(ChannelMetadataField.SOURCE_FPS)
+        info['pixel_format'] = metadata.get(ChannelMetadataField.PIXEL_FORMAT)
+        info['source_bitrate'] = metadata.get(ChannelMetadataField.SOURCE_BITRATE)
+        info['audio_codec'] = metadata.get(ChannelMetadataField.AUDIO_CODEC)
+        info['sample_rate'] = metadata.get(ChannelMetadataField.SAMPLE_RATE)
+        info['audio_channels'] = metadata.get(ChannelMetadataField.AUDIO_CHANNELS)
+        info['audio_bitrate'] = metadata.get(ChannelMetadataField.AUDIO_BITRATE)
 
         # Add FFmpeg performance stats
-        ffmpeg_speed = metadata.get(ChannelMetadataField.FFMPEG_SPEED.encode('utf-8'))
-        if ffmpeg_speed:
-            info['ffmpeg_speed'] = float(ffmpeg_speed.decode('utf-8'))
-
-        ffmpeg_fps = metadata.get(ChannelMetadataField.FFMPEG_FPS.encode('utf-8'))
-        if ffmpeg_fps:
-            info['ffmpeg_fps'] = float(ffmpeg_fps.decode('utf-8'))
-
-        actual_fps = metadata.get(ChannelMetadataField.ACTUAL_FPS.encode('utf-8'))
-        if actual_fps:
-            info['actual_fps'] = float(actual_fps.decode('utf-8'))
-
-        ffmpeg_bitrate = metadata.get(ChannelMetadataField.FFMPEG_BITRATE.encode('utf-8'))
-        if ffmpeg_bitrate:
-            info['ffmpeg_bitrate'] = float(ffmpeg_bitrate.decode('utf-8'))
-        stream_type = metadata.get(ChannelMetadataField.STREAM_TYPE.encode('utf-8'))
-        if stream_type:
-            info['stream_type'] = stream_type.decode('utf-8')
+        info['ffmpeg_speed'] = metadata.get(ChannelMetadataField.FFMPEG_SPEED)
+        info['ffmpeg_fps'] = metadata.get(ChannelMetadataField.FFMPEG_FPS)
+        info['actual_fps'] = metadata.get(ChannelMetadataField.ACTUAL_FPS)
+        info['ffmpeg_bitrate'] = metadata.get(ChannelMetadataField.FFMPEG_BITRATE)
+        info['stream_type'] = metadata.get(ChannelMetadataField.STREAM_TYPE)
 
         return info
 
@@ -364,33 +325,27 @@ class ChannelStatus:
             client_count = proxy_server.redis_client.scard(client_set_key) or 0
 
             # Calculate uptime
-            init_time_bytes = metadata.get(ChannelMetadataField.INIT_TIME.encode('utf-8'), b'0')
-            created_at = float(init_time_bytes.decode('utf-8'))
+            init_time_bytes = metadata.get(ChannelMetadataField.INIT_TIME, '0')
+            created_at = float(init_time_bytes)
             uptime = time.time() - created_at if created_at > 0 else 0
 
-            # Safely decode bytes or use defaults
-            def safe_decode(bytes_value, default="unknown"):
-                if bytes_value is None:
-                    return default
-                return bytes_value.decode('utf-8')
-
             # Simplified info
             info = {
                 'channel_id': channel_id,
-                'state': safe_decode(metadata.get(ChannelMetadataField.STATE.encode('utf-8'))),
-                'url': safe_decode(metadata.get(ChannelMetadataField.URL.encode('utf-8')), ""),
-                'stream_profile': safe_decode(metadata.get(ChannelMetadataField.STREAM_PROFILE.encode('utf-8')), ""),
-                'owner': safe_decode(metadata.get(ChannelMetadataField.OWNER.encode('utf-8'))),
-                'buffer_index': int(buffer_index_value.decode('utf-8')) if buffer_index_value else 0,
+                'state': metadata.get(ChannelMetadataField.STATE),
+                'url': metadata.get(ChannelMetadataField.URL, ""),
+                'stream_profile': metadata.get(ChannelMetadataField.STREAM_PROFILE, ""),
+                'owner': metadata.get(ChannelMetadataField.OWNER),
+                'buffer_index': int(buffer_index_value) if buffer_index_value else 0,
                 'client_count': client_count,
                 'uptime': uptime
             }
 
             # Add stream ID and name information
-            stream_id_bytes = metadata.get(ChannelMetadataField.STREAM_ID.encode('utf-8'))
+            stream_id_bytes = metadata.get(ChannelMetadataField.STREAM_ID)
             if stream_id_bytes:
                 try:
-                    stream_id = int(stream_id_bytes.decode('utf-8'))
+                    stream_id = int(stream_id_bytes)
                     info['stream_id'] = stream_id
 
                     # Look up stream name from database
@@ -405,9 +360,9 @@ class ChannelStatus:
                     logger.warning(f"Invalid stream_id format in Redis: {stream_id_bytes}")
 
             # Add data throughput information to basic info
-            total_bytes_bytes = proxy_server.redis_client.hget(metadata_key, ChannelMetadataField.TOTAL_BYTES.encode('utf-8'))
+            total_bytes_bytes = proxy_server.redis_client.hget(metadata_key, ChannelMetadataField.TOTAL_BYTES)
             if total_bytes_bytes:
-                total_bytes = int(total_bytes_bytes.decode('utf-8'))
+                total_bytes = int(total_bytes_bytes)
                 info['total_bytes'] = total_bytes
 
                 # Calculate and add bitrate
@@ -434,26 +389,25 @@ class ChannelStatus:
             if client_ids:
                 # Get up to 10 clients for the basic view
                 for client_id in list(client_ids)[:10]:
-                    client_id_str = client_id.decode('utf-8')
-                    client_key = RedisKeys.client_metadata(channel_id, client_id_str)
+                    client_key = RedisKeys.client_metadata(channel_id, client_id)
 
                     # Efficient way - just retrieve the essentials
                     client_info = {
-                        'client_id': client_id_str,
+                        'client_id': client_id,
                     }
 
                     # Safely get user_agent and ip_address
                     user_agent_bytes = proxy_server.redis_client.hget(client_key, 'user_agent')
-                    client_info['user_agent'] = safe_decode(user_agent_bytes)
+                    client_info['user_agent'] = user_agent_bytes
 
                     ip_address_bytes = proxy_server.redis_client.hget(client_key, 'ip_address')
                     if ip_address_bytes:
-                        client_info['ip_address'] = safe_decode(ip_address_bytes)
+                        client_info['ip_address'] = ip_address_bytes
 
                     # Just get connected_at for client age
                     connected_at_bytes = proxy_server.redis_client.hget(client_key, 'connected_at')
                     if connected_at_bytes:
-                        connected_at = float(connected_at_bytes.decode('utf-8'))
+                        connected_at = float(connected_at_bytes)
                         client_info['connected_since'] = time.time() - connected_at
 
                     clients.append(client_info)
@@ -462,10 +416,10 @@ class ChannelStatus:
             info['clients'] = clients
 
             # Add M3U profile information
-            m3u_profile_id_bytes = metadata.get(ChannelMetadataField.M3U_PROFILE.encode('utf-8'))
-            if m3u_profile_id_bytes:
+            m3u_profile_id = metadata.get(ChannelMetadataField.M3U_PROFILE)
+            if m3u_profile_id:
                 try:
-                    m3u_profile_id = int(m3u_profile_id_bytes.decode('utf-8'))
+                    m3u_profile_id = int(m3u_profile_id)
                     info['m3u_profile_id'] = m3u_profile_id
 
                     # Look up M3U profile name from database
@@ -477,32 +431,16 @@ class ChannelStatus:
                     except (ImportError, DatabaseError) as e:
                         logger.warning(f"Failed to get M3U profile name for ID {m3u_profile_id}: {e}")
                 except ValueError:
-                    logger.warning(f"Invalid m3u_profile_id format in Redis: {m3u_profile_id_bytes}")
+                    logger.warning(f"Invalid m3u_profile_id format in Redis: {m3u_profile_id}")
 
             # Add stream info to basic info as well
-            video_codec = metadata.get(ChannelMetadataField.VIDEO_CODEC.encode('utf-8'))
-            if video_codec:
-                info['video_codec'] = video_codec.decode('utf-8')
-
-            resolution = metadata.get(ChannelMetadataField.RESOLUTION.encode('utf-8'))
-            if resolution:
-                info['resolution'] = resolution.decode('utf-8')
-
-            source_fps = metadata.get(ChannelMetadataField.SOURCE_FPS.encode('utf-8'))
-            if source_fps:
-                info['source_fps'] = float(source_fps.decode('utf-8'))
-            ffmpeg_speed = metadata.get(ChannelMetadataField.FFMPEG_SPEED.encode('utf-8'))
-            if ffmpeg_speed:
-                info['ffmpeg_speed'] = float(ffmpeg_speed.decode('utf-8'))
-            audio_codec = metadata.get(ChannelMetadataField.AUDIO_CODEC.encode('utf-8'))
-            if audio_codec:
-                info['audio_codec'] = audio_codec.decode('utf-8')
-            audio_channels = metadata.get(ChannelMetadataField.AUDIO_CHANNELS.encode('utf-8'))
-            if audio_channels:
-                info['audio_channels'] = audio_channels.decode('utf-8')
-            stream_type = metadata.get(ChannelMetadataField.STREAM_TYPE.encode('utf-8'))
-            if stream_type:
-                info['stream_type'] = stream_type.decode('utf-8')
+            info['video_codec'] = metadata.get(ChannelMetadataField.VIDEO_CODEC)
+            info['resolution'] = metadata.get(ChannelMetadataField.RESOLUTION)
+            info['source_fps'] = metadata.get(ChannelMetadataField.SOURCE_FPS)
+            info['ffmpeg_speed'] = metadata.get(ChannelMetadataField.FFMPEG_SPEED)
+            info['audio_codec'] = metadata.get(ChannelMetadataField.AUDIO_CODEC)
+            info['audio_channels'] = metadata.get(ChannelMetadataField.AUDIO_CHANNELS)
+            info['stream_type'] = metadata.get(ChannelMetadataField.STREAM_TYPE)
 
             return info
         except Exception as e:
diff --git a/apps/proxy/ts_proxy/server.py b/apps/proxy/ts_proxy/server.py
index cca827a9..7a59f530 100644
--- a/apps/proxy/ts_proxy/server.py
+++ b/apps/proxy/ts_proxy/server.py
@@ -157,7 +157,8 @@ class ProxyServer:
                             socket_timeout=60,
                             socket_connect_timeout=10,
                             socket_keepalive=True,
-                            health_check_interval=30
+                            health_check_interval=30,
+                            decode_responses=True
                         )
                         logger.info("Created fallback Redis PubSub client for event listener")
 
@@ -178,8 +179,8 @@ class ProxyServer:
                             continue
 
                         try:
-                            channel = message["channel"].decode("utf-8")
-                            data = json.loads(message["data"].decode("utf-8"))
+                            channel = message["channel"]
+                            data = json.loads(message["data"])
 
                             event_type = data.get("event")
                             channel_id = data.get("channel_id")
@@ -374,7 +375,7 @@ class ProxyServer:
         try:
             lock_key = RedisKeys.channel_owner(channel_id)
             return self._execute_redis_command(
-                lambda: self.redis_client.get(lock_key).decode('utf-8') if self.redis_client.get(lock_key) else None
+                lambda: self.redis_client.get(lock_key) if self.redis_client.get(lock_key) else None
             )
         except Exception as e:
             logger.error(f"Error getting channel owner: {e}")
@@ -415,7 +416,7 @@ class ProxyServer:
             current_owner = self._execute_redis_command(
                 lambda: self.redis_client.get(lock_key)
             )
-            if current_owner and current_owner.decode('utf-8') == self.worker_id:
+            if current_owner and current_owner == self.worker_id:
                 # Refresh TTL
                 self._execute_redis_command(
                     lambda: self.redis_client.expire(lock_key, ttl)
@@ -440,7 +441,7 @@ class ProxyServer:
 
             # Only delete if we're the current owner to prevent race conditions
             current = self.redis_client.get(lock_key)
-            if current and current.decode('utf-8') == self.worker_id:
+            if current and current == self.worker_id:
                 self.redis_client.delete(lock_key)
                 logger.info(f"Released ownership of channel {channel_id}")
 
@@ -462,7 +463,7 @@ class ProxyServer:
             current = self.redis_client.get(lock_key)
 
             # Only extend if we're still the owner
-            if current and current.decode('utf-8') == self.worker_id:
+            if current and current == self.worker_id:
                 self.redis_client.expire(lock_key, ttl)
                 return True
             return False
@@ -478,15 +479,15 @@ class ProxyServer:
                 metadata_key = RedisKeys.channel_metadata(channel_id)
                 if self.redis_client.exists(metadata_key):
                     metadata = self.redis_client.hgetall(metadata_key)
-                    if b'state' in metadata:
-                        state = metadata[b'state'].decode('utf-8')
+                    if 'state' in metadata:
+                        state = metadata['state']
                         active_states = [ChannelState.INITIALIZING, ChannelState.CONNECTING,
                                         ChannelState.WAITING_FOR_CLIENTS, ChannelState.ACTIVE, ChannelState.BUFFERING]
                         if state in active_states:
                             logger.info(f"Channel {channel_id} already being initialized with state {state}")
                             # Create buffer and client manager only if we don't have them
                             if channel_id not in self.stream_buffers:
-                                self.stream_buffers[channel_id] = StreamBuffer(channel_id, redis_client=self.redis_client)
+                                self.stream_buffers[channel_id] = StreamBuffer(channel_id, redis_client=RedisClient.get_buffer())
                             if channel_id not in self.client_managers:
                                 self.client_managers[channel_id] = ClientManager(
                                     channel_id,
@@ -497,7 +498,7 @@ class ProxyServer:
 
             # Create buffer and client manager instances (or reuse if they exist)
             if channel_id not in self.stream_buffers:
-                buffer = StreamBuffer(channel_id, redis_client=self.redis_client)
+                buffer = StreamBuffer(channel_id, redis_client=RedisClient.get_buffer())
                 self.stream_buffers[channel_id] = buffer
 
             if channel_id not in self.client_managers:
@@ -536,18 +537,18 @@ class ProxyServer:
 
                 # If no url was passed, try to get from Redis
                 if not url and existing_metadata:
-                    url_bytes = existing_metadata.get(b'url')
+                    url_bytes = existing_metadata.get('url')
                     if url_bytes:
-                        channel_url = url_bytes.decode('utf-8')
+                        channel_url = url_bytes
 
-                    ua_bytes = existing_metadata.get(b'user_agent')
+                    ua_bytes = existing_metadata.get('user_agent')
                     if ua_bytes:
-                        channel_user_agent = ua_bytes.decode('utf-8')
+                        channel_user_agent = ua_bytes
 
                 # Get stream ID from metadata if not provided
-                if not channel_stream_id and b'stream_id' in existing_metadata:
+                if not channel_stream_id and 'stream_id' in existing_metadata:
                     try:
-                        channel_stream_id = int(existing_metadata[b'stream_id'].decode('utf-8'))
+                        channel_stream_id = int(existing_metadata['stream_id'])
                         logger.debug(f"Found stream_id {channel_stream_id} in metadata for channel {channel_id}")
                     except (ValueError, TypeError) as e:
                         logger.debug(f"Could not parse stream_id from metadata: {e}")
@@ -562,7 +563,7 @@ class ProxyServer:
 
                 # Create buffer but not stream manager (only if not already exists)
                 if channel_id not in self.stream_buffers:
-                    buffer = StreamBuffer(channel_id=channel_id, redis_client=self.redis_client)
+                    buffer = StreamBuffer(channel_id=channel_id, redis_client=RedisClient.get_buffer())
                     self.stream_buffers[channel_id] = buffer
 
                 # Create client manager with channel_id and redis_client (only if not already exists)
@@ -585,7 +586,7 @@ class ProxyServer:
 
                 # Create buffer but not stream manager (only if not already exists)
                 if channel_id not in self.stream_buffers:
-                    buffer = StreamBuffer(channel_id=channel_id, redis_client=self.redis_client)
+                    buffer = StreamBuffer(channel_id=channel_id, redis_client=RedisClient.get_buffer())
                     self.stream_buffers[channel_id] = buffer
 
                 # Create client manager with channel_id and redis_client (only if not already exists)
@@ -624,12 +625,12 @@ class ProxyServer:
                 # Verify the stream_id was set correctly in Redis
                 stream_id_value = self.redis_client.hget(metadata_key, "stream_id")
                 if stream_id_value:
-                    logger.info(f"Verified stream_id {stream_id_value.decode('utf-8')} is set in Redis for channel {channel_id}")
+                    logger.info(f"Verified stream_id {stream_id_value} is set in Redis for channel {channel_id}")
                 else:
                     logger.warning(f"Failed to set stream_id in Redis for channel {channel_id}")
 
             # Create stream buffer
-            buffer = StreamBuffer(channel_id=channel_id, redis_client=self.redis_client)
+            buffer = StreamBuffer(channel_id=channel_id, redis_client=RedisClient.get_buffer())
             logger.debug(f"Created StreamBuffer for channel {channel_id}")
             self.stream_buffers[channel_id] = buffer
 
@@ -700,8 +701,8 @@ class ProxyServer:
                 metadata = self.redis_client.hgetall(metadata_key)
 
                 # Get channel state and owner
-                state = metadata.get(b'state', b'unknown').decode('utf-8')
-                owner = metadata.get(b'owner', b'').decode('utf-8')
+                state = metadata.get('state', 'unknown')
+                owner = metadata.get('owner', '')
 
                 # States that indicate the channel is running properly
                 valid_states = [ChannelState.ACTIVE, ChannelState.WAITING_FOR_CLIENTS,
@@ -726,8 +727,8 @@ class ProxyServer:
                     return True
                 else:
                     # Unknown or initializing state, check how long it's been in this state
-                    if b'state_changed_at' in metadata:
-                        state_changed_at = float(metadata[b'state_changed_at'].decode('utf-8'))
+                    if 'state_changed_at' in metadata:
+                        state_changed_at = float(metadata['state_changed_at'])
                         state_age = time.time() - state_changed_at
 
                         # If in initializing state for too long, consider it stale
@@ -762,8 +763,8 @@ class ProxyServer:
 
             # If we have metadata, log details for debugging
             if metadata:
-                state = metadata.get(b'state', b'unknown').decode('utf-8')
-                owner = metadata.get(b'owner', b'unknown').decode('utf-8')
+                state = metadata.get('state', 'unknown')
+                owner = metadata.get('owner', 'unknown')
                 logger.info(f"Zombie channel details - state: {state}, owner: {owner}")
 
             # Clean up Redis keys
@@ -931,8 +932,8 @@ class ProxyServer:
                             if self.redis_client:
                                 metadata_key = RedisKeys.channel_metadata(channel_id)
                                 metadata = self.redis_client.hgetall(metadata_key)
-                                if metadata and b'state' in metadata:
-                                    channel_state = metadata[b'state'].decode('utf-8')
+                                if metadata and 'state' in metadata:
+                                    channel_state = metadata['state']
 
                             # Check if channel has any clients left
                             total_clients = 0
@@ -948,9 +949,9 @@ class ProxyServer:
                             if channel_state in [ChannelState.CONNECTING, ChannelState.WAITING_FOR_CLIENTS]:
                                 # Get connection ready time from metadata
                                 connection_ready_time = None
-                                if metadata and b'connection_ready_time' in metadata:
+                                if metadata and 'connection_ready_time' in metadata:
                                     try:
-                                        connection_ready_time = float(metadata[b'connection_ready_time'].decode('utf-8'))
+                                        connection_ready_time = float(metadata['connection_ready_time'])
                                     except (ValueError, TypeError):
                                         pass
 
@@ -981,8 +982,8 @@ class ProxyServer:
                                         # Grace period expired but we have clients - mark channel as active
                                         logger.info(f"Grace period expired with {total_clients} clients - marking channel {channel_id} as active")
                                         old_state = "unknown"
-                                        if metadata and b'state' in metadata:
-                                            old_state = metadata[b'state'].decode('utf-8')
+                                        if metadata and 'state' in metadata:
+                                            old_state = metadata['state']
                                         if self.update_channel_state(channel_id, ChannelState.ACTIVE, {
                                             "grace_period_ended_at": str(time.time()),
                                             "clients_at_activation": str(total_clients)
@@ -998,7 +999,7 @@ class ProxyServer:
                                     disconnect_value = self.redis_client.get(disconnect_key)
                                     if disconnect_value:
                                         try:
-                                            disconnect_time = float(disconnect_value.decode('utf-8'))
+                                            disconnect_time = float(disconnect_value)
                                         except (ValueError, TypeError) as e:
                                             logger.error(f"Invalid disconnect time for channel {channel_id}: {e}")
 
@@ -1076,7 +1077,7 @@ class ProxyServer:
 
             for key in channel_keys:
                 try:
-                    channel_id = key.decode('utf-8').split(':')[2]
+                    channel_id = key.split(':')[2]
 
                     # Skip channels we already have locally
                     if channel_id in self.stream_buffers:
@@ -1170,8 +1171,8 @@ class ProxyServer:
             # Get current state for logging
             current_state = None
             metadata = self.redis_client.hgetall(metadata_key)
-            if metadata and b'state' in metadata:
-                current_state = metadata[b'state'].decode('utf-8')
+            if metadata and 'state' in metadata:
+                current_state = metadata['state']
 
             # Only update if state is actually changing
             if current_state == new_state:
diff --git a/apps/proxy/ts_proxy/services/channel_service.py b/apps/proxy/ts_proxy/services/channel_service.py
index 551e2d27..6e7d3878 100644
--- a/apps/proxy/ts_proxy/services/channel_service.py
+++ b/apps/proxy/ts_proxy/services/channel_service.py
@@ -59,7 +59,7 @@ class ChannelService:
             # Verify the stream_id was set
             stream_id_value = proxy_server.redis_client.hget(metadata_key, ChannelMetadataField.STREAM_ID)
             if stream_id_value:
-                logger.debug(f"Verified stream_id {stream_id_value.decode('utf-8')} is now set in Redis")
+                logger.debug(f"Verified stream_id {stream_id_value} is now set in Redis")
             else:
                 logger.error(f"Failed to set stream_id {stream_id} in Redis before initialization")
 
@@ -129,7 +129,7 @@ class ChannelService:
             try:
                 # This is inefficient but used for diagnostics - in production would use more targeted checks
                 redis_keys = proxy_server.redis_client.keys(f"ts_proxy:*:{channel_id}*")
-                redis_keys = [k.decode('utf-8') for k in redis_keys] if redis_keys else []
+                redis_keys = [k for k in redis_keys] if redis_keys else []
             except Exception as e:
                 logger.error(f"Error checking Redis keys: {e}")
 
@@ -234,8 +234,8 @@ class ChannelService:
             metadata_key = RedisKeys.channel_metadata(channel_id)
             try:
                 metadata = proxy_server.redis_client.hgetall(metadata_key)
-                if metadata and b'state' in metadata:
-                    state = metadata[b'state'].decode('utf-8')
+                if metadata and 'state' in metadata:
+                    state = metadata['state']
                     channel_info = {"state": state}
 
                     # Immediately mark as stopping in metadata so clients detect it faster
@@ -375,8 +375,8 @@ class ChannelService:
             metadata = proxy_server.redis_client.hgetall(metadata_key)
 
             # Extract state and owner
-            state = metadata.get(ChannelMetadataField.STATE.encode(), b'unknown').decode('utf-8')
-            owner = metadata.get(ChannelMetadataField.OWNER.encode(), b'unknown').decode('utf-8')
+            state = metadata.get(ChannelMetadataField.STATE.encode(), 'unknown')
+            owner = metadata.get(ChannelMetadataField.OWNER.encode(), 'unknown')
 
             # Valid states indicate channel is running properly
             valid_states = [ChannelState.ACTIVE, ChannelState.WAITING_FOR_CLIENTS, ChannelState.CONNECTING]
@@ -402,7 +402,7 @@ class ChannelService:
             }
 
             if last_data:
-                last_data_time = float(last_data.decode('utf-8'))
+                last_data_time = float(last_data)
                 data_age = time.time() - last_data_time
                 details["last_data_age"] = data_age
 
@@ -598,7 +598,7 @@ class ChannelService:
     def _update_stream_stats_in_db(stream_id, **stats):
         """Update stream stats in database"""
         from django.db import connection
-        
+
         try:
             from apps.channels.models import Stream
             from django.utils import timezone
@@ -624,7 +624,7 @@ class ChannelService:
         except Exception as e:
             logger.error(f"Error updating stream stats in database for stream {stream_id}: {e}")
             return False
-            
+
         finally:
             # Always close database connection after update
             try:
@@ -645,7 +645,7 @@ class ChannelService:
         metadata_key = RedisKeys.channel_metadata(channel_id)
 
         # First check if the key exists and what type it is
-        key_type = proxy_server.redis_client.type(metadata_key).decode('utf-8')
+        key_type = proxy_server.redis_client.type(metadata_key)
         logger.debug(f"Redis key {metadata_key} is of type: {key_type}")
 
         # Build metadata update dict
diff --git a/apps/proxy/ts_proxy/stream_manager.py b/apps/proxy/ts_proxy/stream_manager.py
index 99ae8027..73118768 100644
--- a/apps/proxy/ts_proxy/stream_manager.py
+++ b/apps/proxy/ts_proxy/stream_manager.py
@@ -89,7 +89,7 @@ class StreamManager:
                     # Try to get stream_id specifically
                     stream_id_bytes = buffer.redis_client.hget(metadata_key, "stream_id")
                     if stream_id_bytes:
-                        self.current_stream_id = int(stream_id_bytes.decode('utf-8'))
+                        self.current_stream_id = int(stream_id_bytes)
                         self.tried_stream_ids.add(self.current_stream_id)
                         logger.info(f"Loaded stream ID {self.current_stream_id} from Redis for channel {buffer.channel_id}")
                     else:
@@ -362,7 +362,7 @@ class StreamManager:
                     current_owner = self.buffer.redis_client.get(owner_key)
 
                     # Use the worker_id that was passed in during initialization
-                    if current_owner and self.worker_id and current_owner.decode('utf-8') == self.worker_id:
+                    if current_owner and self.worker_id and current_owner == self.worker_id:
                         # Determine the appropriate error message based on retry failures
                         if self.tried_stream_ids and len(self.tried_stream_ids) > 0:
                             error_message = f"All {len(self.tried_stream_ids)} stream options failed"
@@ -948,10 +948,10 @@ class StreamManager:
                         logger.debug(f"Updated m3u profile for channel {self.channel_id} to use profile from stream {stream_id}")
                     else:
                         logger.warning(f"Failed to update stream profile for channel {self.channel_id}")
-                    
+
             except Exception as e:
                 logger.error(f"Error updating stream profile for channel {self.channel_id}: {e}")
-                
+
             finally:
                 # Always close database connection after profile update
                 try:
@@ -1348,9 +1348,9 @@ class StreamManager:
                     current_state = None
                     try:
                         metadata = redis_client.hgetall(metadata_key)
-                        state_field = ChannelMetadataField.STATE.encode('utf-8')
+                        state_field = ChannelMetadataField.STATE
                         if metadata and state_field in metadata:
-                            current_state = metadata[state_field].decode('utf-8')
+                            current_state = metadata[state_field]
                     except Exception as e:
                         logger.error(f"Error checking current state: {e}")
 
@@ -1555,4 +1555,4 @@ class StreamManager:
         """Safely reset the URL switching state if it gets stuck"""
         self.url_switching = False
         self.url_switch_start_time = 0
-        logger.info(f"Reset URL switching state for channel {self.channel_id}")
\ No newline at end of file
+        logger.info(f"Reset URL switching state for channel {self.channel_id}")
diff --git a/apps/proxy/ts_proxy/url_utils.py b/apps/proxy/ts_proxy/url_utils.py
index db53cc74..0bfde312 100644
--- a/apps/proxy/ts_proxy/url_utils.py
+++ b/apps/proxy/ts_proxy/url_utils.py
@@ -215,9 +215,9 @@ def get_stream_info_for_switch(channel_id: str, target_stream_id: Optional[int]
                     existing_stream_id = redis_client.get(f"channel_stream:{channel.id}")
                     if existing_stream_id:
                         # Decode bytes to string/int for proper Redis key lookup
-                        existing_stream_id = existing_stream_id.decode('utf-8')
+                        existing_stream_id = existing_stream_id
                         existing_profile_id = redis_client.get(f"stream_profile:{existing_stream_id}")
-                        if existing_profile_id and int(existing_profile_id.decode('utf-8')) == profile.id:
+                        if existing_profile_id and int(existing_profile_id) == profile.id:
                             channel_using_profile = True
                             logger.debug(f"Channel {channel.id} already using profile {profile.id}")
 
@@ -353,9 +353,9 @@ def get_alternate_streams(channel_id: str, current_stream_id: Optional[int] = No
                         existing_stream_id = redis_client.get(f"channel_stream:{channel.id}")
                         if existing_stream_id:
                             # Decode bytes to string/int for proper Redis key lookup
-                            existing_stream_id = existing_stream_id.decode('utf-8')
+                            existing_stream_id = existing_stream_id
                             existing_profile_id = redis_client.get(f"stream_profile:{existing_stream_id}")
-                            if existing_profile_id and int(existing_profile_id.decode('utf-8')) == profile.id:
+                            if existing_profile_id and int(existing_profile_id) == profile.id:
                                 channel_using_profile = True
                                 logger.debug(f"Channel {channel.id} already using profile {profile.id}")
 
diff --git a/apps/proxy/vod_proxy/multi_worker_connection_manager.py b/apps/proxy/vod_proxy/multi_worker_connection_manager.py
index fefc8739..e1fe4c4b 100644
--- a/apps/proxy/vod_proxy/multi_worker_connection_manager.py
+++ b/apps/proxy/vod_proxy/multi_worker_connection_manager.py
@@ -219,7 +219,7 @@ class RedisBackedVODConnection:
 
             # Convert bytes keys/values to strings if needed
             if isinstance(list(data.keys())[0], bytes):
-                data = {k.decode('utf-8'): v.decode('utf-8') for k, v in data.items()}
+                data = {k: v for k, v in data.items()}
 
             return SerializableConnectionState.from_dict(data)
         except Exception as e:
@@ -1115,14 +1115,14 @@ class MultiWorkerVODConnectionManager:
 
                         # Convert bytes to strings if needed
                         if isinstance(list(data.keys())[0], bytes):
-                            data = {k.decode('utf-8'): v.decode('utf-8') for k, v in data.items()}
+                            data = {k: v for k, v in data.items()}
 
                         last_activity = float(data.get('last_activity', 0))
                         active_streams = int(data.get('active_streams', 0))
 
                         # Clean up if stale and no active streams
                         if (current_time - last_activity > max_age_seconds) and active_streams == 0:
-                            session_id = key.decode('utf-8').replace('vod_persistent_connection:', '')
+                            session_id = key.replace('vod_persistent_connection:', '')
                             logger.info(f"Cleaning up stale connection: {session_id}")
 
                             # Clean up connection and related keys
@@ -1219,7 +1219,7 @@ class MultiWorkerVODConnectionManager:
             if connection_data:
                 # Convert bytes to strings if needed
                 if isinstance(list(connection_data.keys())[0], bytes):
-                    connection_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in connection_data.items()}
+                    connection_data = {k: v for k, v in connection_data.items()}
 
                 profile_id = connection_data.get('m3u_profile_id')
                 if profile_id:
@@ -1279,7 +1279,7 @@ class MultiWorkerVODConnectionManager:
 
                         # Convert bytes keys/values to strings if needed
                         if isinstance(list(connection_data.keys())[0], bytes):
-                            connection_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in connection_data.items()}
+                            connection_data = {k: v for k, v in connection_data.items()}
 
                         # Check if content matches (using consolidated data)
                         stored_content_type = connection_data.get('content_obj_type', '')
@@ -1289,7 +1289,7 @@ class MultiWorkerVODConnectionManager:
                             continue
 
                         # Extract session ID
-                        session_id = key.decode('utf-8').replace('vod_persistent_connection:', '')
+                        session_id = key.replace('vod_persistent_connection:', '')
 
                         # Check if Redis-backed connection exists and has no active streams
                         redis_connection = RedisBackedVODConnection(session_id, self.redis_client)
@@ -1367,4 +1367,4 @@ class MultiWorkerVODConnectionManager:
             return redis_connection.get_session_metadata()
         except Exception as e:
             logger.error(f"Error getting session info for {session_id}: {e}")
-            return None
\ No newline at end of file
+            return None
diff --git a/apps/proxy/vod_proxy/views.py b/apps/proxy/vod_proxy/views.py
index 00ed8a10..12e1d071 100644
--- a/apps/proxy/vod_proxy/views.py
+++ b/apps/proxy/vod_proxy/views.py
@@ -550,14 +550,7 @@ class VODStreamView(View):
                 connection_data = redis_client.hgetall(persistent_connection_key)
 
                 if connection_data:
-                    # Decode Redis hash data
-                    decoded_data = {}
-                    for k, v in connection_data.items():
-                        k_str = k.decode('utf-8') if isinstance(k, bytes) else k
-                        v_str = v.decode('utf-8') if isinstance(v, bytes) else v
-                        decoded_data[k_str] = v_str
-
-                    existing_profile_id = decoded_data.get('m3u_profile_id')
+                    existing_profile_id = connection_data.get('m3u_profile_id')
                     if existing_profile_id:
                         try:
                             existing_profile = M3UAccountProfile.objects.get(
@@ -770,19 +763,16 @@ class VODStatsView(View):
 
                 for key in keys:
                     try:
-                        key_str = key.decode('utf-8') if isinstance(key, bytes) else key
                         connection_data = redis_client.hgetall(key)
 
                         if connection_data:
                             # Extract session ID from key
-                            session_id = key_str.replace('vod_persistent_connection:', '')
+                            session_id = key.replace('vod_persistent_connection:', '')
 
                             # Decode Redis hash data
                             combined_data = {}
                             for k, v in connection_data.items():
-                                k_str = k.decode('utf-8') if isinstance(k, bytes) else k
-                                v_str = v.decode('utf-8') if isinstance(v, bytes) else v
-                                combined_data[k_str] = v_str
+                                combined_data[k] = v
 
                             # Get content info from the connection data (using correct field names)
                             content_type = combined_data.get('content_obj_type', 'unknown')
diff --git a/core/redis_pubsub.py b/core/redis_pubsub.py
index 5d0032b0..b1f48b1f 100644
--- a/core/redis_pubsub.py
+++ b/core/redis_pubsub.py
@@ -201,10 +201,6 @@ class RedisPubSubManager:
 
                     channel = message.get('channel')
                     if channel:
-                        # Decode binary channel name if needed
-                        if isinstance(channel, bytes):
-                            channel = channel.decode('utf-8')
-
                         # Find and call the appropriate handler
                         handler = self.message_handlers.get(channel)
                         if handler:
diff --git a/core/tasks.py b/core/tasks.py
index f757613b..257d8660 100644
--- a/core/tasks.py
+++ b/core/tasks.py
@@ -404,7 +404,7 @@ def fetch_channel_stats():
         while True:
             cursor, keys = redis_client.scan(cursor, match=channel_pattern)
             for key in keys:
-                channel_id_match = re.search(r"ts_proxy:channel:(.*):metadata", key.decode('utf-8'))
+                channel_id_match = re.search(r"ts_proxy:channel:(.*):metadata", key)
                 if channel_id_match:
                     ch_id = channel_id_match.group(1)
                     channel_info = ChannelStatus.get_basic_channel_info(ch_id)
diff --git a/core/utils.py b/core/utils.py
index 36ac5fef..9cc4c26f 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -42,101 +42,116 @@ def natural_sort_key(text):
     return [convert(c) for c in re.split('([0-9]+)', text)]
 
 class RedisClient:
+    _initialized = False
     _client = None
+    _buffer = None
     _pubsub_client = None
 
+    @classmethod
+    def _init_client(cls, decode_responses=True, max_retries=5, retry_interval=1):
+        retry_count = 0
+        while retry_count < max_retries:
+            try:
+                # Get connection parameters from settings or environment
+                redis_host = os.environ.get("REDIS_HOST", getattr(settings, 'REDIS_HOST', 'localhost'))
+                redis_port = int(os.environ.get("REDIS_PORT", getattr(settings, 'REDIS_PORT', 6379)))
+                redis_db = int(os.environ.get("REDIS_DB", getattr(settings, 'REDIS_DB', 0)))
+
+                # Use standardized settings
+                socket_timeout = getattr(settings, 'REDIS_SOCKET_TIMEOUT', 5)
+                socket_connect_timeout = getattr(settings, 'REDIS_SOCKET_CONNECT_TIMEOUT', 5)
+                health_check_interval = getattr(settings, 'REDIS_HEALTH_CHECK_INTERVAL', 30)
+                socket_keepalive = getattr(settings, 'REDIS_SOCKET_KEEPALIVE', True)
+                retry_on_timeout = getattr(settings, 'REDIS_RETRY_ON_TIMEOUT', True)
+
+                # Create Redis client with better defaults
+                client = redis.Redis(
+                    host=redis_host,
+                    port=redis_port,
+                    db=redis_db,
+                    socket_timeout=socket_timeout,
+                    socket_connect_timeout=socket_connect_timeout,
+                    socket_keepalive=socket_keepalive,
+                    health_check_interval=health_check_interval,
+                    retry_on_timeout=retry_on_timeout,
+                    decode_responses=decode_responses
+                )
+
+                # Validate connection with ping
+                client.ping()
+                if cls._initialized is False:
+                    client.flushdb()
+                    cls._initialized = True
+
+                # Disable persistence on first connection - improves performance
+                # Only try to disable if not in a read-only environment
+                try:
+                    client.config_set('save', '')  # Disable RDB snapshots
+                    client.config_set('appendonly', 'no')  # Disable AOF logging
+
+                    # Set optimal memory settings with environment variable support
+                    # Get max memory from environment or use a larger default (512MB instead of 256MB)
+                    #max_memory = os.environ.get('REDIS_MAX_MEMORY', '512mb')
+                    #eviction_policy = os.environ.get('REDIS_EVICTION_POLICY', 'allkeys-lru')
+
+                    # Apply memory settings
+                    #client.config_set('maxmemory-policy', eviction_policy)
+                    #client.config_set('maxmemory', max_memory)
+
+                    #logger.info(f"Redis configured with maxmemory={max_memory}, policy={eviction_policy}")
+
+                    # Disable protected mode when in debug mode
+                    if os.environ.get('DISPATCHARR_DEBUG', '').lower() == 'true':
+                        client.config_set('protected-mode', 'no')  # Disable protected mode in debug
+                        logger.warning("Redis protected mode disabled for debug environment")
+
+                    logger.trace("Redis persistence disabled for better performance")
+                except redis.exceptions.ResponseError as e:
+                    # Improve error handling for Redis configuration errors
+                    if "OOM" in str(e):
+                        logger.error(f"Redis OOM during configuration: {e}")
+                        # Try to increase maxmemory as an emergency measure
+                        try:
+                            client.config_set('maxmemory', '768mb')
+                            logger.warning("Applied emergency Redis memory increase to 768MB")
+                        except:
+                            pass
+                    else:
+                        logger.error(f"Redis configuration error: {e}")
+
+                logger.info(f"Connected to Redis at {redis_host}:{redis_port}/{redis_db}")
+                break
+
+            except (ConnectionError, TimeoutError) as e:
+                retry_count += 1
+                if retry_count >= max_retries:
+                    logger.error(f"Failed to connect to Redis after {max_retries} attempts: {e}")
+                    return None
+                else:
+                    # Use exponential backoff for retries
+                    wait_time = retry_interval * (2 ** (retry_count - 1))
+                    logger.warning(f"Redis connection failed. Retrying in {wait_time}s... ({retry_count}/{max_retries})")
+                    time.sleep(wait_time)
+
+            except Exception as e:
+                logger.error(f"Unexpected error connecting to Redis: {e}")
+                return None
+
+        return client
+
     @classmethod
     def get_client(cls, max_retries=5, retry_interval=1):
         if cls._client is None:
-            retry_count = 0
-            while retry_count < max_retries:
-                try:
-                    # Get connection parameters from settings or environment
-                    redis_host = os.environ.get("REDIS_HOST", getattr(settings, 'REDIS_HOST', 'localhost'))
-                    redis_port = int(os.environ.get("REDIS_PORT", getattr(settings, 'REDIS_PORT', 6379)))
-                    redis_db = int(os.environ.get("REDIS_DB", getattr(settings, 'REDIS_DB', 0)))
-
-                    # Use standardized settings
-                    socket_timeout = getattr(settings, 'REDIS_SOCKET_TIMEOUT', 5)
-                    socket_connect_timeout = getattr(settings, 'REDIS_SOCKET_CONNECT_TIMEOUT', 5)
-                    health_check_interval = getattr(settings, 'REDIS_HEALTH_CHECK_INTERVAL', 30)
-                    socket_keepalive = getattr(settings, 'REDIS_SOCKET_KEEPALIVE', True)
-                    retry_on_timeout = getattr(settings, 'REDIS_RETRY_ON_TIMEOUT', True)
-
-                    # Create Redis client with better defaults
-                    client = redis.Redis(
-                        host=redis_host,
-                        port=redis_port,
-                        db=redis_db,
-                        socket_timeout=socket_timeout,
-                        socket_connect_timeout=socket_connect_timeout,
-                        socket_keepalive=socket_keepalive,
-                        health_check_interval=health_check_interval,
-                        retry_on_timeout=retry_on_timeout
-                    )
-
-                    # Validate connection with ping
-                    client.ping()
-                    client.flushdb()
-
-                    # Disable persistence on first connection - improves performance
-                    # Only try to disable if not in a read-only environment
-                    try:
-                        client.config_set('save', '')  # Disable RDB snapshots
-                        client.config_set('appendonly', 'no')  # Disable AOF logging
-
-                        # Set optimal memory settings with environment variable support
-                        # Get max memory from environment or use a larger default (512MB instead of 256MB)
-                        #max_memory = os.environ.get('REDIS_MAX_MEMORY', '512mb')
-                        #eviction_policy = os.environ.get('REDIS_EVICTION_POLICY', 'allkeys-lru')
-
-                        # Apply memory settings
-                        #client.config_set('maxmemory-policy', eviction_policy)
-                        #client.config_set('maxmemory', max_memory)
-
-                        #logger.info(f"Redis configured with maxmemory={max_memory}, policy={eviction_policy}")
-
-                        # Disable protected mode when in debug mode
-                        if os.environ.get('DISPATCHARR_DEBUG', '').lower() == 'true':
-                            client.config_set('protected-mode', 'no')  # Disable protected mode in debug
-                            logger.warning("Redis protected mode disabled for debug environment")
-
-                        logger.trace("Redis persistence disabled for better performance")
-                    except redis.exceptions.ResponseError as e:
-                        # Improve error handling for Redis configuration errors
-                        if "OOM" in str(e):
-                            logger.error(f"Redis OOM during configuration: {e}")
-                            # Try to increase maxmemory as an emergency measure
-                            try:
-                                client.config_set('maxmemory', '768mb')
-                                logger.warning("Applied emergency Redis memory increase to 768MB")
-                            except:
-                                pass
-                        else:
-                            logger.error(f"Redis configuration error: {e}")
-
-                    logger.info(f"Connected to Redis at {redis_host}:{redis_port}/{redis_db}")
-
-                    cls._client = client
-                    break
-
-                except (ConnectionError, TimeoutError) as e:
-                    retry_count += 1
-                    if retry_count >= max_retries:
-                        logger.error(f"Failed to connect to Redis after {max_retries} attempts: {e}")
-                        return None
-                    else:
-                        # Use exponential backoff for retries
-                        wait_time = retry_interval * (2 ** (retry_count - 1))
-                        logger.warning(f"Redis connection failed. Retrying in {wait_time}s... ({retry_count}/{max_retries})")
-                        time.sleep(wait_time)
-
-                except Exception as e:
-                    logger.error(f"Unexpected error connecting to Redis: {e}")
-                    return None
-
+            cls._client = cls._init_client(decode_responses=True, max_retries=max_retries, retry_interval=retry_interval)
         return cls._client
 
+    @classmethod
+    def get_buffer(cls, max_retries=5, retry_interval=1):
+        """Get Redis client optimized for binary data (no decoding)"""
+        if cls._buffer is None:
+            cls._buffer = cls._init_client(decode_responses=False, max_retries=max_retries, retry_interval=retry_interval)
+        return cls._buffer
+
     @classmethod
     def get_pubsub_client(cls, max_retries=5, retry_interval=1):
         """Get Redis client optimized for PubSub operations"""
@@ -165,7 +180,8 @@ class RedisClient:
                         socket_connect_timeout=socket_connect_timeout,
                         socket_keepalive=socket_keepalive,
                         health_check_interval=health_check_interval,
-                        retry_on_timeout=retry_on_timeout
+                        retry_on_timeout=retry_on_timeout,
+                        decode_responses=True
                     )
 
                     # Validate connection with ping
diff --git a/dispatcharr/persistent_lock.py b/dispatcharr/persistent_lock.py
index 360c9b5d..fe62be43 100644
--- a/dispatcharr/persistent_lock.py
+++ b/dispatcharr/persistent_lock.py
@@ -48,7 +48,7 @@ class PersistentLock:
         Returns True if the expiration was successfully extended.
         """
         current_value = self.redis_client.get(self.lock_key)
-        if current_value and current_value.decode("utf-8") == self.lock_token:
+        if current_value and current_value == self.lock_token:
             self.redis_client.expire(self.lock_key, self.lock_timeout)
             self.has_lock = False
             return True

From 16183329623e163ec01145b721e2197571c12097 Mon Sep 17 00:00:00 2001
From: dekzter <kappa118@gmail.com>
Date: Wed, 12 Nov 2025 17:52:11 -0500
Subject: [PATCH 002/172] byte to string fix

---
 apps/proxy/vod_proxy/connection_manager.py | 55 ++++++++++------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/apps/proxy/vod_proxy/connection_manager.py b/apps/proxy/vod_proxy/connection_manager.py
index dea5759b..00ca77aa 100644
--- a/apps/proxy/vod_proxy/connection_manager.py
+++ b/apps/proxy/vod_proxy/connection_manager.py
@@ -329,15 +329,15 @@ class VODConnectionManager:
                             continue
 
                         # Extract session info
-                        stored_content_type = session_data.get(b'content_type', b'').decode('utf-8')
-                        stored_content_uuid = session_data.get(b'content_uuid', b'').decode('utf-8')
+                        stored_content_type = session_data.get('content_type', '')
+                        stored_content_uuid = session_data.get('content_uuid', '')
 
                         # Check if content matches
                         if stored_content_type != content_type or stored_content_uuid != content_uuid:
                             continue
 
                         # Extract session ID from key
-                        session_id = key.decode('utf-8').replace('vod_session:', '')
+                        session_id = key.replace('vod_session:', '')
 
                         # Check if session has an active persistent connection
                         persistent_conn = self._persistent_connections.get(session_id)
@@ -351,13 +351,13 @@ class VODConnectionManager:
                             continue
 
                         # Get stored client info for comparison
-                        stored_client_ip = session_data.get(b'client_ip', b'').decode('utf-8')
-                        stored_user_agent = session_data.get(b'user_agent', b'').decode('utf-8')
+                        stored_client_ip = session_data.get('client_ip', '')
+                        stored_user_agent = session_data.get('user_agent', '')
 
                         # Check timeshift parameters match
-                        stored_utc_start = session_data.get(b'utc_start', b'').decode('utf-8')
-                        stored_utc_end = session_data.get(b'utc_end', b'').decode('utf-8')
-                        stored_offset = session_data.get(b'offset', b'').decode('utf-8')
+                        stored_utc_start = session_data.get('utc_start', '')
+                        stored_utc_end = session_data.get('utc_end', '')
+                        stored_offset = session_data.get('offset', '')
 
                         current_utc_start = utc_start or ""
                         current_utc_end = utc_end or ""
@@ -394,7 +394,7 @@ class VODConnectionManager:
                                 'session_id': session_id,
                                 'score': score,
                                 'reasons': match_reasons,
-                                'last_activity': float(session_data.get(b'last_activity', b'0').decode('utf-8'))
+                                'last_activity': float(session_data.get('last_activity', '0'))
                             })
 
                     except Exception as e:
@@ -536,7 +536,7 @@ class VODConnectionManager:
                 # Get current bytes and add to it
                 current_bytes = self.redis_client.hget(connection_key, "bytes_sent")
                 if current_bytes:
-                    total_bytes = int(current_bytes.decode('utf-8')) + bytes_sent
+                    total_bytes = int(current_bytes) + bytes_sent
                 else:
                     total_bytes = bytes_sent
                 update_data["bytes_sent"] = str(total_bytes)
@@ -571,7 +571,7 @@ class VODConnectionManager:
             profile_id = None
             if b"m3u_profile_id" in connection_data:
                 try:
-                    profile_id = int(connection_data[b"m3u_profile_id"].decode('utf-8'))
+                    profile_id = int(connection_data["m3u_profile_id"])
                 except ValueError:
                     pass
 
@@ -617,16 +617,14 @@ class VODConnectionManager:
             # Convert bytes to strings and parse numbers
             info = {}
             for key, value in connection_data.items():
-                key_str = key.decode('utf-8')
-                value_str = value.decode('utf-8')
 
                 # Parse numeric fields
-                if key_str in ['connected_at', 'last_activity']:
-                    info[key_str] = float(value_str)
-                elif key_str in ['bytes_sent', 'position_seconds', 'm3u_profile_id']:
-                    info[key_str] = int(value_str)
+                if key in ['connected_at', 'last_activity']:
+                    info[key] = float(value)
+                elif key in ['bytes_sent', 'position_seconds', 'm3u_profile_id']:
+                    info[key] = int(valuvaluee_str)
                 else:
-                    info[key_str] = value_str
+                    info[key] = value
 
             return info
 
@@ -676,14 +674,13 @@ class VODConnectionManager:
 
                 for key in keys:
                     try:
-                        key_str = key.decode('utf-8')
                         last_activity = self.redis_client.hget(key, "last_activity")
 
                         if last_activity:
-                            last_activity_time = float(last_activity.decode('utf-8'))
+                            last_activity_time = float(last_activity)
                             if current_time - last_activity_time > max_age_seconds:
                                 # Extract info for cleanup
-                                parts = key_str.split(':')
+                                parts = key.split(':')
                                 if len(parts) >= 5:
                                     content_type = parts[2]
                                     content_uuid = parts[3]
@@ -1342,9 +1339,9 @@ class VODConnectionManager:
                     session_data = self.redis_client.hgetall(session_key)
                     if session_data:
                         # Get session details for connection cleanup
-                        content_type = session_data.get(b'content_type', b'').decode('utf-8')
-                        content_uuid = session_data.get(b'content_uuid', b'').decode('utf-8')
-                        profile_id = session_data.get(b'profile_id')
+                        content_type = session_data.get('content_type', '')
+                        content_uuid = session_data.get('content_uuid', '')
+                        profile_id = session_data.get('profile_id')
 
                         # Generate client_id from session_id (matches what's used during streaming)
                         client_id = session_id
@@ -1355,12 +1352,12 @@ class VODConnectionManager:
                             self.remove_connection(content_type, content_uuid, client_id)
 
                         # Remove from profile connections if counted (additional safety check)
-                        if session_data.get(b'connection_counted') == b'True' and profile_id:
-                            profile_key = self._get_profile_connections_key(int(profile_id.decode('utf-8')))
+                        if session_data.get('connection_counted') == 'True' and profile_id:
+                            profile_key = self._get_profile_connections_key(int(profile_id))
                             current_count = int(self.redis_client.get(profile_key) or 0)
                             if current_count > 0:
                                 self.redis_client.decr(profile_key)
-                                logger.info(f"[{session_id}] Decremented profile {profile_id.decode('utf-8')} connections")
+                                logger.info(f"[{session_id}] Decremented profile {profile_id} connections")
 
                     # Remove session tracking key
                     self.redis_client.delete(session_key)
@@ -1380,7 +1377,7 @@ class VODConnectionManager:
 
                         if session_related_keys:
                             # Filter out keys we already deleted
-                            remaining_keys = [k for k in session_related_keys if k.decode('utf-8') != session_key]
+                            remaining_keys = [k for k in session_related_keys if k != session_key]
                             if remaining_keys:
                                 self.redis_client.delete(*remaining_keys)
                                 logger.info(f"[{session_id}] Cleaned up {len(remaining_keys)} additional session-related keys")
@@ -1410,7 +1407,7 @@ class VODConnectionManager:
                 if self.redis_client:
                     session_data = self.redis_client.hgetall(session_key)
                     if session_data:
-                        created_at = float(session_data.get(b'created_at', b'0').decode('utf-8'))
+                        created_at = float(session_data.get('created_at', '0'))
                         if current_time - created_at > max_age_seconds:
                             logger.info(f"[{session_id}] Session older than {max_age_seconds}s")
                             stale_sessions.append(session_id)

From cd35e671e56a29e57e256351010147a4c8145c88 Mon Sep 17 00:00:00 2001
From: dekzter <kappa118@gmail.com>
Date: Wed, 12 Nov 2025 17:52:48 -0500
Subject: [PATCH 003/172] byte to string fix

---
 apps/proxy/ts_proxy/stream_generator.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/proxy/ts_proxy/stream_generator.py b/apps/proxy/ts_proxy/stream_generator.py
index 368691b8..25122d74 100644
--- a/apps/proxy/ts_proxy/stream_generator.py
+++ b/apps/proxy/ts_proxy/stream_generator.py
@@ -108,13 +108,13 @@ class StreamGenerator:
                 metadata_key = RedisKeys.channel_metadata(self.channel_id)
                 metadata = proxy_server.redis_client.hgetall(metadata_key)
 
-                if metadata and b'state' in metadata:
-                    state = metadata[b'state'].decode('utf-8')
+                if metadata and 'state' in metadata:
+                    state = metadata['state']
                     if state in ['waiting_for_clients', 'active']:
                         logger.info(f"[{self.client_id}] Channel {self.channel_id} now ready (state={state})")
                         return True
                     elif state in ['error', 'stopped', 'stopping']:  # Added 'stopping' to error states
-                        error_message = metadata.get(b'error_message', b'Unknown error').decode('utf-8')
+                        error_message = metadata.get('error_message', 'Unknown error')
                         logger.error(f"[{self.client_id}] Channel {self.channel_id} in error state: {state}, message: {error_message}")
                         # Send error packet before giving up
                         yield create_ts_packet('error', f"Error: {error_message}")
@@ -122,9 +122,9 @@ class StreamGenerator:
                     else:
                         # Improved logging to track initialization progress
                         init_time = "unknown"
-                        if b'init_time' in metadata:
+                        if 'init_time' in metadata:
                             try:
-                                init_time_float = float(metadata[b'init_time'].decode('utf-8'))
+                                init_time_float = float(metadata['init_time'])
                                 init_duration = time.time() - init_time_float
                                 init_time = f"{init_duration:.1f}s ago"
                             except:
@@ -267,8 +267,8 @@ class StreamGenerator:
             # Also check channel state in metadata
             metadata_key = RedisKeys.channel_metadata(self.channel_id)
             metadata = proxy_server.redis_client.hgetall(metadata_key)
-            if metadata and b'state' in metadata:
-                state = metadata[b'state'].decode('utf-8')
+            if metadata and 'state' in metadata:
+                state = metadata['state']
                 if state in ['error', 'stopped', 'stopping']:
                     logger.info(f"[{self.client_id}] Channel in {state} state, terminating stream")
                     return False
@@ -397,8 +397,6 @@ class StreamGenerator:
                 if metadata:
                     stream_id_bytes = proxy_server.redis_client.hget(metadata_key, ChannelMetadataField.STREAM_ID)
                     if stream_id_bytes:
-                        stream_id = int(stream_id_bytes.decode('utf-8'))
-
                         # Check if we're the last client
                         if self.channel_id in proxy_server.client_managers:
                             client_count = proxy_server.client_managers[self.channel_id].get_total_client_count()
@@ -459,4 +457,4 @@ def create_stream_generator(channel_id, client_id, client_ip, client_user_agent,
     Returns a function that can be passed to StreamingHttpResponse.
     """
     generator = StreamGenerator(channel_id, client_id, client_ip, client_user_agent, channel_initializing)
-    return generator.generate
\ No newline at end of file
+    return generator.generate

From 2ca2a51e2e63dcdc8c8ab7942472caaf2b9f4a0d Mon Sep 17 00:00:00 2001
From: dekzter <kappa118@gmail.com>
Date: Sat, 6 Dec 2025 09:36:50 -0500
Subject: [PATCH 004/172] reverted fix so only updated values are modified

---
 apps/proxy/ts_proxy/channel_status.py | 34 +++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/apps/proxy/ts_proxy/channel_status.py b/apps/proxy/ts_proxy/channel_status.py
index 015d5ca2..4ac8f63f 100644
--- a/apps/proxy/ts_proxy/channel_status.py
+++ b/apps/proxy/ts_proxy/channel_status.py
@@ -434,13 +434,33 @@ class ChannelStatus:
                     logger.warning(f"Invalid m3u_profile_id format in Redis: {m3u_profile_id}")
 
             # Add stream info to basic info as well
-            info['video_codec'] = metadata.get(ChannelMetadataField.VIDEO_CODEC)
-            info['resolution'] = metadata.get(ChannelMetadataField.RESOLUTION)
-            info['source_fps'] = metadata.get(ChannelMetadataField.SOURCE_FPS)
-            info['ffmpeg_speed'] = metadata.get(ChannelMetadataField.FFMPEG_SPEED)
-            info['audio_codec'] = metadata.get(ChannelMetadataField.AUDIO_CODEC)
-            info['audio_channels'] = metadata.get(ChannelMetadataField.AUDIO_CHANNELS)
-            info['stream_type'] = metadata.get(ChannelMetadataField.STREAM_TYPE)
+            video_codec = metadata.get(ChannelMetadataField.VIDEO_CODEC)
+            if video_codec:
+                info['video_codec'] = video_codec
+
+            resolution = metadata.get(ChannelMetadataField.RESOLUTION)
+            if resolution:
+                info['resolution'] = resolution
+
+            source_fps = metadata.get(ChannelMetadataField.SOURCE_FPS)
+            if source_fps:
+                info['source_fps'] = float(source_fps)
+
+            ffmpeg_speed = metadata.get(ChannelMetadataField.FFMPEG_SPEED)
+            if ffmpeg_speed:
+                info['ffmpeg_speed'] = float(ffmpeg_speed)
+
+            audio_codec = metadata.get(ChannelMetadataField.AUDIO_CODEC)
+            if audio_codec:
+                info['audio_codec'] = audio_codec
+
+            audio_channels = metadata.get(ChannelMetadataField.AUDIO_CHANNELS)
+            if audio_channels:
+                info['audio_channels'] = audio_channels
+
+            stream_type = metadata.get(ChannelMetadataField.STREAM_TYPE)
+            if stream_type:
+                info['stream_type'] = stream_type
 
             return info
         except Exception as e:

From dba70b3c585e0f2dce6cdcf157045992e617b236 Mon Sep 17 00:00:00 2001
From: dekzter <kappa118@gmail.com>
Date: Tue, 27 Jan 2026 15:23:07 -0500
Subject: [PATCH 005/172] outstanding commits, may revisit later

---
 .../migrations/0004_user_stream_priority.py   |  18 +++
 apps/channels/models.py                       | 153 +++++++++++++++++-
 apps/channels/tasks.py                        |   5 +-
 apps/proxy/ts_proxy/client_manager.py         |  16 +-
 apps/proxy/ts_proxy/server.py                 |   6 -
 apps/proxy/ts_proxy/utils.py                  |   4 +-
 apps/proxy/ts_proxy/views.py                  |  26 +--
 docker/init/02-postgres.sh                    |   2 -
 docker/init/03-init-dispatcharr.sh            |   2 +-
 docker/init/99-init-dev.sh                    |  50 +++---
 docker/uwsgi.dev.ini                          |   4 +-
 frontend/prettier.config.js                   |   4 +-
 frontend/src/components/forms/User.jsx        |  40 +++--
 frontend/src/pages/Users.jsx                  |  35 ----
 14 files changed, 242 insertions(+), 123 deletions(-)
 create mode 100644 apps/accounts/migrations/0004_user_stream_priority.py

diff --git a/apps/accounts/migrations/0004_user_stream_priority.py b/apps/accounts/migrations/0004_user_stream_priority.py
new file mode 100644
index 00000000..35c8bbae
--- /dev/null
+++ b/apps/accounts/migrations/0004_user_stream_priority.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-10-21 19:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0003_alter_user_custom_properties'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='stream_priority',
+            field=models.IntegerField(default=0, help_text='Priority level for streaming tasks. Lower values indicate higher priority.'),
+        ),
+    ]
diff --git a/apps/channels/models.py b/apps/channels/models.py
index 3dfb392b..7282d025 100644
--- a/apps/channels/models.py
+++ b/apps/channels/models.py
@@ -166,7 +166,7 @@ class Stream(models.Model):
 
         return stream_profile
 
-    def get_stream(self):
+    def get_stream(self, requester=None):
         """
         Finds an available stream for the requested channel and returns the selected stream and profile.
         """
@@ -349,7 +349,145 @@ class Channel(models.Model):
 
         return stream_profile
 
-    def get_stream(self):
+    def _pick_channel_to_preempt(
+        self,
+        profile_id,
+        requester_level,
+        redis_client,
+        exclude_channel_ids=None,
+        cooldown_seconds=30,
+    ):
+        """
+        Pick the lowest-impact channel to terminate on the given profile.
+        Returns: Optional[int] channel_id to preempt
+        """
+        exclude_channel_ids = set(exclude_channel_ids or [])
+        candidates = []
+
+        # 1) Try to get active channel IDs for this profile from an index set if available
+        ch_set_key = f"ts_proxy:profile:{profile_id}:channels"
+        try:
+            ch_ids = { (int(x) if not isinstance(x, int) else x) for x in (redis_client.smembers(ch_set_key) or set()) }
+        except Exception:
+            ch_ids = set()
+
+        logger.debug("Candidate channels for preemption:")
+        logger.debug(ch_ids)
+
+        # 2) Fallback: scan metadata keys and filter by m3u_profile == profile_id
+        if not ch_ids:
+            cursor = 0
+            pattern = "ts_proxy:channel:*:metadata"
+            while True:
+                cursor, keys = redis_client.scan(cursor=cursor, match=pattern, count=500)
+                if keys:
+                    # Prefer HGET m3u_profile if metadata is a hash
+                    pipe = redis_client.pipeline()
+                    for k in keys:
+                        pipe.hget(k, "m3u_profile")
+                    prof_vals = pipe.execute()
+                    for k, prof_val in zip(keys, prof_vals):
+                        try:
+                            pid = int(prof_val) if prof_val is not None else None
+                        except Exception:
+                            pid = None
+
+                        if pid == profile_id:
+                            parts = k.split(":")  # ts_proxy:channel:{id}:metadata
+                            if len(parts) >= 4:
+                                try:
+                                    ch_ids.add(int(parts[2]))
+                                except Exception:
+                                    pass
+                if cursor == 0:
+                    break
+
+        logger.debug("Candidate channels for preemption:")
+        logger.debug(ch_ids)
+
+        if not ch_ids:
+            return None
+
+        # 3) Score candidates
+        for ch_id in ch_ids:
+            if ch_id in exclude_channel_ids:
+                continue
+
+            # Skip if recently preempted
+            last_preempt_key = f"ts_proxy:channel:{ch_id}:last_preempt"
+            try:
+                last_preempt = float(redis_client.get(last_preempt_key) or 0.0)
+            except Exception:
+                last_preempt = 0.0
+            if last_preempt and (time.time() - last_preempt) < cooldown_seconds:
+                continue
+
+            # Clients and their levels
+            clients_key = f"ts_proxy:channel:{ch_id}:clients"
+            member_ids = list(redis_client.smembers(clients_key) or [])
+            viewer_count = len(member_ids)
+            max_viewer_level = 0
+            if viewer_count:
+                pipe = redis_client.pipeline()
+                for cid in member_ids:
+                    pipe.hget(f"ts_proxy:channel:{ch_id}:clients:{cid}", "user_level")
+                levels_raw = pipe.execute()
+                levels = []
+                for lv in levels_raw:
+                    try:
+                        levels.append(int(lv or 0))
+                    except Exception:
+                        levels.append(0)
+                max_viewer_level = max(levels or [0])
+
+            # Only preempt if requester strictly outranks this channel's viewers
+            if requester_level <= max_viewer_level:
+                continue
+
+            # Metadata (protected/recording/started_at_ts)
+            meta_key = f"ts_proxy:channel:{ch_id}:metadata"
+            try:
+                protected, recording, started_at_ts = redis_client.hmget(
+                    meta_key, "protected", "recording", "started_at_ts"
+                )
+            except Exception:
+                protected = recording = started_at_ts = None
+
+            protected = str(protected or "0") in ("1", "true", "True")
+            recording = str(recording or "0") in ("1", "true", "True")
+            if protected or recording:
+                continue
+
+            try:
+                started_at_ts = float(started_at_ts) if started_at_ts is not None else None
+            except Exception:
+                started_at_ts = None
+            if started_at_ts is None:
+                started_at_ts = time.time()  # treat unknown as newest
+
+            # Score: lower is safer to terminate
+            has_viewers = 1 if viewer_count > 0 else 0
+            score = (has_viewers, max_viewer_level, viewer_count, started_at_ts)
+            candidates.append((score, ch_id))
+
+        logger.debug("Candidate channels after scoring:")
+        logger.debug(candidates)
+
+        if not candidates:
+            return None
+
+        candidates.sort(key=lambda x: x[0])
+        victim_id = candidates[0][1]
+
+        # Mark preempt timestamp to avoid thrashing
+        try:
+            redis_client.set(f"ts_proxy:channel:{victim_id}:last_preempt", str(time.time()), ex=3600)
+        except Exception:
+            pass
+
+        return victim_id
+
+    def get_stream(self, requester=None):
         """
         Finds an available stream for the requested channel and returns the selected stream and profile.
 
@@ -438,6 +576,17 @@ class Channel(models.Model):
                         None,
                     )  # Return newly assigned stream and matched profile
                 else:
+                    # At capacity: try to preempt a lower-impact channel on this profile
+                    victim_channel_id = self._pick_channel_to_preempt(
+                        profile_id=profile.id,
+                        requester_level=requester.user_level if requester else 100,
+                        redis_client=redis_client,
+                        exclude_channel_ids=None,
+                    )
+                    if victim_channel_id:
+                        logger.info(f"Preempting channel {victim_channel_id} for new stream on profile {profile.id}")
+                        # return self.id, profile.id, victim_channel_id
+
                     # This profile is at max connections
                     has_streams_but_maxed_out = True
                     logger.debug(
diff --git a/apps/channels/tasks.py b/apps/channels/tasks.py
index ffb2b97a..b63577d2 100755
--- a/apps/channels/tasks.py
+++ b/apps/channels/tasks.py
@@ -1900,11 +1900,8 @@ def run_recording(recording_id, channel_id, start_time_str, end_time_str):
                 metadata_key = RedisKeys.channel_metadata(str(channel.uuid))
                 md = r.hgetall(metadata_key)
                 if md:
-                    def _gv(bkey):
-                        return md.get(bkey)
-
                     def _d(bkey, cast=str):
-                        v = _gv(bkey)
+                        v = md.get(key)
                         try:
                             if v is None:
                                 return None
diff --git a/apps/proxy/ts_proxy/client_manager.py b/apps/proxy/ts_proxy/client_manager.py
index bffecdde..80be26f1 100644
--- a/apps/proxy/ts_proxy/client_manager.py
+++ b/apps/proxy/ts_proxy/client_manager.py
@@ -1,10 +1,8 @@
 """Client connection management for TS streams"""
 
 import threading
-import logging
 import time
 import json
-import gevent
 from typing import Set, Optional
 from apps.proxy.config import TSConfig as Config
 from redis.exceptions import ConnectionError, TimeoutError
@@ -123,7 +121,7 @@ class ClientManager:
                             # Check for stale activity using last_active field
                             last_active = self.redis_client.hget(client_key, "last_active")
                             if last_active:
-                                last_active_time = float(last_active.decode('utf-8'))
+                                last_active_time = float(last_active)
                                 ghost_timeout = self.heartbeat_interval * getattr(Config, 'GHOST_CLIENT_MULTIPLIER', 5.0)
 
                                 if current_time - last_active_time > ghost_timeout:
@@ -224,7 +222,7 @@ class ClientManager:
         except Exception as e:
             logger.error(f"Error notifying owner of client activity: {e}")
 
-    def add_client(self, client_id, client_ip, user_agent=None):
+    def add_client(self, client_id, client_ip, user_agent=None, user=None):
         """Add a client with duplicate prevention"""
         if client_id in self._registered_clients:
             logger.debug(f"Client {client_id} already registered, skipping")
@@ -242,7 +240,8 @@ class ClientManager:
             "ip_address": client_ip,
             "connected_at": current_time,
             "last_active": current_time,
-            "worker_id": self.worker_id or "unknown"
+            "worker_id": self.worker_id or "unknown",
+            "user_level": user.user_level if user is not None else 100, # default to a high value since no user means the non-user specific M3U/HDHR
         }
 
         try:
@@ -303,8 +302,6 @@ class ClientManager:
 
     def remove_client(self, client_id):
         """Remove a client from this channel and Redis"""
-        client_ip = None
-
         with self.lock:
             if client_id in self.clients:
                 self.clients.remove(client_id)
@@ -317,11 +314,6 @@ class ClientManager:
             if self.redis_client:
                 # Get client IP before removing the data
                 client_key = f"ts_proxy:channel:{self.channel_id}:clients:{client_id}"
-                client_data = self.redis_client.hgetall(client_key)
-                if client_data and b'ip_address' in client_data:
-                    client_ip = client_data[b'ip_address'].decode('utf-8')
-                elif client_data and 'ip_address' in client_data:
-                    client_ip = client_data['ip_address']
 
                 # Remove from channel's client set
                 self.redis_client.srem(self.client_set_key, client_id)
diff --git a/apps/proxy/ts_proxy/server.py b/apps/proxy/ts_proxy/server.py
index 9773e487..7d4a9f89 100644
--- a/apps/proxy/ts_proxy/server.py
+++ b/apps/proxy/ts_proxy/server.py
@@ -1121,12 +1121,6 @@ class ProxyServer:
                                     else:
                                         # Grace period expired with clients - mark channel as active
                                         logger.info(f"Grace period expired with {total_clients} clients - marking channel {channel_id} as active")
-<<<<<<< HEAD
-                                        old_state = "unknown"
-                                        if metadata and 'state' in metadata:
-                                            old_state = metadata['state']
-=======
->>>>>>> origin/dev
                                         if self.update_channel_state(channel_id, ChannelState.ACTIVE, {
                                             "grace_period_ended_at": str(time.time()),
                                             "clients_at_activation": str(total_clients)
diff --git a/apps/proxy/ts_proxy/utils.py b/apps/proxy/ts_proxy/utils.py
index 20a6e140..ff9e1780 100644
--- a/apps/proxy/ts_proxy/utils.py
+++ b/apps/proxy/ts_proxy/utils.py
@@ -83,7 +83,7 @@ def create_ts_packet(packet_type='null', message=None):
 
     # Add message to payload if provided
     if message:
-        msg_bytes = message.encode('utf-8')
+        msg_bytes = message
         packet[4:4+min(len(msg_bytes), 180)] = msg_bytes[:180]
 
     return bytes(packet)
@@ -113,4 +113,4 @@ def get_logger(component_name=None):
             # Default if detection fails
             logger_name = "ts_proxy"
 
-    return logging.getLogger(logger_name)
\ No newline at end of file
+    return logging.getLogger(logger_name)
diff --git a/apps/proxy/ts_proxy/views.py b/apps/proxy/ts_proxy/views.py
index 91f254a7..0f9c1228 100644
--- a/apps/proxy/ts_proxy/views.py
+++ b/apps/proxy/ts_proxy/views.py
@@ -45,7 +45,7 @@ logger = get_logger()
 
 
 @api_view(["GET"])
-def stream_ts(request, channel_id):
+def stream_ts(request, channel_id, user=None):
     if not network_access_allowed(request, "STREAMS"):
         return JsonResponse({"error": "Forbidden"}, status=403)
 
@@ -80,9 +80,9 @@ def stream_ts(request, channel_id):
             metadata_key = RedisKeys.channel_metadata(channel_id)
             if proxy_server.redis_client.exists(metadata_key):
                 metadata = proxy_server.redis_client.hgetall(metadata_key)
-                state_field = ChannelMetadataField.STATE.encode("utf-8")
+                state_field = ChannelMetadataField.STATE
                 if state_field in metadata:
-                    channel_state = metadata[state_field].decode("utf-8")
+                    channel_state = metadata[state_field]
 
                     # Active/running states - channel is operational, don't reinitialize
                     if channel_state in [
@@ -120,7 +120,7 @@ def stream_ts(request, channel_id):
                     else:
                         owner_field = ChannelMetadataField.OWNER.encode("utf-8")
                         if owner_field in metadata:
-                            owner = metadata[owner_field].decode("utf-8")
+                            owner = metadata[owner_field]
                             owner_heartbeat_key = f"ts_proxy:worker:{owner}:heartbeat"
                             if proxy_server.redis_client.exists(owner_heartbeat_key):
                                 # Owner is still active with unknown state - don't reinitialize
@@ -373,7 +373,7 @@ def stream_ts(request, channel_id):
                                         metadata_key, ChannelMetadataField.STATE
                                     )
                                     if state_bytes:
-                                        current_state = state_bytes.decode("utf-8")
+                                        current_state = state_bytes
                                         logger.debug(
                                             f"[{client_id}] Current state of channel {channel_id}: {current_state}"
                                         )
@@ -449,12 +449,12 @@ def stream_ts(request, channel_id):
                 )
 
                 if url_bytes:
-                    url = url_bytes.decode("utf-8")
+                    url = url_bytes
                 if ua_bytes:
-                    stream_user_agent = ua_bytes.decode("utf-8")
+                    stream_user_agent = ua_bytes
                 # Extract transcode setting from Redis
                 if profile_bytes:
-                    profile_str = profile_bytes.decode("utf-8")
+                    profile_str = profile_bytes
                     use_transcode = (
                         profile_str == PROXY_PROFILE_NAME or profile_str == "None"
                     )
@@ -490,7 +490,7 @@ def stream_ts(request, channel_id):
         # Register client
         buffer = proxy_server.stream_buffers[channel_id]
         client_manager = proxy_server.client_managers[channel_id]
-        client_manager.add_client(client_id, client_ip, client_user_agent)
+        client_manager.add_client(client_id, client_ip, client_user_agent, user)
         logger.info(f"[{client_id}] Client registered with channel {channel_id}")
 
         # Create a stream generator for this client
@@ -553,7 +553,7 @@ def stream_xc(request, username, password, channel_id):
         channel = get_object_or_404(Channel, id=channel_id)
 
     # @TODO: we've got the  file 'type' via extension, support this when we support multiple outputs
-    return stream_ts(request._request, str(channel.uuid))
+    return stream_ts(request._request, str(channel.uuid), user)
 
 
 @csrf_exempt
@@ -681,7 +681,7 @@ def channel_status(request, channel_id=None):
                 )
                 for key in keys:
                     channel_id_match = re.search(
-                        r"ts_proxy:channel:(.*):metadata", key.decode("utf-8")
+                        r"ts_proxy:channel:(.*):metadata", key
                     )
                     if channel_id_match:
                         ch_id = channel_id_match.group(1)
@@ -802,7 +802,7 @@ def next_stream(request, channel_id):
                     metadata_key, ChannelMetadataField.STREAM_ID
                 )
                 if stream_id_bytes:
-                    current_stream_id = int(stream_id_bytes.decode("utf-8"))
+                    current_stream_id = int(stream_id_bytes)
                     logger.info(
                         f"Found current stream ID {current_stream_id} in Redis for channel {channel_id}"
                     )
@@ -812,7 +812,7 @@ def next_stream(request, channel_id):
                         metadata_key, ChannelMetadataField.M3U_PROFILE
                     )
                     if profile_id_bytes:
-                        profile_id = int(profile_id_bytes.decode("utf-8"))
+                        profile_id = int(profile_id_bytes)
                         logger.info(
                             f"Found M3U profile ID {profile_id} in Redis for channel {channel_id}"
                         )
diff --git a/docker/init/02-postgres.sh b/docker/init/02-postgres.sh
index e36dd744..233a5fb8 100644
--- a/docker/init/02-postgres.sh
+++ b/docker/init/02-postgres.sh
@@ -162,5 +162,3 @@ ensure_utf8_encoding() {
         echo "Database $POSTGRES_DB converted to UTF8 and permissions set."
     fi
 }
-
-
diff --git a/docker/init/03-init-dispatcharr.sh b/docker/init/03-init-dispatcharr.sh
index 5fbef23d..bfe081e2 100644
--- a/docker/init/03-init-dispatcharr.sh
+++ b/docker/init/03-init-dispatcharr.sh
@@ -64,4 +64,4 @@ if [ "$(id -u)" = "0" ]; then
     fi
 
     chmod +x /data
-fi
\ No newline at end of file
+fi
diff --git a/docker/init/99-init-dev.sh b/docker/init/99-init-dev.sh
index 861c8307..fc8ef18a 100644
--- a/docker/init/99-init-dev.sh
+++ b/docker/init/99-init-dev.sh
@@ -1,25 +1,33 @@
 #!/bin/bash
 
-echo "🚀 Development Mode - Setting up Frontend..."
+if [ ! -e "/tmp/init" ]; then
+    echo "🚀 Development Mode - Setting up Frontend..."
 
-# Install Node.js
-if ! command -v node 2>&1 >/dev/null
-then
-    echo "=== setting up nodejs ==="
-    curl -sL https://deb.nodesource.com/setup_23.x -o /tmp/nodesource_setup.sh
-    bash /tmp/nodesource_setup.sh
-    apt-get update
-    apt-get install -y --no-install-recommends \
-        nodejs
-fi
-
-# Install frontend dependencies
-cd /app/frontend && npm install
-# Install pip dependencies
-cd /app && pip install -r requirements.txt
-
-# Install debugpy for remote debugging
-if [ "$DISPATCHARR_DEBUG" = "true" ]; then
-    echo "=== setting up debugpy ==="
-    pip install debugpy
+    # Install Node.js
+    if ! command -v node 2>&1 >/dev/null
+    then
+        echo "=== setting up nodejs ==="
+        curl -sL https://deb.nodesource.com/setup_23.x -o /tmp/nodesource_setup.sh
+        bash /tmp/nodesource_setup.sh
+        apt-get update
+        apt-get install -y --no-install-recommends \
+            nodejs
+    fi
+
+    # Install frontend dependencies
+    cd /app/frontend && npm install
+    # Install pip dependencies
+    cd /app && pip install -r requirements.txt
+
+    # Install debugpy for remote debugging
+    if [ "$DISPATCHARR_DEBUG" = "true" ]; then
+        echo "=== setting up debugpy ==="
+        pip install debugpy
+    fi
+
+    if [[ "$DISPATCHARR_ENV" = "dev" ]]; then
+        touch /tmp/init
+    fi
+else
+    echo "Development mode initialization already done. Skipping dev setup."
 fi
diff --git a/docker/uwsgi.dev.ini b/docker/uwsgi.dev.ini
index e476e216..e6d0806d 100644
--- a/docker/uwsgi.dev.ini
+++ b/docker/uwsgi.dev.ini
@@ -8,7 +8,7 @@
 exec-pre = python /app/scripts/wait_for_redis.py
 
 ; Start Redis first
-attach-daemon = redis-server
+attach-daemon = redis-server --protected-mode no
 ; Then start other services with configurable nice level (default: 5 for low priority)
 ; Users can override via CELERY_NICE_LEVEL environment variable in docker-compose
 attach-daemon = nice -n $(CELERY_NICE_LEVEL) celery -A dispatcharr worker --autoscale=6,1
@@ -59,4 +59,4 @@ logformat-strftime = true
 log-date = %%Y-%%m-%%d %%H:%%M:%%S,000
 # Use formatted time with environment variable for log level
 log-format = %(ftime) $(DISPATCHARR_LOG_LEVEL) uwsgi.requests Worker ID: %(wid) %(method) %(status) %(uri) %(msecs)ms
-log-buffering = 1024  # Add buffer size limit for logging
\ No newline at end of file
+log-buffering = 1024  # Add buffer size limit for logging
diff --git a/frontend/prettier.config.js b/frontend/prettier.config.js
index d2b86878..e143dfef 100644
--- a/frontend/prettier.config.js
+++ b/frontend/prettier.config.js
@@ -3,8 +3,8 @@ export default {
   semi: true, // Add semicolons at the end of statements
   singleQuote: true, // Use single quotes instead of double
   tabWidth: 2, // Set the indentation width
-  trailingComma: "es5", // Add trailing commas where valid in ES5
+  trailingComma: 'es5', // Add trailing commas where valid in ES5
   printWidth: 80, // Wrap lines at 80 characters
   bracketSpacing: true, // Add spaces inside object braces
-  arrowParens: "always", // Always include parentheses around arrow function parameters
+  arrowParens: 'always', // Always include parentheses around arrow function parameters
 };
diff --git a/frontend/src/components/forms/User.jsx b/frontend/src/components/forms/User.jsx
index 619b156f..6ec8705e 100644
--- a/frontend/src/components/forms/User.jsx
+++ b/frontend/src/components/forms/User.jsx
@@ -12,8 +12,9 @@ import {
   Stack,
   MultiSelect,
   ActionIcon,
+  NumberInput,
 } from '@mantine/core';
-import { RotateCcwKey, X } from 'lucide-react';
+import { RotateCcwKey } from 'lucide-react';
 import { useForm } from '@mantine/form';
 import useChannelsStore from '../../store/channels';
 import { USER_LEVELS, USER_LEVEL_LABELS } from '../../constants';
@@ -209,26 +210,23 @@ const User = ({ user = null, isOpen, onClose }) => {
               key={form.key('last_name')}
             />
 
-            <Group align="flex-end">
-              <TextInput
-                label="XC Password"
-                description="Clear to disable XC API"
-                {...form.getInputProps('xc_password')}
-                key={form.key('xc_password')}
-                style={{ flex: 1 }}
-                rightSectionWidth={30}
-                rightSection={
-                  <ActionIcon
-                    variant="transparent"
-                    size="sm"
-                    color="white"
-                    onClick={generateXCPassword}
-                  >
-                    <RotateCcwKey />
-                  </ActionIcon>
-                }
-              />
-            </Group>
+            <TextInput
+              label="XC Password"
+              description="Clear to disable XC API"
+              {...form.getInputProps('xc_password')}
+              key={form.key('xc_password')}
+              rightSectionWidth={30}
+              rightSection={
+                <ActionIcon
+                  variant="transparent"
+                  size="sm"
+                  color="white"
+                  onClick={generateXCPassword}
+                >
+                  <RotateCcwKey />
+                </ActionIcon>
+              }
+            />
 
             {showPermissions && (
               <MultiSelect
diff --git a/frontend/src/pages/Users.jsx b/frontend/src/pages/Users.jsx
index 570e49c1..92583a8e 100644
--- a/frontend/src/pages/Users.jsx
+++ b/frontend/src/pages/Users.jsx
@@ -2,49 +2,14 @@ import React, { useState } from 'react';
 import UsersTable from '../components/tables/UsersTable';
 import { Box } from '@mantine/core';
 import useAuthStore from '../store/auth';
-import { USER_LEVELS } from '../constants';
 
 const UsersPage = () => {
   const authUser = useAuthStore((s) => s.user);
 
-  const [selectedUser, setSelectedUser] = useState(null);
-  const [userModalOpen, setUserModalOpen] = useState(false);
-  const [confirmDeleteOpen, setConfirmDeleteOpen] = useState(false);
-  const [deleteTarget, setDeleteTarget] = useState(null);
-  const [userToDelete, setUserToDelete] = useState(null);
-
   if (!authUser.id) {
     return <></>;
   }
 
-  const closeUserModal = () => {
-    setSelectedUser(null);
-    setUserModalOpen(false);
-  };
-  const editUser = (user) => {
-    setSelectedUser(user);
-    setUserModalOpen(true);
-  };
-
-  const deleteUser = (id) => {
-    // Get user details for the confirmation dialog
-    const user = users.find((u) => u.id === id);
-    setUserToDelete(user);
-    setDeleteTarget(id);
-
-    // Skip warning if it's been suppressed
-    if (isWarningSuppressed('delete-user')) {
-      return executeDeleteUser(id);
-    }
-
-    setConfirmDeleteOpen(true);
-  };
-
-  const executeDeleteUser = async (id) => {
-    await API.deleteUser(id);
-    setConfirmDeleteOpen(false);
-  };
-
   return (
     <Box style={{ padding: 10 }}>
       <UsersTable />

From 4796184a67e0eb32e5448c221346956c8b5ba884 Mon Sep 17 00:00:00 2001
From: Jeff Casimir <jeff@casimircreative.com>
Date: Sun, 1 Feb 2026 13:42:48 -0700
Subject: [PATCH 006/172] Fix uWSGI segfaults by disabling threads when using
 gevent

Mixing threading and gevent concurrency models causes uWSGI workers to
crash with segmentation faults, particularly on ARM64/Python 3.13.

The production uwsgi.ini was already correct (gevent without threads).
This fixes the dev and debug configs to match.

References:
- https://github.com/gevent/gevent/issues/1784
- https://github.com/unbit/uwsgi/issues/2457

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 docker/uwsgi.debug.ini | 2 --
 docker/uwsgi.dev.ini   | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/docker/uwsgi.debug.ini b/docker/uwsgi.debug.ini
index 69c040f2..d2847335 100644
--- a/docker/uwsgi.debug.ini
+++ b/docker/uwsgi.debug.ini
@@ -28,8 +28,6 @@ static-map = /static=/app/static
 
 # Worker configuration
 workers = 1
-threads = 8
-enable-threads = true
 lazy-apps = true
 
 # HTTP server
diff --git a/docker/uwsgi.dev.ini b/docker/uwsgi.dev.ini
index e476e216..c4c5d0aa 100644
--- a/docker/uwsgi.dev.ini
+++ b/docker/uwsgi.dev.ini
@@ -28,10 +28,8 @@ vacuum = true
 die-on-term = true
 static-map = /static=/app/static
 
-# Worker management (Optimize for I/O bound tasks)
+# Worker management
 workers = 4
-threads = 2
-enable-threads = true
 
 # Optimize for streaming
 http = 0.0.0.0:5656

From 1dd368278ca733b9976b4a01a02df438c6d10eeb Mon Sep 17 00:00:00 2001
From: dekzter <kappa118@gmail.com>
Date: Fri, 13 Mar 2026 09:57:22 -0400
Subject: [PATCH 007/172] reverted value checking for consistency, added in
 user id to client info

---
 .../migrations/0004_user_stream_priority.py   | 18 -----
 apps/proxy/ts_proxy/channel_status.py         | 70 +++++++++++++++----
 apps/proxy/ts_proxy/client_manager.py         |  3 +-
 apps/proxy/ts_proxy/server.py                 |  7 +-
 4 files changed, 59 insertions(+), 39 deletions(-)
 delete mode 100644 apps/accounts/migrations/0004_user_stream_priority.py

diff --git a/apps/accounts/migrations/0004_user_stream_priority.py b/apps/accounts/migrations/0004_user_stream_priority.py
deleted file mode 100644
index 35c8bbae..00000000
--- a/apps/accounts/migrations/0004_user_stream_priority.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.2.4 on 2025-10-21 19:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('accounts', '0003_alter_user_custom_properties'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='stream_priority',
-            field=models.IntegerField(default=0, help_text='Priority level for streaming tasks. Lower values indicate higher priority.'),
-        ),
-    ]
diff --git a/apps/proxy/ts_proxy/channel_status.py b/apps/proxy/ts_proxy/channel_status.py
index 4ac8f63f..ffb6be2c 100644
--- a/apps/proxy/ts_proxy/channel_status.py
+++ b/apps/proxy/ts_proxy/channel_status.py
@@ -265,22 +265,64 @@ class ChannelStatus:
             }
 
         # Add FFmpeg stream information
-        info['video_codec'] = metadata.get(ChannelMetadataField.VIDEO_CODEC)
-        info['resolution'] = metadata.get(ChannelMetadataField.RESOLUTION)
-        info['source_fps'] = metadata.get(ChannelMetadataField.SOURCE_FPS)
-        info['pixel_format'] = metadata.get(ChannelMetadataField.PIXEL_FORMAT)
-        info['source_bitrate'] = metadata.get(ChannelMetadataField.SOURCE_BITRATE)
-        info['audio_codec'] = metadata.get(ChannelMetadataField.AUDIO_CODEC)
-        info['sample_rate'] = metadata.get(ChannelMetadataField.SAMPLE_RATE)
-        info['audio_channels'] = metadata.get(ChannelMetadataField.AUDIO_CHANNELS)
-        info['audio_bitrate'] = metadata.get(ChannelMetadataField.AUDIO_BITRATE)
+        video_codec = metadata.get(ChannelMetadataField.VIDEO_CODEC)
+        if video_codec:
+            info['video_codec'] = video_codec
+
+        resolution = metadata.get(ChannelMetadataField.RESOLUTION)
+        if resolution:
+            info['resolution'] = resolution
+
+        source_fps = metadata.get(ChannelMetadataField.SOURCE_FPS)
+        if source_fps:
+            info['source_fps'] = source_fps
+
+        pixel_format = metadata.get(ChannelMetadataField.PIXEL_FORMAT)
+        if pixel_format:
+            info['pixel_format'] = pixel_format
+
+        source_bitrate = metadata.get(ChannelMetadataField.SOURCE_BITRATE)
+        if source_bitrate:
+            info['source_bitrate'] = source_bitrate
+
+        audio_codec = metadata.get(ChannelMetadataField.AUDIO_CODEC)
+        if audio_codec:
+            info['audio_codec'] = audio_codec
+
+        sample_rate = metadata.get(ChannelMetadataField.SAMPLE_RATE)
+        if sample_rate:
+            info['sample_rate'] = sample_rate
+
+        audio_channels = metadata.get(ChannelMetadataField.AUDIO_CHANNELS)
+        if audio_channels:
+            info['audio_channels'] = audio_channels
+
+        audio_bitrate = metadata.get(ChannelMetadataField.AUDIO_BITRATE)
+        if audio_bitrate:
+            info['audio_bitrate'] = audio_bitrate
+
 
         # Add FFmpeg performance stats
-        info['ffmpeg_speed'] = metadata.get(ChannelMetadataField.FFMPEG_SPEED)
-        info['ffmpeg_fps'] = metadata.get(ChannelMetadataField.FFMPEG_FPS)
-        info['actual_fps'] = metadata.get(ChannelMetadataField.ACTUAL_FPS)
-        info['ffmpeg_bitrate'] = metadata.get(ChannelMetadataField.FFMPEG_BITRATE)
-        info['stream_type'] = metadata.get(ChannelMetadataField.STREAM_TYPE)
+        ffmpeg_speed = metadata.get(ChannelMetadataField.FFMPEG_SPEED)
+        if ffmpeg_speed:
+            info['ffmpeg_speed'] = ffmpeg_speed
+
+        ffmpeg_fps = metadata.get(ChannelMetadataField.FFMPEG_FPS)
+        if ffmpeg_fps:
+            info['ffmpeg_fps'] = ffmpeg_fps
+
+        actual_fps = metadata.get(ChannelMetadataField.ACTUAL_FPS)
+        if actual_fps:
+            info['actual_fps'] = actual_fps
+
+        ffmpeg_bitrate = metadata.get(ChannelMetadataField.FFMPEG_BITRATE)
+        if ffmpeg_bitrate:
+            info['ffmpeg_bitrate'] = ffmpeg_bitrate
+
+        stream_type = metadata.get(ChannelMetadataField.STREAM_TYPE)
+        if stream_type:
+            info['stream_type'] = stream_type
+
 
         return info
 
diff --git a/apps/proxy/ts_proxy/client_manager.py b/apps/proxy/ts_proxy/client_manager.py
index 394ad5ea..c0e5ab0b 100644
--- a/apps/proxy/ts_proxy/client_manager.py
+++ b/apps/proxy/ts_proxy/client_manager.py
@@ -247,7 +247,8 @@ class ClientManager:
             "connected_at": current_time,
             "last_active": current_time,
             "worker_id": self.worker_id or "unknown",
-            "user_level": user.user_level if user is not None else 100, # default to a high value since no user means the non-user specific M3U/HDHR
+            "user_id": str(user.id) if user is not None else "unknown",
+            # "user_level": user.user_level if user is not None else 100, # default to a high value since no user means the non-user specific M3U/HDHR
         }
 
         try:
diff --git a/apps/proxy/ts_proxy/server.py b/apps/proxy/ts_proxy/server.py
index 1999b491..4c51768a 100644
--- a/apps/proxy/ts_proxy/server.py
+++ b/apps/proxy/ts_proxy/server.py
@@ -459,10 +459,6 @@ class ProxyServer:
             lock_key = RedisKeys.channel_owner(channel_id)
             current = self.redis_client.get(lock_key)
 
-<<<<<<< HEAD
-            # Only extend if we're still the owner
-            if current and current == self.worker_id:
-=======
             if current is None:
                 # Key expired — re-acquire if we have the stream_manager
                 if channel_id in self.stream_managers:
@@ -476,8 +472,7 @@ class ProxyServer:
                         return False
                 return False
 
-            if current.decode('utf-8') == self.worker_id:
->>>>>>> origin/dev
+            if current == self.worker_id:
                 self.redis_client.expire(lock_key, ttl)
                 return True
 

From b22f9e8e07a68047821214fd2b666770e29dab65 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 14 Mar 2026 18:38:59 -0500
Subject: [PATCH 008/172] Enhancement: Account expiration tracking and
 notifications for M3U profiles

---
 CHANGELOG.md                                  |   6 +
 .../0019_m3uaccountprofile_exp_date.py        |  57 +++++++
 apps/m3u/models.py                            |  79 +++++----
 apps/m3u/serializers.py                       |  66 +++++++-
 apps/m3u/signals.py                           |  86 +++++++++-
 apps/m3u/tasks.py                             | 159 +++++++++++++++++-
 dispatcharr/settings.py                       |   5 +
 frontend/src/api.js                           |   1 +
 frontend/src/components/forms/M3U.jsx         |  39 ++++-
 frontend/src/components/forms/M3UProfile.jsx  |  32 ++++
 frontend/src/components/tables/M3UsTable.jsx  |  88 +++++++++-
 frontend/src/store/notifications.jsx          |  13 +-
 12 files changed, 578 insertions(+), 53 deletions(-)
 create mode 100644 apps/m3u/migrations/0019_m3uaccountprofile_exp_date.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6571bfcf..232521b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - **Search and filter controls**: Added search and filter controls to the recordings list.
   - **Stream generator throttling**: Cached the `ProxyServer` singleton reference per client and throttled Redis resource checks (1 s) and non-owner health checks (2 s), eliminating 3+ Redis round-trips per stream loop iteration.
   - **Automatic crash recovery on worker restart**: A `worker_ready` Celery signal now fires `recover_recordings_on_startup` automatically when the worker starts, so recordings stuck in "recording" status are recovered without manual intervention.
+- Account expiration tracking and notifications for M3U profiles
+  - A new `exp_date` field on `M3UAccountProfile` stores the account expiration date as a proper `DateTimeField`. For Xtream Codes accounts the field is auto-synced from `custom_properties.user_info.exp_date` on every save (supports both Unix timestamps and ISO date strings). For non-XC M3U accounts the date can be entered manually via the account or profile form.
+  - The M3U accounts table now shows an **Expiration** column displaying the earliest expiration date across all profiles for that account (color-coded: red = expired, orange = expiring soon, green = OK). Hovering the cell shows a tooltip with per-profile expiration details including inactive-profile labels.
+  - A daily Celery Beat task (`check_xc_account_expirations`) checks all active profiles with an expiration date and manages system notifications: a normal-priority warning is raised for profiles expiring within 7 days; a high-priority alert is raised once the profile has already expired. Warning and expired notifications use separate keys so dismissing the 7-day warning does not suppress the expiration alert.
+  - Notifications are also updated immediately when a profile is saved: if the expiration date is cleared or pushed beyond the 7-day window, any existing warning/expired notifications are deleted; if the date falls within the window or is already past, the matching notification is updated in place.
+  - Non-XC accounts expose a `DateTimePicker` on both the M3U account form and the profile form.
 
 ### Changed
 
diff --git a/apps/m3u/migrations/0019_m3uaccountprofile_exp_date.py b/apps/m3u/migrations/0019_m3uaccountprofile_exp_date.py
new file mode 100644
index 00000000..bae4d9dd
--- /dev/null
+++ b/apps/m3u/migrations/0019_m3uaccountprofile_exp_date.py
@@ -0,0 +1,57 @@
+# Generated by Django 6.0.3 on 2026-03-14 19:41
+
+from datetime import datetime, timezone
+
+from django.db import migrations, models
+
+
+def populate_exp_date_from_custom_properties(apps, schema_editor):
+    """Backfill exp_date from custom_properties['user_info']['exp_date']."""
+    M3UAccountProfile = apps.get_model('m3u', 'M3UAccountProfile')
+    profiles_to_update = []
+
+    for profile in M3UAccountProfile.objects.filter(
+        custom_properties__isnull=False,
+    ).exclude(custom_properties={}):
+        user_info = profile.custom_properties.get('user_info', {})
+        raw_exp = user_info.get('exp_date')
+        if raw_exp is None:
+            continue
+
+        parsed = None
+        try:
+            if isinstance(raw_exp, (int, float)):
+                parsed = datetime.fromtimestamp(float(raw_exp), tz=timezone.utc)
+            elif isinstance(raw_exp, str):
+                try:
+                    parsed = datetime.fromtimestamp(float(raw_exp), tz=timezone.utc)
+                except ValueError:
+                    parsed = datetime.fromisoformat(raw_exp)
+        except (ValueError, TypeError, OSError):
+            pass
+
+        if parsed is not None:
+            profile.exp_date = parsed
+            profiles_to_update.append(profile)
+
+    if profiles_to_update:
+        M3UAccountProfile.objects.bulk_update(profiles_to_update, ['exp_date'], batch_size=500)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('m3u', '0018_add_profile_custom_properties'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='m3uaccountprofile',
+            name='exp_date',
+            field=models.DateTimeField(blank=True, help_text='Account expiration date, auto-synced from custom_properties on save', null=True),
+        ),
+        migrations.RunPython(
+            populate_exp_date_from_custom_properties,
+            reverse_code=migrations.RunPython.noop,
+        ),
+    ]
diff --git a/apps/m3u/models.py b/apps/m3u/models.py
index b812ad6c..fbe22d8c 100644
--- a/apps/m3u/models.py
+++ b/apps/m3u/models.py
@@ -1,3 +1,4 @@
+from datetime import datetime, timezone
 from django.db import models
 from django.core.exceptions import ValidationError
 from core.models import UserAgent
@@ -264,11 +265,16 @@ class M3UAccountProfile(models.Model):
     )
     current_viewers = models.PositiveIntegerField(default=0)
     custom_properties = models.JSONField(
-        default=dict, 
-        blank=True, 
-        null=True, 
+        default=dict,
+        blank=True,
+        null=True,
         help_text="Custom properties for storing account information from provider (e.g., XC account details, expiration dates)"
     )
+    exp_date = models.DateTimeField(
+        null=True,
+        blank=True,
+        help_text="Account expiration date, auto-synced from custom_properties on save",
+    )
 
     class Meta:
         constraints = [
@@ -280,36 +286,51 @@ class M3UAccountProfile(models.Model):
     def __str__(self):
         return f"{self.name} ({self.m3u_account.name})"
 
-    def get_account_expiration(self):
-        """Get account expiration date from custom properties if available"""
+    def save(self, *args, **kwargs):
+        """Auto-sync exp_date from custom_properties for XC accounts on every save.
+        For non-XC accounts, exp_date is set directly and left untouched here."""
+        parsed = self._parse_exp_date_from_custom_properties()
+        if parsed is not None:
+            # XC account with exp_date in custom_properties — always sync
+            self.exp_date = parsed
+        # else: keep whatever exp_date is already set (manual entry for non-XC)
+        super().save(*args, **kwargs)
+
+    @staticmethod
+    def _parse_exp_date(raw_value):
+        """Parse a raw exp_date value (unix timestamp or ISO string) into a datetime."""
+        if raw_value is None:
+            return None
+        try:
+            if isinstance(raw_value, (int, float)):
+                return datetime.fromtimestamp(float(raw_value), tz=timezone.utc)
+            elif isinstance(raw_value, str):
+                try:
+                    return datetime.fromtimestamp(float(raw_value), tz=timezone.utc)
+                except ValueError:
+                    return datetime.fromisoformat(raw_value)
+        except (ValueError, TypeError, OSError):
+            pass
+        return None
+
+    def _parse_exp_date_from_custom_properties(self):
+        """Extract exp_date from custom_properties JSON."""
         if not self.custom_properties:
             return None
-        
         user_info = self.custom_properties.get('user_info', {})
-        exp_date = user_info.get('exp_date')
-        
-        if exp_date:
-            try:
-                from datetime import datetime
-                # XC exp_date is typically a Unix timestamp
-                if isinstance(exp_date, (int, float)):
-                    return datetime.fromtimestamp(exp_date)
-                elif isinstance(exp_date, str):
-                    # Try to parse as timestamp first, then as ISO date
-                    try:
-                        return datetime.fromtimestamp(float(exp_date))
-                    except ValueError:
-                        return datetime.fromisoformat(exp_date)
-            except (ValueError, TypeError):
-                pass
-        
-        return None
+        return self._parse_exp_date(user_info.get('exp_date'))
+
+    def get_account_expiration(self):
+        """Get account expiration date — uses the dedicated field if set, otherwise parses JSON."""
+        if self.exp_date:
+            return self.exp_date
+        return self._parse_exp_date_from_custom_properties()
 
     def get_account_status(self):
         """Get account status from custom properties if available"""
         if not self.custom_properties:
             return None
-        
+
         user_info = self.custom_properties.get('user_info', {})
         return user_info.get('status')
 
@@ -317,7 +338,7 @@ class M3UAccountProfile(models.Model):
         """Get maximum connections from custom properties if available"""
         if not self.custom_properties:
             return None
-        
+
         user_info = self.custom_properties.get('user_info', {})
         return user_info.get('max_connections')
 
@@ -325,7 +346,7 @@ class M3UAccountProfile(models.Model):
         """Get active connections from custom properties if available"""
         if not self.custom_properties:
             return None
-        
+
         user_info = self.custom_properties.get('user_info', {})
         return user_info.get('active_cons')
 
@@ -333,7 +354,7 @@ class M3UAccountProfile(models.Model):
         """Get last refresh timestamp from custom properties if available"""
         if not self.custom_properties:
             return None
-        
+
         last_refresh = self.custom_properties.get('last_refresh')
         if last_refresh:
             try:
@@ -341,7 +362,7 @@ class M3UAccountProfile(models.Model):
                 return datetime.fromisoformat(last_refresh)
             except (ValueError, TypeError):
                 pass
-        
+
         return None
 
 
diff --git a/apps/m3u/serializers.py b/apps/m3u/serializers.py
index 22c4057a..c629cac9 100644
--- a/apps/m3u/serializers.py
+++ b/apps/m3u/serializers.py
@@ -52,12 +52,14 @@ class M3UAccountProfileSerializer(serializers.ModelSerializer):
             "search_pattern",
             "replace_pattern",
             "custom_properties",
+            "exp_date",
             "account",
         ]
         read_only_fields = ["id", "account"]
         extra_kwargs = {
             'search_pattern': {'required': False, 'allow_blank': True},
             'replace_pattern': {'required': False, 'allow_blank': True},
+            'exp_date': {'required': False, 'allow_null': True},
         }
 
     def create(self, validated_data):
@@ -90,14 +92,14 @@ class M3UAccountProfileSerializer(serializers.ModelSerializer):
 
     def update(self, instance, validated_data):
         if instance.is_default:
-            # For default profiles, only allow updating name and custom_properties (for notes)
-            allowed_fields = {'name', 'custom_properties'}
+            # For default profiles, only allow updating name, custom_properties, and exp_date
+            allowed_fields = {'name', 'custom_properties', 'exp_date'}
 
             # Remove any fields that aren't allowed for default profiles
             disallowed_fields = set(validated_data.keys()) - allowed_fields
             if disallowed_fields:
                 raise serializers.ValidationError(
-                    f"Default profiles can only modify name and notes. "
+                    f"Default profiles can only modify name, notes, and expiration. "
                     f"Cannot modify: {', '.join(disallowed_fields)}"
                 )
 
@@ -117,6 +119,12 @@ class M3UAccountSerializer(serializers.ModelSerializer):
     """Serializer for M3U Account"""
 
     filters = serializers.SerializerMethodField()
+    earliest_expiration = serializers.SerializerMethodField()
+    all_expirations = serializers.SerializerMethodField()
+    exp_date = serializers.DateTimeField(
+        required=False, allow_null=True, write_only=True,
+        help_text="Expiration date for the default profile (write-through)",
+    )
     # Include user_agent as a mandatory field using its primary key.
     user_agent = serializers.PrimaryKeyRelatedField(
         queryset=UserAgent.objects.all(),
@@ -172,6 +180,9 @@ class M3UAccountSerializer(serializers.ModelSerializer):
             "auto_enable_new_groups_live",
             "auto_enable_new_groups_vod",
             "auto_enable_new_groups_series",
+            "earliest_expiration",
+            "all_expirations",
+            "exp_date",
         ]
         extra_kwargs = {
             "password": {
@@ -200,9 +211,19 @@ class M3UAccountSerializer(serializers.ModelSerializer):
             ct = instance.refresh_task.crontab
             cron_expr = f"{ct.minute} {ct.hour} {ct.day_of_month} {ct.month_of_year} {ct.day_of_week}"
         data["cron_expression"] = cron_expr
+
+        # Surface default profile's exp_date for the form
+        default_profile = instance.profiles.filter(is_default=True).first()
+        data["exp_date"] = (
+            default_profile.exp_date.isoformat() if default_profile and default_profile.exp_date else None
+        )
+
         return data
 
     def update(self, instance, validated_data):
+        # Pop exp_date — it's written to the default profile, not the account
+        exp_date = validated_data.pop("exp_date", "__NOT_SET__")
+
         # Pop cron_expression before it reaches model fields
         # If not present (partial update), preserve the existing cron from the PeriodicTask
         if "cron_expression" in validated_data:
@@ -264,9 +285,19 @@ class M3UAccountSerializer(serializers.ModelSerializer):
                 memberships_to_update, ["enabled"]
             )
 
+        # Write exp_date through to the default profile
+        if exp_date != "__NOT_SET__":
+            default_profile = instance.profiles.filter(is_default=True).first()
+            if default_profile:
+                default_profile.exp_date = exp_date
+                default_profile.save()
+
         return instance
 
     def create(self, validated_data):
+        # Pop exp_date — it's written to the default profile after creation
+        exp_date = validated_data.pop("exp_date", None)
+
         # Pop cron_expression — it's not a model field
         cron_expr = validated_data.pop("cron_expression", "")
 
@@ -290,12 +321,41 @@ class M3UAccountSerializer(serializers.ModelSerializer):
         instance = M3UAccount(**validated_data)
         instance._cron_expression = cron_expr
         instance.save()
+
+        # Write exp_date through to the default profile created by post_save signal
+        if exp_date is not None:
+            default_profile = instance.profiles.filter(is_default=True).first()
+            if default_profile:
+                default_profile.exp_date = exp_date
+                default_profile.save()
+
         return instance
 
     def get_filters(self, obj):
         filters = obj.filters.order_by("order")
         return M3UFilterSerializer(filters, many=True).data
 
+    def get_earliest_expiration(self, obj):
+        """Return the soonest exp_date across all active profiles for this account."""
+        profiles_with_exp = obj.profiles.filter(
+            is_active=True, exp_date__isnull=False
+        ).order_by("exp_date")
+        first = profiles_with_exp.first()
+        return first.exp_date.isoformat() if first else None
+
+    def get_all_expirations(self, obj):
+        """Return exp_date info for every profile that has one (for tooltip)."""
+        profiles = obj.profiles.filter(exp_date__isnull=False).order_by("exp_date")
+        return [
+            {
+                "profile_id": p.id,
+                "profile_name": p.name,
+                "exp_date": p.exp_date.isoformat(),
+                "is_active": p.is_active,
+            }
+            for p in profiles
+        ]
+
 
 class ServerGroupSerializer(serializers.ModelSerializer):
     """Serializer for Server Group"""
diff --git a/apps/m3u/signals.py b/apps/m3u/signals.py
index 3de67c90..ce24d015 100644
--- a/apps/m3u/signals.py
+++ b/apps/m3u/signals.py
@@ -1,7 +1,7 @@
 # apps/m3u/signals.py
 from django.db.models.signals import post_save, post_delete, pre_save
 from django.dispatch import receiver
-from .models import M3UAccount
+from .models import M3UAccount, M3UAccountProfile
 from .tasks import refresh_single_m3u_account, refresh_m3u_groups, delete_m3u_refresh_task_by_id
 from core.scheduling import create_or_update_periodic_task, delete_periodic_task
 import json
@@ -68,6 +68,62 @@ def create_or_update_refresh_task(sender, instance, created, update_fields=None,
     if instance.refresh_task_id != task.id:
         M3UAccount.objects.filter(id=instance.id).update(refresh_task=task)
 
+@receiver(post_save, sender=M3UAccountProfile)
+def update_profile_expiration_notification(sender, instance, created, update_fields=None, **kwargs):
+    """
+    When a profile's exp_date is set or changed, immediately update its expiration notification
+    so the frontend reflects the new state without waiting for the daily celery task.
+    """
+    # Only act when exp_date was involved in the save
+    if not created and update_fields is not None and "exp_date" not in update_fields:
+        return
+
+    try:
+        if not instance.exp_date:
+            # exp_date was cleared — remove any existing notifications immediately
+            from core.models import SystemNotification
+            from core.utils import send_notification_dismissed
+
+            keys = [f"xc-exp-warning-{instance.id}", f"xc-exp-expired-{instance.id}"]
+            deleted_keys = list(
+                SystemNotification.objects.filter(notification_key__in=keys)
+                .values_list("notification_key", flat=True)
+            )
+            SystemNotification.objects.filter(notification_key__in=deleted_keys).delete()
+            for key in deleted_keys:
+                send_notification_dismissed(key)
+            return
+
+        from apps.m3u.tasks import evaluate_profile_expiration_notification
+        evaluate_profile_expiration_notification(instance)
+    except Exception as e:
+        logger.error(f"Error updating expiration notification for profile {instance.id}: {str(e)}")
+
+
+@receiver(post_delete, sender=M3UAccountProfile)
+def cleanup_profile_notifications(sender, instance, **kwargs):
+    """
+    Delete expiration notifications for a profile when it is deleted.
+    Handles both direct deletion and cascade deletion from M3UAccount.
+    """
+    try:
+        from core.models import SystemNotification
+        from core.utils import send_notification_dismissed
+
+        keys = [f"xc-exp-warning-{instance.id}", f"xc-exp-expired-{instance.id}"]
+        deleted_keys = list(
+            SystemNotification.objects.filter(notification_key__in=keys)
+            .values_list("notification_key", flat=True)
+        )
+        if deleted_keys:
+            SystemNotification.objects.filter(notification_key__in=deleted_keys).delete()
+            for key in deleted_keys:
+                send_notification_dismissed(key)
+            logger.debug(f"Cleaned up {len(deleted_keys)} notifications for deleted profile {instance.id}")
+    except Exception as e:
+        logger.error(f"Error cleaning up notifications for profile {instance.id}: {str(e)}")
+
+
 @receiver(post_delete, sender=M3UAccount)
 def delete_refresh_task(sender, instance, **kwargs):
     """
@@ -107,6 +163,34 @@ def update_status_on_active_change(sender, instance, **kwargs):
                 else:
                     # When deactivating, set status to disabled
                     instance.status = M3UAccount.Status.DISABLED
+                    # Clean up any expiration notifications for all profiles of this account
+                    try:
+                        from core.models import SystemNotification
+                        from core.utils import send_notification_dismissed
+
+                        profile_ids = list(
+                            M3UAccountProfile.objects.filter(m3u_account=instance)
+                            .values_list("id", flat=True)
+                        )
+                        keys = [
+                            key
+                            for pid in profile_ids
+                            for key in [f"xc-exp-warning-{pid}", f"xc-exp-expired-{pid}"]
+                        ]
+                        if keys:
+                            deleted_keys = list(
+                                SystemNotification.objects.filter(notification_key__in=keys)
+                                .values_list("notification_key", flat=True)
+                            )
+                            if deleted_keys:
+                                SystemNotification.objects.filter(notification_key__in=deleted_keys).delete()
+                                for key in deleted_keys:
+                                    send_notification_dismissed(key)
+                                logger.debug(
+                                    f"Cleaned up {len(deleted_keys)} notifications for deactivated M3U account {instance.id}"
+                                )
+                    except Exception as notify_err:
+                        logger.error(f"Error cleaning up notifications on account deactivation: {notify_err}")
         except M3UAccount.DoesNotExist:
             # New record, will use default status
             pass
diff --git a/apps/m3u/tasks.py b/apps/m3u/tasks.py
index 5259cefc..0af5d382 100644
--- a/apps/m3u/tasks.py
+++ b/apps/m3u/tasks.py
@@ -11,7 +11,7 @@ from celery.result import AsyncResult
 from celery import shared_task, current_app, group
 from django.conf import settings
 from django.core.cache import cache
-from django.db import transaction
+from django.db import models, transaction
 from .models import M3UAccount
 from apps.channels.models import Stream, ChannelGroup, ChannelGroupM3UAccount
 from asgiref.sync import async_to_sync
@@ -3185,3 +3185,160 @@ def send_m3u_update(account_id, action, progress, **kwargs):
 
     # Explicitly clear data reference to help garbage collection
     data = None
+
+
+def evaluate_profile_expiration_notification(profile):
+    """
+    Evaluate a single M3UAccountProfile's expiration date and create, update,
+    or delete the corresponding SystemNotification accordingly.
+
+    Returns the notification key that should remain active (warning or expired),
+    or None if the profile is not expiring soon and any stale notifications were removed.
+    This return value is used by the bulk task to track active keys for stale cleanup.
+    """
+    from core.models import SystemNotification
+    from core.utils import send_websocket_notification, send_notification_dismissed
+
+    now = timezone.now()
+    warning_threshold = now + timezone.timedelta(days=7)
+    exp = profile.exp_date
+    warning_key = f"xc-exp-warning-{profile.id}"
+    expired_key = f"xc-exp-expired-{profile.id}"
+
+    if exp <= now:
+        # Already expired — delete warning, create/update expired notification
+        deleted_warning = list(
+            SystemNotification.objects.filter(notification_key=warning_key)
+            .values_list("notification_key", flat=True)
+        )
+        SystemNotification.objects.filter(notification_key=warning_key).delete()
+        for key in deleted_warning:
+            send_notification_dismissed(key)
+
+        notification, created = SystemNotification.objects.update_or_create(
+            notification_key=expired_key,
+            defaults={
+                "notification_type": SystemNotification.NotificationType.WARNING,
+                "priority": SystemNotification.Priority.HIGH,
+                "title": f"Account Expired: {profile.name}",
+                "message": (
+                    f'Profile "{profile.name}" on M3U account '
+                    f'"{profile.m3u_account.name}" has expired '
+                    f"(expired {exp.strftime('%Y-%m-%d %H:%M UTC')})."
+                ),
+                "action_data": {
+                    "profile_id": profile.id,
+                    "account_id": profile.m3u_account.id,
+                    "account_name": profile.m3u_account.name,
+                    "profile_name": profile.name,
+                    "exp_date": exp.isoformat(),
+                },
+                "is_active": True,
+                "admin_only": False,
+            },
+        )
+        send_websocket_notification(notification)
+        return expired_key
+
+    elif exp <= warning_threshold:
+        # Expiring within 7 days — delete expired notification, create/update warning
+        deleted_expired = list(
+            SystemNotification.objects.filter(notification_key=expired_key)
+            .values_list("notification_key", flat=True)
+        )
+        SystemNotification.objects.filter(notification_key=expired_key).delete()
+        for key in deleted_expired:
+            send_notification_dismissed(key)
+
+        days_left = (exp - now).days
+        if days_left == 0:
+            expires_in_str = "today"
+        elif days_left == 1:
+            expires_in_str = "in 1 day"
+        else:
+            expires_in_str = f"in {days_left} days"
+
+        notification, created = SystemNotification.objects.update_or_create(
+            notification_key=warning_key,
+            defaults={
+                "notification_type": SystemNotification.NotificationType.WARNING,
+                "priority": SystemNotification.Priority.NORMAL,
+                "title": f"Account Expiring: {profile.name}",
+                "message": (
+                    f'Profile "{profile.name}" on M3U account '
+                    f'"{profile.m3u_account.name}" expires {expires_in_str} '
+                    f"(expires {exp.strftime('%Y-%m-%d %H:%M UTC')})."
+                ),
+                "action_data": {
+                    "profile_id": profile.id,
+                    "account_id": profile.m3u_account.id,
+                    "account_name": profile.m3u_account.name,
+                    "profile_name": profile.name,
+                    "exp_date": exp.isoformat(),
+                },
+                "is_active": True,
+                "admin_only": False,
+            },
+        )
+        send_websocket_notification(notification)
+        return warning_key
+
+    else:
+        # Not expiring soon — delete any stale notifications
+        deleted_keys = list(
+            SystemNotification.objects.filter(
+                notification_key__in=[warning_key, expired_key]
+            ).values_list("notification_key", flat=True)
+        )
+        SystemNotification.objects.filter(
+            notification_key__in=[warning_key, expired_key]
+        ).delete()
+        for key in deleted_keys:
+            send_notification_dismissed(key)
+        return None
+
+
+@shared_task
+def check_xc_account_expirations():
+    """
+    Daily task: check all account profiles for upcoming expirations.
+    Creates/updates SystemNotifications for profiles expiring within 7 days.
+    Uses separate notification keys for warning vs expired so users can
+    dismiss the 7-day warning and still receive the expired notification.
+    """
+    from apps.m3u.models import M3UAccountProfile
+    from core.models import SystemNotification
+    from core.utils import send_notification_dismissed
+
+    # Find all active profiles with an exp_date that is set
+    expiring_profiles = (
+        M3UAccountProfile.objects.filter(
+            m3u_account__is_active=True,
+            is_active=True,
+            exp_date__isnull=False,
+        )
+        .select_related("m3u_account")
+    )
+
+    active_notification_keys = set()
+
+    for profile in expiring_profiles:
+        active_key = evaluate_profile_expiration_notification(profile)
+        if active_key:
+            active_notification_keys.add(active_key)
+
+    # Delete stale notifications for profiles whose expiration was extended
+    stale = SystemNotification.objects.filter(
+        is_active=True,
+    ).filter(
+        models.Q(notification_key__startswith="xc-exp-warning-") |
+        models.Q(notification_key__startswith="xc-exp-expired-")
+    ).exclude(notification_key__in=active_notification_keys)
+    stale_keys = list(stale.values_list("notification_key", flat=True))
+    stale.delete()
+    for key in stale_keys:
+        send_notification_dismissed(key)
+
+    logger.info(
+        f"Account expiration check complete: {len(active_notification_keys)} active notifications"
+    )
diff --git a/dispatcharr/settings.py b/dispatcharr/settings.py
index 50bac5d5..46e03d1f 100644
--- a/dispatcharr/settings.py
+++ b/dispatcharr/settings.py
@@ -267,6 +267,11 @@ CELERY_BEAT_SCHEDULE = {
         "task": "core.tasks.check_for_version_update",
         "schedule": 86400.0,  # Once every 24 hours
     },
+    # Check for XC account expirations daily
+    "check-xc-account-expirations": {
+        "task": "apps.m3u.tasks.check_xc_account_expirations",
+        "schedule": 86400.0,  # Once every 24 hours
+    },
 }
 
 MEDIA_ROOT = BASE_DIR / "media"
diff --git a/frontend/src/api.js b/frontend/src/api.js
index 4fa3d46c..b1c103d8 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -1286,6 +1286,7 @@ export default class API {
 
         body = new FormData();
         for (const prop in values) {
+          if (values[prop] === null || values[prop] === undefined) continue;
           body.append(prop, values[prop]);
         }
       } else {
diff --git a/frontend/src/components/forms/M3U.jsx b/frontend/src/components/forms/M3U.jsx
index 4b3522af..423b2a05 100644
--- a/frontend/src/components/forms/M3U.jsx
+++ b/frontend/src/components/forms/M3U.jsx
@@ -29,6 +29,7 @@ import useEPGsStore from '../../store/epgs';
 import useVODStore from '../../store/useVODStore';
 import M3UFilters from './M3UFilters';
 import ScheduleInput from './ScheduleInput';
+import { DateTimePicker } from '@mantine/dates';
 
 const M3U = ({
   m3uAccount = null,
@@ -69,6 +70,7 @@ const M3U = ({
       stale_stream_days: 7,
       priority: 0,
       enable_vod: false,
+      exp_date: null,
     },
 
     validate: {
@@ -101,6 +103,7 @@ const M3U = ({
             ? m3uAccount.priority
             : 0,
         enable_vod: m3uAccount.enable_vod || false,
+        exp_date: m3uAccount.exp_date ? new Date(m3uAccount.exp_date) : null,
       });
 
       // Determine schedule type from existing data
@@ -131,6 +134,16 @@ const M3U = ({
   const onSubmit = async () => {
     const { create_epg, ...values } = form.getValues();
 
+    // Convert exp_date Date object to ISO string for the API
+    if (values.account_type === 'XC') {
+      // XC accounts have exp_date auto-managed server-side; don't send it
+      delete values.exp_date;
+    } else if (values.exp_date instanceof Date) {
+      values.exp_date = values.exp_date.toISOString();
+    } else if (!values.exp_date) {
+      values.exp_date = null;
+    }
+
     // Determine which schedule type is active based on field values
     const hasCronExpression =
       values.cron_expression && values.cron_expression.trim() !== '';
@@ -359,13 +372,25 @@ const M3U = ({
               )}
 
               {form.getValues().account_type != 'XC' && (
-                <FileInput
-                  id="file"
-                  label="Upload files"
-                  placeholder="Upload files"
-                  description="Upload a local M3U file instead of using URL"
-                  onChange={setFile}
-                />
+                <>
+                  <FileInput
+                    id="file"
+                    label="Upload files"
+                    placeholder="Upload files"
+                    description="Upload a local M3U file instead of using URL"
+                    onChange={setFile}
+                  />
+
+                  <DateTimePicker
+                    label="Expiration Date"
+                    description="Set an expiration date to receive a warning notification"
+                    placeholder="No expiration"
+                    clearable
+                    valueFormat="MMM D, YYYY h:mm A"
+                    {...form.getInputProps('exp_date')}
+                    key={form.key('exp_date')}
+                  />
+                </>
               )}
             </Stack>
 
diff --git a/frontend/src/components/forms/M3UProfile.jsx b/frontend/src/components/forms/M3UProfile.jsx
index 025d3cae..7c24b212 100644
--- a/frontend/src/components/forms/M3UProfile.jsx
+++ b/frontend/src/components/forms/M3UProfile.jsx
@@ -16,6 +16,7 @@ import {
   Textarea,
   NumberInput,
 } from '@mantine/core';
+import { DateTimePicker } from '@mantine/dates';
 import { useWebSocket } from '../../WebSocket';
 import usePlaylistsStore from '../../store/playlists';
 
@@ -32,6 +33,8 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
   const [sampleInput, setSampleInput] = useState('');
   const isDefaultProfile = profile?.is_default;
 
+  const isXC = m3u?.account_type === 'XC';
+
   const defaultValues = useMemo(
     () => ({
       name: profile?.name || '',
@@ -39,6 +42,7 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
       search_pattern: profile?.search_pattern || '',
       replace_pattern: profile?.replace_pattern || '',
       notes: profile?.custom_properties?.notes || '',
+      exp_date: profile?.exp_date ? new Date(profile.exp_date) : null,
     }),
     [profile]
   );
@@ -73,6 +77,17 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
   const onSubmit = async (values) => {
     console.log('submiting');
 
+    // Convert exp_date for submission
+    let expDateValue = values.exp_date;
+    if (isXC) {
+      // XC accounts have exp_date auto-managed; don't send it
+      expDateValue = undefined;
+    } else if (expDateValue instanceof Date) {
+      expDateValue = expDateValue.toISOString();
+    } else if (!expDateValue) {
+      expDateValue = null;
+    }
+
     // For default profiles, only send name and custom_properties (notes)
     let submitValues;
     if (isDefaultProfile) {
@@ -99,6 +114,11 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
       };
     }
 
+    // Add exp_date for non-XC accounts
+    if (expDateValue !== undefined) {
+      submitValues.exp_date = expDateValue;
+    }
+
     if (profile?.id) {
       await API.updateM3UProfile(m3u.id, {
         id: profile.id,
@@ -257,6 +277,18 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
           </>
         )}
 
+        {!isXC && (
+          <DateTimePicker
+            label="Expiration Date"
+            description="Set an expiration date to receive a 7-day warning notification"
+            placeholder="No expiration"
+            clearable
+            valueFormat="MMM D, YYYY h:mm A"
+            value={watch('exp_date')}
+            onChange={(value) => setValue('exp_date', value)}
+          />
+        )}
+
         <Textarea
           label="Notes"
           placeholder="Add any notes or comments about this profile..."
diff --git a/frontend/src/components/tables/M3UsTable.jsx b/frontend/src/components/tables/M3UsTable.jsx
index e2e5e844..99aeed9b 100644
--- a/frontend/src/components/tables/M3UsTable.jsx
+++ b/frontend/src/components/tables/M3UsTable.jsx
@@ -32,7 +32,12 @@ import {
   SquarePlus,
 } from 'lucide-react';
 import useLocalStorage from '../../hooks/useLocalStorage';
-import { useDateTimeFormat, format } from '../../utils/dateTimeUtils.js';
+import {
+  useDateTimeFormat,
+  format,
+  diff,
+  getNow,
+} from '../../utils/dateTimeUtils.js';
 import ConfirmationDialog from '../../components/ConfirmationDialog';
 import useWarningsStore from '../../store/warnings';
 import { CustomTable, useTable } from './CustomTable';
@@ -159,7 +164,7 @@ const M3UTable = () => {
 
   const theme = useMantineTheme();
   const [tableSize] = useLocalStorage('table-size', 'default');
-  const { fullDateTimeFormat } = useDateTimeFormat();
+  const { fullDateFormat, fullDateTimeFormat } = useDateTimeFormat();
 
   const generateStatusString = (data) => {
     if (data.progress == 100) {
@@ -584,6 +589,64 @@ const M3UTable = () => {
         sortable: true,
         size: 125,
       },
+      {
+        header: 'Expiration',
+        accessorKey: 'earliest_expiration',
+        sortable: true,
+        size: 110,
+        cell: ({ cell, row }) => {
+          const data = row.original;
+
+          const earliest = cell.getValue();
+          if (!earliest) {
+            return null;
+          }
+
+          const now = getNow();
+          const daysLeft = diff(earliest, now, 'day');
+          let color;
+          let label;
+          if (daysLeft < 0) {
+            color = 'red.7';
+            label = 'Expired';
+          } else if (daysLeft === 0) {
+            color = 'red.5';
+            label = 'Expires today';
+          } else if (daysLeft <= 7) {
+            color = 'orange.5';
+            label = `${daysLeft}d left`;
+          } else if (daysLeft <= 30) {
+            color = 'yellow.5';
+            label = `${daysLeft}d left`;
+          } else {
+            label = format(earliest, fullDateFormat);
+          }
+
+          const allExpirations = data.all_expirations || [];
+          const tooltipContent =
+            allExpirations.length > 0
+              ? allExpirations
+                  .map(
+                    (e) =>
+                      `${e.profile_name}: ${format(e.exp_date, fullDateTimeFormat)}${!e.is_active ? ' (inactive)' : ''}`
+                  )
+                  .join('\n')
+              : label;
+
+          return (
+            <Tooltip
+              label={tooltipContent}
+              multiline
+              width={300}
+              style={{ whiteSpace: 'pre-line' }}
+            >
+              <Text size="xs" c={color} fw={daysLeft <= 7 ? 600 : 400}>
+                {label}
+              </Text>
+            </Tooltip>
+          );
+        },
+      },
       {
         header: 'Updated',
         accessorKey: 'updated_at',
@@ -624,6 +687,7 @@ const M3UTable = () => {
       editPlaylist,
       deletePlaylist,
       toggleActive,
+      fullDateFormat,
       fullDateTimeFormat,
     ]
   );
@@ -696,13 +760,22 @@ const M3UTable = () => {
         playlists
           .filter((playlist) => playlist.locked === false)
           .sort((a, b) => {
-            console.log(a);
-            console.log(newSorting[0].id);
-            if (a[compareColumn] !== b[compareColumn]) {
-              return compareDesc ? 1 : -1;
+            const aVal = a[compareColumn];
+            const bVal = b[compareColumn];
+
+            // Always sort nulls/undefined to the end regardless of direction
+            if (aVal == null && bVal == null) return 0;
+            if (aVal == null) return 1;
+            if (bVal == null) return -1;
+
+            let comparison;
+            if (typeof aVal === 'string') {
+              comparison = aVal.localeCompare(bVal);
+            } else {
+              comparison = aVal < bVal ? -1 : aVal > bVal ? 1 : 0;
             }
 
-            return 0;
+            return compareDesc ? -comparison : comparison;
           })
       );
     }
@@ -778,6 +851,7 @@ const M3UTable = () => {
       status: renderHeaderCell,
       last_message: renderHeaderCell,
       updated_at: renderHeaderCell,
+      earliest_expiration: renderHeaderCell,
       is_active: renderHeaderCell,
       actions: renderHeaderCell,
     },
diff --git a/frontend/src/store/notifications.jsx b/frontend/src/store/notifications.jsx
index 438b0cbc..6cbca91d 100644
--- a/frontend/src/store/notifications.jsx
+++ b/frontend/src/store/notifications.jsx
@@ -26,12 +26,15 @@ const useNotificationsStore = create((set, get) => ({
       );
       if (exists) {
         // Update existing notification
+        const updatedNotifications = state.notifications.map((n) =>
+          n.notification_key === notification.notification_key
+            ? { ...n, ...notification }
+            : n
+        );
         return {
-          notifications: state.notifications.map((n) =>
-            n.notification_key === notification.notification_key
-              ? { ...n, ...notification }
-              : n
-          ),
+          notifications: updatedNotifications,
+          unreadCount: updatedNotifications.filter((n) => !n.is_dismissed)
+            .length,
         };
       }
       // Add new notification

From c65ace1a7c92d5499e6e7f9da430a483a73a1b88 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Sat, 14 Mar 2026 19:24:01 -0500
Subject: [PATCH 009/172] fix: stuck channel states and ghost clients in TS
 proxy

- Write ERROR via ownership check OR state guard fallback when ownership TTL expired during retries
- Add INITIALIZING to cleanup task grace period monitoring
- Validate client SET entries against metadata hashes in orphaned channel cleanup; remove ghosts and clean up when no real clients remain
- Stats page self-heals by removing ghost SET entries on read
- Extract remove_ghost_clients() helper to ClientManager
- Add ChannelState.PRE_ACTIVE constant
- Fix 6 pre-existing NonOwnerWorkerKeepalive test failures
---
 .../tests/test_ts_proxy_ghost_clients.py      | 295 ++++++++++++++++++
 .../tests/test_ts_proxy_initializing.py       | 244 +++++++++++++++
 .../channels/tests/test_ts_proxy_keepalive.py |   7 +
 apps/proxy/ts_proxy/channel_status.py         |  83 +++--
 apps/proxy/ts_proxy/client_manager.py         |  33 ++
 apps/proxy/ts_proxy/constants.py              |   4 +
 apps/proxy/ts_proxy/server.py                 |  28 +-
 apps/proxy/ts_proxy/stream_manager.py         |  42 ++-
 8 files changed, 693 insertions(+), 43 deletions(-)
 create mode 100644 apps/channels/tests/test_ts_proxy_ghost_clients.py
 create mode 100644 apps/channels/tests/test_ts_proxy_initializing.py

diff --git a/apps/channels/tests/test_ts_proxy_ghost_clients.py b/apps/channels/tests/test_ts_proxy_ghost_clients.py
new file mode 100644
index 00000000..368fe82f
--- /dev/null
+++ b/apps/channels/tests/test_ts_proxy_ghost_clients.py
@@ -0,0 +1,295 @@
+"""Tests for ghost client detection and cleanup.
+
+Covers:
+  - channel_status detailed stats path removes ghost clients from Redis SET
+  - channel_status basic stats path removes ghost clients and corrects count
+  - _check_orphaned_metadata() validates client SET entries and cleans up
+    channels where all clients are ghosts
+"""
+from unittest.mock import MagicMock, patch, call
+
+from django.test import TestCase
+
+from apps.proxy.ts_proxy.constants import ChannelMetadataField, ChannelState
+from apps.proxy.ts_proxy.redis_keys import RedisKeys
+
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+def _make_proxy_server(redis_client=None):
+    """Create a minimal mock ProxyServer with a redis_client."""
+    server = MagicMock()
+    server.redis_client = redis_client or MagicMock()
+    server.stream_managers = {}
+    server.client_managers = {}
+    server.worker_id = "test-worker-1"
+    return server
+
+
+# ---------------------------------------------------------------------------
+# Detailed stats path: ghost client removal
+# ---------------------------------------------------------------------------
+
+class DetailedStatsGhostClientTests(TestCase):
+    """get_detailed_channel_info() should remove ghost clients whose metadata
+    hash has expired from the Redis client SET."""
+
+    def test_ghost_client_removed_from_set(self):
+        """Client ID in SET with no metadata hash should be SREM'd."""
+        redis = MagicMock()
+        # SMEMBERS returns one ghost client
+        redis.smembers.return_value = {b"ghost_client_001"}
+        # HGETALL returns empty (metadata expired)
+        redis.hgetall.return_value = {}
+
+        server = _make_proxy_server(redis)
+        channel_id = "00000000-0000-0000-0000-000000000001"
+
+        # Simulate the detailed stats ghost detection logic
+        client_set_key = RedisKeys.clients(channel_id)
+        client_ids = redis.smembers(client_set_key)
+        stale_ids = []
+        clients = []
+
+        for cid in client_ids:
+            cid_str = cid.decode('utf-8')
+            client_key = RedisKeys.client_metadata(channel_id, cid_str)
+            data = redis.hgetall(client_key)
+            if not data:
+                stale_ids.append(cid)
+                continue
+            clients.append({'client_id': cid_str})
+
+        if stale_ids:
+            redis.srem(client_set_key, *stale_ids)
+
+        redis.srem.assert_called_once_with(client_set_key, b"ghost_client_001")
+        self.assertEqual(len(clients), 0)
+
+    def test_live_client_preserved(self):
+        """Client with valid metadata hash should NOT be removed."""
+        redis = MagicMock()
+        redis.smembers.return_value = {b"live_client_001"}
+        redis.hgetall.return_value = {
+            b'user_agent': b'VLC/3.0',
+            b'ip_address': b'10.0.0.1',
+            b'connected_at': b'1773500000.0',
+        }
+
+        channel_id = "00000000-0000-0000-0000-000000000002"
+        client_set_key = RedisKeys.clients(channel_id)
+        client_ids = redis.smembers(client_set_key)
+        stale_ids = []
+        clients = []
+
+        for cid in client_ids:
+            cid_str = cid.decode('utf-8')
+            client_key = RedisKeys.client_metadata(channel_id, cid_str)
+            data = redis.hgetall(client_key)
+            if not data:
+                stale_ids.append(cid)
+                continue
+            clients.append({'client_id': cid_str})
+
+        if stale_ids:
+            redis.srem(client_set_key, *stale_ids)
+
+        redis.srem.assert_not_called()
+        self.assertEqual(len(clients), 1)
+
+    def test_mixed_ghost_and_live_clients(self):
+        """Only ghost clients should be removed; live ones preserved."""
+        redis = MagicMock()
+        redis.smembers.return_value = {b"ghost_001", b"live_001"}
+
+        def hgetall_side_effect(key):
+            if "ghost_001" in key:
+                return {}
+            return {b'user_agent': b'VLC', b'ip_address': b'10.0.0.1'}
+
+        redis.hgetall.side_effect = hgetall_side_effect
+
+        channel_id = "00000000-0000-0000-0000-000000000003"
+        client_set_key = RedisKeys.clients(channel_id)
+        client_ids = redis.smembers(client_set_key)
+        stale_ids = []
+        clients = []
+
+        for cid in client_ids:
+            cid_str = cid.decode('utf-8')
+            client_key = RedisKeys.client_metadata(channel_id, cid_str)
+            data = redis.hgetall(client_key)
+            if not data:
+                stale_ids.append(cid)
+                continue
+            clients.append({'client_id': cid_str})
+
+        if stale_ids:
+            redis.srem(client_set_key, *stale_ids)
+
+        self.assertEqual(len(stale_ids), 1)
+        self.assertEqual(len(clients), 1)
+        redis.srem.assert_called_once()
+
+
+# ---------------------------------------------------------------------------
+# Basic stats path: ghost client removal with pipeline
+# ---------------------------------------------------------------------------
+
+class BasicStatsGhostClientTests(TestCase):
+    """get_basic_channel_info() should use pipelined EXISTS checks, skip
+    ghost clients from display, SREM them, and correct client_count."""
+
+    def test_ghost_removed_and_count_corrected(self):
+        """Ghost client should be removed and client_count decremented."""
+        redis = MagicMock()
+        pipe = MagicMock()
+        redis.pipeline.return_value = pipe
+        redis.smembers.return_value = {b"ghost_001"}
+        redis.scard.return_value = 1
+        # Pipeline EXISTS returns False (hash expired)
+        pipe.execute.return_value = [False]
+
+        channel_id = "00000000-0000-0000-0000-000000000004"
+        client_set_key = RedisKeys.clients(channel_id)
+        client_count = redis.scard(client_set_key) or 0
+        client_ids = redis.smembers(client_set_key)
+
+        stale_ids = []
+        clients = []
+        client_id_list = list(client_ids)
+
+        pipe = redis.pipeline()
+        for cid in client_id_list:
+            cid_str = cid.decode('utf-8')
+            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
+        results = pipe.execute()
+
+        for idx, cid in enumerate(client_id_list):
+            if not results[idx]:
+                stale_ids.append(cid)
+                continue
+            clients.append({'client_id': cid.decode('utf-8')})
+
+        if stale_ids:
+            redis.srem(client_set_key, *stale_ids)
+            client_count = max(0, client_count - len(stale_ids))
+
+        self.assertEqual(len(stale_ids), 1)
+        self.assertEqual(len(clients), 0)
+        self.assertEqual(client_count, 0)
+        redis.srem.assert_called_once()
+
+
+# ---------------------------------------------------------------------------
+# Orphaned channel cleanup: ghost validation
+# ---------------------------------------------------------------------------
+
+class OrphanedChannelGhostValidationTests(TestCase):
+    """_check_orphaned_metadata() should validate client SET entries when
+    owner is dead and client_count > 0. If all clients are ghosts, it
+    should clean up the channel."""
+
+    def test_all_ghosts_triggers_cleanup(self):
+        """When all clients in SET are ghosts, channel should be cleaned up."""
+        redis = MagicMock()
+        pipe = MagicMock()
+        redis.pipeline.return_value = pipe
+        redis.smembers.return_value = {b"ghost_001", b"ghost_002"}
+        # Both clients are ghosts (EXISTS returns False)
+        pipe.execute.return_value = [False, False]
+
+        channel_id = "00000000-0000-0000-0000-000000000005"
+        client_set_key = RedisKeys.clients(channel_id)
+        client_count = 2
+
+        client_ids = redis.smembers(client_set_key)
+        client_id_list = list(client_ids)
+
+        pipe = redis.pipeline()
+        for cid in client_id_list:
+            cid_str = cid.decode('utf-8')
+            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
+        results = pipe.execute()
+
+        stale_ids = [
+            cid for cid, exists in zip(client_id_list, results)
+            if not exists
+        ]
+
+        if stale_ids:
+            redis.srem(client_set_key, *stale_ids)
+
+        real_count = client_count - len(stale_ids)
+
+        self.assertEqual(len(stale_ids), 2)
+        self.assertLessEqual(real_count, 0)
+        redis.srem.assert_called_once()
+
+    def test_mixed_preserves_live_clients(self):
+        """When some clients are live, channel should NOT be cleaned up."""
+        redis = MagicMock()
+        pipe = MagicMock()
+        redis.pipeline.return_value = pipe
+        redis.smembers.return_value = {b"ghost_001", b"live_001"}
+        # First is ghost, second is live
+        pipe.execute.return_value = [False, True]
+
+        channel_id = "00000000-0000-0000-0000-000000000006"
+        client_set_key = RedisKeys.clients(channel_id)
+        client_count = 2
+
+        client_ids = redis.smembers(client_set_key)
+        client_id_list = list(client_ids)
+
+        pipe = redis.pipeline()
+        for cid in client_id_list:
+            cid_str = cid.decode('utf-8')
+            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
+        results = pipe.execute()
+
+        stale_ids = [
+            cid for cid, exists in zip(client_id_list, results)
+            if not exists
+        ]
+
+        if stale_ids:
+            redis.srem(client_set_key, *stale_ids)
+
+        real_count = client_count - len(stale_ids)
+
+        self.assertEqual(len(stale_ids), 1)
+        self.assertEqual(real_count, 1)
+
+    def test_no_ghosts_no_cleanup(self):
+        """When all clients are live, no SREM should be called."""
+        redis = MagicMock()
+        pipe = MagicMock()
+        redis.pipeline.return_value = pipe
+        redis.smembers.return_value = {b"live_001"}
+        pipe.execute.return_value = [True]
+
+        channel_id = "00000000-0000-0000-0000-000000000007"
+        client_set_key = RedisKeys.clients(channel_id)
+
+        client_ids = redis.smembers(client_set_key)
+        client_id_list = list(client_ids)
+
+        pipe = redis.pipeline()
+        for cid in client_id_list:
+            cid_str = cid.decode('utf-8')
+            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
+        results = pipe.execute()
+
+        stale_ids = [
+            cid for cid, exists in zip(client_id_list, results)
+            if not exists
+        ]
+
+        if stale_ids:
+            redis.srem(client_set_key, *stale_ids)
+
+        self.assertEqual(len(stale_ids), 0)
+        redis.srem.assert_not_called()
diff --git a/apps/channels/tests/test_ts_proxy_initializing.py b/apps/channels/tests/test_ts_proxy_initializing.py
new file mode 100644
index 00000000..d803e759
--- /dev/null
+++ b/apps/channels/tests/test_ts_proxy_initializing.py
@@ -0,0 +1,244 @@
+"""Tests for stuck INITIALIZING state fix.
+
+Covers:
+  - stream_manager.run() finally block: ownership check + state guard fallback
+  - Channels in INITIALIZING state are included in cleanup task grace period monitoring
+"""
+import time
+from unittest.mock import MagicMock, patch
+
+from django.test import TestCase
+
+from apps.proxy.ts_proxy.constants import ChannelMetadataField, ChannelState
+from apps.proxy.ts_proxy.redis_keys import RedisKeys
+
+
+# ---------------------------------------------------------------------------
+# stream_manager.run() finally block: ownership + state guard behavior
+# ---------------------------------------------------------------------------
+
+class StreamManagerFinallyBlockTests(TestCase):
+    """The run() finally block writes ERROR if the worker is still the owner
+    (normal case) OR if ownership expired and the channel is still in a
+    pre-active state (no new owner has taken over)."""
+
+    def _make_stream_manager(self, tried_stream_ids=None, max_retries=3):
+        from apps.proxy.ts_proxy.stream_manager import StreamManager
+        sm = StreamManager.__new__(StreamManager)
+        sm.channel_id = "00000000-0000-0000-0000-000000000001"
+        sm.worker_id = "worker-1"
+        sm.max_retries = max_retries
+        sm.tried_stream_ids = tried_stream_ids or []
+        sm.running = False
+        sm.connected = False
+        sm.transcode_process_active = False
+        sm._buffer_check_timers = []
+
+        buffer = MagicMock()
+        buffer.redis_client = MagicMock()
+        sm.buffer = buffer
+
+        return sm
+
+    def _run_finally_logic(self, sm, owner_value, current_state):
+        """Simulate the finally block's state-update logic.
+
+        Args:
+            sm: StreamManager mock
+            owner_value: bytes value of owner key (None = expired,
+                         sm.worker_id.encode() = self, b'other' = new owner)
+            current_state: ChannelState string or None
+        Returns:
+            True if ERROR was written, False otherwise
+        """
+        redis = sm.buffer.redis_client
+
+        # Mock the owner key GET
+        redis.get.return_value = owner_value
+
+        # Mock hget for state field
+        if current_state is not None:
+            redis.hget.return_value = current_state.encode('utf-8')
+        else:
+            redis.hget.return_value = None
+
+        # Replicate the finally block logic
+        owner_key = RedisKeys.channel_owner(sm.channel_id)
+        current_owner = redis.get(owner_key)
+
+        is_owner = (
+            current_owner
+            and sm.worker_id
+            and current_owner.decode('utf-8') == sm.worker_id
+        )
+        no_owner = current_owner is None
+
+        should_update = is_owner
+        if not should_update and no_owner:
+            metadata_key = RedisKeys.channel_metadata(sm.channel_id)
+            current_state_bytes = redis.hget(
+                metadata_key, ChannelMetadataField.STATE
+            )
+            current_state_str = (
+                current_state_bytes.decode('utf-8')
+                if current_state_bytes else None
+            )
+            should_update = current_state_str in ChannelState.PRE_ACTIVE
+
+        if should_update:
+            if sm.tried_stream_ids and len(sm.tried_stream_ids) > 0:
+                error_message = f"All {len(sm.tried_stream_ids)} stream options failed"
+            else:
+                error_message = f"Connection failed after {sm.max_retries} attempts"
+
+            metadata_key = RedisKeys.channel_metadata(sm.channel_id)
+            update_data = {
+                ChannelMetadataField.STATE: ChannelState.ERROR,
+                ChannelMetadataField.STATE_CHANGED_AT: str(time.time()),
+                ChannelMetadataField.ERROR_MESSAGE: error_message,
+                ChannelMetadataField.ERROR_TIME: str(time.time())
+            }
+            redis.hset(metadata_key, mapping=update_data)
+            stop_key = RedisKeys.channel_stopping(sm.channel_id)
+            redis.setex(stop_key, 60, "true")
+            return True
+        return False
+
+    # --- Owner still valid: always write ERROR ---
+
+    def test_owner_writes_error_regardless_of_state(self):
+        """When we're still the owner, always write ERROR."""
+        sm = self._make_stream_manager()
+        owner = sm.worker_id.encode('utf-8')
+        # State doesn't matter when we're the owner
+        updated = self._run_finally_logic(sm, owner, ChannelState.ACTIVE)
+        self.assertTrue(updated)
+
+    def test_owner_writes_error_on_initializing(self):
+        """Owner + INITIALIZING = write ERROR."""
+        sm = self._make_stream_manager()
+        owner = sm.worker_id.encode('utf-8')
+        updated = self._run_finally_logic(sm, owner, ChannelState.INITIALIZING)
+        self.assertTrue(updated)
+        call_args = sm.buffer.redis_client.hset.call_args
+        self.assertEqual(
+            call_args[1]['mapping'][ChannelMetadataField.STATE],
+            ChannelState.ERROR
+        )
+
+    # --- Ownership expired, no new owner: use state guard ---
+
+    def test_no_owner_initializing_writes_error(self):
+        """Ownership expired + INITIALIZING = write ERROR."""
+        sm = self._make_stream_manager()
+        updated = self._run_finally_logic(sm, None, ChannelState.INITIALIZING)
+        self.assertTrue(updated)
+
+    def test_no_owner_connecting_writes_error(self):
+        """Ownership expired + CONNECTING = write ERROR."""
+        sm = self._make_stream_manager()
+        updated = self._run_finally_logic(sm, None, ChannelState.CONNECTING)
+        self.assertTrue(updated)
+
+    def test_no_owner_buffering_writes_error(self):
+        """Ownership expired + BUFFERING = write ERROR."""
+        sm = self._make_stream_manager()
+        updated = self._run_finally_logic(sm, None, ChannelState.BUFFERING)
+        self.assertTrue(updated)
+
+    def test_no_owner_waiting_for_clients_writes_error(self):
+        """Ownership expired + WAITING_FOR_CLIENTS = write ERROR."""
+        sm = self._make_stream_manager()
+        updated = self._run_finally_logic(sm, None, ChannelState.WAITING_FOR_CLIENTS)
+        self.assertTrue(updated)
+
+    def test_no_owner_active_does_not_write(self):
+        """Ownership expired + ACTIVE = do NOT write ERROR.
+        ACTIVE means a previous owner successfully served the channel."""
+        sm = self._make_stream_manager()
+        updated = self._run_finally_logic(sm, None, ChannelState.ACTIVE)
+        self.assertFalse(updated)
+
+    def test_no_owner_error_does_not_write(self):
+        """Ownership expired + already ERROR = do NOT write again."""
+        sm = self._make_stream_manager()
+        updated = self._run_finally_logic(sm, None, ChannelState.ERROR)
+        self.assertFalse(updated)
+
+    def test_no_owner_no_state_does_not_write(self):
+        """Ownership expired + no state metadata = do NOT write."""
+        sm = self._make_stream_manager()
+        updated = self._run_finally_logic(sm, None, None)
+        self.assertFalse(updated)
+
+    # --- New owner took over: never clobber ---
+
+    def test_new_owner_initializing_does_not_write(self):
+        """Another worker owns the channel and is INITIALIZING —
+        do NOT clobber, even though state is pre-active."""
+        sm = self._make_stream_manager()
+        updated = self._run_finally_logic(sm, b"other-worker", ChannelState.INITIALIZING)
+        self.assertFalse(updated)
+
+    def test_new_owner_active_does_not_write(self):
+        """Another worker owns the channel and is ACTIVE — do NOT write."""
+        sm = self._make_stream_manager()
+        updated = self._run_finally_logic(sm, b"other-worker", ChannelState.ACTIVE)
+        self.assertFalse(updated)
+
+    # --- Stopping key and error messages ---
+
+    def test_stopping_key_set_on_error_update(self):
+        """When ERROR is written, stopping key must also be set."""
+        sm = self._make_stream_manager()
+        self._run_finally_logic(sm, None, ChannelState.INITIALIZING)
+        sm.buffer.redis_client.setex.assert_called_once()
+        args = sm.buffer.redis_client.setex.call_args[0]
+        self.assertIn("stopping", args[0])
+        self.assertEqual(args[1], 60)
+
+    def test_error_message_includes_stream_count(self):
+        """When multiple streams were tried, error message reflects that."""
+        sm = self._make_stream_manager(tried_stream_ids=[1, 2, 3])
+        self._run_finally_logic(sm, None, ChannelState.INITIALIZING)
+        call_args = sm.buffer.redis_client.hset.call_args
+        error_msg = call_args[1]['mapping'][ChannelMetadataField.ERROR_MESSAGE]
+        self.assertIn("3 stream options failed", error_msg)
+
+    def test_error_message_with_no_streams_tried(self):
+        """When no alternate streams were tried, shows retry count."""
+        sm = self._make_stream_manager(tried_stream_ids=[], max_retries=5)
+        self._run_finally_logic(sm, None, ChannelState.INITIALIZING)
+        call_args = sm.buffer.redis_client.hset.call_args
+        error_msg = call_args[1]['mapping'][ChannelMetadataField.ERROR_MESSAGE]
+        self.assertIn("5", error_msg)
+
+
+# ---------------------------------------------------------------------------
+# Cleanup task: INITIALIZING included in grace period monitoring
+# ---------------------------------------------------------------------------
+
+class CleanupTaskInitializingStateTests(TestCase):
+    """The cleanup task's grace period check must include INITIALIZING
+    alongside CONNECTING and WAITING_FOR_CLIENTS."""
+
+    def test_initializing_in_monitored_states(self):
+        """ChannelState.INITIALIZING must be in the list of states that
+        trigger grace period monitoring in the cleanup task."""
+        monitored_states = [
+            ChannelState.INITIALIZING,
+            ChannelState.CONNECTING,
+            ChannelState.WAITING_FOR_CLIENTS,
+        ]
+        self.assertIn(ChannelState.INITIALIZING, monitored_states)
+        self.assertIn(ChannelState.CONNECTING, monitored_states)
+        self.assertIn(ChannelState.WAITING_FOR_CLIENTS, monitored_states)
+
+    def test_active_not_in_monitored_states(self):
+        """ACTIVE channels should NOT be in the grace period list."""
+        monitored_states = [
+            ChannelState.INITIALIZING,
+            ChannelState.CONNECTING,
+            ChannelState.WAITING_FOR_CLIENTS,
+        ]
+        self.assertNotIn(ChannelState.ACTIVE, monitored_states)
diff --git a/apps/channels/tests/test_ts_proxy_keepalive.py b/apps/channels/tests/test_ts_proxy_keepalive.py
index db388b3d..67793899 100644
--- a/apps/channels/tests/test_ts_proxy_keepalive.py
+++ b/apps/channels/tests/test_ts_proxy_keepalive.py
@@ -85,6 +85,13 @@ class NonOwnerWorkerKeepaliveTests(TestCase):
 
         gen.stream_manager = None  # non-owner worker
         gen.consecutive_empty = consecutive_empty
+
+        # Attributes added by health-check throttling (set in __init__)
+        gen._last_health_check_time = 0.0
+        gen._last_health_check_result = False
+        gen._health_check_interval = 2.0
+        gen.proxy_server = None
+
         return gen
 
     def _mock_proxy_server(self, last_data_value):
diff --git a/apps/proxy/ts_proxy/channel_status.py b/apps/proxy/ts_proxy/channel_status.py
index 8f1d0649..33aaa012 100644
--- a/apps/proxy/ts_proxy/channel_status.py
+++ b/apps/proxy/ts_proxy/channel_status.py
@@ -6,6 +6,7 @@ from .redis_keys import RedisKeys
 from .constants import TS_PACKET_SIZE, ChannelMetadataField
 from redis.exceptions import ConnectionError, TimeoutError
 from .utils import get_logger
+from .client_manager import ClientManager
 from django.db import DatabaseError  # Add import for error handling
 
 logger = get_logger()
@@ -127,43 +128,56 @@ class ChannelStatus:
         client_ids = proxy_server.redis_client.smembers(client_set_key)
         clients = []
 
+        stale_client_ids = []
         for client_id in client_ids:
             client_id_str = client_id.decode('utf-8')
             client_key = RedisKeys.client_metadata(channel_id, client_id_str)
             client_data = proxy_server.redis_client.hgetall(client_key)
 
-            if client_data:
-                client_info = {
-                    'client_id': client_id_str,
-                    'user_agent': client_data.get(b'user_agent', b'unknown').decode('utf-8'),
-                    'worker_id': client_data.get(b'worker_id', b'unknown').decode('utf-8'),
-                }
+            if not client_data:
+                # Metadata hash expired but SET entry persists (ghost client).
+                stale_client_ids.append(client_id)
+                continue
 
-                if b'connected_at' in client_data:
-                    connected_at = float(client_data[b'connected_at'].decode('utf-8'))
-                    client_info['connected_at'] = connected_at
-                    client_info['connection_duration'] = time.time() - connected_at
+            client_info = {
+                'client_id': client_id_str,
+                'user_agent': client_data.get(b'user_agent', b'unknown').decode('utf-8'),
+                'worker_id': client_data.get(b'worker_id', b'unknown').decode('utf-8'),
+            }
 
-                if b'last_active' in client_data:
-                    last_active = float(client_data[b'last_active'].decode('utf-8'))
-                    client_info['last_active'] = last_active
-                    client_info['last_active_ago'] = time.time() - last_active
+            if b'connected_at' in client_data:
+                connected_at = float(client_data[b'connected_at'].decode('utf-8'))
+                client_info['connected_at'] = connected_at
+                client_info['connection_duration'] = time.time() - connected_at
 
-                # Add transfer rate statistics
-                if b'bytes_sent' in client_data:
-                    client_info['bytes_sent'] = int(client_data[b'bytes_sent'].decode('utf-8'))
+            if b'last_active' in client_data:
+                last_active = float(client_data[b'last_active'].decode('utf-8'))
+                client_info['last_active'] = last_active
+                client_info['last_active_ago'] = time.time() - last_active
 
-                # Add average transfer rate
-                if b'avg_rate_KBps' in client_data:
-                    client_info['avg_rate_KBps'] = float(client_data[b'avg_rate_KBps'].decode('utf-8'))
-                elif b'transfer_rate_KBps' in client_data:  # For backward compatibility
-                    client_info['avg_rate_KBps'] = float(client_data[b'transfer_rate_KBps'].decode('utf-8'))
+            # Add transfer rate statistics
+            if b'bytes_sent' in client_data:
+                client_info['bytes_sent'] = int(client_data[b'bytes_sent'].decode('utf-8'))
 
-                # Add current transfer rate
-                if b'current_rate_KBps' in client_data:
-                    client_info['current_rate_KBps'] = float(client_data[b'current_rate_KBps'].decode('utf-8'))
+            # Add average transfer rate
+            if b'avg_rate_KBps' in client_data:
+                client_info['avg_rate_KBps'] = float(client_data[b'avg_rate_KBps'].decode('utf-8'))
+            elif b'transfer_rate_KBps' in client_data:  # For backward compatibility
+                client_info['avg_rate_KBps'] = float(client_data[b'transfer_rate_KBps'].decode('utf-8'))
 
-                clients.append(client_info)
+            # Add current transfer rate
+            if b'current_rate_KBps' in client_data:
+                client_info['current_rate_KBps'] = float(client_data[b'current_rate_KBps'].decode('utf-8'))
+
+            clients.append(client_info)
+
+        # Clean up stale SET entries so SCARD stays accurate.
+        if stale_client_ids:
+            proxy_server.redis_client.srem(client_set_key, *stale_client_ids)
+            logger.info(
+                f"Removed {len(stale_client_ids)} ghost client(s) from "
+                f"channel {channel_id} client set"
+            )
 
         info['clients'] = clients
         info['client_count'] = len(clients)
@@ -430,19 +444,26 @@ class ChannelStatus:
             clients = []
             client_ids = proxy_server.redis_client.smembers(client_set_key)
 
-            # Process only if we have clients and keep it limited
+            # Remove ghost SET entries before building the client list.
+            stale_client_ids = ClientManager.remove_ghost_clients(
+                proxy_server.redis_client, channel_id
+            )
+            if stale_client_ids:
+                client_count = max(0, client_count - len(stale_client_ids))
+
+            # Build concise client list (up to 10) from remaining live clients.
             if client_ids:
-                # Get up to 10 clients for the basic view
                 for client_id in list(client_ids)[:10]:
+                    if client_id in stale_client_ids:
+                        continue
+
                     client_id_str = client_id.decode('utf-8')
                     client_key = RedisKeys.client_metadata(channel_id, client_id_str)
 
-                    # Efficient way - just retrieve the essentials
                     client_info = {
                         'client_id': client_id_str,
                     }
 
-                    # Safely get user_agent and ip_address
                     user_agent_bytes = proxy_server.redis_client.hget(client_key, 'user_agent')
                     client_info['user_agent'] = safe_decode(user_agent_bytes)
 
@@ -450,7 +471,6 @@ class ChannelStatus:
                     if ip_address_bytes:
                         client_info['ip_address'] = safe_decode(ip_address_bytes)
 
-                    # Just get connected_at for client age
                     connected_at_bytes = proxy_server.redis_client.hget(client_key, 'connected_at')
                     if connected_at_bytes:
                         connected_at = float(connected_at_bytes.decode('utf-8'))
@@ -460,6 +480,7 @@ class ChannelStatus:
 
             # Add clients to info
             info['clients'] = clients
+            info['client_count'] = client_count
 
             # Add M3U profile information
             m3u_profile_id_bytes = metadata.get(ChannelMetadataField.M3U_PROFILE.encode('utf-8'))
diff --git a/apps/proxy/ts_proxy/client_manager.py b/apps/proxy/ts_proxy/client_manager.py
index 836f719e..e3ae7542 100644
--- a/apps/proxy/ts_proxy/client_manager.py
+++ b/apps/proxy/ts_proxy/client_manager.py
@@ -413,3 +413,36 @@ class ClientManager:
             self.redis_client.expire(self.client_set_key, self.client_ttl)
         except Exception as e:
             logger.error(f"Error refreshing client TTL: {e}")
+
+    @staticmethod
+    def remove_ghost_clients(redis_client, channel_id):
+        """Remove client SET entries whose metadata hash has expired.
+
+        Returns the list of removed (stale) client IDs, or an empty list
+        if none were found. Uses a pipelined EXISTS check for efficiency.
+        """
+        client_set_key = RedisKeys.clients(channel_id)
+        client_ids = redis_client.smembers(client_set_key)
+        if not client_ids:
+            return []
+
+        client_id_list = list(client_ids)
+        pipe = redis_client.pipeline()
+        for cid in client_id_list:
+            cid_str = cid.decode('utf-8')
+            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
+        results = pipe.execute()
+
+        stale_ids = [
+            cid for cid, exists in zip(client_id_list, results)
+            if not exists
+        ]
+
+        if stale_ids:
+            redis_client.srem(client_set_key, *stale_ids)
+            logger.info(
+                f"Removed {len(stale_ids)} ghost client(s) from "
+                f"channel {channel_id} client set"
+            )
+
+        return stale_ids
diff --git a/apps/proxy/ts_proxy/constants.py b/apps/proxy/ts_proxy/constants.py
index 7baa9e1c..ca44a278 100644
--- a/apps/proxy/ts_proxy/constants.py
+++ b/apps/proxy/ts_proxy/constants.py
@@ -20,6 +20,10 @@ class ChannelState:
     STOPPED = "stopped"
     BUFFERING = "buffering"
 
+    # States before a channel is fully active. Used by the stream manager
+    # finally block to decide whether a failed stream can write ERROR.
+    PRE_ACTIVE = [INITIALIZING, CONNECTING, BUFFERING, WAITING_FOR_CLIENTS]
+
 # Event types
 class EventType:
     STREAM_SWITCH = "stream_switch"
diff --git a/apps/proxy/ts_proxy/server.py b/apps/proxy/ts_proxy/server.py
index e1e2c545..b72b350a 100644
--- a/apps/proxy/ts_proxy/server.py
+++ b/apps/proxy/ts_proxy/server.py
@@ -1080,7 +1080,7 @@ class ProxyServer:
                                 logger.info(f"Channel {channel_id} has {total_clients} clients, state: {channel_state}")
 
                             # If in connecting or waiting_for_clients state, check grace period
-                            if channel_state in [ChannelState.CONNECTING, ChannelState.WAITING_FOR_CLIENTS]:
+                            if channel_state in [ChannelState.INITIALIZING, ChannelState.CONNECTING, ChannelState.WAITING_FOR_CLIENTS]:
                                 # Check if channel is already stopping
                                 if self.redis_client:
                                     stop_key = RedisKeys.channel_stopping(channel_id)
@@ -1389,8 +1389,30 @@ class ProxyServer:
                             # Just clean up Redis keys for remote channels
                             self._clean_redis_keys(channel_id)
                     elif not owner_alive and client_count > 0:
-                        # Owner is gone but clients remain - just log for now
-                        logger.warning(f"Found orphaned channel {channel_id} with {client_count} clients but no owner - may need ownership takeover")
+                        # SCARD may include ghost entries from a dead worker's
+                        # expired metadata hashes. Validate before deciding.
+                        stale_ids = ClientManager.remove_ghost_clients(
+                            self.redis_client, channel_id
+                        )
+                        real_count = max(0, client_count - len(stale_ids))
+                        if real_count <= 0:
+                            # No real clients remain — safe to clean up.
+                            state = metadata.get(b'state', b'unknown').decode('utf-8') if b'state' in metadata else 'unknown'
+                            logger.warning(
+                                f"Orphaned channel {channel_id} (state: {state}, "
+                                f"owner: {owner}) had {client_count} ghost client(s) "
+                                f"- cleaning up"
+                            )
+                            if channel_id in self.stream_managers or channel_id in self.client_managers:
+                                self.stop_channel(channel_id)
+                            else:
+                                self._clean_redis_keys(channel_id)
+                        else:
+                            logger.warning(
+                                f"Orphaned channel {channel_id} still has "
+                                f"{real_count} live client(s) after ghost removal "
+                                f"- may need ownership takeover"
+                            )
 
                 except Exception as e:
                     logger.error(f"Error processing metadata key {key}: {e}", exc_info=True)
diff --git a/apps/proxy/ts_proxy/stream_manager.py b/apps/proxy/ts_proxy/stream_manager.py
index e7f752d8..424e8231 100644
--- a/apps/proxy/ts_proxy/stream_manager.py
+++ b/apps/proxy/ts_proxy/stream_manager.py
@@ -401,24 +401,44 @@ class StreamManager:
             # Close all connections
             self._close_all_connections()
 
-            # Update channel state in Redis to prevent clients from waiting indefinitely
+            # Transition to ERROR so clients stop waiting. Ownership may have
+            # expired during retries, so fall back to a state guard when no
+            # owner exists — but never clobber a new owner's active stream.
             if hasattr(self.buffer, 'redis_client') and self.buffer.redis_client:
                 try:
                     metadata_key = RedisKeys.channel_metadata(self.channel_id)
-
-                    # Check if we're the owner before updating state
                     owner_key = RedisKeys.channel_owner(self.channel_id)
                     current_owner = self.buffer.redis_client.get(owner_key)
 
-                    # Use the worker_id that was passed in during initialization
-                    if current_owner and self.worker_id and current_owner.decode('utf-8') == self.worker_id:
-                        # Determine the appropriate error message based on retry failures
+                    is_owner = (
+                        current_owner
+                        and self.worker_id
+                        and current_owner.decode('utf-8') == self.worker_id
+                    )
+                    no_owner = current_owner is None
+
+                    should_update = is_owner
+                    if not should_update and no_owner:
+                        current_state_bytes = self.buffer.redis_client.hget(
+                            metadata_key, ChannelMetadataField.STATE
+                        )
+                        current_state = (
+                            current_state_bytes.decode('utf-8')
+                            if current_state_bytes else None
+                        )
+                        should_update = current_state in ChannelState.PRE_ACTIVE
+                        if not should_update and current_state:
+                            logger.info(
+                                f"Channel {self.channel_id} has no owner but "
+                                f"state is {current_state} — skipping ERROR update"
+                            )
+
+                    if should_update:
                         if self.tried_stream_ids and len(self.tried_stream_ids) > 0:
                             error_message = f"All {len(self.tried_stream_ids)} stream options failed"
                         else:
                             error_message = f"Connection failed after {self.max_retries} attempts"
 
-                        # Update metadata to indicate error state
                         update_data = {
                             ChannelMetadataField.STATE: ChannelState.ERROR,
                             ChannelMetadataField.STATE_CHANGED_AT: str(time.time()),
@@ -426,9 +446,13 @@ class StreamManager:
                             ChannelMetadataField.ERROR_TIME: str(time.time())
                         }
                         self.buffer.redis_client.hset(metadata_key, mapping=update_data)
-                        logger.info(f"Updated channel {self.channel_id} state to ERROR in Redis after stream failure")
+                        logger.info(
+                            f"Updated channel {self.channel_id} state to ERROR "
+                            f"in Redis after stream failure "
+                            f"(owner={'self' if is_owner else 'expired'})"
+                        )
 
-                        # Also set stopping key to ensure clients disconnect
+                        # Signal clients to disconnect
                         stop_key = RedisKeys.channel_stopping(self.channel_id)
                         self.buffer.redis_client.setex(stop_key, 60, "true")
                 except Exception as e:

From 1f97143bf892905579e655526f55c6ad16ac4380 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Sun, 15 Mar 2026 00:59:58 -0500
Subject: [PATCH 010/172] fix: resolve HTML named entities in XMLTV files
 before parsing

lxml 6.0.2 with recover=True silently drops HTML named entities (e.g. &eacute;, &icirc;) that are not valid XML, causing channel names and program data to lose characters during EPG ingestion.

- Add preprocessing step in fetch_xmltv() that converts HTML named entities to Unicode while preserving XML-predefined entities
- Detect encoding from XML declaration, fall back to UTF-8 for unknown codecs, skip files that fail to decode cleanly
- Guard against entities resolving to XML-special characters and html.unescape partial matching edge cases
- Add 28 unit tests covering entity resolution, encoding detection, and file-level processing
---
 apps/epg/tasks.py                        |  89 +++++++++++
 apps/epg/tests/test_entity_resolution.py | 195 +++++++++++++++++++++++
 2 files changed, 284 insertions(+)
 create mode 100644 apps/epg/tests/test_entity_resolution.py

diff --git a/apps/epg/tasks.py b/apps/epg/tasks.py
index f4c85256..5d567e6e 100644
--- a/apps/epg/tasks.py
+++ b/apps/epg/tasks.py
@@ -1,8 +1,11 @@
 # apps/epg/tasks.py
 
+import codecs
 import logging
 import gzip
+import html as html_module
 import os
+import re
 import uuid
 import requests
 import time  # Add import for tracking download progress
@@ -28,6 +31,85 @@ from core.utils import acquire_task_lock, release_task_lock, TaskLockRenewer, se
 
 logger = logging.getLogger(__name__)
 
+# Regex and helpers for resolving HTML named entities in XMLTV files.
+# lxml only recognises the 5 XML-predefined entities; HTML entities like
+# &eacute; are silently dropped in recovery mode.  This substitution
+# converts them to Unicode before the file reaches the parser.
+_XML_ENTITIES = frozenset({'amp', 'lt', 'gt', 'quot', 'apos'})
+_XML_SPECIAL_CHARS = frozenset('&<>\'"')
+_NAMED_ENTITY_RE = re.compile(r'&([a-zA-Z][a-zA-Z0-9]*);')
+
+
+def _replace_html_entity(match):
+    """Replace a single HTML named entity, preserving XML-special ones.
+
+    Skips lowercase XML entities (fast path) and any entity whose resolved
+    output contains XML-special characters that would break parsing.  This
+    also guards against html.unescape partially matching sub-patterns
+    (e.g. &ampersand; being split into &amp + ersand;).
+    """
+    original = match.group(0)
+    name = match.group(1)
+    if name in _XML_ENTITIES:
+        return original
+    resolved = html_module.unescape(original)
+    if resolved == original:
+        return original
+    # If the resolved output contains any XML-special character, replacing
+    # it would produce invalid XML (bare &, <, >, etc.)
+    if _XML_SPECIAL_CHARS.intersection(resolved):
+        return original
+    return resolved
+
+
+def _detect_xml_encoding(header):
+    """Detect encoding from raw XML header bytes, defaulting to UTF-8.
+
+    Falls back to UTF-8 if the declared encoding is not recognized by Python.
+    """
+    m = re.match(rb'<\?xml[^>]*encoding=["\']([^"\']+)["\']', header)
+    if m:
+        declared = m.group(1).decode('ascii')
+        try:
+            codecs.lookup(declared)
+            return declared
+        except LookupError:
+            logger.warning(f"Unknown encoding '{declared}', falling back to UTF-8")
+            return 'utf-8'
+    return 'utf-8'
+
+
+def _resolve_html_entities(file_path):
+    """Replace HTML named entities in an XMLTV file with Unicode characters.
+
+    Processes line-by-line to keep memory usage low, writes to a temp file,
+    then atomically replaces the original.  Honors the encoding declared
+    in the XML declaration.  If the file cannot be decoded cleanly it is
+    left untouched for lxml to handle with its own recovery mode.
+    """
+    # Read the first 200 bytes to detect encoding from the XML declaration
+    with open(file_path, 'rb') as f:
+        header = f.read(200)
+    encoding = _detect_xml_encoding(header)
+
+    temp_path = file_path + '.entity_tmp'
+    success = False
+    try:
+        with open(file_path, 'r', encoding=encoding) as src, \
+             open(temp_path, 'w', encoding=encoding) as dst:
+            for line in src:
+                dst.write(_NAMED_ENTITY_RE.sub(_replace_html_entity, line))
+        os.replace(temp_path, file_path)
+        success = True
+        logger.debug(f"Resolved HTML entities in {file_path} (encoding: {encoding})")
+    except (UnicodeDecodeError, UnicodeEncodeError):
+        # Leave the file untouched for lxml to handle with its own
+        # encoding detection and recovery mode.
+        logger.debug(f"Skipping entity resolution for {file_path}: encoding error with {encoding}")
+    finally:
+        if not success and os.path.exists(temp_path):
+            os.unlink(temp_path)
+
 
 def validate_icon_url_fast(icon_url, max_length=None):
     """
@@ -280,6 +362,9 @@ def fetch_xmltv(source):
         # Send a download complete notification
         send_epg_update(source.id, "downloading", 100, status="success")
 
+        # Resolve HTML named entities so lxml doesn't drop them during parsing
+        _resolve_html_entities(source.extracted_file_path or source.file_path)
+
         # Return True to indicate successful fetch, processing will continue with parse_channels_only
         return True
 
@@ -526,6 +611,10 @@ def fetch_xmltv(source):
             source.save(update_fields=['status'])
 
             logger.info(f"Cached EPG file saved to {source.file_path}")
+
+            # Resolve HTML named entities so lxml doesn't drop them during parsing
+            _resolve_html_entities(source.extracted_file_path or source.file_path)
+
             return True
 
     except requests.exceptions.HTTPError as e:
diff --git a/apps/epg/tests/test_entity_resolution.py b/apps/epg/tests/test_entity_resolution.py
new file mode 100644
index 00000000..353d9b51
--- /dev/null
+++ b/apps/epg/tests/test_entity_resolution.py
@@ -0,0 +1,195 @@
+import os
+import tempfile
+
+from django.test import TestCase
+
+from apps.epg.tasks import (
+    _NAMED_ENTITY_RE,
+    _detect_xml_encoding,
+    _replace_html_entity,
+    _resolve_html_entities,
+)
+
+
+class ReplaceHtmlEntityTests(TestCase):
+    """Tests for the regex callback that resolves individual HTML entities."""
+
+    def _sub(self, text):
+        return _NAMED_ENTITY_RE.sub(_replace_html_entity, text)
+
+    def test_french_accented(self):
+        self.assertEqual(self._sub("Cha&icirc;ne T&eacute;l&eacute;"), "Chaîne Télé")
+
+    def test_german_umlauts(self):
+        self.assertEqual(self._sub("M&uuml;nchen &Uuml;bersicht &szlig;"), "München Übersicht ß")
+
+    def test_spanish(self):
+        self.assertEqual(self._sub("Espa&ntilde;a &iquest;Qu&eacute;?"), "España ¿Qué?")
+
+    def test_portuguese(self):
+        self.assertEqual(self._sub("Comunica&ccedil;&atilde;o"), "Comunicação")
+
+    def test_scandinavian(self):
+        self.assertEqual(self._sub("Norsk &oslash; &aring; &aelig;"), "Norsk ø å æ")
+
+    def test_greek_letters(self):
+        self.assertEqual(self._sub("&alpha;&beta;&gamma;"), "αβγ")
+
+    def test_currency_and_symbols(self):
+        self.assertEqual(self._sub("&copy; &euro; &pound; &yen;"), "© € £ ¥")
+
+    def test_preserves_xml_amp(self):
+        self.assertEqual(self._sub("A &amp; B"), "A &amp; B")
+
+    def test_preserves_xml_lt_gt(self):
+        self.assertEqual(self._sub("&lt;tag&gt;"), "&lt;tag&gt;")
+
+    def test_preserves_xml_quot_apos(self):
+        self.assertEqual(self._sub("&quot;hello&apos;"), "&quot;hello&apos;")
+
+    def test_preserves_uppercase_xml_entities(self):
+        """&AMP;, &LT;, &GT;, &QUOT; resolve to XML-special chars; must not be replaced."""
+        self.assertEqual(self._sub("&AMP;"), "&AMP;")
+        self.assertEqual(self._sub("&LT;"), "&LT;")
+        self.assertEqual(self._sub("&GT;"), "&GT;")
+        self.assertEqual(self._sub("&QUOT;"), "&QUOT;")
+
+    def test_partial_entity_match_preserved(self):
+        """html.unescape can partially match &amp inside &ampersand; — must not corrupt."""
+        self.assertEqual(self._sub("&ampersand;"), "&ampersand;")
+
+    def test_mixed_html_and_xml_entities(self):
+        self.assertEqual(
+            self._sub("R&eacute;sum&eacute; &amp; Co &lt;test&gt;"),
+            "Résumé &amp; Co &lt;test&gt;",
+        )
+
+    def test_plain_ascii_unchanged(self):
+        self.assertEqual(self._sub("Plain ASCII text"), "Plain ASCII text")
+
+    def test_direct_utf8_unchanged(self):
+        self.assertEqual(self._sub("日本語テレビ"), "日本語テレビ")
+
+    def test_unknown_entity_preserved(self):
+        self.assertEqual(self._sub("&zzfakeentity;"), "&zzfakeentity;")
+
+
+class ResolveHtmlEntitiesFileTests(TestCase):
+    """Tests for the file-level preprocessing function."""
+
+    def _make_file(self, content):
+        fd, path = tempfile.mkstemp(suffix=".xml")
+        with os.fdopen(fd, "w", encoding="utf-8") as f:
+            f.write(content)
+        self.addCleanup(lambda: os.unlink(path) if os.path.exists(path) else None)
+        return path
+
+    def test_resolves_entities_in_file(self):
+        path = self._make_file(
+            '<?xml version="1.0"?>\n<tv><channel><display-name>T&eacute;l&eacute;</display-name></channel></tv>'
+        )
+        _resolve_html_entities(path)
+        with open(path, "r", encoding="utf-8") as f:
+            content = f.read()
+        self.assertIn("Télé", content)
+        self.assertNotIn("&eacute;", content)
+
+    def test_preserves_xml_entities_in_file(self):
+        path = self._make_file("<tv><desc>A &amp; B &lt;C&gt;</desc></tv>")
+        _resolve_html_entities(path)
+        with open(path, "r", encoding="utf-8") as f:
+            content = f.read()
+        self.assertIn("&amp;", content)
+        self.assertIn("&lt;", content)
+        self.assertIn("&gt;", content)
+
+    def test_no_temp_file_left_on_success(self):
+        path = self._make_file("<tv>test</tv>")
+        _resolve_html_entities(path)
+        self.assertFalse(os.path.exists(path + ".entity_tmp"))
+
+    def test_plain_file_unchanged(self):
+        original = '<?xml version="1.0"?>\n<tv><channel><display-name>Plain</display-name></channel></tv>'
+        path = self._make_file(original)
+        _resolve_html_entities(path)
+        with open(path, "r", encoding="utf-8") as f:
+            content = f.read()
+        self.assertEqual(content, original)
+
+    def test_utf8_content_preserved(self):
+        original = "<tv><channel><display-name>日本語テレビ</display-name></channel></tv>"
+        path = self._make_file(original)
+        _resolve_html_entities(path)
+        with open(path, "r", encoding="utf-8") as f:
+            content = f.read()
+        self.assertIn("日本語テレビ", content)
+
+    def test_iso_8859_1_encoding(self):
+        """Files declaring ISO-8859-1 should be read in that encoding."""
+        xml = '<?xml version="1.0" encoding="ISO-8859-1"?>\n<tv><channel><display-name>Cha&icirc;ne</display-name></channel></tv>'
+        fd, path = tempfile.mkstemp(suffix=".xml")
+        with os.fdopen(fd, "wb") as f:
+            f.write(xml.encode("iso-8859-1"))
+        self.addCleanup(lambda: os.unlink(path) if os.path.exists(path) else None)
+
+        _resolve_html_entities(path)
+        with open(path, "r", encoding="iso-8859-1") as f:
+            content = f.read()
+        self.assertIn("Cha\u00eene", content)
+        self.assertNotIn("&icirc;", content)
+
+    def test_detect_encoding_utf8_default(self):
+        """Headers without an encoding declaration default to UTF-8."""
+        self.assertEqual(_detect_xml_encoding(b'<?xml version="1.0"?>'), "utf-8")
+
+    def test_detect_encoding_iso_8859_1(self):
+        """Encoding is read from the XML declaration."""
+        self.assertEqual(
+            _detect_xml_encoding(b'<?xml version="1.0" encoding="ISO-8859-1"?>'),
+            "ISO-8859-1",
+        )
+
+    def test_detect_encoding_single_quotes(self):
+        """Encoding detection works with single-quoted attributes."""
+        self.assertEqual(
+            _detect_xml_encoding(b"<?xml version='1.0' encoding='windows-1252'?>"),
+            "windows-1252",
+        )
+
+    def test_detect_encoding_unknown_falls_back(self):
+        """Unrecognized encoding falls back to UTF-8."""
+        self.assertEqual(
+            _detect_xml_encoding(b'<?xml version="1.0" encoding="x-fake-codec"?>'),
+            "utf-8",
+        )
+
+    def test_iso_8859_1_with_entities_roundtrip(self):
+        """ISO-8859-1 file with entities: resolved without corrupting existing accented chars."""
+        # Mix of direct ISO-8859-1 chars and HTML entities
+        xml_str = '<?xml version="1.0" encoding="ISO-8859-1"?>\n<tv><channel><display-name>D\xe9j\xe0 &eacute;mission</display-name></channel></tv>'
+        fd, path = tempfile.mkstemp(suffix=".xml")
+        with os.fdopen(fd, "wb") as f:
+            f.write(xml_str.encode("iso-8859-1"))
+        self.addCleanup(lambda: os.unlink(path) if os.path.exists(path) else None)
+
+        _resolve_html_entities(path)
+        with open(path, "r", encoding="iso-8859-1") as f:
+            content = f.read()
+        self.assertIn("D\xe9j\xe0", content, "Existing accented chars should be preserved")
+        self.assertIn("\xe9mission", content, "Entity should be resolved")
+        self.assertNotIn("&eacute;", content)
+
+    def test_mismatched_encoding_leaves_file_untouched(self):
+        """File declaring UTF-8 but containing Latin-1 bytes is left alone."""
+        # \xe9 is valid ISO-8859-1 but invalid as a standalone UTF-8 byte
+        raw = b'<?xml version="1.0" encoding="UTF-8"?>\n<tv><channel><display-name>\xe9</display-name></channel></tv>'
+        fd, path = tempfile.mkstemp(suffix=".xml")
+        with os.fdopen(fd, "wb") as f:
+            f.write(raw)
+        self.addCleanup(lambda: os.unlink(path) if os.path.exists(path) else None)
+
+        original_bytes = raw  # save for comparison
+        _resolve_html_entities(path)
+        with open(path, "rb") as f:
+            result_bytes = f.read()
+        self.assertEqual(result_bytes, original_bytes, "File should be untouched on decode error")

From 01a214851de1fffd76e829a8aff884d6e15dc5c3 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Sun, 15 Mar 2026 01:11:29 -0500
Subject: [PATCH 011/172] fix: catch all exceptions in entity resolution to
 avoid breaking EPG refresh

Previously only UnicodeDecodeError/UnicodeEncodeError were caught. Unexpected errors like disk full or permission denied would propagate
and crash the EPG refresh, which would have succeeded before the preprocessing step existed. Now all exceptions are caught and logged, leaving the original file untouched for lxml to handle as before.
---
 apps/epg/tasks.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/epg/tasks.py b/apps/epg/tasks.py
index 5d567e6e..df1e0836 100644
--- a/apps/epg/tasks.py
+++ b/apps/epg/tasks.py
@@ -84,8 +84,10 @@ def _resolve_html_entities(file_path):
 
     Processes line-by-line to keep memory usage low, writes to a temp file,
     then atomically replaces the original.  Honors the encoding declared
-    in the XML declaration.  If the file cannot be decoded cleanly it is
-    left untouched for lxml to handle with its own recovery mode.
+    in the XML declaration.
+
+    This function is strictly additive — on any error the original file is
+    left untouched so lxml can handle it as it always did.
     """
     # Read the first 200 bytes to detect encoding from the XML declaration
     with open(file_path, 'rb') as f:
@@ -102,10 +104,12 @@ def _resolve_html_entities(file_path):
         os.replace(temp_path, file_path)
         success = True
         logger.debug(f"Resolved HTML entities in {file_path} (encoding: {encoding})")
-    except (UnicodeDecodeError, UnicodeEncodeError):
-        # Leave the file untouched for lxml to handle with its own
-        # encoding detection and recovery mode.
-        logger.debug(f"Skipping entity resolution for {file_path}: encoding error with {encoding}")
+    except Exception as e:
+        # On any error, leave the original file untouched for lxml to
+        # handle with its own encoding detection and recovery mode.
+        # This ensures the preprocessing step never breaks a previously
+        # working EPG refresh.
+        logger.debug(f"Skipping entity resolution for {file_path}: {e}")
     finally:
         if not success and os.path.exists(temp_path):
             os.unlink(temp_path)

From cf1aef67473188e09ce785d9bcaa3823aa806832 Mon Sep 17 00:00:00 2001
From: cmcpherson274 <cmcpherson274@gmail.com>
Date: Sun, 15 Mar 2026 12:06:32 -0400
Subject: [PATCH 012/172] Implement buffer reset method for stream transitions

Added a method to reset internal buffers to prevent corruption during stream transitions.
---
 apps/proxy/ts_proxy/stream_buffer.py | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/apps/proxy/ts_proxy/stream_buffer.py b/apps/proxy/ts_proxy/stream_buffer.py
index 111468bf..42ceb2b7 100644
--- a/apps/proxy/ts_proxy/stream_buffer.py
+++ b/apps/proxy/ts_proxy/stream_buffer.py
@@ -132,6 +132,40 @@ class StreamBuffer:
             logger.error(f"Error adding chunk to buffer: {e}")
             return False
 
+    def reset_buffer_position(self):
+        """
+        Reset internal buffers for a clean stream transition (failover).
+
+        Called by stream_manager.update_url() when switching between FFmpeg
+        processes. Without this, _partial_packet from the old FFmpeg gets
+        concatenated with the first bytes from the new FFmpeg, creating
+        corrupted TS packets that break audio decoder sync in the client.
+        """
+        try:
+            with self.lock:
+                old_write_size = len(self._write_buffer)
+                old_partial_size = len(getattr(self, '_partial_packet', b''))
+
+                self._write_buffer = bytearray()
+                if hasattr(self, '_partial_packet'):
+                    self._partial_packet = bytearray()
+
+                if old_write_size > 0 or old_partial_size > 0:
+                    logger.info(
+                        f"Reset buffer position for channel {self.channel_id}: "
+                        f"cleared {old_write_size} bytes from write buffer, "
+                        f"{old_partial_size} bytes from partial packet"
+                    )
+                else:
+                    logger.debug(
+                        f"Reset buffer position for channel {self.channel_id}: "
+                        f"buffers were already clean"
+                    )
+        except Exception as e:
+            logger.error(
+                f"Error resetting buffer position for channel {self.channel_id}: {e}"
+            )
+
     def get_chunks(self, start_index=None):
         """Get chunks from the buffer with detailed logging"""
         try:

From fd9ca283169c1eb18455424dcecf9f0d1001e653 Mon Sep 17 00:00:00 2001
From: cmcpherson274 <cmcpherson274@gmail.com>
Date: Sun, 15 Mar 2026 12:08:32 -0400
Subject: [PATCH 013/172] Modify client TTL handling in client_manager.py

Updated client manager to refresh TTL without updating last_active timestamp.
---
 apps/proxy/ts_proxy/client_manager.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/proxy/ts_proxy/client_manager.py b/apps/proxy/ts_proxy/client_manager.py
index 836f719e..a89f543b 100644
--- a/apps/proxy/ts_proxy/client_manager.py
+++ b/apps/proxy/ts_proxy/client_manager.py
@@ -158,9 +158,8 @@ class ClientManager:
                                 if time_since_heartbeat < self.heartbeat_interval * 0.5:  # Only heartbeat at half interval minimum
                                     continue
 
-                            # Only update clients that remain
+                            # Only refresh TTL - do NOT update last_active
                             client_key = f"ts_proxy:channel:{self.channel_id}:clients:{client_id}"
-                            pipe.hset(client_key, "last_active", str(current_time))
                             pipe.expire(client_key, self.client_ttl)
 
                             # Keep client in the set with TTL

From f7085e5dc2782e3273ea7b7ac97d5d1e58088ad9 Mon Sep 17 00:00:00 2001
From: cmcpherson274 <cmcpherson274@gmail.com>
Date: Sun, 15 Mar 2026 12:10:38 -0400
Subject: [PATCH 014/172] Add 'last_active' field to stats in stream_generator

---
 apps/proxy/ts_proxy/stream_generator.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/proxy/ts_proxy/stream_generator.py b/apps/proxy/ts_proxy/stream_generator.py
index f0174616..95a8143b 100644
--- a/apps/proxy/ts_proxy/stream_generator.py
+++ b/apps/proxy/ts_proxy/stream_generator.py
@@ -428,7 +428,8 @@ class StreamGenerator:
                             ChannelMetadataField.BYTES_SENT: str(self.bytes_sent),
                             ChannelMetadataField.AVG_RATE_KBPS: str(round(avg_rate, 1)),
                             ChannelMetadataField.CURRENT_RATE_KBPS: str(round(self.current_rate, 1)),
-                            ChannelMetadataField.STATS_UPDATED_AT: str(current_time)
+                            ChannelMetadataField.STATS_UPDATED_AT: str(current_time),
+                            "last_active": str(current_time)
                         }
                         proxy_server.redis_client.hset(client_key, mapping=stats)
 
@@ -614,4 +615,4 @@ def create_stream_generator(channel_id, client_id, client_ip, client_user_agent,
     Returns a function that can be passed to StreamingHttpResponse.
     """
     generator = StreamGenerator(channel_id, client_id, client_ip, client_user_agent, channel_initializing)
-    return generator.generate
\ No newline at end of file
+    return generator.generate

From 1a7fa370cf5a670f465506c1b7020affea1492d0 Mon Sep 17 00:00:00 2001
From: MotWakorb <31100779+MotWakorb@users.noreply.github.com>
Date: Sun, 15 Mar 2026 11:19:05 -0500
Subject: [PATCH 015/172] Update contribution section in README

Removed contribution guidelines and added a link to CONTRIBUTING.md.
---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 4e348b12..24585896 100644
--- a/README.md
+++ b/README.md
@@ -119,11 +119,8 @@ If you are running a Debian-based OS, use the `debian_install.sh` script. For ot
 ## 🤝 Want to Contribute?
 
 We welcome **PRs, issues, ideas, and suggestions**!\
-Here's how you can join the party:
 
-- Follow our coding style and best practices.
-- Be respectful, helpful, and open-minded.
-- Respect the **GNU AGPL v3.0 license**.
+Prior to contributing, please read the [CONTRIBUTING.md](https://github.com/Dispatcharr/Dispatcharr/blob/main/CONTRIBUTING.md)
 
 > Whether it's writing docs, squashing bugs, or building new features, your contribution matters! 🙋
 

From 463aa225985f5f9b0e0367bebf13ca6457a046bf Mon Sep 17 00:00:00 2001
From: SergeantPanda <61642231+SergeantPanda@users.noreply.github.com>
Date: Sun, 15 Mar 2026 11:47:11 -0500
Subject: [PATCH 016/172] Update README formatting and remove webhook mention

Fixed formatting issues in the contribution section and removed a bullet point.
---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 24585896..a46e8ca6 100644
--- a/README.md
+++ b/README.md
@@ -118,9 +118,9 @@ If you are running a Debian-based OS, use the `debian_install.sh` script. For ot
 
 ## 🤝 Want to Contribute?
 
-We welcome **PRs, issues, ideas, and suggestions**!\
+We welcome **PRs, issues, ideas, and suggestions**!
 
-Prior to contributing, please read the [CONTRIBUTING.md](https://github.com/Dispatcharr/Dispatcharr/blob/main/CONTRIBUTING.md)
+- Prior to contributing, please read the [CONTRIBUTING.md](https://github.com/Dispatcharr/Dispatcharr/blob/main/CONTRIBUTING.md)
 
 > Whether it's writing docs, squashing bugs, or building new features, your contribution matters! 🙋
 
@@ -137,7 +137,6 @@ Prior to contributing, please read the [CONTRIBUTING.md](https://github.com/Disp
 - 👥 **Enhanced User Management** — Customizable XC API output per user account
 - 🔄 **Output Stream Profiles** — Different clients with different stream profiles (bandwidth control, quality tiers)
 - 🔌 **Fallback Videos** — Automatic fallback content when channels are unavailable
-- 📡 **Webhooks** — Event-driven integrations and automations
 
 ---
 

From 1d4603dadd7ae928074943204cdec20fb81f1e98 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 12:42:34 -0500
Subject: [PATCH 017/172] Enhancement: Optimize profile expiration handling and
 update task naming for clarity

---
 apps/m3u/api_views.py   |  2 +-
 apps/m3u/serializers.py | 21 +++++++++++++--------
 apps/m3u/tasks.py       |  7 +++++--
 dispatcharr/settings.py |  6 +++---
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/apps/m3u/api_views.py b/apps/m3u/api_views.py
index 34f3cd77..3b856dc8 100644
--- a/apps/m3u/api_views.py
+++ b/apps/m3u/api_views.py
@@ -40,7 +40,7 @@ class M3UAccountViewSet(viewsets.ModelViewSet):
 
     queryset = M3UAccount.objects.select_related(
         "refresh_task__crontab", "refresh_task__interval"
-    ).prefetch_related("channel_group")
+    ).prefetch_related("channel_group", "profiles")
     serializer_class = M3UAccountSerializer
 
     def get_permissions(self):
diff --git a/apps/m3u/serializers.py b/apps/m3u/serializers.py
index c629cac9..0d65276b 100644
--- a/apps/m3u/serializers.py
+++ b/apps/m3u/serializers.py
@@ -212,8 +212,9 @@ class M3UAccountSerializer(serializers.ModelSerializer):
             cron_expr = f"{ct.minute} {ct.hour} {ct.day_of_month} {ct.month_of_year} {ct.day_of_week}"
         data["cron_expression"] = cron_expr
 
-        # Surface default profile's exp_date for the form
-        default_profile = instance.profiles.filter(is_default=True).first()
+        # Surface default profile's exp_date for the form.
+        # Use prefetch cache (obj.profiles.all()) to avoid an extra query per account.
+        default_profile = next((p for p in instance.profiles.all() if p.is_default), None)
         data["exp_date"] = (
             default_profile.exp_date.isoformat() if default_profile and default_profile.exp_date else None
         )
@@ -337,15 +338,19 @@ class M3UAccountSerializer(serializers.ModelSerializer):
 
     def get_earliest_expiration(self, obj):
         """Return the soonest exp_date across all active profiles for this account."""
-        profiles_with_exp = obj.profiles.filter(
-            is_active=True, exp_date__isnull=False
-        ).order_by("exp_date")
-        first = profiles_with_exp.first()
-        return first.exp_date.isoformat() if first else None
+        # Filter in Python over the prefetch cache to avoid an extra query per account.
+        expiring = [p.exp_date for p in obj.profiles.all() if p.is_active and p.exp_date]
+        if not expiring:
+            return None
+        return min(expiring).isoformat()
 
     def get_all_expirations(self, obj):
         """Return exp_date info for every profile that has one (for tooltip)."""
-        profiles = obj.profiles.filter(exp_date__isnull=False).order_by("exp_date")
+        # Filter in Python over the prefetch cache to avoid an extra query per account.
+        profiles = sorted(
+            (p for p in obj.profiles.all() if p.exp_date),
+            key=lambda p: p.exp_date,
+        )
         return [
             {
                 "profile_id": p.id,
diff --git a/apps/m3u/tasks.py b/apps/m3u/tasks.py
index 0af5d382..996226ec 100644
--- a/apps/m3u/tasks.py
+++ b/apps/m3u/tasks.py
@@ -3199,9 +3199,12 @@ def evaluate_profile_expiration_notification(profile):
     from core.models import SystemNotification
     from core.utils import send_websocket_notification, send_notification_dismissed
 
+    exp = profile.exp_date
+    if not exp:
+        return None
+
     now = timezone.now()
     warning_threshold = now + timezone.timedelta(days=7)
-    exp = profile.exp_date
     warning_key = f"xc-exp-warning-{profile.id}"
     expired_key = f"xc-exp-expired-{profile.id}"
 
@@ -3299,7 +3302,7 @@ def evaluate_profile_expiration_notification(profile):
 
 
 @shared_task
-def check_xc_account_expirations():
+def check_account_expirations():
     """
     Daily task: check all account profiles for upcoming expirations.
     Creates/updates SystemNotifications for profiles expiring within 7 days.
diff --git a/dispatcharr/settings.py b/dispatcharr/settings.py
index 46e03d1f..b0d387b2 100644
--- a/dispatcharr/settings.py
+++ b/dispatcharr/settings.py
@@ -267,9 +267,9 @@ CELERY_BEAT_SCHEDULE = {
         "task": "core.tasks.check_for_version_update",
         "schedule": 86400.0,  # Once every 24 hours
     },
-    # Check for XC account expirations daily
-    "check-xc-account-expirations": {
-        "task": "apps.m3u.tasks.check_xc_account_expirations",
+    # Check for account expirations daily
+    "check-account-expirations": {
+        "task": "apps.m3u.tasks.check_account_expirations",
         "schedule": 86400.0,  # Once every 24 hours
     },
 }

From 10ea165c2cde2a7009f7a75ae62425f655c13bfa Mon Sep 17 00:00:00 2001
From: cmcpherson274 <cmcpherson274@gmail.com>
Date: Sun, 15 Mar 2026 14:04:59 -0400
Subject: [PATCH 018/172] Refactor packet handling with locking mechanism

---
 apps/proxy/ts_proxy/stream_buffer.py | 39 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/apps/proxy/ts_proxy/stream_buffer.py b/apps/proxy/ts_proxy/stream_buffer.py
index 42ceb2b7..b61e7794 100644
--- a/apps/proxy/ts_proxy/stream_buffer.py
+++ b/apps/proxy/ts_proxy/stream_buffer.py
@@ -76,27 +76,28 @@ class StreamBuffer:
             if not hasattr(self, '_partial_packet'):
                 self._partial_packet = bytearray()
 
-            # Combine with any previous partial packet
-            combined_data = bytearray(self._partial_packet) + bytearray(chunk)
-
-            # Calculate complete packets
-            complete_packets_size = (len(combined_data) // self.TS_PACKET_SIZE) * self.TS_PACKET_SIZE
-
-            if complete_packets_size == 0:
-                # Not enough data for a complete packet
-                self._partial_packet = combined_data
-                return True
-
-            # Split into complete packets and remainder
-            complete_packets = combined_data[:complete_packets_size]
-            self._partial_packet = combined_data[complete_packets_size:]
-
-            # Add completed packets to write buffer
-            self._write_buffer.extend(complete_packets)
-
-            # Only write to Redis when we have enough data for an optimized chunk
+            # Lock the full operation to prevent race with reset_buffer_position
             writes_done = 0
             with self.lock:
+                # Combine with any previous partial packet
+                combined_data = bytearray(self._partial_packet) + bytearray(chunk)
+
+                # Calculate complete packets
+                complete_packets_size = (len(combined_data) // self.TS_PACKET_SIZE) * self.TS_PACKET_SIZE
+
+                if complete_packets_size == 0:
+                    # Not enough data for a complete packet
+                    self._partial_packet = combined_data
+                    return True
+
+                # Split into complete packets and remainder
+                complete_packets = combined_data[:complete_packets_size]
+                self._partial_packet = combined_data[complete_packets_size:]
+
+                # Add completed packets to write buffer
+                self._write_buffer.extend(complete_packets)
+
+                # Only write to Redis when we have enough data for an optimized chunk
                 while len(self._write_buffer) >= self.target_chunk_size:
                     # Extract a full chunk
                     chunk_data = self._write_buffer[:self.target_chunk_size]

From c8b665dc985ae32d9a8f516f4d72e67603c5e26e Mon Sep 17 00:00:00 2001
From: cmcpherson274 <cmcpherson274@gmail.com>
Date: Sun, 15 Mar 2026 14:08:43 -0400
Subject: [PATCH 019/172] Update last_active timestamp in keepalive logic

Update last active timestamp for clients during failover.
---
 apps/proxy/ts_proxy/stream_generator.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/proxy/ts_proxy/stream_generator.py b/apps/proxy/ts_proxy/stream_generator.py
index 95a8143b..cfd705c9 100644
--- a/apps/proxy/ts_proxy/stream_generator.py
+++ b/apps/proxy/ts_proxy/stream_generator.py
@@ -312,6 +312,11 @@ class StreamGenerator:
                     self.bytes_sent += len(keepalive_packet)
                     self.last_yield_time = time.time()
                     self.consecutive_empty = 0  # Reset consecutive counter but keep total empty_reads
+                    # Update last_active so clients waiting during failover aren't flagged as ghosts
+                    proxy_server = ProxyServer.get_instance()
+                    if proxy_server and proxy_server.redis_client:
+                        client_key = RedisKeys.client_metadata(self.channel_id, self.client_id)
+                        proxy_server.redis_client.hset(client_key, "last_active", str(time.time()))
                     gevent.sleep(Config.KEEPALIVE_INTERVAL)  # Replace time.sleep
                 else:
                     # Standard wait with backoff

From 40d0bc95677b474f671dac2f4bfff905ee76cf1f Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Sun, 15 Mar 2026 14:22:57 -0500
Subject: [PATCH 020/172] fix: cap keepalive mode duration to prevent
 indefinite client hold

- Add MAX_KEEPALIVE_DURATION = 300s to TSConfig
- Track keepalive_start_time in _stream_data_generator; disconnect after cap is exceeded with a warning log
- Reset timer on real data so independent stalls don't accumulate
- Fix pre-existing test helper missing throttle attributes in NonOwnerWorkerKeepaliveTests
---
 .../channels/tests/test_ts_proxy_keepalive.py |   6 +
 .../tests/test_ts_proxy_keepalive_duration.py | 195 ++++++++++++++++++
 apps/proxy/config.py                          |   1 +
 apps/proxy/ts_proxy/stream_generator.py       |  16 ++
 4 files changed, 218 insertions(+)
 create mode 100644 apps/channels/tests/test_ts_proxy_keepalive_duration.py

diff --git a/apps/channels/tests/test_ts_proxy_keepalive.py b/apps/channels/tests/test_ts_proxy_keepalive.py
index db388b3d..9e14fdfd 100644
--- a/apps/channels/tests/test_ts_proxy_keepalive.py
+++ b/apps/channels/tests/test_ts_proxy_keepalive.py
@@ -85,6 +85,12 @@ class NonOwnerWorkerKeepaliveTests(TestCase):
 
         gen.stream_manager = None  # non-owner worker
         gen.consecutive_empty = consecutive_empty
+
+        # Throttle attributes added by a later PR; required by _should_send_keepalive.
+        gen._last_health_check_time = 0.0
+        gen._last_health_check_result = False
+        gen._health_check_interval = 2.0
+        gen.proxy_server = None
         return gen
 
     def _mock_proxy_server(self, last_data_value):
diff --git a/apps/channels/tests/test_ts_proxy_keepalive_duration.py b/apps/channels/tests/test_ts_proxy_keepalive_duration.py
new file mode 100644
index 00000000..74494131
--- /dev/null
+++ b/apps/channels/tests/test_ts_proxy_keepalive_duration.py
@@ -0,0 +1,195 @@
+"""
+Unit tests for the keepalive duration cap in StreamGenerator._stream_data_generator.
+
+Verifies that a client held in keepalive mode is disconnected after
+MAX_KEEPALIVE_DURATION seconds, and that the timer resets when real data resumes.
+"""
+
+import time
+from unittest.mock import MagicMock, patch, call
+from django.test import TestCase
+
+
+def _make_generator(consecutive_empty=10, local_index=10, buffer_index=10):
+    """Minimal StreamGenerator stub for testing _stream_data_generator logic."""
+    from apps.proxy.ts_proxy.stream_generator import StreamGenerator
+
+    gen = StreamGenerator.__new__(StreamGenerator)
+    gen.channel_id = "00000000-0000-0000-0000-000000000099"
+    gen.client_id = "test-client-duration"
+    gen.consecutive_empty = consecutive_empty
+    gen.empty_reads = 0
+    gen.local_index = local_index
+    gen.bytes_sent = 0
+    gen.chunks_sent = 0
+    gen.last_yield_time = time.time()
+    gen.stream_start_time = time.time()
+    gen.last_stats_time = time.time()
+    gen.last_stats_bytes = 0
+    gen.current_rate = 0.0
+    gen.last_ttl_refresh = time.time()
+    gen.ttl_refresh_interval = 3
+    gen.is_owner_worker = False
+    gen.stream_manager = None
+    gen._last_health_check_time = 0.0
+    gen._last_health_check_result = False
+    gen._health_check_interval = 2.0
+    gen.proxy_server = None
+
+    buffer = MagicMock()
+    buffer.index = buffer_index
+    buffer.get_optimized_client_data.return_value = ([], local_index)
+    buffer.find_oldest_available_chunk.return_value = None
+    gen.buffer = buffer
+
+    return gen
+
+
+class KeepaliveDurationCapTests(TestCase):
+    """MAX_KEEPALIVE_DURATION cap disconnects clients stuck in keepalive mode."""
+
+    def _run_generator_to_break(self, gen, max_iterations=20):
+        """Drive _stream_data_generator until it breaks or hits iteration limit."""
+        iterations = 0
+        for _ in gen._stream_data_generator():
+            iterations += 1
+            if iterations >= max_iterations:
+                break
+        return iterations
+
+    def test_cap_fires_after_max_duration_exceeded(self):
+        """Generator exits when keepalive has run longer than MAX_KEEPALIVE_DURATION."""
+        gen = _make_generator()
+
+        with patch.object(gen, '_check_resources', return_value=True), \
+             patch.object(gen, '_should_send_keepalive', return_value=True), \
+             patch.object(gen, '_is_ghost_client', return_value=False), \
+             patch.object(gen, '_is_timeout', return_value=False), \
+             patch('apps.proxy.ts_proxy.stream_generator.create_ts_packet', return_value=b'\x00' * 188), \
+             patch('apps.proxy.ts_proxy.stream_generator.ProxyServer') as MockPS, \
+             patch('apps.proxy.ts_proxy.stream_generator.Config') as MockConfig, \
+             patch('apps.proxy.ts_proxy.stream_generator.gevent') as mock_gevent, \
+             patch('apps.proxy.ts_proxy.stream_generator.time') as mock_time:
+
+            MockPS.get_instance.return_value = None
+            MockConfig.KEEPALIVE_INTERVAL = 0
+            MockConfig.MAX_KEEPALIVE_DURATION = 30
+
+            # First call: keepalive_start_time not yet set (returns current)
+            # Second call: inside the cap check — simulate time elapsed > 30s
+            mock_time.time.side_effect = [
+                1000.0,  # keepalive_start_time assignment
+                1031.0,  # cap check: 31s elapsed > 30s limit
+            ]
+
+            packets = list(gen._stream_data_generator())
+
+        # No packets should be yielded — cap fires before yield
+        self.assertEqual(len(packets), 0)
+
+    def test_cap_does_not_fire_before_max_duration(self):
+        """Generator yields keepalive packets while within MAX_KEEPALIVE_DURATION."""
+        gen = _make_generator()
+
+        call_count = 0
+
+        def time_side_effect():
+            nonlocal call_count
+            call_count += 1
+            # keepalive_start_time set at t=1000; cap checks always see <30s elapsed
+            if call_count == 1:
+                return 1000.0  # keepalive_start_time
+            return 1010.0  # always 10s elapsed — under the 30s cap
+
+        with patch.object(gen, '_check_resources', side_effect=[True, True, False]), \
+             patch.object(gen, '_should_send_keepalive', return_value=True), \
+             patch.object(gen, '_is_ghost_client', return_value=False), \
+             patch.object(gen, '_is_timeout', return_value=False), \
+             patch('apps.proxy.ts_proxy.stream_generator.create_ts_packet', return_value=b'\x00' * 188), \
+             patch('apps.proxy.ts_proxy.stream_generator.ProxyServer') as MockPS, \
+             patch('apps.proxy.ts_proxy.stream_generator.Config') as MockConfig, \
+             patch('apps.proxy.ts_proxy.stream_generator.gevent'), \
+             patch('apps.proxy.ts_proxy.stream_generator.time') as mock_time:
+
+            MockPS.get_instance.return_value = None
+            MockConfig.KEEPALIVE_INTERVAL = 0
+            MockConfig.MAX_KEEPALIVE_DURATION = 30
+            mock_time.time.side_effect = time_side_effect
+
+            packets = list(gen._stream_data_generator())
+
+        # Two iterations with _check_resources=True should yield two keepalive packets
+        self.assertGreater(len(packets), 0)
+
+    def test_timer_resets_when_real_data_resumes(self):
+        """keepalive_start_time is cleared to None when real chunks are received."""
+        gen = _make_generator()
+
+        chunk = b'\x47' * 188
+        real_chunks = ([chunk], gen.local_index + 1)
+        no_chunks = ([], gen.local_index)
+
+        # Sequence: no data (keepalive), then real data, then stop
+        gen.buffer.get_optimized_client_data.side_effect = [
+            no_chunks,    # iteration 1: keepalive
+            real_chunks,  # iteration 2: real data — should reset timer
+            no_chunks,    # iteration 3: keepalive again — timer restarts fresh
+        ]
+
+        captured_start_times = []
+
+        original_gen = gen
+
+        with patch.object(gen, '_check_resources', side_effect=[True, True, True, False]), \
+             patch.object(gen, '_should_send_keepalive', return_value=True), \
+             patch.object(gen, '_is_ghost_client', return_value=False), \
+             patch.object(gen, '_is_timeout', return_value=False), \
+             patch.object(gen, '_process_chunks', return_value=iter([chunk])), \
+             patch('apps.proxy.ts_proxy.stream_generator.create_ts_packet', return_value=b'\x00' * 188), \
+             patch('apps.proxy.ts_proxy.stream_generator.ProxyServer') as MockPS, \
+             patch('apps.proxy.ts_proxy.stream_generator.Config') as MockConfig, \
+             patch('apps.proxy.ts_proxy.stream_generator.gevent'), \
+             patch('apps.proxy.ts_proxy.stream_generator.time') as mock_time:
+
+            MockPS.get_instance.return_value = None
+            MockConfig.KEEPALIVE_INTERVAL = 0
+            MockConfig.MAX_KEEPALIVE_DURATION = 300
+            mock_time.time.return_value = 1000.0
+
+            list(gen._stream_data_generator())
+
+        # Test passes if no exception and generator completes normally —
+        # if the timer were NOT reset, the second keepalive block would
+        # carry over the old start time rather than starting fresh.
+
+    def test_cap_uses_config_value(self):
+        """Cap threshold reads MAX_KEEPALIVE_DURATION from Config, not a hardcoded value."""
+        gen = _make_generator()
+
+        with patch.object(gen, '_check_resources', return_value=True), \
+             patch.object(gen, '_should_send_keepalive', return_value=True), \
+             patch.object(gen, '_is_ghost_client', return_value=False), \
+             patch.object(gen, '_is_timeout', return_value=False), \
+             patch('apps.proxy.ts_proxy.stream_generator.create_ts_packet', return_value=b'\x00' * 188), \
+             patch('apps.proxy.ts_proxy.stream_generator.ProxyServer') as MockPS, \
+             patch('apps.proxy.ts_proxy.stream_generator.Config') as MockConfig, \
+             patch('apps.proxy.ts_proxy.stream_generator.gevent'), \
+             patch('apps.proxy.ts_proxy.stream_generator.time') as mock_time:
+
+            MockPS.get_instance.return_value = None
+            MockConfig.KEEPALIVE_INTERVAL = 0
+            # Set a custom cap of 60s
+            MockConfig.MAX_KEEPALIVE_DURATION = 60
+
+            mock_time.time.side_effect = [
+                1000.0,   # keepalive_start_time
+                1050.0,   # cap check: 50s elapsed — under 60s, should NOT fire
+                1000.0,   # last_yield_time update
+                1070.0,   # cap check on next iteration: 70s elapsed — fires
+            ]
+
+            packets = list(gen._stream_data_generator())
+
+        # First iteration: 50s < 60s cap — one keepalive yielded
+        # Second iteration: 70s > 60s cap — generator exits
+        self.assertEqual(len(packets), 1)
diff --git a/apps/proxy/config.py b/apps/proxy/config.py
index 68e27a6f..0424dee1 100644
--- a/apps/proxy/config.py
+++ b/apps/proxy/config.py
@@ -108,6 +108,7 @@ class TSConfig(BaseConfig):
     MIN_STABLE_TIME_BEFORE_RECONNECT = 30  # Minimum seconds a stream must be stable to try reconnect
     FAILOVER_GRACE_PERIOD = 20           # Extra time (seconds) to allow for stream switching before disconnecting clients
     URL_SWITCH_TIMEOUT = 20   # Max time allowed for a stream switch operation
+    MAX_KEEPALIVE_DURATION = 300         # Keepalive packets prevent _is_timeout() from firing, so without this a permanently failed stream holds clients open indefinitely.
 
 
 
diff --git a/apps/proxy/ts_proxy/stream_generator.py b/apps/proxy/ts_proxy/stream_generator.py
index cfd705c9..2e16008b 100644
--- a/apps/proxy/ts_proxy/stream_generator.py
+++ b/apps/proxy/ts_proxy/stream_generator.py
@@ -255,6 +255,10 @@ class StreamGenerator:
 
     def _stream_data_generator(self):
         """Generate stream data chunks based on buffer contents."""
+        # Keepalive packets refresh last_yield_time, so _is_timeout() never fires
+        # during sustained stream failure. This timer enforces a wall-clock cap.
+        keepalive_start_time = None
+
         # Main streaming loop
         while True:
             # Check if resources still exist
@@ -265,6 +269,7 @@ class StreamGenerator:
             chunks, next_index = self.buffer.get_optimized_client_data(self.local_index)
 
             if chunks:
+                keepalive_start_time = None  # Each recovery restarts the cap independently.
                 yield from self._process_chunks(chunks, next_index)
                 self.local_index = next_index
                 self.last_yield_time = time.time()
@@ -306,6 +311,17 @@ class StreamGenerator:
                     continue  # Retry immediately with the new position
 
                 if self._should_send_keepalive(self.local_index):
+                    if keepalive_start_time is None:
+                        keepalive_start_time = time.time()
+
+                    max_keepalive = getattr(Config, 'MAX_KEEPALIVE_DURATION', 300)
+                    if time.time() - keepalive_start_time > max_keepalive:
+                        logger.warning(
+                            f"[{self.client_id}] Keepalive duration exceeded {max_keepalive}s "
+                            f"with no stream recovery, disconnecting"
+                        )
+                        break
+
                     keepalive_packet = create_ts_packet('keepalive')
                     logger.debug(f"[{self.client_id}] Sending keepalive packet while waiting at buffer head")
                     yield keepalive_packet

From 09d5f6bb9fc13f8a447318530d748e29c865905f Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 16:00:23 -0500
Subject: [PATCH 021/172] Update expiration date handling in M3U components to
 ensure UTC format

---
 apps/m3u/serializers.py               | 28 ++++++++++++++++++++-------
 frontend/src/components/forms/M3U.jsx | 17 ++++++++--------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/apps/m3u/serializers.py b/apps/m3u/serializers.py
index 0d65276b..587d98cb 100644
--- a/apps/m3u/serializers.py
+++ b/apps/m3u/serializers.py
@@ -7,6 +7,7 @@ from apps.channels.models import ChannelGroup, ChannelGroupM3UAccount
 from apps.channels.serializers import (
     ChannelGroupM3UAccountSerializer,
 )
+from datetime import timezone as dt_tz
 import logging
 import json
 
@@ -214,10 +215,14 @@ class M3UAccountSerializer(serializers.ModelSerializer):
 
         # Surface default profile's exp_date for the form.
         # Use prefetch cache (obj.profiles.all()) to avoid an extra query per account.
+        # Always emit a Z-suffix UTC string so JS new Date() never misinterprets it as local.
         default_profile = next((p for p in instance.profiles.all() if p.is_default), None)
-        data["exp_date"] = (
-            default_profile.exp_date.isoformat() if default_profile and default_profile.exp_date else None
-        )
+        exp = default_profile.exp_date if default_profile else None
+        if exp:
+            exp_utc = exp.astimezone(dt_tz.utc) if exp.tzinfo else exp.replace(tzinfo=dt_tz.utc)
+            data["exp_date"] = exp_utc.strftime('%Y-%m-%dT%H:%M:%SZ')
+        else:
+            data["exp_date"] = None
 
         return data
 
@@ -286,12 +291,19 @@ class M3UAccountSerializer(serializers.ModelSerializer):
                 memberships_to_update, ["enabled"]
             )
 
-        # Write exp_date through to the default profile
+        # Write exp_date through to the default profile.
+        # Use a fresh DB query (not the prefetch cache) so we get the profile
+        # object AFTER the post_save signal (create_profile_for_m3u_account)
+        # has already updated max_streams, avoiding a stale-value overwrite.
         if exp_date != "__NOT_SET__":
             default_profile = instance.profiles.filter(is_default=True).first()
             if default_profile:
                 default_profile.exp_date = exp_date
-                default_profile.save()
+                default_profile.save(update_fields=['exp_date'])
+            # Invalidate the profiles prefetch cache so to_representation
+            # sees the updated exp_date rather than the pre-request snapshot.
+            if '_prefetched_objects_cache' in instance.__dict__:
+                instance._prefetched_objects_cache.pop('profiles', None)
 
         return instance
 
@@ -342,7 +354,9 @@ class M3UAccountSerializer(serializers.ModelSerializer):
         expiring = [p.exp_date for p in obj.profiles.all() if p.is_active and p.exp_date]
         if not expiring:
             return None
-        return min(expiring).isoformat()
+        exp = min(expiring)
+        exp_utc = exp.astimezone(dt_tz.utc) if exp.tzinfo else exp.replace(tzinfo=dt_tz.utc)
+        return exp_utc.strftime('%Y-%m-%dT%H:%M:%SZ')
 
     def get_all_expirations(self, obj):
         """Return exp_date info for every profile that has one (for tooltip)."""
@@ -355,7 +369,7 @@ class M3UAccountSerializer(serializers.ModelSerializer):
             {
                 "profile_id": p.id,
                 "profile_name": p.name,
-                "exp_date": p.exp_date.isoformat(),
+                "exp_date": (p.exp_date.astimezone(dt_tz.utc) if p.exp_date.tzinfo else p.exp_date.replace(tzinfo=dt_tz.utc)).strftime('%Y-%m-%dT%H:%M:%SZ'),
                 "is_active": p.is_active,
             }
             for p in profiles
diff --git a/frontend/src/components/forms/M3U.jsx b/frontend/src/components/forms/M3U.jsx
index 423b2a05..c8caeaef 100644
--- a/frontend/src/components/forms/M3U.jsx
+++ b/frontend/src/components/forms/M3U.jsx
@@ -46,6 +46,7 @@ const M3U = ({
 
   const [playlist, setPlaylist] = useState(null);
   const [file, setFile] = useState(null);
+  const [expDate, setExpDate] = useState(null);
   const [profileModalOpen, setProfileModalOpen] = useState(false);
   const [groupFilterModalOpen, setGroupFilterModalOpen] = useState(false);
   const [filterModalOpen, setFilterModalOpen] = useState(false);
@@ -70,7 +71,6 @@ const M3U = ({
       stale_stream_days: 7,
       priority: 0,
       enable_vod: false,
-      exp_date: null,
     },
 
     validate: {
@@ -103,8 +103,8 @@ const M3U = ({
             ? m3uAccount.priority
             : 0,
         enable_vod: m3uAccount.enable_vod || false,
-        exp_date: m3uAccount.exp_date ? new Date(m3uAccount.exp_date) : null,
       });
+      setExpDate(m3uAccount.exp_date ? new Date(m3uAccount.exp_date) : null);
 
       // Determine schedule type from existing data
       setScheduleType(
@@ -122,6 +122,7 @@ const M3U = ({
       setPlaylist(null);
       form.reset();
       setScheduleType('interval');
+      setExpDate(null);
     }
   }, [m3uAccount]);
 
@@ -134,13 +135,13 @@ const M3U = ({
   const onSubmit = async () => {
     const { create_epg, ...values } = form.getValues();
 
-    // Convert exp_date Date object to ISO string for the API
+    // Convert exp_date (from controlled state) to ISO string for the API
     if (values.account_type === 'XC') {
       // XC accounts have exp_date auto-managed server-side; don't send it
       delete values.exp_date;
-    } else if (values.exp_date instanceof Date) {
-      values.exp_date = values.exp_date.toISOString();
-    } else if (!values.exp_date) {
+    } else if (expDate instanceof Date) {
+      values.exp_date = expDate.toISOString();
+    } else {
       values.exp_date = null;
     }
 
@@ -387,8 +388,8 @@ const M3U = ({
                     placeholder="No expiration"
                     clearable
                     valueFormat="MMM D, YYYY h:mm A"
-                    {...form.getInputProps('exp_date')}
-                    key={form.key('exp_date')}
+                    value={expDate}
+                    onChange={(v) => setExpDate(v ? new Date(v) : null)}
                   />
                 </>
               )}

From bd11b0e832267d57e54672cbb955c476aadd7c4d Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 16:03:41 -0500
Subject: [PATCH 022/172] Change notification for account expiry to admin only.

---
 apps/m3u/tasks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/m3u/tasks.py b/apps/m3u/tasks.py
index 996226ec..9c31fa75 100644
--- a/apps/m3u/tasks.py
+++ b/apps/m3u/tasks.py
@@ -3237,7 +3237,7 @@ def evaluate_profile_expiration_notification(profile):
                     "exp_date": exp.isoformat(),
                 },
                 "is_active": True,
-                "admin_only": False,
+                "admin_only": True,
             },
         )
         send_websocket_notification(notification)
@@ -3280,7 +3280,7 @@ def evaluate_profile_expiration_notification(profile):
                     "exp_date": exp.isoformat(),
                 },
                 "is_active": True,
-                "admin_only": False,
+                "admin_only": True,
             },
         )
         send_websocket_notification(notification)

From e95285ec8c92bba427687df9c2f6974b3bb61eac Mon Sep 17 00:00:00 2001
From: Nick Sandstrom <32273437+nick4810@users.noreply.github.com>
Date: Sat, 14 Mar 2026 07:54:19 -0700
Subject: [PATCH 023/172] Added forms/settings tests

---
 .../__tests__/DvrSettingsForm.test.jsx        | 483 +++++++++++
 .../__tests__/NetworkAccessForm.test.jsx      | 378 +++++++++
 .../__tests__/ProxySettingsForm.test.jsx      | 347 ++++++++
 .../__tests__/StreamSettingsForm.test.jsx     | 760 ++++++++++++++++++
 .../__tests__/SystemSettingsForm.test.jsx     | 311 +++++++
 .../__tests__/UiSettingsForm.test.jsx         | 424 ++++++++++
 6 files changed, 2703 insertions(+)
 create mode 100644 frontend/src/components/forms/settings/__tests__/DvrSettingsForm.test.jsx
 create mode 100644 frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx
 create mode 100644 frontend/src/components/forms/settings/__tests__/ProxySettingsForm.test.jsx
 create mode 100644 frontend/src/components/forms/settings/__tests__/StreamSettingsForm.test.jsx
 create mode 100644 frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
 create mode 100644 frontend/src/components/forms/settings/__tests__/UiSettingsForm.test.jsx

diff --git a/frontend/src/components/forms/settings/__tests__/DvrSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/DvrSettingsForm.test.jsx
new file mode 100644
index 00000000..ad86f1e0
--- /dev/null
+++ b/frontend/src/components/forms/settings/__tests__/DvrSettingsForm.test.jsx
@@ -0,0 +1,483 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import DvrSettingsForm from '../DvrSettingsForm';
+
+// ── Store mocks ────────────────────────────────────────────────────────────────
+vi.mock('../../../../store/settings.jsx', () => {
+  const mock = vi.fn();
+  mock.getState = vi.fn();
+  return { default: mock };
+});
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../../utils/pages/SettingsUtils.js', () => ({
+  getChangedSettings: vi.fn(),
+  parseSettings: vi.fn(),
+  saveChangedSettings: vi.fn(),
+}));
+
+vi.mock('../../../../utils/notificationUtils.js', () => ({
+  showNotification: vi.fn(),
+}));
+
+vi.mock('../../../../utils/forms/settings/DvrSettingsFormUtils.js', () => ({
+  getComskipConfig: vi.fn(),
+  getDvrSettingsFormInitialValues: vi.fn(),
+  uploadComskipIni: vi.fn(),
+}));
+
+// ── Mantine form ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({
+  useForm: vi.fn(),
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  Alert: ({ title }) => <div data-testid="alert">{title}</div>,
+  Button: ({ children, onClick, disabled, type, variant }) => (
+    <button
+      type={type || 'button'}
+      onClick={onClick}
+      disabled={disabled}
+      data-variant={variant}
+    >
+      {children}
+    </button>
+  ),
+  FileInput: ({ placeholder, onChange, disabled }) => (
+    <input
+      data-testid="file-input"
+      type="file"
+      placeholder={placeholder}
+      disabled={disabled}
+      onChange={(e) => {
+        const file = e.target.files?.[0] ?? null;
+        onChange?.(file);
+      }}
+    />
+  ),
+  Flex: ({ children }) => <div>{children}</div>,
+  Group: ({ children }) => <div>{children}</div>,
+  NumberInput: ({ label, id, name, ...rest }) => (
+    <input
+      data-testid={id}
+      id={id}
+      name={name}
+      aria-label={label}
+      type="number"
+      onChange={(e) => rest.onChange?.(Number(e.target.value))}
+    />
+  ),
+  Stack: ({ children }) => <div>{children}</div>,
+  Switch: ({ label, id, checked, onChange }) => (
+    <input
+      data-testid={id}
+      id={id}
+      type="checkbox"
+      aria-label={label}
+      checked={checked ?? false}
+      onChange={onChange}
+    />
+  ),
+  Text: ({ children }) => <span>{children}</span>,
+  TextInput: ({ label, id, name, placeholder, ...rest }) => (
+    <input
+      data-testid={id}
+      id={id}
+      name={name}
+      aria-label={label}
+      placeholder={placeholder}
+      onChange={(e) => rest.onChange?.(e)}
+    />
+  ),
+}));
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Imports after mocks
+// ──────────────────────────────────────────────────────────────────────────────
+import useSettingsStore from '../../../../store/settings.jsx';
+import { useForm } from '@mantine/form';
+import {
+  getChangedSettings,
+  parseSettings,
+  saveChangedSettings,
+} from '../../../../utils/pages/SettingsUtils.js';
+import { showNotification } from '../../../../utils/notificationUtils.js';
+import {
+  getComskipConfig,
+  getDvrSettingsFormInitialValues,
+  uploadComskipIni,
+} from '../../../../utils/forms/settings/DvrSettingsFormUtils.js';
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ──────────────────────────────────────────────────────────────────────────────
+const mockFormValues = {
+  comskip_enabled: false,
+  comskip_custom_path: '',
+  pre_offset_minutes: 0,
+  post_offset_minutes: 0,
+  tv_template: '',
+  tv_fallback_template: '',
+  movie_template: '',
+  movie_fallback_template: '',
+};
+
+const makeFormMock = (overrides = {}) => ({
+  getInputProps: vi.fn((field, opts) => {
+    if (opts?.type === 'checkbox') return { checked: mockFormValues[field] ?? false, onChange: vi.fn() };
+    return { value: mockFormValues[field] ?? '', onChange: vi.fn() };
+  }),
+  setValues: vi.fn(),
+  setFieldValue: vi.fn(),
+  getValues: vi.fn(() => mockFormValues),
+  onSubmit: vi.fn((handler) => (e) => { e?.preventDefault?.(); return handler(); }),
+  ...overrides,
+});
+
+const makeSettings = (overrides = {}) => ({
+  comskip_enabled: { key: 'comskip_enabled', value: 'false' },
+  comskip_custom_path: { key: 'comskip_custom_path', value: '' },
+  pre_offset_minutes: { key: 'pre_offset_minutes', value: '0' },
+  post_offset_minutes: { key: 'post_offset_minutes', value: '0' },
+  ...overrides,
+});
+
+const setupMocks = ({ settings = makeSettings(), formOverrides = {} } = {}) => {
+  const formMock = makeFormMock(formOverrides);
+
+  vi.mocked(useForm).mockReturnValue(formMock);
+  vi.mocked(getDvrSettingsFormInitialValues).mockReturnValue(mockFormValues);
+  vi.mocked(parseSettings).mockReturnValue(mockFormValues);
+  vi.mocked(getComskipConfig).mockResolvedValue({ path: '', exists: false });
+  vi.mocked(getChangedSettings).mockReturnValue({});
+  vi.mocked(saveChangedSettings).mockResolvedValue(undefined);
+
+  vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
+  vi.mocked(useSettingsStore).getState = vi.fn(() => ({
+    updateSetting: vi.fn(),
+  }));
+
+  return { formMock };
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('DvrSettingsForm', () => {
+  let formMock;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    ({ formMock } = setupMocks());
+  });
+
+  // ── Rendering ──────────────────────────────────────────────────────────────
+  describe('rendering', () => {
+    it('renders the form without crashing', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByTestId('comskip_enabled')).toBeInTheDocument();
+      });
+    });
+
+    it('renders the comskip enabled switch', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByTestId('comskip_enabled')).toBeInTheDocument();
+      });
+    });
+
+    it('renders the comskip custom path text input', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByTestId('comskip_custom_path')).toBeInTheDocument();
+      });
+    });
+
+    it('renders the file input for comskip.ini upload', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByTestId('file-input')).toBeInTheDocument();
+      });
+    });
+
+    it('renders the Upload comskip.ini button', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByText('Upload comskip.ini')).toBeInTheDocument();
+      });
+    });
+
+    it('renders the pre_offset_minutes number input', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByTestId('pre_offset_minutes')).toBeInTheDocument();
+      });
+    });
+
+    it('renders the post_offset_minutes number input', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByTestId('post_offset_minutes')).toBeInTheDocument();
+      });
+    });
+
+    it('renders all template text inputs', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByTestId('tv_template')).toBeInTheDocument();
+        expect(screen.getByTestId('tv_fallback_template')).toBeInTheDocument();
+        expect(screen.getByTestId('movie_template')).toBeInTheDocument();
+        expect(screen.getByTestId('movie_fallback_template')).toBeInTheDocument();
+      });
+    });
+
+    it('renders the Save button', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByText('Save')).toBeInTheDocument();
+      });
+    });
+
+    it('does not show success alert on initial render', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      });
+    });
+
+    it('shows "No custom comskip.ini uploaded." when no config exists', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByText('No custom comskip.ini uploaded.')).toBeInTheDocument();
+      });
+    });
+
+    it('shows config path when comskipConfig has path and exists', async () => {
+      vi.mocked(getComskipConfig).mockResolvedValue({
+        path: '/app/docker/comskip.ini',
+        exists: true,
+      });
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByText('Using /app/docker/comskip.ini')).toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Initialization ─────────────────────────────────────────────────────────
+  describe('initialization', () => {
+    it('calls getDvrSettingsFormInitialValues on mount', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(getDvrSettingsFormInitialValues).toHaveBeenCalled();
+      });
+    });
+
+    it('calls parseSettings with settings on mount', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(parseSettings).toHaveBeenCalledWith(makeSettings());
+        expect(formMock.setValues).toHaveBeenCalledWith(mockFormValues);
+      });
+    });
+
+    it('calls getComskipConfig on mount', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(getComskipConfig).toHaveBeenCalled();
+      });
+    });
+
+    it('sets comskip path from getComskipConfig response', async () => {
+      vi.mocked(getComskipConfig).mockResolvedValue({
+        path: '/custom/path/comskip.ini',
+        exists: true,
+      });
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(formMock.setFieldValue).toHaveBeenCalledWith(
+          'comskip_custom_path',
+          '/custom/path/comskip.ini'
+        );
+      });
+    });
+
+    it('handles getComskipConfig error gracefully', async () => {
+      vi.mocked(getComskipConfig).mockRejectedValue(new Error('network error'));
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalledWith(
+          'Failed to load comskip config',
+          expect.any(Error)
+        );
+      });
+      consoleSpy.mockRestore();
+    });
+
+    it('does not call setFieldValue when getComskipConfig returns no path', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(getComskipConfig).toHaveBeenCalled();
+      });
+      expect(formMock.setFieldValue).not.toHaveBeenCalledWith(
+        'comskip_custom_path',
+        expect.anything()
+      );
+    });
+  });
+
+  // ── active prop ────────────────────────────────────────────────────────────
+  describe('active prop', () => {
+    it('resets saved state when active becomes false', async () => {
+      vi.mocked(getChangedSettings).mockReturnValue({ comskip_enabled: true });
+      const { rerender } = render(<DvrSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+      });
+
+      rerender(<DvrSettingsForm active={false} />);
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Form submission ────────────────────────────────────────────────────────
+  describe('form submission', () => {
+    it('calls getChangedSettings and saveChangedSettings on submit', async () => {
+      vi.mocked(getChangedSettings).mockReturnValue({ pre_offset_minutes: 5 });
+      render(<DvrSettingsForm active={true} />);
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      await waitFor(() => {
+        expect(getChangedSettings).toHaveBeenCalledWith(mockFormValues, makeSettings());
+        expect(saveChangedSettings).toHaveBeenCalledWith(makeSettings(), { pre_offset_minutes: 5 });
+      });
+    });
+
+    it('shows success alert after successful save', async () => {
+      render(<DvrSettingsForm active={true} />);
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+        expect(screen.getByText('Saved Successfully')).toBeInTheDocument();
+      });
+    });
+
+    it('does not show success alert when saveChangedSettings throws', async () => {
+      vi.mocked(saveChangedSettings).mockRejectedValue(new Error('save failed'));
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+
+      render(<DvrSettingsForm active={true} />);
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalledWith(
+          'Error saving settings:',
+          expect.any(Error)
+        );
+        expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      });
+      consoleSpy.mockRestore();
+    });
+  });
+
+  // ── comskip upload ─────────────────────────────────────────────────────────
+  describe('comskip upload', () => {
+    it('Upload button is disabled when no file is selected', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(screen.getByText('Upload comskip.ini')).toBeDisabled();
+      });
+    });
+
+    it('calls uploadComskipIni with the selected file', async () => {
+      const mockFile = new File(['content'], 'comskip.ini', { type: 'text/plain' });
+      vi.mocked(uploadComskipIni).mockResolvedValue({ path: '/uploaded/comskip.ini' });
+
+      render(<DvrSettingsForm active={true} />);
+      fireEvent.change(screen.getByTestId('file-input'), { target: { files: [mockFile] } });
+
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('Upload comskip.ini'));
+      });
+
+      await waitFor(() => {
+        expect(uploadComskipIni).toHaveBeenCalledWith(mockFile);
+      });
+    });
+
+    it('shows success notification after successful upload', async () => {
+      const mockFile = new File(['content'], 'comskip.ini', { type: 'text/plain' });
+      vi.mocked(uploadComskipIni).mockResolvedValue({ path: '/uploaded/comskip.ini' });
+
+      render(<DvrSettingsForm active={true} />);
+      fireEvent.change(screen.getByTestId('file-input'), { target: { files: [mockFile] } });
+
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('Upload comskip.ini'));
+      });
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ title: 'comskip.ini uploaded', color: 'green' })
+        );
+      });
+    });
+
+    it('sets comskip_custom_path form field after successful upload', async () => {
+      const mockFile = new File(['content'], 'comskip.ini', { type: 'text/plain' });
+      vi.mocked(uploadComskipIni).mockResolvedValue({ path: '/uploaded/comskip.ini' });
+
+      render(<DvrSettingsForm active={true} />);
+      fireEvent.change(screen.getByTestId('file-input'), { target: { files: [mockFile] } });
+
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('Upload comskip.ini'));
+      });
+
+      await waitFor(() => {
+        expect(formMock.setFieldValue).toHaveBeenCalledWith(
+          'comskip_custom_path',
+          '/uploaded/comskip.ini'
+        );
+      });
+    });
+
+    it('handles upload error gracefully', async () => {
+      const mockFile = new File(['content'], 'comskip.ini', { type: 'text/plain' });
+      vi.mocked(uploadComskipIni).mockRejectedValue(new Error('upload failed'));
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+
+      render(<DvrSettingsForm active={true} />);
+      fireEvent.change(screen.getByTestId('file-input'), { target: { files: [mockFile] } });
+
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('Upload comskip.ini'));
+      });
+
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalledWith(
+          'Failed to upload comskip.ini',
+          expect.any(Error)
+        );
+        expect(showNotification).not.toHaveBeenCalled();
+      });
+      consoleSpy.mockRestore();
+    });
+
+    it('does not call uploadComskipIni when no file is selected', async () => {
+      render(<DvrSettingsForm active={true} />);
+      await waitFor(() => screen.getByTestId('file-input'));
+      expect(uploadComskipIni).not.toHaveBeenCalled();
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx b/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx
new file mode 100644
index 00000000..32271d0b
--- /dev/null
+++ b/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx
@@ -0,0 +1,378 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import NetworkAccessForm from '../NetworkAccessForm';
+
+// ── Constants mock ─────────────────────────────────────────────────────────────
+vi.mock('../../../../constants.js', () => ({
+  NETWORK_ACCESS_OPTIONS: [
+    { value: 'all', label: 'All' },
+    { value: 'local', label: 'Local Only' },
+    { value: 'custom', label: 'Custom' },
+  ],
+}));
+
+// ── Store mock ─────────────────────────────────────────────────────────────────
+vi.mock('../../../../store/settings.jsx', () => ({ default: vi.fn() }));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../../utils/pages/SettingsUtils.js', () => ({
+  checkSetting: vi.fn(),
+  updateSetting: vi.fn(),
+}));
+
+vi.mock('../../../../utils/forms/settings/NetworkAccessFormUtils.js', () => ({
+  getNetworkAccessFormInitialValues: vi.fn(),
+  getNetworkAccessFormValidation: vi.fn(),
+  getNetworkAccessDefaults: vi.fn(),
+}));
+
+// ── Mantine form ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({ useForm: vi.fn() }));
+
+// ── ConfirmationDialog mock ────────────────────────────────────────────────────
+vi.mock('../../../ConfirmationDialog.jsx', () => ({
+  default: ({ opened, onConfirm, onClose, title, message }) =>
+    opened ? (
+      <div data-testid="confirmation-dialog">
+        <div data-testid="confirm-title">{title}</div>
+        <div data-testid="confirm-message">{message}</div>
+        <button data-testid="confirm-ok" onClick={onConfirm}>Confirm</button>
+        <button data-testid="confirm-cancel" onClick={onClose}>Cancel</button>
+      </div>
+    ) : null,
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  Alert: ({ title, children }) => (
+    <div data-testid="alert">
+      <span data-testid="alert-title">{title}</span>
+      {children}
+    </div>
+  ),
+  Button: ({ children, onClick, disabled, loading, type, variant }) => (
+    <button
+      type={type || 'button'}
+      onClick={onClick}
+      disabled={disabled || loading}
+      data-variant={variant}
+      data-loading={String(loading)}
+    >
+      {children}
+    </button>
+  ),
+  Flex: ({ children }) => <div>{children}</div>,
+  Stack: ({ children }) => <div>{children}</div>,
+  Text: ({ children }) => <span>{children}</span>,
+  TextInput: ({ label, id, placeholder, error, ...rest }) => (
+    <div>
+      <input
+        data-testid={id}
+        id={id}
+        aria-label={label}
+        placeholder={placeholder}
+        data-error={error}
+        onChange={(e) => rest.onChange?.(e)}
+        value={rest.value ?? ''}
+      />
+      {error && <span data-testid={`${id}-error`}>{error}</span>}
+    </div>
+  ),
+}));
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Imports after mocks
+// ──────────────────────────────────────────────────────────────────────────────
+import useSettingsStore from '../../../../store/settings.jsx';
+import { useForm } from '@mantine/form';
+import { checkSetting, updateSetting } from '../../../../utils/pages/SettingsUtils.js';
+import {
+  getNetworkAccessFormInitialValues,
+  getNetworkAccessFormValidation,
+  getNetworkAccessDefaults,
+} from '../../../../utils/forms/settings/NetworkAccessFormUtils.js';
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ──────────────────────────────────────────────────────────────────────────────
+const mockInitialValues = {
+  m3u_access: 'local',
+  epg_access: 'local',
+  recordings_access: 'all',
+  m3u_custom_cidrs: '',
+  epg_custom_cidrs: '',
+  recordings_custom_cidrs: '',
+};
+
+const makeFormMock = (overrides = {}) => ({
+  key: vi.fn(),
+  getInputProps: vi.fn((field) => ({
+    value: mockInitialValues[field] ?? '',
+    onChange: vi.fn(),
+  })),
+  setValues: vi.fn(),
+  setErrors: vi.fn(),
+  setFieldValue: vi.fn(),
+  getValues: vi.fn(() => mockInitialValues),
+  validate: vi.fn(() => ({ hasErrors: false })),
+  onSubmit: vi.fn((handler) => (e) => {
+    e?.preventDefault?.();
+    return handler(mockInitialValues);
+  }),
+  errors: {},
+  ...overrides,
+});
+
+const makeSettings = (overrides = {}) => ({
+  network_access: {
+    key: 'network_access',
+    value: {
+      m3u_access: 'local',
+      epg_access: 'local',
+      recordings_access: 'all',
+    },
+  },
+  ...overrides,
+});
+
+const setupMocks = ({ settings = makeSettings(), formOverrides = {} } = {}) => {
+  const formMock = makeFormMock(formOverrides);
+
+  vi.mocked(useForm).mockReturnValue(formMock);
+  vi.mocked(getNetworkAccessFormInitialValues).mockReturnValue(mockInitialValues);
+  vi.mocked(getNetworkAccessFormValidation).mockReturnValue({});
+  vi.mocked(getNetworkAccessDefaults).mockReturnValue(mockInitialValues);
+  vi.mocked(checkSetting).mockResolvedValue({ client_ip: '192.168.1.1', UI: ['192.168.0.0/16'] });
+  vi.mocked(updateSetting).mockResolvedValue(undefined);
+
+  vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
+
+  return { formMock };
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('NetworkAccessForm', () => {
+  let formMock;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    ({ formMock } = setupMocks());
+  });
+
+  // ── Rendering ──────────────────────────────────────────────────────────────
+  describe('rendering', () => {
+    it('renders without crashing', () => {
+      render(<NetworkAccessForm active={true} />);
+      expect(screen.getByText('Save')).toBeInTheDocument();
+    });
+
+    it('renders the Save button', () => {
+      render(<NetworkAccessForm active={true} />);
+      expect(screen.getByText('Save')).toBeInTheDocument();
+    });
+
+    it('does not show success alert on initial render', () => {
+      render(<NetworkAccessForm active={true} />);
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+
+    it('does not show confirmation dialog on initial render', () => {
+      render(<NetworkAccessForm active={true} />);
+      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+    });
+
+    it('does not show error alert on initial render', () => {
+      render(<NetworkAccessForm active={true} />);
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+  });
+
+  // ── Initialization ─────────────────────────────────────────────────────────
+  describe('initialization', () => {
+    it('calls getNetworkAccessFormInitialValues on mount', () => {
+      render(<NetworkAccessForm active={true} />);
+      expect(getNetworkAccessFormInitialValues).toHaveBeenCalled();
+    });
+
+    it('calls getNetworkAccessFormValidation on mount', () => {
+      render(<NetworkAccessForm active={true} />);
+      expect(getNetworkAccessFormValidation).toHaveBeenCalled();
+    });
+
+    it('does not call checkSetting on mount', () => {
+      render(<NetworkAccessForm active={true} />);
+      expect(checkSetting).not.toHaveBeenCalled();
+    });
+
+    it('calls checkSetting when form is submitted', async () => {
+      render(<NetworkAccessForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+      await waitFor(() => {
+        expect(checkSetting).toHaveBeenCalled();
+      });
+    });
+
+    it('sets form values from network_access settings on mount', async () => {
+      render(<NetworkAccessForm active={true} />);
+      await waitFor(() => {
+        expect(formMock.setValues).toHaveBeenCalled();
+      });
+    });
+
+    it('handles missing network_access setting gracefully', async () => {
+      ({ formMock } = setupMocks({ settings: {} }));
+      expect(() => render(<NetworkAccessForm active={true} />)).not.toThrow();
+    });
+
+    it('handles checkSetting error gracefully', async () => {
+      vi.mocked(checkSetting).mockRejectedValue(new Error('network error'));
+      render(<NetworkAccessForm active={true} />);
+    });
+  });
+
+  // ── active prop ────────────────────────────────────────────────────────────
+  describe('active prop', () => {
+    it('resets saved state when active becomes false', async () => {
+      vi.mocked(updateSetting).mockResolvedValue(undefined);
+      const { rerender } = render(<NetworkAccessForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form') ?? screen.getByText('Save').closest('div'));
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('confirmation-dialog')).not.toBeNull();
+      }).catch(() => {});
+
+      rerender(<NetworkAccessForm active={false} />);
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Form submission ────────────────────────────────────────────────────────
+  describe('form submission', () => {
+    it('opens confirmation dialog on Save click', async () => {
+      render(<NetworkAccessForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+      await waitFor(() => {
+        expect(screen.getByTestId('confirmation-dialog')).toBeInTheDocument();
+      });
+    });
+
+    it('closes confirmation dialog on Cancel click', async () => {
+      render(<NetworkAccessForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-cancel'));
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      });
+    });
+
+    it('calls updateSetting on confirm', async () => {
+      render(<NetworkAccessForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-ok'));
+
+      await waitFor(() => {
+        expect(updateSetting).toHaveBeenCalled();
+      });
+    });
+
+    it('shows success alert after confirmed save', async () => {
+      render(<NetworkAccessForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-ok'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+      });
+    });
+
+    it('does not call updateSetting when confirmation is cancelled', async () => {
+      render(<NetworkAccessForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-cancel'));
+
+      await waitFor(() => {
+        expect(updateSetting).not.toHaveBeenCalled();
+      });
+    });
+
+    it('does not show success alert when updateSetting throws', async () => {
+      vi.mocked(updateSetting).mockRejectedValue(
+        { body: { value: { m3u_custom_cidrs: 'Invalid CIDR' } } });
+      render(<NetworkAccessForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-ok'));
+
+      await waitFor(() => {
+        const alertTitle = screen.queryByTestId('alert-title');
+        expect(alertTitle?.textContent).not.toBe('Saved Successfully');
+      });
+    });
+  });
+
+  // ── Client IP display ──────────────────────────────────────────────────────
+  describe('client IP display', () => {
+    it('displays client IP address fetched on submit', async () => {
+      render(<NetworkAccessForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-ok'));
+      await waitFor(() => {
+        expect(screen.getByText(/192\.168\.1\.1/)).toBeInTheDocument();
+      });
+    });
+
+    it('does not display IP when checkSetting returns null', async () => {
+      vi.mocked(checkSetting).mockResolvedValue(null);
+      render(<NetworkAccessForm active={true} />);
+      await waitFor(() => {
+        expect(screen.queryByText(/\d+\.\d+\.\d+\.\d+/)).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Network access error ───────────────────────────────────────────────────
+  describe('network access error state', () => {
+    it('clears error state after successful save', async () => {
+      vi.mocked(checkSetting).mockResolvedValue(
+        { error: true, message: 'Invalid CIDR', data: 'Error details' }
+      );
+
+      render(<NetworkAccessForm active={true} />);
+
+      // First save — fails
+      fireEvent.click(screen.getByText('Save'));
+      await waitFor(() => screen.getByTestId('alert'));
+
+      vi.mocked(checkSetting).mockResolvedValue(
+        { client_ip: '192.168.1.1', UI: ['192.168.0.0/16'] });
+
+      // Second save — succeeds
+      fireEvent.click(screen.getByText('Save'));
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-ok'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/settings/__tests__/ProxySettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/ProxySettingsForm.test.jsx
new file mode 100644
index 00000000..193f528c
--- /dev/null
+++ b/frontend/src/components/forms/settings/__tests__/ProxySettingsForm.test.jsx
@@ -0,0 +1,347 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import ProxySettingsForm from '../ProxySettingsForm';
+
+// ── Constants mock ─────────────────────────────────────────────────────────────
+vi.mock('../../../../constants.js', () => ({
+  PROXY_SETTINGS_OPTIONS: {
+    buffering_timeout: { label: 'Buffering Timeout', description: 'Timeout in seconds' },
+    buffering_speed: { label: 'Buffering Speed', description: 'Speed multiplier' },
+    redis_url: { label: 'Redis URL', description: 'Redis connection URL' },
+  },
+}));
+
+// ── Store mock ─────────────────────────────────────────────────────────────────
+vi.mock('../../../../store/settings.jsx', () => ({ default: vi.fn() }));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../../utils/pages/SettingsUtils.js', () => ({
+  updateSetting: vi.fn(),
+}));
+
+vi.mock('../../../../utils/forms/settings/ProxySettingsFormUtils.js', () => ({
+  getProxySettingsFormInitialValues: vi.fn(),
+  getProxySettingDefaults: vi.fn(),
+}));
+
+// ── Mantine form ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({ useForm: vi.fn() }));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  Alert: ({ title, children }) => (
+    <div data-testid="alert">
+      <span data-testid="alert-title">{title}</span>
+      {children}
+    </div>
+  ),
+  Button: ({ children, onClick, disabled, loading, type, variant, color }) => (
+    <button
+      type={type || 'button'}
+      onClick={onClick}
+      disabled={disabled || loading}
+      data-variant={variant}
+      data-color={color}
+      data-loading={String(loading)}
+    >
+      {children}
+    </button>
+  ),
+  Flex: ({ children }) => <div>{children}</div>,
+  NumberInput: ({ label, description, min, max, step, ...rest }) => (
+    <div>
+      <label>{label}</label>
+      {description && <span data-testid={`desc-${label}`}>{description}</span>}
+      <input
+        data-testid={`number-input-${label}`}
+        type="number"
+        aria-label={label}
+        min={min}
+        max={max}
+        step={step}
+        onChange={(e) => rest.onChange?.(Number(e.target.value))}
+        value={rest.value ?? 0}
+      />
+    </div>
+  ),
+  Stack: ({ children }) => <div>{children}</div>,
+  TextInput: ({ label, description, ...rest }) => (
+    <div>
+      <label>{label}</label>
+      {description && <span data-testid={`desc-${label}`}>{description}</span>}
+      <input
+        data-testid={`text-input-${label}`}
+        aria-label={label}
+        onChange={(e) => rest.onChange?.(e)}
+        value={rest.value ?? ''}
+      />
+    </div>
+  ),
+}));
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Imports after mocks
+// ──────────────────────────────────────────────────────────────────────────────
+import useSettingsStore from '../../../../store/settings.jsx';
+import { useForm } from '@mantine/form';
+import { updateSetting } from '../../../../utils/pages/SettingsUtils.js';
+import {
+  getProxySettingsFormInitialValues,
+  getProxySettingDefaults,
+} from '../../../../utils/forms/settings/ProxySettingsFormUtils.js';
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ──────────────────────────────────────────────────────────────────────────────
+const mockInitialValues = {
+  buffering_timeout: 30,
+  buffering_speed: 1.0,
+  redis_url: 'redis://localhost:6379',
+};
+
+const mockDefaults = {
+  buffering_timeout: 30,
+  buffering_speed: 1.0,
+  redis_url: '',
+};
+
+const makeFormMock = (overrides = {}) => ({
+  getInputProps: vi.fn((field) => ({
+    value: mockInitialValues[field] ?? '',
+    onChange: vi.fn(),
+  })),
+  setValues: vi.fn(),
+  getValues: vi.fn(() => mockInitialValues),
+  onSubmit: vi.fn((handler) => (e) => {
+    e?.preventDefault?.();
+    return handler();
+  }),
+  submitting: false,
+  errors: {},
+  ...overrides,
+});
+
+const makeSettings = (overrides = {}) => ({
+  proxy_settings: {
+    key: 'proxy_settings',
+    value: { ...mockInitialValues },
+  },
+  ...overrides,
+});
+
+const setupMocks = ({ settings = makeSettings(), formOverrides = {} } = {}) => {
+  const formMock = makeFormMock(formOverrides);
+
+  vi.mocked(useForm).mockReturnValue(formMock);
+  vi.mocked(getProxySettingsFormInitialValues).mockReturnValue(mockInitialValues);
+  vi.mocked(getProxySettingDefaults).mockReturnValue(mockDefaults);
+  vi.mocked(updateSetting).mockResolvedValue({ success: true });
+  vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
+
+  return { formMock };
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('ProxySettingsForm', () => {
+  let formMock;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    ({ formMock } = setupMocks());
+  });
+
+  // ── Rendering ──────────────────────────────────────────────────────────────
+  describe('rendering', () => {
+    it('does not show success alert on initial render', () => {
+      render(<ProxySettingsForm active={true} />);
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+
+    it('renders NumberInput for buffering_timeout', () => {
+      render(<ProxySettingsForm active={true} />);
+      expect(screen.getByTestId('number-input-Buffering Timeout')).toBeInTheDocument();
+    });
+
+    it('renders NumberInput for buffering_speed', () => {
+      render(<ProxySettingsForm active={true} />);
+      expect(screen.getByTestId('number-input-Buffering Speed')).toBeInTheDocument();
+    });
+
+    it('renders TextInput for redis_url', () => {
+      render(<ProxySettingsForm active={true} />);
+      expect(screen.getByTestId('text-input-Redis URL')).toBeInTheDocument();
+    });
+
+    it('renders description text for fields that have one', () => {
+      render(<ProxySettingsForm active={true} />);
+      expect(screen.getByTestId('desc-Buffering Timeout')).toBeInTheDocument();
+    });
+  });
+
+  // ── Initialization ─────────────────────────────────────────────────────────
+  describe('initialization', () => {
+    it('calls getProxySettingsFormInitialValues on mount', () => {
+      render(<ProxySettingsForm active={true} />);
+      expect(getProxySettingsFormInitialValues).toHaveBeenCalled();
+    });
+
+    it('calls setValues with merged defaults and stored settings on mount', async () => {
+      render(<ProxySettingsForm active={true} />);
+      await waitFor(() => {
+        expect(formMock.setValues).toHaveBeenCalledWith({
+          ...mockDefaults,
+          ...makeSettings().proxy_settings.value,
+        });
+      });
+    });
+
+    it('does not call setValues when proxy_settings is missing', async () => {
+      ({ formMock } = setupMocks({ settings: {} }));
+      render(<ProxySettingsForm active={true} />);
+      await waitFor(() => {
+        expect(formMock.setValues).not.toHaveBeenCalled();
+      });
+    });
+
+    it('does not call setValues when proxy_settings.value is missing', async () => {
+      ({ formMock } = setupMocks({
+        settings: { proxy_settings: { key: 'proxy_settings' } },
+      }));
+      render(<ProxySettingsForm active={true} />);
+      await waitFor(() => {
+        expect(formMock.setValues).not.toHaveBeenCalled();
+      });
+    });
+
+    it('handles null settings gracefully', () => {
+      vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings: null }));
+      expect(() => render(<ProxySettingsForm active={true} />)).not.toThrow();
+    });
+  });
+
+  // ── active prop ────────────────────────────────────────────────────────────
+  describe('active prop', () => {
+    it('clears saved state when active becomes false', async () => {
+      vi.mocked(updateSetting).mockResolvedValue({ success: true });
+      const { rerender } = render(<ProxySettingsForm active={true} />);
+
+      // Trigger a successful save
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+      });
+
+      rerender(<ProxySettingsForm active={false} />);
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Form submission ────────────────────────────────────────────────────────
+  describe('form submission', () => {
+    it('calls updateSetting with proxy_settings on Save', async () => {
+      render(<ProxySettingsForm active={true} />);
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      await waitFor(() => {
+        expect(updateSetting).toHaveBeenCalledWith({
+          ...makeSettings().proxy_settings,
+          value: mockInitialValues,
+        });
+      });
+    });
+
+    it('shows success alert when updateSetting returns a truthy result', async () => {
+      render(<ProxySettingsForm active={true} />);
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+      });
+    });
+
+    it('does not show success alert when updateSetting returns undefined', async () => {
+      vi.mocked(updateSetting).mockResolvedValue(undefined);
+      render(<ProxySettingsForm active={true} />);
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      await waitFor(() => {
+        expect(updateSetting).toHaveBeenCalled();
+      });
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+
+    it('does not show success alert when updateSetting returns null', async () => {
+      vi.mocked(updateSetting).mockResolvedValue(null);
+      render(<ProxySettingsForm active={true} />);
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      await waitFor(() => {
+        expect(updateSetting).toHaveBeenCalled();
+      });
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+
+    it('does not show success alert when updateSetting throws', async () => {
+      vi.mocked(updateSetting).mockRejectedValue(new Error('save failed'));
+      render(<ProxySettingsForm active={true} />);
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+
+    it('resets saved to false at the start of a new submission', async () => {
+      render(<ProxySettingsForm active={true} />);
+
+      // First save — succeeds
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => screen.getByTestId('alert'));
+
+      // Second save — returns undefined (no result)
+      vi.mocked(updateSetting).mockResolvedValue(undefined);
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Reset to Defaults ──────────────────────────────────────────────────────
+  describe('Reset to Defaults', () => {
+    it('calls getProxySettingDefaults when Reset to Defaults is clicked', () => {
+      render(<ProxySettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Reset to Defaults'));
+      expect(getProxySettingDefaults).toHaveBeenCalled();
+    });
+
+    it('calls form.setValues with defaults when Reset to Defaults is clicked', () => {
+      render(<ProxySettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Reset to Defaults'));
+      expect(formMock.setValues).toHaveBeenCalledWith(mockDefaults);
+    });
+
+    it('does not submit the form when Reset to Defaults is clicked', async () => {
+      render(<ProxySettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Reset to Defaults'));
+      await waitFor(() => {
+        expect(updateSetting).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  // ── ProxySettingsOptions field routing ─────────────────────────────────────
+  describe('ProxySettingsOptions field routing', () => {
+    it('calls getInputProps for each PROXY_SETTINGS_OPTIONS key', () => {
+      render(<ProxySettingsForm active={true} />);
+      expect(formMock.getInputProps).toHaveBeenCalledWith('buffering_timeout');
+      expect(formMock.getInputProps).toHaveBeenCalledWith('buffering_speed');
+      expect(formMock.getInputProps).toHaveBeenCalledWith('redis_url');
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/settings/__tests__/StreamSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/StreamSettingsForm.test.jsx
new file mode 100644
index 00000000..c0742c8e
--- /dev/null
+++ b/frontend/src/components/forms/settings/__tests__/StreamSettingsForm.test.jsx
@@ -0,0 +1,760 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import StreamSettingsForm from '../StreamSettingsForm';
+
+// ── Store mocks ────────────────────────────────────────────────────────────────
+vi.mock('../../../../store/settings.jsx', () => ({ default: vi.fn() }));
+vi.mock('../../../../store/warnings.jsx', () => ({ default: vi.fn() }));
+vi.mock('../../../../store/userAgents.jsx', () => ({ default: vi.fn() }));
+vi.mock('../../../../store/streamProfiles.jsx', () => ({ default: vi.fn() }));
+
+// ── Constants mock ─────────────────────────────────────────────────────────────
+vi.mock('../../../../constants.js', () => ({
+  REGION_CHOICES: [
+    { label: 'US', value: 'us' },
+    { label: 'EU', value: 'eu' },
+  ],
+}));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../../utils/pages/SettingsUtils.js', () => ({
+  getChangedSettings: vi.fn(),
+  parseSettings: vi.fn(),
+  rehashStreams: vi.fn(),
+  saveChangedSettings: vi.fn(),
+}));
+
+vi.mock('../../../../utils/forms/settings/StreamSettingsFormUtils.js', () => ({
+  getStreamSettingsFormInitialValues: vi.fn(),
+  getStreamSettingsFormValidation: vi.fn(),
+}));
+
+// ── Mantine form ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({ useForm: vi.fn() }));
+
+// ── ConfirmationDialog mock ────────────────────────────────────────────────────
+vi.mock('../../../ConfirmationDialog.jsx', () => ({
+  default: ({
+              opened,
+              onClose,
+              onConfirm,
+              title,
+              message,
+              confirmLabel,
+              cancelLabel,
+              actionKey,
+              onSuppressChange,
+            }) =>
+    opened ? (
+      <div data-testid="confirmation-dialog">
+        <div data-testid="confirm-title">{title}</div>
+        <div data-testid="confirm-message">{message}</div>
+        <button data-testid="confirm-ok" onClick={onConfirm}>
+          {confirmLabel}
+        </button>
+        <button data-testid="confirm-cancel" onClick={onClose}>
+          {cancelLabel}
+        </button>
+        {actionKey && (
+          <button
+            data-testid="confirm-suppress"
+            onClick={() => onSuppressChange?.(actionKey)}
+          >
+            Don't show again
+          </button>
+        )}
+      </div>
+    ) : null,
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  Alert: ({ title, children }) => (
+    <div data-testid="alert">
+      <span data-testid="alert-title">{title}</span>
+      {children}
+    </div>
+  ),
+  Button: ({ children, onClick, disabled, loading, type, variant, color }) => (
+    <button
+      type={type || 'button'}
+      onClick={onClick}
+      disabled={disabled || loading}
+      data-variant={variant}
+      data-color={color}
+      data-loading={String(loading)}
+    >
+      {children}
+    </button>
+  ),
+  Flex: ({ children }) => <div>{children}</div>,
+  Group: ({ children }) => <div>{children}</div>,
+  MultiSelect: ({ label, id, data, ...rest }) => (
+    <div>
+      <label htmlFor={id}>{label}</label>
+      <select
+        data-testid={id}
+        id={id}
+        aria-label={label}
+        multiple
+        onChange={(e) => {
+          const selected = Array.from(e.target.selectedOptions).map((o) => o.value);
+          rest.onChange?.(selected);
+        }}
+        value={rest.value ?? []}
+      >
+        {data?.map((opt) => (
+          <option key={opt.value} value={opt.value}>
+            {opt.label}
+          </option>
+        ))}
+      </select>
+    </div>
+  ),
+  Select: ({ label, id, data, ...rest }) => (
+    <div>
+      <label htmlFor={id}>{label}</label>
+      <select
+        data-testid={id}
+        id={id}
+        aria-label={label}
+        onChange={(e) => rest.onChange?.(e.target.value)}
+        value={rest.value ?? ''}
+      >
+        {data?.map((opt) => (
+          <option key={opt.value} value={opt.value}>
+            {opt.label}
+          </option>
+        ))}
+      </select>
+    </div>
+  ),
+  Switch: ({ id, ...rest }) => (
+    <input
+      data-testid={id}
+      id={id}
+      type="checkbox"
+      checked={rest.checked ?? false}
+      onChange={(e) => rest.onChange?.(e)}
+    />
+  ),
+  Text: ({ children, size, fw }) => (
+    <span data-size={size} data-fw={fw}>
+      {children}
+    </span>
+  ),
+}));
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Imports after mocks
+// ──────────────────────────────────────────────────────────────────────────────
+import useSettingsStore from '../../../../store/settings.jsx';
+import useWarningsStore from '../../../../store/warnings.jsx';
+import useUserAgentsStore from '../../../../store/userAgents.jsx';
+import useStreamProfilesStore from '../../../../store/streamProfiles.jsx';
+import { useForm } from '@mantine/form';
+import {
+  getChangedSettings,
+  parseSettings,
+  rehashStreams,
+  saveChangedSettings,
+} from '../../../../utils/pages/SettingsUtils.js';
+import {
+  getStreamSettingsFormInitialValues,
+  getStreamSettingsFormValidation,
+} from '../../../../utils/forms/settings/StreamSettingsFormUtils.js';
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ──────────────────────────────────────────────────────────────────────────────
+const mockFormValues = {
+  default_user_agent: '1',
+  default_stream_profile: '2',
+  preferred_region: 'us',
+  auto_import_mapped_files: false,
+  m3u_hash_key: ['name'],
+};
+
+const makeFormMock = (overrides = {}) => ({
+  getInputProps: vi.fn((field, opts) => {
+    if (opts?.type === 'checkbox') {
+      return { checked: mockFormValues[field] ?? false, onChange: vi.fn() };
+    }
+    return { value: mockFormValues[field] ?? '', onChange: vi.fn() };
+  }),
+  setValues: vi.fn(),
+  getValues: vi.fn(() => mockFormValues),
+  onSubmit: vi.fn((handler) => (e) => {
+    e?.preventDefault?.();
+    return handler();
+  }),
+  submitting: false,
+  errors: {},
+  ...overrides,
+});
+
+const makeSettings = (overrides = {}) => ({
+  stream_settings: {
+    key: 'stream_settings',
+    value: { m3u_hash_key: 'name' },
+  },
+  ...overrides,
+});
+
+const makeUserAgents = () => [
+  { id: 1, name: 'Chrome' },
+  { id: 2, name: 'Firefox' },
+];
+
+const makeStreamProfiles = () => [
+  { id: 1, name: 'Default' },
+  { id: 2, name: 'HLS' },
+];
+
+const setupMocks = ({
+                      settings = makeSettings(),
+                      formOverrides = {},
+                      warningSuppressed = false,
+                      userAgents = makeUserAgents(),
+                      streamProfiles = makeStreamProfiles(),
+                    } = {}) => {
+  const formMock = makeFormMock(formOverrides);
+
+  vi.mocked(useForm).mockReturnValue(formMock);
+  vi.mocked(getStreamSettingsFormInitialValues).mockReturnValue(mockFormValues);
+  vi.mocked(getStreamSettingsFormValidation).mockReturnValue({});
+  vi.mocked(parseSettings).mockReturnValue(mockFormValues);
+  vi.mocked(getChangedSettings).mockReturnValue({ preferred_region: 'eu' });
+  vi.mocked(saveChangedSettings).mockResolvedValue(undefined);
+  vi.mocked(rehashStreams).mockResolvedValue(undefined);
+
+  vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
+  vi.mocked(useWarningsStore).mockImplementation((sel) =>
+    sel({
+      suppressWarning: vi.fn(),
+      isWarningSuppressed: vi.fn(() => warningSuppressed),
+    })
+  );
+  vi.mocked(useUserAgentsStore).mockImplementation((sel) =>
+    sel({ userAgents })
+  );
+  vi.mocked(useStreamProfilesStore).mockImplementation((sel) =>
+    sel({ profiles: streamProfiles })
+  );
+
+  return { formMock };
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('StreamSettingsForm', () => {
+  let formMock;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    ({ formMock } = setupMocks());
+  });
+
+  // ── Rendering ──────────────────────────────────────────────────────────────
+  describe('rendering', () => {
+    it('renders without crashing', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByText('Save')).toBeInTheDocument();
+    });
+
+    it('renders the Save button', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByText('Save')).toBeInTheDocument();
+    });
+
+    it('renders the Rehash Streams button', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByText('Rehash Streams')).toBeInTheDocument();
+    });
+
+    it('renders the Default User Agent select', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByTestId('default_user_agent')).toBeInTheDocument();
+    });
+
+    it('renders the Default Stream Profile select', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByTestId('default_stream_profile')).toBeInTheDocument();
+    });
+
+    it('renders the Preferred Region select', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByTestId('preferred_region')).toBeInTheDocument();
+    });
+
+    it('renders the Auto-Import Mapped Files switch', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByTestId('auto_import_mapped_files')).toBeInTheDocument();
+    });
+
+    it('renders the M3U Hash Key multiselect', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByTestId('m3u_hash_key')).toBeInTheDocument();
+    });
+
+    it('populates user agent options from store', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByText('Chrome')).toBeInTheDocument();
+      expect(screen.getByText('Firefox')).toBeInTheDocument();
+    });
+
+    it('populates stream profile options from store', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByText('Default')).toBeInTheDocument();
+      expect(screen.getByText('HLS')).toBeInTheDocument();
+    });
+
+    it('populates region options from REGION_CHOICES', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.getByText('US')).toBeInTheDocument();
+      expect(screen.getByText('EU')).toBeInTheDocument();
+    });
+
+    it('does not show success alert on initial render', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+
+    it('does not show confirmation dialog on initial render', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+    });
+  });
+
+  // ── Initialization ─────────────────────────────────────────────────────────
+  describe('initialization', () => {
+    it('calls getStreamSettingsFormInitialValues on mount', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(getStreamSettingsFormInitialValues).toHaveBeenCalled();
+    });
+
+    it('calls getStreamSettingsFormValidation on mount', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(getStreamSettingsFormValidation).toHaveBeenCalled();
+    });
+
+    it('calls parseSettings with settings from store on mount', async () => {
+      const settings = makeSettings();
+      setupMocks({ settings });
+      render(<StreamSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(parseSettings).toHaveBeenCalledWith(settings);
+      });
+    });
+
+    it('calls form.setValues with parsed settings on mount', async () => {
+      render(<StreamSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(formMock.setValues).toHaveBeenCalledWith(mockFormValues);
+      });
+    });
+
+    it('does not call parseSettings when settings is null', async () => {
+      vi.mocked(useSettingsStore).mockImplementation((sel) =>
+        sel({ settings: null })
+      );
+      render(<StreamSettingsForm active={true} />);
+      await waitFor(() => {
+        expect(parseSettings).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  // ── active prop ────────────────────────────────────────────────────────────
+  describe('active prop', () => {
+    it('clears saved state when active becomes false', async () => {
+      vi.mocked(saveChangedSettings).mockResolvedValue(undefined);
+      vi.mocked(getChangedSettings).mockReturnValue({});
+      const { rerender } = render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+      });
+
+      rerender(<StreamSettingsForm active={false} />);
+      await waitFor(() => {
+        expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      });
+    });
+
+    it('clears rehashSuccess when active becomes false', async () => {
+      ({ formMock } = setupMocks({ warningSuppressed: true }));
+      const { rerender } = render(<StreamSettingsForm active={true} />);
+
+      fireEvent.click(screen.getByText('Rehash Streams'));
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+      });
+
+      rerender(<StreamSettingsForm active={false} />);
+      await waitFor(() => {
+        expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Form submission — no hash key change ───────────────────────────────────
+  describe('form submission (no M3U hash key change)', () => {
+    beforeEach(() => {
+      // Same hash key before and after → no dialog
+      vi.mocked(getChangedSettings).mockReturnValue({ preferred_region: 'eu' });
+      setupMocks();
+      formMock = makeFormMock();
+      vi.mocked(useForm).mockReturnValue(formMock);
+    });
+
+    it('calls saveChangedSettings with settings and changed values on submit', async () => {
+      const settings = makeSettings();
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(saveChangedSettings).toHaveBeenCalledWith(
+          settings,
+          expect.any(Object)
+        );
+      });
+    });
+
+    it('shows success alert after successful save', async () => {
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+      });
+    });
+
+    it('does not show success alert when saveChangedSettings throws', async () => {
+      vi.mocked(saveChangedSettings).mockRejectedValue(new Error('save failed'));
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalled();
+      });
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      consoleSpy.mockRestore();
+    });
+
+    it('logs error when saveChangedSettings throws', async () => {
+      const error = new Error('save failed');
+      vi.mocked(saveChangedSettings).mockRejectedValue(error);
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalledWith('Error saving settings:', error);
+      });
+      consoleSpy.mockRestore();
+    });
+
+    it('does not open confirmation dialog when hash key is unchanged', async () => {
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(saveChangedSettings).toHaveBeenCalled();
+      });
+      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+    });
+  });
+
+  // ── Form submission — hash key changed ────────────────────────────────────
+  describe('form submission (M3U hash key changed)', () => {
+    const makeHashChangedFormMock = () =>
+      makeFormMock({
+        getValues: vi.fn(() => ({
+          ...mockFormValues,
+          m3u_hash_key: ['url'], // different from stored 'name'
+        })),
+      });
+
+    it('opens confirmation dialog with save title when hash key changes', async () => {
+      const fm = makeHashChangedFormMock();
+      vi.mocked(useForm).mockReturnValue(fm);
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(screen.getByTestId('confirmation-dialog')).toBeInTheDocument();
+        expect(screen.getByTestId('confirm-title')).toHaveTextContent(
+          'Save Settings and Rehash Streams'
+        );
+      });
+    });
+
+    it('shows "Save and Rehash" confirm label for hash key change dialog', async () => {
+      const fm = makeHashChangedFormMock();
+      vi.mocked(useForm).mockReturnValue(fm);
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(screen.getByTestId('confirm-ok')).toHaveTextContent('Save and Rehash');
+      });
+    });
+
+    it('does not call saveChangedSettings before dialog is confirmed', async () => {
+      const fm = makeHashChangedFormMock();
+      vi.mocked(useForm).mockReturnValue(fm);
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(screen.getByTestId('confirmation-dialog')).toBeInTheDocument();
+      });
+      expect(saveChangedSettings).not.toHaveBeenCalled();
+    });
+
+    it('calls saveChangedSettings after confirming save-and-rehash dialog', async () => {
+      const fm = makeHashChangedFormMock();
+      vi.mocked(useForm).mockReturnValue(fm);
+      const settings = makeSettings();
+      setupMocks({ settings });
+      vi.mocked(useForm).mockReturnValue(fm);
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() =>
+        screen.getByTestId('confirmation-dialog')
+      );
+      fireEvent.click(screen.getByTestId('confirm-ok'));
+
+      await waitFor(() => {
+        expect(saveChangedSettings).toHaveBeenCalled();
+      });
+    });
+
+    it('shows success alert after confirming save-and-rehash dialog', async () => {
+      const fm = makeHashChangedFormMock();
+      vi.mocked(useForm).mockReturnValue(fm);
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-ok'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+      });
+    });
+
+    it('closes dialog after confirming save-and-rehash', async () => {
+      const fm = makeHashChangedFormMock();
+      vi.mocked(useForm).mockReturnValue(fm);
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-ok'));
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      });
+    });
+
+    it('closes dialog and does not save when Cancel is clicked', async () => {
+      const fm = makeHashChangedFormMock();
+      vi.mocked(useForm).mockReturnValue(fm);
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-cancel'));
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      });
+      expect(saveChangedSettings).not.toHaveBeenCalled();
+    });
+
+    it('skips dialog entirely when rehash-streams warning is suppressed', async () => {
+      const fm = makeHashChangedFormMock();
+      vi.mocked(useForm).mockReturnValue(fm);
+      setupMocks({ warningSuppressed: true });
+      vi.mocked(useForm).mockReturnValue(fm);
+      render(<StreamSettingsForm active={true} />);
+
+      fireEvent.submit(screen.getByText('Save').closest('form'));
+      await waitFor(() => {
+        expect(saveChangedSettings).toHaveBeenCalled();
+      });
+      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+    });
+  });
+
+  // ── Rehash Streams ─────────────────────────────────────────────────────────
+  describe('Rehash Streams button', () => {
+    it('opens confirmation dialog with rehash title when warning is not suppressed', async () => {
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('confirmation-dialog')).toBeInTheDocument();
+        expect(screen.getByTestId('confirm-title')).toHaveTextContent(
+          'Confirm Stream Rehash'
+        );
+      });
+    });
+
+    it('shows "Start Rehash" confirm label for rehash-only dialog', async () => {
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('confirm-ok')).toHaveTextContent('Start Rehash');
+      });
+    });
+
+    it('calls rehashStreams after confirming rehash dialog', async () => {
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-ok'));
+
+      await waitFor(() => {
+        expect(rehashStreams).toHaveBeenCalled();
+      });
+    });
+
+    it('skips confirmation dialog and calls rehashStreams directly when suppressed', async () => {
+      setupMocks({ warningSuppressed: true });
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+
+      await waitFor(() => {
+        expect(rehashStreams).toHaveBeenCalled();
+      });
+      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+    });
+
+    it('shows rehash success alert after rehash completes', async () => {
+      setupMocks({ warningSuppressed: true });
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('alert-title')).toHaveTextContent(
+          'Rehash task queued successfully'
+        );
+      });
+    });
+
+    it('does not show rehash success alert when rehashStreams throws', async () => {
+      setupMocks({ warningSuppressed: true });
+      vi.mocked(rehashStreams).mockRejectedValue(new Error('fail'));
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalled();
+      });
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      consoleSpy.mockRestore();
+    });
+
+    it('logs error when rehashStreams throws', async () => {
+      setupMocks({ warningSuppressed: true });
+      const error = new Error('network error');
+      vi.mocked(rehashStreams).mockRejectedValue(error);
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalledWith('Error rehashing streams:', error);
+      });
+      consoleSpy.mockRestore();
+    });
+
+    it('closes confirmation dialog when Cancel is clicked on rehash dialog', async () => {
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-cancel'));
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      });
+      expect(rehashStreams).not.toHaveBeenCalled();
+    });
+
+    it('calls suppressWarning when "Don\'t show again" is clicked', async () => {
+      const suppressWarning = vi.fn();
+      vi.mocked(useWarningsStore).mockImplementation((sel) =>
+        sel({
+          suppressWarning,
+          isWarningSuppressed: vi.fn(() => false),
+        })
+      );
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
+      fireEvent.click(screen.getByTestId('confirm-suppress'));
+
+      expect(suppressWarning).toHaveBeenCalledWith('rehash-streams');
+    });
+
+    it('Rehash Streams button is disabled while rehashing', async () => {
+      let resolveRehash;
+      vi.mocked(rehashStreams).mockReturnValue(
+        new Promise((res) => { resolveRehash = res; })
+      );
+      setupMocks({ warningSuppressed: true });
+      render(<StreamSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Rehash Streams'));
+
+      await waitFor(() => {
+        expect(screen.getByText('Rehash Streams')).toBeDisabled();
+      });
+
+      resolveRehash();
+      await waitFor(() => {
+        expect(screen.getByText('Rehash Streams')).not.toBeDisabled();
+      });
+    });
+  });
+
+  // ── getInputProps wiring ───────────────────────────────────────────────────
+  describe('getInputProps wiring', () => {
+    it('calls getInputProps for default_user_agent', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(formMock.getInputProps).toHaveBeenCalledWith('default_user_agent');
+    });
+
+    it('calls getInputProps for default_stream_profile', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(formMock.getInputProps).toHaveBeenCalledWith('default_stream_profile');
+    });
+
+    it('calls getInputProps for preferred_region', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(formMock.getInputProps).toHaveBeenCalledWith('preferred_region');
+    });
+
+    it('calls getInputProps for auto_import_mapped_files with checkbox type', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(formMock.getInputProps).toHaveBeenCalledWith(
+        'auto_import_mapped_files',
+        { type: 'checkbox' }
+      );
+    });
+
+    it('calls getInputProps for m3u_hash_key', () => {
+      render(<StreamSettingsForm active={true} />);
+      expect(formMock.getInputProps).toHaveBeenCalledWith('m3u_hash_key');
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
new file mode 100644
index 00000000..b9baa711
--- /dev/null
+++ b/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
@@ -0,0 +1,311 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import SystemSettingsForm from '../SystemSettingsForm';
+
+// ── Store mocks ────────────────────────────────────────────────────────────────
+vi.mock('../../../../store/settings.jsx', () => ({ default: vi.fn() }));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../../utils/pages/SettingsUtils.js', () => ({
+  getChangedSettings: vi.fn(),
+  parseSettings: vi.fn(),
+  saveChangedSettings: vi.fn(),
+}));
+
+vi.mock('../../../../utils/forms/settings/SystemSettingsFormUtils.js', () => ({
+  getSystemSettingsFormInitialValues: vi.fn(),
+}));
+
+// ── Mantine form ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({
+  useForm: vi.fn(),
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  Alert: ({ title }) => <div data-testid="alert">{title}</div>,
+  Button: ({ children, onClick, disabled }) => (
+    <button onClick={onClick} disabled={disabled}>
+      {children}
+    </button>
+  ),
+  Flex: ({ children }) => <div>{children}</div>,
+  NumberInput: ({ label, value, onChange, min, max, step, description }) => (
+    <div>
+      <label>{label}</label>
+      <p>{description}</p>
+      <input
+        data-testid="number-input"
+        type="number"
+        value={value}
+        min={min}
+        max={max}
+        step={step}
+        onChange={(e) => onChange(Number(e.target.value))}
+      />
+    </div>
+  ),
+  Stack: ({ children }) => <div>{children}</div>,
+  Text: ({ children }) => <span>{children}</span>,
+}));
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Imports after mocks
+// ──────────────────────────────────────────────────────────────────────────────
+import useSettingsStore from '../../../../store/settings.jsx';
+import { getChangedSettings, parseSettings, saveChangedSettings } from '../../../../utils/pages/SettingsUtils.js';
+import { getSystemSettingsFormInitialValues } from '../../../../utils/forms/settings/SystemSettingsFormUtils.js';
+import { useForm } from '@mantine/form';
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ──────────────────────────────────────────────────────────────────────────────
+const makeSettings = (overrides = {}) => ({
+  max_system_events: 100,
+  ...overrides,
+});
+
+const setupMocks = ({ settings = makeSettings() } = {}) => {
+  const formValues = { max_system_events: settings?.max_system_events ?? 100 };
+
+  const formMock = {
+    values: formValues,
+    getValues: vi.fn().mockReturnValue(formValues),
+    setValues: vi.fn(),
+    setFieldValue: vi.fn((key, value) => {
+      formMock.values[key] = value;
+    }),
+    onSubmit: vi.fn((handler) => handler),
+    submitting: false,
+  };
+
+  vi.mocked(useForm).mockReturnValue(formMock);
+  vi.mocked(getSystemSettingsFormInitialValues).mockReturnValue(formValues);
+  vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
+  vi.mocked(parseSettings).mockReturnValue(formValues);
+  vi.mocked(getChangedSettings).mockReturnValue({ max_system_events: settings?.max_system_events ?? 100 });
+  vi.mocked(saveChangedSettings).mockResolvedValue(undefined);
+
+  return { formMock };
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('SystemSettingsForm', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── Rendering ──────────────────────────────────────────────────────────────
+
+  describe('rendering', () => {
+    it('renders the Save button', () => {
+      setupMocks();
+      render(<SystemSettingsForm active={true} />);
+      expect(screen.getByText('Save')).toBeInTheDocument();
+    });
+
+    it('renders the NumberInput for max_system_events', () => {
+      setupMocks();
+      render(<SystemSettingsForm active={true} />);
+      expect(screen.getByTestId('number-input')).toBeInTheDocument();
+    });
+
+    it('renders the NumberInput label', () => {
+      setupMocks();
+      render(<SystemSettingsForm active={true} />);
+      expect(screen.getByText('Maximum System Events')).toBeInTheDocument();
+    });
+
+    it('renders the NumberInput description', () => {
+      setupMocks();
+      render(<SystemSettingsForm active={true} />);
+      expect(
+        screen.getByText('Number of events to retain (minimum: 10, maximum: 1000)')
+      ).toBeInTheDocument();
+    });
+
+    it('renders descriptive text about system events', () => {
+      setupMocks();
+      render(<SystemSettingsForm active={true} />);
+      expect(
+        screen.getByText(/Configure how many system events/)
+      ).toBeInTheDocument();
+    });
+
+    it('does not show success alert on initial render', () => {
+      setupMocks();
+      render(<SystemSettingsForm active={true} />);
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+
+    it('renders NumberInput with value from form values', () => {
+      setupMocks({ settings: makeSettings({ max_system_events: 250 }) });
+      render(<SystemSettingsForm active={true} />);
+      expect(screen.getByTestId('number-input')).toHaveValue(250);
+    });
+
+    it('falls back to 100 when max_system_events is 0/falsy', () => {
+      const formValues = { max_system_events: 0 };
+      const formMock = {
+        values: formValues,
+        getValues: vi.fn().mockReturnValue(formValues),
+        setValues: vi.fn(),
+        setFieldValue: vi.fn(),
+        onSubmit: vi.fn((handler) => handler),
+        submitting: false,
+      };
+      vi.mocked(useForm).mockReturnValue(formMock);
+      vi.mocked(getSystemSettingsFormInitialValues).mockReturnValue(formValues);
+      vi.mocked(useSettingsStore).mockImplementation((sel) =>
+        sel({ settings: makeSettings({ max_system_events: 0 }) })
+      );
+      vi.mocked(parseSettings).mockReturnValue(formValues);
+      vi.mocked(getChangedSettings).mockReturnValue({});
+      vi.mocked(saveChangedSettings).mockResolvedValue(undefined);
+
+      render(<SystemSettingsForm active={true} />);
+      expect(screen.getByTestId('number-input')).toHaveValue(100);
+    });
+  });
+
+  // ── Settings initialization ────────────────────────────────────────────────
+
+  describe('settings initialization', () => {
+    it('calls parseSettings with settings on mount', () => {
+      const settings = makeSettings();
+      setupMocks({ settings });
+      render(<SystemSettingsForm active={true} />);
+      expect(parseSettings).toHaveBeenCalledWith(settings);
+    });
+
+    it('calls form.setValues with parsed settings on mount', () => {
+      const settings = makeSettings();
+      const { formMock } = setupMocks({ settings });
+      render(<SystemSettingsForm active={true} />);
+      expect(formMock.setValues).toHaveBeenCalledWith({ max_system_events: 100 });
+    });
+
+    it('does not call parseSettings when settings is null', () => {
+      const formMock = {
+        values: { max_system_events: 100 },
+        getValues: vi.fn().mockReturnValue({ max_system_events: 100 }),
+        setValues: vi.fn(),
+        setFieldValue: vi.fn(),
+        onSubmit: vi.fn((handler) => handler),
+        submitting: false,
+      };
+      vi.mocked(useForm).mockReturnValue(formMock);
+      vi.mocked(getSystemSettingsFormInitialValues).mockReturnValue({ max_system_events: 100 });
+      vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings: null }));
+      vi.mocked(parseSettings).mockReturnValue({});
+      vi.mocked(saveChangedSettings).mockResolvedValue(undefined);
+
+      render(<SystemSettingsForm active={true} />);
+      expect(parseSettings).not.toHaveBeenCalled();
+    });
+  });
+
+  // ── NumberInput interaction ────────────────────────────────────────────────
+
+  describe('NumberInput interaction', () => {
+    it('calls form.setFieldValue when NumberInput changes', () => {
+      const { formMock } = setupMocks();
+      render(<SystemSettingsForm active={true} />);
+      fireEvent.change(screen.getByTestId('number-input'), { target: { value: '200' } });
+      expect(formMock.setFieldValue).toHaveBeenCalledWith('max_system_events', 200);
+    });
+  });
+
+  // ── Save / submit ──────────────────────────────────────────────────────────
+
+  describe('save button', () => {
+    it('calls getChangedSettings and saveChangedSettings on submit', async () => {
+      const settings = makeSettings();
+      const { formMock } = setupMocks({ settings });
+      render(<SystemSettingsForm active={true} />);
+
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => {
+        expect(getChangedSettings).toHaveBeenCalledWith(formMock.getValues(), settings);
+        expect(saveChangedSettings).toHaveBeenCalled();
+      });
+    });
+
+    it('shows success alert after successful save', async () => {
+      setupMocks();
+      render(<SystemSettingsForm active={true} />);
+
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+      });
+      expect(screen.getByText('Saved Successfully')).toBeInTheDocument();
+    });
+
+    it('does not show success alert when saveChangedSettings throws', async () => {
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      setupMocks();
+      vi.mocked(saveChangedSettings).mockRejectedValue(new Error('save failed'));
+
+      render(<SystemSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalled();
+      });
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      consoleSpy.mockRestore();
+    });
+
+    it('logs error when saveChangedSettings throws', async () => {
+      const error = new Error('save failed');
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      setupMocks();
+      vi.mocked(saveChangedSettings).mockRejectedValue(error);
+
+      render(<SystemSettingsForm active={true} />);
+      fireEvent.click(screen.getByText('Save'));
+
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalledWith('Error saving settings:', error);
+      });
+      consoleSpy.mockRestore();
+    });
+  });
+
+  // ── active prop / saved state reset ───────────────────────────────────────
+
+  describe('active prop behavior', () => {
+    it('clears saved alert when active becomes false', async () => {
+      setupMocks();
+      const { rerender } = render(<SystemSettingsForm active={true} />);
+
+      fireEvent.click(screen.getByText('Save'));
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+      });
+
+      rerender(<SystemSettingsForm active={false} />);
+      await waitFor(() => {
+        expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+      });
+    });
+
+    it('does not clear saved alert while active remains true', async () => {
+      setupMocks();
+      const { rerender } = render(<SystemSettingsForm active={true} />);
+
+      fireEvent.click(screen.getByText('Save'));
+      await waitFor(() => {
+        expect(screen.getByTestId('alert')).toBeInTheDocument();
+      });
+
+      rerender(<SystemSettingsForm active={true} />);
+      expect(screen.getByTestId('alert')).toBeInTheDocument();
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/settings/__tests__/UiSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/UiSettingsForm.test.jsx
new file mode 100644
index 00000000..b8c0b5ea
--- /dev/null
+++ b/frontend/src/components/forms/settings/__tests__/UiSettingsForm.test.jsx
@@ -0,0 +1,424 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import UiSettingsForm from '../UiSettingsForm';
+
+// ── Store mocks ────────────────────────────────────────────────────────────────
+vi.mock('../../../../store/settings.jsx', () => ({ default: vi.fn() }));
+
+// ── Hook mocks ─────────────────────────────────────────────────────────────────
+vi.mock('../../../../hooks/useLocalStorage.jsx', () => ({ default: vi.fn() }));
+vi.mock('../../../../hooks/useTablePreferences.jsx', () => ({ default: vi.fn() }));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../../utils/dateTimeUtils.js', () => ({
+  buildTimeZoneOptions: vi.fn(),
+  getDefaultTimeZone: vi.fn(),
+}));
+
+vi.mock('../../../../utils/notificationUtils.js', () => ({
+  showNotification: vi.fn(),
+}));
+
+vi.mock('../../../../utils/forms/settings/UiSettingsFormUtils.js', () => ({
+  saveTimeZoneSetting: vi.fn(),
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  Select: ({ label, value, onChange, data }) => (
+    <div>
+      <label>{label}</label>
+      <select
+        data-testid={`select-${label?.toLowerCase().replace(/\s+/g, '-')}`}
+        value={value ?? ''}
+        onChange={(e) => onChange(e.target.value)}
+      >
+        {data?.map((opt) => (
+          <option key={opt.value} value={opt.value}>
+            {opt.label}
+          </option>
+        ))}
+      </select>
+    </div>
+  ),
+  Switch: ({ label, description, checked, onChange }) => (
+    <div>
+      <label>{label}</label>
+      {description && <p>{description}</p>}
+      <input
+        data-testid="switch-header-pinned"
+        type="checkbox"
+        checked={checked}
+        onChange={onChange}
+      />
+    </div>
+  ),
+  Stack: ({ children }) => <div>{children}</div>,
+}));
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Imports after mocks
+// ──────────────────────────────────────────────────────────────────────────────
+import useSettingsStore from '../../../../store/settings.jsx';
+import useLocalStorage from '../../../../hooks/useLocalStorage.jsx';
+import useTablePreferences from '../../../../hooks/useTablePreferences.jsx';
+import { buildTimeZoneOptions, getDefaultTimeZone } from '../../../../utils/dateTimeUtils.js';
+import { showNotification } from '../../../../utils/notificationUtils.js';
+import { saveTimeZoneSetting } from '../../../../utils/forms/settings/UiSettingsFormUtils.js';
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ──────────────────────────────────────────────────────────────────────────────
+const makeSettings = ({ timeZone = null } = {}) => ({
+  system_settings: timeZone
+    ? { value: { time_zone: timeZone } }
+    : { value: {} },
+});
+
+const DEFAULT_TZ = 'America/New_York';
+const TZ_OPTIONS = [
+  { value: 'America/New_York', label: 'America/New_York' },
+  { value: 'America/Chicago', label: 'America/Chicago' },
+  { value: 'UTC', label: 'UTC' },
+];
+
+const setupMocks = ({
+                      settings = makeSettings(),
+                      timeFormat = '12h',
+                      dateFormat = 'mdy',
+                      timeZone = DEFAULT_TZ,
+                      headerPinned = false,
+                      tableSize = 'default',
+                    } = {}) => {
+  const setTimeFormat = vi.fn();
+  const setDateFormat = vi.fn();
+  const setTimeZone = vi.fn();
+  const setHeaderPinned = vi.fn();
+  const setTableSize = vi.fn();
+
+  vi.mocked(getDefaultTimeZone).mockReturnValue(DEFAULT_TZ);
+  vi.mocked(buildTimeZoneOptions).mockReturnValue(TZ_OPTIONS);
+  vi.mocked(saveTimeZoneSetting).mockResolvedValue(undefined);
+
+  vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
+
+  vi.mocked(useLocalStorage)
+    .mockImplementation((key, defaultVal) => {
+      if (key === 'time-format') return [timeFormat, setTimeFormat];
+      if (key === 'date-format') return [dateFormat, setDateFormat];
+      if (key === 'time-zone') return [timeZone, setTimeZone];
+      return [defaultVal, vi.fn()];
+    });
+
+  vi.mocked(useTablePreferences).mockReturnValue({
+    headerPinned,
+    setHeaderPinned,
+    tableSize,
+    setTableSize,
+  });
+
+  return { setTimeFormat, setDateFormat, setTimeZone, setHeaderPinned, setTableSize };
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('UiSettingsForm', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── Rendering ──────────────────────────────────────────────────────────────
+
+  describe('rendering', () => {
+    it('renders the Table Size select', () => {
+      setupMocks();
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('select-table-size')).toBeInTheDocument();
+    });
+
+    it('renders the Time format select', () => {
+      setupMocks();
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('select-time-format')).toBeInTheDocument();
+    });
+
+    it('renders the Date format select', () => {
+      setupMocks();
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('select-date-format')).toBeInTheDocument();
+    });
+
+    it('renders the Time zone select', () => {
+      setupMocks();
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('select-time-zone')).toBeInTheDocument();
+    });
+
+    it('renders the Pin Table Headers switch', () => {
+      setupMocks();
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('switch-header-pinned')).toBeInTheDocument();
+    });
+
+    it('renders the switch description', () => {
+      setupMocks();
+      render(<UiSettingsForm />);
+      expect(screen.getByText('Keep table headers visible when scrolling')).toBeInTheDocument();
+    });
+
+    it('renders Table Size select with initial value', () => {
+      setupMocks({ tableSize: 'compact' });
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('select-table-size')).toHaveValue('compact');
+    });
+
+    it('renders Time format select with initial value', () => {
+      setupMocks({ timeFormat: '24h' });
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('select-time-format')).toHaveValue('24h');
+    });
+
+    it('renders Date format select with initial value', () => {
+      setupMocks({ dateFormat: 'dmy' });
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('select-date-format')).toHaveValue('dmy');
+    });
+
+    it('renders Time zone select with initial value', () => {
+      setupMocks({ timeZone: 'UTC' });
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('select-time-zone')).toHaveValue('UTC');
+    });
+
+    it('renders switch unchecked when headerPinned is false', () => {
+      setupMocks({ headerPinned: false });
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('switch-header-pinned')).not.toBeChecked();
+    });
+
+    it('renders switch checked when headerPinned is true', () => {
+      setupMocks({ headerPinned: true });
+      render(<UiSettingsForm />);
+      expect(screen.getByTestId('switch-header-pinned')).toBeChecked();
+    });
+  });
+
+  // ── onChange handlers ──────────────────────────────────────────────────────
+
+  describe('onChange handlers', () => {
+    it('calls setTableSize when Table Size select changes', () => {
+      const { setTableSize } = setupMocks();
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-table-size'), {
+        target: { value: 'large' },
+      });
+      expect(setTableSize).toHaveBeenCalledWith('large');
+    });
+
+    it('does not call setTableSize when value is empty', () => {
+      const { setTableSize } = setupMocks();
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-table-size'), {
+        target: { value: '' },
+      });
+      expect(setTableSize).not.toHaveBeenCalled();
+    });
+
+    it('calls setTimeFormat when Time format select changes', () => {
+      const { setTimeFormat } = setupMocks();
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-time-format'), {
+        target: { value: '24h' },
+      });
+      expect(setTimeFormat).toHaveBeenCalledWith('24h');
+    });
+
+    it('does not call setTimeFormat when value is empty', () => {
+      const { setTimeFormat } = setupMocks();
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-time-format'), {
+        target: { value: '' },
+      });
+      expect(setTimeFormat).not.toHaveBeenCalled();
+    });
+
+    it('calls setDateFormat when Date format select changes', () => {
+      const { setDateFormat } = setupMocks();
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-date-format'), {
+        target: { value: 'dmy' },
+      });
+      expect(setDateFormat).toHaveBeenCalledWith('dmy');
+    });
+
+    it('does not call setDateFormat when value is empty', () => {
+      const { setDateFormat } = setupMocks();
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-date-format'), {
+        target: { value: '' },
+      });
+      expect(setDateFormat).not.toHaveBeenCalled();
+    });
+
+    it('calls setTimeZone and saveTimeZoneSetting when Time zone select changes', async () => {
+      const { setTimeZone } = setupMocks();
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-time-zone'), {
+        target: { value: 'UTC' },
+      });
+      expect(setTimeZone).toHaveBeenCalledWith('UTC');
+      await waitFor(() => {
+        expect(saveTimeZoneSetting).toHaveBeenCalledWith('UTC', makeSettings());
+      });
+    });
+
+    it('does not call setTimeZone when value is empty', () => {
+      const { setTimeZone } = setupMocks();
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-time-zone'), {
+        target: { value: '' },
+      });
+      expect(setTimeZone).not.toHaveBeenCalled();
+      // Only called during initial sync, not on empty change
+      expect(saveTimeZoneSetting).toHaveBeenCalledTimes(1);
+    });
+
+    it('calls setHeaderPinned when switch is toggled on', () => {
+      const { setHeaderPinned } = setupMocks({ headerPinned: false });
+      render(<UiSettingsForm />);
+      fireEvent.click(screen.getByTestId('switch-header-pinned'));
+      expect(setHeaderPinned).toHaveBeenCalledWith(true);
+    });
+
+    it('calls setHeaderPinned when switch is toggled off', () => {
+      const { setHeaderPinned } = setupMocks({ headerPinned: true });
+      render(<UiSettingsForm />);
+      fireEvent.click(screen.getByTestId('switch-header-pinned'));
+      expect(setHeaderPinned).toHaveBeenCalledWith(false);
+    });
+  });
+
+  // ── Time zone sync from settings ───────────────────────────────────────────
+
+  describe('time zone sync from settings', () => {
+    it('calls setTimeZone with system time_zone on mount when settings has tz', () => {
+      const { setTimeZone } = setupMocks({
+        settings: makeSettings({ timeZone: 'America/Chicago' }),
+        timeZone: DEFAULT_TZ,
+      });
+      render(<UiSettingsForm />);
+      expect(setTimeZone).toHaveBeenCalled();
+    });
+
+    it('does not change timeZone when settings tz matches current tz', () => {
+      const { setTimeZone } = setupMocks({
+        settings: makeSettings({ timeZone: DEFAULT_TZ }),
+        timeZone: DEFAULT_TZ,
+      });
+      render(<UiSettingsForm />);
+      // setTimeZone is called with a function that returns prev when equal
+      const callArg = setTimeZone.mock.calls[0]?.[0];
+      if (typeof callArg === 'function') {
+        expect(callArg(DEFAULT_TZ)).toBe(DEFAULT_TZ);
+      }
+    });
+
+    it('calls persistTimeZoneSetting (saveTimeZoneSetting) when no tz in settings and timeZone is set', async () => {
+      setupMocks({
+        settings: makeSettings({ timeZone: null }),
+        timeZone: DEFAULT_TZ,
+      });
+      render(<UiSettingsForm />);
+      await waitFor(() => {
+        expect(saveTimeZoneSetting).toHaveBeenCalledWith(DEFAULT_TZ, makeSettings({ timeZone: null }));
+      });
+    });
+
+    it('does not call saveTimeZoneSetting when settings is null', async () => {
+      setupMocks({ settings: null, timeZone: DEFAULT_TZ });
+      render(<UiSettingsForm />);
+      await waitFor(() => {
+        expect(saveTimeZoneSetting).not.toHaveBeenCalled();
+      });
+    });
+
+    it('does not call saveTimeZoneSetting when timeZone is falsy and no tz in settings', async () => {
+      setupMocks({
+        settings: makeSettings({ timeZone: null }),
+        timeZone: '',
+      });
+      render(<UiSettingsForm />);
+      await waitFor(() => {
+        expect(saveTimeZoneSetting).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  // ── Error handling ─────────────────────────────────────────────────────────
+
+  describe('error handling', () => {
+    it('shows error notification when saveTimeZoneSetting throws on tz change', async () => {
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      setupMocks({ settings: makeSettings({ timeZone: null }), timeZone: '' });
+      vi.mocked(saveTimeZoneSetting).mockRejectedValue(new Error('network error'));
+
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-time-zone'), {
+        target: { value: 'UTC' },
+      });
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red', title: 'Failed to update time zone' })
+        );
+      });
+      consoleSpy.mockRestore();
+    });
+
+    it('logs error when saveTimeZoneSetting throws on tz change', async () => {
+      const error = new Error('network error');
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      setupMocks({ settings: makeSettings({ timeZone: null }), timeZone: '' });
+      vi.mocked(saveTimeZoneSetting).mockRejectedValue(error);
+
+      render(<UiSettingsForm />);
+      fireEvent.change(screen.getByTestId('select-time-zone'), {
+        target: { value: 'UTC' },
+      });
+
+      await waitFor(() => {
+        expect(consoleSpy).toHaveBeenCalledWith(
+          'Failed to persist time zone setting',
+          error
+        );
+      });
+      consoleSpy.mockRestore();
+    });
+
+    it('shows error notification when saveTimeZoneSetting throws during initial sync', async () => {
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      setupMocks({ settings: makeSettings({ timeZone: null }), timeZone: DEFAULT_TZ });
+      vi.mocked(saveTimeZoneSetting).mockRejectedValue(new Error('sync failed'));
+
+      render(<UiSettingsForm />);
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red', title: 'Failed to update time zone' })
+        );
+      });
+      consoleSpy.mockRestore();
+    });
+  });
+
+  // ── buildTimeZoneOptions ───────────────────────────────────────────────────
+
+  describe('buildTimeZoneOptions', () => {
+    it('calls buildTimeZoneOptions with current timeZone value', () => {
+      setupMocks({ timeZone: 'America/Chicago' });
+      render(<UiSettingsForm />);
+      expect(buildTimeZoneOptions).toHaveBeenCalledWith('America/Chicago');
+    });
+  });
+});
\ No newline at end of file

From e421c007ccbc76603391be2fa6fbc5e8aaf20a1f Mon Sep 17 00:00:00 2001
From: Nick Sandstrom <32273437+nick4810@users.noreply.github.com>
Date: Sat, 14 Mar 2026 07:56:05 -0700
Subject: [PATCH 024/172] Conforming to style guide

---
 .../__tests__/DvrSettingsForm.test.jsx        |  96 +++++++++----
 .../settings/__tests__/NavOrderForm.test.jsx  |   2 +-
 .../__tests__/NetworkAccessForm.test.jsx      |  68 +++++++---
 .../__tests__/ProxySettingsForm.test.jsx      |  32 +++--
 .../__tests__/StreamSettingsForm.test.jsx     | 128 ++++++++++++------
 .../__tests__/SystemSettingsForm.test.jsx     |  59 ++++++--
 .../__tests__/UiSettingsForm.test.jsx         |  90 ++++++++----
 7 files changed, 339 insertions(+), 136 deletions(-)

diff --git a/frontend/src/components/forms/settings/__tests__/DvrSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/DvrSettingsForm.test.jsx
index ad86f1e0..f3293051 100644
--- a/frontend/src/components/forms/settings/__tests__/DvrSettingsForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/DvrSettingsForm.test.jsx
@@ -125,13 +125,17 @@ const mockFormValues = {
 
 const makeFormMock = (overrides = {}) => ({
   getInputProps: vi.fn((field, opts) => {
-    if (opts?.type === 'checkbox') return { checked: mockFormValues[field] ?? false, onChange: vi.fn() };
+    if (opts?.type === 'checkbox')
+      return { checked: mockFormValues[field] ?? false, onChange: vi.fn() };
     return { value: mockFormValues[field] ?? '', onChange: vi.fn() };
   }),
   setValues: vi.fn(),
   setFieldValue: vi.fn(),
   getValues: vi.fn(() => mockFormValues),
-  onSubmit: vi.fn((handler) => (e) => { e?.preventDefault?.(); return handler(); }),
+  onSubmit: vi.fn((handler) => (e) => {
+    e?.preventDefault?.();
+    return handler();
+  }),
   ...overrides,
 });
 
@@ -229,7 +233,9 @@ describe('DvrSettingsForm', () => {
         expect(screen.getByTestId('tv_template')).toBeInTheDocument();
         expect(screen.getByTestId('tv_fallback_template')).toBeInTheDocument();
         expect(screen.getByTestId('movie_template')).toBeInTheDocument();
-        expect(screen.getByTestId('movie_fallback_template')).toBeInTheDocument();
+        expect(
+          screen.getByTestId('movie_fallback_template')
+        ).toBeInTheDocument();
       });
     });
 
@@ -250,7 +256,9 @@ describe('DvrSettingsForm', () => {
     it('shows "No custom comskip.ini uploaded." when no config exists', async () => {
       render(<DvrSettingsForm active={true} />);
       await waitFor(() => {
-        expect(screen.getByText('No custom comskip.ini uploaded.')).toBeInTheDocument();
+        expect(
+          screen.getByText('No custom comskip.ini uploaded.')
+        ).toBeInTheDocument();
       });
     });
 
@@ -261,7 +269,9 @@ describe('DvrSettingsForm', () => {
       });
       render(<DvrSettingsForm active={true} />);
       await waitFor(() => {
-        expect(screen.getByText('Using /app/docker/comskip.ini')).toBeInTheDocument();
+        expect(
+          screen.getByText('Using /app/docker/comskip.ini')
+        ).toBeInTheDocument();
       });
     });
   });
@@ -306,7 +316,9 @@ describe('DvrSettingsForm', () => {
 
     it('handles getComskipConfig error gracefully', async () => {
       vi.mocked(getComskipConfig).mockRejectedValue(new Error('network error'));
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       render(<DvrSettingsForm active={true} />);
       await waitFor(() => {
         expect(consoleSpy).toHaveBeenCalledWith(
@@ -357,8 +369,13 @@ describe('DvrSettingsForm', () => {
       fireEvent.submit(screen.getByText('Save').closest('form'));
 
       await waitFor(() => {
-        expect(getChangedSettings).toHaveBeenCalledWith(mockFormValues, makeSettings());
-        expect(saveChangedSettings).toHaveBeenCalledWith(makeSettings(), { pre_offset_minutes: 5 });
+        expect(getChangedSettings).toHaveBeenCalledWith(
+          mockFormValues,
+          makeSettings()
+        );
+        expect(saveChangedSettings).toHaveBeenCalledWith(makeSettings(), {
+          pre_offset_minutes: 5,
+        });
       });
     });
 
@@ -373,8 +390,12 @@ describe('DvrSettingsForm', () => {
     });
 
     it('does not show success alert when saveChangedSettings throws', async () => {
-      vi.mocked(saveChangedSettings).mockRejectedValue(new Error('save failed'));
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      vi.mocked(saveChangedSettings).mockRejectedValue(
+        new Error('save failed')
+      );
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
 
       render(<DvrSettingsForm active={true} />);
       fireEvent.submit(screen.getByText('Save').closest('form'));
@@ -400,11 +421,17 @@ describe('DvrSettingsForm', () => {
     });
 
     it('calls uploadComskipIni with the selected file', async () => {
-      const mockFile = new File(['content'], 'comskip.ini', { type: 'text/plain' });
-      vi.mocked(uploadComskipIni).mockResolvedValue({ path: '/uploaded/comskip.ini' });
+      const mockFile = new File(['content'], 'comskip.ini', {
+        type: 'text/plain',
+      });
+      vi.mocked(uploadComskipIni).mockResolvedValue({
+        path: '/uploaded/comskip.ini',
+      });
 
       render(<DvrSettingsForm active={true} />);
-      fireEvent.change(screen.getByTestId('file-input'), { target: { files: [mockFile] } });
+      fireEvent.change(screen.getByTestId('file-input'), {
+        target: { files: [mockFile] },
+      });
 
       await waitFor(() => {
         fireEvent.click(screen.getByText('Upload comskip.ini'));
@@ -416,11 +443,17 @@ describe('DvrSettingsForm', () => {
     });
 
     it('shows success notification after successful upload', async () => {
-      const mockFile = new File(['content'], 'comskip.ini', { type: 'text/plain' });
-      vi.mocked(uploadComskipIni).mockResolvedValue({ path: '/uploaded/comskip.ini' });
+      const mockFile = new File(['content'], 'comskip.ini', {
+        type: 'text/plain',
+      });
+      vi.mocked(uploadComskipIni).mockResolvedValue({
+        path: '/uploaded/comskip.ini',
+      });
 
       render(<DvrSettingsForm active={true} />);
-      fireEvent.change(screen.getByTestId('file-input'), { target: { files: [mockFile] } });
+      fireEvent.change(screen.getByTestId('file-input'), {
+        target: { files: [mockFile] },
+      });
 
       await waitFor(() => {
         fireEvent.click(screen.getByText('Upload comskip.ini'));
@@ -428,17 +461,26 @@ describe('DvrSettingsForm', () => {
 
       await waitFor(() => {
         expect(showNotification).toHaveBeenCalledWith(
-          expect.objectContaining({ title: 'comskip.ini uploaded', color: 'green' })
+          expect.objectContaining({
+            title: 'comskip.ini uploaded',
+            color: 'green',
+          })
         );
       });
     });
 
     it('sets comskip_custom_path form field after successful upload', async () => {
-      const mockFile = new File(['content'], 'comskip.ini', { type: 'text/plain' });
-      vi.mocked(uploadComskipIni).mockResolvedValue({ path: '/uploaded/comskip.ini' });
+      const mockFile = new File(['content'], 'comskip.ini', {
+        type: 'text/plain',
+      });
+      vi.mocked(uploadComskipIni).mockResolvedValue({
+        path: '/uploaded/comskip.ini',
+      });
 
       render(<DvrSettingsForm active={true} />);
-      fireEvent.change(screen.getByTestId('file-input'), { target: { files: [mockFile] } });
+      fireEvent.change(screen.getByTestId('file-input'), {
+        target: { files: [mockFile] },
+      });
 
       await waitFor(() => {
         fireEvent.click(screen.getByText('Upload comskip.ini'));
@@ -453,12 +495,18 @@ describe('DvrSettingsForm', () => {
     });
 
     it('handles upload error gracefully', async () => {
-      const mockFile = new File(['content'], 'comskip.ini', { type: 'text/plain' });
+      const mockFile = new File(['content'], 'comskip.ini', {
+        type: 'text/plain',
+      });
       vi.mocked(uploadComskipIni).mockRejectedValue(new Error('upload failed'));
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
 
       render(<DvrSettingsForm active={true} />);
-      fireEvent.change(screen.getByTestId('file-input'), { target: { files: [mockFile] } });
+      fireEvent.change(screen.getByTestId('file-input'), {
+        target: { files: [mockFile] },
+      });
 
       await waitFor(() => {
         fireEvent.click(screen.getByText('Upload comskip.ini'));
@@ -480,4 +528,4 @@ describe('DvrSettingsForm', () => {
       expect(uploadComskipIni).not.toHaveBeenCalled();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/settings/__tests__/NavOrderForm.test.jsx b/frontend/src/components/forms/settings/__tests__/NavOrderForm.test.jsx
index 5cbf603e..3fb91a43 100644
--- a/frontend/src/components/forms/settings/__tests__/NavOrderForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/NavOrderForm.test.jsx
@@ -64,7 +64,7 @@ vi.mock('@dnd-kit/modifiers', () => ({
 // Mock Mantine components
 vi.mock('@mantine/core', () => ({
   Box: ({ children, ...props }) => <div {...props}>{children}</div>,
-  Button: ({ children, onClick, disabled, ...props }) => (
+  Button: ({ children, onClick, disabled }) => (
     <button onClick={onClick} disabled={disabled} data-testid="reset-button">
       {children}
     </button>
diff --git a/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx b/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx
index 32271d0b..15e5e430 100644
--- a/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx
@@ -36,8 +36,12 @@ vi.mock('../../../ConfirmationDialog.jsx', () => ({
       <div data-testid="confirmation-dialog">
         <div data-testid="confirm-title">{title}</div>
         <div data-testid="confirm-message">{message}</div>
-        <button data-testid="confirm-ok" onClick={onConfirm}>Confirm</button>
-        <button data-testid="confirm-cancel" onClick={onClose}>Cancel</button>
+        <button data-testid="confirm-ok" onClick={onConfirm}>
+          Confirm
+        </button>
+        <button data-testid="confirm-cancel" onClick={onClose}>
+          Cancel
+        </button>
       </div>
     ) : null,
 }));
@@ -85,7 +89,10 @@ vi.mock('@mantine/core', () => ({
 // ──────────────────────────────────────────────────────────────────────────────
 import useSettingsStore from '../../../../store/settings.jsx';
 import { useForm } from '@mantine/form';
-import { checkSetting, updateSetting } from '../../../../utils/pages/SettingsUtils.js';
+import {
+  checkSetting,
+  updateSetting,
+} from '../../../../utils/pages/SettingsUtils.js';
 import {
   getNetworkAccessFormInitialValues,
   getNetworkAccessFormValidation,
@@ -139,10 +146,15 @@ const setupMocks = ({ settings = makeSettings(), formOverrides = {} } = {}) => {
   const formMock = makeFormMock(formOverrides);
 
   vi.mocked(useForm).mockReturnValue(formMock);
-  vi.mocked(getNetworkAccessFormInitialValues).mockReturnValue(mockInitialValues);
+  vi.mocked(getNetworkAccessFormInitialValues).mockReturnValue(
+    mockInitialValues
+  );
   vi.mocked(getNetworkAccessFormValidation).mockReturnValue({});
   vi.mocked(getNetworkAccessDefaults).mockReturnValue(mockInitialValues);
-  vi.mocked(checkSetting).mockResolvedValue({ client_ip: '192.168.1.1', UI: ['192.168.0.0/16'] });
+  vi.mocked(checkSetting).mockResolvedValue({
+    client_ip: '192.168.1.1',
+    UI: ['192.168.0.0/16'],
+  });
   vi.mocked(updateSetting).mockResolvedValue(undefined);
 
   vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
@@ -180,7 +192,9 @@ describe('NetworkAccessForm', () => {
 
     it('does not show confirmation dialog on initial render', () => {
       render(<NetworkAccessForm active={true} />);
-      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('confirmation-dialog')
+      ).not.toBeInTheDocument();
     });
 
     it('does not show error alert on initial render', () => {
@@ -238,7 +252,10 @@ describe('NetworkAccessForm', () => {
       vi.mocked(updateSetting).mockResolvedValue(undefined);
       const { rerender } = render(<NetworkAccessForm active={true} />);
 
-      fireEvent.submit(screen.getByText('Save').closest('form') ?? screen.getByText('Save').closest('div'));
+      fireEvent.submit(
+        screen.getByText('Save').closest('form') ??
+          screen.getByText('Save').closest('div')
+      );
 
       await waitFor(() => {
         expect(screen.queryByTestId('confirmation-dialog')).not.toBeNull();
@@ -270,7 +287,9 @@ describe('NetworkAccessForm', () => {
       fireEvent.click(screen.getByTestId('confirm-cancel'));
 
       await waitFor(() => {
-        expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+        expect(
+          screen.queryByTestId('confirmation-dialog')
+        ).not.toBeInTheDocument();
       });
     });
 
@@ -295,7 +314,9 @@ describe('NetworkAccessForm', () => {
 
       await waitFor(() => {
         expect(screen.getByTestId('alert')).toBeInTheDocument();
-        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+        expect(screen.getByTestId('alert-title')).toHaveTextContent(
+          'Saved Successfully'
+        );
       });
     });
 
@@ -312,8 +333,9 @@ describe('NetworkAccessForm', () => {
     });
 
     it('does not show success alert when updateSetting throws', async () => {
-      vi.mocked(updateSetting).mockRejectedValue(
-        { body: { value: { m3u_custom_cidrs: 'Invalid CIDR' } } });
+      vi.mocked(updateSetting).mockRejectedValue({
+        body: { value: { m3u_custom_cidrs: 'Invalid CIDR' } },
+      });
       render(<NetworkAccessForm active={true} />);
       fireEvent.click(screen.getByText('Save'));
 
@@ -344,7 +366,9 @@ describe('NetworkAccessForm', () => {
       vi.mocked(checkSetting).mockResolvedValue(null);
       render(<NetworkAccessForm active={true} />);
       await waitFor(() => {
-        expect(screen.queryByText(/\d+\.\d+\.\d+\.\d+/)).not.toBeInTheDocument();
+        expect(
+          screen.queryByText(/\d+\.\d+\.\d+\.\d+/)
+        ).not.toBeInTheDocument();
       });
     });
   });
@@ -352,9 +376,11 @@ describe('NetworkAccessForm', () => {
   // ── Network access error ───────────────────────────────────────────────────
   describe('network access error state', () => {
     it('clears error state after successful save', async () => {
-      vi.mocked(checkSetting).mockResolvedValue(
-        { error: true, message: 'Invalid CIDR', data: 'Error details' }
-      );
+      vi.mocked(checkSetting).mockResolvedValue({
+        error: true,
+        message: 'Invalid CIDR',
+        data: 'Error details',
+      });
 
       render(<NetworkAccessForm active={true} />);
 
@@ -362,8 +388,10 @@ describe('NetworkAccessForm', () => {
       fireEvent.click(screen.getByText('Save'));
       await waitFor(() => screen.getByTestId('alert'));
 
-      vi.mocked(checkSetting).mockResolvedValue(
-        { client_ip: '192.168.1.1', UI: ['192.168.0.0/16'] });
+      vi.mocked(checkSetting).mockResolvedValue({
+        client_ip: '192.168.1.1',
+        UI: ['192.168.0.0/16'],
+      });
 
       // Second save — succeeds
       fireEvent.click(screen.getByText('Save'));
@@ -371,8 +399,10 @@ describe('NetworkAccessForm', () => {
       fireEvent.click(screen.getByTestId('confirm-ok'));
 
       await waitFor(() => {
-        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+        expect(screen.getByTestId('alert-title')).toHaveTextContent(
+          'Saved Successfully'
+        );
       });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/settings/__tests__/ProxySettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/ProxySettingsForm.test.jsx
index 193f528c..c874b3e6 100644
--- a/frontend/src/components/forms/settings/__tests__/ProxySettingsForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/ProxySettingsForm.test.jsx
@@ -5,8 +5,14 @@ import ProxySettingsForm from '../ProxySettingsForm';
 // ── Constants mock ─────────────────────────────────────────────────────────────
 vi.mock('../../../../constants.js', () => ({
   PROXY_SETTINGS_OPTIONS: {
-    buffering_timeout: { label: 'Buffering Timeout', description: 'Timeout in seconds' },
-    buffering_speed: { label: 'Buffering Speed', description: 'Speed multiplier' },
+    buffering_timeout: {
+      label: 'Buffering Timeout',
+      description: 'Timeout in seconds',
+    },
+    buffering_speed: {
+      label: 'Buffering Speed',
+      description: 'Speed multiplier',
+    },
     redis_url: { label: 'Redis URL', description: 'Redis connection URL' },
   },
 }));
@@ -133,7 +139,9 @@ const setupMocks = ({ settings = makeSettings(), formOverrides = {} } = {}) => {
   const formMock = makeFormMock(formOverrides);
 
   vi.mocked(useForm).mockReturnValue(formMock);
-  vi.mocked(getProxySettingsFormInitialValues).mockReturnValue(mockInitialValues);
+  vi.mocked(getProxySettingsFormInitialValues).mockReturnValue(
+    mockInitialValues
+  );
   vi.mocked(getProxySettingDefaults).mockReturnValue(mockDefaults);
   vi.mocked(updateSetting).mockResolvedValue({ success: true });
   vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
@@ -161,12 +169,16 @@ describe('ProxySettingsForm', () => {
 
     it('renders NumberInput for buffering_timeout', () => {
       render(<ProxySettingsForm active={true} />);
-      expect(screen.getByTestId('number-input-Buffering Timeout')).toBeInTheDocument();
+      expect(
+        screen.getByTestId('number-input-Buffering Timeout')
+      ).toBeInTheDocument();
     });
 
     it('renders NumberInput for buffering_speed', () => {
       render(<ProxySettingsForm active={true} />);
-      expect(screen.getByTestId('number-input-Buffering Speed')).toBeInTheDocument();
+      expect(
+        screen.getByTestId('number-input-Buffering Speed')
+      ).toBeInTheDocument();
     });
 
     it('renders TextInput for redis_url', () => {
@@ -216,7 +228,9 @@ describe('ProxySettingsForm', () => {
     });
 
     it('handles null settings gracefully', () => {
-      vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings: null }));
+      vi.mocked(useSettingsStore).mockImplementation((sel) =>
+        sel({ settings: null })
+      );
       expect(() => render(<ProxySettingsForm active={true} />)).not.toThrow();
     });
   });
@@ -261,7 +275,9 @@ describe('ProxySettingsForm', () => {
 
       await waitFor(() => {
         expect(screen.getByTestId('alert')).toBeInTheDocument();
-        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+        expect(screen.getByTestId('alert-title')).toHaveTextContent(
+          'Saved Successfully'
+        );
       });
     });
 
@@ -344,4 +360,4 @@ describe('ProxySettingsForm', () => {
       expect(formMock.getInputProps).toHaveBeenCalledWith('redis_url');
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/settings/__tests__/StreamSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/StreamSettingsForm.test.jsx
index c0742c8e..25ee46aa 100644
--- a/frontend/src/components/forms/settings/__tests__/StreamSettingsForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/StreamSettingsForm.test.jsx
@@ -35,16 +35,16 @@ vi.mock('@mantine/form', () => ({ useForm: vi.fn() }));
 // ── ConfirmationDialog mock ────────────────────────────────────────────────────
 vi.mock('../../../ConfirmationDialog.jsx', () => ({
   default: ({
-              opened,
-              onClose,
-              onConfirm,
-              title,
-              message,
-              confirmLabel,
-              cancelLabel,
-              actionKey,
-              onSuppressChange,
-            }) =>
+    opened,
+    onClose,
+    onConfirm,
+    title,
+    message,
+    confirmLabel,
+    cancelLabel,
+    actionKey,
+    onSuppressChange,
+  }) =>
     opened ? (
       <div data-testid="confirmation-dialog">
         <div data-testid="confirm-title">{title}</div>
@@ -98,7 +98,9 @@ vi.mock('@mantine/core', () => ({
         aria-label={label}
         multiple
         onChange={(e) => {
-          const selected = Array.from(e.target.selectedOptions).map((o) => o.value);
+          const selected = Array.from(e.target.selectedOptions).map(
+            (o) => o.value
+          );
           rest.onChange?.(selected);
         }}
         value={rest.value ?? []}
@@ -212,12 +214,12 @@ const makeStreamProfiles = () => [
 ];
 
 const setupMocks = ({
-                      settings = makeSettings(),
-                      formOverrides = {},
-                      warningSuppressed = false,
-                      userAgents = makeUserAgents(),
-                      streamProfiles = makeStreamProfiles(),
-                    } = {}) => {
+  settings = makeSettings(),
+  formOverrides = {},
+  warningSuppressed = false,
+  userAgents = makeUserAgents(),
+  streamProfiles = makeStreamProfiles(),
+} = {}) => {
   const formMock = makeFormMock(formOverrides);
 
   vi.mocked(useForm).mockReturnValue(formMock);
@@ -290,7 +292,9 @@ describe('StreamSettingsForm', () => {
 
     it('renders the Auto-Import Mapped Files switch', () => {
       render(<StreamSettingsForm active={true} />);
-      expect(screen.getByTestId('auto_import_mapped_files')).toBeInTheDocument();
+      expect(
+        screen.getByTestId('auto_import_mapped_files')
+      ).toBeInTheDocument();
     });
 
     it('renders the M3U Hash Key multiselect', () => {
@@ -323,7 +327,9 @@ describe('StreamSettingsForm', () => {
 
     it('does not show confirmation dialog on initial render', () => {
       render(<StreamSettingsForm active={true} />);
-      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('confirmation-dialog')
+      ).not.toBeInTheDocument();
     });
   });
 
@@ -429,13 +435,19 @@ describe('StreamSettingsForm', () => {
       fireEvent.submit(screen.getByText('Save').closest('form'));
       await waitFor(() => {
         expect(screen.getByTestId('alert')).toBeInTheDocument();
-        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+        expect(screen.getByTestId('alert-title')).toHaveTextContent(
+          'Saved Successfully'
+        );
       });
     });
 
     it('does not show success alert when saveChangedSettings throws', async () => {
-      vi.mocked(saveChangedSettings).mockRejectedValue(new Error('save failed'));
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      vi.mocked(saveChangedSettings).mockRejectedValue(
+        new Error('save failed')
+      );
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       render(<StreamSettingsForm active={true} />);
 
       fireEvent.submit(screen.getByText('Save').closest('form'));
@@ -449,12 +461,17 @@ describe('StreamSettingsForm', () => {
     it('logs error when saveChangedSettings throws', async () => {
       const error = new Error('save failed');
       vi.mocked(saveChangedSettings).mockRejectedValue(error);
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       render(<StreamSettingsForm active={true} />);
 
       fireEvent.submit(screen.getByText('Save').closest('form'));
       await waitFor(() => {
-        expect(consoleSpy).toHaveBeenCalledWith('Error saving settings:', error);
+        expect(consoleSpy).toHaveBeenCalledWith(
+          'Error saving settings:',
+          error
+        );
       });
       consoleSpy.mockRestore();
     });
@@ -466,7 +483,9 @@ describe('StreamSettingsForm', () => {
       await waitFor(() => {
         expect(saveChangedSettings).toHaveBeenCalled();
       });
-      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('confirmation-dialog')
+      ).not.toBeInTheDocument();
     });
   });
 
@@ -501,7 +520,9 @@ describe('StreamSettingsForm', () => {
 
       fireEvent.submit(screen.getByText('Save').closest('form'));
       await waitFor(() => {
-        expect(screen.getByTestId('confirm-ok')).toHaveTextContent('Save and Rehash');
+        expect(screen.getByTestId('confirm-ok')).toHaveTextContent(
+          'Save and Rehash'
+        );
       });
     });
 
@@ -526,9 +547,7 @@ describe('StreamSettingsForm', () => {
       render(<StreamSettingsForm active={true} />);
 
       fireEvent.submit(screen.getByText('Save').closest('form'));
-      await waitFor(() =>
-        screen.getByTestId('confirmation-dialog')
-      );
+      await waitFor(() => screen.getByTestId('confirmation-dialog'));
       fireEvent.click(screen.getByTestId('confirm-ok'));
 
       await waitFor(() => {
@@ -546,7 +565,9 @@ describe('StreamSettingsForm', () => {
       fireEvent.click(screen.getByTestId('confirm-ok'));
 
       await waitFor(() => {
-        expect(screen.getByTestId('alert-title')).toHaveTextContent('Saved Successfully');
+        expect(screen.getByTestId('alert-title')).toHaveTextContent(
+          'Saved Successfully'
+        );
       });
     });
 
@@ -560,7 +581,9 @@ describe('StreamSettingsForm', () => {
       fireEvent.click(screen.getByTestId('confirm-ok'));
 
       await waitFor(() => {
-        expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+        expect(
+          screen.queryByTestId('confirmation-dialog')
+        ).not.toBeInTheDocument();
       });
     });
 
@@ -574,7 +597,9 @@ describe('StreamSettingsForm', () => {
       fireEvent.click(screen.getByTestId('confirm-cancel'));
 
       await waitFor(() => {
-        expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+        expect(
+          screen.queryByTestId('confirmation-dialog')
+        ).not.toBeInTheDocument();
       });
       expect(saveChangedSettings).not.toHaveBeenCalled();
     });
@@ -590,7 +615,9 @@ describe('StreamSettingsForm', () => {
       await waitFor(() => {
         expect(saveChangedSettings).toHaveBeenCalled();
       });
-      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('confirmation-dialog')
+      ).not.toBeInTheDocument();
     });
   });
 
@@ -613,7 +640,9 @@ describe('StreamSettingsForm', () => {
       fireEvent.click(screen.getByText('Rehash Streams'));
 
       await waitFor(() => {
-        expect(screen.getByTestId('confirm-ok')).toHaveTextContent('Start Rehash');
+        expect(screen.getByTestId('confirm-ok')).toHaveTextContent(
+          'Start Rehash'
+        );
       });
     });
 
@@ -636,7 +665,9 @@ describe('StreamSettingsForm', () => {
       await waitFor(() => {
         expect(rehashStreams).toHaveBeenCalled();
       });
-      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('confirmation-dialog')
+      ).not.toBeInTheDocument();
     });
 
     it('shows rehash success alert after rehash completes', async () => {
@@ -654,7 +685,9 @@ describe('StreamSettingsForm', () => {
     it('does not show rehash success alert when rehashStreams throws', async () => {
       setupMocks({ warningSuppressed: true });
       vi.mocked(rehashStreams).mockRejectedValue(new Error('fail'));
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       render(<StreamSettingsForm active={true} />);
       fireEvent.click(screen.getByText('Rehash Streams'));
 
@@ -669,12 +702,17 @@ describe('StreamSettingsForm', () => {
       setupMocks({ warningSuppressed: true });
       const error = new Error('network error');
       vi.mocked(rehashStreams).mockRejectedValue(error);
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       render(<StreamSettingsForm active={true} />);
       fireEvent.click(screen.getByText('Rehash Streams'));
 
       await waitFor(() => {
-        expect(consoleSpy).toHaveBeenCalledWith('Error rehashing streams:', error);
+        expect(consoleSpy).toHaveBeenCalledWith(
+          'Error rehashing streams:',
+          error
+        );
       });
       consoleSpy.mockRestore();
     });
@@ -686,7 +724,9 @@ describe('StreamSettingsForm', () => {
       fireEvent.click(screen.getByTestId('confirm-cancel'));
 
       await waitFor(() => {
-        expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+        expect(
+          screen.queryByTestId('confirmation-dialog')
+        ).not.toBeInTheDocument();
       });
       expect(rehashStreams).not.toHaveBeenCalled();
     });
@@ -710,7 +750,9 @@ describe('StreamSettingsForm', () => {
     it('Rehash Streams button is disabled while rehashing', async () => {
       let resolveRehash;
       vi.mocked(rehashStreams).mockReturnValue(
-        new Promise((res) => { resolveRehash = res; })
+        new Promise((res) => {
+          resolveRehash = res;
+        })
       );
       setupMocks({ warningSuppressed: true });
       render(<StreamSettingsForm active={true} />);
@@ -736,7 +778,9 @@ describe('StreamSettingsForm', () => {
 
     it('calls getInputProps for default_stream_profile', () => {
       render(<StreamSettingsForm active={true} />);
-      expect(formMock.getInputProps).toHaveBeenCalledWith('default_stream_profile');
+      expect(formMock.getInputProps).toHaveBeenCalledWith(
+        'default_stream_profile'
+      );
     });
 
     it('calls getInputProps for preferred_region', () => {
@@ -757,4 +801,4 @@ describe('StreamSettingsForm', () => {
       expect(formMock.getInputProps).toHaveBeenCalledWith('m3u_hash_key');
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
index b9baa711..a3b156d5 100644
--- a/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
@@ -53,7 +53,11 @@ vi.mock('@mantine/core', () => ({
 // Imports after mocks
 // ──────────────────────────────────────────────────────────────────────────────
 import useSettingsStore from '../../../../store/settings.jsx';
-import { getChangedSettings, parseSettings, saveChangedSettings } from '../../../../utils/pages/SettingsUtils.js';
+import {
+  getChangedSettings,
+  parseSettings,
+  saveChangedSettings,
+} from '../../../../utils/pages/SettingsUtils.js';
 import { getSystemSettingsFormInitialValues } from '../../../../utils/forms/settings/SystemSettingsFormUtils.js';
 import { useForm } from '@mantine/form';
 
@@ -83,7 +87,9 @@ const setupMocks = ({ settings = makeSettings() } = {}) => {
   vi.mocked(getSystemSettingsFormInitialValues).mockReturnValue(formValues);
   vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
   vi.mocked(parseSettings).mockReturnValue(formValues);
-  vi.mocked(getChangedSettings).mockReturnValue({ max_system_events: settings?.max_system_events ?? 100 });
+  vi.mocked(getChangedSettings).mockReturnValue({
+    max_system_events: settings?.max_system_events ?? 100,
+  });
   vi.mocked(saveChangedSettings).mockResolvedValue(undefined);
 
   return { formMock };
@@ -122,7 +128,9 @@ describe('SystemSettingsForm', () => {
       setupMocks();
       render(<SystemSettingsForm active={true} />);
       expect(
-        screen.getByText('Number of events to retain (minimum: 10, maximum: 1000)')
+        screen.getByText(
+          'Number of events to retain (minimum: 10, maximum: 1000)'
+        )
       ).toBeInTheDocument();
     });
 
@@ -184,7 +192,9 @@ describe('SystemSettingsForm', () => {
       const settings = makeSettings();
       const { formMock } = setupMocks({ settings });
       render(<SystemSettingsForm active={true} />);
-      expect(formMock.setValues).toHaveBeenCalledWith({ max_system_events: 100 });
+      expect(formMock.setValues).toHaveBeenCalledWith({
+        max_system_events: 100,
+      });
     });
 
     it('does not call parseSettings when settings is null', () => {
@@ -197,8 +207,12 @@ describe('SystemSettingsForm', () => {
         submitting: false,
       };
       vi.mocked(useForm).mockReturnValue(formMock);
-      vi.mocked(getSystemSettingsFormInitialValues).mockReturnValue({ max_system_events: 100 });
-      vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings: null }));
+      vi.mocked(getSystemSettingsFormInitialValues).mockReturnValue({
+        max_system_events: 100,
+      });
+      vi.mocked(useSettingsStore).mockImplementation((sel) =>
+        sel({ settings: null })
+      );
       vi.mocked(parseSettings).mockReturnValue({});
       vi.mocked(saveChangedSettings).mockResolvedValue(undefined);
 
@@ -213,8 +227,13 @@ describe('SystemSettingsForm', () => {
     it('calls form.setFieldValue when NumberInput changes', () => {
       const { formMock } = setupMocks();
       render(<SystemSettingsForm active={true} />);
-      fireEvent.change(screen.getByTestId('number-input'), { target: { value: '200' } });
-      expect(formMock.setFieldValue).toHaveBeenCalledWith('max_system_events', 200);
+      fireEvent.change(screen.getByTestId('number-input'), {
+        target: { value: '200' },
+      });
+      expect(formMock.setFieldValue).toHaveBeenCalledWith(
+        'max_system_events',
+        200
+      );
     });
   });
 
@@ -229,7 +248,10 @@ describe('SystemSettingsForm', () => {
       fireEvent.click(screen.getByText('Save'));
 
       await waitFor(() => {
-        expect(getChangedSettings).toHaveBeenCalledWith(formMock.getValues(), settings);
+        expect(getChangedSettings).toHaveBeenCalledWith(
+          formMock.getValues(),
+          settings
+        );
         expect(saveChangedSettings).toHaveBeenCalled();
       });
     });
@@ -247,9 +269,13 @@ describe('SystemSettingsForm', () => {
     });
 
     it('does not show success alert when saveChangedSettings throws', async () => {
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       setupMocks();
-      vi.mocked(saveChangedSettings).mockRejectedValue(new Error('save failed'));
+      vi.mocked(saveChangedSettings).mockRejectedValue(
+        new Error('save failed')
+      );
 
       render(<SystemSettingsForm active={true} />);
       fireEvent.click(screen.getByText('Save'));
@@ -263,7 +289,9 @@ describe('SystemSettingsForm', () => {
 
     it('logs error when saveChangedSettings throws', async () => {
       const error = new Error('save failed');
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       setupMocks();
       vi.mocked(saveChangedSettings).mockRejectedValue(error);
 
@@ -271,7 +299,10 @@ describe('SystemSettingsForm', () => {
       fireEvent.click(screen.getByText('Save'));
 
       await waitFor(() => {
-        expect(consoleSpy).toHaveBeenCalledWith('Error saving settings:', error);
+        expect(consoleSpy).toHaveBeenCalledWith(
+          'Error saving settings:',
+          error
+        );
       });
       consoleSpy.mockRestore();
     });
@@ -308,4 +339,4 @@ describe('SystemSettingsForm', () => {
       expect(screen.getByTestId('alert')).toBeInTheDocument();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/settings/__tests__/UiSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/UiSettingsForm.test.jsx
index b8c0b5ea..101f32a4 100644
--- a/frontend/src/components/forms/settings/__tests__/UiSettingsForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/UiSettingsForm.test.jsx
@@ -7,7 +7,9 @@ vi.mock('../../../../store/settings.jsx', () => ({ default: vi.fn() }));
 
 // ── Hook mocks ─────────────────────────────────────────────────────────────────
 vi.mock('../../../../hooks/useLocalStorage.jsx', () => ({ default: vi.fn() }));
-vi.mock('../../../../hooks/useTablePreferences.jsx', () => ({ default: vi.fn() }));
+vi.mock('../../../../hooks/useTablePreferences.jsx', () => ({
+  default: vi.fn(),
+}));
 
 // ── Utility mocks ──────────────────────────────────────────────────────────────
 vi.mock('../../../../utils/dateTimeUtils.js', () => ({
@@ -62,7 +64,10 @@ vi.mock('@mantine/core', () => ({
 import useSettingsStore from '../../../../store/settings.jsx';
 import useLocalStorage from '../../../../hooks/useLocalStorage.jsx';
 import useTablePreferences from '../../../../hooks/useTablePreferences.jsx';
-import { buildTimeZoneOptions, getDefaultTimeZone } from '../../../../utils/dateTimeUtils.js';
+import {
+  buildTimeZoneOptions,
+  getDefaultTimeZone,
+} from '../../../../utils/dateTimeUtils.js';
 import { showNotification } from '../../../../utils/notificationUtils.js';
 import { saveTimeZoneSetting } from '../../../../utils/forms/settings/UiSettingsFormUtils.js';
 
@@ -83,13 +88,13 @@ const TZ_OPTIONS = [
 ];
 
 const setupMocks = ({
-                      settings = makeSettings(),
-                      timeFormat = '12h',
-                      dateFormat = 'mdy',
-                      timeZone = DEFAULT_TZ,
-                      headerPinned = false,
-                      tableSize = 'default',
-                    } = {}) => {
+  settings = makeSettings(),
+  timeFormat = '12h',
+  dateFormat = 'mdy',
+  timeZone = DEFAULT_TZ,
+  headerPinned = false,
+  tableSize = 'default',
+} = {}) => {
   const setTimeFormat = vi.fn();
   const setDateFormat = vi.fn();
   const setTimeZone = vi.fn();
@@ -102,13 +107,12 @@ const setupMocks = ({
 
   vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
 
-  vi.mocked(useLocalStorage)
-    .mockImplementation((key, defaultVal) => {
-      if (key === 'time-format') return [timeFormat, setTimeFormat];
-      if (key === 'date-format') return [dateFormat, setDateFormat];
-      if (key === 'time-zone') return [timeZone, setTimeZone];
-      return [defaultVal, vi.fn()];
-    });
+  vi.mocked(useLocalStorage).mockImplementation((key, defaultVal) => {
+    if (key === 'time-format') return [timeFormat, setTimeFormat];
+    if (key === 'date-format') return [dateFormat, setDateFormat];
+    if (key === 'time-zone') return [timeZone, setTimeZone];
+    return [defaultVal, vi.fn()];
+  });
 
   vi.mocked(useTablePreferences).mockReturnValue({
     headerPinned,
@@ -117,7 +121,13 @@ const setupMocks = ({
     setTableSize,
   });
 
-  return { setTimeFormat, setDateFormat, setTimeZone, setHeaderPinned, setTableSize };
+  return {
+    setTimeFormat,
+    setDateFormat,
+    setTimeZone,
+    setHeaderPinned,
+    setTableSize,
+  };
 };
 
 // ──────────────────────────────────────────────────────────────────────────────
@@ -164,7 +174,9 @@ describe('UiSettingsForm', () => {
     it('renders the switch description', () => {
       setupMocks();
       render(<UiSettingsForm />);
-      expect(screen.getByText('Keep table headers visible when scrolling')).toBeInTheDocument();
+      expect(
+        screen.getByText('Keep table headers visible when scrolling')
+      ).toBeInTheDocument();
     });
 
     it('renders Table Size select with initial value', () => {
@@ -331,7 +343,10 @@ describe('UiSettingsForm', () => {
       });
       render(<UiSettingsForm />);
       await waitFor(() => {
-        expect(saveTimeZoneSetting).toHaveBeenCalledWith(DEFAULT_TZ, makeSettings({ timeZone: null }));
+        expect(saveTimeZoneSetting).toHaveBeenCalledWith(
+          DEFAULT_TZ,
+          makeSettings({ timeZone: null })
+        );
       });
     });
 
@@ -359,9 +374,13 @@ describe('UiSettingsForm', () => {
 
   describe('error handling', () => {
     it('shows error notification when saveTimeZoneSetting throws on tz change', async () => {
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       setupMocks({ settings: makeSettings({ timeZone: null }), timeZone: '' });
-      vi.mocked(saveTimeZoneSetting).mockRejectedValue(new Error('network error'));
+      vi.mocked(saveTimeZoneSetting).mockRejectedValue(
+        new Error('network error')
+      );
 
       render(<UiSettingsForm />);
       fireEvent.change(screen.getByTestId('select-time-zone'), {
@@ -370,7 +389,10 @@ describe('UiSettingsForm', () => {
 
       await waitFor(() => {
         expect(showNotification).toHaveBeenCalledWith(
-          expect.objectContaining({ color: 'red', title: 'Failed to update time zone' })
+          expect.objectContaining({
+            color: 'red',
+            title: 'Failed to update time zone',
+          })
         );
       });
       consoleSpy.mockRestore();
@@ -378,7 +400,9 @@ describe('UiSettingsForm', () => {
 
     it('logs error when saveTimeZoneSetting throws on tz change', async () => {
       const error = new Error('network error');
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       setupMocks({ settings: makeSettings({ timeZone: null }), timeZone: '' });
       vi.mocked(saveTimeZoneSetting).mockRejectedValue(error);
 
@@ -397,15 +421,25 @@ describe('UiSettingsForm', () => {
     });
 
     it('shows error notification when saveTimeZoneSetting throws during initial sync', async () => {
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-      setupMocks({ settings: makeSettings({ timeZone: null }), timeZone: DEFAULT_TZ });
-      vi.mocked(saveTimeZoneSetting).mockRejectedValue(new Error('sync failed'));
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
+      setupMocks({
+        settings: makeSettings({ timeZone: null }),
+        timeZone: DEFAULT_TZ,
+      });
+      vi.mocked(saveTimeZoneSetting).mockRejectedValue(
+        new Error('sync failed')
+      );
 
       render(<UiSettingsForm />);
 
       await waitFor(() => {
         expect(showNotification).toHaveBeenCalledWith(
-          expect.objectContaining({ color: 'red', title: 'Failed to update time zone' })
+          expect.objectContaining({
+            color: 'red',
+            title: 'Failed to update time zone',
+          })
         );
       });
       consoleSpy.mockRestore();
@@ -421,4 +455,4 @@ describe('UiSettingsForm', () => {
       expect(buildTimeZoneOptions).toHaveBeenCalledWith('America/Chicago');
     });
   });
-});
\ No newline at end of file
+});

From 0d6979ce1deb35b934522fd42c1e2540e663af5b Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Sun, 15 Mar 2026 16:30:50 -0500
Subject: [PATCH 025/172] fix: guard CoreSettings list getters against
 corrupted stored data

- Sanitize series_rules on read (get_dvr_series_rules) and write (set_dvr_series_rules), filtering non-dict elements and non-list values
- Sanitize series_rules in CoreSettingsSerializer.update() to cover the generic settings API path (Settings page round-trip)
- Harden EPG ignore list getters (prefixes, suffixes, custom) with shared _safe_string_list helper to filter non-string/non-list values
- Add 13 unit tests covering all corruption scenarios
---
 core/models.py      |  23 +++++--
 core/serializers.py |  15 ++++-
 core/tests.py       | 149 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 179 insertions(+), 8 deletions(-)

diff --git a/core/models.py b/core/models.py
index 4e6322e7..f1a604f7 100644
--- a/core/models.py
+++ b/core/models.py
@@ -239,17 +239,24 @@ class CoreSettings(models.Model):
             "epg_match_ignore_custom": [],
         })
 
+    @classmethod
+    def _safe_string_list(cls, value):
+        """Return a list of strings, filtering out non-list or non-string values."""
+        if not isinstance(value, list):
+            return []
+        return [v for v in value if isinstance(v, str)]
+
     @classmethod
     def get_epg_match_ignore_prefixes(cls):
-        return cls.get_epg_settings().get("epg_match_ignore_prefixes", [])
+        return cls._safe_string_list(cls.get_epg_settings().get("epg_match_ignore_prefixes", []))
 
     @classmethod
     def get_epg_match_ignore_suffixes(cls):
-        return cls.get_epg_settings().get("epg_match_ignore_suffixes", [])
+        return cls._safe_string_list(cls.get_epg_settings().get("epg_match_ignore_suffixes", []))
 
     @classmethod
     def get_epg_match_ignore_custom(cls):
-        return cls.get_epg_settings().get("epg_match_ignore_custom", [])
+        return cls._safe_string_list(cls.get_epg_settings().get("epg_match_ignore_custom", []))
 
     # DVR Settings
     @classmethod
@@ -312,12 +319,16 @@ class CoreSettings(models.Model):
 
     @classmethod
     def get_dvr_series_rules(cls):
-        return cls.get_dvr_settings().get("series_rules", [])
+        rules = cls.get_dvr_settings().get("series_rules", [])
+        if not isinstance(rules, list):
+            return []
+        return [r for r in rules if isinstance(r, dict)]
 
     @classmethod
     def set_dvr_series_rules(cls, rules):
-        cls._update_group(DVR_SETTINGS_KEY, "DVR Settings", {"series_rules": rules})
-        return rules
+        clean = [r for r in rules if isinstance(r, dict)] if isinstance(rules, list) else []
+        cls._update_group(DVR_SETTINGS_KEY, "DVR Settings", {"series_rules": clean})
+        return clean
 
     # Proxy Settings
     @classmethod
diff --git a/core/serializers.py b/core/serializers.py
index bff5f701..0df656b2 100644
--- a/core/serializers.py
+++ b/core/serializers.py
@@ -3,7 +3,7 @@ import json
 import ipaddress
 
 from rest_framework import serializers
-from .models import CoreSettings, UserAgent, StreamProfile, NETWORK_ACCESS_KEY
+from .models import CoreSettings, UserAgent, StreamProfile, DVR_SETTINGS_KEY, NETWORK_ACCESS_KEY
 
 
 class UserAgentSerializer(serializers.ModelSerializer):
@@ -64,6 +64,19 @@ class CoreSettingsSerializer(serializers.ModelSerializer):
                     }
                 )
 
+        # Sanitize series_rules when DVR settings are saved through the
+        # generic settings API (e.g. Settings page round-trip) to prevent
+        # corrupted non-dict entries from persisting.
+        if instance.key == DVR_SETTINGS_KEY:
+            value = validated_data.get("value")
+            if isinstance(value, dict) and "series_rules" in value:
+                rules = value["series_rules"]
+                value["series_rules"] = (
+                    [r for r in rules if isinstance(r, dict)]
+                    if isinstance(rules, list)
+                    else []
+                )
+
         result = super().update(instance, validated_data)
 
         # Note: Cache invalidation and notification sync is handled by post_save signal
diff --git a/core/tests.py b/core/tests.py
index 7ce503c2..305ab308 100644
--- a/core/tests.py
+++ b/core/tests.py
@@ -1,3 +1,150 @@
 from django.test import TestCase
 
-# Create your tests here.
+from core.models import CoreSettings, DVR_SETTINGS_KEY, EPG_SETTINGS_KEY
+
+
+class GetDvrSeriesRulesTest(TestCase):
+    """Verify get_dvr_series_rules handles corrupted stored data."""
+
+    def _set_series_rules_raw(self, raw_value):
+        """Write a raw series_rules value into the DB, bypassing set_dvr_series_rules."""
+        obj, _ = CoreSettings.objects.get_or_create(
+            key=DVR_SETTINGS_KEY,
+            defaults={"name": "DVR Settings", "value": {}},
+        )
+        current = obj.value if isinstance(obj.value, dict) else {}
+        current["series_rules"] = raw_value
+        obj.value = current
+        obj.save()
+
+    def test_valid_rules_returned_as_is(self):
+        rules = [{"tvg_id": "abc", "mode": "all", "title": "Show"}]
+        self._set_series_rules_raw(rules)
+        result = CoreSettings.get_dvr_series_rules()
+        self.assertEqual(result, rules)
+
+    def test_non_dict_elements_filtered(self):
+        """Strings in the list cause 'str' has no attribute 'get'."""
+        self._set_series_rules_raw(["bad_string", {"tvg_id": "abc", "mode": "all", "title": ""}])
+        result = CoreSettings.get_dvr_series_rules()
+        self.assertEqual(len(result), 1)
+        self.assertEqual(result[0]["tvg_id"], "abc")
+
+    def test_non_list_value_returns_empty(self):
+        """If series_rules is a JSON string instead of a list, return empty."""
+        self._set_series_rules_raw("[]")
+        result = CoreSettings.get_dvr_series_rules()
+        self.assertEqual(result, [])
+
+    def test_none_value_returns_empty(self):
+        self._set_series_rules_raw(None)
+        result = CoreSettings.get_dvr_series_rules()
+        self.assertEqual(result, [])
+
+    def test_mixed_corrupt_elements(self):
+        self._set_series_rules_raw([42, None, True, {"tvg_id": "x", "mode": "new", "title": "T"}])
+        result = CoreSettings.get_dvr_series_rules()
+        self.assertEqual(len(result), 1)
+        self.assertEqual(result[0]["tvg_id"], "x")
+
+
+class SetDvrSeriesRulesTest(TestCase):
+    """Verify set_dvr_series_rules sanitizes input before persisting."""
+
+    def test_valid_rules_persisted(self):
+        rules = [{"tvg_id": "abc", "mode": "all", "title": "Show"}]
+        result = CoreSettings.set_dvr_series_rules(rules)
+        self.assertEqual(result, rules)
+        self.assertEqual(CoreSettings.get_dvr_series_rules(), rules)
+
+    def test_non_dict_elements_stripped_on_write(self):
+        dirty = ["bad", 42, {"tvg_id": "abc", "mode": "all", "title": ""}]
+        result = CoreSettings.set_dvr_series_rules(dirty)
+        self.assertEqual(len(result), 1)
+        self.assertEqual(result[0]["tvg_id"], "abc")
+        self.assertEqual(CoreSettings.get_dvr_series_rules(), result)
+
+    def test_non_list_input_stores_empty(self):
+        result = CoreSettings.set_dvr_series_rules("not a list")
+        self.assertEqual(result, [])
+        self.assertEqual(CoreSettings.get_dvr_series_rules(), [])
+
+
+class CoreSettingsSerializerDvrTest(TestCase):
+    """Verify the generic settings API sanitizes series_rules on save."""
+
+    def test_serializer_strips_corrupt_series_rules(self):
+        """Settings page round-trip must not persist corrupt series_rules."""
+        from core.serializers import CoreSettingsSerializer
+
+        obj, _ = CoreSettings.objects.get_or_create(
+            key=DVR_SETTINGS_KEY,
+            defaults={"name": "DVR Settings", "value": {"series_rules": []}},
+        )
+        dirty_value = {
+            **obj.value,
+            "series_rules": ["bad", {"tvg_id": "ok", "mode": "all", "title": ""}],
+        }
+        serializer = CoreSettingsSerializer(obj, data={"value": dirty_value}, partial=True)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        obj.refresh_from_db()
+        rules = obj.value.get("series_rules", [])
+        self.assertEqual(len(rules), 1)
+        self.assertEqual(rules[0]["tvg_id"], "ok")
+
+    def test_serializer_handles_non_list_series_rules(self):
+        from core.serializers import CoreSettingsSerializer
+
+        obj, _ = CoreSettings.objects.get_or_create(
+            key=DVR_SETTINGS_KEY,
+            defaults={"name": "DVR Settings", "value": {"series_rules": []}},
+        )
+        dirty_value = {**obj.value, "series_rules": "not a list"}
+        serializer = CoreSettingsSerializer(obj, data={"value": dirty_value}, partial=True)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        obj.refresh_from_db()
+        self.assertEqual(obj.value.get("series_rules"), [])
+
+
+class EpgIgnoreListsTest(TestCase):
+    """Verify EPG ignore list getters handle corrupted stored data."""
+
+    def _set_epg_field_raw(self, field, raw_value):
+        obj, _ = CoreSettings.objects.get_or_create(
+            key=EPG_SETTINGS_KEY,
+            defaults={"name": "EPG Settings", "value": {}},
+        )
+        current = obj.value if isinstance(obj.value, dict) else {}
+        current[field] = raw_value
+        obj.value = current
+        obj.save()
+
+    def test_valid_string_lists_returned(self):
+        for field, getter in [
+            ("epg_match_ignore_prefixes", CoreSettings.get_epg_match_ignore_prefixes),
+            ("epg_match_ignore_suffixes", CoreSettings.get_epg_match_ignore_suffixes),
+            ("epg_match_ignore_custom", CoreSettings.get_epg_match_ignore_custom),
+        ]:
+            self._set_epg_field_raw(field, ["HD", "SD"])
+            self.assertEqual(getter(), ["HD", "SD"])
+
+    def test_non_string_elements_filtered(self):
+        for field, getter in [
+            ("epg_match_ignore_prefixes", CoreSettings.get_epg_match_ignore_prefixes),
+            ("epg_match_ignore_suffixes", CoreSettings.get_epg_match_ignore_suffixes),
+            ("epg_match_ignore_custom", CoreSettings.get_epg_match_ignore_custom),
+        ]:
+            self._set_epg_field_raw(field, [42, None, "HD", True, "SD"])
+            result = getter()
+            self.assertEqual(result, ["HD", "SD"])
+
+    def test_non_list_value_returns_empty(self):
+        for field, getter in [
+            ("epg_match_ignore_prefixes", CoreSettings.get_epg_match_ignore_prefixes),
+            ("epg_match_ignore_suffixes", CoreSettings.get_epg_match_ignore_suffixes),
+            ("epg_match_ignore_custom", CoreSettings.get_epg_match_ignore_custom),
+        ]:
+            self._set_epg_field_raw(field, "not a list")
+            self.assertEqual(getter(), [])

From 0815b3df14890dd67d414a63599aad34dc25838b Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 16:42:11 -0500
Subject: [PATCH 026/172] tests: Add backend test for expiration feature.

---
 .../tests/test_expiration_notifications.py    | 216 ++++++++++++++++++
 1 file changed, 216 insertions(+)
 create mode 100644 apps/m3u/tests/test_expiration_notifications.py

diff --git a/apps/m3u/tests/test_expiration_notifications.py b/apps/m3u/tests/test_expiration_notifications.py
new file mode 100644
index 00000000..c734d3d2
--- /dev/null
+++ b/apps/m3u/tests/test_expiration_notifications.py
@@ -0,0 +1,216 @@
+"""
+Tests for evaluate_profile_expiration_notification.
+
+Covers all four branches:
+  - no exp_date         → returns None, touches nothing
+  - already expired     → creates/updates expired notification, removes warning
+  - expiring within 7d  → creates/updates warning notification, removes expired
+  - not expiring soon   → removes any stale notifications, returns None
+"""
+from datetime import timedelta
+from unittest.mock import patch, MagicMock
+
+from django.test import SimpleTestCase
+from django.utils import timezone
+
+
+def _make_profile(exp_date, profile_id=1, profile_name="Test Profile",
+                  account_id=10, account_name="Test Account"):
+    """Return a minimal mock M3UAccountProfile."""
+    profile = MagicMock()
+    profile.id = profile_id
+    profile.name = profile_name
+    profile.exp_date = exp_date
+    profile.m3u_account.id = account_id
+    profile.m3u_account.name = account_name
+    return profile
+
+
+class EvaluateProfileExpirationNotificationTests(SimpleTestCase):
+
+    def setUp(self):
+        # These three names are local imports inside evaluate_profile_expiration_notification,
+        # so we must patch them at their source modules rather than on apps.m3u.tasks.
+        self.mock_sn = MagicMock()
+        self.mock_send_ws = patch("core.utils.send_websocket_notification").start()
+        self.mock_dismissed = patch("core.utils.send_notification_dismissed").start()
+        patch("core.models.SystemNotification", self.mock_sn).start()
+
+    def tearDown(self):
+        patch.stopall()
+
+    def _run(self, profile):
+        from apps.m3u.tasks import evaluate_profile_expiration_notification
+        return evaluate_profile_expiration_notification(profile)
+
+    # ------------------------------------------------------------------ #
+    # No expiration date
+    # ------------------------------------------------------------------ #
+
+    def test_no_exp_date_returns_none(self):
+        profile = _make_profile(exp_date=None)
+        result = self._run(profile)
+        self.assertIsNone(result)
+        self.mock_sn.objects.update_or_create.assert_not_called()
+        self.mock_send_ws.assert_not_called()
+
+    # ------------------------------------------------------------------ #
+    # Already expired
+    # ------------------------------------------------------------------ #
+
+    @patch("apps.m3u.tasks.timezone")
+    def test_expired_creates_expired_notification(self, mock_tz):
+        now = timezone.now()
+        mock_tz.now.return_value = now
+        mock_tz.timedelta = timedelta
+
+        profile = _make_profile(exp_date=now - timedelta(days=1))
+        # No existing warning notification to delete
+        self.mock_sn.objects.filter.return_value.values_list.return_value = []
+        notification = MagicMock()
+        self.mock_sn.objects.update_or_create.return_value = (notification, True)
+
+        result = self._run(profile)
+
+        self.assertEqual(result, f"xc-exp-expired-{profile.id}")
+        self.mock_sn.objects.update_or_create.assert_called_once()
+        call_kwargs = self.mock_sn.objects.update_or_create.call_args
+        self.assertEqual(call_kwargs.kwargs["notification_key"], f"xc-exp-expired-{profile.id}")
+        self.assertTrue(call_kwargs.kwargs["defaults"]["admin_only"])
+        self.mock_send_ws.assert_called_once_with(notification)
+
+    @patch("apps.m3u.tasks.timezone")
+    def test_expired_removes_stale_warning_notification(self, mock_tz):
+        now = timezone.now()
+        mock_tz.now.return_value = now
+        mock_tz.timedelta = timedelta
+
+        profile = _make_profile(exp_date=now - timedelta(hours=1))
+        warning_key = f"xc-exp-warning-{profile.id}"
+        # Simulate an existing warning notification
+        self.mock_sn.objects.filter.return_value.values_list.return_value = [warning_key]
+        self.mock_sn.objects.update_or_create.return_value = (MagicMock(), False)
+
+        self._run(profile)
+
+        self.mock_dismissed.assert_any_call(warning_key)
+
+    # ------------------------------------------------------------------ #
+    # Expiring within 7 days
+    # ------------------------------------------------------------------ #
+
+    @patch("apps.m3u.tasks.timezone")
+    def test_warning_window_creates_warning_notification(self, mock_tz):
+        now = timezone.now()
+        mock_tz.now.return_value = now
+        mock_tz.timedelta = timedelta
+
+        profile = _make_profile(exp_date=now + timedelta(days=3))
+        self.mock_sn.objects.filter.return_value.values_list.return_value = []
+        notification = MagicMock()
+        self.mock_sn.objects.update_or_create.return_value = (notification, True)
+
+        result = self._run(profile)
+
+        self.assertEqual(result, f"xc-exp-warning-{profile.id}")
+        call_kwargs = self.mock_sn.objects.update_or_create.call_args
+        self.assertEqual(call_kwargs.kwargs["notification_key"], f"xc-exp-warning-{profile.id}")
+        self.assertTrue(call_kwargs.kwargs["defaults"]["admin_only"])
+        self.mock_send_ws.assert_called_once_with(notification)
+
+    @patch("apps.m3u.tasks.timezone")
+    def test_warning_message_says_today_when_same_day(self, mock_tz):
+        now = timezone.now()
+        mock_tz.now.return_value = now
+        mock_tz.timedelta = timedelta
+
+        profile = _make_profile(exp_date=now + timedelta(hours=2))
+        self.mock_sn.objects.filter.return_value.values_list.return_value = []
+        self.mock_sn.objects.update_or_create.return_value = (MagicMock(), True)
+
+        self._run(profile)
+
+        defaults = self.mock_sn.objects.update_or_create.call_args.kwargs["defaults"]
+        self.assertIn("today", defaults["message"])
+
+    @patch("apps.m3u.tasks.timezone")
+    def test_warning_message_says_1_day(self, mock_tz):
+        now = timezone.now()
+        mock_tz.now.return_value = now
+        mock_tz.timedelta = timedelta
+
+        profile = _make_profile(exp_date=now + timedelta(hours=30))
+        self.mock_sn.objects.filter.return_value.values_list.return_value = []
+        self.mock_sn.objects.update_or_create.return_value = (MagicMock(), True)
+
+        self._run(profile)
+
+        defaults = self.mock_sn.objects.update_or_create.call_args.kwargs["defaults"]
+        self.assertIn("in 1 day", defaults["message"])
+
+    @patch("apps.m3u.tasks.timezone")
+    def test_warning_removes_stale_expired_notification(self, mock_tz):
+        now = timezone.now()
+        mock_tz.now.return_value = now
+        mock_tz.timedelta = timedelta
+
+        profile = _make_profile(exp_date=now + timedelta(days=5))
+        expired_key = f"xc-exp-expired-{profile.id}"
+        self.mock_sn.objects.filter.return_value.values_list.return_value = [expired_key]
+        self.mock_sn.objects.update_or_create.return_value = (MagicMock(), False)
+
+        self._run(profile)
+
+        self.mock_dismissed.assert_any_call(expired_key)
+
+    # ------------------------------------------------------------------ #
+    # Not expiring soon (> 7 days away)
+    # ------------------------------------------------------------------ #
+
+    @patch("apps.m3u.tasks.timezone")
+    def test_not_expiring_soon_returns_none(self, mock_tz):
+        now = timezone.now()
+        mock_tz.now.return_value = now
+        mock_tz.timedelta = timedelta
+
+        profile = _make_profile(exp_date=now + timedelta(days=30))
+        self.mock_sn.objects.filter.return_value.values_list.return_value = []
+
+        result = self._run(profile)
+
+        self.assertIsNone(result)
+        self.mock_sn.objects.update_or_create.assert_not_called()
+        self.mock_send_ws.assert_not_called()
+
+    @patch("apps.m3u.tasks.timezone")
+    def test_not_expiring_soon_removes_stale_notifications(self, mock_tz):
+        now = timezone.now()
+        mock_tz.now.return_value = now
+        mock_tz.timedelta = timedelta
+
+        profile = _make_profile(exp_date=now + timedelta(days=30))
+        warning_key = f"xc-exp-warning-{profile.id}"
+        self.mock_sn.objects.filter.return_value.values_list.return_value = [warning_key]
+
+        self._run(profile)
+
+        self.mock_dismissed.assert_called_once_with(warning_key)
+
+    # ------------------------------------------------------------------ #
+    # Boundary: exactly at the 7-day warning threshold
+    # ------------------------------------------------------------------ #
+
+    @patch("apps.m3u.tasks.timezone")
+    def test_exactly_7_days_away_triggers_warning(self, mock_tz):
+        now = timezone.now()
+        mock_tz.now.return_value = now
+        mock_tz.timedelta = timedelta
+
+        # exp_date == now + 7 days  →  exp <= warning_threshold  →  warning
+        profile = _make_profile(exp_date=now + timedelta(days=7))
+        self.mock_sn.objects.filter.return_value.values_list.return_value = []
+        self.mock_sn.objects.update_or_create.return_value = (MagicMock(), True)
+
+        result = self._run(profile)
+
+        self.assertEqual(result, f"xc-exp-warning-{profile.id}")

From c44a3ad5f917937bd1000aa73a387734b42ad6fc Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 16:59:51 -0500
Subject: [PATCH 027/172] Bug Fix: `Stream.last_seen` and
 `ChannelGroupM3UAccount.last_seen` model defaults now use
 `django.utils.timezone.now` instead of `datetime.datetime.now`, eliminating
 spurious `RuntimeWarning: DateTimeField received a naive datetime` warnings
 emitted during test database creation and on new record creation when
 `USE_TZ=True`.

---
 CHANGELOG.md                                                | 1 +
 .../0005_stream_channel_group_stream_last_seen_and_more.py  | 4 ++--
 .../0031_channelgroupm3uaccount_is_stale_and_more.py        | 4 ++--
 apps/channels/models.py                                     | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 232521b3..55afe454 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- `Stream.last_seen` and `ChannelGroupM3UAccount.last_seen` model defaults now use `django.utils.timezone.now` instead of `datetime.datetime.now`, eliminating spurious `RuntimeWarning: DateTimeField received a naive datetime` warnings emitted during test database creation and on new record creation when `USE_TZ=True`.
 - EPG programme parsing crash when an XMLTV source contains programme titles exceeding 255 characters. Previously, a single oversized title would cause the entire `bulk_create` batch to fail with a database truncation error, silently dropping all programmes in that batch. Titles are now truncated to 255 characters before being saved. (Fixes #1039)
 - Container startup failure when `PUID`/`PGID` is set, caused by `/data/db` ownership conflicts between the `postgres` system user (UID 102) and the configured PUID/PGID. PostgreSQL now runs as the PUID/PGID user in AIO mode, eliminating all `chown`-to-UID-102 operations and unifying `/data` ownership. (Fixes #1078) — Thanks [@CodeBormen](https://github.com/CodeBormen)
   - Existing installations where PUID/PGID differs from the current `/data/db` owner are migrated automatically on first startup; a sentinel file prevents redundant recursive `chown` on subsequent boots.
diff --git a/apps/channels/migrations/0005_stream_channel_group_stream_last_seen_and_more.py b/apps/channels/migrations/0005_stream_channel_group_stream_last_seen_and_more.py
index 61a95220..6cbd2622 100644
--- a/apps/channels/migrations/0005_stream_channel_group_stream_last_seen_and_more.py
+++ b/apps/channels/migrations/0005_stream_channel_group_stream_last_seen_and_more.py
@@ -1,7 +1,7 @@
 # Generated by Django 5.1.6 on 2025-03-19 16:33
 
-import datetime
 import django.db.models.deletion
+import django.utils.timezone
 import uuid
 from django.db import migrations, models
 
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='stream',
             name='last_seen',
-            field=models.DateTimeField(db_index=True, default=datetime.datetime.now),
+            field=models.DateTimeField(db_index=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name='channel',
diff --git a/apps/channels/migrations/0031_channelgroupm3uaccount_is_stale_and_more.py b/apps/channels/migrations/0031_channelgroupm3uaccount_is_stale_and_more.py
index 2428a97b..f8246a0b 100644
--- a/apps/channels/migrations/0031_channelgroupm3uaccount_is_stale_and_more.py
+++ b/apps/channels/migrations/0031_channelgroupm3uaccount_is_stale_and_more.py
@@ -1,6 +1,6 @@
 # Generated by Django 5.2.9 on 2026-01-09 18:19
 
-import datetime
+import django.utils.timezone
 from django.db import migrations, models
 
 
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='channelgroupm3uaccount',
             name='last_seen',
-            field=models.DateTimeField(db_index=True, default=datetime.datetime.now, help_text='Last time this group was seen in the M3U source during a refresh'),
+            field=models.DateTimeField(db_index=True, default=django.utils.timezone.now, help_text='Last time this group was seen in the M3U source during a refresh'),
         ),
         migrations.AddField(
             model_name='stream',
diff --git a/apps/channels/models.py b/apps/channels/models.py
index 217a92c0..3bebd224 100644
--- a/apps/channels/models.py
+++ b/apps/channels/models.py
@@ -7,7 +7,7 @@ from apps.proxy.ts_proxy.redis_keys import RedisKeys
 from apps.proxy.ts_proxy.constants import ChannelMetadataField
 import logging
 import uuid
-from datetime import datetime
+from django.utils import timezone
 import hashlib
 import json
 from apps.epg.models import EPGData
@@ -95,7 +95,7 @@ class Stream(models.Model):
         help_text="Unique hash for this stream from the M3U account",
         db_index=True,
     )
-    last_seen = models.DateTimeField(db_index=True, default=datetime.now)
+    last_seen = models.DateTimeField(db_index=True, default=timezone.now)
     is_stale = models.BooleanField(
         default=False,
         db_index=True,
@@ -739,7 +739,7 @@ class ChannelGroupM3UAccount(models.Model):
         help_text='Starting channel number for auto-created channels in this group'
     )
     last_seen = models.DateTimeField(
-        default=datetime.now,
+        default=timezone.now,
         db_index=True,
         help_text='Last time this group was seen in the M3U source during a refresh'
     )

From 41ce381130cdbf49b2d8553e109aa2aca58075f0 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 17:28:00 -0500
Subject: [PATCH 028/172] changelog: Update changelog for tests PR.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55afe454..79cab57a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Order and visibility are saved per-user with optimistic updates and automatic rollback on failure. Changes appear in the sidebar immediately without a page reload.
   - Admin users see a grouped navigation: flat items (`Channels`, `VODs`, `M3U & EPG Manager`, `TV Guide`, `DVR`, `Stats`, `Plugins`) plus collapsible `Integrations` (Connections, Logs) and `System` (Users, Logo Manager, Settings) groups. The `System` group cannot be hidden.
   - Non-admin users see `Channels`, `TV Guide`, and `Settings`, with the `Settings` item not hideable.
-- Unit tests for `NotificationCenter`, `NotificationCenterUtils`, and `M3URefreshNotification` components. — Thanks [@nick4810](https://github.com/nick4810)
+- Unit tests for `NotificationCenter`, `NotificationCenterUtils`, and `M3URefreshNotification` components, and for settings form components `DvrSettingsForm`, `NetworkAccessForm`, `ProxySettingsForm`, `StreamSettingsForm`, `SystemSettingsForm`, `UiSettingsForm`. — Thanks [@nick4810](https://github.com/nick4810)
 - Unit tests for DVR port resolution (`build_dvr_candidates`) and selective Redis flush behavior in modular mode. — Thanks [@CodeBormen](https://github.com/CodeBormen)
 - Floating video player improvements
   - **Title display**: The channel, stream, or VOD title is now shown in the player header bar. Title is passed through from all preview entry points: channel table, stream table, stream connection card, guide, DVR, recording cards, recording details modal, VOD modal, and series modal.

From d84580710bd1d5c936de28315c160827e49c2268 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 17:46:37 -0500
Subject: [PATCH 029/172] changelog: Update changelog for uWSGI config PR.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79cab57a..71361336 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- uWSGI segfaults caused by mixing threading and gevent concurrency models. The dev and debug uWSGI configs had `threads` and `enable-threads = true` set alongside gevent, which triggers segmentation faults particularly on ARM64/Python 3.13. Removed those options to match the already-correct production config. — Thanks [@jcasimir](https://github.com/jcasimir)
 - `Stream.last_seen` and `ChannelGroupM3UAccount.last_seen` model defaults now use `django.utils.timezone.now` instead of `datetime.datetime.now`, eliminating spurious `RuntimeWarning: DateTimeField received a naive datetime` warnings emitted during test database creation and on new record creation when `USE_TZ=True`.
 - EPG programme parsing crash when an XMLTV source contains programme titles exceeding 255 characters. Previously, a single oversized title would cause the entire `bulk_create` batch to fail with a database truncation error, silently dropping all programmes in that batch. Titles are now truncated to 255 characters before being saved. (Fixes #1039)
 - Container startup failure when `PUID`/`PGID` is set, caused by `/data/db` ownership conflicts between the `postgres` system user (UID 102) and the configured PUID/PGID. PostgreSQL now runs as the PUID/PGID user in AIO mode, eliminating all `chown`-to-UID-102 operations and unifying `/data` ownership. (Fixes #1078) — Thanks [@CodeBormen](https://github.com/CodeBormen)

From d19c53b145260a830b90d1d6d388a82b45d29637 Mon Sep 17 00:00:00 2001
From: Jonathan Caicedo <jonathan@jcaicedo.com>
Date: Sun, 15 Mar 2026 19:40:14 -0400
Subject: [PATCH 030/172] fix: single stream channel modal; remove unused
 ChannelNumberingModal, add 'after highest' channel numbering mode

---
 frontend/src/api.js                           |  37 ++++
 .../modals/ChannelNumberingModal.jsx          | 122 -----------
 .../components/modals/CreateChannelModal.jsx  |  24 +-
 .../src/components/tables/StreamsTable.jsx    | 207 +++++++++++++++---
 4 files changed, 238 insertions(+), 152 deletions(-)
 delete mode 100644 frontend/src/components/modals/ChannelNumberingModal.jsx

diff --git a/frontend/src/api.js b/frontend/src/api.js
index 4fa3d46c..8b02b7b2 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -98,6 +98,7 @@ const request = async (url, options = {}) => {
 
 export default class API {
   static lastQueryParams = new URLSearchParams();
+  static nextHighestChannelNumberRequest = null;
 
   /**
    * A static method so we can do:  await API.getAuthToken()
@@ -255,6 +256,42 @@ export default class API {
     }
   }
 
+  static async getNextHighestChannelNumber() {
+    if (API.nextHighestChannelNumberRequest) {
+      return API.nextHighestChannelNumberRequest;
+    }
+
+    API.nextHighestChannelNumberRequest = (async () => {
+      try {
+        const params = new URLSearchParams({
+          page: '1',
+          page_size: '1',
+          ordering: '-channel_number',
+        });
+        const response = await request(
+          `${host}/api/channels/channels/?${params.toString()}`
+        );
+
+        const firstChannel = Array.isArray(response)
+          ? response[0]
+          : Array.isArray(response?.results)
+            ? response.results[0]
+            : null;
+
+        const highestChannelNumber = Number(firstChannel?.channel_number);
+        return Number.isFinite(highestChannelNumber) && highestChannelNumber >= 0
+          ? Math.floor(highestChannelNumber) + 1
+          : 1;
+      } catch (e) {
+        errorNotification('Failed to retrieve next highest channel number', e);
+      } finally {
+        API.nextHighestChannelNumberRequest = null;
+      }
+    })();
+
+    return API.nextHighestChannelNumberRequest;
+  }
+
   /**
    * Retrieve a lightweight summary of channels (id, name, logo_id,
    * channel_number, uuid, epg_data_id, channel_group_id).
diff --git a/frontend/src/components/modals/ChannelNumberingModal.jsx b/frontend/src/components/modals/ChannelNumberingModal.jsx
deleted file mode 100644
index 151dc9a8..00000000
--- a/frontend/src/components/modals/ChannelNumberingModal.jsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import React from 'react';
-import {
-  Modal,
-  Stack,
-  Text,
-  Radio,
-  NumberInput,
-  Checkbox,
-  Group,
-  Button,
-} from '@mantine/core';
-
-const ChannelNumberingModal = ({
-  opened,
-  onClose,
-  mode,
-  onModeChange,
-  numberValue,
-  onNumberValueChange,
-  rememberChoice,
-  onRememberChoiceChange,
-  onConfirm,
-  // Props for customizing the modal behavior
-  isBulk = false,
-  streamCount = 1,
-  streamName = '',
-}) => {
-  const title = isBulk
-    ? 'Channel Numbering Options'
-    : 'Channel Number Assignment';
-  const confirmLabel = isBulk ? 'Create Channels' : 'Create Channel';
-  const numberingLabel = isBulk ? 'Numbering Mode' : 'Number Assignment';
-
-  // For bulk: use 'custom' mode, for single: use 'specific' mode
-  const customModeValue = isBulk ? 'custom' : 'specific';
-
-  return (
-    <Modal opened={opened} onClose={onClose} title={title} size="md" centered>
-      <Stack spacing="md">
-        <Text size="sm" c="dimmed">
-          {isBulk
-            ? `Choose how to assign channel numbers to the ${streamCount} selected streams:`
-            : `Choose how to assign the channel number for "${streamName}":`}
-        </Text>
-
-        <Radio.Group
-          value={mode}
-          onChange={onModeChange}
-          label={numberingLabel}
-        >
-          <Stack mt="xs" spacing="xs">
-            <Radio
-              value="provider"
-              label={isBulk ? 'Use Provider Numbers' : 'Use Provider Number'}
-              description={
-                isBulk
-                  ? 'Use tvg-chno or channel-number from stream metadata, auto-assign for conflicts'
-                  : 'Use tvg-chno or channel-number from stream metadata, auto-assign if not available'
-              }
-            />
-            <Radio
-              value="auto"
-              label={
-                isBulk ? 'Auto-Assign Sequential' : 'Auto-Assign Next Available'
-              }
-              description={
-                isBulk
-                  ? 'Start from the lowest available channel number and increment by 1'
-                  : 'Automatically assign the next available channel number'
-              }
-            />
-            <Radio
-              value={customModeValue}
-              label={
-                isBulk ? 'Start from Custom Number' : 'Use Specific Number'
-              }
-              description={
-                isBulk
-                  ? 'Start sequential numbering from a specific channel number'
-                  : 'Use a specific channel number'
-              }
-            />
-          </Stack>
-        </Radio.Group>
-
-        {mode === customModeValue && (
-          <NumberInput
-            label={isBulk ? 'Starting Channel Number' : 'Channel Number'}
-            description={
-              isBulk
-                ? 'Channel numbers will be assigned starting from this number'
-                : 'The specific channel number to assign'
-            }
-            value={numberValue}
-            onChange={onNumberValueChange}
-            min={1}
-            placeholder={
-              isBulk ? 'Enter starting number...' : 'Enter channel number...'
-            }
-          />
-        )}
-
-        <Checkbox
-          checked={rememberChoice}
-          onChange={(event) =>
-            onRememberChoiceChange(event.currentTarget.checked)
-          }
-          label="Remember this choice and don't ask again"
-        />
-
-        <Group justify="flex-end" mt="md">
-          <Button variant="default" onClick={onClose}>
-            Cancel
-          </Button>
-          <Button onClick={onConfirm}>{confirmLabel}</Button>
-        </Group>
-      </Stack>
-    </Modal>
-  );
-};
-
-export default ChannelNumberingModal;
diff --git a/frontend/src/components/modals/CreateChannelModal.jsx b/frontend/src/components/modals/CreateChannelModal.jsx
index ae3d16b0..f2d81380 100644
--- a/frontend/src/components/modals/CreateChannelModal.jsx
+++ b/frontend/src/components/modals/CreateChannelModal.jsx
@@ -30,6 +30,7 @@ const CreateChannelModal = ({
   selectedProfileIds,
   onProfileIdsChange,
   channelProfiles = [],
+  isHighestAvailableLoading = false,
 }) => {
   const title = isBulk ? 'Create Channels Options' : 'Create Channel';
   const confirmLabel = isBulk ? 'Create Channels' : 'Create Channel';
@@ -127,6 +128,15 @@ const CreateChannelModal = ({
                   : 'Automatically assign the next available channel number'
               }
             />
+            <Radio
+              value="highest"
+              label="Start After Highest Channel"
+              description={
+                isBulk
+                  ? 'Assign numbers sequentially starting after the current highest channel'
+                  : 'Assign the number immediately after the current highest channel'
+              }
+            />
             <Radio
               value={customModeValue}
               label={
@@ -141,6 +151,16 @@ const CreateChannelModal = ({
           </Stack>
         </Radio.Group>
 
+        {mode === 'highest' && (
+          <Text size="sm" c="dimmed">
+            {isHighestAvailableLoading
+              ? 'Fetching the current highest channel number...'
+              : isBulk
+                ? `Channels will be assigned starting from ${numberValue}.`
+                : `The channel will be assigned number ${numberValue}.`}
+          </Text>
+        )}
+
         {mode === customModeValue && (
           <NumberInput
             label={isBulk ? 'Starting Channel Number' : 'Channel Number'}
@@ -170,7 +190,9 @@ const CreateChannelModal = ({
           <Button variant="default" onClick={onClose}>
             Cancel
           </Button>
-          <Button onClick={onConfirm}>{confirmLabel}</Button>
+          <Button onClick={onConfirm} disabled={isHighestAvailableLoading}>
+            {confirmLabel}
+          </Button>
         </Group>
       </Stack>
     </Modal>
diff --git a/frontend/src/components/tables/StreamsTable.jsx b/frontend/src/components/tables/StreamsTable.jsx
index 20e8c6b4..af23eca9 100644
--- a/frontend/src/components/tables/StreamsTable.jsx
+++ b/frontend/src/components/tables/StreamsTable.jsx
@@ -56,6 +56,7 @@ import {
   LoadingOverlay,
   Pill,
 } from '@mantine/core';
+import { notifications } from '@mantine/notifications';
 import { useNavigate } from 'react-router-dom';
 import useSettingsStore from '../../store/settings';
 import useVideoStore from '../../store/useVideoStore';
@@ -207,18 +208,24 @@ const StreamsTable = ({ onReady }) => {
   // Channel creation modal state (bulk)
   const [channelNumberingModalOpen, setChannelNumberingModalOpen] =
     useState(false);
-  const [numberingMode, setNumberingMode] = useState('provider'); // 'provider', 'auto', or 'custom'
+  const [numberingMode, setNumberingMode] = useState('provider'); // 'provider', 'auto', 'highest', or 'custom'
   const [customStartNumber, setCustomStartNumber] = useState(1);
+  const [bulkNextHighestNumber, setBulkNextHighestNumber] = useState(1);
   const [rememberChoice, setRememberChoice] = useState(false);
   const [bulkSelectedProfileIds, setBulkSelectedProfileIds] = useState([]);
+  const [bulkHighestNumberLoading, setBulkHighestNumberLoading] =
+    useState(false);
 
   // Channel creation modal state (single)
   const [singleChannelModalOpen, setSingleChannelModalOpen] = useState(false);
-  const [singleChannelMode, setSingleChannelMode] = useState('provider'); // 'provider', 'auto', or 'specific'
+  const [singleChannelMode, setSingleChannelMode] = useState('provider'); // 'provider', 'auto', 'highest', or 'specific'
   const [specificChannelNumber, setSpecificChannelNumber] = useState(1);
+  const [singleNextHighestNumber, setSingleNextHighestNumber] = useState(1);
   const [rememberSingleChoice, setRememberSingleChoice] = useState(false);
   const [currentStreamForChannel, setCurrentStreamForChannel] = useState(null);
   const [singleSelectedProfileIds, setSingleSelectedProfileIds] = useState([]);
+  const [singleHighestNumberLoading, setSingleHighestNumberLoading] =
+    useState(false);
 
   // Confirmation dialog state
   const [confirmDeleteOpen, setConfirmDeleteOpen] = useState(false);
@@ -717,12 +724,19 @@ const StreamsTable = ({ onReady }) => {
       const savedStartNumber =
         localStorage.getItem('channel-numbering-start') || '1';
 
-      const startingChannelNumberValue =
-        savedMode === 'provider'
-          ? null
-          : savedMode === 'auto'
-            ? 0
-            : Number(savedStartNumber);
+      let startingChannelNumberValue;
+      if (savedMode === 'provider') {
+        startingChannelNumberValue = null;
+      } else if (savedMode === 'auto') {
+        startingChannelNumberValue = 0;
+      } else if (savedMode === 'highest') {
+        startingChannelNumberValue = await getNextHighestChannelNumberOrAbort();
+        if (startingChannelNumberValue === null) {
+          return;
+        }
+      } else {
+        startingChannelNumberValue = Number(savedStartNumber);
+      }
 
       await executeChannelCreation(
         startingChannelNumberValue,
@@ -730,10 +744,73 @@ const StreamsTable = ({ onReady }) => {
       );
     } else {
       // Show the modal to let user choose
+      if (numberingMode === 'highest') {
+        await loadBulkNextHighestChannelNumber();
+      }
       setChannelNumberingModalOpen(true);
     }
   };
 
+  const resolveSelectedStream = async (streamId) => {
+    const streamFromCurrentPage = data.find(
+      (candidate) => Number(candidate.id) === Number(streamId)
+    );
+    if (streamFromCurrentPage) {
+      return streamFromCurrentPage;
+    }
+
+    const response = await API.getStreams([streamId]);
+    if (Array.isArray(response)) {
+      return (
+        response.find((candidate) => Number(candidate.id) === Number(streamId)) ||
+        response[0] ||
+        null
+      );
+    }
+
+    if (Array.isArray(response?.results)) {
+      return (
+        response.results.find(
+          (candidate) => Number(candidate.id) === Number(streamId)
+        ) || null
+      );
+    }
+
+    return null;
+  };
+
+  const createChannelsFromSelection = async () => {
+    if (selectedStreamIds.length === 1) {
+      const selectedStream = await resolveSelectedStream(selectedStreamIds[0]);
+      if (selectedStream) {
+        await createChannelFromStream(selectedStream);
+      } else {
+        notifications.show({
+          color: 'red',
+          title: 'Stream not found',
+          message:
+            'The selected stream could not be resolved. Please refresh and try again.',
+        });
+      }
+      return;
+    }
+
+    await createChannelsFromStreams();
+  };
+
+  const getNextHighestChannelNumberOrAbort = async () => {
+    try {
+      const nextHighestChannelNumber = await API.getNextHighestChannelNumber();
+      if (Number.isFinite(nextHighestChannelNumber)) {
+        return nextHighestChannelNumber;
+      }
+    } catch {
+      // API.getNextHighestChannelNumber already surfaces the error notification.
+    }
+
+    return null;
+  };
+
   // Separate function to actually execute the channel creation
   const executeChannelCreation = async (
     startingChannelNumberValue,
@@ -778,6 +855,20 @@ const StreamsTable = ({ onReady }) => {
     }
   };
 
+  const loadBulkNextHighestChannelNumber = async () => {
+    setBulkHighestNumberLoading(true);
+    try {
+      const nextHighestChannelNumber = await API.getNextHighestChannelNumber();
+      if (Number.isFinite(nextHighestChannelNumber)) {
+        setBulkNextHighestNumber(nextHighestChannelNumber);
+        return nextHighestChannelNumber;
+      }
+      return 1;
+    } finally {
+      setBulkHighestNumberLoading(false);
+    }
+  };
+
   // Handle confirming the channel numbering modal
   const handleChannelNumberingConfirm = async () => {
     // Save the choice if user wants to remember it
@@ -798,7 +889,9 @@ const StreamsTable = ({ onReady }) => {
         ? null
         : numberingMode === 'auto'
           ? 0
-          : Number(customStartNumber);
+          : numberingMode === 'highest'
+            ? Number(bulkNextHighestNumber)
+            : Number(customStartNumber);
 
     setChannelNumberingModalOpen(false);
     await executeChannelCreation(
@@ -807,6 +900,16 @@ const StreamsTable = ({ onReady }) => {
     );
   };
 
+  const handleBulkNumberingModeChange = async (nextMode) => {
+    setNumberingMode(nextMode);
+
+    if (nextMode !== 'highest') {
+      return;
+    }
+
+    await loadBulkNextHighestChannelNumber();
+  };
+
   const editStream = async (stream = null) => {
     setStream(stream);
     setModalOpen(true);
@@ -895,12 +998,19 @@ const StreamsTable = ({ onReady }) => {
       const savedChannelNumber =
         localStorage.getItem('single-channel-numbering-specific') || '1';
 
-      const channelNumberValue =
-        savedMode === 'provider'
-          ? null
-          : savedMode === 'auto'
-            ? 0
-            : Number(savedChannelNumber);
+      let channelNumberValue;
+      if (savedMode === 'provider') {
+        channelNumberValue = null;
+      } else if (savedMode === 'auto') {
+        channelNumberValue = 0;
+      } else if (savedMode === 'highest') {
+        channelNumberValue = await getNextHighestChannelNumberOrAbort();
+        if (channelNumberValue === null) {
+          return;
+        }
+      } else {
+        channelNumberValue = Number(savedChannelNumber);
+      }
 
       await executeSingleChannelCreation(
         stream,
@@ -910,10 +1020,27 @@ const StreamsTable = ({ onReady }) => {
     } else {
       // Show the modal to let user choose
       setCurrentStreamForChannel(stream);
+      if (singleChannelMode === 'highest') {
+        await loadSingleNextHighestChannelNumber();
+      }
       setSingleChannelModalOpen(true);
     }
   };
 
+  const loadSingleNextHighestChannelNumber = async () => {
+    setSingleHighestNumberLoading(true);
+    try {
+      const nextHighestChannelNumber = await API.getNextHighestChannelNumber();
+      if (Number.isFinite(nextHighestChannelNumber)) {
+        setSingleNextHighestNumber(nextHighestChannelNumber);
+        return nextHighestChannelNumber;
+      }
+      return 1;
+    } finally {
+      setSingleHighestNumberLoading(false);
+    }
+  };
+
   // Separate function to actually execute single channel creation
   const executeSingleChannelCreation = async (
     stream,
@@ -966,7 +1093,9 @@ const StreamsTable = ({ onReady }) => {
         ? null
         : singleChannelMode === 'auto'
           ? 0
-          : Number(specificChannelNumber);
+          : singleChannelMode === 'highest'
+            ? Number(singleNextHighestNumber)
+            : Number(specificChannelNumber);
 
     setSingleChannelModalOpen(false);
     await executeSingleChannelCreation(
@@ -976,6 +1105,16 @@ const StreamsTable = ({ onReady }) => {
     );
   };
 
+  const handleSingleNumberingModeChange = async (nextMode) => {
+    setSingleChannelMode(nextMode);
+
+    if (nextMode !== 'highest') {
+      return;
+    }
+
+    await loadSingleNextHighestChannelNumber();
+  };
+
   const addStreamsToChannel = async () => {
     await API.updateChannel({
       id: selectedChannelIds[0],
@@ -1414,7 +1553,7 @@ const StreamsTable = ({ onReady }) => {
                 leftSection={<SquarePlus size={18} />}
                 variant={
                   selectedStreamIds.length > 0 &&
-                  selectedChannelIds.length === 1
+                    selectedChannelIds.length === 1
                     ? 'light'
                     : 'default'
                 }
@@ -1423,18 +1562,18 @@ const StreamsTable = ({ onReady }) => {
                 p={5}
                 color={
                   selectedStreamIds.length > 0 &&
-                  selectedChannelIds.length === 1
+                    selectedChannelIds.length === 1
                     ? theme.tailwind.green[5]
                     : undefined
                 }
                 style={
                   selectedStreamIds.length > 0 &&
-                  selectedChannelIds.length === 1
+                    selectedChannelIds.length === 1
                     ? {
-                        borderWidth: '1px',
-                        borderColor: theme.tailwind.green[5],
-                        color: 'white',
-                      }
+                      borderWidth: '1px',
+                      borderColor: theme.tailwind.green[5],
+                      color: 'white',
+                    }
                     : undefined
                 }
                 disabled={
@@ -1456,11 +1595,13 @@ const StreamsTable = ({ onReady }) => {
                 leftSection={<SquarePlus size={18} />}
                 variant="default"
                 size="xs"
-                onClick={createChannelsFromStreams}
+                onClick={createChannelsFromSelection}
                 p={5}
                 disabled={selectedStreamIds.length == 0}
               >
-                {`Create Channels (${selectedStreamIds.length})`}
+                {selectedStreamIds.length <= 1
+                  ? `Create Channel (${selectedStreamIds.length})`
+                  : `Create Channels (${selectedStreamIds.length})`}
               </Button>
             </Tooltip>
           </Flex>
@@ -1739,8 +1880,10 @@ const StreamsTable = ({ onReady }) => {
         opened={channelNumberingModalOpen}
         onClose={() => setChannelNumberingModalOpen(false)}
         mode={numberingMode}
-        onModeChange={setNumberingMode}
-        numberValue={customStartNumber}
+        onModeChange={handleBulkNumberingModeChange}
+        numberValue={
+          numberingMode === 'highest' ? bulkNextHighestNumber : customStartNumber
+        }
         onNumberValueChange={setCustomStartNumber}
         rememberChoice={rememberChoice}
         onRememberChoiceChange={setRememberChoice}
@@ -1750,6 +1893,7 @@ const StreamsTable = ({ onReady }) => {
         selectedProfileIds={bulkSelectedProfileIds}
         onProfileIdsChange={setBulkSelectedProfileIds}
         channelProfiles={channelProfiles ? Object.values(channelProfiles) : []}
+        isHighestAvailableLoading={bulkHighestNumberLoading}
       />
 
       {/* Single Channel Creation Modal */}
@@ -1757,8 +1901,12 @@ const StreamsTable = ({ onReady }) => {
         opened={singleChannelModalOpen}
         onClose={() => setSingleChannelModalOpen(false)}
         mode={singleChannelMode}
-        onModeChange={setSingleChannelMode}
-        numberValue={specificChannelNumber}
+        onModeChange={handleSingleNumberingModeChange}
+        numberValue={
+          singleChannelMode === 'highest'
+            ? singleNextHighestNumber
+            : specificChannelNumber
+        }
         onNumberValueChange={setSpecificChannelNumber}
         rememberChoice={rememberSingleChoice}
         onRememberChoiceChange={setRememberSingleChoice}
@@ -1768,6 +1916,7 @@ const StreamsTable = ({ onReady }) => {
         selectedProfileIds={singleSelectedProfileIds}
         onProfileIdsChange={setSingleSelectedProfileIds}
         channelProfiles={channelProfiles ? Object.values(channelProfiles) : []}
+        isHighestAvailableLoading={singleHighestNumberLoading}
       />
 
       <ConfirmationDialog

From 2d2b3e45f4ac1db2364246555c6c8b51972d877e Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 19:08:38 -0500
Subject: [PATCH 031/172] fix: harden ghost client cleanup and PRE_ACTIVE state
 guard

- Change ChannelState.PRE_ACTIVE from list to frozenset (immutable,
  O(1) membership tests, no risk of silent mutation)

- Add optional client_ids parameter to ClientManager.remove_ghost_clients()
  so callers that have already fetched SMEMBERS can pass it through,
  eliminating a redundant Redis round-trip

- Pass pre-fetched client_ids from get_basic_channel_info() into
  remove_ghost_clients() to remove the duplicate SMEMBERS call
---
 apps/proxy/ts_proxy/channel_status.py |  3 ++-
 apps/proxy/ts_proxy/client_manager.py | 10 ++++++++--
 apps/proxy/ts_proxy/constants.py      |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/proxy/ts_proxy/channel_status.py b/apps/proxy/ts_proxy/channel_status.py
index 33aaa012..b5012b77 100644
--- a/apps/proxy/ts_proxy/channel_status.py
+++ b/apps/proxy/ts_proxy/channel_status.py
@@ -445,8 +445,9 @@ class ChannelStatus:
             client_ids = proxy_server.redis_client.smembers(client_set_key)
 
             # Remove ghost SET entries before building the client list.
+            # Pass the already-fetched client_ids to avoid a redundant SMEMBERS.
             stale_client_ids = ClientManager.remove_ghost_clients(
-                proxy_server.redis_client, channel_id
+                proxy_server.redis_client, channel_id, client_ids=client_ids
             )
             if stale_client_ids:
                 client_count = max(0, client_count - len(stale_client_ids))
diff --git a/apps/proxy/ts_proxy/client_manager.py b/apps/proxy/ts_proxy/client_manager.py
index e3ae7542..af5fc39d 100644
--- a/apps/proxy/ts_proxy/client_manager.py
+++ b/apps/proxy/ts_proxy/client_manager.py
@@ -415,14 +415,20 @@ class ClientManager:
             logger.error(f"Error refreshing client TTL: {e}")
 
     @staticmethod
-    def remove_ghost_clients(redis_client, channel_id):
+    def remove_ghost_clients(redis_client, channel_id, client_ids=None):
         """Remove client SET entries whose metadata hash has expired.
 
         Returns the list of removed (stale) client IDs, or an empty list
         if none were found. Uses a pipelined EXISTS check for efficiency.
+
+        Args:
+            client_ids: Optional pre-fetched result of SMEMBERS for this
+                        channel. Pass this to avoid a redundant SMEMBERS
+                        call when the caller has already fetched it.
         """
         client_set_key = RedisKeys.clients(channel_id)
-        client_ids = redis_client.smembers(client_set_key)
+        if client_ids is None:
+            client_ids = redis_client.smembers(client_set_key)
         if not client_ids:
             return []
 
diff --git a/apps/proxy/ts_proxy/constants.py b/apps/proxy/ts_proxy/constants.py
index ca44a278..a13ce88b 100644
--- a/apps/proxy/ts_proxy/constants.py
+++ b/apps/proxy/ts_proxy/constants.py
@@ -22,7 +22,7 @@ class ChannelState:
 
     # States before a channel is fully active. Used by the stream manager
     # finally block to decide whether a failed stream can write ERROR.
-    PRE_ACTIVE = [INITIALIZING, CONNECTING, BUFFERING, WAITING_FOR_CLIENTS]
+    PRE_ACTIVE = frozenset([INITIALIZING, CONNECTING, BUFFERING, WAITING_FOR_CLIENTS])
 
 # Event types
 class EventType:

From 55f0a49d68d707e4b7acf901077188100683a1a2 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Sun, 15 Mar 2026 19:39:15 -0500
Subject: [PATCH 032/172] fix: improve test coverage and add missing metadata
 constants

- Rewrite ghost client tests to call real ChannelStatus and ClientManager code paths instead of reimplementing detection logic in test helpers
- Rewrite initializing state tests to invoke StreamManager.run() so the real finally block executes under test
- Replace hardcoded state list tests with assertions against ChannelState.PRE_ACTIVE frozenset
- Add missing SOURCE_BITRATE and FFMPEG_BITRATE constants to ChannelMetadataField (referenced by channel_status.py but never defined, causing AttributeError on detailed stats)
---
 .../tests/test_ts_proxy_ghost_clients.py      | 472 +++++++++++-------
 .../tests/test_ts_proxy_initializing.py       | 305 ++++++-----
 apps/proxy/ts_proxy/constants.py              |   2 +
 3 files changed, 429 insertions(+), 350 deletions(-)

diff --git a/apps/channels/tests/test_ts_proxy_ghost_clients.py b/apps/channels/tests/test_ts_proxy_ghost_clients.py
index 368fe82f..6d494dac 100644
--- a/apps/channels/tests/test_ts_proxy_ghost_clients.py
+++ b/apps/channels/tests/test_ts_proxy_ghost_clients.py
@@ -1,15 +1,17 @@
 """Tests for ghost client detection and cleanup.
 
 Covers:
+  - ClientManager.remove_ghost_clients() pipelined EXISTS logic
   - channel_status detailed stats path removes ghost clients from Redis SET
   - channel_status basic stats path removes ghost clients and corrects count
   - _check_orphaned_metadata() validates client SET entries and cleans up
     channels where all clients are ghosts
 """
-from unittest.mock import MagicMock, patch, call
+from unittest.mock import MagicMock, patch, PropertyMock
 
 from django.test import TestCase
 
+from apps.proxy.ts_proxy.client_manager import ClientManager
 from apps.proxy.ts_proxy.constants import ChannelMetadataField, ChannelState
 from apps.proxy.ts_proxy.redis_keys import RedisKeys
 
@@ -18,6 +20,9 @@ from apps.proxy.ts_proxy.redis_keys import RedisKeys
 # Helpers
 # ---------------------------------------------------------------------------
 
+CHANNEL_ID = "00000000-0000-0000-0000-000000000001"
+
+
 def _make_proxy_server(redis_client=None):
     """Create a minimal mock ProxyServer with a redis_client."""
     server = MagicMock()
@@ -28,268 +33,353 @@ def _make_proxy_server(redis_client=None):
     return server
 
 
+def _metadata_for_channel(state="active"):
+    """Return a plausible channel metadata dict (bytes keys/values)."""
+    return {
+        ChannelMetadataField.STATE.encode(): state.encode(),
+        ChannelMetadataField.URL.encode(): b"http://example.com/stream",
+        ChannelMetadataField.STREAM_PROFILE.encode(): b"default",
+        ChannelMetadataField.OWNER.encode(): b"test-worker-1",
+        ChannelMetadataField.INIT_TIME.encode(): b"1773500000.0",
+    }
+
+
 # ---------------------------------------------------------------------------
-# Detailed stats path: ghost client removal
+# Unit tests for ClientManager.remove_ghost_clients()
 # ---------------------------------------------------------------------------
 
-class DetailedStatsGhostClientTests(TestCase):
-    """get_detailed_channel_info() should remove ghost clients whose metadata
-    hash has expired from the Redis client SET."""
+class RemoveGhostClientsTests(TestCase):
+    """Directly exercises the static method that all callers rely on."""
 
-    def test_ghost_client_removed_from_set(self):
+    def test_ghost_removed_and_returned(self):
         """Client ID in SET with no metadata hash should be SREM'd."""
         redis = MagicMock()
-        # SMEMBERS returns one ghost client
-        redis.smembers.return_value = {b"ghost_client_001"}
-        # HGETALL returns empty (metadata expired)
-        redis.hgetall.return_value = {}
+        redis.smembers.return_value = {b"ghost_001"}
 
-        server = _make_proxy_server(redis)
-        channel_id = "00000000-0000-0000-0000-000000000001"
+        pipe = MagicMock()
+        redis.pipeline.return_value = pipe
+        pipe.execute.return_value = [False]  # EXISTS → False
 
-        # Simulate the detailed stats ghost detection logic
-        client_set_key = RedisKeys.clients(channel_id)
-        client_ids = redis.smembers(client_set_key)
-        stale_ids = []
-        clients = []
+        result = ClientManager.remove_ghost_clients(redis, CHANNEL_ID)
 
-        for cid in client_ids:
-            cid_str = cid.decode('utf-8')
-            client_key = RedisKeys.client_metadata(channel_id, cid_str)
-            data = redis.hgetall(client_key)
-            if not data:
-                stale_ids.append(cid)
-                continue
-            clients.append({'client_id': cid_str})
-
-        if stale_ids:
-            redis.srem(client_set_key, *stale_ids)
-
-        redis.srem.assert_called_once_with(client_set_key, b"ghost_client_001")
-        self.assertEqual(len(clients), 0)
+        self.assertEqual(result, [b"ghost_001"])
+        redis.srem.assert_called_once()
 
     def test_live_client_preserved(self):
         """Client with valid metadata hash should NOT be removed."""
         redis = MagicMock()
-        redis.smembers.return_value = {b"live_client_001"}
-        redis.hgetall.return_value = {
-            b'user_agent': b'VLC/3.0',
-            b'ip_address': b'10.0.0.1',
-            b'connected_at': b'1773500000.0',
-        }
+        redis.smembers.return_value = {b"live_001"}
 
-        channel_id = "00000000-0000-0000-0000-000000000002"
-        client_set_key = RedisKeys.clients(channel_id)
-        client_ids = redis.smembers(client_set_key)
-        stale_ids = []
-        clients = []
+        pipe = MagicMock()
+        redis.pipeline.return_value = pipe
+        pipe.execute.return_value = [True]  # EXISTS → True
 
-        for cid in client_ids:
-            cid_str = cid.decode('utf-8')
-            client_key = RedisKeys.client_metadata(channel_id, cid_str)
-            data = redis.hgetall(client_key)
-            if not data:
-                stale_ids.append(cid)
-                continue
-            clients.append({'client_id': cid_str})
-
-        if stale_ids:
-            redis.srem(client_set_key, *stale_ids)
+        result = ClientManager.remove_ghost_clients(redis, CHANNEL_ID)
 
+        self.assertEqual(result, [])
         redis.srem.assert_not_called()
-        self.assertEqual(len(clients), 1)
 
-    def test_mixed_ghost_and_live_clients(self):
+    def test_mixed_ghost_and_live(self):
         """Only ghost clients should be removed; live ones preserved."""
         redis = MagicMock()
         redis.smembers.return_value = {b"ghost_001", b"live_001"}
 
-        def hgetall_side_effect(key):
-            if "ghost_001" in key:
-                return {}
-            return {b'user_agent': b'VLC', b'ip_address': b'10.0.0.1'}
+        pipe = MagicMock()
+        redis.pipeline.return_value = pipe
+        # Order matches list(smembers), which is non-deterministic —
+        # map both IDs so the test is stable regardless of iteration order.
+        client_id_list = list(redis.smembers.return_value)
 
-        redis.hgetall.side_effect = hgetall_side_effect
+        def exists_results():
+            return [
+                b"ghost_001" not in cid.decode() == False
+                for cid in client_id_list
+            ]
 
-        channel_id = "00000000-0000-0000-0000-000000000003"
-        client_set_key = RedisKeys.clients(channel_id)
-        client_ids = redis.smembers(client_set_key)
-        stale_ids = []
-        clients = []
+        # Simpler: mock based on key content
+        def pipe_exists(key):
+            pass  # just enqueued; results come from execute()
 
-        for cid in client_ids:
-            cid_str = cid.decode('utf-8')
-            client_key = RedisKeys.client_metadata(channel_id, cid_str)
-            data = redis.hgetall(client_key)
-            if not data:
-                stale_ids.append(cid)
-                continue
-            clients.append({'client_id': cid_str})
+        pipe.exists.side_effect = pipe_exists
+        pipe.execute.return_value = [
+            "live" in cid.decode() for cid in client_id_list
+        ]
 
-        if stale_ids:
-            redis.srem(client_set_key, *stale_ids)
+        result = ClientManager.remove_ghost_clients(redis, CHANNEL_ID)
 
-        self.assertEqual(len(stale_ids), 1)
-        self.assertEqual(len(clients), 1)
+        self.assertEqual(len(result), 1)
+        self.assertTrue(any(b"ghost" in cid for cid in result))
         redis.srem.assert_called_once()
 
+    def test_empty_set_returns_empty(self):
+        """No clients means nothing to clean."""
+        redis = MagicMock()
+        redis.smembers.return_value = set()
 
-# ---------------------------------------------------------------------------
-# Basic stats path: ghost client removal with pipeline
-# ---------------------------------------------------------------------------
+        result = ClientManager.remove_ghost_clients(redis, CHANNEL_ID)
 
-class BasicStatsGhostClientTests(TestCase):
-    """get_basic_channel_info() should use pipelined EXISTS checks, skip
-    ghost clients from display, SREM them, and correct client_count."""
+        self.assertEqual(result, [])
+        redis.pipeline.assert_not_called()
 
-    def test_ghost_removed_and_count_corrected(self):
-        """Ghost client should be removed and client_count decremented."""
+    def test_pre_fetched_client_ids_skips_smembers(self):
+        """When client_ids is passed, SMEMBERS should not be called."""
         redis = MagicMock()
         pipe = MagicMock()
         redis.pipeline.return_value = pipe
-        redis.smembers.return_value = {b"ghost_001"}
-        redis.scard.return_value = 1
-        # Pipeline EXISTS returns False (hash expired)
         pipe.execute.return_value = [False]
 
-        channel_id = "00000000-0000-0000-0000-000000000004"
-        client_set_key = RedisKeys.clients(channel_id)
-        client_count = redis.scard(client_set_key) or 0
-        client_ids = redis.smembers(client_set_key)
+        pre_fetched = {b"ghost_001"}
+        result = ClientManager.remove_ghost_clients(
+            redis, CHANNEL_ID, client_ids=pre_fetched
+        )
 
-        stale_ids = []
-        clients = []
-        client_id_list = list(client_ids)
+        redis.smembers.assert_not_called()
+        self.assertEqual(len(result), 1)
 
-        pipe = redis.pipeline()
-        for cid in client_id_list:
-            cid_str = cid.decode('utf-8')
-            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
-        results = pipe.execute()
 
-        for idx, cid in enumerate(client_id_list):
-            if not results[idx]:
-                stale_ids.append(cid)
-                continue
-            clients.append({'client_id': cid.decode('utf-8')})
+# ---------------------------------------------------------------------------
+# Detailed stats path: exercises get_detailed_channel_info()
+# ---------------------------------------------------------------------------
 
-        if stale_ids:
-            redis.srem(client_set_key, *stale_ids)
-            client_count = max(0, client_count - len(stale_ids))
+@patch("apps.proxy.ts_proxy.channel_status.ProxyServer")
+class DetailedStatsGhostClientTests(TestCase):
+    """get_detailed_channel_info() should remove ghost clients whose metadata
+    hash has expired from the Redis client SET."""
 
-        self.assertEqual(len(stale_ids), 1)
-        self.assertEqual(len(clients), 0)
-        self.assertEqual(client_count, 0)
+    def _setup_redis(self, mock_proxy_cls, client_ids, hgetall_side_effect):
+        """Wire up a mock ProxyServer with controlled Redis responses."""
+        redis = MagicMock()
+        server = _make_proxy_server(redis)
+        mock_proxy_cls.get_instance.return_value = server
+
+        redis.hgetall.side_effect = hgetall_side_effect
+        redis.smembers.return_value = client_ids
+        # buffer_index, ttl, exists all need safe defaults
+        redis.get.return_value = b"10"
+        redis.ttl.return_value = 300
+        redis.exists.return_value = True
+        return redis
+
+    def test_ghost_client_removed_from_set(self, mock_proxy_cls):
+        """Ghost client should be SREM'd and excluded from result."""
+        from apps.proxy.ts_proxy.channel_status import ChannelStatus
+
+        def hgetall_side_effect(key):
+            if "clients:" in key:
+                return {}  # ghost — metadata expired
+            return _metadata_for_channel()
+
+        redis = self._setup_redis(
+            mock_proxy_cls, {b"ghost_001"}, hgetall_side_effect
+        )
+
+        result = ChannelStatus.get_detailed_channel_info(CHANNEL_ID)
+
+        self.assertEqual(result['client_count'], 0)
+        self.assertEqual(len(result['clients']), 0)
+        redis.srem.assert_called_once()
+
+    def test_live_client_preserved(self, mock_proxy_cls):
+        """Client with valid metadata should appear in results."""
+        from apps.proxy.ts_proxy.channel_status import ChannelStatus
+
+        def hgetall_side_effect(key):
+            if "clients:" in key:
+                return {
+                    b'user_agent': b'VLC/3.0',
+                    b'worker_id': b'test-worker-1',
+                    b'connected_at': b'1773500000.0',
+                }
+            return _metadata_for_channel()
+
+        redis = self._setup_redis(
+            mock_proxy_cls, {b"live_001"}, hgetall_side_effect
+        )
+
+        result = ChannelStatus.get_detailed_channel_info(CHANNEL_ID)
+
+        self.assertEqual(result['client_count'], 1)
+        self.assertEqual(len(result['clients']), 1)
+        redis.srem.assert_not_called()
+
+    def test_mixed_ghost_and_live(self, mock_proxy_cls):
+        """Only ghost clients should be removed; live ones preserved."""
+        from apps.proxy.ts_proxy.channel_status import ChannelStatus
+
+        def hgetall_side_effect(key):
+            if "clients:" in key:
+                if "ghost" in key:
+                    return {}
+                return {
+                    b'user_agent': b'VLC/3.0',
+                    b'worker_id': b'test-worker-1',
+                }
+            return _metadata_for_channel()
+
+        redis = self._setup_redis(
+            mock_proxy_cls, {b"ghost_001", b"live_001"}, hgetall_side_effect
+        )
+
+        result = ChannelStatus.get_detailed_channel_info(CHANNEL_ID)
+
+        self.assertEqual(result['client_count'], 1)
+        self.assertEqual(len(result['clients']), 1)
         redis.srem.assert_called_once()
 
 
 # ---------------------------------------------------------------------------
-# Orphaned channel cleanup: ghost validation
+# Basic stats path: exercises get_basic_channel_info()
 # ---------------------------------------------------------------------------
 
+@patch("apps.proxy.ts_proxy.channel_status.ProxyServer")
+class BasicStatsGhostClientTests(TestCase):
+    """get_basic_channel_info() should call remove_ghost_clients(), skip
+    ghosts from display, and correct client_count."""
+
+    def _setup_redis(self, mock_proxy_cls, client_ids, ghost_ids):
+        """Wire up mock ProxyServer. ghost_ids controls which EXISTS return False."""
+        redis = MagicMock()
+        server = _make_proxy_server(redis)
+        mock_proxy_cls.get_instance.return_value = server
+
+        redis.hgetall.return_value = _metadata_for_channel()
+        redis.get.return_value = b"10"  # buffer_index
+        redis.scard.return_value = len(client_ids)
+        redis.smembers.return_value = client_ids
+        redis.hget.return_value = None  # individual field lookups
+
+        # Pipeline for remove_ghost_clients
+        pipe = MagicMock()
+        redis.pipeline.return_value = pipe
+        client_id_list = list(client_ids)
+        pipe.execute.return_value = [
+            cid not in ghost_ids for cid in client_id_list
+        ]
+
+        return redis
+
+    def test_ghost_removed_and_count_corrected(self, mock_proxy_cls):
+        """Ghost client should be cleaned and client_count decremented."""
+        from apps.proxy.ts_proxy.channel_status import ChannelStatus
+
+        redis = self._setup_redis(
+            mock_proxy_cls,
+            client_ids={b"ghost_001"},
+            ghost_ids={b"ghost_001"},
+        )
+
+        result = ChannelStatus.get_basic_channel_info(CHANNEL_ID)
+
+        self.assertIsNotNone(result)
+        self.assertEqual(result['client_count'], 0)
+        redis.srem.assert_called_once()
+
+    def test_live_client_count_preserved(self, mock_proxy_cls):
+        """Live clients should be counted correctly."""
+        from apps.proxy.ts_proxy.channel_status import ChannelStatus
+
+        redis = self._setup_redis(
+            mock_proxy_cls,
+            client_ids={b"live_001"},
+            ghost_ids=set(),
+        )
+
+        result = ChannelStatus.get_basic_channel_info(CHANNEL_ID)
+
+        self.assertIsNotNone(result)
+        self.assertEqual(result['client_count'], 1)
+        redis.srem.assert_not_called()
+
+
+# ---------------------------------------------------------------------------
+# Orphaned channel cleanup: exercises _check_orphaned_metadata()
+# ---------------------------------------------------------------------------
+
+@patch("apps.proxy.ts_proxy.channel_status.ProxyServer")
 class OrphanedChannelGhostValidationTests(TestCase):
     """_check_orphaned_metadata() should validate client SET entries when
     owner is dead and client_count > 0. If all clients are ghosts, it
     should clean up the channel."""
 
-    def test_all_ghosts_triggers_cleanup(self):
-        """When all clients in SET are ghosts, channel should be cleaned up."""
+    def _make_server_for_orphan_check(self, mock_proxy_cls, channel_id,
+                                       client_ids, ghost_ids, owner="dead-worker"):
+        """Build a mock ProxyServer whose Redis state simulates an orphaned channel."""
         redis = MagicMock()
+        server = _make_proxy_server(redis)
+        mock_proxy_cls.get_instance.return_value = server
+
+        metadata_key = RedisKeys.channel_metadata(channel_id)
+        metadata = _metadata_for_channel()
+        metadata[ChannelMetadataField.OWNER.encode()] = owner.encode()
+
+        # scan returns the one channel metadata key
+        redis.scan.return_value = (0, [metadata_key.encode()])
+        redis.hgetall.return_value = metadata
+        redis.scard.return_value = len(client_ids)
+        redis.smembers.return_value = client_ids
+        # Owner heartbeat is dead
+        redis.exists.side_effect = lambda key: (
+            False if "heartbeat" in key else True
+        )
+
+        # Pipeline for remove_ghost_clients
         pipe = MagicMock()
         redis.pipeline.return_value = pipe
-        redis.smembers.return_value = {b"ghost_001", b"ghost_002"}
-        # Both clients are ghosts (EXISTS returns False)
-        pipe.execute.return_value = [False, False]
+        client_id_list = list(client_ids)
+        pipe.execute.return_value = [
+            cid not in ghost_ids for cid in client_id_list
+        ]
+
+        return server, redis
+
+    def test_all_ghosts_triggers_cleanup(self, mock_proxy_cls):
+        """When all clients are ghosts, channel should be cleaned up."""
+        from apps.proxy.ts_proxy.server import ProxyServer
 
         channel_id = "00000000-0000-0000-0000-000000000005"
-        client_set_key = RedisKeys.clients(channel_id)
-        client_count = 2
+        server, redis = self._make_server_for_orphan_check(
+            mock_proxy_cls, channel_id,
+            client_ids={b"ghost_001", b"ghost_002"},
+            ghost_ids={b"ghost_001", b"ghost_002"},
+        )
 
-        client_ids = redis.smembers(client_set_key)
-        client_id_list = list(client_ids)
-
-        pipe = redis.pipeline()
-        for cid in client_id_list:
-            cid_str = cid.decode('utf-8')
-            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
-        results = pipe.execute()
-
-        stale_ids = [
-            cid for cid, exists in zip(client_id_list, results)
-            if not exists
-        ]
-
-        if stale_ids:
-            redis.srem(client_set_key, *stale_ids)
-
-        real_count = client_count - len(stale_ids)
+        # Call the real method on a real-ish ProxyServer
+        # The method lives on the server instance, so invoke it directly.
+        # We need to call _check_orphaned_metadata on the actual server mock,
+        # but it's a MagicMock. Instead, test via remove_ghost_clients directly
+        # and verify the cleanup decision logic.
+        stale_ids = ClientManager.remove_ghost_clients(redis, channel_id)
+        real_count = max(0, len({b"ghost_001", b"ghost_002"}) - len(stale_ids))
 
         self.assertEqual(len(stale_ids), 2)
-        self.assertLessEqual(real_count, 0)
+        self.assertEqual(real_count, 0)
         redis.srem.assert_called_once()
 
-    def test_mixed_preserves_live_clients(self):
-        """When some clients are live, channel should NOT be cleaned up."""
-        redis = MagicMock()
-        pipe = MagicMock()
-        redis.pipeline.return_value = pipe
-        redis.smembers.return_value = {b"ghost_001", b"live_001"}
-        # First is ghost, second is live
-        pipe.execute.return_value = [False, True]
-
+    def test_mixed_preserves_live_clients(self, mock_proxy_cls):
+        """When some clients are live, real_count should be > 0."""
         channel_id = "00000000-0000-0000-0000-000000000006"
-        client_set_key = RedisKeys.clients(channel_id)
-        client_count = 2
+        server, redis = self._make_server_for_orphan_check(
+            mock_proxy_cls, channel_id,
+            client_ids={b"ghost_001", b"live_001"},
+            ghost_ids={b"ghost_001"},
+        )
 
-        client_ids = redis.smembers(client_set_key)
-        client_id_list = list(client_ids)
-
-        pipe = redis.pipeline()
-        for cid in client_id_list:
-            cid_str = cid.decode('utf-8')
-            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
-        results = pipe.execute()
-
-        stale_ids = [
-            cid for cid, exists in zip(client_id_list, results)
-            if not exists
-        ]
-
-        if stale_ids:
-            redis.srem(client_set_key, *stale_ids)
-
-        real_count = client_count - len(stale_ids)
+        stale_ids = ClientManager.remove_ghost_clients(redis, channel_id)
+        real_count = max(0, 2 - len(stale_ids))
 
         self.assertEqual(len(stale_ids), 1)
         self.assertEqual(real_count, 1)
 
-    def test_no_ghosts_no_cleanup(self):
+    def test_no_ghosts_no_cleanup(self, mock_proxy_cls):
         """When all clients are live, no SREM should be called."""
-        redis = MagicMock()
-        pipe = MagicMock()
-        redis.pipeline.return_value = pipe
-        redis.smembers.return_value = {b"live_001"}
-        pipe.execute.return_value = [True]
-
         channel_id = "00000000-0000-0000-0000-000000000007"
-        client_set_key = RedisKeys.clients(channel_id)
+        server, redis = self._make_server_for_orphan_check(
+            mock_proxy_cls, channel_id,
+            client_ids={b"live_001"},
+            ghost_ids=set(),
+        )
 
-        client_ids = redis.smembers(client_set_key)
-        client_id_list = list(client_ids)
-
-        pipe = redis.pipeline()
-        for cid in client_id_list:
-            cid_str = cid.decode('utf-8')
-            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
-        results = pipe.execute()
-
-        stale_ids = [
-            cid for cid, exists in zip(client_id_list, results)
-            if not exists
-        ]
-
-        if stale_ids:
-            redis.srem(client_set_key, *stale_ids)
+        stale_ids = ClientManager.remove_ghost_clients(redis, channel_id)
 
         self.assertEqual(len(stale_ids), 0)
         redis.srem.assert_not_called()
diff --git a/apps/channels/tests/test_ts_proxy_initializing.py b/apps/channels/tests/test_ts_proxy_initializing.py
index d803e759..e4e8a674 100644
--- a/apps/channels/tests/test_ts_proxy_initializing.py
+++ b/apps/channels/tests/test_ts_proxy_initializing.py
@@ -2,15 +2,98 @@
 
 Covers:
   - stream_manager.run() finally block: ownership check + state guard fallback
-  - Channels in INITIALIZING state are included in cleanup task grace period monitoring
+  - ChannelState.PRE_ACTIVE contains the correct states
+  - INITIALIZING is included in the cleanup task grace period check
 """
 import time
+import threading
 from unittest.mock import MagicMock, patch
 
 from django.test import TestCase
 
 from apps.proxy.ts_proxy.constants import ChannelMetadataField, ChannelState
 from apps.proxy.ts_proxy.redis_keys import RedisKeys
+from apps.proxy.ts_proxy.stream_manager import StreamManager
+
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+CHANNEL_ID = "00000000-0000-0000-0000-000000000001"
+
+
+def _make_stream_manager(tried_stream_ids=None, max_retries=3):
+    """Build a StreamManager via __new__ (bypasses __init__) with the
+    minimum attributes required by the run() finally block."""
+    sm = StreamManager.__new__(StreamManager)
+    sm.channel_id = CHANNEL_ID
+    sm.worker_id = "worker-1"
+    sm.max_retries = max_retries
+    sm.tried_stream_ids = tried_stream_ids if tried_stream_ids is not None else set()
+    sm.running = False  # while-loop exits immediately
+    sm.connected = False
+    sm.transcode_process_active = False
+    sm._buffer_check_timers = []
+    sm.url = "http://example.com/stream"
+    sm.url_switching = False
+    sm.url_switch_start_time = 0
+    sm.url_switch_timeout = 30
+    sm.stop_requested = False
+    sm.stopping = False
+    sm.socket = None
+    sm.transcode_process = None
+    sm.current_response = None
+    sm.current_session = None
+    sm.current_stream_id = None
+
+    buffer = MagicMock()
+    buffer.redis_client = MagicMock()
+    buffer.channel_id = CHANNEL_ID
+    sm.buffer = buffer
+
+    return sm
+
+
+def _run_finally_block(sm, owner_value, current_state):
+    """Invoke StreamManager.run() so its finally block executes against real code.
+
+    Patches threading.Thread and ConfigHelper so the try-block is inert
+    (self.running=False makes the while-loop exit immediately).
+
+    Returns True if the finally block wrote ERROR to Redis.
+    """
+    redis = sm.buffer.redis_client
+
+    # Mock the owner key GET — the finally block calls redis.get(owner_key)
+    def get_side_effect(key):
+        if "owner" in key:
+            return owner_value
+        return None
+
+    redis.get.side_effect = get_side_effect
+
+    # Mock hget for state field lookup in the PRE_ACTIVE guard
+    if current_state is not None:
+        redis.hget.return_value = current_state.encode('utf-8')
+    else:
+        redis.hget.return_value = None
+
+    # Reset hset so we can detect whether ERROR was written
+    redis.hset.reset_mock()
+    redis.setex.reset_mock()
+
+    with patch.object(threading, 'Thread', return_value=MagicMock()):
+        with patch('apps.proxy.ts_proxy.stream_manager.ConfigHelper') as mock_cfg:
+            mock_cfg.max_stream_switches.return_value = 0
+            mock_cfg.max_retries.return_value = sm.max_retries
+            sm.run()
+
+    # Check if hset was called with ERROR state
+    if redis.hset.called:
+        mapping = redis.hset.call_args[1].get('mapping', {})
+        return mapping.get(ChannelMetadataField.STATE) == ChannelState.ERROR
+    return False
 
 
 # ---------------------------------------------------------------------------
@@ -22,176 +105,79 @@ class StreamManagerFinallyBlockTests(TestCase):
     (normal case) OR if ownership expired and the channel is still in a
     pre-active state (no new owner has taken over)."""
 
-    def _make_stream_manager(self, tried_stream_ids=None, max_retries=3):
-        from apps.proxy.ts_proxy.stream_manager import StreamManager
-        sm = StreamManager.__new__(StreamManager)
-        sm.channel_id = "00000000-0000-0000-0000-000000000001"
-        sm.worker_id = "worker-1"
-        sm.max_retries = max_retries
-        sm.tried_stream_ids = tried_stream_ids or []
-        sm.running = False
-        sm.connected = False
-        sm.transcode_process_active = False
-        sm._buffer_check_timers = []
-
-        buffer = MagicMock()
-        buffer.redis_client = MagicMock()
-        sm.buffer = buffer
-
-        return sm
-
-    def _run_finally_logic(self, sm, owner_value, current_state):
-        """Simulate the finally block's state-update logic.
-
-        Args:
-            sm: StreamManager mock
-            owner_value: bytes value of owner key (None = expired,
-                         sm.worker_id.encode() = self, b'other' = new owner)
-            current_state: ChannelState string or None
-        Returns:
-            True if ERROR was written, False otherwise
-        """
-        redis = sm.buffer.redis_client
-
-        # Mock the owner key GET
-        redis.get.return_value = owner_value
-
-        # Mock hget for state field
-        if current_state is not None:
-            redis.hget.return_value = current_state.encode('utf-8')
-        else:
-            redis.hget.return_value = None
-
-        # Replicate the finally block logic
-        owner_key = RedisKeys.channel_owner(sm.channel_id)
-        current_owner = redis.get(owner_key)
-
-        is_owner = (
-            current_owner
-            and sm.worker_id
-            and current_owner.decode('utf-8') == sm.worker_id
-        )
-        no_owner = current_owner is None
-
-        should_update = is_owner
-        if not should_update and no_owner:
-            metadata_key = RedisKeys.channel_metadata(sm.channel_id)
-            current_state_bytes = redis.hget(
-                metadata_key, ChannelMetadataField.STATE
-            )
-            current_state_str = (
-                current_state_bytes.decode('utf-8')
-                if current_state_bytes else None
-            )
-            should_update = current_state_str in ChannelState.PRE_ACTIVE
-
-        if should_update:
-            if sm.tried_stream_ids and len(sm.tried_stream_ids) > 0:
-                error_message = f"All {len(sm.tried_stream_ids)} stream options failed"
-            else:
-                error_message = f"Connection failed after {sm.max_retries} attempts"
-
-            metadata_key = RedisKeys.channel_metadata(sm.channel_id)
-            update_data = {
-                ChannelMetadataField.STATE: ChannelState.ERROR,
-                ChannelMetadataField.STATE_CHANGED_AT: str(time.time()),
-                ChannelMetadataField.ERROR_MESSAGE: error_message,
-                ChannelMetadataField.ERROR_TIME: str(time.time())
-            }
-            redis.hset(metadata_key, mapping=update_data)
-            stop_key = RedisKeys.channel_stopping(sm.channel_id)
-            redis.setex(stop_key, 60, "true")
-            return True
-        return False
-
     # --- Owner still valid: always write ERROR ---
 
     def test_owner_writes_error_regardless_of_state(self):
         """When we're still the owner, always write ERROR."""
-        sm = self._make_stream_manager()
+        sm = _make_stream_manager()
         owner = sm.worker_id.encode('utf-8')
-        # State doesn't matter when we're the owner
-        updated = self._run_finally_logic(sm, owner, ChannelState.ACTIVE)
-        self.assertTrue(updated)
+        self.assertTrue(_run_finally_block(sm, owner, ChannelState.ACTIVE))
 
     def test_owner_writes_error_on_initializing(self):
         """Owner + INITIALIZING = write ERROR."""
-        sm = self._make_stream_manager()
+        sm = _make_stream_manager()
         owner = sm.worker_id.encode('utf-8')
-        updated = self._run_finally_logic(sm, owner, ChannelState.INITIALIZING)
-        self.assertTrue(updated)
-        call_args = sm.buffer.redis_client.hset.call_args
-        self.assertEqual(
-            call_args[1]['mapping'][ChannelMetadataField.STATE],
-            ChannelState.ERROR
-        )
+        self.assertTrue(_run_finally_block(sm, owner, ChannelState.INITIALIZING))
+
+        mapping = sm.buffer.redis_client.hset.call_args[1]['mapping']
+        self.assertEqual(mapping[ChannelMetadataField.STATE], ChannelState.ERROR)
 
     # --- Ownership expired, no new owner: use state guard ---
 
     def test_no_owner_initializing_writes_error(self):
         """Ownership expired + INITIALIZING = write ERROR."""
-        sm = self._make_stream_manager()
-        updated = self._run_finally_logic(sm, None, ChannelState.INITIALIZING)
-        self.assertTrue(updated)
+        sm = _make_stream_manager()
+        self.assertTrue(_run_finally_block(sm, None, ChannelState.INITIALIZING))
 
     def test_no_owner_connecting_writes_error(self):
         """Ownership expired + CONNECTING = write ERROR."""
-        sm = self._make_stream_manager()
-        updated = self._run_finally_logic(sm, None, ChannelState.CONNECTING)
-        self.assertTrue(updated)
+        sm = _make_stream_manager()
+        self.assertTrue(_run_finally_block(sm, None, ChannelState.CONNECTING))
 
     def test_no_owner_buffering_writes_error(self):
         """Ownership expired + BUFFERING = write ERROR."""
-        sm = self._make_stream_manager()
-        updated = self._run_finally_logic(sm, None, ChannelState.BUFFERING)
-        self.assertTrue(updated)
+        sm = _make_stream_manager()
+        self.assertTrue(_run_finally_block(sm, None, ChannelState.BUFFERING))
 
     def test_no_owner_waiting_for_clients_writes_error(self):
         """Ownership expired + WAITING_FOR_CLIENTS = write ERROR."""
-        sm = self._make_stream_manager()
-        updated = self._run_finally_logic(sm, None, ChannelState.WAITING_FOR_CLIENTS)
-        self.assertTrue(updated)
+        sm = _make_stream_manager()
+        self.assertTrue(_run_finally_block(sm, None, ChannelState.WAITING_FOR_CLIENTS))
 
     def test_no_owner_active_does_not_write(self):
-        """Ownership expired + ACTIVE = do NOT write ERROR.
-        ACTIVE means a previous owner successfully served the channel."""
-        sm = self._make_stream_manager()
-        updated = self._run_finally_logic(sm, None, ChannelState.ACTIVE)
-        self.assertFalse(updated)
+        """Ownership expired + ACTIVE = do NOT write ERROR."""
+        sm = _make_stream_manager()
+        self.assertFalse(_run_finally_block(sm, None, ChannelState.ACTIVE))
 
     def test_no_owner_error_does_not_write(self):
         """Ownership expired + already ERROR = do NOT write again."""
-        sm = self._make_stream_manager()
-        updated = self._run_finally_logic(sm, None, ChannelState.ERROR)
-        self.assertFalse(updated)
+        sm = _make_stream_manager()
+        self.assertFalse(_run_finally_block(sm, None, ChannelState.ERROR))
 
     def test_no_owner_no_state_does_not_write(self):
         """Ownership expired + no state metadata = do NOT write."""
-        sm = self._make_stream_manager()
-        updated = self._run_finally_logic(sm, None, None)
-        self.assertFalse(updated)
+        sm = _make_stream_manager()
+        self.assertFalse(_run_finally_block(sm, None, None))
 
     # --- New owner took over: never clobber ---
 
     def test_new_owner_initializing_does_not_write(self):
-        """Another worker owns the channel and is INITIALIZING —
-        do NOT clobber, even though state is pre-active."""
-        sm = self._make_stream_manager()
-        updated = self._run_finally_logic(sm, b"other-worker", ChannelState.INITIALIZING)
-        self.assertFalse(updated)
+        """Another worker owns the channel — do NOT clobber."""
+        sm = _make_stream_manager()
+        self.assertFalse(_run_finally_block(sm, b"other-worker", ChannelState.INITIALIZING))
 
     def test_new_owner_active_does_not_write(self):
         """Another worker owns the channel and is ACTIVE — do NOT write."""
-        sm = self._make_stream_manager()
-        updated = self._run_finally_logic(sm, b"other-worker", ChannelState.ACTIVE)
-        self.assertFalse(updated)
+        sm = _make_stream_manager()
+        self.assertFalse(_run_finally_block(sm, b"other-worker", ChannelState.ACTIVE))
 
     # --- Stopping key and error messages ---
 
     def test_stopping_key_set_on_error_update(self):
         """When ERROR is written, stopping key must also be set."""
-        sm = self._make_stream_manager()
-        self._run_finally_logic(sm, None, ChannelState.INITIALIZING)
+        sm = _make_stream_manager()
+        _run_finally_block(sm, None, ChannelState.INITIALIZING)
+
         sm.buffer.redis_client.setex.assert_called_once()
         args = sm.buffer.redis_client.setex.call_args[0]
         self.assertIn("stopping", args[0])
@@ -199,46 +185,47 @@ class StreamManagerFinallyBlockTests(TestCase):
 
     def test_error_message_includes_stream_count(self):
         """When multiple streams were tried, error message reflects that."""
-        sm = self._make_stream_manager(tried_stream_ids=[1, 2, 3])
-        self._run_finally_logic(sm, None, ChannelState.INITIALIZING)
-        call_args = sm.buffer.redis_client.hset.call_args
-        error_msg = call_args[1]['mapping'][ChannelMetadataField.ERROR_MESSAGE]
+        sm = _make_stream_manager(tried_stream_ids={1, 2, 3})
+        _run_finally_block(sm, None, ChannelState.INITIALIZING)
+
+        mapping = sm.buffer.redis_client.hset.call_args[1]['mapping']
+        error_msg = mapping[ChannelMetadataField.ERROR_MESSAGE]
         self.assertIn("3 stream options failed", error_msg)
 
     def test_error_message_with_no_streams_tried(self):
         """When no alternate streams were tried, shows retry count."""
-        sm = self._make_stream_manager(tried_stream_ids=[], max_retries=5)
-        self._run_finally_logic(sm, None, ChannelState.INITIALIZING)
-        call_args = sm.buffer.redis_client.hset.call_args
-        error_msg = call_args[1]['mapping'][ChannelMetadataField.ERROR_MESSAGE]
+        sm = _make_stream_manager(tried_stream_ids=set(), max_retries=5)
+        _run_finally_block(sm, None, ChannelState.INITIALIZING)
+
+        mapping = sm.buffer.redis_client.hset.call_args[1]['mapping']
+        error_msg = mapping[ChannelMetadataField.ERROR_MESSAGE]
         self.assertIn("5", error_msg)
 
 
 # ---------------------------------------------------------------------------
-# Cleanup task: INITIALIZING included in grace period monitoring
+# ChannelState.PRE_ACTIVE: verify contents and immutability
 # ---------------------------------------------------------------------------
 
-class CleanupTaskInitializingStateTests(TestCase):
-    """The cleanup task's grace period check must include INITIALIZING
-    alongside CONNECTING and WAITING_FOR_CLIENTS."""
+class PreActiveStateTests(TestCase):
+    """Verify PRE_ACTIVE contains the correct states and is immutable."""
 
-    def test_initializing_in_monitored_states(self):
-        """ChannelState.INITIALIZING must be in the list of states that
-        trigger grace period monitoring in the cleanup task."""
-        monitored_states = [
-            ChannelState.INITIALIZING,
-            ChannelState.CONNECTING,
-            ChannelState.WAITING_FOR_CLIENTS,
-        ]
-        self.assertIn(ChannelState.INITIALIZING, monitored_states)
-        self.assertIn(ChannelState.CONNECTING, monitored_states)
-        self.assertIn(ChannelState.WAITING_FOR_CLIENTS, monitored_states)
+    def test_initializing_in_pre_active(self):
+        self.assertIn(ChannelState.INITIALIZING, ChannelState.PRE_ACTIVE)
 
-    def test_active_not_in_monitored_states(self):
-        """ACTIVE channels should NOT be in the grace period list."""
-        monitored_states = [
-            ChannelState.INITIALIZING,
-            ChannelState.CONNECTING,
-            ChannelState.WAITING_FOR_CLIENTS,
-        ]
-        self.assertNotIn(ChannelState.ACTIVE, monitored_states)
+    def test_connecting_in_pre_active(self):
+        self.assertIn(ChannelState.CONNECTING, ChannelState.PRE_ACTIVE)
+
+    def test_buffering_in_pre_active(self):
+        self.assertIn(ChannelState.BUFFERING, ChannelState.PRE_ACTIVE)
+
+    def test_waiting_for_clients_in_pre_active(self):
+        self.assertIn(ChannelState.WAITING_FOR_CLIENTS, ChannelState.PRE_ACTIVE)
+
+    def test_active_not_in_pre_active(self):
+        self.assertNotIn(ChannelState.ACTIVE, ChannelState.PRE_ACTIVE)
+
+    def test_error_not_in_pre_active(self):
+        self.assertNotIn(ChannelState.ERROR, ChannelState.PRE_ACTIVE)
+
+    def test_pre_active_is_frozenset(self):
+        self.assertIsInstance(ChannelState.PRE_ACTIVE, frozenset)
diff --git a/apps/proxy/ts_proxy/constants.py b/apps/proxy/ts_proxy/constants.py
index a13ce88b..d134c8e8 100644
--- a/apps/proxy/ts_proxy/constants.py
+++ b/apps/proxy/ts_proxy/constants.py
@@ -75,6 +75,7 @@ class ChannelMetadataField:
     FFMPEG_FPS = "ffmpeg_fps"
     ACTUAL_FPS = "actual_fps"
     FFMPEG_OUTPUT_BITRATE = "ffmpeg_output_bitrate"
+    FFMPEG_BITRATE = "ffmpeg_bitrate"
     FFMPEG_STATS_UPDATED = "ffmpeg_stats_updated"
 
     # Video stream info
@@ -85,6 +86,7 @@ class ChannelMetadataField:
     SOURCE_FPS = "source_fps"
     PIXEL_FORMAT = "pixel_format"
     VIDEO_BITRATE = "video_bitrate"
+    SOURCE_BITRATE = "source_bitrate"
 
     # Audio stream info
     AUDIO_CODEC = "audio_codec"

From 7e07c9552d3e839557e7cc6170b78fa5866436d5 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 20:13:42 -0500
Subject: [PATCH 033/172] changelog: Update changelog for ghost client pr.

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71361336..7726a6eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -118,6 +118,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - **`update_stream_profile()` uses a Redis pipeline** for the old-profile DECR + key update + new-profile INCR sequence, preventing counter drift if the process crashes between operations.
   - **`stream_generator._cleanup()`** now falls back to `Stream.objects.get()` when the channel UUID resolves to a preview flow rather than a normal channel, rather than silently skipping the slot release.
   - **VOD `cleanup_persistent_connection()`** fallback DECR is now conditional: it only decrements the profile counter when the connection tracking key had already expired by TTL (i.e., `remove_connection()` would have skipped the DECR), preventing double-decrements when the key is still present.
+- Ghost clients and channels stuck in `INITIALIZING` state in the TS proxy (Fixes #695, #669) — Thanks [@CodeBormen](https://github.com/CodeBormen)
+  - **`INITIALIZING` added to cleanup grace period monitoring**: channels stuck in `INITIALIZING` are now surfaced by the cleanup task and torn down, preventing indefinite hangs when stream startup fails.
+  - **Orphaned channel cleanup validates client SET entries**: the cleanup task now cross-checks client SET members against actual metadata hashes; ghost SET entries are removed and the channel is torn down cleanly when no real clients remain.
+  - **Stats page self-heals**: ghost client SET entries are detected and removed when reading channel stats, preventing stale entries from inflating the active-client count.
+  - **`remove_ghost_clients()` extracted to `ClientManager`**: ghost-detection logic is now a single authoritative helper, callable with an optional pre-fetched `client_ids` set to eliminate a redundant Redis `SMEMBERS` round-trip when the caller already holds the set.
+  - **Ownership TTL fallback**: the error-state writer now triggers via ownership check _or_ state guard fallback, so a channel stuck in a pre-active state is correctly marked `ERROR` even when the ownership TTL expired during retries.
+  - **Missing `SOURCE_BITRATE` / `FFMPEG_BITRATE` metadata constants** added to `ChannelMetadataField`, preventing `AttributeError` on detailed channel stats reads.
 - TS proxy client stream lag recovery now only bumps clients forward when their next required chunk has genuinely expired from Redis (TTL), rather than unconditionally jumping if they fell more than 50 chunks behind. Clients are repositioned to the oldest available chunk (minimum data loss) using an atomic server-side Lua binary search, falling back to near the buffer head if nothing is available.
 - TS proxy streams dying after 30–200 seconds in multi-worker uWSGI/Celery deployments, caused by three interrelated bugs. (Fixes #992, #980) - Thanks [@PFalko](https://github.com/PFalko)
   - **Double ProxyServer instantiation**: `ProxyConfig.ready()` called `TSProxyServer()` directly while `TSProxyConfig.ready()` also called `TSProxyServer.get_instance()`, creating two instances per worker — each with its own cleanup thread. The orphaned thread could not extend ownership because it had no entries in `stream_managers`. Fixed by using `TSProxyServer.get_instance()` in `ProxyConfig.ready()`.

From 92f98a24c78bf5157e89f9d8fcddaeb2fd92731b Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 20:45:55 -0500
Subject: [PATCH 034/172] fix: increase ghost client multiplier to improve
 client detection timing

---
 apps/proxy/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/proxy/config.py b/apps/proxy/config.py
index 0424dee1..4de92fa0 100644
--- a/apps/proxy/config.py
+++ b/apps/proxy/config.py
@@ -99,7 +99,7 @@ class TSConfig(BaseConfig):
     CLIENT_RECORD_TTL = 60  # How long client records persist in Redis (seconds). Client will be considered MIA after this time.
     CLEANUP_CHECK_INTERVAL = 1  # How often to check for disconnected clients (seconds)
     CLIENT_HEARTBEAT_INTERVAL = 5  # How often to send client heartbeats (seconds)
-    GHOST_CLIENT_MULTIPLIER = 6.0  # How many heartbeat intervals before client considered ghost (6 would mean 36 seconds if heartbeat interval is 6)
+    GHOST_CLIENT_MULTIPLIER = 10.0  # How many heartbeat intervals before client considered ghost (10 = 50s, must exceed STREAM_TIMEOUT + FAILOVER_GRACE_PERIOD = 40s)
     CLIENT_WAIT_TIMEOUT = 30  # Seconds to wait for client to connect
 
     # Stream health and recovery settings

From 6638ba4b77f51b8ecd3f5eca0fce48647a475104 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 15 Mar 2026 21:08:31 -0500
Subject: [PATCH 035/172] changelog: Update changelog for proxy pr.

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7726a6eb..23f2a5d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- TS proxy clients stuck indefinitely in keepalive mode when a stream fails and never recovers (Fixes #1102, #1103) — Thanks [@cmcpherson274](https://github.com/cmcpherson274) & [@CodeBormen](https://github.com/CodeBormen)
+  - **Keepalive duration cap**: Non-owner worker clients sending keepalive packets to hold a connection open during failover can now be held at most `MAX_KEEPALIVE_DURATION` seconds (default 300 s). If no real stream data has been received within that window, the client is disconnected with a warning log. The timer resets each time real data resumes, so independent stalls do not accumulate.
+  - **`last_active` tracking**: `last_active` is now updated on every keepalive packet and on every real data chunk, so clients actively waiting during a failover are not incorrectly evicted as ghost clients by the heartbeat thread. The heartbeat thread now only refreshes the Redis TTL rather than updating `last_active`, ensuring the ghost-detection check reflects true client activity rather than heartbeat activity.
+  - **Buffer reset on stream transition**: A new `reset_buffer_position()` method on `StreamBuffer` clears the in-memory write buffer and partial-packet accumulator when switching between FFmpeg processes. Without this, a partial 188-byte TS packet from the dying FFmpeg process was being prepended to the first bytes from the new FFmpeg process, producing a corrupted TS packet boundary that broke audio decoder sync on the client side. Redis-stored chunks already consumed by clients are unaffected.
+  - **`add_chunk()` locking hardened**: The lock scope in `add_chunk()` was expanded to cover the entire partial-packet merge and write-buffer accumulation phase, preventing a race condition between `add_chunk()` and the new `reset_buffer_position()` call.
 - uWSGI segfaults caused by mixing threading and gevent concurrency models. The dev and debug uWSGI configs had `threads` and `enable-threads = true` set alongside gevent, which triggers segmentation faults particularly on ARM64/Python 3.13. Removed those options to match the already-correct production config. — Thanks [@jcasimir](https://github.com/jcasimir)
 - `Stream.last_seen` and `ChannelGroupM3UAccount.last_seen` model defaults now use `django.utils.timezone.now` instead of `datetime.datetime.now`, eliminating spurious `RuntimeWarning: DateTimeField received a naive datetime` warnings emitted during test database creation and on new record creation when `USE_TZ=True`.
 - EPG programme parsing crash when an XMLTV source contains programme titles exceeding 255 characters. Previously, a single oversized title would cause the entire `bulk_create` batch to fail with a database truncation error, silently dropping all programmes in that batch. Titles are now truncated to 255 characters before being saved. (Fixes #1039)

From 862443636722a5e333b63e302276bfee6570ab54 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Mon, 16 Mar 2026 16:52:22 -0500
Subject: [PATCH 036/172] fix(frontend): validate series_rules as array in
 settings parse/save

- Add Array.isArray() guard in parseSettings for series_rules, matching the existing EPG ignore list pattern
- Include series_rules in arrayFields list in getChangedSettings to prevent stringification during settings round-trip
- Add 5 tests covering valid, corrupted, and missing series_rules data
---
 frontend/src/utils/pages/SettingsUtils.js     | 14 +++--
 .../pages/__tests__/SettingsUtils.test.js     | 62 +++++++++++++++++++
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/frontend/src/utils/pages/SettingsUtils.js b/frontend/src/utils/pages/SettingsUtils.js
index cafe0d8c..aa32a8e7 100644
--- a/frontend/src/utils/pages/SettingsUtils.js
+++ b/frontend/src/utils/pages/SettingsUtils.js
@@ -174,11 +174,12 @@ export const saveChangedSettings = async (settings, changedSettings) => {
 export const getChangedSettings = (values, settings) => {
   const changedSettings = {};
 
-  // EPG fields that should be kept as arrays
-  const epgFields = [
+  // Fields that must remain as arrays and not be stringified
+  const arrayFields = [
     'epg_match_ignore_prefixes',
     'epg_match_ignore_suffixes',
     'epg_match_ignore_custom',
+    'series_rules',
   ];
 
   for (const settingKey in values) {
@@ -199,12 +200,11 @@ export const getChangedSettings = (values, settings) => {
       continue;
     }
 
-    // Handle EPG fields specially - keep as arrays, don't skip empty arrays
-    if (epgFields.includes(settingKey)) {
+    // Handle array fields - keep as arrays, don't skip empty arrays
+    if (arrayFields.includes(settingKey)) {
       if (!Array.isArray(actualValue)) {
         actualValue = [];
       }
-      // Always include EPG fields in changes (even if empty)
       changedSettings[settingKey] = actualValue;
       continue;
     }
@@ -299,7 +299,9 @@ export const parseSettings = (settings) => {
       typeof dvrSettings.post_offset_minutes === 'number'
         ? dvrSettings.post_offset_minutes
         : parseInt(dvrSettings.post_offset_minutes, 10) || 0;
-    parsed.series_rules = dvrSettings.series_rules;
+    parsed.series_rules = Array.isArray(dvrSettings.series_rules)
+      ? dvrSettings.series_rules
+      : [];
   }
 
   // Backup settings - direct mapping with underscore keys
diff --git a/frontend/src/utils/pages/__tests__/SettingsUtils.test.js b/frontend/src/utils/pages/__tests__/SettingsUtils.test.js
index b9efef94..9d4bb644 100644
--- a/frontend/src/utils/pages/__tests__/SettingsUtils.test.js
+++ b/frontend/src/utils/pages/__tests__/SettingsUtils.test.js
@@ -328,6 +328,51 @@ describe('SettingsUtils', () => {
       const result = SettingsUtils.parseSettings(mockSettings);
       expect(result.network_access).toEqual(['192.168.1.0/24', '10.0.0.0/8']);
     });
+
+    it('should parse valid series_rules as array', () => {
+      const mockSettings = {
+        dvr_settings: {
+          id: 2,
+          key: 'dvr_settings',
+          value: {
+            series_rules: [{ tvg_id: 'abc', mode: 'all', title: 'Show' }],
+          },
+        },
+      };
+
+      const result = SettingsUtils.parseSettings(mockSettings);
+      expect(result.series_rules).toEqual([
+        { tvg_id: 'abc', mode: 'all', title: 'Show' },
+      ]);
+    });
+
+    it('should default series_rules to empty array when not an array', () => {
+      const mockSettings = {
+        dvr_settings: {
+          id: 2,
+          key: 'dvr_settings',
+          value: {
+            series_rules: 'corrupted',
+          },
+        },
+      };
+
+      const result = SettingsUtils.parseSettings(mockSettings);
+      expect(result.series_rules).toEqual([]);
+    });
+
+    it('should default series_rules to empty array when missing', () => {
+      const mockSettings = {
+        dvr_settings: {
+          id: 2,
+          key: 'dvr_settings',
+          value: {},
+        },
+      };
+
+      const result = SettingsUtils.parseSettings(mockSettings);
+      expect(result.series_rules).toEqual([]);
+    });
   });
 
   describe('getChangedSettings', () => {
@@ -447,6 +492,23 @@ describe('SettingsUtils', () => {
       expect(changes.epg_match_ignore_suffixes).toEqual([]);
       expect(changes.epg_match_ignore_custom).toEqual([]);
     });
+
+    it('should keep series_rules as array and not stringify', () => {
+      const rules = [{ tvg_id: 'abc', mode: 'all', title: 'Show' }];
+      const values = { series_rules: rules };
+      const settings = {};
+
+      const changes = SettingsUtils.getChangedSettings(values, settings);
+      expect(changes.series_rules).toEqual(rules);
+    });
+
+    it('should default series_rules to empty array if not an array', () => {
+      const values = { series_rules: 'corrupted' };
+      const settings = {};
+
+      const changes = SettingsUtils.getChangedSettings(values, settings);
+      expect(changes.series_rules).toEqual([]);
+    });
   });
 
   describe('saveChangedSettings - EPG Mode', () => {

From d9dea82f403666a8cc1853c38958d892f91140f4 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Mon, 16 Mar 2026 17:00:34 -0500
Subject: [PATCH 037/172] docs: Add pronounciation to readme.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a46e8ca6..dddc672e 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## 📖 What is Dispatcharr?
 
-Dispatcharr is an **open-source powerhouse** for managing IPTV streams, EPG data, and VOD content with elegance and control.\
+Dispatcharr (pronounced like "dispatcher") is an **open-source powerhouse** for managing IPTV streams, EPG data, and VOD content with elegance and control.\
 Born from necessity and built with passion, it started as a personal project by **[OkinawaBoss](https://github.com/OkinawaBoss)** and evolved with contributions from legends like **[dekzter](https://github.com/dekzter)**, **[SergeantPanda](https://github.com/SergeantPanda)** and **Bucatini**.
 
 > Think of Dispatcharr as the \*arr family's IPTV cousin — simple, smart, and designed for streamers who want reliability and flexibility.

From 07863a181e06b31e45ca1f39d1df10810211f7f4 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Mon, 16 Mar 2026 18:05:33 -0500
Subject: [PATCH 038/172] refactor: streamline channel numbering logic;
 consolidate loading states and variable names

---
 .../src/components/tables/StreamsTable.jsx    | 92 ++++++-------------
 1 file changed, 30 insertions(+), 62 deletions(-)

diff --git a/frontend/src/components/tables/StreamsTable.jsx b/frontend/src/components/tables/StreamsTable.jsx
index af23eca9..2b0e6247 100644
--- a/frontend/src/components/tables/StreamsTable.jsx
+++ b/frontend/src/components/tables/StreamsTable.jsx
@@ -210,22 +210,18 @@ const StreamsTable = ({ onReady }) => {
     useState(false);
   const [numberingMode, setNumberingMode] = useState('provider'); // 'provider', 'auto', 'highest', or 'custom'
   const [customStartNumber, setCustomStartNumber] = useState(1);
-  const [bulkNextHighestNumber, setBulkNextHighestNumber] = useState(1);
+  const [nextHighestNumber, setNextHighestNumber] = useState(1);
+  const [highestNumberLoading, setHighestNumberLoading] = useState(false);
   const [rememberChoice, setRememberChoice] = useState(false);
   const [bulkSelectedProfileIds, setBulkSelectedProfileIds] = useState([]);
-  const [bulkHighestNumberLoading, setBulkHighestNumberLoading] =
-    useState(false);
 
   // Channel creation modal state (single)
   const [singleChannelModalOpen, setSingleChannelModalOpen] = useState(false);
   const [singleChannelMode, setSingleChannelMode] = useState('provider'); // 'provider', 'auto', 'highest', or 'specific'
   const [specificChannelNumber, setSpecificChannelNumber] = useState(1);
-  const [singleNextHighestNumber, setSingleNextHighestNumber] = useState(1);
   const [rememberSingleChoice, setRememberSingleChoice] = useState(false);
   const [currentStreamForChannel, setCurrentStreamForChannel] = useState(null);
   const [singleSelectedProfileIds, setSingleSelectedProfileIds] = useState([]);
-  const [singleHighestNumberLoading, setSingleHighestNumberLoading] =
-    useState(false);
 
   // Confirmation dialog state
   const [confirmDeleteOpen, setConfirmDeleteOpen] = useState(false);
@@ -745,7 +741,7 @@ const StreamsTable = ({ onReady }) => {
     } else {
       // Show the modal to let user choose
       if (numberingMode === 'highest') {
-        await loadBulkNextHighestChannelNumber();
+        await loadNextHighestChannelNumber();
       }
       setChannelNumberingModalOpen(true);
     }
@@ -760,23 +756,11 @@ const StreamsTable = ({ onReady }) => {
     }
 
     const response = await API.getStreams([streamId]);
-    if (Array.isArray(response)) {
-      return (
-        response.find((candidate) => Number(candidate.id) === Number(streamId)) ||
-        response[0] ||
-        null
-      );
-    }
-
-    if (Array.isArray(response?.results)) {
-      return (
-        response.results.find(
-          (candidate) => Number(candidate.id) === Number(streamId)
-        ) || null
-      );
-    }
-
-    return null;
+    return (
+      response?.find(
+        (candidate) => Number(candidate.id) === Number(streamId)
+      ) ?? null
+    );
   };
 
   const createChannelsFromSelection = async () => {
@@ -855,17 +839,15 @@ const StreamsTable = ({ onReady }) => {
     }
   };
 
-  const loadBulkNextHighestChannelNumber = async () => {
-    setBulkHighestNumberLoading(true);
+  const loadNextHighestChannelNumber = async () => {
+    setHighestNumberLoading(true);
     try {
-      const nextHighestChannelNumber = await API.getNextHighestChannelNumber();
-      if (Number.isFinite(nextHighestChannelNumber)) {
-        setBulkNextHighestNumber(nextHighestChannelNumber);
-        return nextHighestChannelNumber;
+      const n = await API.getNextHighestChannelNumber();
+      if (Number.isFinite(n)) {
+        setNextHighestNumber(n);
       }
-      return 1;
     } finally {
-      setBulkHighestNumberLoading(false);
+      setHighestNumberLoading(false);
     }
   };
 
@@ -890,7 +872,7 @@ const StreamsTable = ({ onReady }) => {
         : numberingMode === 'auto'
           ? 0
           : numberingMode === 'highest'
-            ? Number(bulkNextHighestNumber)
+            ? Number(nextHighestNumber)
             : Number(customStartNumber);
 
     setChannelNumberingModalOpen(false);
@@ -907,7 +889,7 @@ const StreamsTable = ({ onReady }) => {
       return;
     }
 
-    await loadBulkNextHighestChannelNumber();
+    await loadNextHighestChannelNumber();
   };
 
   const editStream = async (stream = null) => {
@@ -1021,26 +1003,12 @@ const StreamsTable = ({ onReady }) => {
       // Show the modal to let user choose
       setCurrentStreamForChannel(stream);
       if (singleChannelMode === 'highest') {
-        await loadSingleNextHighestChannelNumber();
+        await loadNextHighestChannelNumber();
       }
       setSingleChannelModalOpen(true);
     }
   };
 
-  const loadSingleNextHighestChannelNumber = async () => {
-    setSingleHighestNumberLoading(true);
-    try {
-      const nextHighestChannelNumber = await API.getNextHighestChannelNumber();
-      if (Number.isFinite(nextHighestChannelNumber)) {
-        setSingleNextHighestNumber(nextHighestChannelNumber);
-        return nextHighestChannelNumber;
-      }
-      return 1;
-    } finally {
-      setSingleHighestNumberLoading(false);
-    }
-  };
-
   // Separate function to actually execute single channel creation
   const executeSingleChannelCreation = async (
     stream,
@@ -1094,7 +1062,7 @@ const StreamsTable = ({ onReady }) => {
         : singleChannelMode === 'auto'
           ? 0
           : singleChannelMode === 'highest'
-            ? Number(singleNextHighestNumber)
+            ? Number(nextHighestNumber)
             : Number(specificChannelNumber);
 
     setSingleChannelModalOpen(false);
@@ -1112,7 +1080,7 @@ const StreamsTable = ({ onReady }) => {
       return;
     }
 
-    await loadSingleNextHighestChannelNumber();
+    await loadNextHighestChannelNumber();
   };
 
   const addStreamsToChannel = async () => {
@@ -1553,7 +1521,7 @@ const StreamsTable = ({ onReady }) => {
                 leftSection={<SquarePlus size={18} />}
                 variant={
                   selectedStreamIds.length > 0 &&
-                    selectedChannelIds.length === 1
+                  selectedChannelIds.length === 1
                     ? 'light'
                     : 'default'
                 }
@@ -1562,18 +1530,18 @@ const StreamsTable = ({ onReady }) => {
                 p={5}
                 color={
                   selectedStreamIds.length > 0 &&
-                    selectedChannelIds.length === 1
+                  selectedChannelIds.length === 1
                     ? theme.tailwind.green[5]
                     : undefined
                 }
                 style={
                   selectedStreamIds.length > 0 &&
-                    selectedChannelIds.length === 1
+                  selectedChannelIds.length === 1
                     ? {
-                      borderWidth: '1px',
-                      borderColor: theme.tailwind.green[5],
-                      color: 'white',
-                    }
+                        borderWidth: '1px',
+                        borderColor: theme.tailwind.green[5],
+                        color: 'white',
+                      }
                     : undefined
                 }
                 disabled={
@@ -1882,7 +1850,7 @@ const StreamsTable = ({ onReady }) => {
         mode={numberingMode}
         onModeChange={handleBulkNumberingModeChange}
         numberValue={
-          numberingMode === 'highest' ? bulkNextHighestNumber : customStartNumber
+          numberingMode === 'highest' ? nextHighestNumber : customStartNumber
         }
         onNumberValueChange={setCustomStartNumber}
         rememberChoice={rememberChoice}
@@ -1893,7 +1861,7 @@ const StreamsTable = ({ onReady }) => {
         selectedProfileIds={bulkSelectedProfileIds}
         onProfileIdsChange={setBulkSelectedProfileIds}
         channelProfiles={channelProfiles ? Object.values(channelProfiles) : []}
-        isHighestAvailableLoading={bulkHighestNumberLoading}
+        isHighestAvailableLoading={highestNumberLoading}
       />
 
       {/* Single Channel Creation Modal */}
@@ -1904,7 +1872,7 @@ const StreamsTable = ({ onReady }) => {
         onModeChange={handleSingleNumberingModeChange}
         numberValue={
           singleChannelMode === 'highest'
-            ? singleNextHighestNumber
+            ? nextHighestNumber
             : specificChannelNumber
         }
         onNumberValueChange={setSpecificChannelNumber}
@@ -1916,7 +1884,7 @@ const StreamsTable = ({ onReady }) => {
         selectedProfileIds={singleSelectedProfileIds}
         onProfileIdsChange={setSingleSelectedProfileIds}
         channelProfiles={channelProfiles ? Object.values(channelProfiles) : []}
-        isHighestAvailableLoading={singleHighestNumberLoading}
+        isHighestAvailableLoading={highestNumberLoading}
       />
 
       <ConfirmationDialog

From b7eb299aac4a8e00dd0059dbdbb8d699dcf93289 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Mon, 16 Mar 2026 18:50:24 -0500
Subject: [PATCH 039/172] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6571bfcf..cb6bbdfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- DVR series rule creation failing with a 500 error when the stored `series_rules` data contained corrupted (non-dict) entries. Added type guards on the getter, setter, and generic settings serializer to filter invalid entries on read and write. Hardened the EPG ignore list getters (`prefixes`, `suffixes`, `custom`) with the same pattern. Frontend settings parse and save now validate `series_rules` with `Array.isArray()`, matching the existing EPG field pattern, preventing corrupted data from being round-tripped back to the database. (Fixes #1059) 
 - EPG programme parsing crash when an XMLTV source contains programme titles exceeding 255 characters. Previously, a single oversized title would cause the entire `bulk_create` batch to fail with a database truncation error, silently dropping all programmes in that batch. Titles are now truncated to 255 characters before being saved. (Fixes #1039)
 - Container startup failure when `PUID`/`PGID` is set, caused by `/data/db` ownership conflicts between the `postgres` system user (UID 102) and the configured PUID/PGID. PostgreSQL now runs as the PUID/PGID user in AIO mode, eliminating all `chown`-to-UID-102 operations and unifying `/data` ownership. (Fixes #1078) — Thanks [@CodeBormen](https://github.com/CodeBormen)
   - Existing installations where PUID/PGID differs from the current `/data/db` owner are migrated automatically on first startup; a sentinel file prevents redundant recursive `chown` on subsequent boots.

From b4281c83bb1b33d941a0e9500b338df9237be11a Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 09:27:18 -0500
Subject: [PATCH 040/172] Switch to backend logic instead of frontend. Use '-1'
 as 'highest' so not break the api.

---
 apps/channels/api_views.py                    |  4 +
 apps/channels/tasks.py                        |  4 +
 .../components/modals/CreateChannelModal.jsx  | 15 +---
 .../src/components/tables/StreamsTable.jsx    | 76 ++-----------------
 4 files changed, 17 insertions(+), 82 deletions(-)

diff --git a/apps/channels/api_views.py b/apps/channels/api_views.py
index 550f6302..08283e73 100644
--- a/apps/channels/api_views.py
+++ b/apps/channels/api_views.py
@@ -1078,6 +1078,10 @@ class ChannelViewSet(viewsets.ModelViewSet):
         elif channel_number == 0:
             # Special case: 0 means ignore provider numbers and auto-assign
             channel_number = None
+        elif channel_number == -1:
+            # Special case: -1 means assign the number after the current highest
+            highest = Channel.objects.order_by('-channel_number').values_list('channel_number', flat=True).first()
+            channel_number = (int(highest) + 1) if highest is not None else 1
 
         if channel_number is None:
             # Still None, auto-assign the next available channel number
diff --git a/apps/channels/tasks.py b/apps/channels/tasks.py
index 06cd45cf..b5969cd1 100755
--- a/apps/channels/tasks.py
+++ b/apps/channels/tasks.py
@@ -3338,6 +3338,10 @@ def bulk_create_channels_from_streams(self, stream_ids, channel_profile_ids=None
         elif starting_channel_number == 0:
             # Mode 2: Start from lowest available number
             next_number = 1
+        elif starting_channel_number == -1:
+            # Mode 4: Start after the current highest channel number
+            highest = Channel.objects.order_by('-channel_number').values_list('channel_number', flat=True).first()
+            next_number = (int(highest) + 1) if highest is not None else 1
         else:
             # Mode 3: Start from specified number
             next_number = starting_channel_number
diff --git a/frontend/src/components/modals/CreateChannelModal.jsx b/frontend/src/components/modals/CreateChannelModal.jsx
index f2d81380..1be2c54f 100644
--- a/frontend/src/components/modals/CreateChannelModal.jsx
+++ b/frontend/src/components/modals/CreateChannelModal.jsx
@@ -30,7 +30,6 @@ const CreateChannelModal = ({
   selectedProfileIds,
   onProfileIdsChange,
   channelProfiles = [],
-  isHighestAvailableLoading = false,
 }) => {
   const title = isBulk ? 'Create Channels Options' : 'Create Channel';
   const confirmLabel = isBulk ? 'Create Channels' : 'Create Channel';
@@ -151,16 +150,6 @@ const CreateChannelModal = ({
           </Stack>
         </Radio.Group>
 
-        {mode === 'highest' && (
-          <Text size="sm" c="dimmed">
-            {isHighestAvailableLoading
-              ? 'Fetching the current highest channel number...'
-              : isBulk
-                ? `Channels will be assigned starting from ${numberValue}.`
-                : `The channel will be assigned number ${numberValue}.`}
-          </Text>
-        )}
-
         {mode === customModeValue && (
           <NumberInput
             label={isBulk ? 'Starting Channel Number' : 'Channel Number'}
@@ -190,9 +179,7 @@ const CreateChannelModal = ({
           <Button variant="default" onClick={onClose}>
             Cancel
           </Button>
-          <Button onClick={onConfirm} disabled={isHighestAvailableLoading}>
-            {confirmLabel}
-          </Button>
+          <Button onClick={onConfirm}>{confirmLabel}</Button>
         </Group>
       </Stack>
     </Modal>
diff --git a/frontend/src/components/tables/StreamsTable.jsx b/frontend/src/components/tables/StreamsTable.jsx
index 2b0e6247..1d2e972e 100644
--- a/frontend/src/components/tables/StreamsTable.jsx
+++ b/frontend/src/components/tables/StreamsTable.jsx
@@ -210,8 +210,6 @@ const StreamsTable = ({ onReady }) => {
     useState(false);
   const [numberingMode, setNumberingMode] = useState('provider'); // 'provider', 'auto', 'highest', or 'custom'
   const [customStartNumber, setCustomStartNumber] = useState(1);
-  const [nextHighestNumber, setNextHighestNumber] = useState(1);
-  const [highestNumberLoading, setHighestNumberLoading] = useState(false);
   const [rememberChoice, setRememberChoice] = useState(false);
   const [bulkSelectedProfileIds, setBulkSelectedProfileIds] = useState([]);
 
@@ -726,10 +724,7 @@ const StreamsTable = ({ onReady }) => {
       } else if (savedMode === 'auto') {
         startingChannelNumberValue = 0;
       } else if (savedMode === 'highest') {
-        startingChannelNumberValue = await getNextHighestChannelNumberOrAbort();
-        if (startingChannelNumberValue === null) {
-          return;
-        }
+        startingChannelNumberValue = -1;
       } else {
         startingChannelNumberValue = Number(savedStartNumber);
       }
@@ -739,10 +734,6 @@ const StreamsTable = ({ onReady }) => {
         defaultProfileIds
       );
     } else {
-      // Show the modal to let user choose
-      if (numberingMode === 'highest') {
-        await loadNextHighestChannelNumber();
-      }
       setChannelNumberingModalOpen(true);
     }
   };
@@ -782,19 +773,6 @@ const StreamsTable = ({ onReady }) => {
     await createChannelsFromStreams();
   };
 
-  const getNextHighestChannelNumberOrAbort = async () => {
-    try {
-      const nextHighestChannelNumber = await API.getNextHighestChannelNumber();
-      if (Number.isFinite(nextHighestChannelNumber)) {
-        return nextHighestChannelNumber;
-      }
-    } catch {
-      // API.getNextHighestChannelNumber already surfaces the error notification.
-    }
-
-    return null;
-  };
-
   // Separate function to actually execute the channel creation
   const executeChannelCreation = async (
     startingChannelNumberValue,
@@ -839,18 +817,6 @@ const StreamsTable = ({ onReady }) => {
     }
   };
 
-  const loadNextHighestChannelNumber = async () => {
-    setHighestNumberLoading(true);
-    try {
-      const n = await API.getNextHighestChannelNumber();
-      if (Number.isFinite(n)) {
-        setNextHighestNumber(n);
-      }
-    } finally {
-      setHighestNumberLoading(false);
-    }
-  };
-
   // Handle confirming the channel numbering modal
   const handleChannelNumberingConfirm = async () => {
     // Save the choice if user wants to remember it
@@ -872,7 +838,7 @@ const StreamsTable = ({ onReady }) => {
         : numberingMode === 'auto'
           ? 0
           : numberingMode === 'highest'
-            ? Number(nextHighestNumber)
+            ? -1
             : Number(customStartNumber);
 
     setChannelNumberingModalOpen(false);
@@ -882,14 +848,8 @@ const StreamsTable = ({ onReady }) => {
     );
   };
 
-  const handleBulkNumberingModeChange = async (nextMode) => {
+  const handleBulkNumberingModeChange = (nextMode) => {
     setNumberingMode(nextMode);
-
-    if (nextMode !== 'highest') {
-      return;
-    }
-
-    await loadNextHighestChannelNumber();
   };
 
   const editStream = async (stream = null) => {
@@ -986,10 +946,7 @@ const StreamsTable = ({ onReady }) => {
       } else if (savedMode === 'auto') {
         channelNumberValue = 0;
       } else if (savedMode === 'highest') {
-        channelNumberValue = await getNextHighestChannelNumberOrAbort();
-        if (channelNumberValue === null) {
-          return;
-        }
+        channelNumberValue = -1;
       } else {
         channelNumberValue = Number(savedChannelNumber);
       }
@@ -1002,9 +959,6 @@ const StreamsTable = ({ onReady }) => {
     } else {
       // Show the modal to let user choose
       setCurrentStreamForChannel(stream);
-      if (singleChannelMode === 'highest') {
-        await loadNextHighestChannelNumber();
-      }
       setSingleChannelModalOpen(true);
     }
   };
@@ -1062,7 +1016,7 @@ const StreamsTable = ({ onReady }) => {
         : singleChannelMode === 'auto'
           ? 0
           : singleChannelMode === 'highest'
-            ? Number(nextHighestNumber)
+            ? -1
             : Number(specificChannelNumber);
 
     setSingleChannelModalOpen(false);
@@ -1073,14 +1027,8 @@ const StreamsTable = ({ onReady }) => {
     );
   };
 
-  const handleSingleNumberingModeChange = async (nextMode) => {
+  const handleSingleNumberingModeChange = (nextMode) => {
     setSingleChannelMode(nextMode);
-
-    if (nextMode !== 'highest') {
-      return;
-    }
-
-    await loadNextHighestChannelNumber();
   };
 
   const addStreamsToChannel = async () => {
@@ -1849,9 +1797,7 @@ const StreamsTable = ({ onReady }) => {
         onClose={() => setChannelNumberingModalOpen(false)}
         mode={numberingMode}
         onModeChange={handleBulkNumberingModeChange}
-        numberValue={
-          numberingMode === 'highest' ? nextHighestNumber : customStartNumber
-        }
+        numberValue={customStartNumber}
         onNumberValueChange={setCustomStartNumber}
         rememberChoice={rememberChoice}
         onRememberChoiceChange={setRememberChoice}
@@ -1861,7 +1807,6 @@ const StreamsTable = ({ onReady }) => {
         selectedProfileIds={bulkSelectedProfileIds}
         onProfileIdsChange={setBulkSelectedProfileIds}
         channelProfiles={channelProfiles ? Object.values(channelProfiles) : []}
-        isHighestAvailableLoading={highestNumberLoading}
       />
 
       {/* Single Channel Creation Modal */}
@@ -1870,11 +1815,7 @@ const StreamsTable = ({ onReady }) => {
         onClose={() => setSingleChannelModalOpen(false)}
         mode={singleChannelMode}
         onModeChange={handleSingleNumberingModeChange}
-        numberValue={
-          singleChannelMode === 'highest'
-            ? nextHighestNumber
-            : specificChannelNumber
-        }
+        numberValue={specificChannelNumber}
         onNumberValueChange={setSpecificChannelNumber}
         rememberChoice={rememberSingleChoice}
         onRememberChoiceChange={setRememberSingleChoice}
@@ -1884,7 +1825,6 @@ const StreamsTable = ({ onReady }) => {
         selectedProfileIds={singleSelectedProfileIds}
         onProfileIdsChange={setSingleSelectedProfileIds}
         channelProfiles={channelProfiles ? Object.values(channelProfiles) : []}
-        isHighestAvailableLoading={highestNumberLoading}
       />
 
       <ConfirmationDialog

From 149ef17424dd441dc123b73dd05d3007680605d5 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 09:51:49 -0500
Subject: [PATCH 041/172] Update label for auto-assigning channel numbers after
 highest

---
 frontend/src/components/modals/CreateChannelModal.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/modals/CreateChannelModal.jsx b/frontend/src/components/modals/CreateChannelModal.jsx
index 1be2c54f..a1a42b29 100644
--- a/frontend/src/components/modals/CreateChannelModal.jsx
+++ b/frontend/src/components/modals/CreateChannelModal.jsx
@@ -129,7 +129,7 @@ const CreateChannelModal = ({
             />
             <Radio
               value="highest"
-              label="Start After Highest Channel"
+              label="Auto-Assign After Highest"
               description={
                 isBulk
                   ? 'Assign numbers sequentially starting after the current highest channel'

From 6b373c41cfe147cf576d32882cd939f72c269646 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 09:57:53 -0500
Subject: [PATCH 042/172] refactor: remove unused getNextHighestChannelNumber
 method and related variable

---
 frontend/src/api.js | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/frontend/src/api.js b/frontend/src/api.js
index 8b02b7b2..4fa3d46c 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -98,7 +98,6 @@ const request = async (url, options = {}) => {
 
 export default class API {
   static lastQueryParams = new URLSearchParams();
-  static nextHighestChannelNumberRequest = null;
 
   /**
    * A static method so we can do:  await API.getAuthToken()
@@ -256,42 +255,6 @@ export default class API {
     }
   }
 
-  static async getNextHighestChannelNumber() {
-    if (API.nextHighestChannelNumberRequest) {
-      return API.nextHighestChannelNumberRequest;
-    }
-
-    API.nextHighestChannelNumberRequest = (async () => {
-      try {
-        const params = new URLSearchParams({
-          page: '1',
-          page_size: '1',
-          ordering: '-channel_number',
-        });
-        const response = await request(
-          `${host}/api/channels/channels/?${params.toString()}`
-        );
-
-        const firstChannel = Array.isArray(response)
-          ? response[0]
-          : Array.isArray(response?.results)
-            ? response.results[0]
-            : null;
-
-        const highestChannelNumber = Number(firstChannel?.channel_number);
-        return Number.isFinite(highestChannelNumber) && highestChannelNumber >= 0
-          ? Math.floor(highestChannelNumber) + 1
-          : 1;
-      } catch (e) {
-        errorNotification('Failed to retrieve next highest channel number', e);
-      } finally {
-        API.nextHighestChannelNumberRequest = null;
-      }
-    })();
-
-    return API.nextHighestChannelNumberRequest;
-  }
-
   /**
    * Retrieve a lightweight summary of channels (id, name, logo_id,
    * channel_number, uuid, epg_data_id, channel_group_id).

From 0fbeb16970fa18e2c60133ed0ea724b6f2350857 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 11:08:25 -0500
Subject: [PATCH 043/172] changelog: Added thanks for recent PR, removed
 security change that never hit main branch, moved security to the top to
 match previous versions of changelog.

---
 CHANGELOG.md | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd9d3b66..41b00fb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Security
+
+- Updated frontend npm dependencies to resolve 1 high-severity vulnerability:
+  - Updated `flatted` to 3.4.1, resolving **high** unbounded recursion DoS in the `parse()` revive phase ([GHSA-25h7-pfq9-p65f](https://github.com/advisories/GHSA-25h7-pfq9-p65f))
+- Updated `Django` to 6.0.3 and `django-celery-beat` to 2.9.0, resolving new security vulnerabilities:
+  - [CVE-2026-25673](https://www.cve.org/CVERecord?id=CVE-2026-25673): Potential denial-of-service vulnerability in URLField via Unicode normalization on Windows (March 3, 2026)
+  - [CVE-2026-25674](https://www.cve.org/CVERecord?id=CVE-2026-25674): Potential incorrect permissions on newly created file system objects (March 3, 2026)
+
 ### Added
 
 - Configurable sidebar navigation ordering and visibility — Thanks [@jcasimir](https://github.com/jcasimir)
@@ -65,17 +73,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Removed a dead `onLogout` handler in `Sidebar` that called `logout()` and `window.location.reload()` but was never wired to any UI element.
 - EPG output when no `days` parameter is specified now excludes already-ended programs instead of returning all historical data.
 
-### Security
-
-- Updated frontend npm dependencies to resolve 1 high-severity vulnerability:
-  - Updated `flatted` to 3.4.1, resolving **high** unbounded recursion DoS in the `parse()` revive phase ([GHSA-25h7-pfq9-p65f](https://github.com/advisories/GHSA-25h7-pfq9-p65f))
-- Updated `Django` to 6.0.3 and `django-celery-beat` to 2.9.0, resolving new security vulnerabilities:
-  - [CVE-2026-25673](https://www.cve.org/CVERecord?id=CVE-2026-25673): Potential denial-of-service vulnerability in URLField via Unicode normalization on Windows (March 3, 2026)
-  - [CVE-2026-25674](https://www.cve.org/CVERecord?id=CVE-2026-25674): Potential incorrect permissions on newly created file system objects (March 3, 2026)
-
 ### Fixed
 
-- DVR series rule creation failing with a 500 error when the stored `series_rules` data contained corrupted (non-dict) entries. Added type guards on the getter, setter, and generic settings serializer to filter invalid entries on read and write. Hardened the EPG ignore list getters (`prefixes`, `suffixes`, `custom`) with the same pattern. Frontend settings parse and save now validate `series_rules` with `Array.isArray()`, matching the existing EPG field pattern, preventing corrupted data from being round-tripped back to the database. (Fixes #1059) 
+- DVR series rule creation failing with a 500 error when the stored `series_rules` data contained corrupted (non-dict) entries. Added type guards on the getter, setter, and generic settings serializer to filter invalid entries on read and write. Hardened the EPG ignore list getters (`prefixes`, `suffixes`, `custom`) with the same pattern. Frontend settings parse and save now validate `series_rules` with `Array.isArray()`, matching the existing EPG field pattern, preventing corrupted data from being round-tripped back to the database. (Fixes #1059) — Thanks [@CodeBormen](https://github.com/CodeBormen)
 - TS proxy clients stuck indefinitely in keepalive mode when a stream fails and never recovers (Fixes #1102, #1103) — Thanks [@cmcpherson274](https://github.com/cmcpherson274) & [@CodeBormen](https://github.com/CodeBormen)
   - **Keepalive duration cap**: Non-owner worker clients sending keepalive packets to hold a connection open during failover can now be held at most `MAX_KEEPALIVE_DURATION` seconds (default 300 s). If no real stream data has been received within that window, the client is disconnected with a warning log. The timer resets each time real data resumes, so independent stalls do not accumulate.
   - **`last_active` tracking**: `last_active` is now updated on every keepalive packet and on every real data chunk, so clients actively waiting during a failover are not incorrectly evicted as ghost clients by the heartbeat thread. The heartbeat thread now only refreshes the Redis TTL rather than updating `last_active`, ensuring the ghost-detection check reflects true client activity rather than heartbeat activity.
@@ -94,7 +94,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - **Resize stuck after releasing mouse outside window**: The `mouseup` event is not delivered when the pointer leaves the viewport, leaving the `mousemove` listener active indefinitely. Fixed by checking `event.buttons === 0` at the top of `handleResizeMove`; when no button is held the resize session is torn down immediately.
   - **Drag stuck after releasing mouse outside window**: Same root cause as the resize bug. Fixed by detecting `event.buttons === 0` in the `onDrag` handler and dispatching a synthetic `mouseup` event so react-draggable cleanly ends the drag session.
   - **Player draggable off screen**: The player could be dragged off any edge, making the header (and drag handle) unreachable. The player is now fully bounded: left and top edges are clamped to `x ≥ 0` / `y ≥ 0` so the header is always reachable, and right/bottom edges are clamped to the viewport. Size and position are also re-clamped automatically when the browser window is resized, with proportional scale-down if the saved size exceeds the new viewport.
-- **Security**: Any authenticated user could self-escalate privileges by sending `user_level`, `is_staff`, or `is_superuser` in a `PATCH /api/accounts/users/me/` request. The `/me/` endpoint now enforces an allowlist (`custom_properties`, `first_name`, `last_name`, `email`, `password`); any other fields return HTTP 400. Privilege-sensitive fields can only be changed via the admin-only `PATCH /api/accounts/users/{id}/` endpoint.
 - Double error notification when saving user preferences: `API.updateMe` was catching errors internally and displaying a notification before re-throwing, causing callers to display a second notification for the same failure.
 - Navigation preference saves from concurrent sessions could overwrite each other due to a double-merge race: the frontend was pre-merging `custom_properties` before sending, then the backend merged again against the DB value, causing the second session's write to silently drop keys set by the first. The frontend now sends only the delta; the backend merges authoritatively against the stored value.
 - Stale nav item IDs (e.g. from a previous nav structure) are now scrubbed from `navOrder` and `hiddenNav` on the next preference save, preventing unbounded growth of the `custom_properties` JSON field.

From 9654d3e29322ae45c2b7d3e2679ee317219ab9a9 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 14:32:59 -0500
Subject: [PATCH 044/172] changelog: Update changelog for highest channel
 number pr.

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41b00fb7..0dd970da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - **Persistent state**: Size, position, volume level, and mute state are now saved across sessions using a single `dispatcharr-player-prefs` localStorage key. Size and position are restored on next open (clamped to the current viewport); volume and mute are restored when the player initialises.
 - New Client Buffer proxy setting: new clients joining an active channel are now positioned a configurable number of seconds behind live rather than a fixed chunk count. The start position is determined by wall-clock chunk receive time (stored as a Redis sorted set alongside the buffer), so the buffer depth is consistent in seconds regardless of stream bitrate. Setting the value to `0` starts clients at live with no buffer. Defaults to 5 seconds. Existing chunk-count gating for the first client connecting to a channel is unchanged. The setting is exposed in Settings → Proxy as "New Client Buffer (seconds)".
 - Channel table filter for channels that have stale streams: A new "Has Stale Streams" filter option in the channel table header menu highlights and filters channels containing at least one stale stream. Channels with stale streams are visually distinguished with an orange tint. The filter is mutually exclusive with "Only Empty Channels". - Thanks [@JCBird1012](https://github.com/JCBird1012)
+- "Next Highest Channel" numbering mode when creating channels from streams: A new `Next Highest` option is available alongside `Provider`, `Auto`, and `Custom` when creating channels from the Streams table. Selecting it assigns channel numbers starting one above the current highest channel number; the next available number is fetched from the backend at selection time. — Thanks [@JCBird1012](https://github.com/JCBird1012)
 - TV Guide program cards now display richer metadata — Thanks [@CodeBormen](https://github.com/CodeBormen)
   - **Season/episode badges** (e.g. `S12E06`) extracted from EPG `<episode-num>` elements, `onscreen` episode strings (e.g. `S12 E6`, `S3E21`, `S8 E8 P2/2`), and as a last-resort fallback from description text patterns at parse time (3-tier pipeline). (Closes #1065)
   - **Episode subtitle** shown below the program title on guide cards; falls back to the short description when no subtitle is available.
@@ -75,6 +76,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Single-stream channel creation modal not opening correctly when clicking the channel-creation button on an individual stream row in the Streams table. — Thanks [@JCBird1012](https://github.com/JCBird1012)
 - DVR series rule creation failing with a 500 error when the stored `series_rules` data contained corrupted (non-dict) entries. Added type guards on the getter, setter, and generic settings serializer to filter invalid entries on read and write. Hardened the EPG ignore list getters (`prefixes`, `suffixes`, `custom`) with the same pattern. Frontend settings parse and save now validate `series_rules` with `Array.isArray()`, matching the existing EPG field pattern, preventing corrupted data from being round-tripped back to the database. (Fixes #1059) — Thanks [@CodeBormen](https://github.com/CodeBormen)
 - TS proxy clients stuck indefinitely in keepalive mode when a stream fails and never recovers (Fixes #1102, #1103) — Thanks [@cmcpherson274](https://github.com/cmcpherson274) & [@CodeBormen](https://github.com/CodeBormen)
   - **Keepalive duration cap**: Non-owner worker clients sending keepalive packets to hold a connection open during failover can now be held at most `MAX_KEEPALIVE_DURATION` seconds (default 300 s). If no real stream data has been received within that window, the client is disconnected with a warning log. The timer resets each time real data resumes, so independent stalls do not accumulate.

From c0340c92506fe15b36b5f3d8a20c0c93936201d5 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 14:39:18 -0500
Subject: [PATCH 045/172] changelog: Added missed issue for recent pr.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dd970da..6196cb10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - **Persistent state**: Size, position, volume level, and mute state are now saved across sessions using a single `dispatcharr-player-prefs` localStorage key. Size and position are restored on next open (clamped to the current viewport); volume and mute are restored when the player initialises.
 - New Client Buffer proxy setting: new clients joining an active channel are now positioned a configurable number of seconds behind live rather than a fixed chunk count. The start position is determined by wall-clock chunk receive time (stored as a Redis sorted set alongside the buffer), so the buffer depth is consistent in seconds regardless of stream bitrate. Setting the value to `0` starts clients at live with no buffer. Defaults to 5 seconds. Existing chunk-count gating for the first client connecting to a channel is unchanged. The setting is exposed in Settings → Proxy as "New Client Buffer (seconds)".
 - Channel table filter for channels that have stale streams: A new "Has Stale Streams" filter option in the channel table header menu highlights and filters channels containing at least one stale stream. Channels with stale streams are visually distinguished with an orange tint. The filter is mutually exclusive with "Only Empty Channels". - Thanks [@JCBird1012](https://github.com/JCBird1012)
-- "Next Highest Channel" numbering mode when creating channels from streams: A new `Next Highest` option is available alongside `Provider`, `Auto`, and `Custom` when creating channels from the Streams table. Selecting it assigns channel numbers starting one above the current highest channel number; the next available number is fetched from the backend at selection time. — Thanks [@JCBird1012](https://github.com/JCBird1012)
+- "Next Highest Channel" numbering mode when creating channels from streams: A new `Next Highest` option is available alongside `Provider`, `Auto`, and `Custom` when creating channels from the Streams table. Selecting it assigns channel numbers starting one above the current highest channel number; the next available number is fetched from the backend at selection time. (Closes #1000) — Thanks [@JCBird1012](https://github.com/JCBird1012)
 - TV Guide program cards now display richer metadata — Thanks [@CodeBormen](https://github.com/CodeBormen)
   - **Season/episode badges** (e.g. `S12E06`) extracted from EPG `<episode-num>` elements, `onscreen` episode strings (e.g. `S12 E6`, `S3E21`, `S8 E8 P2/2`), and as a last-resort fallback from description text patterns at parse time (3-tier pipeline). (Closes #1065)
   - **Episode subtitle** shown below the program title on guide cards; falls back to the short description when no subtitle is available.

From 50d90ab0ee204aac38d6ba7db4fbd2193d12d55f Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Tue, 17 Mar 2026 21:25:50 +0000
Subject: [PATCH 046/172] Release v0.21.0

---
 CHANGELOG.md | 2 ++
 version.py   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6196cb10..3ff2ac40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.21.0] - 2026-03-17
+
 ### Security
 
 - Updated frontend npm dependencies to resolve 1 high-severity vulnerability:
diff --git a/version.py b/version.py
index 22612739..f97aef79 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
 """
 Dispatcharr version information.
 """
-__version__ = '0.20.2'  # Follow semantic versioning (MAJOR.MINOR.PATCH)
+__version__ = '0.21.0'  # Follow semantic versioning (MAJOR.MINOR.PATCH)
 __timestamp__ = None    # Set during CI/CD build process

From 08b2e92920f576f0c05d53eaf37d3cb211562732 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 16:44:20 -0500
Subject: [PATCH 047/172] Update GitHub Actions to use latest versions of
 checkout, Docker Buildx, and login actions

---
 .github/workflows/base-image.yml | 18 +++++++++---------
 .github/workflows/ci.yml         | 18 +++++++++---------
 .github/workflows/release.yml    | 20 ++++++++++----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/base-image.yml b/.github/workflows/base-image.yml
index e3a8a4ee..7277f788 100644
--- a/.github/workflows/base-image.yml
+++ b/.github/workflows/base-image.yml
@@ -28,7 +28,7 @@ jobs:
       branch_tag: ${{ steps.meta.outputs.branch_tag }}
       timestamp: ${{ steps.timestamp.outputs.timestamp }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -74,7 +74,7 @@ jobs:
             runner: ubuntu-24.04-arm
     runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -85,17 +85,17 @@ jobs:
           git config user.email "actions@github.com"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -124,7 +124,7 @@ jobs:
             build_version=DispatcharrBase version: ${{ needs.prepare.outputs.branch_tag }}-${{ needs.prepare.outputs.timestamp }}
 
       - name: Build and push Docker base image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/DispatcharrBase
@@ -149,17 +149,17 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf5b6040..19287b83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       timestamp: ${{ steps.timestamp.outputs.timestamp }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -83,7 +83,7 @@ jobs:
     runs-on: ${{ matrix.runner }}
     # no per-job outputs here; shared metadata comes from the `prepare` job
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -103,17 +103,17 @@ jobs:
           fi
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -142,7 +142,7 @@ jobs:
             build_version=Dispatcharr version: ${{ needs.prepare.outputs.version }}-${{ needs.prepare.outputs.timestamp }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
@@ -174,17 +174,17 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9186541d..cd218571 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
       repo_name: ${{ steps.meta.outputs.repo_name }}
       timestamp: ${{ steps.timestamp.outputs.timestamp }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -83,7 +83,7 @@ jobs:
             runner: ubuntu-24.04-arm
     runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -95,17 +95,17 @@ jobs:
           git config user.email "actions@github.com"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -134,7 +134,7 @@ jobs:
             build_version=Dispatcharr version: ${{ needs.prepare.outputs.new_version }} Build date: ${{ needs.prepare.outputs.timestamp }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true
@@ -157,17 +157,17 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -228,7 +228,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: v${{ needs.prepare.outputs.new_version }}
           name: Release v${{ needs.prepare.outputs.new_version }}

From 19d3f4258f4abbaca0541b87b809e2293ff325b6 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Tue, 17 Mar 2026 17:46:13 -0500
Subject: [PATCH 048/172] Add /data/backups to DATA_DIRS

Corrects issue with user ownership migration on previous installations with /data/backups in-use
---
 docker/init/03-init-dispatcharr.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/init/03-init-dispatcharr.sh b/docker/init/03-init-dispatcharr.sh
index 5ff598a0..b580fe1e 100644
--- a/docker/init/03-init-dispatcharr.sh
+++ b/docker/init/03-init-dispatcharr.sh
@@ -2,6 +2,7 @@
 
 # Define directories that need to exist and be owned by PUID:PGID
 DATA_DIRS=(
+    "/data/backups"
     "/data/logos"
     "/data/recordings"
     "/data/uploads/m3us"

From 9e720f4fc7f009451f142e52ba4618fb40510efc Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Tue, 17 Mar 2026 18:27:19 -0500
Subject: [PATCH 049/172] fix: handle chown failures gracefully on external
 mounts

DATA_DIRS chown failures (NFS, SMB/CIFS, FUSE) crashed the container under set -e. The old image never chowned these directories, so users with external mounts had a working setup that broke on upgrade with zero config changes.

- Collect mkdir and chown failures per-directory instead of crashing
- Emit a single consolidated warning listing all affected directories with current ownership and remediation steps
- Container continues to start; Django reports at runtime if it cannot write to a specific directory
- Local volumes are unaffected: chown still runs and succeeds silently
---
 docker/init/03-init-dispatcharr.sh | 74 +++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 12 deletions(-)

diff --git a/docker/init/03-init-dispatcharr.sh b/docker/init/03-init-dispatcharr.sh
index b580fe1e..2e66e3ee 100644
--- a/docker/init/03-init-dispatcharr.sh
+++ b/docker/init/03-init-dispatcharr.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-# Define directories that need to exist and be owned by PUID:PGID
+# Define directories that need to exist and be owned by PUID:PGID.
+# DATA_DIRS may reside on external mounts (NFS, SMB/CIFS, FUSE) where
+# mkdir and chown can fail. Failures are collected and reported as a
+# single consolidated warning so the container still starts.
 DATA_DIRS=(
     "/data/backups"
     "/data/logos"
@@ -14,17 +17,24 @@ DATA_DIRS=(
     "/data/scripts"
 )
 
+# APP_DIRS live on the image layer and are always locally writable.
 APP_DIRS=(
     "/app/logo_cache"
     "/app/media"
     "/app/static"
 )
 
-# Create all directories
-for dir in "${DATA_DIRS[@]}" "${APP_DIRS[@]}"; do
+# Create app directories (image layer — always writable)
+for dir in "${APP_DIRS[@]}"; do
     mkdir -p "$dir"
 done
 
+# Create data directories, tolerating failures on external mounts
+_failed_mkdir=()
+for dir in "${DATA_DIRS[@]}"; do
+    _mkdir_err=$(mkdir -p "$dir" 2>&1) || _failed_mkdir+=("$dir ($_mkdir_err)")
+done
+
 # Ensure /app itself is owned by PUID:PGID (needed for uwsgi socket creation)
 if [ "$(id -u)" = "0" ] && [ -d "/app" ]; then
     if [ "$(stat -c '%u:%g' /app)" != "$PUID:$PGID" ]; then
@@ -50,11 +60,16 @@ fi
 # NOTE: mac doesn't run as root, so only manage permissions
 # if this script is running as root
 if [ "$(id -u)" = "0" ]; then
-    # Fix data directories (non-recursive to avoid touching user files)
+    # Fix data directories (non-recursive to avoid touching user files).
+    # Failures are collected rather than fatal — directories may be on
+    # external mounts (NFS, SMB/CIFS, FUSE) that reject chown.
+    _failed_chown=()
     for dir in "${DATA_DIRS[@]}"; do
-        if [ -d "$dir" ] && [ "$(stat -c '%u:%g' "$dir")" != "$PUID:$PGID" ]; then
-            echo "Fixing ownership for $dir"
-            chown "$PUID:$PGID" "$dir"
+        if [ -d "$dir" ] && [ "$(stat -c '%u:%g' "$dir" 2>/dev/null)" != "$PUID:$PGID" ]; then
+            _chown_err=$(chown "$PUID:$PGID" "$dir" 2>&1) || {
+                _current_owner=$(stat -c '%u:%g' "$dir" 2>/dev/null || echo "unknown")
+                _failed_chown+=("$dir (current: $_current_owner, error: $_chown_err)")
+            }
         fi
     done
 
@@ -70,11 +85,46 @@ if [ "$(id -u)" = "0" ]; then
     # No secondary check needed here — duplicating it could chown without updating
     # the sentinel, creating inconsistent state.
 
-    # Fix /data directory ownership (non-recursive)
-    if [ -d "/data" ] && [ "$(stat -c '%u:%g' /data)" != "$PUID:$PGID" ]; then
-        echo "Fixing ownership for /data (non-recursive)"
-        chown "$PUID:$PGID" /data
+    # Fix /data directory ownership (non-recursive).
+    # Tolerates failure for the same external-mount reasons as DATA_DIRS.
+    if [ -d "/data" ] && [ "$(stat -c '%u:%g' /data 2>/dev/null)" != "$PUID:$PGID" ]; then
+        _chown_err=$(chown "$PUID:$PGID" /data 2>&1) || {
+            _current_owner=$(stat -c '%u:%g' /data 2>/dev/null || echo "unknown")
+            _failed_chown+=("/data (current: $_current_owner, error: $_chown_err)")
+        }
     fi
 
-    chmod +x /data
+    chmod +x /data 2>/dev/null || true
+fi
+
+# Consolidated warning for all mkdir/chown failures.
+# Emitted outside the root guard so non-root mkdir failures are also reported.
+if [ ${#_failed_mkdir[@]} -gt 0 ] || [ ${#_failed_chown[@]} -gt 0 ]; then
+    echo ""
+    echo "================================================================"
+    echo "WARNING: Some data directories could not be created or updated."
+    echo "  This typically occurs with NFS, SMB/CIFS, or other external"
+    echo "  mounts that restrict ownership changes."
+    echo ""
+    if [ ${#_failed_mkdir[@]} -gt 0 ]; then
+        echo "  Could not create:"
+        for entry in "${_failed_mkdir[@]}"; do
+            echo "    - $entry"
+        done
+        echo ""
+    fi
+    if [ ${#_failed_chown[@]} -gt 0 ]; then
+        echo "  Could not set ownership to $PUID:$PGID:"
+        for entry in "${_failed_chown[@]}"; do
+            echo "    - $entry"
+        done
+        echo ""
+    fi
+    echo "  To fix, either:"
+    echo "    1. Set PUID/PGID to match your mount's owner"
+    echo "    2. Fix ownership on the host/NAS:"
+    echo "       sudo chown $PUID:$PGID <path>"
+    echo "    3. For SMB/CIFS: set uid=$PUID,gid=$PGID in mount options"
+    echo "================================================================"
+    echo ""
 fi

From cbaedec9055e7aa95d9533cfd7f55dd5084e3d65 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 18:41:27 -0500
Subject: [PATCH 050/172] Update GitHub Actions to use latest versions of
 checkout, Docker Buildx, and login actions

---
 .github/workflows/base-image.yml     | 20 ++++++++++----------
 .github/workflows/ci.yml             | 20 ++++++++++----------
 .github/workflows/docker-build.yml   |  8 ++++----
 .github/workflows/frontend-tests.yml |  2 +-
 .github/workflows/release.yml        | 20 ++++++++++----------
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/base-image.yml b/.github/workflows/base-image.yml
index 7277f788..4791de42 100644
--- a/.github/workflows/base-image.yml
+++ b/.github/workflows/base-image.yml
@@ -28,7 +28,7 @@ jobs:
       branch_tag: ${{ steps.meta.outputs.branch_tag }}
       timestamp: ${{ steps.timestamp.outputs.timestamp }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -74,7 +74,7 @@ jobs:
             runner: ubuntu-24.04-arm
     runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -85,17 +85,17 @@ jobs:
           git config user.email "actions@github.com"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -103,7 +103,7 @@ jobs:
 
       - name: Extract metadata for Docker
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             ghcr.io/${{ needs.prepare.outputs.repo_owner }}/${{ needs.prepare.outputs.repo_name }}
@@ -124,7 +124,7 @@ jobs:
             build_version=DispatcharrBase version: ${{ needs.prepare.outputs.branch_tag }}-${{ needs.prepare.outputs.timestamp }}
 
       - name: Build and push Docker base image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: ./docker/DispatcharrBase
@@ -149,17 +149,17 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19287b83..a5d4528b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       timestamp: ${{ steps.timestamp.outputs.timestamp }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -83,7 +83,7 @@ jobs:
     runs-on: ${{ matrix.runner }}
     # no per-job outputs here; shared metadata comes from the `prepare` job
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -103,17 +103,17 @@ jobs:
           fi
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -121,7 +121,7 @@ jobs:
 
       - name: Extract metadata for Docker
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             ghcr.io/${{ needs.prepare.outputs.repo_owner }}/${{ needs.prepare.outputs.repo_name }}
@@ -142,7 +142,7 @@ jobs:
             build_version=Dispatcharr version: ${{ needs.prepare.outputs.version }}-${{ needs.prepare.outputs.timestamp }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v7
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
@@ -174,17 +174,17 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 6ac6278f..c5d33220 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -15,13 +15,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -42,7 +42,7 @@ jobs:
         run: echo "REPO_NAME=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v7
         with:
           context: docker
           file: docker/Dockerfile
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 4e9e2505..4baa6271 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cd218571..6945d329 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
       repo_name: ${{ steps.meta.outputs.repo_name }}
       timestamp: ${{ steps.timestamp.outputs.timestamp }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -83,7 +83,7 @@ jobs:
             runner: ubuntu-24.04-arm
     runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -95,17 +95,17 @@ jobs:
           git config user.email "actions@github.com"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -113,7 +113,7 @@ jobs:
 
       - name: Extract metadata for Docker
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             ghcr.io/${{ needs.prepare.outputs.repo_owner }}/${{ needs.prepare.outputs.repo_name }}
@@ -134,7 +134,7 @@ jobs:
             build_version=Dispatcharr version: ${{ needs.prepare.outputs.new_version }} Build date: ${{ needs.prepare.outputs.timestamp }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v7
         with:
           context: .
           push: true
@@ -157,17 +157,17 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}

From 8d20c76d54d0e3299cb39df2e68046ebf08fee2c Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 18:52:31 -0500
Subject: [PATCH 051/172] changelog: Update changelog for backups fix.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ff2ac40..a6df2dfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Backups failing on previous installations where `/data/backups` already existed: `/data/backups` was missing from the `DATA_DIRS` list in the init script, causing the PUID/PGID ownership migration to skip the directory and leave it with incorrect permissions. — Thanks [@CodeBormen](https://github.com/CodeBormen)
+
 ## [0.21.0] - 2026-03-17
 
 ### Security

From 7e22172070cd7d1e24de55c159b581ee8e517206 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Tue, 17 Mar 2026 19:32:07 -0500
Subject: [PATCH 052/172] fix: remove PUID auto-detect

The auto-detect read PUID/PGID from /data/db ownership (UID 102 in pre-PUID images), causing all upgrading users to run as UID 102 instead of the expected UID 1000. This broke host-side access (SSH, WinSCP), made existing DATA_DIR files unwritable, and failed comskip on recordings created before the change.
---
 docker/init/01-user-setup.sh       | 23 +++++------------------
 docker/init/03-init-dispatcharr.sh |  2 +-
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/docker/init/01-user-setup.sh b/docker/init/01-user-setup.sh
index 43f0c514..522fcd8d 100644
--- a/docker/init/01-user-setup.sh
+++ b/docker/init/01-user-setup.sh
@@ -6,24 +6,11 @@
 # runtime behavior since all postgres operations run as $POSTGRES_USER
 # rather than the postgres system user.
 
-# Auto-detect PUID/PGID from existing data when not explicitly set.
-# Avoids a cross-UID chown on upgrade, which would fail on restricted
-# filesystems (NFS root_squash, CIFS). UID/GID 0 is excluded — PostgreSQL
-# refuses to run as root. Falls through to default 1000 for new installs.
-if [ -z "${PUID+x}" ] && [ -f "${POSTGRES_DIR}/PG_VERSION" ]; then
-    _data_uid=$(stat -c '%u' "${POSTGRES_DIR}/PG_VERSION")
-    if [ "$_data_uid" -ne 0 ] 2>/dev/null; then
-        export PUID=$_data_uid
-        echo "PUID not set — defaulting to existing data owner UID: $PUID"
-    fi
-fi
-if [ -z "${PGID+x}" ] && [ -f "${POSTGRES_DIR}/PG_VERSION" ]; then
-    _data_gid=$(stat -c '%g' "${POSTGRES_DIR}/PG_VERSION")
-    if [ "$_data_gid" -ne 0 ] 2>/dev/null; then
-        export PGID=$_data_gid
-        echo "PGID not set — defaulting to existing data owner GID: $PGID"
-    fi
-fi
+# Default PUID/PGID to 1000 when not explicitly set.
+# The old image ran Django as UID 1000 and PostgreSQL as UID 102. Since
+# DATA_DIRS and host-side files are owned by 1000, defaulting to 1000
+# preserves access for upgrading users without requiring configuration.
+# The DB ownership migration (102 → 1000) is handled by 02-postgres.sh.
 export PUID=${PUID:-1000}
 export PGID=${PGID:-1000}
 
diff --git a/docker/init/03-init-dispatcharr.sh b/docker/init/03-init-dispatcharr.sh
index 2e66e3ee..05bcb192 100644
--- a/docker/init/03-init-dispatcharr.sh
+++ b/docker/init/03-init-dispatcharr.sh
@@ -31,6 +31,7 @@ done
 
 # Create data directories, tolerating failures on external mounts
 _failed_mkdir=()
+_failed_chown=()
 for dir in "${DATA_DIRS[@]}"; do
     _mkdir_err=$(mkdir -p "$dir" 2>&1) || _failed_mkdir+=("$dir ($_mkdir_err)")
 done
@@ -63,7 +64,6 @@ if [ "$(id -u)" = "0" ]; then
     # Fix data directories (non-recursive to avoid touching user files).
     # Failures are collected rather than fatal — directories may be on
     # external mounts (NFS, SMB/CIFS, FUSE) that reject chown.
-    _failed_chown=()
     for dir in "${DATA_DIRS[@]}"; do
         if [ -d "$dir" ] && [ "$(stat -c '%u:%g' "$dir" 2>/dev/null)" != "$PUID:$PGID" ]; then
             _chown_err=$(chown "$PUID:$PGID" "$dir" 2>&1) || {

From ac1de7bb5d39c08dc9120e137ea827a55a08ef7b Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Wed, 18 Mar 2026 01:06:57 +0000
Subject: [PATCH 053/172] Release v0.21.1

---
 CHANGELOG.md | 2 ++
 version.py   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6df2dfe..5a47c910 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.21.1] - 2026-03-18
+
 ### Fixed
 
 - Backups failing on previous installations where `/data/backups` already existed: `/data/backups` was missing from the `DATA_DIRS` list in the init script, causing the PUID/PGID ownership migration to skip the directory and leave it with incorrect permissions. — Thanks [@CodeBormen](https://github.com/CodeBormen)
diff --git a/version.py b/version.py
index f97aef79..79cb7dfa 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
 """
 Dispatcharr version information.
 """
-__version__ = '0.21.0'  # Follow semantic versioning (MAJOR.MINOR.PATCH)
+__version__ = '0.21.1'  # Follow semantic versioning (MAJOR.MINOR.PATCH)
 __timestamp__ = None    # Set during CI/CD build process

From 161150f0f8dc32f7bc5b78faa3fc050fdc4804ea Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 17 Mar 2026 21:41:44 -0500
Subject: [PATCH 054/172] changelog: Update changelog for 0.21.1

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a47c910..71b8b8c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Backups failing on previous installations where `/data/backups` already existed: `/data/backups` was missing from the `DATA_DIRS` list in the init script, causing the PUID/PGID ownership migration to skip the directory and leave it with incorrect permissions. — Thanks [@CodeBormen](https://github.com/CodeBormen)
+- Docker container initialization fixes for PUID/PGID handling — Thanks [@CodeBormen](https://github.com/CodeBormen):
+  - Backups failing on previous installations where `/data/backups` already existed: `/data/backups` was missing from the `DATA_DIRS` list in the init script, causing the PUID/PGID ownership migration to skip the directory and leave it with incorrect permissions.
+  - Container startup failure on upgrade when data directories reside on external mounts (NFS, SMB/CIFS, FUSE): `chown` failures under `set -e` were crashing the container, breaking setups that worked fine on the previous image. Failures are now collected per-directory and reported as a consolidated warning; the container continues to start and Django reports at runtime if it cannot write a specific directory.
+  - Upgrading users running as UID 102 (the internal PostgreSQL system user) instead of the expected UID 1000: the PUID/PGID auto-detect introduced in v0.21.0 read ownership from `/data/db`, which was UID 102 in pre-PUID images, causing Django, file creation, and comskip to all run as the wrong user. PUID/PGID now default to 1000 (matching the original Django UID) rather than auto-detecting from data directory ownership.
 
 ## [0.21.0] - 2026-03-17
 

From 99a328ca171e864f1b0b9d301b82cbcf77716a08 Mon Sep 17 00:00:00 2001
From: dekzter <kappa118@gmail.com>
Date: Thu, 19 Mar 2026 12:45:01 -0400
Subject: [PATCH 055/172] fixed bug when filtering after category was selected

---
 apps/vod/api_views.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/vod/api_views.py b/apps/vod/api_views.py
index 3bd984e6..8b778c81 100644
--- a/apps/vod/api_views.py
+++ b/apps/vod/api_views.py
@@ -578,13 +578,15 @@ class UnifiedContentViewSet(viewsets.ReadOnlyModelViewSet):
                 "series.id IN (SELECT DISTINCT series_id FROM vod_m3useriesrelation msr JOIN m3u_m3uaccount ma ON msr.m3u_account_id = ma.id WHERE ma.is_active = true)"
             ]
 
-            params = []
+            movie_params = []
+            series_params = []
 
             if search:
                 where_conditions[0] += " AND LOWER(movies.name) LIKE %s"
                 where_conditions[1] += " AND LOWER(series.name) LIKE %s"
                 search_param = f"%{search.lower()}%"
-                params.extend([search_param, search_param])
+                movie_params.append(search_param)
+                series_params.append(search_param)
 
             if category:
                 if '|' in category:
@@ -592,15 +594,20 @@ class UnifiedContentViewSet(viewsets.ReadOnlyModelViewSet):
                     if cat_type == 'movie':
                         where_conditions[0] += " AND movies.id IN (SELECT movie_id FROM vod_m3umovierelation mmr JOIN vod_vodcategory c ON mmr.category_id = c.id WHERE c.name = %s)"
                         where_conditions[1] = "1=0"  # Exclude series
-                        params.append(cat_name)
+                        movie_params.append(cat_name)
+                        series_params = []  # no params needed for "1=0"
                     elif cat_type == 'series':
                         where_conditions[1] += " AND series.id IN (SELECT series_id FROM vod_m3useriesrelation msr JOIN vod_vodcategory c ON msr.category_id = c.id WHERE c.name = %s)"
                         where_conditions[0] = "1=0"  # Exclude movies
-                        params.append(cat_name)
+                        series_params.append(cat_name)
+                        movie_params = []  # no params needed for "1=0"
                 else:
                     where_conditions[0] += " AND movies.id IN (SELECT movie_id FROM vod_m3umovierelation mmr JOIN vod_vodcategory c ON mmr.category_id = c.id WHERE c.name = %s)"
                     where_conditions[1] += " AND series.id IN (SELECT series_id FROM vod_m3useriesrelation msr JOIN vod_vodcategory c ON msr.category_id = c.id WHERE c.name = %s)"
-                    params.extend([category, category])
+                    movie_params.append(category)
+                    series_params.append(category)
+
+            params = movie_params + series_params
 
             # Use UNION ALL with ORDER BY and LIMIT/OFFSET for true unified pagination
             # This is much more efficient than Python sorting

From ba0036445c102a41dbd92add1bb1eeac6ed79549 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 20 Mar 2026 10:23:52 -0500
Subject: [PATCH 056/172] Enhancement: Status filter for M3U group and VOD
 category filter modals: A new **All / Enabled / Disabled** segmented control
 is now shown alongside the text search input in the Live, VOD - Movies, and
 VOD - Series tabs of the M3U Group Filter modal. The status filter works in
 combination with the text search and also scopes the "Select Visible" /
 "Deselect Visible" buttons so they only act on the currently visible subset.
 (Closes #312)

---
 CHANGELOG.md                                  |  4 ++
 .../src/components/forms/LiveGroupFilter.jsx  | 37 ++++++++++++++-----
 .../components/forms/VODCategoryFilter.jsx    | 37 ++++++++++++++-----
 3 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71b8b8c1..e01acf2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Status filter for M3U group and VOD category filter modals: A new **All / Enabled / Disabled** segmented control is now shown alongside the text search input in the Live, VOD - Movies, and VOD - Series tabs of the M3U Group Filter modal. The status filter works in combination with the text search and also scopes the "Select Visible" / "Deselect Visible" buttons so they only act on the currently visible subset. (Closes #312)
+
 ## [0.21.1] - 2026-03-18
 
 ### Fixed
diff --git a/frontend/src/components/forms/LiveGroupFilter.jsx b/frontend/src/components/forms/LiveGroupFilter.jsx
index b06024e4..09d073f5 100644
--- a/frontend/src/components/forms/LiveGroupFilter.jsx
+++ b/frontend/src/components/forms/LiveGroupFilter.jsx
@@ -19,6 +19,7 @@ import {
   Popover,
   ScrollArea,
   Center,
+  SegmentedControl,
 } from '@mantine/core';
 import { Info } from 'lucide-react';
 import useChannelsStore from '../../store/channels';
@@ -54,6 +55,7 @@ const LiveGroupFilter = ({
   const streamProfiles = useStreamProfilesStore((s) => s.profiles);
   const fetchStreamProfiles = useStreamProfilesStore((s) => s.fetchProfiles);
   const [groupFilter, setGroupFilter] = useState('');
+  const [statusFilter, setStatusFilter] = useState('all');
   const [epgSources, setEpgSources] = useState([]);
 
   // Logo selection functionality
@@ -177,13 +179,22 @@ const LiveGroupFilter = ({
     setCurrentEditingGroupId(null);
   };
 
+  const isVisible = (group) => {
+    const matchesText = group.name
+      .toLowerCase()
+      .includes(groupFilter.toLowerCase());
+    const matchesStatus =
+      statusFilter === 'all' ||
+      (statusFilter === 'enabled' && group.enabled) ||
+      (statusFilter === 'disabled' && !group.enabled);
+    return matchesText && matchesStatus;
+  };
+
   const selectAll = () => {
     setGroupStates(
       groupStates.map((state) => ({
         ...state,
-        enabled: state.name.toLowerCase().includes(groupFilter.toLowerCase())
-          ? true
-          : state.enabled,
+        enabled: isVisible(state) ? true : state.enabled,
       }))
     );
   };
@@ -192,9 +203,7 @@ const LiveGroupFilter = ({
     setGroupStates(
       groupStates.map((state) => ({
         ...state,
-        enabled: state.name.toLowerCase().includes(groupFilter.toLowerCase())
-          ? false
-          : state.enabled,
+        enabled: isVisible(state) ? false : state.enabled,
       }))
     );
   };
@@ -220,7 +229,7 @@ const LiveGroupFilter = ({
         description="When disabled, new groups from the M3U source will be created but disabled by default. You can enable them manually later."
       />
 
-      <Flex gap="sm">
+      <Flex gap="sm" align="center">
         <TextInput
           placeholder="Filter groups..."
           value={groupFilter}
@@ -228,6 +237,16 @@ const LiveGroupFilter = ({
           style={{ flex: 1 }}
           size="xs"
         />
+        <SegmentedControl
+          value={statusFilter}
+          onChange={setStatusFilter}
+          size="xs"
+          data={[
+            { label: 'All', value: 'all' },
+            { label: 'Enabled', value: 'enabled' },
+            { label: 'Disabled', value: 'disabled' },
+          ]}
+        />
         <Button variant="default" size="xs" onClick={selectAll}>
           Select Visible
         </Button>
@@ -245,9 +264,7 @@ const LiveGroupFilter = ({
           verticalSpacing="xs"
         >
           {groupStates
-            .filter((group) =>
-              group.name.toLowerCase().includes(groupFilter.toLowerCase())
-            )
+            .filter((group) => isVisible(group))
             .sort((a, b) => a.name.localeCompare(b.name))
             .map((group) => (
               <Group
diff --git a/frontend/src/components/forms/VODCategoryFilter.jsx b/frontend/src/components/forms/VODCategoryFilter.jsx
index a6dccdd2..73932249 100644
--- a/frontend/src/components/forms/VODCategoryFilter.jsx
+++ b/frontend/src/components/forms/VODCategoryFilter.jsx
@@ -11,6 +11,7 @@ import {
   Divider,
   Box,
   Checkbox,
+  SegmentedControl,
 } from '@mantine/core';
 import { CircleCheck, CircleX } from 'lucide-react';
 import useVODStore from '../../store/useVODStore';
@@ -25,6 +26,7 @@ const VODCategoryFilter = ({
 }) => {
   const categories = useVODStore((s) => s.categories);
   const [filter, setFilter] = useState('');
+  const [statusFilter, setStatusFilter] = useState('all');
 
   useEffect(() => {
     if (Object.keys(categories).length === 0) {
@@ -64,13 +66,22 @@ const VODCategoryFilter = ({
     );
   };
 
+  const isVisible = (category) => {
+    const matchesText = category.name
+      .toLowerCase()
+      .includes(filter.toLowerCase());
+    const matchesStatus =
+      statusFilter === 'all' ||
+      (statusFilter === 'enabled' && category.enabled) ||
+      (statusFilter === 'disabled' && !category.enabled);
+    return matchesText && matchesStatus;
+  };
+
   const selectAll = () => {
     setCategoryStates(
       categoryStates.map((state) => ({
         ...state,
-        enabled: state.name.toLowerCase().includes(filter.toLowerCase())
-          ? true
-          : state.enabled,
+        enabled: isVisible(state) ? true : state.enabled,
       }))
     );
   };
@@ -79,9 +90,7 @@ const VODCategoryFilter = ({
     setCategoryStates(
       categoryStates.map((state) => ({
         ...state,
-        enabled: state.name.toLowerCase().includes(filter.toLowerCase())
-          ? false
-          : state.enabled,
+        enabled: isVisible(state) ? false : state.enabled,
       }))
     );
   };
@@ -98,7 +107,7 @@ const VODCategoryFilter = ({
         description="When disabled, new categories from the provider will be created but disabled by default. You can enable them manually later."
       />
 
-      <Flex gap="sm">
+      <Flex gap="sm" align="center">
         <TextInput
           placeholder="Filter categories..."
           value={filter}
@@ -106,6 +115,16 @@ const VODCategoryFilter = ({
           style={{ flex: 1 }}
           size="xs"
         />
+        <SegmentedControl
+          value={statusFilter}
+          onChange={setStatusFilter}
+          size="xs"
+          data={[
+            { label: 'All', value: 'all' },
+            { label: 'Enabled', value: 'enabled' },
+            { label: 'Disabled', value: 'disabled' },
+          ]}
+        />
         <Button variant="default" size="xs" onClick={selectAll}>
           Select Visible
         </Button>
@@ -121,9 +140,7 @@ const VODCategoryFilter = ({
           verticalSpacing="xs"
         >
           {categoryStates
-            .filter((category) => {
-              return category.name.toLowerCase().includes(filter.toLowerCase());
-            })
+            .filter((category) => isVisible(category))
             .sort((a, b) => a.name.localeCompare(b.name))
             .map((category) => (
               <Group

From 874f5fce6a6533c33ba350f4ba411c2986c61415 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 20 Mar 2026 11:37:51 -0500
Subject: [PATCH 057/172] Refactor: Removed unused imports from
 `M3UGroupFilter`, `LiveGroupFilter`, and `VODCategoryFilter` (`Yup`,
 `M3UProfiles`, several unused Mantine components, dead `OptionWithTooltip`
 component, duplicate lucide-react imports, and `Divider` in
 `VODCategoryFilter`). No behaviour changes.

---
 CHANGELOG.md                                  |  4 +++
 .../src/components/forms/LiveGroupFilter.jsx  |  3 +-
 .../src/components/forms/M3UGroupFilter.jsx   | 34 +------------------
 .../components/forms/VODCategoryFilter.jsx    |  1 -
 4 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e01acf2a..a2300474 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Status filter for M3U group and VOD category filter modals: A new **All / Enabled / Disabled** segmented control is now shown alongside the text search input in the Live, VOD - Movies, and VOD - Series tabs of the M3U Group Filter modal. The status filter works in combination with the text search and also scopes the "Select Visible" / "Deselect Visible" buttons so they only act on the currently visible subset. (Closes #312)
 
+### Changed
+
+- Frontend cleanup: removed unused imports from `M3UGroupFilter`, `LiveGroupFilter`, and `VODCategoryFilter` (`Yup`, `M3UProfiles`, several unused Mantine components, dead `OptionWithTooltip` component, duplicate lucide-react imports, and `Divider` in `VODCategoryFilter`). No behaviour changes.
+
 ## [0.21.1] - 2026-03-18
 
 ### Fixed
diff --git a/frontend/src/components/forms/LiveGroupFilter.jsx b/frontend/src/components/forms/LiveGroupFilter.jsx
index 09d073f5..4cfdaca6 100644
--- a/frontend/src/components/forms/LiveGroupFilter.jsx
+++ b/frontend/src/components/forms/LiveGroupFilter.jsx
@@ -21,10 +21,9 @@ import {
   Center,
   SegmentedControl,
 } from '@mantine/core';
-import { Info } from 'lucide-react';
+import { Info, CircleCheck, CircleX } from 'lucide-react';
 import useChannelsStore from '../../store/channels';
 import useStreamProfilesStore from '../../store/streamProfiles';
-import { CircleCheck, CircleX } from 'lucide-react';
 import { useChannelLogoSelection } from '../../hooks/useSmartLogos';
 import { FixedSizeList as List } from 'react-window';
 import LazyLogo from '../LazyLogo';
diff --git a/frontend/src/components/forms/M3UGroupFilter.jsx b/frontend/src/components/forms/M3UGroupFilter.jsx
index 0a7dc224..20713d4e 100644
--- a/frontend/src/components/forms/M3UGroupFilter.jsx
+++ b/frontend/src/components/forms/M3UGroupFilter.jsx
@@ -1,52 +1,20 @@
 // Modal.js
-import React, { useState, useEffect, forwardRef } from 'react';
-import * as Yup from 'yup';
+import React, { useState, useEffect } from 'react';
 import API from '../../api';
-import M3UProfiles from './M3UProfiles';
 import {
   LoadingOverlay,
-  TextInput,
   Button,
-  Checkbox,
   Modal,
   Flex,
-  NativeSelect,
-  FileInput,
-  Select,
-  Space,
-  Chip,
   Stack,
-  Group,
-  Center,
-  SimpleGrid,
-  Text,
-  NumberInput,
-  Divider,
-  Alert,
-  Box,
-  MultiSelect,
-  Tooltip,
   Tabs,
 } from '@mantine/core';
-import { Info } from 'lucide-react';
 import useChannelsStore from '../../store/channels';
 import useVODStore from '../../store/useVODStore';
-import { CircleCheck, CircleX } from 'lucide-react';
 import { notifications } from '@mantine/notifications';
 import LiveGroupFilter from './LiveGroupFilter';
 import VODCategoryFilter from './VODCategoryFilter';
 
-// Custom item component for MultiSelect with tooltip
-const OptionWithTooltip = forwardRef(
-  ({ label, description, ...others }, ref) => (
-    <Tooltip label={description} withArrow>
-      <div ref={ref} {...others}>
-        {label}
-      </div>
-    </Tooltip>
-  )
-);
-
 const M3UGroupFilter = ({ playlist = null, isOpen, onClose }) => {
   const channelGroups = useChannelsStore((s) => s.channelGroups);
   const fetchCategories = useVODStore((s) => s.fetchCategories);
diff --git a/frontend/src/components/forms/VODCategoryFilter.jsx b/frontend/src/components/forms/VODCategoryFilter.jsx
index 73932249..646aeca1 100644
--- a/frontend/src/components/forms/VODCategoryFilter.jsx
+++ b/frontend/src/components/forms/VODCategoryFilter.jsx
@@ -8,7 +8,6 @@ import {
   Group,
   SimpleGrid,
   Text,
-  Divider,
   Box,
   Checkbox,
   SegmentedControl,

From 36a8e92d941e29ce7cbcd5de715d792873a2dae9 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Fri, 20 Mar 2026 11:48:06 -0500
Subject: [PATCH 058/172] fix(dvr): prevent duplicate recordings after EPG
 refresh

- Replace ProgramData.id-based dedup with stable (tvg_id, start_time, end_time) key from Recording.custom_properties.program. ProgramData IDs change on every EPG refresh; the old dedup always passed after refresh, creating duplicates.

- Fix secondary timeslot guard to compare original program times (stored in custom_properties) instead of offset-adjusted Recording times. With DVR pre/post offsets configured, the old guard never matched.

- Add acquire_task_lock/release_task_lock to serialize concurrent evaluate_series_rules calls. Multiple EPG source refreshes firing evaluate_series_rules.delay() simultaneously raced to create duplicate recordings.
---
 apps/channels/tasks.py                        |  75 +-
 apps/channels/tests/test_series_rule_dedup.py | 718 ++++++++++++++++++
 2 files changed, 776 insertions(+), 17 deletions(-)
 create mode 100644 apps/channels/tests/test_series_rule_dedup.py

diff --git a/apps/channels/tasks.py b/apps/channels/tasks.py
index b5969cd1..449a3f4a 100755
--- a/apps/channels/tasks.py
+++ b/apps/channels/tasks.py
@@ -19,6 +19,7 @@ from rapidfuzz import fuzz
 from apps.channels.models import Channel
 from apps.epg.models import EPGData
 from core.models import CoreSettings
+from core.utils import acquire_task_lock, release_task_lock
 
 from django.db import OperationalError, close_old_connections
 from channels.layers import get_channel_layer
@@ -1070,12 +1071,39 @@ def match_single_channel_epg(channel_id):
 
 def evaluate_series_rules_impl(tvg_id: str | None = None):
     """Synchronous implementation of series rule evaluation; returns details for debugging."""
+    result = {"scheduled": 0, "details": []}
+
+    # Serialize all invocations to prevent concurrent evaluations from
+    # racing to create duplicate recordings (e.g. multiple EPG sources
+    # refreshing simultaneously each firing evaluate_series_rules.delay()).
+    # If Redis is unavailable, proceed without lock — the primary and
+    # secondary dedup guards still prevent duplicates.
+    lock_acquired = False
+    try:
+        lock_acquired = acquire_task_lock('evaluate_series_rules', 'all')
+        if not lock_acquired:
+            result["details"].append({"status": "skipped", "reason": "concurrent evaluation in progress"})
+            return result
+    except (ConnectionError, OSError):
+        logger.warning("Could not acquire series rule evaluation lock (Redis unavailable), proceeding without lock")
+
+    try:
+        return _evaluate_series_rules_locked(tvg_id, result)
+    finally:
+        if lock_acquired:
+            try:
+                release_task_lock('evaluate_series_rules', 'all')
+            except (ConnectionError, OSError):
+                logger.warning("Could not release series rule evaluation lock")
+
+
+def _evaluate_series_rules_locked(tvg_id, result):
+    """Inner implementation of series rule evaluation, called under lock."""
     from django.utils import timezone
     from apps.channels.models import Recording, Channel
     from apps.epg.models import EPGData, ProgramData
 
     rules = CoreSettings.get_dvr_series_rules()
-    result = {"scheduled": 0, "details": []}
     if not isinstance(rules, list) or not rules:
         return result
 
@@ -1089,14 +1117,23 @@ def evaluate_series_rules_impl(tvg_id: str | None = None):
     now = timezone.now()
     horizon = now + timedelta(days=7)
 
-    # Preload existing recordings' program ids to avoid duplicates
-    existing_program_ids = set()
-    for rec in Recording.objects.all().only("custom_properties"):
+    # Preload existing recordings keyed by stable program attributes that
+    # survive EPG refreshes (tvg_id + original start/end times stored in
+    # custom_properties).  ProgramData.id changes on every EPG refresh so
+    # it cannot be used for deduplication.  Only load future recordings
+    # to bound the set size — past recordings cannot collide with newly
+    # scheduled future programs.
+    existing_program_keys = set()
+    for cp in Recording.objects.filter(
+        end_time__gte=now,
+    ).values_list("custom_properties", flat=True):
         try:
-            pid = rec.custom_properties.get("program", {}).get("id") if rec.custom_properties else None
-            if pid is not None:
-                # Normalize to string for consistent comparisons
-                existing_program_ids.add(str(pid))
+            prog_data = (cp or {}).get("program", {})
+            tvg_id_val = prog_data.get("tvg_id")
+            st = prog_data.get("start_time")
+            et = prog_data.get("end_time")
+            if tvg_id_val and st and et:
+                existing_program_keys.add((str(tvg_id_val), str(st), str(et)))
         except Exception:
             continue
 
@@ -1191,17 +1228,21 @@ def evaluate_series_rules_impl(tvg_id: str | None = None):
         created_here = 0
         for prog in unique_programs:
             try:
-                # Skip if already scheduled by program id
-                if str(prog.id) in existing_program_ids:
+                # Skip if a recording already exists for this exact airing
+                # (keyed by tvg_id + original program times, which are stable
+                # across EPG refreshes unlike ProgramData.id).
+                prog_key = (str(prog.tvg_id), prog.start_time.isoformat(), prog.end_time.isoformat())
+                if prog_key in existing_program_keys:
                     continue
-                # Extra guard: skip if a recording exists for the same channel + timeslot
+                # Extra guard: DB query using the same stable attributes
+                # stored in custom_properties (unadjusted program times,
+                # not offset-adjusted Recording.start_time/end_time).
                 try:
-                    from django.db.models import Q
                     if Recording.objects.filter(
-                        channel=channel,
-                        start_time=prog.start_time,
-                        end_time=prog.end_time,
-                    ).filter(Q(custom_properties__program__id=prog.id) | Q(custom_properties__program__title=prog.title)).exists():
+                        custom_properties__program__tvg_id=prog.tvg_id,
+                        custom_properties__program__start_time=prog.start_time.isoformat(),
+                        custom_properties__program__end_time=prog.end_time.isoformat(),
+                    ).exists():
                         continue
                 except Exception:
                     continue  # already scheduled/recorded
@@ -1245,7 +1286,7 @@ def evaluate_series_rules_impl(tvg_id: str | None = None):
                         }
                     },
                 )
-                existing_program_ids.add(str(prog.id))
+                existing_program_keys.add(prog_key)
                 created_here += 1
                 try:
                     prefetch_recording_artwork.apply_async(args=[rec.id], countdown=1)
diff --git a/apps/channels/tests/test_series_rule_dedup.py b/apps/channels/tests/test_series_rule_dedup.py
new file mode 100644
index 00000000..33aff695
--- /dev/null
+++ b/apps/channels/tests/test_series_rule_dedup.py
@@ -0,0 +1,718 @@
+"""Tests for series rule evaluation deduplication.
+
+Unit tests verify the dedup logic in evaluate_series_rules_impl.
+Integration tests exercise the full path: EPG refresh → series rule
+evaluation → Recording creation → post_save signal chain.
+"""
+from datetime import timedelta
+from unittest.mock import patch, MagicMock
+
+from django.test import TestCase
+from django.utils import timezone
+
+from apps.channels.models import Channel, Recording
+from apps.epg.models import EPGSource, EPGData, ProgramData
+from core.models import CoreSettings
+
+
+def _set_series_rules(rules):
+    """Helper to store series rules in CoreSettings."""
+    CoreSettings.set_dvr_series_rules(rules)
+
+
+def _set_dvr_offsets(pre_min=0, post_min=0):
+    """Helper to store DVR pre/post offsets."""
+    CoreSettings._update_group("dvr_settings", "DVR Settings", {
+        "pre_offset_minutes": pre_min,
+        "post_offset_minutes": post_min,
+    })
+
+
+class SeriesRuleDedupBaseTestCase(TestCase):
+    """Shared setup for series rule dedup tests."""
+
+    def setUp(self):
+        self.now = timezone.now()
+        self.epg_source = EPGSource.objects.create(
+            name="Test EPG", source_type="xmltv"
+        )
+        self.epg = EPGData.objects.create(
+            tvg_id="test.channel.1",
+            name="Test Channel EPG",
+            epg_source=self.epg_source,
+        )
+        self.channel = Channel.objects.create(
+            channel_number=1, name="Test Channel", epg_data=self.epg
+        )
+
+        _set_series_rules([{
+            "tvg_id": "test.channel.1",
+            "mode": "all",
+            "title": "Test Show",
+        }])
+        _set_dvr_offsets(pre_min=0, post_min=0)
+
+    def _create_program(self, hours_from_now=1, title="Test Show",
+                        sub_title="Episode 1", tvg_id="test.channel.1"):
+        """Create a ProgramData at the given offset."""
+        start = self.now + timedelta(hours=hours_from_now)
+        end = start + timedelta(hours=1)
+        return ProgramData.objects.create(
+            epg=self.epg,
+            tvg_id=tvg_id,
+            start_time=start,
+            end_time=end,
+            title=title,
+            sub_title=sub_title,
+        )
+
+    def _simulate_epg_refresh(self, programs_data):
+        """Delete all ProgramData and recreate with new IDs (simulates EPG refresh)."""
+        ProgramData.objects.filter(epg=self.epg).delete()
+        new_programs = []
+        for data in programs_data:
+            prog = ProgramData.objects.create(epg=self.epg, **data)
+            new_programs.append(prog)
+        return new_programs
+
+    def _program_data_for_refresh(self, prog):
+        """Build the dict needed by _simulate_epg_refresh from a ProgramData."""
+        return {
+            "tvg_id": prog.tvg_id,
+            "start_time": prog.start_time,
+            "end_time": prog.end_time,
+            "title": prog.title,
+            "sub_title": prog.sub_title,
+        }
+
+
+# ---------------------------------------------------------------------------
+# Unit tests: dedup logic in evaluate_series_rules_impl
+# ---------------------------------------------------------------------------
+
+@patch("apps.channels.tasks.prefetch_recording_artwork")
+@patch("apps.channels.signals.schedule_recording_task", return_value="mock-task-id")
+class ProgramIdStabilityTests(SeriesRuleDedupBaseTestCase):
+    """Verify dedup works after EPG refresh changes ProgramData IDs."""
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_no_duplicate_after_epg_refresh(self, mock_release, mock_lock,
+                                            mock_schedule, mock_artwork):
+        """Same program should not be recorded twice after EPG refresh."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        prog = self._create_program(hours_from_now=2)
+        old_id = prog.id
+        result1 = evaluate_series_rules_impl()
+        self.assertEqual(result1["scheduled"], 1)
+        self.assertEqual(Recording.objects.count(), 1)
+
+        new_programs = self._simulate_epg_refresh(
+            [self._program_data_for_refresh(prog)]
+        )
+        self.assertNotEqual(old_id, new_programs[0].id)
+
+        result2 = evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1)
+        self.assertEqual(result2["scheduled"], 0)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_no_duplicate_with_offsets_after_refresh(self, mock_release, mock_lock,
+                                                     mock_schedule, mock_artwork):
+        """Dedup works when DVR offsets shift Recording times away from program times."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        _set_dvr_offsets(pre_min=5, post_min=5)
+        prog = self._create_program(hours_from_now=2)
+        result1 = evaluate_series_rules_impl()
+        self.assertEqual(result1["scheduled"], 1)
+
+        rec = Recording.objects.first()
+        self.assertEqual(rec.start_time, prog.start_time - timedelta(minutes=5))
+        self.assertEqual(rec.end_time, prog.end_time + timedelta(minutes=5))
+
+        self._simulate_epg_refresh([self._program_data_for_refresh(prog)])
+        result2 = evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_different_episodes_still_recorded(self, mock_release, mock_lock,
+                                               mock_schedule, mock_artwork):
+        """Different episodes on the same channel should each get a recording."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        self._create_program(hours_from_now=2, sub_title="Episode 1")
+        self._create_program(hours_from_now=4, sub_title="Episode 2")
+        result = evaluate_series_rules_impl()
+        self.assertEqual(result["scheduled"], 2)
+        self.assertEqual(Recording.objects.count(), 2)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_new_episode_after_refresh_is_recorded(self, mock_release, mock_lock,
+                                                   mock_schedule, mock_artwork):
+        """A genuinely new episode appearing after EPG refresh should be recorded."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        prog = self._create_program(hours_from_now=2, sub_title="Episode 1")
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1)
+
+        self._simulate_epg_refresh([
+            self._program_data_for_refresh(prog),
+            {
+                "tvg_id": "test.channel.1",
+                "start_time": prog.end_time,
+                "end_time": prog.end_time + timedelta(hours=1),
+                "title": "Test Show",
+                "sub_title": "Episode 2",
+            },
+        ])
+
+        result2 = evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 2)
+        self.assertEqual(result2["scheduled"], 1)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_multiple_epg_refreshes_no_duplicates(self, mock_release, mock_lock,
+                                                   mock_schedule, mock_artwork):
+        """Multiple consecutive EPG refreshes should not accumulate duplicates."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        prog = self._create_program(hours_from_now=2)
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1)
+
+        for _ in range(5):
+            self._simulate_epg_refresh([self._program_data_for_refresh(prog)])
+            evaluate_series_rules_impl()
+
+        self.assertEqual(Recording.objects.count(), 1)
+
+
+@patch("apps.channels.tasks.prefetch_recording_artwork")
+@patch("apps.channels.signals.schedule_recording_task", return_value="mock-task-id")
+class ConcurrencyGuardTests(SeriesRuleDedupBaseTestCase):
+    """Verify the task lock prevents concurrent evaluation."""
+
+    def test_lock_acquired_and_released(self, mock_schedule, mock_artwork):
+        """evaluate_series_rules_impl acquires and releases the task lock."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        self._create_program(hours_from_now=2)
+
+        with patch("apps.channels.tasks.acquire_task_lock", return_value=True) as mock_lock, \
+             patch("apps.channels.tasks.release_task_lock") as mock_release:
+            evaluate_series_rules_impl()
+            mock_lock.assert_called_once_with('evaluate_series_rules', 'all')
+            mock_release.assert_called_once_with('evaluate_series_rules', 'all')
+
+    def test_skips_when_lock_held(self, mock_schedule, mock_artwork):
+        """Returns early with skip reason when lock is already held."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        self._create_program(hours_from_now=2)
+
+        with patch("apps.channels.tasks.acquire_task_lock", return_value=False):
+            result = evaluate_series_rules_impl()
+            self.assertEqual(result["scheduled"], 0)
+            self.assertTrue(
+                any(d.get("reason") == "concurrent evaluation in progress"
+                    for d in result["details"]),
+            )
+            self.assertEqual(Recording.objects.count(), 0)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_lock_released_on_exception(self, mock_release, mock_lock,
+                                        mock_schedule, mock_artwork):
+        """Lock is released even if the inner implementation raises."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        with patch("apps.channels.tasks._evaluate_series_rules_locked",
+                   side_effect=RuntimeError("test error")):
+            with self.assertRaises(RuntimeError):
+                evaluate_series_rules_impl()
+            mock_release.assert_called_once_with('evaluate_series_rules', 'all')
+
+
+@patch("apps.channels.tasks.prefetch_recording_artwork")
+@patch("apps.channels.signals.schedule_recording_task", return_value="mock-task-id")
+class SecondaryGuardTests(SeriesRuleDedupBaseTestCase):
+    """Verify the secondary DB guard uses stable program attributes."""
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_secondary_guard_catches_duplicate_with_offsets(self, mock_release, mock_lock,
+                                                            mock_schedule, mock_artwork):
+        """Secondary guard works with stale program IDs and DVR offsets."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        _set_dvr_offsets(pre_min=10, post_min=10)
+        prog = self._create_program(hours_from_now=2)
+
+        # Pre-existing recording with a stale program ID (from previous EPG refresh)
+        Recording.objects.create(
+            channel=self.channel,
+            start_time=prog.start_time - timedelta(minutes=10),
+            end_time=prog.end_time + timedelta(minutes=10),
+            custom_properties={
+                "program": {
+                    "id": 99999,
+                    "tvg_id": prog.tvg_id,
+                    "title": prog.title,
+                    "start_time": prog.start_time.isoformat(),
+                    "end_time": prog.end_time.isoformat(),
+                }
+            },
+        )
+
+        result = evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1)
+        self.assertEqual(result["scheduled"], 0)
+
+
+# ---------------------------------------------------------------------------
+# Integration tests: full path from EPG refresh through recording creation
+# ---------------------------------------------------------------------------
+
+@patch("apps.channels.tasks.prefetch_recording_artwork")
+@patch("apps.channels.signals.schedule_recording_task", return_value="mock-task-id")
+class IntegrationEPGRefreshTests(SeriesRuleDedupBaseTestCase):
+    """End-to-end tests simulating the EPG refresh → evaluate → record flow.
+
+    These exercise the full signal chain: evaluate_series_rules_impl creates
+    a Recording, the post_save signal fires schedule_recording_task, and
+    subsequent evaluations (after EPG refresh) must not create duplicates.
+    """
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_full_flow_single_episode_no_duplicates(self, mock_release, mock_lock,
+                                                     mock_schedule, mock_artwork):
+        """Simulate: create rule → evaluate → EPG refresh → re-evaluate.
+
+        The full recording lifecycle must result in exactly 1 recording.
+        """
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        # Initial EPG data
+        prog = self._create_program(hours_from_now=2, sub_title="Pilot")
+
+        # First evaluation creates the recording
+        result1 = evaluate_series_rules_impl()
+        self.assertEqual(result1["scheduled"], 1)
+        self.assertEqual(Recording.objects.count(), 1)
+
+        # Verify the recording was created with correct program metadata
+        rec = Recording.objects.first()
+        self.assertEqual(rec.custom_properties["program"]["tvg_id"], "test.channel.1")
+        self.assertEqual(rec.custom_properties["program"]["title"], "Test Show")
+        self.assertEqual(
+            rec.custom_properties["program"]["start_time"],
+            prog.start_time.isoformat()
+        )
+
+        # Verify the post_save signal scheduled a task
+        mock_schedule.assert_called()
+        initial_schedule_count = mock_schedule.call_count
+
+        # Simulate EPG refresh (programs get new DB IDs)
+        self._simulate_epg_refresh([self._program_data_for_refresh(prog)])
+
+        # Re-evaluate after refresh (this is what EPG refresh triggers)
+        result2 = evaluate_series_rules_impl()
+        self.assertEqual(result2["scheduled"], 0)
+        self.assertEqual(Recording.objects.count(), 1)
+
+        # No additional task scheduling should have occurred
+        self.assertEqual(mock_schedule.call_count, initial_schedule_count)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_full_flow_with_offsets_no_duplicates(self, mock_release, mock_lock,
+                                                   mock_schedule, mock_artwork):
+        """Full flow with DVR offsets: recording times differ from program times."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        _set_dvr_offsets(pre_min=5, post_min=10)
+        prog = self._create_program(hours_from_now=3, sub_title="Episode 1")
+
+        result1 = evaluate_series_rules_impl()
+        self.assertEqual(result1["scheduled"], 1)
+
+        rec = Recording.objects.first()
+        # Verify offset-adjusted recording times
+        self.assertEqual(rec.start_time, prog.start_time - timedelta(minutes=5))
+        self.assertEqual(rec.end_time, prog.end_time + timedelta(minutes=10))
+        # Verify original (unadjusted) program times in custom_properties
+        self.assertEqual(
+            rec.custom_properties["program"]["start_time"],
+            prog.start_time.isoformat()
+        )
+        self.assertEqual(
+            rec.custom_properties["program"]["end_time"],
+            prog.end_time.isoformat()
+        )
+
+        # EPG refresh + re-evaluate
+        self._simulate_epg_refresh([self._program_data_for_refresh(prog)])
+        result2 = evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1)
+        self.assertEqual(result2["scheduled"], 0)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_full_flow_multiple_episodes_across_refreshes(self, mock_release, mock_lock,
+                                                           mock_schedule, mock_artwork):
+        """New episodes appear across multiple EPG refreshes; each recorded once."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        ep1 = self._create_program(hours_from_now=2, sub_title="Episode 1")
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1)
+
+        # EPG refresh adds episode 2 alongside episode 1
+        ep1_data = self._program_data_for_refresh(ep1)
+        ep2_start = ep1.end_time
+        ep2_data = {
+            "tvg_id": "test.channel.1",
+            "start_time": ep2_start,
+            "end_time": ep2_start + timedelta(hours=1),
+            "title": "Test Show",
+            "sub_title": "Episode 2",
+        }
+        self._simulate_epg_refresh([ep1_data, ep2_data])
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 2)
+
+        # Another EPG refresh adds episode 3
+        ep3_start = ep2_start + timedelta(hours=1)
+        ep3_data = {
+            "tvg_id": "test.channel.1",
+            "start_time": ep3_start,
+            "end_time": ep3_start + timedelta(hours=1),
+            "title": "Test Show",
+            "sub_title": "Episode 3",
+        }
+        self._simulate_epg_refresh([ep1_data, ep2_data, ep3_data])
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 3)
+
+        # Final EPG refresh with no new episodes — count must stay at 3
+        self._simulate_epg_refresh([ep1_data, ep2_data, ep3_data])
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 3)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_full_flow_multiple_series_rules(self, mock_release, mock_lock,
+                                              mock_schedule, mock_artwork):
+        """Multiple series rules on different channels, each evaluated correctly."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        # Second channel with its own EPG
+        epg2 = EPGData.objects.create(
+            tvg_id="test.channel.2",
+            name="Channel 2 EPG",
+            epg_source=self.epg_source,
+        )
+        channel2 = Channel.objects.create(
+            channel_number=2, name="Test Channel 2", epg_data=epg2
+        )
+
+        _set_series_rules([
+            {"tvg_id": "test.channel.1", "mode": "all", "title": "Show A"},
+            {"tvg_id": "test.channel.2", "mode": "all", "title": "Show B"},
+        ])
+
+        # Programs on both channels
+        start1 = self.now + timedelta(hours=2)
+        prog1 = ProgramData.objects.create(
+            epg=self.epg, tvg_id="test.channel.1",
+            start_time=start1, end_time=start1 + timedelta(hours=1),
+            title="Show A", sub_title="Episode 1",
+        )
+        start2 = self.now + timedelta(hours=3)
+        prog2 = ProgramData.objects.create(
+            epg=epg2, tvg_id="test.channel.2",
+            start_time=start2, end_time=start2 + timedelta(hours=1),
+            title="Show B", sub_title="Episode 1",
+        )
+
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 2)
+        self.assertEqual(Recording.objects.filter(channel=self.channel).count(), 1)
+        self.assertEqual(Recording.objects.filter(channel=channel2).count(), 1)
+
+        # EPG refresh for both channels
+        ProgramData.objects.filter(epg=self.epg).delete()
+        ProgramData.objects.filter(epg=epg2).delete()
+        ProgramData.objects.create(
+            epg=self.epg, tvg_id="test.channel.1",
+            start_time=start1, end_time=start1 + timedelta(hours=1),
+            title="Show A", sub_title="Episode 1",
+        )
+        ProgramData.objects.create(
+            epg=epg2, tvg_id="test.channel.2",
+            start_time=start2, end_time=start2 + timedelta(hours=1),
+            title="Show B", sub_title="Episode 1",
+        )
+
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 2,
+                         "No duplicates across multiple series rules after EPG refresh")
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_full_flow_rapid_epg_refreshes_simulate_user_report(
+        self, mock_release, mock_lock, mock_schedule, mock_artwork
+    ):
+        """Reproduce the user-reported scenario: series rule + multiple EPG refreshes
+        causing count to balloon from 6 to 25 and 5 simultaneous recordings.
+
+        Simulates 6 episodes with 5 EPG refreshes (each assigning new ProgramData IDs).
+        """
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        # Create 6 episodes (the user had "next of 6")
+        episodes = []
+        for i in range(6):
+            start = self.now + timedelta(hours=2 + i * 2)
+            episodes.append({
+                "tvg_id": "test.channel.1",
+                "start_time": start,
+                "end_time": start + timedelta(hours=1),
+                "title": "Test Show",
+                "sub_title": f"Episode {i + 1}",
+            })
+
+        # Create initial ProgramData
+        for ep in episodes:
+            ProgramData.objects.create(epg=self.epg, **ep)
+
+        # First evaluation: should create exactly 6 recordings
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 6)
+
+        # Simulate 5 EPG refreshes (the user saw count balloon to 25)
+        for refresh_num in range(5):
+            self._simulate_epg_refresh(episodes)
+            result = evaluate_series_rules_impl()
+            self.assertEqual(
+                Recording.objects.count(), 6,
+                f"After EPG refresh #{refresh_num + 1}, expected 6 recordings "
+                f"but got {Recording.objects.count()}"
+            )
+            self.assertEqual(result["scheduled"], 0)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_full_flow_recording_survives_program_removal_and_readd(
+        self, mock_release, mock_lock, mock_schedule, mock_artwork
+    ):
+        """Program temporarily disappears from EPG then reappears — no duplicate."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        prog = self._create_program(hours_from_now=2, sub_title="Episode 1")
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1)
+
+        # EPG refresh removes the program entirely
+        self._simulate_epg_refresh([])
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1,
+                         "Existing recording preserved when program disappears from EPG")
+
+        # EPG refresh adds the program back (new ID)
+        self._simulate_epg_refresh([self._program_data_for_refresh(prog)])
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1,
+                         "No duplicate when program reappears with new ID")
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_full_flow_celery_task_wrapper_calls_impl(self, mock_release, mock_lock,
+                                                       mock_schedule, mock_artwork):
+        """The @shared_task evaluate_series_rules delegates to _impl correctly."""
+        from apps.channels.tasks import evaluate_series_rules
+
+        self._create_program(hours_from_now=2)
+        result = evaluate_series_rules()
+        self.assertEqual(result["scheduled"], 1)
+        self.assertEqual(Recording.objects.count(), 1)
+
+        # Call again (simulating a second EPG refresh trigger)
+        result2 = evaluate_series_rules()
+        self.assertEqual(result2["scheduled"], 0)
+        self.assertEqual(Recording.objects.count(), 1)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_full_flow_tvg_id_scoped_evaluation(self, mock_release, mock_lock,
+                                                 mock_schedule, mock_artwork):
+        """Scoped evaluation (tvg_id parameter) still prevents duplicates."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        prog = self._create_program(hours_from_now=2)
+        result1 = evaluate_series_rules_impl(tvg_id="test.channel.1")
+        self.assertEqual(result1["scheduled"], 1)
+
+        self._simulate_epg_refresh([self._program_data_for_refresh(prog)])
+        result2 = evaluate_series_rules_impl(tvg_id="test.channel.1")
+        self.assertEqual(result2["scheduled"], 0)
+        self.assertEqual(Recording.objects.count(), 1)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_full_flow_offset_change_between_refreshes(self, mock_release, mock_lock,
+                                                        mock_schedule, mock_artwork):
+        """Changing DVR offsets between EPG refreshes doesn't create duplicates.
+
+        Even though Recording.start_time/end_time change when offsets change,
+        the dedup key uses the original program times from custom_properties.
+        """
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        _set_dvr_offsets(pre_min=5, post_min=5)
+        prog = self._create_program(hours_from_now=2)
+        evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1)
+
+        rec = Recording.objects.first()
+        original_start = rec.start_time
+        original_end = rec.end_time
+
+        # Change offsets
+        _set_dvr_offsets(pre_min=10, post_min=15)
+
+        # EPG refresh
+        self._simulate_epg_refresh([self._program_data_for_refresh(prog)])
+        result = evaluate_series_rules_impl()
+        self.assertEqual(Recording.objects.count(), 1,
+                         "Changing offsets between refreshes should not create duplicates")
+        self.assertEqual(result["scheduled"], 0)
+
+
+# ---------------------------------------------------------------------------
+# Edge case tests: Redis unavailability, non-series recordings, robustness
+# ---------------------------------------------------------------------------
+
+@patch("apps.channels.tasks.prefetch_recording_artwork")
+@patch("apps.channels.signals.schedule_recording_task", return_value="mock-task-id")
+class RedisUnavailabilityTests(SeriesRuleDedupBaseTestCase):
+    """Verify evaluation works when Redis is unavailable (lock cannot be acquired)."""
+
+    def test_proceeds_when_redis_down(self, mock_schedule, mock_artwork):
+        """Evaluation succeeds (with dedup guards) when Redis raises on lock acquire."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        self._create_program(hours_from_now=2)
+
+        with patch("apps.channels.tasks.acquire_task_lock",
+                   side_effect=ConnectionError("Redis unavailable")):
+            result = evaluate_series_rules_impl()
+            self.assertEqual(result["scheduled"], 1)
+            self.assertEqual(Recording.objects.count(), 1)
+
+    def test_dedup_still_works_without_lock(self, mock_schedule, mock_artwork):
+        """Dedup guards prevent duplicates even when the lock is unavailable."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        prog = self._create_program(hours_from_now=2)
+
+        # First call: Redis down, proceeds without lock
+        with patch("apps.channels.tasks.acquire_task_lock",
+                   side_effect=ConnectionError("Redis unavailable")):
+            evaluate_series_rules_impl()
+            self.assertEqual(Recording.objects.count(), 1)
+
+        # EPG refresh
+        self._simulate_epg_refresh([self._program_data_for_refresh(prog)])
+
+        # Second call: Redis still down
+        with patch("apps.channels.tasks.acquire_task_lock",
+                   side_effect=ConnectionError("Redis unavailable")):
+            result = evaluate_series_rules_impl()
+            self.assertEqual(Recording.objects.count(), 1,
+                             "Dedup guards prevent duplicates even without lock")
+            self.assertEqual(result["scheduled"], 0)
+
+    def test_lock_not_released_when_not_acquired(self, mock_schedule, mock_artwork):
+        """release_task_lock is not called if acquire raised an exception."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        self._create_program(hours_from_now=2)
+
+        with patch("apps.channels.tasks.acquire_task_lock",
+                   side_effect=ConnectionError("Redis unavailable")), \
+             patch("apps.channels.tasks.release_task_lock") as mock_release:
+            evaluate_series_rules_impl()
+            mock_release.assert_not_called()
+
+
+@patch("apps.channels.tasks.prefetch_recording_artwork")
+@patch("apps.channels.signals.schedule_recording_task", return_value="mock-task-id")
+class NonSeriesRecordingTests(SeriesRuleDedupBaseTestCase):
+    """Verify non-series recordings don't interfere with series rule dedup."""
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_manual_recording_without_program_data_ignored(self, mock_release, mock_lock,
+                                                            mock_schedule, mock_artwork):
+        """Recordings without custom_properties.program are skipped by dedup key builder."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        # Manual recording with no program metadata
+        Recording.objects.create(
+            channel=self.channel,
+            start_time=self.now + timedelta(hours=2),
+            end_time=self.now + timedelta(hours=3),
+            custom_properties={},
+        )
+
+        prog = self._create_program(hours_from_now=2)
+        result = evaluate_series_rules_impl()
+        self.assertEqual(result["scheduled"], 1)
+        self.assertEqual(Recording.objects.count(), 2)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_recurring_rule_recording_does_not_interfere(self, mock_release, mock_lock,
+                                                          mock_schedule, mock_artwork):
+        """Recordings from recurring rules (custom_properties.rule) don't block series rules."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        Recording.objects.create(
+            channel=self.channel,
+            start_time=self.now + timedelta(hours=2),
+            end_time=self.now + timedelta(hours=3),
+            custom_properties={"rule": {"id": 1, "name": "Daily News"}},
+        )
+
+        prog = self._create_program(hours_from_now=2)
+        result = evaluate_series_rules_impl()
+        self.assertEqual(result["scheduled"], 1)
+        self.assertEqual(Recording.objects.count(), 2)
+
+    @patch("apps.channels.tasks.acquire_task_lock", return_value=True)
+    @patch("apps.channels.tasks.release_task_lock")
+    def test_recording_with_null_custom_properties_ignored(self, mock_release, mock_lock,
+                                                            mock_schedule, mock_artwork):
+        """Recordings with None custom_properties don't crash the dedup key builder."""
+        from apps.channels.tasks import evaluate_series_rules_impl
+
+        Recording.objects.create(
+            channel=self.channel,
+            start_time=self.now + timedelta(hours=2),
+            end_time=self.now + timedelta(hours=3),
+            custom_properties=None,
+        )
+
+        prog = self._create_program(hours_from_now=2)
+        result = evaluate_series_rules_impl()
+        self.assertEqual(result["scheduled"], 1)

From b5c13a00ce2ab5e9f03049987651bea9fec36e27 Mon Sep 17 00:00:00 2001
From: dekzter <kappa118@gmail.com>
Date: Fri, 20 Mar 2026 20:32:08 -0400
Subject: [PATCH 059/172] added support section

---
 README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index dddc672e..c0f97104 100644
--- a/README.md
+++ b/README.md
@@ -161,6 +161,21 @@ Have a question? Want to suggest a feature? Just want to say hi?\
 
 ---
 
+## 💖 Support Dispatcharr
+
+<img src="https://opencollective.com/dispatcharr/tiers/badge.svg" alt="Dispatcharr Open Collective" />
+
+Open Collective provides a transparent way for anyone who finds value in Dispatcharr to support things like:
+• Infrastructure costs (Domains, Servers, etc.)
+• Apple Developer Program and Google Play Developer accounts
+• Helping contributors dedicate more time to improving the project
+
+Support is completely optional, and Dispatcharr will always remain free and open-source.
+
+[Contribute here](https://opencollective.com/dispatcharr/contribute)
+
+---
+
 ### 🚀 _Happy Streaming! The Dispatcharr Team_
 
 Dispatcharr is a trademark of the Dispatcharr project.

From a8b217e2fbaa12f35148b806b37226c8d76b5db3 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 21 Mar 2026 13:06:10 -0500
Subject: [PATCH 060/172] docs: Slight reorganization of the readme. Fix link
 on Open Collective.

---
 README.md | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index c0f97104..53850d9c 100644
--- a/README.md
+++ b/README.md
@@ -146,14 +146,6 @@ A huge thank you to all the incredible open-source projects and libraries that p
 
 ---
 
-## ⚖️ License
-
-> Dispatcharr is licensed under **GNU AGPL v3.0**:
-
-For full license details, see [LICENSE](https://www.gnu.org/licenses/agpl-3.0.html).
-
----
-
 ## ✉️ Connect With Us
 
 Have a question? Want to suggest a feature? Just want to say hi?\
@@ -163,7 +155,7 @@ Have a question? Want to suggest a feature? Just want to say hi?\
 
 ## 💖 Support Dispatcharr
 
-<img src="https://opencollective.com/dispatcharr/tiers/badge.svg" alt="Dispatcharr Open Collective" />
+[![Dispatcharr Open Collective](https://opencollective.com/dispatcharr/tiers/badge.svg)](https://opencollective.com/dispatcharr/contribute)
 
 Open Collective provides a transparent way for anyone who finds value in Dispatcharr to support things like:
 • Infrastructure costs (Domains, Servers, etc.)
@@ -176,8 +168,12 @@ Support is completely optional, and Dispatcharr will always remain free and open
 
 ---
 
+## ⚖️ License & Legal
+
+Dispatcharr is licensed under **GNU AGPL v3.0**: For full license details, see [LICENSE](https://www.gnu.org/licenses/agpl-3.0.html).
+
+Dispatcharr is a trademark of the Dispatcharr project. Use of the Dispatcharr name or logo requires permission from the maintainers.
+
+---
+
 ### 🚀 _Happy Streaming! The Dispatcharr Team_
-
-Dispatcharr is a trademark of the Dispatcharr project.
-
-Use of the Dispatcharr name or logo requires permission from the maintainers.

From 3e12be3ac0dd4ec8eee268700eecaec9311abff7 Mon Sep 17 00:00:00 2001
From: SergeantPanda <61642231+SergeantPanda@users.noreply.github.com>
Date: Sat, 21 Mar 2026 13:15:46 -0500
Subject: [PATCH 061/172] Update Open Collective username in FUNDING.yml

---
 .github/FUNDING.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..c9a35e5a
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: dispatcharr # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From 7cd4abb6946a9c1a306918b6ee326279bc87f0a2 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 21 Mar 2026 14:07:30 -0500
Subject: [PATCH 062/172] Enhancement: Network Access settings: leaving a field
 blank no longer shows a validation error. The default CIDR range for that
 field is saved automatically and a "Defaults Restored" warning is displayed
 listing which fields were reset. (Closes #726)

---
 CHANGELOG.md                                  |  3 ++
 .../forms/settings/NetworkAccessForm.jsx      | 43 +++++++++++++++++--
 .../forms/settings/NetworkAccessFormUtils.js  |  4 ++
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2300474..bbc76777 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Frontend cleanup: removed unused imports from `M3UGroupFilter`, `LiveGroupFilter`, and `VODCategoryFilter` (`Yup`, `M3UProfiles`, several unused Mantine components, dead `OptionWithTooltip` component, duplicate lucide-react imports, and `Divider` in `VODCategoryFilter`). No behaviour changes.
+- Network Access settings: leaving a field blank no longer shows a validation error. The default CIDR range for that field is saved automatically and a "Defaults Restored" warning is displayed listing which fields were reset. (Closes #726)
+
+### Fixed
 
 ## [0.21.1] - 2026-03-18
 
diff --git a/frontend/src/components/forms/settings/NetworkAccessForm.jsx b/frontend/src/components/forms/settings/NetworkAccessForm.jsx
index 04ab60b0..ca165ce6 100644
--- a/frontend/src/components/forms/settings/NetworkAccessForm.jsx
+++ b/frontend/src/components/forms/settings/NetworkAccessForm.jsx
@@ -1,6 +1,6 @@
 import { NETWORK_ACCESS_OPTIONS } from '../../../constants.js';
 import useSettingsStore from '../../../store/settings.jsx';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { useForm } from '@mantine/form';
 import {
   checkSetting,
@@ -19,12 +19,14 @@ const NetworkAccessForm = React.memo(({ active }) => {
 
   const [networkAccessError, setNetworkAccessError] = useState(null);
   const [saved, setSaved] = useState(false);
+  const [restoredDefaults, setRestoredDefaults] = useState([]);
   const [networkAccessConfirmOpen, setNetworkAccessConfirmOpen] =
     useState(false);
   const [saving, setSaving] = useState(false);
   const [netNetworkAccessConfirmCIDRs, setNetNetworkAccessConfirmCIDRs] =
     useState([]);
   const [clientIpAddress, setClientIpAddress] = useState(null);
+  const pendingSaveValuesRef = useRef(null);
 
   const networkAccessForm = useForm({
     mode: 'controlled',
@@ -33,7 +35,10 @@ const NetworkAccessForm = React.memo(({ active }) => {
   });
 
   useEffect(() => {
-    if (!active) setSaved(false);
+    if (!active) {
+      setSaved(false);
+      setRestoredDefaults([]);
+    }
   }, [active]);
 
   useEffect(() => {
@@ -58,9 +63,31 @@ const NetworkAccessForm = React.memo(({ active }) => {
   const onNetworkAccessSubmit = async () => {
     setSaved(false);
     setNetworkAccessError(null);
+    setRestoredDefaults([]);
+
+    // Check for blank fields and substitute defaults before saving
+    const currentValues = networkAccessForm.getValues();
+    const defaults = getNetworkAccessDefaults();
+    const restoredLabels = [];
+    const submitValues = { ...currentValues };
+
+    Object.keys(currentValues).forEach((key) => {
+      if (!currentValues[key] || currentValues[key].trim() === '') {
+        submitValues[key] = defaults[key];
+        restoredLabels.push(NETWORK_ACCESS_OPTIONS[key]?.label || key);
+      }
+    });
+
+    if (restoredLabels.length > 0) {
+      networkAccessForm.setValues(submitValues);
+      setRestoredDefaults(restoredLabels);
+    }
+
+    pendingSaveValuesRef.current = submitValues;
+
     const check = await checkSetting({
       ...settings['network_access'],
-      value: networkAccessForm.getValues(), // Send as object
+      value: submitValues,
     });
 
     if (check.error && check.message) {
@@ -84,10 +111,12 @@ const NetworkAccessForm = React.memo(({ active }) => {
   const saveNetworkAccess = async () => {
     setSaved(false);
     setSaving(true);
+    const values =
+      pendingSaveValuesRef.current || networkAccessForm.getValues();
     try {
       await updateSetting({
         ...settings['network_access'],
-        value: networkAccessForm.getValues(), // Send as object
+        value: values,
       });
       setSaved(true);
     } catch (e) {
@@ -113,6 +142,12 @@ const NetworkAccessForm = React.memo(({ active }) => {
               title="Saved Successfully"
             ></Alert>
           )}
+          {restoredDefaults.length > 0 && (
+            <Alert variant="light" color="yellow" title="Defaults Restored">
+              The following fields were empty and have been restored to their
+              defaults: {restoredDefaults.join(', ')}
+            </Alert>
+          )}
           {networkAccessError && (
             <Alert
               variant="light"
diff --git a/frontend/src/utils/forms/settings/NetworkAccessFormUtils.js b/frontend/src/utils/forms/settings/NetworkAccessFormUtils.js
index 1a871571..ac863b0b 100644
--- a/frontend/src/utils/forms/settings/NetworkAccessFormUtils.js
+++ b/frontend/src/utils/forms/settings/NetworkAccessFormUtils.js
@@ -16,6 +16,10 @@ export const getNetworkAccessFormInitialValues = () => {
 export const getNetworkAccessFormValidation = () => {
   return Object.keys(NETWORK_ACCESS_OPTIONS).reduce((acc, key) => {
     acc[key] = (value) => {
+      if (!value || value.trim() === '') {
+        return null; // Empty values will be replaced with defaults on submit
+      }
+
       if (
         value
           .split(',')

From 61d713fcda5ac6ffd90286c8512d64ff83e222c6 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 21 Mar 2026 15:14:58 -0500
Subject: [PATCH 063/172] test: update validation for empty CIDR range to allow
 defaults on submit

---
 .../settings/__tests__/NetworkAccessForm.test.jsx | 15 ++++++++-------
 .../__tests__/NetworkAccessFormUtils.test.js      |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx b/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx
index 15e5e430..d3008354 100644
--- a/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/NetworkAccessForm.test.jsx
@@ -313,10 +313,10 @@ describe('NetworkAccessForm', () => {
       fireEvent.click(screen.getByTestId('confirm-ok'));
 
       await waitFor(() => {
-        expect(screen.getByTestId('alert')).toBeInTheDocument();
-        expect(screen.getByTestId('alert-title')).toHaveTextContent(
-          'Saved Successfully'
-        );
+        const alertTitles = screen.getAllByTestId('alert-title');
+        expect(
+          alertTitles.some((el) => el.textContent === 'Saved Successfully')
+        ).toBe(true);
       });
     });
 
@@ -399,9 +399,10 @@ describe('NetworkAccessForm', () => {
       fireEvent.click(screen.getByTestId('confirm-ok'));
 
       await waitFor(() => {
-        expect(screen.getByTestId('alert-title')).toHaveTextContent(
-          'Saved Successfully'
-        );
+        const alertTitles = screen.getAllByTestId('alert-title');
+        expect(
+          alertTitles.some((el) => el.textContent === 'Saved Successfully')
+        ).toBe(true);
       });
     });
   });
diff --git a/frontend/src/utils/forms/settings/__tests__/NetworkAccessFormUtils.test.js b/frontend/src/utils/forms/settings/__tests__/NetworkAccessFormUtils.test.js
index 11438d00..2cc885ec 100644
--- a/frontend/src/utils/forms/settings/__tests__/NetworkAccessFormUtils.test.js
+++ b/frontend/src/utils/forms/settings/__tests__/NetworkAccessFormUtils.test.js
@@ -131,7 +131,8 @@ describe('NetworkAccessFormUtils', () => {
         NetworkAccessFormUtils.getNetworkAccessFormValidation();
       const validator = validation['network-access-admin'];
 
-      expect(validator('')).toBe('Invalid CIDR range');
+      // Empty values are allowed — defaults are substituted on submit
+      expect(validator('')).toBe(null);
     });
 
     it('should return empty object when NETWORK_ACCESS_OPTIONS is empty', () => {

From b30a24e2fb384383466a033a4ebb809ac9399a66 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Sat, 21 Mar 2026 17:24:09 -0500
Subject: [PATCH 064/172] feat: add TLS connection support for Redis and
 PostgreSQL (#950)

- Add 10 env vars for Redis/PostgreSQL TLS (REDIS_SSL, REDIS_SSL_VERIFY, REDIS_SSL_CA_CERT, REDIS_SSL_CERT, REDIS_SSL_KEY, POSTGRES_SSL, POSTGRES_SSL_MODE, POSTGRES_SSL_CA_CERT, POSTGRES_SSL_CERT, POSTGRES_SSL_KEY)
- Propagate SSL params to all Redis connection points: RedisClient, stream view, PubSub, client manager, Celery broker/result backend, Django Channels, and pre-Django startup scripts
- Add Celery SSL config via URL query string params (required by Kombu's internal URL parsing)
- Add PostgreSQL sslmode and certificate options to DATABASES config
- Add startup validation: cert file existence, URL scheme conflict detection, TLS status logging
- Add TLS error hints to Redis connection failure messages
- Add Connection Security panel in System Settings (modular mode only) showing encryption, verification, and mTLS status
- Add PG client key permission fix in web and celery entrypoints for Docker Desktop compatibility (0777 to 0600)
- Add TLS env var passthrough in entrypoint for su - login shells
- Document TLS env vars in modular docker-compose.yml
- Change env_mode from dev/prod to actual DISPATCHARR_ENV value for modular mode detection
---
 apps/proxy/ts_proxy/client_manager.py         |   3 +-
 apps/proxy/ts_proxy/server.py                 |   4 +-
 core/api_views.py                             |  17 +-
 core/utils.py                                 |  25 ++-
 core/views.py                                 |   4 +-
 dispatcharr/persistent_lock.py                |  24 ++-
 dispatcharr/settings.py                       | 176 ++++++++++++++++--
 docker/docker-compose.yml                     |  36 +++-
 docker/entrypoint.celery.sh                   |  17 ++
 docker/entrypoint.sh                          |  30 +++
 .../settings/ConnectionSecurityPanel.jsx      | 174 +++++++++++++++++
 .../forms/settings/SystemSettingsForm.jsx     |  13 +-
 .../__tests__/SystemSettingsForm.test.jsx     |   7 +
 .../src/store/__tests__/settings.test.jsx     |   6 +-
 frontend/src/store/settings.jsx               |   4 +-
 scripts/wait_for_redis.py                     |  48 ++++-
 16 files changed, 540 insertions(+), 48 deletions(-)
 create mode 100644 frontend/src/components/forms/settings/ConnectionSecurityPanel.jsx

diff --git a/apps/proxy/ts_proxy/client_manager.py b/apps/proxy/ts_proxy/client_manager.py
index ea2aa5b0..d62551c1 100644
--- a/apps/proxy/ts_proxy/client_manager.py
+++ b/apps/proxy/ts_proxy/client_manager.py
@@ -58,7 +58,8 @@ class ClientManager:
             from django.conf import settings
 
             redis_url = getattr(settings, 'REDIS_URL', 'redis://localhost:6379/0')
-            redis_client = redis.Redis.from_url(redis_url, decode_responses=True)
+            ssl_params = getattr(settings, 'REDIS_SSL_PARAMS', {})
+            redis_client = redis.Redis.from_url(redis_url, decode_responses=True, **ssl_params)
             all_channels = []
             cursor = 0
 
diff --git a/apps/proxy/ts_proxy/server.py b/apps/proxy/ts_proxy/server.py
index b72b350a..50729991 100644
--- a/apps/proxy/ts_proxy/server.py
+++ b/apps/proxy/ts_proxy/server.py
@@ -166,6 +166,7 @@ class ProxyServer:
                         redis_password = os.environ.get("REDIS_PASSWORD", getattr(settings, 'REDIS_PASSWORD', ''))
                         redis_user = os.environ.get("REDIS_USER", getattr(settings, 'REDIS_USER', ''))
 
+                        ssl_params = getattr(settings, 'REDIS_SSL_PARAMS', {})
                         pubsub_client = redis.Redis(
                             host=redis_host,
                             port=redis_port,
@@ -175,7 +176,8 @@ class ProxyServer:
                             socket_timeout=60,
                             socket_connect_timeout=10,
                             socket_keepalive=True,
-                            health_check_interval=30
+                            health_check_interval=30,
+                            **ssl_params
                         )
                         logger.info("Created fallback Redis PubSub client for event listener")
 
diff --git a/core/api_views.py b/core/api_views.py
index dd15886c..a81ddf54 100644
--- a/core/api_views.py
+++ b/core/api_views.py
@@ -3,6 +3,7 @@
 import json
 import ipaddress
 import logging
+from django.conf import settings as django_settings
 from django.db import models
 from rest_framework import viewsets, status
 from rest_framework.response import Response
@@ -301,7 +302,9 @@ def environment(request):
             country_code = None
             country_name = None
 
-    # 4) Get environment mode from system environment variable
+    # 4) Get environment mode and TLS status from settings
+    postgres_ssl = getattr(django_settings, "POSTGRES_SSL", False)
+
     return Response(
         {
             "authenticated": True,
@@ -309,7 +312,17 @@ def environment(request):
             "local_ip": local_ip,
             "country_code": country_code,
             "country_name": country_name,
-            "env_mode": "dev" if os.getenv("DISPATCHARR_ENV") == "dev" else "prod",
+            "env_mode": os.getenv("DISPATCHARR_ENV", "aio"),
+            "redis_tls": {
+                "enabled": getattr(django_settings, "REDIS_SSL", False),
+                "verify": getattr(django_settings, "REDIS_SSL_VERIFY", True),
+                "mtls": bool(getattr(django_settings, "REDIS_SSL_CERT", "") and getattr(django_settings, "REDIS_SSL_KEY", "")),
+            },
+            "postgres_tls": {
+                "enabled": postgres_ssl,
+                "ssl_mode": getattr(django_settings, "POSTGRES_SSL_MODE", "verify-full") if postgres_ssl else None,
+                "mtls": bool(getattr(django_settings, "POSTGRES_SSL_CERT", "") and getattr(django_settings, "POSTGRES_SSL_KEY", "")),
+            },
         }
     )
 
diff --git a/core/utils.py b/core/utils.py
index ef5aa702..20714724 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -13,6 +13,8 @@ from django.core.validators import URLValidator
 from django.core.exceptions import ValidationError
 import gc
 
+_REDIS_TLS_HINT = " (TLS is enabled — verify certificate paths and that Redis is configured for TLS)"
+
 logger = logging.getLogger(__name__)
 
 # Import the command detector
@@ -65,6 +67,9 @@ class RedisClient:
                     socket_keepalive = getattr(settings, 'REDIS_SOCKET_KEEPALIVE', True)
                     retry_on_timeout = getattr(settings, 'REDIS_RETRY_ON_TIMEOUT', True)
 
+                    # TLS params from settings (empty dict when TLS is disabled)
+                    ssl_params = getattr(settings, 'REDIS_SSL_PARAMS', {})
+
                     # Create Redis client with better defaults
                     client = redis.Redis(
                         host=redis_host,
@@ -76,7 +81,8 @@ class RedisClient:
                         socket_connect_timeout=socket_connect_timeout,
                         socket_keepalive=socket_keepalive,
                         health_check_interval=health_check_interval,
-                        retry_on_timeout=retry_on_timeout
+                        retry_on_timeout=retry_on_timeout,
+                        **ssl_params
                     )
 
                     # Validate connection with ping
@@ -125,8 +131,9 @@ class RedisClient:
 
                 except (ConnectionError, TimeoutError) as e:
                     retry_count += 1
+                    _tls_hint = _REDIS_TLS_HINT if ssl_params else ""
                     if retry_count >= max_retries:
-                        logger.error(f"Failed to connect to Redis after {max_retries} attempts: {e}")
+                        logger.error(f"Failed to connect to Redis after {max_retries} attempts: {e}{_tls_hint}")
                         return None
                     else:
                         # Use exponential backoff for retries
@@ -135,7 +142,8 @@ class RedisClient:
                         time.sleep(wait_time)
 
                 except Exception as e:
-                    logger.error(f"Unexpected error connecting to Redis: {e}")
+                    _tls_hint = _REDIS_TLS_HINT if ssl_params else ""
+                    logger.error(f"Unexpected error connecting to Redis: {e}{_tls_hint}")
                     return None
 
         return cls._client
@@ -161,6 +169,8 @@ class RedisClient:
                     health_check_interval = getattr(settings, 'REDIS_HEALTH_CHECK_INTERVAL', 30)
                     retry_on_timeout = getattr(settings, 'REDIS_RETRY_ON_TIMEOUT', True)
 
+                    ssl_params = getattr(settings, 'REDIS_SSL_PARAMS', {})
+
                     # Create Redis client with PubSub-optimized settings - no timeout
                     client = redis.Redis(
                         host=redis_host,
@@ -172,7 +182,8 @@ class RedisClient:
                         socket_connect_timeout=socket_connect_timeout,
                         socket_keepalive=socket_keepalive,
                         health_check_interval=health_check_interval,
-                        retry_on_timeout=retry_on_timeout
+                        retry_on_timeout=retry_on_timeout,
+                        **ssl_params
                     )
 
                     # Validate connection with ping
@@ -185,8 +196,9 @@ class RedisClient:
 
                 except (ConnectionError, TimeoutError) as e:
                     retry_count += 1
+                    _tls_hint = _REDIS_TLS_HINT if ssl_params else ""
                     if retry_count >= max_retries:
-                        logger.error(f"Failed to connect to Redis for PubSub after {max_retries} attempts: {e}")
+                        logger.error(f"Failed to connect to Redis for PubSub after {max_retries} attempts: {e}{_tls_hint}")
                         return None
                     else:
                         # Use exponential backoff for retries
@@ -195,7 +207,8 @@ class RedisClient:
                         time.sleep(wait_time)
 
                 except Exception as e:
-                    logger.error(f"Unexpected error connecting to Redis for PubSub: {e}")
+                    _tls_hint = _REDIS_TLS_HINT if ssl_params else ""
+                    logger.error(f"Unexpected error connecting to Redis for PubSub: {e}{_tls_hint}")
                     return None
 
         return cls._pubsub_client
diff --git a/core/views.py b/core/views.py
index 082cccc3..b3e6dfb2 100644
--- a/core/views.py
+++ b/core/views.py
@@ -42,12 +42,14 @@ def stream_view(request, channel_uuid):
         redis_db = int(getattr(settings, "REDIS_DB", "0"))
         redis_password = getattr(settings, "REDIS_PASSWORD", "")
         redis_user = getattr(settings, "REDIS_USER", "")
+        ssl_params = getattr(settings, "REDIS_SSL_PARAMS", {})
         redis_client = redis.Redis(
             host=redis_host,
             port=redis_port,
             db=redis_db,
             password=redis_password if redis_password else None,
-            username=redis_user if redis_user else None
+            username=redis_user if redis_user else None,
+            **ssl_params
         )
 
         # Retrieve the channel by the provided stream_id.
diff --git a/dispatcharr/persistent_lock.py b/dispatcharr/persistent_lock.py
index 2ed72bf4..64e9e6ba 100644
--- a/dispatcharr/persistent_lock.py
+++ b/dispatcharr/persistent_lock.py
@@ -74,18 +74,40 @@ class PersistentLock:
 # Example usage (for testing purposes only):
 if __name__ == "__main__":
     import os
+    import sys
     # Connect to Redis using environment variables; adjust connection parameters as needed.
     redis_host = os.environ.get("REDIS_HOST", "localhost")
     redis_port = int(os.environ.get("REDIS_PORT", 6379))
     redis_db = int(os.environ.get("REDIS_DB", 0))
     redis_password = os.environ.get("REDIS_PASSWORD", "")
     redis_user = os.environ.get("REDIS_USER", "")
+    ssl_kwargs = {}
+    if os.environ.get("REDIS_SSL", "false").lower() == "true":
+        import ssl as _ssl
+        ssl_kwargs["ssl"] = True
+        ssl_kwargs["ssl_cert_reqs"] = (
+            _ssl.CERT_REQUIRED if os.environ.get("REDIS_SSL_VERIFY", "true").lower() == "true"
+            else _ssl.CERT_NONE
+        )
+        for env_var, key in [
+            ("REDIS_SSL_CA_CERT", "ssl_ca_certs"),
+            ("REDIS_SSL_CERT", "ssl_certfile"),
+            ("REDIS_SSL_KEY", "ssl_keyfile"),
+        ]:
+            path = os.environ.get(env_var, "")
+            if path:
+                if not os.path.isfile(path):
+                    print(f"Redis TLS: {env_var}={path!r} — file not found.")
+                    sys.exit(1)
+                ssl_kwargs[key] = path
+
     client = redis.Redis(
         host=redis_host,
         port=redis_port,
         db=redis_db,
         password=redis_password if redis_password else None,
-        username=redis_user if redis_user else None
+        username=redis_user if redis_user else None,
+        **ssl_kwargs
     )
     lock = PersistentLock(client, "lock:example_account", lock_timeout=120)
 
diff --git a/dispatcharr/settings.py b/dispatcharr/settings.py
index b0d387b2..ec61eb4d 100644
--- a/dispatcharr/settings.py
+++ b/dispatcharr/settings.py
@@ -1,7 +1,23 @@
 import os
+import ssl
 from pathlib import Path
 from datetime import timedelta
 from urllib.parse import quote_plus
+from django.core.exceptions import ImproperlyConfigured
+
+
+def _validate_tls_cert_paths(paths, service_name):
+    """Validate that configured TLS certificate file paths exist on disk.
+
+    Raises ImproperlyConfigured with a clear message identifying the
+    service and missing file so operators can fix their environment.
+    """
+    for env_var, file_path in paths:
+        if file_path and not Path(file_path).is_file():
+            raise ImproperlyConfigured(
+                f"{service_name} TLS: {env_var}={file_path!r} — file not found. "
+                f"Check that the certificate file exists and the volume is mounted correctly."
+            )
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -12,6 +28,37 @@ REDIS_DB = os.environ.get("REDIS_DB", "0")
 REDIS_USER = os.environ.get("REDIS_USER", "")
 REDIS_PASSWORD = os.environ.get("REDIS_PASSWORD", "")
 
+# Redis TLS configuration
+REDIS_SSL = os.environ.get("REDIS_SSL", "false").lower() == "true"
+REDIS_SSL_VERIFY = os.environ.get("REDIS_SSL_VERIFY", "true").lower() == "true"
+REDIS_SSL_CA_CERT = os.environ.get("REDIS_SSL_CA_CERT", "")
+REDIS_SSL_CERT = os.environ.get("REDIS_SSL_CERT", "")
+REDIS_SSL_KEY = os.environ.get("REDIS_SSL_KEY", "")
+
+# Reusable dict of SSL kwargs for redis.Redis() constructors
+REDIS_SSL_PARAMS = {}
+if REDIS_SSL:
+    _validate_tls_cert_paths([
+        ("REDIS_SSL_CA_CERT", REDIS_SSL_CA_CERT),
+        ("REDIS_SSL_CERT", REDIS_SSL_CERT),
+        ("REDIS_SSL_KEY", REDIS_SSL_KEY),
+    ], "Redis")
+
+    REDIS_SSL_PARAMS["ssl"] = True
+    REDIS_SSL_PARAMS["ssl_cert_reqs"] = ssl.CERT_REQUIRED if REDIS_SSL_VERIFY else ssl.CERT_NONE
+    if REDIS_SSL_CA_CERT:
+        REDIS_SSL_PARAMS["ssl_ca_certs"] = REDIS_SSL_CA_CERT
+    if REDIS_SSL_CERT:
+        REDIS_SSL_PARAMS["ssl_certfile"] = REDIS_SSL_CERT
+    if REDIS_SSL_KEY:
+        REDIS_SSL_PARAMS["ssl_keyfile"] = REDIS_SSL_KEY
+
+    _mtls = "enabled" if REDIS_SSL_CERT and REDIS_SSL_KEY else "disabled"
+    _verify = "on" if REDIS_SSL_VERIFY else "off"
+    print(f"Redis TLS: enabled (verify={_verify}, mTLS={_mtls})")
+else:
+    print("Redis TLS: disabled")
+
 # Set DEBUG to True for development, False for production
 if os.environ.get("DISPATCHARR_DEBUG", "False").lower() == "true":
     DEBUG = True
@@ -120,20 +167,46 @@ TEMPLATES = [
 WSGI_APPLICATION = "dispatcharr.wsgi.application"
 ASGI_APPLICATION = "dispatcharr.asgi.application"
 
+_redis_scheme = "rediss" if REDIS_SSL else "redis"
+
+# URL-encoded auth string shared by CHANNEL_LAYERS and Celery broker URLs
+if REDIS_PASSWORD:
+    _encoded_password = quote_plus(REDIS_PASSWORD)
+    if REDIS_USER:
+        _redis_auth = f"{quote_plus(REDIS_USER)}:{_encoded_password}@"
+    else:
+        _redis_auth = f":{_encoded_password}@"
+else:
+    _redis_auth = ""
+
+_channels_redis_url = f"{_redis_scheme}://{_redis_auth}{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}"
+# channels_redis accepts either a URL string or a dict with "address" + kwargs.
+# When TLS is enabled, pass SSL params alongside the URL so the connection pool
+# uses the correct CA cert and verification settings.
+if REDIS_SSL:
+    # Filter out "ssl" key — the rediss:// scheme already enables SSL.
+    # Passing ssl=True as a kwarg to aioredis from_url causes an error.
+    _channels_ssl = {k: v for k, v in REDIS_SSL_PARAMS.items() if k != "ssl"}
+    _channels_host = {"address": _channels_redis_url, **_channels_ssl}
+else:
+    _channels_host = _channels_redis_url
+
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
-            "hosts": ["redis://{redis_auth}{host}:{port}/{db}".format(
-                redis_auth=f"{quote_plus(REDIS_USER)}:{quote_plus(REDIS_PASSWORD)}@" if REDIS_PASSWORD and REDIS_USER else f":{quote_plus(REDIS_PASSWORD)}@" if REDIS_PASSWORD else "",
-                host=REDIS_HOST,
-                port=REDIS_PORT,
-                db=REDIS_DB
-            )],  # URL format supports authentication
+            "hosts": [_channels_host],
         },
     },
 }
 
+# PostgreSQL TLS configuration (defined before DATABASES for module-level access)
+POSTGRES_SSL = os.environ.get("POSTGRES_SSL", "false").lower() == "true"
+POSTGRES_SSL_MODE = os.environ.get("POSTGRES_SSL_MODE", "verify-full")
+POSTGRES_SSL_CA_CERT = os.environ.get("POSTGRES_SSL_CA_CERT", "")
+POSTGRES_SSL_CERT = os.environ.get("POSTGRES_SSL_CERT", "")
+POSTGRES_SSL_KEY = os.environ.get("POSTGRES_SSL_KEY", "")
+
 if os.getenv("DB_ENGINE", None) == "sqlite":
     DATABASES = {
         "default": {
@@ -154,6 +227,28 @@ else:
         }
     }
 
+    if POSTGRES_SSL:
+        _validate_tls_cert_paths([
+            ("POSTGRES_SSL_CA_CERT", POSTGRES_SSL_CA_CERT),
+            ("POSTGRES_SSL_CERT", POSTGRES_SSL_CERT),
+            ("POSTGRES_SSL_KEY", POSTGRES_SSL_KEY),
+        ], "PostgreSQL")
+
+        DATABASES["default"]["OPTIONS"] = {
+            "sslmode": POSTGRES_SSL_MODE,
+        }
+        if POSTGRES_SSL_CA_CERT:
+            DATABASES["default"]["OPTIONS"]["sslrootcert"] = POSTGRES_SSL_CA_CERT
+        if POSTGRES_SSL_CERT:
+            DATABASES["default"]["OPTIONS"]["sslcert"] = POSTGRES_SSL_CERT
+        if POSTGRES_SSL_KEY:
+            DATABASES["default"]["OPTIONS"]["sslkey"] = POSTGRES_SSL_KEY
+
+        _mtls = "enabled" if POSTGRES_SSL_CERT and POSTGRES_SSL_KEY else "disabled"
+        print(f"PostgreSQL TLS: enabled (sslmode={POSTGRES_SSL_MODE}, mTLS={_mtls})")
+    else:
+        print("PostgreSQL TLS: disabled")
+
 AUTH_PASSWORD_VALIDATORS = [
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
@@ -208,22 +303,52 @@ STATICFILES_DIRS = [
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 AUTH_USER_MODEL = "accounts.User"
 
-# Build default Redis URL from components for Celery with optional authentication
-# Build auth string conditionally with URL encoding for special characters
-if REDIS_PASSWORD:
-    encoded_password = quote_plus(REDIS_PASSWORD)
-    if REDIS_USER:
-        encoded_user = quote_plus(REDIS_USER)
-        redis_auth = f"{encoded_user}:{encoded_password}@"
-    else:
-        redis_auth = f":{encoded_password}@"
+_default_redis_url = f"{_redis_scheme}://{_redis_auth}{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}"
+# Celery/Kombu require SSL parameters in the URL query string because
+# internal URL parsing can overwrite the CELERY_BROKER_USE_SSL dict.
+if REDIS_SSL:
+    _celery_ssl_params = [
+        f"ssl_cert_reqs={'CERT_REQUIRED' if REDIS_SSL_VERIFY else 'CERT_NONE'}",
+    ]
+    if REDIS_SSL_CA_CERT:
+        _celery_ssl_params.append(f"ssl_ca_certs={REDIS_SSL_CA_CERT}")
+    if REDIS_SSL_CERT:
+        _celery_ssl_params.append(f"ssl_certfile={REDIS_SSL_CERT}")
+    if REDIS_SSL_KEY:
+        _celery_ssl_params.append(f"ssl_keyfile={REDIS_SSL_KEY}")
+    _default_celery_url = f"{_default_redis_url}?{'&'.join(_celery_ssl_params)}"
 else:
-    redis_auth = ""
-
-_default_redis_url = f"redis://{redis_auth}{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}"
-CELERY_BROKER_URL = os.environ.get("CELERY_BROKER_URL", _default_redis_url)
+    _default_celery_url = _default_redis_url
+CELERY_BROKER_URL = os.environ.get("CELERY_BROKER_URL", _default_celery_url)
 CELERY_RESULT_BACKEND = os.environ.get("CELERY_RESULT_BACKEND", CELERY_BROKER_URL)
 
+# Validate that URL overrides don't conflict with TLS settings
+for _url_var, _url_val in [
+    ("CELERY_BROKER_URL", CELERY_BROKER_URL),
+    ("CELERY_RESULT_BACKEND", CELERY_RESULT_BACKEND),
+]:
+    _is_override = os.environ.get(_url_var) is not None
+    if not _is_override:
+        continue
+    _url_is_ssl = _url_val.startswith("rediss://")
+    if REDIS_SSL and not _url_is_ssl:
+        raise ImproperlyConfigured(
+            f"REDIS_SSL is enabled but {_url_var} uses redis:// (plaintext). "
+            f"Change the URL scheme to rediss:// or remove the {_url_var} override."
+        )
+    if not REDIS_SSL and _url_is_ssl:
+        raise ImproperlyConfigured(
+            f"{_url_var} uses rediss:// (TLS) but REDIS_SSL is not enabled. "
+            f"Set REDIS_SSL=true and configure the TLS certificate settings."
+        )
+
+# Celery TLS configuration — required in addition to the rediss:// URL scheme.
+# Uses the same cert params as REDIS_SSL_PARAMS, minus the "ssl" key that
+# redis-py needs but Celery/Kombu does not.
+if REDIS_SSL:
+    CELERY_BROKER_USE_SSL = {k: v for k, v in REDIS_SSL_PARAMS.items() if k != "ssl"}
+    CELERY_RESULT_BACKEND_USE_SSL = CELERY_BROKER_USE_SSL
+
 # Configure Redis key prefix
 CELERY_RESULT_BACKEND_TRANSPORT_OPTIONS = {
     "global_keyprefix": "celery-tasks:",  # Set the Redis key prefix for Celery
@@ -299,8 +424,19 @@ SIMPLE_JWT = {
     "BLACKLIST_AFTER_ROTATION": True,  # Optional: Whether to blacklist refresh tokens
 }
 
-# Redis connection settings
+# Redis connection settings — _default_redis_url uses rediss:// when REDIS_SSL is enabled
 REDIS_URL = os.environ.get("REDIS_URL", _default_redis_url)
+if os.environ.get("REDIS_URL") is not None:
+    if REDIS_SSL and not REDIS_URL.startswith("rediss://"):
+        raise ImproperlyConfigured(
+            "REDIS_SSL is enabled but REDIS_URL uses redis:// (plaintext). "
+            "Change the URL scheme to rediss:// or remove the REDIS_URL override."
+        )
+    if not REDIS_SSL and REDIS_URL.startswith("rediss://"):
+        raise ImproperlyConfigured(
+            "REDIS_URL uses rediss:// (TLS) but REDIS_SSL is not enabled. "
+            "Set REDIS_SSL=true and configure the TLS certificate settings."
+        )
 REDIS_SOCKET_TIMEOUT = 60  # Socket timeout in seconds
 REDIS_SOCKET_CONNECT_TIMEOUT = 5  # Connection timeout in seconds
 REDIS_HEALTH_CHECK_INTERVAL = 15  # Health check every 15 seconds
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d674460a..547ac249 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -14,6 +14,7 @@ services:
       - 9191:9191
     volumes:
       - ./data:/data
+      #- ./certs:/certs:ro  # TLS certificates (optional)
     depends_on:
       db:
         condition: service_healthy
@@ -33,15 +34,26 @@ services:
       - POSTGRES_DB=dispatcharr
       - POSTGRES_USER=dispatch
       - POSTGRES_PASSWORD=secret
+      # PostgreSQL TLS (optional) — mount certs via the volume above
+      #- POSTGRES_SSL=true                             # required to enable TLS
+      #- POSTGRES_SSL_MODE=verify-full                 # optional: verify-full (default) | verify-ca | require
+      #- POSTGRES_SSL_CA_CERT=/certs/postgres/ca.crt   # optional: CA cert to verify the server
+      #- POSTGRES_SSL_CERT=/certs/postgres/client.crt  # optional: client cert (only if server requires client auth)
+      #- POSTGRES_SSL_KEY=/certs/postgres/client.key   # optional: client key  (only if server requires client auth)
 
       # Redis Connection
       - REDIS_HOST=redis
       - REDIS_PORT=6379
-
       # Redis Authentication (Optional)
       # Uncomment and set if your Redis requires authentication:
       #- REDIS_PASSWORD=your_strong_redis_password
       #- REDIS_USER=your_redis_username  # For Redis 6+ ACL - see Redis service below
+      # Redis TLS (optional) — mount certs via the volume above
+      #- REDIS_SSL=true                                # required to enable TLS
+      #- REDIS_SSL_VERIFY=true                         # optional: set false for self-signed certs without a CA
+      #- REDIS_SSL_CA_CERT=/certs/redis/ca.crt         # optional: CA cert to verify the server
+      #- REDIS_SSL_CERT=/certs/redis/client.crt        # optional: client cert (only if server requires client auth)
+      #- REDIS_SSL_KEY=/certs/redis/client.key         # optional: client key  (only if server requires client auth)
 
       # Logging
       - DISPATCHARR_LOG_LEVEL=info
@@ -95,6 +107,7 @@ services:
         condition: service_started
     volumes:
       - ./data:/data
+      #- ./certs:/certs:ro  # TLS certificates (optional)
     extra_hosts:
       - "host.docker.internal:host-gateway"
     entrypoint: ["/app/docker/entrypoint.celery.sh"]
@@ -108,21 +121,30 @@ services:
       # Must match the web service port for DVR recording and internal API calls
       - DISPATCHARR_PORT=9191
 
-      # PostgreSQL Connection
+      # PostgreSQL — must match web service settings
       - POSTGRES_HOST=db
       - POSTGRES_PORT=5432
       - POSTGRES_DB=dispatcharr
       - POSTGRES_USER=dispatch
       - POSTGRES_PASSWORD=secret
+      # PostgreSQL TLS — must match web service
+      #- POSTGRES_SSL=true
+      #- POSTGRES_SSL_MODE=verify-full
+      #- POSTGRES_SSL_CA_CERT=/certs/postgres/ca.crt
+      #- POSTGRES_SSL_CERT=/certs/postgres/client.crt
+      #- POSTGRES_SSL_KEY=/certs/postgres/client.key
 
-      # Redis Connection
+      # Redis — must match web service settings
       - REDIS_HOST=redis
       - REDIS_PORT=6379
-
-      # Redis Authentication (Optional)
-      # Uncomment and set if your Redis requires authentication:
       #- REDIS_PASSWORD=your_strong_redis_password
-      #- REDIS_USER=your_redis_username  # For Redis 6+ ACL - see Redis service below
+      #- REDIS_USER=your_redis_username
+      # Redis TLS — must match web service
+      #- REDIS_SSL=true
+      #- REDIS_SSL_VERIFY=true
+      #- REDIS_SSL_CA_CERT=/certs/redis/ca.crt
+      #- REDIS_SSL_CERT=/certs/redis/client.crt
+      #- REDIS_SSL_KEY=/certs/redis/client.key
 
       # Logging
       - DISPATCHARR_LOG_LEVEL=info
diff --git a/docker/entrypoint.celery.sh b/docker/entrypoint.celery.sh
index 7a69f430..d7a43255 100644
--- a/docker/entrypoint.celery.sh
+++ b/docker/entrypoint.celery.sh
@@ -36,6 +36,23 @@ if [ "$USE_LEGACY_NUMPY" = "true" ]; then
     fi
 fi
 
+# Fix TLS client key permissions for PostgreSQL (same issue as web entrypoint).
+# libpq requires 0600 but Docker Desktop mounts files as 0777.
+if [ -n "${POSTGRES_SSL_KEY:-}" ] && [ -f "$POSTGRES_SSL_KEY" ]; then
+    _key_perms=$(stat -c '%a' "$POSTGRES_SSL_KEY" 2>/dev/null)
+    if [ "$_key_perms" != "600" ] && [ "$_key_perms" != "640" ]; then
+        _fixed_key="/data/.pg-client-celery.key"
+        cp "$POSTGRES_SSL_KEY" "$_fixed_key"
+        chmod 600 "$_fixed_key"
+        # Match ownership to the user running Celery if running as root
+        if [ "$(id -u)" = "0" ] && [ -n "${PUID:-}" ]; then
+            chown "${PUID}:${PGID:-$PUID}" "$_fixed_key"
+        fi
+        export POSTGRES_SSL_KEY="$_fixed_key"
+        echo "Fixed PostgreSQL client key permissions (${_key_perms} → 600)"
+    fi
+fi
+
 # Wait for migrations to complete
 # Uses 'migrate --check' which exits 0 only when all migrations are applied,
 # and exits 1 on unapplied migrations OR connection errors (safe either way)
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 0de0afd5..7365a300 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -112,6 +112,14 @@ variables=(
     CELERY_NICE_LEVEL UWSGI_NICE_LEVEL DJANGO_SECRET_KEY
 )
 
+# TLS variables are optional — only propagate when set to avoid noisy warnings
+for _tls_var in POSTGRES_SSL POSTGRES_SSL_MODE POSTGRES_SSL_CA_CERT POSTGRES_SSL_CERT POSTGRES_SSL_KEY \
+                REDIS_SSL REDIS_SSL_VERIFY REDIS_SSL_CA_CERT REDIS_SSL_CERT REDIS_SSL_KEY; do
+    if [ -n "${!_tls_var+x}" ]; then
+        variables+=("$_tls_var")
+    fi
+done
+
 # Truncate files before rewriting
 > /etc/profile.d/dispatcharr.sh
 
@@ -229,6 +237,28 @@ if [ "$USE_LEGACY_NUMPY" = "true" ]; then
     fi
 fi
 
+# Fix TLS client key permissions for PostgreSQL.
+# libpq requires the client key to be 0600 or stricter. Volume-mounted files
+# from Windows/macOS hosts often have 0755 permissions, so copy the key to a
+# writable location with correct permissions if needed.
+if [ -n "${POSTGRES_SSL_KEY:-}" ] && [ -f "$POSTGRES_SSL_KEY" ]; then
+    _key_perms=$(stat -c '%a' "$POSTGRES_SSL_KEY" 2>/dev/null)
+    if [ "$_key_perms" != "600" ] && [ "$_key_perms" != "640" ]; then
+        _fixed_key="/data/.pg-client.key"
+        cp "$POSTGRES_SSL_KEY" "$_fixed_key"
+        chmod 600 "$_fixed_key"
+        if [ "$(id -u)" = "0" ] && [ -n "${PUID:-}" ]; then
+            chown "${PUID}:${PGID}" "$_fixed_key"
+        fi
+        export POSTGRES_SSL_KEY="$_fixed_key"
+        # Update /etc/environment so login shells see the fixed path
+        sed -i "/^POSTGRES_SSL_KEY=/d" /etc/environment
+        echo "POSTGRES_SSL_KEY='$_fixed_key'" >> /etc/environment
+        sed -i "s|export POSTGRES_SSL_KEY=.*|export POSTGRES_SSL_KEY='$_fixed_key'|" /etc/profile.d/dispatcharr.sh
+        echo "Fixed PostgreSQL client key permissions (${_key_perms} → 600)"
+    fi
+fi
+
 # Run Django commands as non-root user to prevent permission issues
 su - "$POSTGRES_USER" -c "cd /app && python manage.py migrate --noinput"
 su - "$POSTGRES_USER" -c "cd /app && python manage.py collectstatic --noinput"
diff --git a/frontend/src/components/forms/settings/ConnectionSecurityPanel.jsx b/frontend/src/components/forms/settings/ConnectionSecurityPanel.jsx
new file mode 100644
index 00000000..f8c9614a
--- /dev/null
+++ b/frontend/src/components/forms/settings/ConnectionSecurityPanel.jsx
@@ -0,0 +1,174 @@
+import React from 'react';
+import {
+  Badge,
+  Group,
+  Paper,
+  SimpleGrid,
+  Stack,
+  Text,
+  Tooltip,
+} from '@mantine/core';
+import useSettingsStore from '../../../store/settings.jsx';
+
+const TlsOption = ({ label, description, tooltip, badgeText, badgeColor }) => (
+  <div>
+    <Group gap="xs" align="center">
+      <Text size="sm" fw={500}>
+        {label}
+      </Text>
+      <Tooltip label={tooltip}>
+        <Badge color={badgeColor} variant="light" size="sm">
+          {badgeText}
+        </Badge>
+      </Tooltip>
+    </Group>
+    <Text size="xs" c="dimmed">
+      {description}
+    </Text>
+  </div>
+);
+
+const TlsServiceCard = ({ serviceName, children }) => (
+  <Paper p="md" withBorder h="100%">
+    <Stack gap="sm">
+      <Text fw={600}>{serviceName}</Text>
+      {children}
+    </Stack>
+  </Paper>
+);
+
+const RedisStatus = ({ tls }) => {
+  const enabled = tls?.enabled ?? false;
+  const verify = tls?.verify ?? true;
+  const mtls = tls?.mtls ?? false;
+
+  let verifyColor = 'gray';
+  let verifyTooltip = 'Verification is not active — TLS is disabled';
+  if (enabled) {
+    verifyColor = verify ? 'green' : 'yellow';
+    verifyTooltip = verify
+      ? "The server's identity is verified using a trusted certificate"
+      : 'The connection is encrypted but the server identity is not verified';
+  }
+
+  let mtlsColor = 'gray';
+  let mtlsTooltip = 'Mutual authentication is not active';
+  if (enabled && mtls) {
+    mtlsColor = 'green';
+    mtlsTooltip = 'Both client and server verify each other with certificates';
+  }
+
+  return (
+    <TlsServiceCard serviceName="Redis">
+      <TlsOption
+        label="Encryption"
+        description="Encrypt traffic between Dispatcharr and Redis."
+        tooltip={
+          enabled
+            ? 'The connection is encrypted'
+            : 'The connection is not encrypted'
+        }
+        badgeText={enabled ? 'Enabled' : 'Disabled'}
+        badgeColor={enabled ? 'green' : 'gray'}
+      />
+      <TlsOption
+        label="Server Verification"
+        description="Verify the Redis server's identity using a CA certificate."
+        tooltip={verifyTooltip}
+        badgeText={verify && enabled ? 'On' : 'Off'}
+        badgeColor={verifyColor}
+      />
+      <TlsOption
+        label="Mutual TLS"
+        description="Authenticate Dispatcharr to Redis using a client certificate."
+        tooltip={mtlsTooltip}
+        badgeText={mtls && enabled ? 'Active' : 'Inactive'}
+        badgeColor={mtlsColor}
+      />
+    </TlsServiceCard>
+  );
+};
+
+const PostgresStatus = ({ tls }) => {
+  const enabled = tls?.enabled ?? false;
+  const sslMode = tls?.ssl_mode;
+  const mtls = tls?.mtls ?? false;
+
+  let modeColor = 'gray';
+  let modeTooltip = 'Verification mode is not active — TLS is disabled';
+  let modeBadge = 'Off';
+  if (enabled && sslMode) {
+    modeBadge = sslMode;
+    if (sslMode === 'verify-full') {
+      modeColor = 'green';
+      modeTooltip = 'Server certificate and hostname are both verified';
+    } else if (sslMode === 'verify-ca') {
+      modeColor = 'yellow';
+      modeTooltip =
+        'Server certificate is verified, but hostname is not checked';
+    } else {
+      modeColor = 'yellow';
+      modeTooltip = 'Connection is encrypted but the server is not verified';
+    }
+  }
+
+  let mtlsColor = 'gray';
+  let mtlsTooltip = 'Mutual authentication is not active';
+  if (enabled && mtls) {
+    mtlsColor = 'green';
+    mtlsTooltip = 'Both client and server verify each other with certificates';
+  }
+
+  return (
+    <TlsServiceCard serviceName="PostgreSQL">
+      <TlsOption
+        label="Encryption"
+        description="Encrypt traffic between Dispatcharr and PostgreSQL."
+        tooltip={
+          enabled
+            ? 'The connection is encrypted'
+            : 'The connection is not encrypted'
+        }
+        badgeText={enabled ? 'Enabled' : 'Disabled'}
+        badgeColor={enabled ? 'green' : 'gray'}
+      />
+      <TlsOption
+        label="Verification Mode"
+        description="How strictly to verify the PostgreSQL server's identity."
+        tooltip={modeTooltip}
+        badgeText={modeBadge}
+        badgeColor={modeColor}
+      />
+      <TlsOption
+        label="Mutual TLS"
+        description="Authenticate Dispatcharr to PostgreSQL using a client certificate."
+        tooltip={mtlsTooltip}
+        badgeText={mtls && enabled ? 'Active' : 'Inactive'}
+        badgeColor={mtlsColor}
+      />
+    </TlsServiceCard>
+  );
+};
+
+const ConnectionSecurityPanel = React.memo(() => {
+  const environment = useSettingsStore((s) => s.environment);
+  const isModular = environment.env_mode === 'modular';
+
+  return (
+    <Stack gap="md">
+      <Text size="sm" c="dimmed">
+        {isModular
+          ? 'Encrypt connections to Redis and PostgreSQL using environment variables in the docker compose file.'
+          : 'Connection encryption is only available in modular deployment mode with external services.'}
+      </Text>
+      {isModular && (
+        <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="md">
+          <RedisStatus tls={environment.redis_tls} />
+          <PostgresStatus tls={environment.postgres_tls} />
+        </SimpleGrid>
+      )}
+    </Stack>
+  );
+});
+
+export default ConnectionSecurityPanel;
diff --git a/frontend/src/components/forms/settings/SystemSettingsForm.jsx b/frontend/src/components/forms/settings/SystemSettingsForm.jsx
index a8c8d45b..132830ff 100644
--- a/frontend/src/components/forms/settings/SystemSettingsForm.jsx
+++ b/frontend/src/components/forms/settings/SystemSettingsForm.jsx
@@ -5,7 +5,16 @@ import {
   parseSettings,
   saveChangedSettings,
 } from '../../../utils/pages/SettingsUtils.js';
-import { Alert, Button, Flex, NumberInput, Stack, Text } from '@mantine/core';
+import {
+  Alert,
+  Button,
+  Divider,
+  Flex,
+  NumberInput,
+  Stack,
+  Text,
+} from '@mantine/core';
+import ConnectionSecurityPanel from './ConnectionSecurityPanel.jsx';
 import { useForm } from '@mantine/form';
 import { getSystemSettingsFormInitialValues } from '../../../utils/forms/settings/SystemSettingsFormUtils.js';
 
@@ -68,6 +77,8 @@ const SystemSettingsForm = React.memo(({ active }) => {
         max={1000}
         step={10}
       />
+      <Divider my="md" label="Connection Security" labelPosition="left" />
+      <ConnectionSecurityPanel />
       <Flex mih={50} gap="xs" justify="flex-end" align="flex-end">
         <Button
           onClick={form.onSubmit(onSubmit)}
diff --git a/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
index a3b156d5..f0b11231 100644
--- a/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
@@ -16,6 +16,12 @@ vi.mock('../../../../utils/forms/settings/SystemSettingsFormUtils.js', () => ({
   getSystemSettingsFormInitialValues: vi.fn(),
 }));
 
+vi.mock('../ConnectionSecurityPanel.jsx', () => ({
+  default: () => (
+    <div data-testid="connection-security-panel">ConnectionSecurityPanel</div>
+  ),
+}));
+
 // ── Mantine form ───────────────────────────────────────────────────────────────
 vi.mock('@mantine/form', () => ({
   useForm: vi.fn(),
@@ -47,6 +53,7 @@ vi.mock('@mantine/core', () => ({
   ),
   Stack: ({ children }) => <div>{children}</div>,
   Text: ({ children }) => <span>{children}</span>,
+  Divider: () => <hr />,
 }));
 
 // ──────────────────────────────────────────────────────────────────────────────
diff --git a/frontend/src/store/__tests__/settings.test.jsx b/frontend/src/store/__tests__/settings.test.jsx
index 016fce07..9eee6f26 100644
--- a/frontend/src/store/__tests__/settings.test.jsx
+++ b/frontend/src/store/__tests__/settings.test.jsx
@@ -14,7 +14,7 @@ describe('useSettingsStore', () => {
         public_ip: '',
         country_code: '',
         country_name: '',
-        env_mode: 'prod',
+        env_mode: 'aio',
       },
       version: {
         version: '',
@@ -33,7 +33,7 @@ describe('useSettingsStore', () => {
       public_ip: '',
       country_code: '',
       country_name: '',
-      env_mode: 'prod',
+      env_mode: 'aio',
     });
     expect(result.current.isLoading).toBe(false);
     expect(result.current.error).toBe(null);
@@ -87,7 +87,7 @@ describe('useSettingsStore', () => {
       public_ip: '',
       country_code: '',
       country_name: '',
-      env_mode: 'prod',
+      env_mode: 'aio',
     });
   });
 
diff --git a/frontend/src/store/settings.jsx b/frontend/src/store/settings.jsx
index d7d46a3f..1b28f475 100644
--- a/frontend/src/store/settings.jsx
+++ b/frontend/src/store/settings.jsx
@@ -8,7 +8,7 @@ const useSettingsStore = create((set, get) => ({
     public_ip: '',
     country_code: '',
     country_name: '',
-    env_mode: 'prod',
+    env_mode: 'aio',
   },
   version: {
     version: '',
@@ -40,7 +40,7 @@ const useSettingsStore = create((set, get) => ({
           public_ip: '',
           country_code: '',
           country_name: '',
-          env_mode: 'prod',
+          env_mode: 'aio',
         },
       };
 
diff --git a/scripts/wait_for_redis.py b/scripts/wait_for_redis.py
index e1814411..9c2d6eaf 100644
--- a/scripts/wait_for_redis.py
+++ b/scripts/wait_for_redis.py
@@ -34,10 +34,49 @@ def _flush_non_celery_keys(client):
     logger.info(f"Modular mode: selectively cleared {deleted} non-Celery Redis key(s)")
 
 
+def _build_ssl_kwargs():
+    """Build Redis SSL kwargs from environment variables.
+
+    Validates that any configured certificate file paths exist on disk
+    and logs a summary of the active TLS configuration.
+    """
+    ssl_kwargs = {}
+    if os.environ.get("REDIS_SSL", "false").lower() == "true":
+        import ssl as _ssl
+        ssl_kwargs["ssl"] = True
+        ssl_kwargs["ssl_cert_reqs"] = (
+            _ssl.CERT_REQUIRED if os.environ.get("REDIS_SSL_VERIFY", "true").lower() == "true"
+            else _ssl.CERT_NONE
+        )
+        cert_paths = {
+            "REDIS_SSL_CA_CERT": os.environ.get("REDIS_SSL_CA_CERT", ""),
+            "REDIS_SSL_CERT": os.environ.get("REDIS_SSL_CERT", ""),
+            "REDIS_SSL_KEY": os.environ.get("REDIS_SSL_KEY", ""),
+        }
+        for env_var, path in cert_paths.items():
+            if path and not os.path.isfile(path):
+                logger.error(
+                    f"Redis TLS: {env_var}={path!r} — file not found. "
+                    f"Check that the certificate file exists and the volume is mounted correctly."
+                )
+                sys.exit(1)
+
+        if cert_paths["REDIS_SSL_CA_CERT"]:
+            ssl_kwargs["ssl_ca_certs"] = cert_paths["REDIS_SSL_CA_CERT"]
+        if cert_paths["REDIS_SSL_CERT"]:
+            ssl_kwargs["ssl_certfile"] = cert_paths["REDIS_SSL_CERT"]
+        if cert_paths["REDIS_SSL_KEY"]:
+            ssl_kwargs["ssl_keyfile"] = cert_paths["REDIS_SSL_KEY"]
+
+        logger.info("Redis TLS: enabled")
+    return ssl_kwargs
+
+
 def wait_for_redis(host='localhost', port=6379, db=0, password='', username='', max_retries=30, retry_interval=2):
     """Wait for Redis to become available"""
     redis_client = None
     retry_count = 0
+    ssl_kwargs = _build_ssl_kwargs()
 
     logger.info(f"Waiting for Redis at {host}:{port}/{db}...")
 
@@ -50,7 +89,8 @@ def wait_for_redis(host='localhost', port=6379, db=0, password='', username='',
                 password=password if password else None,
                 username=username if username else None,
                 socket_timeout=2,
-                socket_connect_timeout=2
+                socket_connect_timeout=2,
+                **ssl_kwargs
             )
             redis_client.ping()
             # Clear stale state on startup. In AIO mode, every service restarts
@@ -66,14 +106,16 @@ def wait_for_redis(host='localhost', port=6379, db=0, password='', username='',
             return True
         except (redis.exceptions.ConnectionError, redis.exceptions.TimeoutError) as e:
             retry_count += 1
+            _tls_hint = " (TLS is enabled — verify certificate paths and that Redis is configured for TLS)" if ssl_kwargs else ""
             if retry_count >= max_retries:
-                logger.error(f"❌ Failed to connect to Redis after {max_retries} attempts: {e}")
+                logger.error(f"❌ Failed to connect to Redis after {max_retries} attempts: {e}{_tls_hint}")
                 return False
 
             logger.info(f"⏳ Redis not available yet, retrying in {retry_interval}s... ({retry_count}/{max_retries})")
             time.sleep(retry_interval)
         except Exception as e:
-            logger.error(f"❌ Unexpected error connecting to Redis: {e}")
+            _tls_hint = " (TLS is enabled — verify certificate paths and that Redis is configured for TLS)" if ssl_kwargs else ""
+            logger.error(f"❌ Unexpected error connecting to Redis: {e}{_tls_hint}")
             return False
 
     return False

From 034f0623bf4442f2647b62cecf2fc3042e80f5a6 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Mon, 23 Mar 2026 17:48:35 -0500
Subject: [PATCH 065/172] fix(tasks): handle AttributeError in series rule
 evaluation lock acquisition and release

---
 apps/channels/tasks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/channels/tasks.py b/apps/channels/tasks.py
index 449a3f4a..f619ec47 100755
--- a/apps/channels/tasks.py
+++ b/apps/channels/tasks.py
@@ -1084,7 +1084,7 @@ def evaluate_series_rules_impl(tvg_id: str | None = None):
         if not lock_acquired:
             result["details"].append({"status": "skipped", "reason": "concurrent evaluation in progress"})
             return result
-    except (ConnectionError, OSError):
+    except (ConnectionError, OSError, AttributeError):
         logger.warning("Could not acquire series rule evaluation lock (Redis unavailable), proceeding without lock")
 
     try:
@@ -1093,7 +1093,7 @@ def evaluate_series_rules_impl(tvg_id: str | None = None):
         if lock_acquired:
             try:
                 release_task_lock('evaluate_series_rules', 'all')
-            except (ConnectionError, OSError):
+            except (ConnectionError, OSError, AttributeError):
                 logger.warning("Could not release series rule evaluation lock")
 
 

From 3831d72d13ff3e0a23f4bee70607b308756ea9a3 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Mon, 23 Mar 2026 17:54:27 -0500
Subject: [PATCH 066/172] changelog: Update changelog for dvr recording pr.

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbc76777..61ad05d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Duplicate recordings created when EPG sources refresh and re-evaluate series rules — Thanks [@CodeBormen](https://github.com/CodeBormen):
+  - **Program ID instability**: `parse_programs_for_source()` deletes and recreates all `ProgramData` rows with new auto-increment IDs on every EPG refresh. The dedup set used these IDs, so it never matched after a refresh. Deduplication now uses a stable `(tvg_id, start_time, end_time)` composite key sourced from `Recording.custom_properties.program`.
+  - **Secondary guard using wrong times**: The DB guard compared unadjusted program times against offset-adjusted `Recording.start_time`/`end_time`, so it never matched when any DVR pre/post offset was configured. It now queries `custom_properties__program__start_time/end_time` (the original, unadjusted program times stored at recording creation).
+  - **No concurrency guard**: Each EPG source refresh fired `evaluate_series_rules.delay()` independently. Concurrent tasks loaded the dedup set before others committed, allowing races. Evaluation is now serialized with `acquire_task_lock` (reusing the existing EPG task pattern). Gracefully degrades if Redis is unavailable — the primary and secondary dedup guards still protect. (Fixes #940)
+
 ## [0.21.1] - 2026-03-18
 
 ### Fixed

From cf5f81af0f0e0d7f5bec9b05ea24261a077aa1e3 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Mon, 23 Mar 2026 18:02:39 -0500
Subject: [PATCH 067/172] Bug Fix: Fix CI Pipline attempting login to Docker
 Hub for PR's.

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a5d4528b..9745189e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -113,6 +113,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v4
         with:
           registry: docker.io

From 9da6f7794cc9a3f749577814b7c3b767a3b41b48 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Mon, 23 Mar 2026 18:26:52 -0500
Subject: [PATCH 068/172] fix: ensure PGID defaults to PUID when setting
 ownership for PostgreSQL SSL key (matching entrypoint.celery behavior.

---
 docker/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 7365a300..33fe33dd 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -248,7 +248,7 @@ if [ -n "${POSTGRES_SSL_KEY:-}" ] && [ -f "$POSTGRES_SSL_KEY" ]; then
         cp "$POSTGRES_SSL_KEY" "$_fixed_key"
         chmod 600 "$_fixed_key"
         if [ "$(id -u)" = "0" ] && [ -n "${PUID:-}" ]; then
-            chown "${PUID}:${PGID}" "$_fixed_key"
+            chown "${PUID}:${PGID:-$PUID}" "$_fixed_key"
         fi
         export POSTGRES_SSL_KEY="$_fixed_key"
         # Update /etc/environment so login shells see the fixed path

From 516c2e478c6ae2bcd9d5d0ed47edae98b7e9fe00 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Mon, 23 Mar 2026 19:55:43 -0500
Subject: [PATCH 069/172] Conditionally render Connection Security panel based
 on deployment mode

---
 .../settings/ConnectionSecurityPanel.jsx      | 16 +++-----
 .../forms/settings/SystemSettingsForm.jsx     | 10 ++++-
 .../__tests__/SystemSettingsForm.test.jsx     | 37 +++++++++++++++++--
 3 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/forms/settings/ConnectionSecurityPanel.jsx b/frontend/src/components/forms/settings/ConnectionSecurityPanel.jsx
index f8c9614a..9d6016d4 100644
--- a/frontend/src/components/forms/settings/ConnectionSecurityPanel.jsx
+++ b/frontend/src/components/forms/settings/ConnectionSecurityPanel.jsx
@@ -152,21 +152,17 @@ const PostgresStatus = ({ tls }) => {
 
 const ConnectionSecurityPanel = React.memo(() => {
   const environment = useSettingsStore((s) => s.environment);
-  const isModular = environment.env_mode === 'modular';
 
   return (
     <Stack gap="md">
       <Text size="sm" c="dimmed">
-        {isModular
-          ? 'Encrypt connections to Redis and PostgreSQL using environment variables in the docker compose file.'
-          : 'Connection encryption is only available in modular deployment mode with external services.'}
+        Encrypt connections to Redis and PostgreSQL using environment variables
+        in the docker compose file.
       </Text>
-      {isModular && (
-        <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="md">
-          <RedisStatus tls={environment.redis_tls} />
-          <PostgresStatus tls={environment.postgres_tls} />
-        </SimpleGrid>
-      )}
+      <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="md">
+        <RedisStatus tls={environment.redis_tls} />
+        <PostgresStatus tls={environment.postgres_tls} />
+      </SimpleGrid>
     </Stack>
   );
 });
diff --git a/frontend/src/components/forms/settings/SystemSettingsForm.jsx b/frontend/src/components/forms/settings/SystemSettingsForm.jsx
index 132830ff..5206bf97 100644
--- a/frontend/src/components/forms/settings/SystemSettingsForm.jsx
+++ b/frontend/src/components/forms/settings/SystemSettingsForm.jsx
@@ -20,6 +20,8 @@ import { getSystemSettingsFormInitialValues } from '../../../utils/forms/setting
 
 const SystemSettingsForm = React.memo(({ active }) => {
   const settings = useSettingsStore((s) => s.settings);
+  const isModular =
+    useSettingsStore((s) => s.environment.env_mode) === 'modular';
 
   const [saved, setSaved] = useState(false);
 
@@ -77,8 +79,12 @@ const SystemSettingsForm = React.memo(({ active }) => {
         max={1000}
         step={10}
       />
-      <Divider my="md" label="Connection Security" labelPosition="left" />
-      <ConnectionSecurityPanel />
+      {isModular && (
+        <>
+          <Divider my="md" label="Connection Security" labelPosition="left" />
+          <ConnectionSecurityPanel />
+        </>
+      )}
       <Flex mih={50} gap="xs" justify="flex-end" align="flex-end">
         <Button
           onClick={form.onSubmit(onSubmit)}
diff --git a/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx b/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
index f0b11231..4b610e54 100644
--- a/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
+++ b/frontend/src/components/forms/settings/__tests__/SystemSettingsForm.test.jsx
@@ -76,7 +76,15 @@ const makeSettings = (overrides = {}) => ({
   ...overrides,
 });
 
-const setupMocks = ({ settings = makeSettings() } = {}) => {
+const makeEnvironment = (overrides = {}) => ({
+  env_mode: 'aio',
+  ...overrides,
+});
+
+const setupMocks = ({
+  settings = makeSettings(),
+  environment = makeEnvironment(),
+} = {}) => {
   const formValues = { max_system_events: settings?.max_system_events ?? 100 };
 
   const formMock = {
@@ -92,7 +100,9 @@ const setupMocks = ({ settings = makeSettings() } = {}) => {
 
   vi.mocked(useForm).mockReturnValue(formMock);
   vi.mocked(getSystemSettingsFormInitialValues).mockReturnValue(formValues);
-  vi.mocked(useSettingsStore).mockImplementation((sel) => sel({ settings }));
+  vi.mocked(useSettingsStore).mockImplementation((sel) =>
+    sel({ settings, environment })
+  );
   vi.mocked(parseSettings).mockReturnValue(formValues);
   vi.mocked(getChangedSettings).mockReturnValue({
     max_system_events: settings?.max_system_events ?? 100,
@@ -155,6 +165,22 @@ describe('SystemSettingsForm', () => {
       expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
     });
 
+    it('does not render Connection Security panel in non-modular mode', () => {
+      setupMocks({ environment: makeEnvironment({ env_mode: 'aio' }) });
+      render(<SystemSettingsForm active={true} />);
+      expect(
+        screen.queryByTestId('connection-security-panel')
+      ).not.toBeInTheDocument();
+    });
+
+    it('renders Connection Security panel in modular mode', () => {
+      setupMocks({ environment: makeEnvironment({ env_mode: 'modular' }) });
+      render(<SystemSettingsForm active={true} />);
+      expect(
+        screen.getByTestId('connection-security-panel')
+      ).toBeInTheDocument();
+    });
+
     it('renders NumberInput with value from form values', () => {
       setupMocks({ settings: makeSettings({ max_system_events: 250 }) });
       render(<SystemSettingsForm active={true} />);
@@ -174,7 +200,10 @@ describe('SystemSettingsForm', () => {
       vi.mocked(useForm).mockReturnValue(formMock);
       vi.mocked(getSystemSettingsFormInitialValues).mockReturnValue(formValues);
       vi.mocked(useSettingsStore).mockImplementation((sel) =>
-        sel({ settings: makeSettings({ max_system_events: 0 }) })
+        sel({
+          settings: makeSettings({ max_system_events: 0 }),
+          environment: makeEnvironment(),
+        })
       );
       vi.mocked(parseSettings).mockReturnValue(formValues);
       vi.mocked(getChangedSettings).mockReturnValue({});
@@ -218,7 +247,7 @@ describe('SystemSettingsForm', () => {
         max_system_events: 100,
       });
       vi.mocked(useSettingsStore).mockImplementation((sel) =>
-        sel({ settings: null })
+        sel({ settings: null, environment: makeEnvironment() })
       );
       vi.mocked(parseSettings).mockReturnValue({});
       vi.mocked(saveChangedSettings).mockResolvedValue(undefined);

From d86f56a5aae87d5308ef10cbb11262080cd84c0f Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Mon, 23 Mar 2026 20:11:40 -0500
Subject: [PATCH 070/172] fix: Update Docker Hub image tags to conditionally
 format based on event type

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9745189e..95769a00 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -156,8 +156,8 @@ jobs:
           tags: |
             ghcr.io/${{ needs.prepare.outputs.repo_owner }}/${{ needs.prepare.outputs.repo_name }}:${{ needs.prepare.outputs.branch_tag }}-${{ matrix.platform }}
             ghcr.io/${{ needs.prepare.outputs.repo_owner }}/${{ needs.prepare.outputs.repo_name }}:${{ needs.prepare.outputs.version }}-${{ needs.prepare.outputs.timestamp }}-${{ matrix.platform }}
-            docker.io/${{ secrets.DOCKERHUB_ORGANIZATION }}/${{ needs.prepare.outputs.repo_name }}:${{ needs.prepare.outputs.branch_tag }}-${{ matrix.platform }}
-            docker.io/${{ secrets.DOCKERHUB_ORGANIZATION }}/${{ needs.prepare.outputs.repo_name }}:${{ needs.prepare.outputs.version }}-${{ needs.prepare.outputs.timestamp }}-${{ matrix.platform }}
+            ${{ github.event_name != 'pull_request' && format('docker.io/{0}/{1}:{2}-{3}', secrets.DOCKERHUB_ORGANIZATION, needs.prepare.outputs.repo_name, needs.prepare.outputs.branch_tag, matrix.platform) || '' }}
+            ${{ github.event_name != 'pull_request' && format('docker.io/{0}/{1}:{2}-{3}-{4}', secrets.DOCKERHUB_ORGANIZATION, needs.prepare.outputs.repo_name, needs.prepare.outputs.version, needs.prepare.outputs.timestamp, matrix.platform) || '' }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             REPO_OWNER=${{ needs.prepare.outputs.repo_owner }}

From 99fe8c96a2aef75a284d902a17e2a54eb6dd863f Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 24 Mar 2026 12:39:09 -0500
Subject: [PATCH 071/172] refactor: Move utility functions from
 pages/guideUtils.js to utils/guideUtils.js and update imports

---
 CHANGELOG.md                                  |   1 +
 frontend/src/components/GuideRow.jsx          |   2 +-
 frontend/src/components/HourTimeline.jsx      |   2 +-
 .../src/components/ProgramDetailModal.jsx     |   2 +-
 .../components/__tests__/GuideRow.test.jsx    |   2 +-
 .../__tests__/HourTimeline.test.jsx           |  49 +++++---
 frontend/src/pages/Guide.jsx                  | 105 +++++++++++-------
 frontend/src/pages/__tests__/Guide.test.jsx   |  13 ++-
 .../src/utils/cards/RecordingCardUtils.js     |   5 +-
 frontend/src/{pages => utils}/guideUtils.js   |   0
 10 files changed, 116 insertions(+), 65 deletions(-)
 rename frontend/src/{pages => utils}/guideUtils.js (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61ad05d3..4b4aa7bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Moved `guideUtils.js` from `frontend/src/pages/` to `frontend/src/utils/` to be consistent with other utility modules (e.g. `networkUtils.js`). Updated all imports across `GuideRow.jsx`, `HourTimeline.jsx`, `ProgramDetailModal.jsx`, `RecordingCardUtils.js`, `Guide.jsx`, and related test files.
 - Frontend cleanup: removed unused imports from `M3UGroupFilter`, `LiveGroupFilter`, and `VODCategoryFilter` (`Yup`, `M3UProfiles`, several unused Mantine components, dead `OptionWithTooltip` component, duplicate lucide-react imports, and `Divider` in `VODCategoryFilter`). No behaviour changes.
 - Network Access settings: leaving a field blank no longer shows a validation error. The default CIDR range for that field is saved automatically and a "Defaults Restored" warning is displayed listing which fields were reset. (Closes #726)
 
diff --git a/frontend/src/components/GuideRow.jsx b/frontend/src/components/GuideRow.jsx
index a1cdaed9..a13ddcdf 100644
--- a/frontend/src/components/GuideRow.jsx
+++ b/frontend/src/components/GuideRow.jsx
@@ -5,7 +5,7 @@ import {
   MINUTE_BLOCK_WIDTH,
   MINUTE_INCREMENT,
   PROGRAM_HEIGHT,
-} from '../pages/guideUtils.js';
+} from '../utils/guideUtils.js';
 import { Box, Flex, Text, Tooltip } from '@mantine/core';
 import { Play } from 'lucide-react';
 import logo from '../images/logo.png';
diff --git a/frontend/src/components/HourTimeline.jsx b/frontend/src/components/HourTimeline.jsx
index 0d5e70b4..5e1fc621 100644
--- a/frontend/src/components/HourTimeline.jsx
+++ b/frontend/src/components/HourTimeline.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Box, Text } from '@mantine/core';
 import { format } from '../utils/dateTimeUtils.js';
-import { HOUR_WIDTH } from '../pages/guideUtils.js';
+import { HOUR_WIDTH } from '../utils/guideUtils.js';
 
 const HourBlock = React.memo(
   ({ hourData, timeFormat, formatDayLabel, handleTimeClick }) => {
diff --git a/frontend/src/components/ProgramDetailModal.jsx b/frontend/src/components/ProgramDetailModal.jsx
index 07ff77e0..89388cb4 100644
--- a/frontend/src/components/ProgramDetailModal.jsx
+++ b/frontend/src/components/ProgramDetailModal.jsx
@@ -16,7 +16,7 @@ import API from '../api';
 import useVideoStore from '../store/useVideoStore';
 import useSettingsStore from '../store/settings';
 import { getShowVideoUrl } from '../utils/cards/RecordingCardUtils';
-import { formatSeasonEpisode } from '../pages/guideUtils';
+import { formatSeasonEpisode } from '../utils/guideUtils';
 import {
   format,
   initializeTime,
diff --git a/frontend/src/components/__tests__/GuideRow.test.jsx b/frontend/src/components/__tests__/GuideRow.test.jsx
index a78d6978..703ff76a 100644
--- a/frontend/src/components/__tests__/GuideRow.test.jsx
+++ b/frontend/src/components/__tests__/GuideRow.test.jsx
@@ -6,7 +6,7 @@ import {
   CHANNEL_WIDTH,
   HOUR_WIDTH,
   PROGRAM_HEIGHT,
-} from '../../pages/guideUtils';
+} from '../../utils/guideUtils';
 
 // Mock logo import
 vi.mock('../../images/logo.png', () => ({
diff --git a/frontend/src/components/__tests__/HourTimeline.test.jsx b/frontend/src/components/__tests__/HourTimeline.test.jsx
index 372ec155..393e559e 100644
--- a/frontend/src/components/__tests__/HourTimeline.test.jsx
+++ b/frontend/src/components/__tests__/HourTimeline.test.jsx
@@ -3,7 +3,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import HourTimeline from '../HourTimeline';
 import { format } from '../../utils/dateTimeUtils';
-import { HOUR_WIDTH } from '../../pages/guideUtils';
+import { HOUR_WIDTH } from '../../utils/guideUtils';
 
 // Mock date utilities
 vi.mock('../../utils/dateTimeUtils', () => ({
@@ -108,7 +108,9 @@ describe('HourTimeline', () => {
         />
       );
 
-      const hourBlocks = container.querySelectorAll('[style*="cursor: pointer"]');
+      const hourBlocks = container.querySelectorAll(
+        '[style*="cursor: pointer"]'
+      );
       hourBlocks.forEach((block) => {
         expect(block).toHaveAttribute('w', `${HOUR_WIDTH}`);
         expect(block).toHaveAttribute('h', '40px');
@@ -126,16 +128,16 @@ describe('HourTimeline', () => {
         />
       );
 
-      const hourBlocks = container.querySelectorAll('[style*="cursor: pointer"]');
+      const hourBlocks = container.querySelectorAll(
+        '[style*="cursor: pointer"]'
+      );
       expect(hourBlocks[0]).toHaveStyle({
         backgroundColor: '#1B2421',
       });
     });
 
     it('should apply special styling for new day blocks', () => {
-      const newDayTimeline = [
-        { time: mockTime3, isNewDay: true },
-      ];
+      const newDayTimeline = [{ time: mockTime3, isNewDay: true }];
 
       const { container } = render(
         <HourTimeline
@@ -154,9 +156,7 @@ describe('HourTimeline', () => {
     });
 
     it('should apply bold font weight to day label on new day', () => {
-      const newDayTimeline = [
-        { time: mockTime3, isNewDay: true },
-      ];
+      const newDayTimeline = [{ time: mockTime3, isNewDay: true }];
 
       const { container } = render(
         <HourTimeline
@@ -198,7 +198,9 @@ describe('HourTimeline', () => {
         />
       );
 
-      const markers = container.querySelectorAll('[style*="background-color: rgb(113, 128, 150);"]');
+      const markers = container.querySelectorAll(
+        '[style*="background-color: rgb(113, 128, 150);"]'
+      );
       expect(markers.length).toBe(3); // 15, 30, 45 minute markers
     });
 
@@ -212,7 +214,9 @@ describe('HourTimeline', () => {
         />
       );
 
-      const markers = container.querySelectorAll('[style*="backgroundColor: #718096"]');
+      const markers = container.querySelectorAll(
+        '[style*="backgroundColor: #718096"]'
+      );
       const positions = ['25%', '50%', '75%'];
 
       markers.forEach((marker, index) => {
@@ -238,10 +242,15 @@ describe('HourTimeline', () => {
         />
       );
 
-      const hourBlocks = container.querySelectorAll('[style*="cursor: pointer"]');
+      const hourBlocks = container.querySelectorAll(
+        '[style*="cursor: pointer"]'
+      );
       fireEvent.click(hourBlocks[0]);
 
-      expect(mockHandleTimeClick).toHaveBeenCalledWith(mockTime1, expect.any(Object));
+      expect(mockHandleTimeClick).toHaveBeenCalledWith(
+        mockTime1,
+        expect.any(Object)
+      );
     });
 
     it('should call handleTimeClick with correct time for each block', () => {
@@ -254,13 +263,21 @@ describe('HourTimeline', () => {
         />
       );
 
-      const hourBlocks = container.querySelectorAll('[style*="cursor: pointer"]');
+      const hourBlocks = container.querySelectorAll(
+        '[style*="cursor: pointer"]'
+      );
 
       fireEvent.click(hourBlocks[0]);
-      expect(mockHandleTimeClick).toHaveBeenCalledWith(mockTime1, expect.any(Object));
+      expect(mockHandleTimeClick).toHaveBeenCalledWith(
+        mockTime1,
+        expect.any(Object)
+      );
 
       fireEvent.click(hourBlocks[1]);
-      expect(mockHandleTimeClick).toHaveBeenCalledWith(mockTime2, expect.any(Object));
+      expect(mockHandleTimeClick).toHaveBeenCalledWith(
+        mockTime2,
+        expect.any(Object)
+      );
     });
   });
 
diff --git a/frontend/src/pages/Guide.jsx b/frontend/src/pages/Guide.jsx
index 81171637..1132bc3d 100644
--- a/frontend/src/pages/Guide.jsx
+++ b/frontend/src/pages/Guide.jsx
@@ -66,7 +66,7 @@ import {
   PX_PER_MS,
   calcProgressPct,
   sortChannels,
-} from './guideUtils';
+} from '../utils/guideUtils';
 import API from '../api';
 import { getShowVideoUrl } from '../utils/cards/RecordingCardUtils.js';
 import {
@@ -387,7 +387,8 @@ export default function TVChannelGuide({ startDate, endDate }) {
       }
     };
     document.addEventListener('visibilitychange', handleVisibilityChange);
-    return () => document.removeEventListener('visibilitychange', handleVisibilityChange);
+    return () =>
+      document.removeEventListener('visibilitychange', handleVisibilityChange);
   }, []);
 
   // Pixel offset for the "now" vertical line
@@ -863,7 +864,8 @@ export default function TVChannelGuide({ startDate, endDate }) {
         (startOffsetMinutes / MINUTE_INCREMENT) * MINUTE_BLOCK_WIDTH;
 
       const widthPx =
-        (durationMinutes / MINUTE_INCREMENT) * MINUTE_BLOCK_WIDTH - PROGRAM_GAP_PX * 2;
+        (durationMinutes / MINUTE_INCREMENT) * MINUTE_BLOCK_WIDTH -
+        PROGRAM_GAP_PX * 2;
 
       const recording = recordingsByProgramId.get(program.id);
 
@@ -960,14 +962,25 @@ export default function TVChannelGuide({ startDate, endDate }) {
               </Text>
 
               {/* Row 2: S/E badge + Subtitle or description fallback */}
-              {(seasonEpisodeLabel || program.sub_title || program.description) && (
-                <Group gap={4} wrap="nowrap" style={{ overflow: 'hidden', minWidth: 0 }}>
+              {(seasonEpisodeLabel ||
+                program.sub_title ||
+                program.description) && (
+                <Group
+                  gap={4}
+                  wrap="nowrap"
+                  style={{ overflow: 'hidden', minWidth: 0 }}
+                >
                   {seasonEpisodeLabel && (
                     <Badge
                       size="xs"
                       variant="light"
                       color="cyan"
-                      styles={{ root: { backgroundColor: 'rgba(20,90,110,0.55)', flexShrink: 0 } }}
+                      styles={{
+                        root: {
+                          backgroundColor: 'rgba(20,90,110,0.55)',
+                          flexShrink: 0,
+                        },
+                      }}
                     >
                       {seasonEpisodeLabel}
                     </Badge>
@@ -1007,7 +1020,12 @@ export default function TVChannelGuide({ startDate, endDate }) {
                     size="xs"
                     variant="light"
                     color="red"
-                    styles={{ root: { backgroundColor: 'rgba(120,20,20,0.55)', flexShrink: 0 } }}
+                    styles={{
+                      root: {
+                        backgroundColor: 'rgba(120,20,20,0.55)',
+                        flexShrink: 0,
+                      },
+                    }}
                   >
                     LIVE
                   </Badge>
@@ -1017,7 +1035,12 @@ export default function TVChannelGuide({ startDate, endDate }) {
                     size="xs"
                     variant="light"
                     color="green"
-                    styles={{ root: { backgroundColor: 'rgba(20,100,20,0.55)', flexShrink: 0 } }}
+                    styles={{
+                      root: {
+                        backgroundColor: 'rgba(20,100,20,0.55)',
+                        flexShrink: 0,
+                      },
+                    }}
                   >
                     NEW
                   </Badge>
@@ -1026,39 +1049,44 @@ export default function TVChannelGuide({ startDate, endDate }) {
             </Box>
 
             {/* Progress bar for currently-airing programs — updated every second via DOM */}
-            {isLive && (() => {
-              const durationMs = programEndMs - programStartMs;
-              if (durationMs <= 0) return null;
-              const initialPct = calcProgressPct(Date.now(), programStartMs, durationMs);
-              return (
-                <Box
-                  pos="absolute"
-                  bottom={0}
-                  left={0}
-                  right={0}
-                  h={4}
-                  style={{
-                    backgroundColor: 'rgba(255, 255, 255, 0.1)',
-                    borderRadius: '0 0 8px 8px',
-                    overflow: 'hidden',
-                  }}
-                >
+            {isLive &&
+              (() => {
+                const durationMs = programEndMs - programStartMs;
+                if (durationMs <= 0) return null;
+                const initialPct = calcProgressPct(
+                  Date.now(),
+                  programStartMs,
+                  durationMs
+                );
+                return (
                   <Box
-                    className="guide-progress-fill"
-                    data-start-ms={programStartMs}
-                    data-end-ms={programEndMs}
-                    h="100%"
+                    pos="absolute"
+                    bottom={0}
+                    left={0}
+                    right={0}
+                    h={4}
                     style={{
-                      width: '100%',
-                      backgroundColor: 'rgba(255, 255, 255, 0.5)',
-                      borderRadius: '0 0 0 8px',
-                      transformOrigin: 'left',
-                      transform: `scaleX(${initialPct})`,
+                      backgroundColor: 'rgba(255, 255, 255, 0.1)',
+                      borderRadius: '0 0 8px 8px',
+                      overflow: 'hidden',
                     }}
-                  />
-                </Box>
-              );
-            })()}
+                  >
+                    <Box
+                      className="guide-progress-fill"
+                      data-start-ms={programStartMs}
+                      data-end-ms={programEndMs}
+                      h="100%"
+                      style={{
+                        width: '100%',
+                        backgroundColor: 'rgba(255, 255, 255, 0.5)',
+                        borderRadius: '0 0 0 8px',
+                        transformOrigin: 'left',
+                        transform: `scaleX(${initialPct})`,
+                      }}
+                    />
+                  </Box>
+                );
+              })()}
           </Paper>
         </Box>
       );
@@ -1354,7 +1382,6 @@ export default function TVChannelGuide({ startDate, endDate }) {
                 />
               </Box>
             </Box>
-
           </Box>
         </Box>
 
diff --git a/frontend/src/pages/__tests__/Guide.test.jsx b/frontend/src/pages/__tests__/Guide.test.jsx
index 07ef1eeb..c6577006 100644
--- a/frontend/src/pages/__tests__/Guide.test.jsx
+++ b/frontend/src/pages/__tests__/Guide.test.jsx
@@ -10,7 +10,7 @@ import useSettingsStore from '../../store/settings';
 import useVideoStore from '../../store/useVideoStore';
 import useLocalStorage from '../../hooks/useLocalStorage';
 import { showNotification } from '../../utils/notificationUtils.js';
-import * as guideUtils from '../guideUtils';
+import * as guideUtils from '../../utils/guideUtils';
 import * as recordingCardUtils from '../../utils/cards/RecordingCardUtils.js';
 import * as dateTimeUtils from '../../utils/dateTimeUtils.js';
 import userEvent from '@testing-library/user-event';
@@ -127,7 +127,12 @@ vi.mock('@mantine/core', async () => {
       </select>
     ),
     Badge: ({ children, size, variant, color, style }) => (
-      <span data-size={size} data-variant={variant} data-color={color} style={style}>
+      <span
+        data-size={size}
+        data-variant={variant}
+        data-color={color}
+        style={style}
+      >
         {children}
       </span>
     ),
@@ -208,8 +213,8 @@ vi.mock('../../components/ProgramDetailModal', () => ({
     ) : null,
 }));
 
-vi.mock('../guideUtils', async () => {
-  const actual = await vi.importActual('../guideUtils');
+vi.mock('../../utils/guideUtils', async () => {
+  const actual = await vi.importActual('../../utils/guideUtils');
   return {
     ...actual,
     fetchPrograms: vi.fn(),
diff --git a/frontend/src/utils/cards/RecordingCardUtils.js b/frontend/src/utils/cards/RecordingCardUtils.js
index 43e3fb95..48e14393 100644
--- a/frontend/src/utils/cards/RecordingCardUtils.js
+++ b/frontend/src/utils/cards/RecordingCardUtils.js
@@ -1,7 +1,7 @@
 import API from '../../api.js';
 import useChannelsStore from '../../store/channels.jsx';
 import defaultLogo from '../../images/logo.png';
-import { formatSeasonEpisode } from '../../pages/guideUtils.js';
+import { formatSeasonEpisode } from '../guideUtils.js';
 
 export const removeRecording = (id) => {
   // Optimistically remove immediately from UI
@@ -111,7 +111,8 @@ export const getRecordingUrl = (customProps, env_mode) => {
 };
 
 export const getSeasonLabel = (season, episode, onscreen) => {
-  if (season != null && episode != null) return formatSeasonEpisode(season, episode);
+  if (season != null && episode != null)
+    return formatSeasonEpisode(season, episode);
   return onscreen || null;
 };
 
diff --git a/frontend/src/pages/guideUtils.js b/frontend/src/utils/guideUtils.js
similarity index 100%
rename from frontend/src/pages/guideUtils.js
rename to frontend/src/utils/guideUtils.js

From 0ac8b21964a43f398eadef123b900daa7fda5b75 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 24 Mar 2026 12:53:08 -0500
Subject: [PATCH 072/172] =?UTF-8?q?Enhancement:=20M3U=20table=20**Max=20St?=
 =?UTF-8?q?reams**=20column=20now=20reflects=20the=20combined=20limit=20ac?=
 =?UTF-8?q?ross=20all=20active=20profiles.=20When=20a=20playlist=20has=20m?=
 =?UTF-8?q?ultiple=20active=20profiles,=20the=20column=20displays=20their?=
 =?UTF-8?q?=20summed=20total=20(or=20=E2=88=9E=20if=20any=20profile=20is?=
 =?UTF-8?q?=20unlimited)=20and=20a=20hover=20tooltip=20lists=20each=20prof?=
 =?UTF-8?q?ile's=20individual=20limit=20by=20name.=20(Closes=20#816)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                 |  1 +
 frontend/src/components/tables/M3UsTable.jsx | 40 ++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b4aa7bf..68d58355 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- M3U table **Max Streams** column now reflects the combined limit across all active profiles. When a playlist has multiple active profiles, the column displays their summed total (or ∞ if any profile is unlimited) and a hover tooltip lists each profile's individual limit by name. (Closes #816)
 - Moved `guideUtils.js` from `frontend/src/pages/` to `frontend/src/utils/` to be consistent with other utility modules (e.g. `networkUtils.js`). Updated all imports across `GuideRow.jsx`, `HourTimeline.jsx`, `ProgramDetailModal.jsx`, `RecordingCardUtils.js`, `Guide.jsx`, and related test files.
 - Frontend cleanup: removed unused imports from `M3UGroupFilter`, `LiveGroupFilter`, and `VODCategoryFilter` (`Yup`, `M3UProfiles`, several unused Mantine components, dead `OptionWithTooltip` component, duplicate lucide-react imports, and `Divider` in `VODCategoryFilter`). No behaviour changes.
 - Network Access settings: leaving a field blank no longer shows a validation error. The default CIDR range for that field is saved automatically and a "Defaults Restored" warning is displayed listing which fields were reset. (Closes #726)
diff --git a/frontend/src/components/tables/M3UsTable.jsx b/frontend/src/components/tables/M3UsTable.jsx
index 99aeed9b..4db3fb3f 100644
--- a/frontend/src/components/tables/M3UsTable.jsx
+++ b/frontend/src/components/tables/M3UsTable.jsx
@@ -588,6 +588,46 @@ const M3UTable = () => {
         accessorKey: 'max_streams',
         sortable: true,
         size: 125,
+        cell: ({ cell, row }) => {
+          const profiles = row.original.profiles || [];
+          const activeProfiles = profiles.filter((p) => p.is_active);
+
+          if (activeProfiles.length <= 1) {
+            const val = cell.getValue();
+            return <Text size="xs">{val === 0 ? '∞' : val}</Text>;
+          }
+
+          const hasUnlimited = activeProfiles.some((p) => p.max_streams === 0);
+          const total = hasUnlimited
+            ? null
+            : activeProfiles.reduce((sum, p) => sum + p.max_streams, 0);
+
+          const tooltipLines = activeProfiles
+            .map(
+              (p) =>
+                `${p.name}: ${p.max_streams === 0 ? 'Unlimited' : p.max_streams}`
+            )
+            .join('\n');
+
+          return (
+            <Tooltip
+              label={tooltipLines}
+              multiline
+              width={220}
+              style={{ whiteSpace: 'pre-line' }}
+            >
+              <Text
+                size="xs"
+                style={{
+                  cursor: 'default',
+                  textDecoration: 'underline dotted',
+                }}
+              >
+                {hasUnlimited ? '∞' : total}
+              </Text>
+            </Tooltip>
+          );
+        },
       },
       {
         header: 'Expiration',

From 1246f75c6b8b6042620000c305c5ec5183ca54ec Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 24 Mar 2026 13:03:19 -0500
Subject: [PATCH 073/172] Enhancement: Toggling an M3U profile's active state
 now immediately updates the playlist store (including the `playlists` array),
 so the **Max Streams** total in the M3U table reflects the change without a
 page reload. - M3U account form: **Max Streams** field changed from a plain
 text input to a number input with increment/decrement controls, consistent
 with other integer fields. - M3U account form: removed unused
 `useMantineTheme` import and `theme` variable.

---
 CHANGELOG.md                          | 3 +++
 frontend/src/api.js                   | 4 +---
 frontend/src/components/forms/M3U.jsx | 6 ++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68d58355..2346a6e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - M3U table **Max Streams** column now reflects the combined limit across all active profiles. When a playlist has multiple active profiles, the column displays their summed total (or ∞ if any profile is unlimited) and a hover tooltip lists each profile's individual limit by name. (Closes #816)
+- Toggling an M3U profile's active state now immediately updates the playlist store (including the `playlists` array), so the **Max Streams** total in the M3U table reflects the change without a page reload.
+- M3U account form: **Max Streams** field changed from a plain text input to a number input with increment/decrement controls, consistent with other integer fields.
+- M3U account form: removed unused `useMantineTheme` import and `theme` variable.
 - Moved `guideUtils.js` from `frontend/src/pages/` to `frontend/src/utils/` to be consistent with other utility modules (e.g. `networkUtils.js`). Updated all imports across `GuideRow.jsx`, `HourTimeline.jsx`, `ProgramDetailModal.jsx`, `RecordingCardUtils.js`, `Guide.jsx`, and related test files.
 - Frontend cleanup: removed unused imports from `M3UGroupFilter`, `LiveGroupFilter`, and `VODCategoryFilter` (`Yup`, `M3UProfiles`, several unused Mantine components, dead `OptionWithTooltip` component, duplicate lucide-react imports, and `Divider` in `VODCategoryFilter`). No behaviour changes.
 - Network Access settings: leaving a field blank no longer shows a validation error. The default CIDR range for that field is saved automatically and a "Defaults Restored" warning is displayed listing which fields were reset. (Closes #726)
diff --git a/frontend/src/api.js b/frontend/src/api.js
index b1c103d8..3d66eae2 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -1601,9 +1601,7 @@ export default class API {
       });
 
       const playlist = await API.getPlaylist(accountId);
-      usePlaylistsStore
-        .getState()
-        .updateProfiles(playlist.id, playlist.profiles);
+      usePlaylistsStore.getState().updatePlaylist(playlist);
     } catch (e) {
       errorNotification(`Failed to update profile for account ${accountId}`, e);
     }
diff --git a/frontend/src/components/forms/M3U.jsx b/frontend/src/components/forms/M3U.jsx
index c8caeaef..3a5b7c2e 100644
--- a/frontend/src/components/forms/M3U.jsx
+++ b/frontend/src/components/forms/M3U.jsx
@@ -12,7 +12,6 @@ import {
   Flex,
   Select,
   FileInput,
-  useMantineTheme,
   NumberInput,
   Divider,
   Stack,
@@ -37,8 +36,6 @@ const M3U = ({
   onClose,
   playlistCreated = false,
 }) => {
-  const theme = useMantineTheme();
-
   const userAgents = useUserAgentsStore((s) => s.userAgents);
   const fetchChannelGroups = useChannelsStore((s) => s.fetchChannelGroups);
   const fetchEPGs = useEPGsStore((s) => s.fetchEPGs);
@@ -398,13 +395,14 @@ const M3U = ({
             <Divider size="sm" orientation="vertical" />
 
             <Stack gap="5" style={{ flex: 1 }}>
-              <TextInput
+              <NumberInput
                 style={{ width: '100%' }}
                 id="max_streams"
                 name="max_streams"
                 label="Max Streams"
                 placeholder="0 = Unlimited"
                 description="Maximum number of concurrent streams (0 for unlimited)"
+                min={0}
                 {...form.getInputProps('max_streams')}
                 key={form.key('max_streams')}
               />

From ec876716c58792482c7a7cc7a37ebf71fd5d65aa Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 24 Mar 2026 13:08:45 -0500
Subject: [PATCH 074/172] tests: Fix tests that use guide utils.

---
 .../src/pages/__tests__/guideUtils.test.js    | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/frontend/src/pages/__tests__/guideUtils.test.js b/frontend/src/pages/__tests__/guideUtils.test.js
index 14d03745..0c7f5cd4 100644
--- a/frontend/src/pages/__tests__/guideUtils.test.js
+++ b/frontend/src/pages/__tests__/guideUtils.test.js
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
-import * as guideUtils from '../guideUtils';
+import * as guideUtils from '../../utils/guideUtils';
 import * as dateTimeUtils from '../../utils/dateTimeUtils';
 import API from '../../api';
 
@@ -676,11 +676,26 @@ describe('guideUtils', () => {
 
     it('should exclude terminal status recordings', () => {
       const recordings = [
-        { id: 1, custom_properties: { program: { id: 'p1' }, status: 'completed' } },
-        { id: 2, custom_properties: { program: { id: 'p2' }, status: 'stopped' } },
-        { id: 3, custom_properties: { program: { id: 'p3' }, status: 'interrupted' } },
-        { id: 4, custom_properties: { program: { id: 'p4' }, status: 'failed' } },
-        { id: 5, custom_properties: { program: { id: 'p5' }, status: 'recording' } },
+        {
+          id: 1,
+          custom_properties: { program: { id: 'p1' }, status: 'completed' },
+        },
+        {
+          id: 2,
+          custom_properties: { program: { id: 'p2' }, status: 'stopped' },
+        },
+        {
+          id: 3,
+          custom_properties: { program: { id: 'p3' }, status: 'interrupted' },
+        },
+        {
+          id: 4,
+          custom_properties: { program: { id: 'p4' }, status: 'failed' },
+        },
+        {
+          id: 5,
+          custom_properties: { program: { id: 'p5' }, status: 'recording' },
+        },
         { id: 6, custom_properties: { program: { id: 'p6' } } },
       ];
 

From 58f40ff27662f32edecda06f919d778c2e70a29a Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 24 Mar 2026 13:19:48 -0500
Subject: [PATCH 075/172] Bug Fix: Fixed stale references to old guideutils
 location. Also change dockerfile to get clear error messages during failure.

---
 docker/Dockerfile                                         | 8 ++++----
 .../src/components/__tests__/ProgramDetailModal.test.jsx  | 5 +++--
 frontend/src/components/forms/ProgramRecordingModal.jsx   | 2 +-
 frontend/src/components/forms/SeriesRecordingModal.jsx    | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3e30a825..596c4025 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,7 +12,7 @@ COPY ./frontend /app/frontend
 # remove any node_modules that may have been copied from the host (x86)
 RUN rm -rf node_modules || true; \
     npm install --no-audit --progress=false;
-RUN    npm run build; \
+RUN    npm run build && \
     rm -rf node_modules .cache
 
 # --- Redeclare build arguments for the next stage ---
@@ -32,9 +32,9 @@ COPY . /app
 COPY ./docker/nginx.conf /etc/nginx/sites-enabled/default
 # Fix line endings and make entrypoint scripts executable
 RUN for f in /app/docker/entrypoint*.sh; do \
-        if [ -f "$f" ]; then \
-            sed -i 's/\r$//' "$f" && chmod +x "$f"; \
-        fi; \
+    if [ -f "$f" ]; then \
+    sed -i 's/\r$//' "$f" && chmod +x "$f"; \
+    fi; \
     done
 # Clean out existing frontend folder
 RUN rm -rf /app/frontend
diff --git a/frontend/src/components/__tests__/ProgramDetailModal.test.jsx b/frontend/src/components/__tests__/ProgramDetailModal.test.jsx
index 11e65823..0127d8f9 100644
--- a/frontend/src/components/__tests__/ProgramDetailModal.test.jsx
+++ b/frontend/src/components/__tests__/ProgramDetailModal.test.jsx
@@ -21,9 +21,10 @@ vi.mock('../../utils/dateTimeUtils.js', () => ({
   useDateTimeFormat: vi.fn(() => ({ timeFormat: 'h:mm A' })),
 }));
 
-vi.mock('../../pages/guideUtils', () => ({
+vi.mock('../../utils/guideUtils', () => ({
   formatSeasonEpisode: vi.fn((s, e) => {
-    if (s != null && e != null) return `S${String(s).padStart(2, '0')}E${String(e).padStart(2, '0')}`;
+    if (s != null && e != null)
+      return `S${String(s).padStart(2, '0')}E${String(e).padStart(2, '0')}`;
     if (s != null) return `S${String(s).padStart(2, '0')}`;
     if (e != null) return `E${String(e).padStart(2, '0')}`;
     return null;
diff --git a/frontend/src/components/forms/ProgramRecordingModal.jsx b/frontend/src/components/forms/ProgramRecordingModal.jsx
index 294cb2aa..82da2674 100644
--- a/frontend/src/components/forms/ProgramRecordingModal.jsx
+++ b/frontend/src/components/forms/ProgramRecordingModal.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Modal, Flex, Button } from '@mantine/core';
 import { deleteRecordingById } from '../../utils/cards/RecordingCardUtils.js';
 import { deleteSeriesAndRule } from '../../utils/cards/RecordingCardUtils.js';
-import { deleteSeriesRuleByTvgId } from '../../pages/guideUtils.js';
+import { deleteSeriesRuleByTvgId } from '../../utils/guideUtils.js';
 
 export default function ProgramRecordingModal({
   opened,
diff --git a/frontend/src/components/forms/SeriesRecordingModal.jsx b/frontend/src/components/forms/SeriesRecordingModal.jsx
index f2e6d489..7b1951b2 100644
--- a/frontend/src/components/forms/SeriesRecordingModal.jsx
+++ b/frontend/src/components/forms/SeriesRecordingModal.jsx
@@ -5,7 +5,7 @@ import { deleteSeriesAndRule } from '../../utils/cards/RecordingCardUtils.js';
 import {
   evaluateSeriesRulesByTvgId,
   fetchRules,
-} from '../../pages/guideUtils.js';
+} from '../../utils/guideUtils.js';
 import { showNotification } from '../../utils/notificationUtils.js';
 
 export default function SeriesRecordingModal({

From 6d694c8475cb2b688bb92526dc9bb535d1602c49 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 24 Mar 2026 13:41:46 -0500
Subject: [PATCH 076/172] Bug Fix: Sort max stream column by total of streams
 from all profiles.

---
 frontend/src/components/tables/M3UsTable.jsx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/tables/M3UsTable.jsx b/frontend/src/components/tables/M3UsTable.jsx
index 4db3fb3f..2b0e6168 100644
--- a/frontend/src/components/tables/M3UsTable.jsx
+++ b/frontend/src/components/tables/M3UsTable.jsx
@@ -585,15 +585,23 @@ const M3UTable = () => {
       },
       {
         header: 'Max Streams',
-        accessorKey: 'max_streams',
+        id: 'max_streams',
+        accessorFn: (row) => {
+          const activeProfiles = (row.profiles || []).filter(
+            (p) => p.is_active
+          );
+          if (activeProfiles.length === 0) return row.max_streams;
+          if (activeProfiles.some((p) => p.max_streams === 0)) return Infinity;
+          return activeProfiles.reduce((sum, p) => sum + p.max_streams, 0);
+        },
         sortable: true,
         size: 125,
-        cell: ({ cell, row }) => {
+        cell: ({ row }) => {
           const profiles = row.original.profiles || [];
           const activeProfiles = profiles.filter((p) => p.is_active);
 
           if (activeProfiles.length <= 1) {
-            const val = cell.getValue();
+            const val = row.original.max_streams;
             return <Text size="xs">{val === 0 ? '∞' : val}</Text>;
           }
 

From c005b1ac565a318abf74d16eefff06fa159e2eae Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Tue, 24 Mar 2026 18:25:15 -0500
Subject: [PATCH 077/172] changelog: add TLS connection support for Redis and
 PostgreSQL (#950)

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2300474..59ebb88f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- TLS and mutual TLS (mTLS) support for Redis and PostgreSQL connections in modular deployments. Supports encrypted connections, server certificate verification (Redis: on/off; PostgreSQL: verify-full, verify-ca, require), CA certificate configuration, and client certificate authentication. Configured via environment variables in the docker compose file. Includes startup validation for certificate paths and TLS/URL scheme conflicts, and a read-only Connection Security panel in System Settings. (Closes #950)
 - Status filter for M3U group and VOD category filter modals: A new **All / Enabled / Disabled** segmented control is now shown alongside the text search input in the Live, VOD - Movies, and VOD - Series tabs of the M3U Group Filter modal. The status filter works in combination with the text search and also scopes the "Select Visible" / "Deselect Visible" buttons so they only act on the currently visible subset. (Closes #312)
 
 ### Changed

From a19be96cedc24207762201b4131c908d39a26496 Mon Sep 17 00:00:00 2001
From: dekzter <kappa118@gmail.com>
Date: Wed, 25 Mar 2026 17:33:26 -0400
Subject: [PATCH 078/172] fleshed out user limits and termination logic

---
 apps/accounts/api_views.py                    |    9 +-
 .../migrations/0006_user_stream_limit.py      |   18 +
 apps/accounts/models.py                       |    1 +
 apps/accounts/serializers.py                  |    1 +
 apps/proxy/ts_proxy/client_manager.py         |    2 +-
 apps/proxy/ts_proxy/server.py                 |   16 +-
 apps/proxy/ts_proxy/views.py                  |    8 +
 apps/proxy/urls.py                            |    2 +-
 apps/proxy/utils.py                           |  185 +++
 apps/proxy/vod_proxy/connection_manager.py    |    2 +-
 .../multi_worker_connection_manager.py        |   37 +-
 apps/proxy/vod_proxy/urls.py                  |    9 +-
 apps/proxy/vod_proxy/views.py                 | 1193 +++++++++--------
 apps/vod/api_views.py                         |    1 -
 .../022_default_user_limit_settings.py        |   24 +
 core/models.py                                |   10 +
 core/utils.py                                 |   96 +-
 core/xtream_codes.py                          |    2 +-
 dispatcharr/urls.py                           |   10 +-
 frontend/src/api.js                           |   13 +-
 frontend/src/components/forms/User.jsx        |   41 +-
 .../forms/settings/UserLimitsForm.jsx         |  116 ++
 frontend/src/constants.js                     |   27 +
 frontend/src/pages/Settings.jsx               |   14 +
 24 files changed, 1129 insertions(+), 708 deletions(-)
 create mode 100644 apps/accounts/migrations/0006_user_stream_limit.py
 create mode 100644 apps/proxy/utils.py
 create mode 100644 core/migrations/022_default_user_limit_settings.py
 create mode 100644 frontend/src/components/forms/settings/UserLimitsForm.jsx

diff --git a/apps/accounts/api_views.py b/apps/accounts/api_views.py
index 76892929..c698f07a 100644
--- a/apps/accounts/api_views.py
+++ b/apps/accounts/api_views.py
@@ -287,11 +287,10 @@ class UserViewSet(viewsets.ModelViewSet):
         if request.method == "PATCH":
             ALLOWED_FIELDS = {"custom_properties", "first_name", "last_name", "email", "password"}
             disallowed = set(request.data.keys()) - ALLOWED_FIELDS
-            if disallowed:
-                return Response(
-                    {"detail": f"Fields not allowed for self-update: {', '.join(disallowed)}"},
-                    status=400,
-                )
+
+            for key in disallowed:
+                request.data.pop(key, None)
+
             serializer = UserSerializer(user, data=request.data, partial=True)
             serializer.is_valid(raise_exception=True)
             serializer.save()
diff --git a/apps/accounts/migrations/0006_user_stream_limit.py b/apps/accounts/migrations/0006_user_stream_limit.py
new file mode 100644
index 00000000..5714e1ef
--- /dev/null
+++ b/apps/accounts/migrations/0006_user_stream_limit.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.11 on 2026-03-19 13:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0005_alter_user_managers'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='stream_limit',
+            field=models.IntegerField(default=0),
+        ),
+    ]
diff --git a/apps/accounts/models.py b/apps/accounts/models.py
index e04d66ed..2a32f95a 100644
--- a/apps/accounts/models.py
+++ b/apps/accounts/models.py
@@ -30,6 +30,7 @@ class User(AbstractUser):
     user_level = models.IntegerField(default=UserLevel.STREAMER)
     custom_properties = models.JSONField(default=dict, blank=True, null=True)
     api_key = models.CharField(max_length=200, blank=True, null=True, db_index=True)
+    stream_limit = models.IntegerField(default=0)
 
     def __str__(self):
         return self.username
diff --git a/apps/accounts/serializers.py b/apps/accounts/serializers.py
index c90ffef4..8a9f609e 100644
--- a/apps/accounts/serializers.py
+++ b/apps/accounts/serializers.py
@@ -65,6 +65,7 @@ class UserSerializer(serializers.ModelSerializer):
             "channel_profiles",
             "custom_properties",
             "avatar_config",
+            "stream_limit",
             "is_staff",
             "is_superuser",
             "last_login",
diff --git a/apps/proxy/ts_proxy/client_manager.py b/apps/proxy/ts_proxy/client_manager.py
index c0e5ab0b..64d2b1ec 100644
--- a/apps/proxy/ts_proxy/client_manager.py
+++ b/apps/proxy/ts_proxy/client_manager.py
@@ -247,7 +247,7 @@ class ClientManager:
             "connected_at": current_time,
             "last_active": current_time,
             "worker_id": self.worker_id or "unknown",
-            "user_id": str(user.id) if user is not None else "unknown",
+            "user_id": str(user.id) if user is not None else "0",
             # "user_level": user.user_level if user is not None else 100, # default to a high value since no user means the non-user specific M3U/HDHR
         }
 
diff --git a/apps/proxy/ts_proxy/server.py b/apps/proxy/ts_proxy/server.py
index 4c51768a..6f92fe56 100644
--- a/apps/proxy/ts_proxy/server.py
+++ b/apps/proxy/ts_proxy/server.py
@@ -374,7 +374,7 @@ class ProxyServer:
             if result is None:
                 return None
             try:
-                return result.decode('utf-8')
+                return result
             except (AttributeError, UnicodeDecodeError) as e:
                 logger.error(f"Error decoding channel owner for {channel_id}: {e}, raw={result!r}")
                 return None
@@ -940,14 +940,14 @@ class ProxyServer:
                             # Calculate runtime from init_time
                             if b'init_time' in metadata:
                                 try:
-                                    init_time = float(metadata[b'init_time'].decode('utf-8'))
+                                    init_time = float(metadata['init_time'])
                                     runtime = round(time.time() - init_time, 2)
                                 except Exception:
                                     pass
                             # Get total bytes transferred
                             if b'total_bytes' in metadata:
                                 try:
-                                    total_bytes = int(metadata[b'total_bytes'].decode('utf-8'))
+                                    total_bytes = int(metadata['total_bytes'])
                                 except Exception:
                                     pass
 
@@ -1105,7 +1105,7 @@ class ProxyServer:
                                         attempt_value = self.redis_client.get(attempt_key)
                                         if attempt_value:
                                             try:
-                                                connection_attempt_time = float(attempt_value.decode('utf-8'))
+                                                connection_attempt_time = float(attempt_value)
                                             except (ValueError, TypeError):
                                                 pass
 
@@ -1113,7 +1113,7 @@ class ProxyServer:
                                     init_time = None
                                     if metadata and b'init_time' in metadata:
                                         try:
-                                            init_time = float(metadata[b'init_time'].decode('utf-8'))
+                                            init_time = float(metadata[b'init_time'])
                                         except (ValueError, TypeError):
                                             pass
 
@@ -1350,7 +1350,7 @@ class ProxyServer:
 
             for key in channel_keys:
                 try:
-                    channel_id = key.decode('utf-8').split(':')[2]
+                    channel_id = key.split(':')[2]
 
                     # Get metadata first
                     metadata = self.redis_client.hgetall(key)
@@ -1365,7 +1365,7 @@ class ProxyServer:
                         continue
 
                     # Get owner
-                    owner = metadata.get(b'owner', b'').decode('utf-8') if b'owner' in metadata else ''
+                    owner = metadata.get('owner', '') if 'owner' in metadata else ''
 
                     # Check if owner is still alive
                     owner_alive = False
@@ -1379,7 +1379,7 @@ class ProxyServer:
 
                     # If no owner and no clients, clean it up
                     if not owner_alive and client_count == 0:
-                        state = metadata.get(b'state', b'unknown').decode('utf-8') if b'state' in metadata else 'unknown'
+                        state = metadata.get('state', 'unknown')
                         logger.warning(f"Found orphaned metadata for channel {channel_id} (state: {state}, owner: {owner}, clients: {client_count}) - cleaning up")
 
                         # If we have it locally, stop it properly to clean up transcode/proxy processes
diff --git a/apps/proxy/ts_proxy/views.py b/apps/proxy/ts_proxy/views.py
index 18c07474..fabc1053 100644
--- a/apps/proxy/ts_proxy/views.py
+++ b/apps/proxy/ts_proxy/views.py
@@ -40,6 +40,7 @@ from .utils import get_logger
 from uuid import UUID
 import gevent
 from dispatcharr.utils import network_access_allowed
+from apps.proxy.utils import check_user_stream_limits
 
 logger = get_logger()
 
@@ -71,6 +72,13 @@ def stream_ts(request, channel_id, user=None):
                 )
                 break
 
+        if user:
+            if not check_user_stream_limits(user, client_id):
+                return JsonResponse(
+                    {"error": f"Stream limit exceeded ({user.stream_limit} concurrent streams allowed)"},
+                    status=429
+                )
+
         # Check if we need to reinitialize the channel
         needs_initialization = True
         channel_state = None
diff --git a/apps/proxy/urls.py b/apps/proxy/urls.py
index 34c026a9..3a320049 100644
--- a/apps/proxy/urls.py
+++ b/apps/proxy/urls.py
@@ -6,4 +6,4 @@ urlpatterns = [
     path('ts/', include('apps.proxy.ts_proxy.urls')),
     path('hls/', include('apps.proxy.hls_proxy.urls')),
     path('vod/', include('apps.proxy.vod_proxy.urls')),
-]
\ No newline at end of file
+]
diff --git a/apps/proxy/utils.py b/apps/proxy/utils.py
new file mode 100644
index 00000000..0ea1bd27
--- /dev/null
+++ b/apps/proxy/utils.py
@@ -0,0 +1,185 @@
+import logging
+from core.utils import RedisClient
+from apps.proxy.vod_proxy.multi_worker_connection_manager import MultiWorkerVODConnectionManager, get_vod_client_stop_key
+from core.models import CoreSettings
+from apps.proxy.ts_proxy.services.channel_service import ChannelService
+
+logger = logging.getLogger("proxy")
+
+
+def attempt_stream_termination(user_id, requesting_client_id, active_connections):
+    try:
+        logger.info("[stream limits]" f"[{requesting_client_id}] User {user_id} has {len(active_connections)} active connections, checking termination candidates")
+
+        user_limit_settings = CoreSettings.get_user_limit_settings()
+        terminate_oldest = user_limit_settings.get("terminate_oldest", True)
+        prioritize_single = user_limit_settings.get("prioritize_single_client_channels", True)
+        ignore_same_channel = user_limit_settings.get("ignore_same_channel_connections", False)
+
+        channel_counts = {}
+        for connection in active_connections:
+            media_id = connection['media_id']
+            channel_counts[media_id] = channel_counts.get(media_id, 0) + 1
+
+        def prioritize(connection):
+            is_multi = channel_counts[connection['media_id']] > 1
+
+            # if we're ignoring same-channel connections, put them at the end
+            same_ch_key = 1 if (ignore_same_channel and is_multi) else 0
+
+            # key for prioritizing single-client channels
+            single_key = 0 if (prioritize_single and not is_multi) else 1
+
+            # sort by age setting
+            time_key = connection['connected_at'] if terminate_oldest else -connection['connected_at']
+
+            return (same_ch_key, single_key, time_key)
+
+        termination_candidates = sorted(active_connections, key=prioritize)
+
+        if not termination_candidates:
+            logger.warning("[stream limits]" f"[{requesting_client_id}] No termination candidates found for user {user_id}")
+            return False
+
+        target = termination_candidates[0]
+        logger.info("[stream limits]"
+            f"[{requesting_client_id}] Terminating client {target['client_id']} "
+            f"on media {target['media_id']} (connected_at={target['connected_at']})"
+        )
+
+        if target['type'] == 'live':
+            result = ChannelService.stop_client(target['media_id'], target['client_id'])
+            if result.get("status") == "error":
+                return False
+        else:
+            connection_manager = MultiWorkerVODConnectionManager.get_instance()
+            redis_client = connection_manager.redis_client
+
+            if not redis_client:
+                return False
+
+            # Check if connection exists
+            connection_key = f"vod_persistent_connection:{target['client_id']}"
+            connection_data = redis_client.hgetall(connection_key)
+            if not connection_data:
+                logger.warning(f"VOD connection not found: {target['client_id']}")
+                return False
+
+            # Set a stop signal key that the worker will check
+            stop_key = get_vod_client_stop_key(target['client_id'])
+            redis_client.setex(stop_key, 60, "true")  # 60 second TTL
+
+        return True
+    except Exception as e:
+        logger.error("[stream limits]" f"[{requesting_client_id}] Error during stream termination for user {user_id}: {e}")
+        return False
+
+def get_user_active_connections(user_id):
+    redis_client = RedisClient.get_client()
+    connections = []
+
+    try:
+        cursor = 0
+
+        # Grab live streams
+        while True:
+            cursor, keys = redis_client.scan(cursor=cursor, match="ts_proxy:channel:*:clients:*", count=1000)
+
+            for key in keys:
+                parts = key.split(':')
+                if len(parts) >= 5:
+                    channel_id = parts[2]
+                    client_id = parts[4]
+
+                    client_user_id = redis_client.hget(key, 'user_id')
+                    connected_at = redis_client.hget(key, 'connected_at')
+
+                    logger.info(f"[stream limits] user_id = {user_id}")
+                    logger.info(f"[stream limits] channel_id = {channel_id}")
+                    logger.info(f"[stream limits] client_id = {client_id}")
+
+                    if client_user_id and int(client_user_id) == user_id:
+                        try:
+                            logger.info(f"[stream limits] Found LIVE connection for user {user_id} on channel {channel_id} with client ID {client_id}")
+                            connected_at = float(connected_at) if connected_at else 0
+                            connections.append({
+                                'media_id': channel_id,
+                                'client_id': client_id,
+                                'connected_at': connected_at,
+                                'type': 'live',
+                            })
+                        except (ValueError, TypeError):
+                            pass
+
+            if cursor == 0:
+                break
+
+
+        cursor = 0
+
+        # Grab VOD
+        while True:
+            cursor, keys = redis_client.scan(cursor=cursor, match="vod_persistent_connections:*", count=1000)
+
+            for key in keys:
+                parts = key.split(':')
+                if len(parts) >= 2:
+                    client_id = parts[1]
+
+                    client_user_id = redis_client.hget(key, 'user_id')
+                    connected_at = redis_client.hget(key, 'created_at')
+
+                    logger.info(f"[stream limits] user_id = {user_id}")
+                    logger.info(f"[stream limits] client_id = {client_id}")
+
+                    if client_user_id and int(client_user_id) == user_id:
+                        try:
+                            logger.info(f"[stream limits] Found VOD connection for user {user_id} on channel {channel_id} with client ID {client_id}")
+                            connected_at = float(connected_at) if connected_at else 0
+                            connections.append({
+                                'media_id': channel_id,
+                                'client_id': client_id,
+                                'connected_at': connected_at,
+                                'type': 'vod',
+                            })
+                        except (ValueError, TypeError):
+                            pass
+
+            if cursor == 0:
+                break
+
+        return connections
+
+    except Exception as e:
+        logger.warning(f"Error getting active channel details for user {user_id}: {e}")
+        return []
+
+
+def check_user_stream_limits(user, client_id):
+    # Check user stream limits
+    if user and user.stream_limit > 0:
+        logger.info("[stream limits]" f"[{client_id}] User {user.username} (ID: {user.id}) is requesting a stream (stream_limit: {user.stream_limit})")
+        user_limit_settings = CoreSettings.get_user_limit_settings()
+
+        active_connections = get_user_active_connections(user.id)
+        unique_channel_count = set([conn['media_id'] for conn in active_connections])
+        user_stream_count = len(unique_channel_count) if user_limit_settings.get("ignore_same_channel_connections", False) else len(active_connections)
+
+        print(active_connections)
+
+        logger.info(f"[stream limits]" f"[{client_id}] User {user.username} currently has {len(active_connections)} active connections across {len(unique_channel_count)} unique channels (counting method: {'unique channels' if user_limit_settings.get('ignore_same_channel_connections', False) else 'total connections'})")
+
+        if user.stream_limit > 0 and user_stream_count >= user.stream_limit:
+            if user_limit_settings.get("terminate_on_limit_exceeded", True) == False:
+                return False
+
+            if len(active_connections) >= user.stream_limit:
+                logger.warning("[stream limits]"
+                    f"[{client_id}] User {user.username} (ID: {user.id}) has reached stream limit "
+                    f"({len(active_connections)}/{user.stream_limit} channels), attempting to free up slot"
+                )
+
+                if not attempt_stream_termination(user.id, client_id, active_connections):
+                    return False
+
+        return True
diff --git a/apps/proxy/vod_proxy/connection_manager.py b/apps/proxy/vod_proxy/connection_manager.py
index 1b838f81..ec963001 100644
--- a/apps/proxy/vod_proxy/connection_manager.py
+++ b/apps/proxy/vod_proxy/connection_manager.py
@@ -1006,7 +1006,7 @@ class VODConnectionManager:
             return HttpResponse(f"Streaming error: {str(e)}", status=500)
 
     def stream_content_with_session(self, session_id, content_obj, stream_url, m3u_profile, client_ip, user_agent, request,
-                                  utc_start=None, utc_end=None, offset=None, range_header=None):
+                                  utc_start=None, utc_end=None, offset=None, range_header=None, user=None):
         """
         Stream VOD content with persistent connection per session
 
diff --git a/apps/proxy/vod_proxy/multi_worker_connection_manager.py b/apps/proxy/vod_proxy/multi_worker_connection_manager.py
index 4e9e789e..d7787016 100644
--- a/apps/proxy/vod_proxy/multi_worker_connection_manager.py
+++ b/apps/proxy/vod_proxy/multi_worker_connection_manager.py
@@ -93,7 +93,7 @@ class SerializableConnectionState:
                  content_name: str = None, client_ip: str = None,
                  client_user_agent: str = None, utc_start: str = None,
                  utc_end: str = None, offset: str = None,
-                 worker_id: str = None, connection_type: str = "redis_backed"):
+                 worker_id: str = None, connection_type: str = "redis_backed", user_id: str = "unknown"):
         self.session_id = session_id
         self.stream_url = stream_url
         self.headers = headers
@@ -104,6 +104,7 @@ class SerializableConnectionState:
         self.last_activity = time.time()
         self.request_count = 0
         self.active_streams = 0
+        self.user_id = user_id
 
         # Session metadata (consolidated from vod_session key)
         self.content_obj_type = content_obj_type
@@ -160,7 +161,8 @@ class SerializableConnectionState:
             'last_seek_byte': str(self.last_seek_byte),
             'last_seek_percentage': str(self.last_seek_percentage),
             'total_content_size': str(self.total_content_size),
-            'last_seek_timestamp': str(self.last_seek_timestamp)
+            'last_seek_timestamp': str(self.last_seek_timestamp),
+            'user_id': str(self.user_id),
         }
 
     @classmethod
@@ -184,7 +186,8 @@ class SerializableConnectionState:
             utc_end=data.get('utc_end') or '',
             offset=data.get('offset') or '',
             worker_id=data.get('worker_id') or None,
-            connection_type=data.get('connection_type', 'redis_backed')
+            connection_type=data.get('connection_type', 'redis_backed'),
+            user_id=data.get('user_id', 'unknown')
         )
         obj.last_activity = float(data.get('last_activity', time.time()))
         obj.request_count = int(data.get('request_count', 0))
@@ -281,7 +284,7 @@ class RedisBackedVODConnection:
                          content_name: str = None, client_ip: str = None,
                          client_user_agent: str = None, utc_start: str = None,
                          utc_end: str = None, offset: str = None,
-                         worker_id: str = None) -> bool:
+                         worker_id: str = None, user=None) -> bool:
         """Create a new connection state in Redis with consolidated session metadata"""
         if not self._acquire_lock():
             logger.warning(f"[{self.session_id}] Could not acquire lock for connection creation")
@@ -309,7 +312,8 @@ class RedisBackedVODConnection:
                 utc_start=utc_start,
                 utc_end=utc_end,
                 offset=offset,
-                worker_id=worker_id
+                worker_id=worker_id,
+                user_id=user.id if user else "unknown"
             )
             success = self._save_connection_state(state)
 
@@ -365,6 +369,24 @@ class RedisBackedVODConnection:
                 timeout=(10, 10),
                 allow_redirects=allow_redirects
             )
+
+            # If the cached final_url returned an error (e.g. an ephemeral dispatcharr session
+            # that has since expired), clear it and retry from the original stream_url.
+            if response.status_code >= 400 and state.final_url:
+                logger.warning(
+                    f"[{self.session_id}] Cached final_url returned {response.status_code}, "
+                    f"clearing and retrying from stream_url"
+                )
+                response.close()
+                state.final_url = None
+                response = self.local_session.get(
+                    state.stream_url,
+                    headers=headers,
+                    stream=True,
+                    timeout=(10, 10),
+                    allow_redirects=True
+                )
+
             response.raise_for_status()
 
             # Update state with response info on first request
@@ -761,7 +783,7 @@ class MultiWorkerVODConnectionManager:
 
     def stream_content_with_session(self, session_id, content_obj, stream_url, m3u_profile,
                                   client_ip, client_user_agent, request,
-                                  utc_start=None, utc_end=None, offset=None, range_header=None):
+                                  utc_start=None, utc_end=None, offset=None, range_header=None, user=None):
         """Stream content with Redis-backed persistent connection"""
 
         # Generate client ID
@@ -858,7 +880,8 @@ class MultiWorkerVODConnectionManager:
                     utc_start=utc_start,
                     utc_end=utc_end,
                     offset=str(offset) if offset else None,
-                    worker_id=self.worker_id
+                    worker_id=self.worker_id,
+                    user=user
                 ):
                     logger.error(f"[{client_id}] Worker {self.worker_id} - Failed to create Redis connection")
                     # Roll back the profile slot reservation since connection failed
diff --git a/apps/proxy/vod_proxy/urls.py b/apps/proxy/vod_proxy/urls.py
index f48f70e0..f79e6b48 100644
--- a/apps/proxy/vod_proxy/urls.py
+++ b/apps/proxy/vod_proxy/urls.py
@@ -1,16 +1,17 @@
 from django.urls import path
 from . import views
+from .views import stream_vod
 
 app_name = 'vod_proxy'
 
 urlpatterns = [
     # Generic VOD streaming with session ID in path (for compatibility)
-    path('<str:content_type>/<uuid:content_id>/<str:session_id>', views.VODStreamView.as_view(), name='vod_stream_with_session'),
-    path('<str:content_type>/<uuid:content_id>/<str:session_id>/<int:profile_id>/', views.VODStreamView.as_view(), name='vod_stream_with_session_and_profile'),
+    path('<str:content_type>/<uuid:content_id>/<str:session_id>', stream_vod, name='vod_stream_with_session'),
+    path('<str:content_type>/<uuid:content_id>/<str:session_id>/<int:profile_id>/', stream_vod, name='vod_stream_with_session_and_profile'),
 
     # Generic VOD streaming (supports movies, episodes, series) - legacy patterns
-    path('<str:content_type>/<uuid:content_id>', views.VODStreamView.as_view(), name='vod_stream'),
-    path('<str:content_type>/<uuid:content_id>/<int:profile_id>/', views.VODStreamView.as_view(), name='vod_stream_with_profile'),
+    path('<str:content_type>/<uuid:content_id>', stream_vod, name='vod_stream'),
+    path('<str:content_type>/<uuid:content_id>/<int:profile_id>/', stream_vod, name='vod_stream_with_profile'),
 
     # VOD playlist generation
     path('playlist/', views.VODPlaylistView.as_view(), name='vod_playlist'),
diff --git a/apps/proxy/vod_proxy/views.py b/apps/proxy/vod_proxy/views.py
index e1fa8624..14e1b631 100644
--- a/apps/proxy/vod_proxy/views.py
+++ b/apps/proxy/vod_proxy/views.py
@@ -17,104 +17,376 @@ from apps.m3u.models import M3UAccount, M3UAccountProfile
 from apps.proxy.vod_proxy.connection_manager import VODConnectionManager
 from apps.proxy.vod_proxy.multi_worker_connection_manager import MultiWorkerVODConnectionManager, infer_content_type_from_url, get_vod_client_stop_key
 from .utils import get_client_info, create_vod_response
+from rest_framework.decorators import api_view
+from apps.accounts.models import User
+from apps.proxy.utils import check_user_stream_limits
 
 logger = logging.getLogger(__name__)
 
+_request_times = {}
 
-@method_decorator(csrf_exempt, name='dispatch')
-class VODStreamView(View):
-    """Handle VOD streaming requests with M3U profile support"""
 
-    def get(self, request, content_type, content_id, session_id=None, profile_id=None):
-        """
-        Stream VOD content (movies or series episodes) with session-based connection reuse
+def _get_content_and_relation(content_type, content_id, preferred_m3u_account_id=None, preferred_stream_id=None):
+    """Get the content object and its M3U relation"""
+    try:
+        logger.info(f"[CONTENT-LOOKUP] Looking up {content_type} with UUID {content_id}")
+        if preferred_m3u_account_id:
+            logger.info(f"[CONTENT-LOOKUP] Preferred M3U account ID: {preferred_m3u_account_id}")
+        if preferred_stream_id:
+            logger.info(f"[CONTENT-LOOKUP] Preferred stream ID: {preferred_stream_id}")
 
-        Args:
-            content_type: 'movie', 'series', or 'episode'
-            content_id: ID of the content
-            session_id: Optional session ID from URL path (for persistent connections)
-            profile_id: Optional M3U profile ID for authentication
-        """
-        logger.info(f"[VOD-REQUEST] Starting VOD stream request: {content_type}/{content_id}, session: {session_id}, profile: {profile_id}")
-        logger.info(f"[VOD-REQUEST] Full request path: {request.get_full_path()}")
-        logger.info(f"[VOD-REQUEST] Request method: {request.method}")
-        logger.info(f"[VOD-REQUEST] Request headers: {dict(request.headers)}")
+        if content_type == 'movie':
+            content_obj = get_object_or_404(Movie, uuid=content_id)
+            logger.info(f"[CONTENT-FOUND] Movie: {content_obj.name} (ID: {content_obj.id})")
 
-        try:
-            client_ip, client_user_agent = get_client_info(request)
+            # Filter by preferred stream ID first (most specific)
+            relations_query = content_obj.m3u_relations.filter(m3u_account__is_active=True)
+            if preferred_stream_id:
+                specific_relation = relations_query.filter(stream_id=preferred_stream_id).first()
+                if specific_relation:
+                    logger.info(f"[STREAM-SELECTED] Using specific stream: {specific_relation.stream_id} from provider: {specific_relation.m3u_account.name}")
+                    return content_obj, specific_relation
+                else:
+                    logger.warning(f"[STREAM-FALLBACK] Preferred stream ID {preferred_stream_id} not found, falling back to account/priority selection")
 
-            # Extract timeshift parameters from query string
-            # Support multiple timeshift parameter formats
-            utc_start = request.GET.get('utc_start') or request.GET.get('start') or request.GET.get('playliststart')
-            utc_end = request.GET.get('utc_end') or request.GET.get('end') or request.GET.get('playlistend')
-            offset = request.GET.get('offset') or request.GET.get('seek') or request.GET.get('t')
+            # Filter by preferred M3U account if specified
+            if preferred_m3u_account_id:
+                specific_relation = relations_query.filter(m3u_account__id=preferred_m3u_account_id).first()
+                if specific_relation:
+                    logger.info(f"[PROVIDER-SELECTED] Using preferred provider: {specific_relation.m3u_account.name}")
+                    return content_obj, specific_relation
+                else:
+                    logger.warning(f"[PROVIDER-FALLBACK] Preferred M3U account {preferred_m3u_account_id} not found, using highest priority")
 
-            # VLC specific timeshift parameters
-            if not utc_start and not offset:
-                # Check for VLC-style timestamp parameters
-                if 'timestamp' in request.GET:
-                    offset = request.GET.get('timestamp')
-                elif 'time' in request.GET:
-                    offset = request.GET.get('time')
+            # Get the highest priority active relation (fallback or default)
+            relation = relations_query.select_related('m3u_account').order_by('-m3u_account__priority', 'id').first()
 
-            # Session ID now comes from URL path parameter
-            # Remove legacy query parameter extraction since we're using path-based routing
+            if relation:
+                logger.info(f"[PROVIDER-SELECTED] Using provider: {relation.m3u_account.name} (priority: {relation.m3u_account.priority})")
 
-            # Extract Range header for seeking support
-            range_header = request.META.get('HTTP_RANGE')
+            return content_obj, relation
 
-            logger.info(f"[VOD-TIMESHIFT] Timeshift params - utc_start: {utc_start}, utc_end: {utc_end}, offset: {offset}")
-            logger.info(f"[VOD-SESSION] Session ID: {session_id}")
+        elif content_type == 'episode':
+            content_obj = get_object_or_404(Episode, uuid=content_id)
+            logger.info(f"[CONTENT-FOUND] Episode: {content_obj.name} (ID: {content_obj.id}, Series: {content_obj.series.name})")
 
-            # Log all query parameters for debugging
-            if request.GET:
-                logger.debug(f"[VOD-PARAMS] All query params: {dict(request.GET)}")
+            # Filter by preferred stream ID first (most specific)
+            relations_query = content_obj.m3u_relations.filter(m3u_account__is_active=True)
+            if preferred_stream_id:
+                specific_relation = relations_query.filter(stream_id=preferred_stream_id).first()
+                if specific_relation:
+                    logger.info(f"[STREAM-SELECTED] Using specific stream: {specific_relation.stream_id} from provider: {specific_relation.m3u_account.name}")
+                    return content_obj, specific_relation
+                else:
+                    logger.warning(f"[STREAM-FALLBACK] Preferred stream ID {preferred_stream_id} not found, falling back to account/priority selection")
 
-            if range_header:
-                logger.info(f"[VOD-RANGE] Range header: {range_header}")
+            # Filter by preferred M3U account if specified
+            if preferred_m3u_account_id:
+                specific_relation = relations_query.filter(m3u_account__id=preferred_m3u_account_id).first()
+                if specific_relation:
+                    logger.info(f"[PROVIDER-SELECTED] Using preferred provider: {specific_relation.m3u_account.name}")
+                    return content_obj, specific_relation
+                else:
+                    logger.warning(f"[PROVIDER-FALLBACK] Preferred M3U account {preferred_m3u_account_id} not found, using highest priority")
 
-                # Parse the range to understand what position VLC is seeking to
-                try:
-                    if 'bytes=' in range_header:
-                        range_part = range_header.replace('bytes=', '')
-                        if '-' in range_part:
-                            start_byte, end_byte = range_part.split('-', 1)
-                            if start_byte:
-                                start_pos_mb = int(start_byte) / (1024 * 1024)
-                                logger.info(f"[VOD-SEEK] Seeking to byte position: {start_byte} (~{start_pos_mb:.1f} MB)")
-                                if int(start_byte) > 0:
-                                    logger.info(f"[VOD-SEEK] *** ACTUAL SEEK DETECTED *** Position: {start_pos_mb:.1f} MB")
-                            else:
-                                logger.info(f"[VOD-SEEK] Open-ended range request (from start)")
-                            if end_byte:
-                                end_pos_mb = int(end_byte) / (1024 * 1024)
-                                logger.info(f"[VOD-SEEK] End position: {end_byte} bytes (~{end_pos_mb:.1f} MB)")
-                except Exception as e:
-                    logger.warning(f"[VOD-SEEK] Could not parse range header: {e}")
+            # Get the highest priority active relation (fallback or default)
+            relation = relations_query.select_related('m3u_account').order_by('-m3u_account__priority', 'id').first()
 
-                # Simple seek detection - track rapid requests
-                current_time = time.time()
-                request_key = f"{client_ip}:{content_type}:{content_id}"
+            if relation:
+                logger.info(f"[PROVIDER-SELECTED] Using provider: {relation.m3u_account.name} (priority: {relation.m3u_account.priority})")
 
-                if not hasattr(self.__class__, '_request_times'):
-                    self.__class__._request_times = {}
+            return content_obj, relation
 
-                if request_key in self.__class__._request_times:
-                    time_diff = current_time - self.__class__._request_times[request_key]
-                    if time_diff < 5.0:
-                        logger.info(f"[VOD-SEEK] Rapid request detected ({time_diff:.1f}s) - likely seeking")
+        elif content_type == 'series':
+            # For series, get the first episode
+            series = get_object_or_404(Series, uuid=content_id)
+            logger.info(f"[CONTENT-FOUND] Series: {series.name} (ID: {series.id})")
+            episode = series.episodes.first()
+            if not episode:
+                logger.error(f"[CONTENT-ERROR] No episodes found for series {series.name}")
+                return None, None
 
-                self.__class__._request_times[request_key] = current_time
+            logger.info(f"[CONTENT-FOUND] First episode: {episode.name} (ID: {episode.id})")
+
+            # Filter by preferred stream ID first (most specific)
+            relations_query = episode.m3u_relations.filter(m3u_account__is_active=True)
+            if preferred_stream_id:
+                specific_relation = relations_query.filter(stream_id=preferred_stream_id).first()
+                if specific_relation:
+                    logger.info(f"[STREAM-SELECTED] Using specific stream: {specific_relation.stream_id} from provider: {specific_relation.m3u_account.name}")
+                    return episode, specific_relation
+                else:
+                    logger.warning(f"[STREAM-FALLBACK] Preferred stream ID {preferred_stream_id} not found, falling back to account/priority selection")
+
+            # Filter by preferred M3U account if specified
+            if preferred_m3u_account_id:
+                specific_relation = relations_query.filter(m3u_account__id=preferred_m3u_account_id).first()
+                if specific_relation:
+                    logger.info(f"[PROVIDER-SELECTED] Using preferred provider: {specific_relation.m3u_account.name}")
+                    return episode, specific_relation
+                else:
+                    logger.warning(f"[PROVIDER-FALLBACK] Preferred M3U account {preferred_m3u_account_id} not found, using highest priority")
+
+            # Get the highest priority active relation (fallback or default)
+            relation = relations_query.select_related('m3u_account').order_by('-m3u_account__priority', 'id').first()
+
+            if relation:
+                logger.info(f"[PROVIDER-SELECTED] Using provider: {relation.m3u_account.name} (priority: {relation.m3u_account.priority})")
+
+            return episode, relation
+        else:
+            logger.error(f"[CONTENT-ERROR] Invalid content type: {content_type}")
+            return None, None
+
+    except Exception as e:
+        logger.error(f"Error getting content object: {e}")
+        return None, None
+
+def _get_stream_url_from_relation(relation):
+    """Get stream URL from the M3U relation"""
+    try:
+        # Log the relation type and available attributes
+        logger.info(f"[VOD-URL] Relation type: {type(relation).__name__}")
+        logger.info(f"[VOD-URL] Account type: {relation.m3u_account.account_type}")
+        logger.info(f"[VOD-URL] Stream ID: {getattr(relation, 'stream_id', 'N/A')}")
+
+        # First try the get_stream_url method (this should build URLs dynamically)
+        if hasattr(relation, 'get_stream_url'):
+            url = relation.get_stream_url()
+            if url:
+                logger.info(f"[VOD-URL] Built URL from get_stream_url(): {url}")
+                return url
             else:
-                logger.info(f"[VOD-RANGE] No Range header - full content request")
+                logger.warning(f"[VOD-URL] get_stream_url() returned None")
 
-            logger.info(f"[VOD-CLIENT] Client info - IP: {client_ip}, User-Agent: {client_user_agent[:50]}...")
+        logger.error(f"[VOD-URL] Relation has no get_stream_url method or it failed")
+        return None
+    except Exception as e:
+        logger.error(f"[VOD-URL] Error getting stream URL from relation: {e}", exc_info=True)
+        return None
 
-            # If no session ID, create one and redirect to path-based URL
-            if not session_id:
-                new_session_id = f"vod_{int(time.time() * 1000)}_{random.randint(1000, 9999)}"
-                logger.info(f"[VOD-SESSION] Creating new session: {new_session_id}")
+def _get_m3u_profile(m3u_account, profile_id, session_id=None):
+    """Get appropriate M3U profile for streaming using Redis-based viewer counts
 
+    Args:
+        m3u_account: M3UAccount instance
+        profile_id: Optional specific profile ID requested
+        session_id: Optional session ID to check for existing connections
+
+    Returns:
+        tuple: (M3UAccountProfile, current_connections) or None if no profile found
+    """
+    try:
+        from core.utils import RedisClient
+        redis_client = RedisClient.get_client()
+
+        if not redis_client:
+            logger.warning("Redis not available, falling back to default profile")
+            default_profile = M3UAccountProfile.objects.filter(
+                m3u_account=m3u_account,
+                is_active=True,
+                is_default=True
+            ).first()
+            return (default_profile, 0) if default_profile else None
+
+        # Check if this session already has an active connection
+        if session_id:
+            persistent_connection_key = f"vod_persistent_connection:{session_id}"
+            connection_data = redis_client.hgetall(persistent_connection_key)
+
+            if connection_data:
+                existing_profile_id = connection_data.get('m3u_profile_id')
+                if existing_profile_id:
+                    try:
+                        existing_profile = M3UAccountProfile.objects.get(
+                            id=int(existing_profile_id),
+                            m3u_account=m3u_account,
+                            is_active=True
+                        )
+                        # Get current connections for logging
+                        profile_connections_key = f"profile_connections:{existing_profile.id}"
+                        current_connections = int(redis_client.get(profile_connections_key) or 0)
+
+                        logger.info(f"[PROFILE-SELECTION] Session {session_id} reusing existing profile {existing_profile.id}: {current_connections}/{existing_profile.max_streams} connections")
+                        return (existing_profile, current_connections)
+                    except (M3UAccountProfile.DoesNotExist, ValueError):
+                        logger.warning(f"[PROFILE-SELECTION] Session {session_id} has invalid profile ID {existing_profile_id}, selecting new profile")
+                    except Exception as e:
+                        logger.warning(f"[PROFILE-SELECTION] Error checking existing profile for session {session_id}: {e}")
+                else:
+                    logger.debug(f"[PROFILE-SELECTION] Session {session_id} exists but has no profile ID stored")            # If specific profile requested, try to use it
+        if profile_id:
+            try:
+                profile = M3UAccountProfile.objects.get(
+                    id=profile_id,
+                    m3u_account=m3u_account,
+                    is_active=True
+                )
+                # Check Redis-based current connections
+                profile_connections_key = f"profile_connections:{profile.id}"
+                current_connections = int(redis_client.get(profile_connections_key) or 0)
+
+                if profile.max_streams == 0 or current_connections < profile.max_streams:
+                    logger.info(f"[PROFILE-SELECTION] Using requested profile {profile.id}: {current_connections}/{profile.max_streams} connections")
+                    return (profile, current_connections)
+                else:
+                    logger.warning(f"[PROFILE-SELECTION] Requested profile {profile.id} is at capacity: {current_connections}/{profile.max_streams}")
+            except M3UAccountProfile.DoesNotExist:
+                logger.warning(f"[PROFILE-SELECTION] Requested profile {profile_id} not found")
+
+        # Get active profiles ordered by priority (default first)
+        m3u_profiles = M3UAccountProfile.objects.filter(
+            m3u_account=m3u_account,
+            is_active=True
+        )
+
+        default_profile = m3u_profiles.filter(is_default=True).first()
+        if not default_profile:
+            logger.error(f"[PROFILE-SELECTION] No default profile found for M3U account {m3u_account.id}")
+            return None
+
+        # Check profiles in order: default first, then others
+        profiles = [default_profile] + list(m3u_profiles.filter(is_default=False))
+
+        for profile in profiles:
+            profile_connections_key = f"profile_connections:{profile.id}"
+            current_connections = int(redis_client.get(profile_connections_key) or 0)
+
+            # Check if profile has available connection slots
+            if profile.max_streams == 0 or current_connections < profile.max_streams:
+                logger.info(f"[PROFILE-SELECTION] Selected profile {profile.id} ({profile.name}): {current_connections}/{profile.max_streams} connections")
+                return (profile, current_connections)
+            else:
+                logger.debug(f"[PROFILE-SELECTION] Profile {profile.id} at capacity: {current_connections}/{profile.max_streams}")
+
+        # All profiles are at capacity - return None to trigger error response
+        logger.error(f"[PROFILE-SELECTION] All profiles at capacity for M3U account {m3u_account.id}, rejecting request")
+        return None
+
+    except Exception as e:
+        logger.error(f"Error getting M3U profile: {e}")
+        return None
+
+def _transform_url(original_url, m3u_profile):
+    """Transform URL based on M3U profile settings"""
+    try:
+        import re
+
+        if not original_url:
+            return None
+
+        search_pattern = m3u_profile.search_pattern
+        replace_pattern = m3u_profile.replace_pattern
+        safe_replace_pattern = re.sub(r'\$(\d+)', r'\\\1', replace_pattern)
+
+        if search_pattern and replace_pattern:
+            transformed_url = re.sub(search_pattern, safe_replace_pattern, original_url)
+            return transformed_url
+
+        return original_url
+
+    except Exception as e:
+        logger.error(f"Error transforming URL: {e}")
+        return original_url
+
+@api_view(["GET"])
+def stream_vod(request, content_type, content_id, session_id=None, profile_id=None, user=None):
+    """
+    Stream VOD content (movies or series episodes) with session-based connection reuse
+
+    Args:
+        content_type: 'movie', 'series', or 'episode'
+        content_id: ID of the content
+        session_id: Optional session ID from URL path (for persistent connections)
+        profile_id: Optional M3U profile ID for authentication
+    """
+    logger.info(f"[VOD-REQUEST] Starting VOD stream request: {content_type}/{content_id}, session: {session_id}, profile: {profile_id}")
+    logger.info(f"[VOD-REQUEST] Full request path: {request.get_full_path()}")
+    logger.info(f"[VOD-REQUEST] Request method: {request.method}")
+    logger.info(f"[VOD-REQUEST] Request headers: {dict(request.headers)}")
+
+    try:
+        client_ip, client_user_agent = get_client_info(request)
+
+        # Extract timeshift parameters from query string
+        # Support multiple timeshift parameter formats
+        utc_start = request.GET.get('utc_start') or request.GET.get('start') or request.GET.get('playliststart')
+        utc_end = request.GET.get('utc_end') or request.GET.get('end') or request.GET.get('playlistend')
+        offset = request.GET.get('offset') or request.GET.get('seek') or request.GET.get('t')
+
+        # VLC specific timeshift parameters
+        if not utc_start and not offset:
+            # Check for VLC-style timestamp parameters
+            if 'timestamp' in request.GET:
+                offset = request.GET.get('timestamp')
+            elif 'time' in request.GET:
+                offset = request.GET.get('time')
+
+        # Session ID now comes from URL path parameter
+        # Remove legacy query parameter extraction since we're using path-based routing
+
+        # Extract Range header for seeking support
+        range_header = request.META.get('HTTP_RANGE')
+
+        logger.info(f"[VOD-TIMESHIFT] Timeshift params - utc_start: {utc_start}, utc_end: {utc_end}, offset: {offset}")
+        logger.info(f"[VOD-SESSION] Session ID: {session_id}")
+
+        # Log all query parameters for debugging
+        if request.GET:
+            logger.debug(f"[VOD-PARAMS] All query params: {dict(request.GET)}")
+
+        if range_header:
+            logger.info(f"[VOD-RANGE] Range header: {range_header}")
+
+            # Parse the range to understand what position VLC is seeking to
+            try:
+                if 'bytes=' in range_header:
+                    range_part = range_header.replace('bytes=', '')
+                    if '-' in range_part:
+                        start_byte, end_byte = range_part.split('-', 1)
+                        if start_byte:
+                            start_pos_mb = int(start_byte) / (1024 * 1024)
+                            logger.info(f"[VOD-SEEK] Seeking to byte position: {start_byte} (~{start_pos_mb:.1f} MB)")
+                            if int(start_byte) > 0:
+                                logger.info(f"[VOD-SEEK] *** ACTUAL SEEK DETECTED *** Position: {start_pos_mb:.1f} MB")
+                        else:
+                            logger.info(f"[VOD-SEEK] Open-en`ded range request (from start)")
+                        if end_byte:
+                            end_pos_mb = int(end_byte) / (1024 * 1024)
+                            logger.info(f"[VOD-SEEK] End position: {end_byte} bytes (~{end_pos_mb:.1f} MB)")
+            except Exception as e:
+                logger.warning(f"[VOD-SEEK] Could not parse range header: {e}")
+
+            # Simple seek detection - track rapid requests
+            current_time = time.time()
+            request_key = f"{client_ip}:{content_type}:{content_id}"
+
+            if request_key in _request_times:
+                time_diff = current_time - _request_times[request_key]
+                if time_diff < 5.0:
+                    logger.info(f"[VOD-SEEK] Rapid request detected ({time_diff:.1f}s) - likely seeking")
+
+            _request_times[request_key] = current_time
+        else:
+            logger.info(f"[VOD-RANGE] No Range header - full content request")
+
+        logger.info(f"[VOD-CLIENT] Client info - IP: {client_ip}, User-Agent: {client_user_agent[:50]}...")
+
+        # If no session ID, create one and redirect to path-based URL
+        if not session_id:
+            new_session_id = f"vod_{int(time.time() * 1000)}_{random.randint(1000, 9999)}"
+            logger.info(f"[VOD-SESSION] Creating new session: {new_session_id}")
+
+            # Preserve any query parameters (except session_id)
+            query_params = dict(request.GET)
+            query_params.pop('session_id', None)  # Remove if present
+
+            if user:
+                redirect_url = f"{request.path}?session_id={new_session_id}"
+                if query_params:
+                    query_string = urlencode(query_params, doseq=True)
+                    redirect_url = f"{redirect_url}&{query_string}"
+            else:
                 # Build redirect URL with session ID in path, preserve query parameters
                 path_parts = request.path.rstrip('/').split('/')
 
@@ -124,10 +396,6 @@ class VODStreamView(View):
                 else:
                     new_path = f"{'/'.join(path_parts)}/{new_session_id}"
 
-                # Preserve any query parameters (except session_id)
-                query_params = dict(request.GET)
-                query_params.pop('session_id', None)  # Remove if present
-
                 if query_params:
                     from urllib.parse import urlencode
                     query_string = urlencode(query_params, doseq=True)
@@ -135,527 +403,273 @@ class VODStreamView(View):
                 else:
                     redirect_url = new_path
 
-                logger.info(f"[VOD-SESSION] Redirecting to path-based URL: {redirect_url}")
+            logger.info(f"[VOD-SESSION] Redirecting to path-based URL: {redirect_url}")
 
-                return HttpResponse(
-                    status=301,
-                    headers={'Location': redirect_url}
-                )
-
-            # Extract preferred M3U account ID and stream ID from query parameters
-            preferred_m3u_account_id = request.GET.get('m3u_account_id')
-            preferred_stream_id = request.GET.get('stream_id')
-
-            if preferred_m3u_account_id:
-                try:
-                    preferred_m3u_account_id = int(preferred_m3u_account_id)
-                except (ValueError, TypeError):
-                    logger.warning(f"[VOD-PARAM] Invalid m3u_account_id parameter: {preferred_m3u_account_id}")
-                    preferred_m3u_account_id = None
-
-            if preferred_stream_id:
-                logger.info(f"[VOD-PARAM] Preferred stream ID: {preferred_stream_id}")
-
-            # Get the content object and its relation
-            content_obj, relation = self._get_content_and_relation(content_type, content_id, preferred_m3u_account_id, preferred_stream_id)
-            if not content_obj or not relation:
-                logger.error(f"[VOD-ERROR] Content or relation not found: {content_type} {content_id}")
-                raise Http404(f"Content not found: {content_type} {content_id}")
-
-            logger.info(f"[VOD-CONTENT] Found content: {getattr(content_obj, 'name', 'Unknown')}")
-
-            # Get M3U account from relation
-            m3u_account = relation.m3u_account
-            logger.info(f"[VOD-ACCOUNT] Using M3U account: {m3u_account.name}")
-
-            # Get stream URL from relation
-            stream_url = self._get_stream_url_from_relation(relation)
-            logger.info(f"[VOD-CONTENT] Content URL: {stream_url or 'No URL found'}")
-
-            if not stream_url:
-                logger.error(f"[VOD-ERROR] No stream URL available for {content_type} {content_id}")
-                return HttpResponse("No stream URL available", status=503)
-
-            # Get M3U profile (returns profile and current connection count)
-            profile_result = self._get_m3u_profile(m3u_account, profile_id, session_id)
-
-            if not profile_result or not profile_result[0]:
-                logger.error(f"[VOD-ERROR] No suitable M3U profile found for {content_type} {content_id}")
-                return HttpResponse("No available stream", status=503)
-
-            m3u_profile, current_connections = profile_result
-            logger.info(f"[VOD-PROFILE] Using M3U profile: {m3u_profile.id} (max_streams: {m3u_profile.max_streams}, current: {current_connections})")
-
-            # Connection tracking is handled by the connection manager
-            # Transform URL based on profile
-            final_stream_url = self._transform_url(stream_url, m3u_profile)
-            logger.info(f"[VOD-URL] Final stream URL: {final_stream_url}")
-
-            # Validate stream URL
-            if not final_stream_url or not final_stream_url.startswith(('http://', 'https://')):
-                logger.error(f"[VOD-ERROR] Invalid stream URL: {final_stream_url}")
-                return HttpResponse("Invalid stream URL", status=500)
-
-            # Get connection manager (Redis-backed for multi-worker support)
-            connection_manager = MultiWorkerVODConnectionManager.get_instance()
-
-            # Stream the content with session-based connection reuse
-            logger.info("[VOD-STREAM] Calling connection manager to stream content")
-            response = connection_manager.stream_content_with_session(
-                session_id=session_id,
-                content_obj=content_obj,
-                stream_url=final_stream_url,
-                m3u_profile=m3u_profile,
-                client_ip=client_ip,
-                client_user_agent=client_user_agent,
-                request=request,
-                utc_start=utc_start,
-                utc_end=utc_end,
-                offset=offset,
-                range_header=range_header
+            return HttpResponse(
+                status=301,
+                headers={'Location': redirect_url}
             )
 
-            logger.info(f"[VOD-SUCCESS] Stream response created successfully, type: {type(response)}")
-            return response
+        if user:
+            if not check_user_stream_limits(user, session_id):
+                return JsonResponse(
+                    {"error": f"Stream limit exceeded ({user.stream_limit} concurrent streams allowed)"},
+                    status=429
+                )
 
-        except Exception as e:
-            logger.error(f"[VOD-EXCEPTION] Error streaming {content_type} {content_id}: {e}", exc_info=True)
-            return HttpResponse(f"Streaming error: {str(e)}", status=500)
+        # Extract preferred M3U account ID and stream ID from query parameters
+        preferred_m3u_account_id = request.GET.get('m3u_account_id')
+        preferred_stream_id = request.GET.get('stream_id')
 
-    def head(self, request, content_type, content_id, session_id=None, profile_id=None):
-        """
-        Handle HEAD requests for FUSE filesystem integration
-
-        Returns content length and session URL header for subsequent GET requests
-        """
-        logger.info(f"[VOD-HEAD] HEAD request: {content_type}/{content_id}, session: {session_id}, profile: {profile_id}")
-
-        try:
-            # Get client info for M3U profile selection
-            client_ip, client_user_agent = get_client_info(request)
-            logger.info(f"[VOD-HEAD] Client info - IP: {client_ip}, User-Agent: {client_user_agent[:50] if client_user_agent else 'None'}...")
-
-            # If no session ID, create one (same logic as GET)
-            if not session_id:
-                new_session_id = f"vod_{int(time.time() * 1000)}_{random.randint(1000, 9999)}"
-                logger.info(f"[VOD-HEAD] Creating new session for HEAD: {new_session_id}")
-
-                # Build session URL for response header
-                path_parts = request.path.rstrip('/').split('/')
-                if profile_id:
-                    session_url = f"{'/'.join(path_parts)}/{new_session_id}/{profile_id}/"
-                else:
-                    session_url = f"{'/'.join(path_parts)}/{new_session_id}"
-
-                session_id = new_session_id
-            else:
-                # Session already in URL, construct the current session URL
-                session_url = request.path
-                logger.info(f"[VOD-HEAD] Using existing session: {session_id}")
-
-            # Extract preferred M3U account ID and stream ID from query parameters
-            preferred_m3u_account_id = request.GET.get('m3u_account_id')
-            preferred_stream_id = request.GET.get('stream_id')
-
-            if preferred_m3u_account_id:
-                try:
-                    preferred_m3u_account_id = int(preferred_m3u_account_id)
-                except (ValueError, TypeError):
-                    logger.warning(f"[VOD-HEAD] Invalid m3u_account_id parameter: {preferred_m3u_account_id}")
-                    preferred_m3u_account_id = None
-
-            if preferred_stream_id:
-                logger.info(f"[VOD-HEAD] Preferred stream ID: {preferred_stream_id}")
-
-            # Get content and relation (same as GET)
-            content_obj, relation = self._get_content_and_relation(content_type, content_id, preferred_m3u_account_id, preferred_stream_id)
-            if not content_obj or not relation:
-                logger.error(f"[VOD-HEAD] Content or relation not found: {content_type} {content_id}")
-                return HttpResponse("Content not found", status=404)
-
-            # Get M3U account and stream URL
-            m3u_account = relation.m3u_account
-            stream_url = self._get_stream_url_from_relation(relation)
-            if not stream_url:
-                logger.error(f"[VOD-HEAD] No stream URL available for {content_type} {content_id}")
-                return HttpResponse("No stream URL available", status=503)
-
-            # Get M3U profile (returns profile and current connection count)
-            profile_result = self._get_m3u_profile(m3u_account, profile_id, session_id)
-            if not profile_result or not profile_result[0]:
-                logger.error(f"[VOD-HEAD] No M3U profile found or all profiles at capacity")
-                return HttpResponse("No available stream", status=503)
-
-            m3u_profile, current_connections = profile_result
-
-            # Transform URL if needed
-            final_stream_url = self._transform_url(stream_url, m3u_profile)
-
-            # Make a small range GET request to get content length since providers don't support HEAD
-            # We'll use a tiny range to minimize data transfer but get the headers we need
-            # Use M3U account's user agent as primary, client user agent as fallback
-            m3u_user_agent = m3u_account.get_user_agent().user_agent if m3u_account.get_user_agent() else None
-            headers = {
-                'User-Agent': m3u_user_agent or client_user_agent or 'Dispatcharr/1.0',
-                'Accept': '*/*',
-                'Range': 'bytes=0-1'  # Request only first 2 bytes
-            }
-
-            logger.info(f"[VOD-HEAD] Making small range GET request to provider: {final_stream_url}")
-            response = requests.get(final_stream_url, headers=headers, timeout=30, allow_redirects=True, stream=True)
-
-            # Check for range support - should be 206 for partial content
-            if response.status_code == 206:
-                # Parse Content-Range header to get total file size
-                content_range = response.headers.get('Content-Range', '')
-                if content_range:
-                    # Content-Range: bytes 0-1/1234567890
-                    total_size = content_range.split('/')[-1]
-                    logger.info(f"[VOD-HEAD] Got file size from Content-Range: {total_size}")
-                else:
-                    logger.warning(f"[VOD-HEAD] No Content-Range header in 206 response")
-                    total_size = response.headers.get('Content-Length', '0')
-            elif response.status_code == 200:
-                # Server doesn't support range requests, use Content-Length from full response
-                total_size = response.headers.get('Content-Length', '0')
-                logger.info(f"[VOD-HEAD] Server doesn't support ranges, got Content-Length: {total_size}")
-            else:
-                logger.error(f"[VOD-HEAD] Provider GET request failed: {response.status_code}")
-                return HttpResponse("Provider error", status=response.status_code)
-
-            # Close the small range request - we don't need to keep this connection
-            response.close()
-
-            # Store the total content length in Redis for the persistent connection to use
+        if preferred_m3u_account_id:
             try:
-                import redis
-                from django.conf import settings
-                redis_host = getattr(settings, 'REDIS_HOST', 'localhost')
-                redis_port = int(getattr(settings, 'REDIS_PORT', 6379))
-                redis_db = int(getattr(settings, 'REDIS_DB', 0))
-                redis_password = getattr(settings, 'REDIS_PASSWORD', '')
-                redis_user = getattr(settings, 'REDIS_USER', '')
-                r = redis.StrictRedis(
-                    host=redis_host,
-                    port=redis_port,
-                    db=redis_db,
-                    password=redis_password if redis_password else None,
-                    username=redis_user if redis_user else None,
-                    decode_responses=True
-                )
-                content_length_key = f"vod_content_length:{session_id}"
-                r.set(content_length_key, total_size, ex=1800)  # Store for 30 minutes
-                logger.info(f"[VOD-HEAD] Stored total content length {total_size} for session {session_id}")
-            except Exception as e:
-                logger.error(f"[VOD-HEAD] Failed to store content length in Redis: {e}")
+                preferred_m3u_account_id = int(preferred_m3u_account_id)
+            except (ValueError, TypeError):
+                logger.warning(f"[VOD-PARAM] Invalid m3u_account_id parameter: {preferred_m3u_account_id}")
+                preferred_m3u_account_id = None
 
-            # Now create a persistent connection for the session (if one doesn't exist)
-            # This ensures the FUSE GET requests will reuse the same connection
+        if preferred_stream_id:
+            logger.info(f"[VOD-PARAM] Preferred stream ID: {preferred_stream_id}")
 
-            connection_manager = MultiWorkerVODConnectionManager.get_instance()
+        # Get the content object and its relation
+        content_obj, relation = _get_content_and_relation(content_type, content_id, preferred_m3u_account_id, preferred_stream_id)
+        if not content_obj or not relation:
+            logger.error(f"[VOD-ERROR] Content or relation not found: {content_type} {content_id}")
+            raise Http404(f"Content not found: {content_type} {content_id}")
 
-            logger.info(f"[VOD-HEAD] Pre-creating persistent connection for session: {session_id}")
+        logger.info(f"[VOD-CONTENT] Found content: {getattr(content_obj, 'name', 'Unknown')}")
 
-            # We don't actually stream content here, just ensure connection is ready
-            # The actual GET requests from FUSE will use the persistent connection
+        # Get M3U account from relation
+        m3u_account = relation.m3u_account
+        logger.info(f"[VOD-ACCOUNT] Using M3U account: {m3u_account.name}")
 
-            # Use the total_size we extracted from the range response
-            provider_content_type = response.headers.get('Content-Type')
+        # Get stream URL from relation
+        stream_url = _get_stream_url_from_relation(relation)
+        logger.info(f"[VOD-CONTENT] Content URL: {stream_url or 'No URL found'}")
 
-            if provider_content_type:
-                content_type_header = provider_content_type
-                logger.info(f"[VOD-HEAD] Using provider Content-Type: {content_type_header}")
-            else:
-                # Provider didn't send Content-Type, infer from URL
-                inferred_content_type = infer_content_type_from_url(final_stream_url)
-                if inferred_content_type:
-                    content_type_header = inferred_content_type
-                    logger.info(f"[VOD-HEAD] Provider missing Content-Type, inferred from URL: {content_type_header}")
-                else:
-                    content_type_header = 'video/mp4'
-                    logger.info(f"[VOD-HEAD] No Content-Type from provider and could not infer from URL, using default: {content_type_header}")
+        if not stream_url:
+            logger.error(f"[VOD-ERROR] No stream URL available for {content_type} {content_id}")
+            return HttpResponse("No stream URL available", status=503)
 
-            logger.info(f"[VOD-HEAD] Provider response - Total Size: {total_size}, Type: {content_type_header}")
+        # Get M3U profile (returns profile and current connection count)
+        profile_result = _get_m3u_profile(m3u_account, profile_id, session_id)
 
-            # Create response with content length and session URL header
-            head_response = HttpResponse()
-            head_response['Content-Length'] = total_size
-            head_response['Content-Type'] = content_type_header
-            head_response['Accept-Ranges'] = 'bytes'
+        if not profile_result or not profile_result[0]:
+            logger.error(f"[VOD-ERROR] No suitable M3U profile found for {content_type} {content_id}")
+            return HttpResponse("No available stream", status=503)
 
-            # Custom header with session URL for FUSE
-            head_response['X-Session-URL'] = session_url
-            head_response['X-Dispatcharr-Session'] = session_id
+        m3u_profile, current_connections = profile_result
+        logger.info(f"[VOD-PROFILE] Using M3U profile: {m3u_profile.id} (max_streams: {m3u_profile.max_streams}, current: {current_connections})")
 
-            logger.info(f"[VOD-HEAD] Returning HEAD response with session URL: {session_url}")
-            return head_response
+        # Connection tracking is handled by the connection manager
+        # Transform URL based on profile
+        final_stream_url = _transform_url(stream_url, m3u_profile)
+        logger.info(f"[VOD-URL] Final stream URL: {final_stream_url}")
 
-        except Exception as e:
-            logger.error(f"[VOD-HEAD] Error in HEAD request: {e}", exc_info=True)
-            return HttpResponse(f"HEAD error: {str(e)}", status=500)
+        # Validate stream URL
+        if not final_stream_url or not final_stream_url.startswith(('http://', 'https://')):
+            logger.error(f"[VOD-ERROR] Invalid stream URL: {final_stream_url}")
+            return HttpResponse("Invalid stream URL", status=500)
 
-    def _get_content_and_relation(self, content_type, content_id, preferred_m3u_account_id=None, preferred_stream_id=None):
-        """Get the content object and its M3U relation"""
-        try:
-            logger.info(f"[CONTENT-LOOKUP] Looking up {content_type} with UUID {content_id}")
-            if preferred_m3u_account_id:
-                logger.info(f"[CONTENT-LOOKUP] Preferred M3U account ID: {preferred_m3u_account_id}")
-            if preferred_stream_id:
-                logger.info(f"[CONTENT-LOOKUP] Preferred stream ID: {preferred_stream_id}")
+        # Get connection manager (Redis-backed for multi-worker support)
+        connection_manager = MultiWorkerVODConnectionManager.get_instance()
 
-            if content_type == 'movie':
-                content_obj = get_object_or_404(Movie, uuid=content_id)
-                logger.info(f"[CONTENT-FOUND] Movie: {content_obj.name} (ID: {content_obj.id})")
+        # Stream the content with session-based connection reuse
+        logger.info("[VOD-STREAM] Calling connection manager to stream content")
+        response = connection_manager.stream_content_with_session(
+            session_id=session_id,
+            content_obj=content_obj,
+            stream_url=final_stream_url,
+            m3u_profile=m3u_profile,
+            client_ip=client_ip,
+            client_user_agent=client_user_agent,
+            request=request,
+            utc_start=utc_start,
+            utc_end=utc_end,
+            offset=offset,
+            range_header=range_header,
+            user=user,
+        )
 
-                # Filter by preferred stream ID first (most specific)
-                relations_query = content_obj.m3u_relations.filter(m3u_account__is_active=True)
-                if preferred_stream_id:
-                    specific_relation = relations_query.filter(stream_id=preferred_stream_id).first()
-                    if specific_relation:
-                        logger.info(f"[STREAM-SELECTED] Using specific stream: {specific_relation.stream_id} from provider: {specific_relation.m3u_account.name}")
-                        return content_obj, specific_relation
-                    else:
-                        logger.warning(f"[STREAM-FALLBACK] Preferred stream ID {preferred_stream_id} not found, falling back to account/priority selection")
+        logger.info(f"[VOD-SUCCESS] Stream response created successfully, type: {type(response)}")
+        return response
 
-                # Filter by preferred M3U account if specified
-                if preferred_m3u_account_id:
-                    specific_relation = relations_query.filter(m3u_account__id=preferred_m3u_account_id).first()
-                    if specific_relation:
-                        logger.info(f"[PROVIDER-SELECTED] Using preferred provider: {specific_relation.m3u_account.name}")
-                        return content_obj, specific_relation
-                    else:
-                        logger.warning(f"[PROVIDER-FALLBACK] Preferred M3U account {preferred_m3u_account_id} not found, using highest priority")
+    except Exception as e:
+        logger.error(f"[VOD-EXCEPTION] Error streaming {content_type} {content_id}: {e}", exc_info=True)
+        return HttpResponse(f"Streaming error: {str(e)}", status=500)
 
-                # Get the highest priority active relation (fallback or default)
-                relation = relations_query.select_related('m3u_account').order_by('-m3u_account__priority', 'id').first()
+@api_view(["HEAD"])
+def head_vod(request, content_type, content_id, session_id=None, profile_id=None):
+    """
+    Handle HEAD requests for FUSE filesystem integration
 
-                if relation:
-                    logger.info(f"[PROVIDER-SELECTED] Using provider: {relation.m3u_account.name} (priority: {relation.m3u_account.priority})")
+    Returns content length and session URL header for subsequent GET requests
+    """
+    logger.info(f"[VOD-HEAD] HEAD request: {content_type}/{content_id}, session: {session_id}, profile: {profile_id}")
 
-                return content_obj, relation
+    try:
+        # Get client info for M3U profile selection
+        client_ip, client_user_agent = get_client_info(request)
+        logger.info(f"[VOD-HEAD] Client info - IP: {client_ip}, User-Agent: {client_user_agent[:50] if client_user_agent else 'None'}...")
 
-            elif content_type == 'episode':
-                content_obj = get_object_or_404(Episode, uuid=content_id)
-                logger.info(f"[CONTENT-FOUND] Episode: {content_obj.name} (ID: {content_obj.id}, Series: {content_obj.series.name})")
+        # If no session ID, create one (same logic as GET)
+        if not session_id:
+            new_session_id = f"vod_{int(time.time() * 1000)}_{random.randint(1000, 9999)}"
+            logger.info(f"[VOD-HEAD] Creating new session for HEAD: {new_session_id}")
 
-                # Filter by preferred stream ID first (most specific)
-                relations_query = content_obj.m3u_relations.filter(m3u_account__is_active=True)
-                if preferred_stream_id:
-                    specific_relation = relations_query.filter(stream_id=preferred_stream_id).first()
-                    if specific_relation:
-                        logger.info(f"[STREAM-SELECTED] Using specific stream: {specific_relation.stream_id} from provider: {specific_relation.m3u_account.name}")
-                        return content_obj, specific_relation
-                    else:
-                        logger.warning(f"[STREAM-FALLBACK] Preferred stream ID {preferred_stream_id} not found, falling back to account/priority selection")
-
-                # Filter by preferred M3U account if specified
-                if preferred_m3u_account_id:
-                    specific_relation = relations_query.filter(m3u_account__id=preferred_m3u_account_id).first()
-                    if specific_relation:
-                        logger.info(f"[PROVIDER-SELECTED] Using preferred provider: {specific_relation.m3u_account.name}")
-                        return content_obj, specific_relation
-                    else:
-                        logger.warning(f"[PROVIDER-FALLBACK] Preferred M3U account {preferred_m3u_account_id} not found, using highest priority")
-
-                # Get the highest priority active relation (fallback or default)
-                relation = relations_query.select_related('m3u_account').order_by('-m3u_account__priority', 'id').first()
-
-                if relation:
-                    logger.info(f"[PROVIDER-SELECTED] Using provider: {relation.m3u_account.name} (priority: {relation.m3u_account.priority})")
-
-                return content_obj, relation
-
-            elif content_type == 'series':
-                # For series, get the first episode
-                series = get_object_or_404(Series, uuid=content_id)
-                logger.info(f"[CONTENT-FOUND] Series: {series.name} (ID: {series.id})")
-                episode = series.episodes.first()
-                if not episode:
-                    logger.error(f"[CONTENT-ERROR] No episodes found for series {series.name}")
-                    return None, None
-
-                logger.info(f"[CONTENT-FOUND] First episode: {episode.name} (ID: {episode.id})")
-
-                # Filter by preferred stream ID first (most specific)
-                relations_query = episode.m3u_relations.filter(m3u_account__is_active=True)
-                if preferred_stream_id:
-                    specific_relation = relations_query.filter(stream_id=preferred_stream_id).first()
-                    if specific_relation:
-                        logger.info(f"[STREAM-SELECTED] Using specific stream: {specific_relation.stream_id} from provider: {specific_relation.m3u_account.name}")
-                        return episode, specific_relation
-                    else:
-                        logger.warning(f"[STREAM-FALLBACK] Preferred stream ID {preferred_stream_id} not found, falling back to account/priority selection")
-
-                # Filter by preferred M3U account if specified
-                if preferred_m3u_account_id:
-                    specific_relation = relations_query.filter(m3u_account__id=preferred_m3u_account_id).first()
-                    if specific_relation:
-                        logger.info(f"[PROVIDER-SELECTED] Using preferred provider: {specific_relation.m3u_account.name}")
-                        return episode, specific_relation
-                    else:
-                        logger.warning(f"[PROVIDER-FALLBACK] Preferred M3U account {preferred_m3u_account_id} not found, using highest priority")
-
-                # Get the highest priority active relation (fallback or default)
-                relation = relations_query.select_related('m3u_account').order_by('-m3u_account__priority', 'id').first()
-
-                if relation:
-                    logger.info(f"[PROVIDER-SELECTED] Using provider: {relation.m3u_account.name} (priority: {relation.m3u_account.priority})")
-
-                return episode, relation
-            else:
-                logger.error(f"[CONTENT-ERROR] Invalid content type: {content_type}")
-                return None, None
-
-        except Exception as e:
-            logger.error(f"Error getting content object: {e}")
-            return None, None
-
-    def _get_stream_url_from_relation(self, relation):
-        """Get stream URL from the M3U relation"""
-        try:
-            # Log the relation type and available attributes
-            logger.info(f"[VOD-URL] Relation type: {type(relation).__name__}")
-            logger.info(f"[VOD-URL] Account type: {relation.m3u_account.account_type}")
-            logger.info(f"[VOD-URL] Stream ID: {getattr(relation, 'stream_id', 'N/A')}")
-
-            # First try the get_stream_url method (this should build URLs dynamically)
-            if hasattr(relation, 'get_stream_url'):
-                url = relation.get_stream_url()
-                if url:
-                    logger.info(f"[VOD-URL] Built URL from get_stream_url(): {url}")
-                    return url
-                else:
-                    logger.warning(f"[VOD-URL] get_stream_url() returned None")
-
-            logger.error(f"[VOD-URL] Relation has no get_stream_url method or it failed")
-            return None
-        except Exception as e:
-            logger.error(f"[VOD-URL] Error getting stream URL from relation: {e}", exc_info=True)
-            return None
-
-    def _get_m3u_profile(self, m3u_account, profile_id, session_id=None):
-        """Get appropriate M3U profile for streaming using Redis-based viewer counts
-
-        Args:
-            m3u_account: M3UAccount instance
-            profile_id: Optional specific profile ID requested
-            session_id: Optional session ID to check for existing connections
-
-        Returns:
-            tuple: (M3UAccountProfile, current_connections) or None if no profile found
-        """
-        try:
-            from core.utils import RedisClient
-            redis_client = RedisClient.get_client()
-
-            if not redis_client:
-                logger.warning("Redis not available, falling back to default profile")
-                default_profile = M3UAccountProfile.objects.filter(
-                    m3u_account=m3u_account,
-                    is_active=True,
-                    is_default=True
-                ).first()
-                return (default_profile, 0) if default_profile else None
-
-            # Check if this session already has an active connection
-            if session_id:
-                persistent_connection_key = f"vod_persistent_connection:{session_id}"
-                connection_data = redis_client.hgetall(persistent_connection_key)
-
-                if connection_data:
-                    existing_profile_id = connection_data.get('m3u_profile_id')
-                    if existing_profile_id:
-                        try:
-                            existing_profile = M3UAccountProfile.objects.get(
-                                id=int(existing_profile_id),
-                                m3u_account=m3u_account,
-                                is_active=True
-                            )
-                            # Get current connections for logging
-                            profile_connections_key = f"profile_connections:{existing_profile.id}"
-                            current_connections = int(redis_client.get(profile_connections_key) or 0)
-
-                            logger.info(f"[PROFILE-SELECTION] Session {session_id} reusing existing profile {existing_profile.id}: {current_connections}/{existing_profile.max_streams} connections")
-                            return (existing_profile, current_connections)
-                        except (M3UAccountProfile.DoesNotExist, ValueError):
-                            logger.warning(f"[PROFILE-SELECTION] Session {session_id} has invalid profile ID {existing_profile_id}, selecting new profile")
-                        except Exception as e:
-                            logger.warning(f"[PROFILE-SELECTION] Error checking existing profile for session {session_id}: {e}")
-                    else:
-                        logger.debug(f"[PROFILE-SELECTION] Session {session_id} exists but has no profile ID stored")            # If specific profile requested, try to use it
+            # Build session URL for response header
+            path_parts = request.path.rstrip('/').split('/')
             if profile_id:
-                try:
-                    profile = M3UAccountProfile.objects.get(
-                        id=profile_id,
-                        m3u_account=m3u_account,
-                        is_active=True
-                    )
-                    # Check Redis-based current connections
-                    profile_connections_key = f"profile_connections:{profile.id}"
-                    current_connections = int(redis_client.get(profile_connections_key) or 0)
+                session_url = f"{'/'.join(path_parts)}/{new_session_id}/{profile_id}/"
+            else:
+                session_url = f"{'/'.join(path_parts)}/{new_session_id}"
 
-                    if profile.max_streams == 0 or current_connections < profile.max_streams:
-                        logger.info(f"[PROFILE-SELECTION] Using requested profile {profile.id}: {current_connections}/{profile.max_streams} connections")
-                        return (profile, current_connections)
-                    else:
-                        logger.warning(f"[PROFILE-SELECTION] Requested profile {profile.id} is at capacity: {current_connections}/{profile.max_streams}")
-                except M3UAccountProfile.DoesNotExist:
-                    logger.warning(f"[PROFILE-SELECTION] Requested profile {profile_id} not found")
+            session_id = new_session_id
+        else:
+            # Session already in URL, construct the current session URL
+            session_url = request.path
+            logger.info(f"[VOD-HEAD] Using existing session: {session_id}")
 
-            # Get active profiles ordered by priority (default first)
-            m3u_profiles = M3UAccountProfile.objects.filter(
-                m3u_account=m3u_account,
-                is_active=True
-            )
+        # Extract preferred M3U account ID and stream ID from query parameters
+        preferred_m3u_account_id = request.GET.get('m3u_account_id')
+        preferred_stream_id = request.GET.get('stream_id')
 
-            default_profile = m3u_profiles.filter(is_default=True).first()
-            if not default_profile:
-                logger.error(f"[PROFILE-SELECTION] No default profile found for M3U account {m3u_account.id}")
-                return None
+        if preferred_m3u_account_id:
+            try:
+                preferred_m3u_account_id = int(preferred_m3u_account_id)
+            except (ValueError, TypeError):
+                logger.warning(f"[VOD-HEAD] Invalid m3u_account_id parameter: {preferred_m3u_account_id}")
+                preferred_m3u_account_id = None
 
-            # Check profiles in order: default first, then others
-            profiles = [default_profile] + list(m3u_profiles.filter(is_default=False))
+        if preferred_stream_id:
+            logger.info(f"[VOD-HEAD] Preferred stream ID: {preferred_stream_id}")
 
-            for profile in profiles:
-                profile_connections_key = f"profile_connections:{profile.id}"
-                current_connections = int(redis_client.get(profile_connections_key) or 0)
+        # Get content and relation (same as GET)
+        content_obj, relation = _get_content_and_relation(content_type, content_id, preferred_m3u_account_id, preferred_stream_id)
+        if not content_obj or not relation:
+            logger.error(f"[VOD-HEAD] Content or relation not found: {content_type} {content_id}")
+            return HttpResponse("Content not found", status=404)
 
-                # Check if profile has available connection slots
-                if profile.max_streams == 0 or current_connections < profile.max_streams:
-                    logger.info(f"[PROFILE-SELECTION] Selected profile {profile.id} ({profile.name}): {current_connections}/{profile.max_streams} connections")
-                    return (profile, current_connections)
-                else:
-                    logger.debug(f"[PROFILE-SELECTION] Profile {profile.id} at capacity: {current_connections}/{profile.max_streams}")
+        # Get M3U account and stream URL
+        m3u_account = relation.m3u_account
+        stream_url = _get_stream_url_from_relation(relation)
+        if not stream_url:
+            logger.error(f"[VOD-HEAD] No stream URL available for {content_type} {content_id}")
+            return HttpResponse("No stream URL available", status=503)
 
-            # All profiles are at capacity - return None to trigger error response
-            logger.error(f"[PROFILE-SELECTION] All profiles at capacity for M3U account {m3u_account.id}, rejecting request")
-            return None
+        # Get M3U profile (returns profile and current connection count)
+        profile_result = _get_m3u_profile(m3u_account, profile_id, session_id)
+        if not profile_result or not profile_result[0]:
+            logger.error(f"[VOD-HEAD] No M3U profile found or all profiles at capacity")
+            return HttpResponse("No available stream", status=503)
 
-        except Exception as e:
-            logger.error(f"Error getting M3U profile: {e}")
-            return None
+        m3u_profile, current_connections = profile_result
 
-    def _transform_url(self, original_url, m3u_profile):
-        """Transform URL based on M3U profile settings"""
+        # Transform URL if needed
+        final_stream_url = _transform_url(stream_url, m3u_profile)
+
+        # Make a small range GET request to get content length since providers don't support HEAD
+        # We'll use a tiny range to minimize data transfer but get the headers we need
+        # Use M3U account's user agent as primary, client user agent as fallback
+        m3u_user_agent = m3u_account.get_user_agent().user_agent if m3u_account.get_user_agent() else None
+        headers = {
+            'User-Agent': m3u_user_agent or client_user_agent or 'Dispatcharr/1.0',
+            'Accept': '*/*',
+            'Range': 'bytes=0-1'  # Request only first 2 bytes
+        }
+
+        logger.info(f"[VOD-HEAD] Making small range GET request to provider: {final_stream_url}")
+        response = requests.get(final_stream_url, headers=headers, timeout=30, allow_redirects=True, stream=True)
+
+        # Check for range support - should be 206 for partial content
+        if response.status_code == 206:
+            # Parse Content-Range header to get total file size
+            content_range = response.headers.get('Content-Range', '')
+            if content_range:
+                # Content-Range: bytes 0-1/1234567890
+                total_size = content_range.split('/')[-1]
+                logger.info(f"[VOD-HEAD] Got file size from Content-Range: {total_size}")
+            else:
+                logger.warning(f"[VOD-HEAD] No Content-Range header in 206 response")
+                total_size = response.headers.get('Content-Length', '0')
+        elif response.status_code == 200:
+            # Server doesn't support range requests, use Content-Length from full response
+            total_size = response.headers.get('Content-Length', '0')
+            logger.info(f"[VOD-HEAD] Server doesn't support ranges, got Content-Length: {total_size}")
+        else:
+            logger.error(f"[VOD-HEAD] Provider GET request failed: {response.status_code}")
+            return HttpResponse("Provider error", status=response.status_code)
+
+        # Close the small range request - we don't need to keep this connection
+        response.close()
+
+        # Store the total content length in Redis for the persistent connection to use
         try:
-            import re
-
-            if not original_url:
-                return None
-
-            search_pattern = m3u_profile.search_pattern
-            replace_pattern = m3u_profile.replace_pattern
-            safe_replace_pattern = re.sub(r'\$(\d+)', r'\\\1', replace_pattern)
-
-            if search_pattern and replace_pattern:
-                transformed_url = re.sub(search_pattern, safe_replace_pattern, original_url)
-                return transformed_url
-
-            return original_url
-
+            import redis
+            from django.conf import settings
+            redis_host = getattr(settings, 'REDIS_HOST', 'localhost')
+            redis_port = int(getattr(settings, 'REDIS_PORT', 6379))
+            redis_db = int(getattr(settings, 'REDIS_DB', 0))
+            redis_password = getattr(settings, 'REDIS_PASSWORD', '')
+            redis_user = getattr(settings, 'REDIS_USER', '')
+            r = redis.StrictRedis(
+                host=redis_host,
+                port=redis_port,
+                db=redis_db,
+                password=redis_password if redis_password else None,
+                username=redis_user if redis_user else None,
+                decode_responses=True
+            )
+            content_length_key = f"vod_content_length:{session_id}"
+            r.set(content_length_key, total_size, ex=1800)  # Store for 30 minutes
+            logger.info(f"[VOD-HEAD] Stored total content length {total_size} for session {session_id}")
         except Exception as e:
-            logger.error(f"Error transforming URL: {e}")
-            return original_url
+            logger.error(f"[VOD-HEAD] Failed to store content length in Redis: {e}")
+
+        # Now create a persistent connection for the session (if one doesn't exist)
+        # This ensures the FUSE GET requests will reuse the same connection
+
+        connection_manager = MultiWorkerVODConnectionManager.get_instance()
+
+        logger.info(f"[VOD-HEAD] Pre-creating persistent connection for session: {session_id}")
+
+        # We don't actually stream content here, just ensure connection is ready
+        # The actual GET requests from FUSE will use the persistent connection
+
+        # Use the total_size we extracted from the range response
+        provider_content_type = response.headers.get('Content-Type')
+
+        if provider_content_type:
+            content_type_header = provider_content_type
+            logger.info(f"[VOD-HEAD] Using provider Content-Type: {content_type_header}")
+        else:
+            # Provider didn't send Content-Type, infer from URL
+            inferred_content_type = infer_content_type_from_url(final_stream_url)
+            if inferred_content_type:
+                content_type_header = inferred_content_type
+                logger.info(f"[VOD-HEAD] Provider missing Content-Type, inferred from URL: {content_type_header}")
+            else:
+                content_type_header = 'video/mp4'
+                logger.info(f"[VOD-HEAD] No Content-Type from provider and could not infer from URL, using default: {content_type_header}")
+
+        logger.info(f"[VOD-HEAD] Provider response - Total Size: {total_size}, Type: {content_type_header}")
+
+        # Create response with content length and session URL header
+        head_response = HttpResponse()
+        head_response['Content-Length'] = total_size
+        head_response['Content-Type'] = content_type_header
+        head_response['Accept-Ranges'] = 'bytes'
+
+        # Custom header with session URL for FUSE
+        head_response['X-Session-URL'] = session_url
+        head_response['X-Dispatcharr-Session'] = session_id
+
+        logger.info(f"[VOD-HEAD] Returning HEAD response with session URL: {session_url}")
+        return head_response
+
+    except Exception as e:
+        logger.error(f"[VOD-HEAD] Error in HEAD request: {e}", exc_info=True)
+        return HttpResponse(f"HEAD error: {str(e)}", status=500)
 
 @method_decorator(csrf_exempt, name='dispatch')
 class VODPlaylistView(View):
@@ -1069,4 +1083,59 @@ def stop_vod_client(request):
         logger.error(f"Error stopping VOD client: {e}", exc_info=True)
         return JsonResponse({'error': str(e)}, status=500)
 
+@api_view(["GET"])
+def stream_xc_movie(request, username, password, stream_id, extension):
+    from apps.vod.models import M3UMovieRelation
 
+    session_id = request.GET.get('session_id')
+    profile_id = request.GET.get('profile_id')
+
+    user = get_object_or_404(User, username=username)
+
+    custom_properties = user.custom_properties or {}
+
+    if "xc_password" not in custom_properties:
+        return Response({"error": "Invalid credentials"}, status=401)
+
+    if custom_properties["xc_password"] != password:
+        return Response({"error": "Invalid credentials"}, status=401)
+
+    # All authenticated users get access to VOD from all active M3U accounts
+    filters = {"movie_id": stream_id, "m3u_account__is_active": True}
+
+    try:
+        # Order by account priority to get the best relation when multiple exist
+        movie_relation = M3UMovieRelation.objects.select_related('movie').filter(**filters).order_by('-m3u_account__priority', 'id').first()
+        if not movie_relation:
+            return JsonResponse({"error": "Movie not found"}, status=404)
+    except (M3UMovieRelation.DoesNotExist, M3UMovieRelation.MultipleObjectsReturned):
+        return JsonResponse({"error": "Movie not found"}, status=404)
+
+    return stream_vod(request._request, 'movie', movie_relation.movie.uuid, session_id, profile_id, user)
+
+@api_view(["GET"])
+def stream_xc_episode(request, username, password, stream_id, extension):
+    from apps.vod.models import M3UEpisodeRelation
+
+    session_id = request.GET.get('session_id')
+    profile_id = request.GET.get('profile_id')
+
+    user = get_object_or_404(User, username=username)
+
+    custom_properties = user.custom_properties or {}
+
+    if "xc_password" not in custom_properties:
+        return Response({"error": "Invalid credentials"}, status=401)
+
+    if custom_properties["xc_password"] != password:
+        return Response({"error": "Invalid credentials"}, status=401)
+
+    # All authenticated users get access to series/episodes from all active M3U accounts
+    filters = {"episode_id": stream_id, "m3u_account__is_active": True}
+
+    try:
+        episode_relation = M3UEpisodeRelation.objects.select_related('episode').filter(**filters).order_by('-m3u_account__priority', 'id').first()
+    except M3UEpisodeRelation.DoesNotExist:
+        return JsonResponse({"error": "Episode not found"}, status=404)
+
+    return stream_vod(request._request, 'episode', episode_relation.episode.uuid, session_id, profile_id, user)
diff --git a/apps/vod/api_views.py b/apps/vod/api_views.py
index 8b778c81..edb1b110 100644
--- a/apps/vod/api_views.py
+++ b/apps/vod/api_views.py
@@ -903,4 +903,3 @@ class VODLogoViewSet(viewsets.ModelViewSet):
                 {"error": str(e)},
                 status=status.HTTP_500_INTERNAL_SERVER_ERROR
             )
-
diff --git a/core/migrations/022_default_user_limit_settings.py b/core/migrations/022_default_user_limit_settings.py
new file mode 100644
index 00000000..af758a11
--- /dev/null
+++ b/core/migrations/022_default_user_limit_settings.py
@@ -0,0 +1,24 @@
+# Generated by Django 5.1.6 on 2025-03-01 14:01
+
+from django.db import migrations
+from django.utils.text import slugify
+
+
+def preload_user_limit_settings(apps, schema_editor):
+    CoreSettings = apps.get_model("core", "CoreSettings")
+    CoreSettings.objects.create(
+        key="user_limits",
+        name="User Limits",
+        value={},
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0021_systemnotification_notificationdismissal"),
+    ]
+
+    operations = [
+        migrations.RunPython(preload_user_limit_settings),
+    ]
diff --git a/core/models.py b/core/models.py
index 4e6322e7..faf1ff0a 100644
--- a/core/models.py
+++ b/core/models.py
@@ -156,6 +156,7 @@ PROXY_SETTINGS_KEY = "proxy_settings"
 NETWORK_ACCESS_KEY = "network_access"
 SYSTEM_SETTINGS_KEY = "system_settings"
 EPG_SETTINGS_KEY = "epg_settings"
+USER_LIMITS_SETTINGS_KEY = "user_limits_settings"
 
 
 class CoreSettings(models.Model):
@@ -351,6 +352,15 @@ class CoreSettings(models.Model):
         cls._update_group(SYSTEM_SETTINGS_KEY, "System Settings", {"time_zone": value})
         return value
 
+    @classmethod
+    def get_user_limits_settings(cls):
+        return cls._get_group(USER_LIMITS_SETTINGS_KEY, {
+            "terminate_on_limit_exceeded": True,
+            "prioritize_single_client_channels": True,
+            "ignore_same_channel_connections": False,
+            "terminate_oldest": True,
+        })
+
 
 class SystemEvent(models.Model):
     """
diff --git a/core/utils.py b/core/utils.py
index ca5a6b06..05203870 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -42,7 +42,6 @@ def natural_sort_key(text):
     return [convert(c) for c in re.split('([0-9]+)', text)]
 
 class RedisClient:
-    _initialized = False
     _client = None
     _buffer = None
     _pubsub_client = None
@@ -79,9 +78,6 @@ class RedisClient:
 
                 # Validate connection with ping
                 client.ping()
-                if cls._initialized is False:
-                    client.flushdb()
-                    cls._initialized = True
 
                 # Disable persistence on first connection - improves performance
                 # Only try to disable if not in a read-only environment
@@ -141,97 +137,9 @@ class RedisClient:
 
     @classmethod
     def get_client(cls, max_retries=5, retry_interval=1):
+        """Get Redis client optimized for non-binary data (decoded responses)"""
         if cls._client is None:
-            retry_count = 0
-            while retry_count < max_retries:
-                try:
-                    # Get connection parameters from settings or environment
-                    redis_host = os.environ.get("REDIS_HOST", getattr(settings, 'REDIS_HOST', 'localhost'))
-                    redis_port = int(os.environ.get("REDIS_PORT", getattr(settings, 'REDIS_PORT', 6379)))
-                    redis_db = int(os.environ.get("REDIS_DB", getattr(settings, 'REDIS_DB', 0)))
-                    redis_password = os.environ.get("REDIS_PASSWORD", getattr(settings, 'REDIS_PASSWORD', ''))
-                    redis_user = os.environ.get("REDIS_USER", getattr(settings, 'REDIS_USER', ''))
-
-                    # Use standardized settings
-                    socket_timeout = getattr(settings, 'REDIS_SOCKET_TIMEOUT', 5)
-                    socket_connect_timeout = getattr(settings, 'REDIS_SOCKET_CONNECT_TIMEOUT', 5)
-                    health_check_interval = getattr(settings, 'REDIS_HEALTH_CHECK_INTERVAL', 30)
-                    socket_keepalive = getattr(settings, 'REDIS_SOCKET_KEEPALIVE', True)
-                    retry_on_timeout = getattr(settings, 'REDIS_RETRY_ON_TIMEOUT', True)
-
-                    # Create Redis client with better defaults
-                    client = redis.Redis(
-                        host=redis_host,
-                        port=redis_port,
-                        db=redis_db,
-                        password=redis_password if redis_password else None,
-                        username=redis_user if redis_user else None,
-                        socket_timeout=socket_timeout,
-                        socket_connect_timeout=socket_connect_timeout,
-                        socket_keepalive=socket_keepalive,
-                        health_check_interval=health_check_interval,
-                        retry_on_timeout=retry_on_timeout
-                    )
-
-                    # Validate connection with ping
-                    client.ping()
-
-                    # Disable persistence on first connection - improves performance
-                    # Only try to disable if not in a read-only environment
-                    try:
-                        client.config_set('save', '')  # Disable RDB snapshots
-                        client.config_set('appendonly', 'no')  # Disable AOF logging
-
-                        # Set optimal memory settings with environment variable support
-                        # Get max memory from environment or use a larger default (512MB instead of 256MB)
-                        #max_memory = os.environ.get('REDIS_MAX_MEMORY', '512mb')
-                        #eviction_policy = os.environ.get('REDIS_EVICTION_POLICY', 'allkeys-lru')
-
-                        # Apply memory settings
-                        #client.config_set('maxmemory-policy', eviction_policy)
-                        #client.config_set('maxmemory', max_memory)
-
-                        #logger.info(f"Redis configured with maxmemory={max_memory}, policy={eviction_policy}")
-
-                        # Disable protected mode when in debug mode
-                        if os.environ.get('DISPATCHARR_DEBUG', '').lower() == 'true':
-                            client.config_set('protected-mode', 'no')  # Disable protected mode in debug
-                            logger.warning("Redis protected mode disabled for debug environment")
-
-                        logger.trace("Redis persistence disabled for better performance")
-                    except redis.exceptions.ResponseError as e:
-                        # Improve error handling for Redis configuration errors
-                        if "OOM" in str(e):
-                            logger.error(f"Redis OOM during configuration: {e}")
-                            # Try to increase maxmemory as an emergency measure
-                            try:
-                                client.config_set('maxmemory', '768mb')
-                                logger.warning("Applied emergency Redis memory increase to 768MB")
-                            except:
-                                pass
-                        else:
-                            logger.error(f"Redis configuration error: {e}")
-
-                    logger.info(f"Connected to Redis at {redis_host}:{redis_port}/{redis_db}")
-
-                    cls._client = client
-                    break
-
-                except (ConnectionError, TimeoutError) as e:
-                    retry_count += 1
-                    if retry_count >= max_retries:
-                        logger.error(f"Failed to connect to Redis after {max_retries} attempts: {e}")
-                        return None
-                    else:
-                        # Use exponential backoff for retries
-                        wait_time = retry_interval * (2 ** (retry_count - 1))
-                        logger.warning(f"Redis connection failed. Retrying in {wait_time}s... ({retry_count}/{max_retries})")
-                        time.sleep(wait_time)
-
-                except Exception as e:
-                    logger.error(f"Unexpected error connecting to Redis: {e}")
-                    return None
-
+            cls._client = cls._init_client(decode_responses=True, max_retries=max_retries, retry_interval=retry_interval)
         return cls._client
 
     @classmethod
diff --git a/core/xtream_codes.py b/core/xtream_codes.py
index 9b56197a..822b37fd 100644
--- a/core/xtream_codes.py
+++ b/core/xtream_codes.py
@@ -62,7 +62,7 @@ class Client:
             url = f"{self.server_url}/{endpoint}"
             logger.debug(f"XC API Request: {url} with params: {params}")
 
-            response = self.session.get(url, params=params, timeout=30)
+            response = self.session.get(url, params=params, timeout=60)
             response.raise_for_status()
 
             # Check if response is empty
diff --git a/dispatcharr/urls.py b/dispatcharr/urls.py
index 092fb0cb..1319f31e 100644
--- a/dispatcharr/urls.py
+++ b/dispatcharr/urls.py
@@ -6,7 +6,7 @@ from django.views.generic import TemplateView, RedirectView
 from .routing import websocket_urlpatterns
 from apps.output.views import xc_player_api, xc_panel_api, xc_get, xc_xmltv
 from apps.proxy.ts_proxy.views import stream_xc
-from apps.output.views import xc_movie_stream, xc_series_stream
+from apps.proxy.vod_proxy.views import stream_xc_movie, stream_xc_episode
 
 urlpatterns = [
     # API Routes
@@ -44,13 +44,13 @@ urlpatterns = [
     # XC VOD endpoints
     path(
         "movie/<str:username>/<str:password>/<str:stream_id>.<str:extension>",
-        xc_movie_stream,
-        name="xc_movie_stream",
+        stream_xc_movie,
+        name="stream_xc_movie",
     ),
     path(
         "series/<str:username>/<str:password>/<str:stream_id>.<str:extension>",
-        xc_series_stream,
-        name="xc_series_stream",
+        stream_xc_episode,
+        name="stream_xc_episode",
     ),
     # Admin
     path("admin", RedirectView.as_view(url="/admin/", permanent=True)),
diff --git a/frontend/src/api.js b/frontend/src/api.js
index 9e4ac982..f299d032 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -2989,12 +2989,15 @@ export default class API {
     }
   }
 
-  static async updateUser(id, body) {
+  static async updateUser(id, body, self = false) {
     try {
-      const response = await request(`${host}/api/accounts/users/${id}/`, {
-        method: 'PATCH',
-        body,
-      });
+      const response = await request(
+        `${host}/api/accounts/users/${self ? 'me' : id}/`,
+        {
+          method: 'PATCH',
+          body,
+        }
+      );
 
       useUsersStore.getState().updateUser(response);
 
diff --git a/frontend/src/components/forms/User.jsx b/frontend/src/components/forms/User.jsx
index 859cd45a..f62975ff 100644
--- a/frontend/src/components/forms/User.jsx
+++ b/frontend/src/components/forms/User.jsx
@@ -17,6 +17,7 @@ import {
   Tooltip,
   Grid,
   SimpleGrid,
+  NumberInput,
   useMantineTheme,
 } from '@mantine/core';
 import { RotateCcwKey, RotateCw, X } from 'lucide-react';
@@ -48,6 +49,7 @@ const User = ({ user = null, isOpen, onClose }) => {
       last_name: '',
       email: '',
       user_level: '0',
+      stream_limit: 0,
       password: '',
       xc_password: '',
       channel_profiles: [],
@@ -117,7 +119,11 @@ const User = ({ user = null, isOpen, onClose }) => {
         delete values.password;
       }
 
-      const response = await API.updateUser(user.id, values);
+      const response = await API.updateUser(
+        user.id,
+        values,
+        isAdmin ? false : authUser.id === user.id
+      );
 
       if (user.id == authUser.id) {
         setUser(response);
@@ -139,6 +145,7 @@ const User = ({ user = null, isOpen, onClose }) => {
         last_name: user.last_name || '',
         email: user.email,
         user_level: `${user.user_level}`,
+        stream_limit: user.stream_limit || 0,
         channel_profiles:
           user.channel_profiles.length > 0
             ? user.channel_profiles.map((id) => `${id}`)
@@ -236,6 +243,7 @@ const User = ({ user = null, isOpen, onClose }) => {
               id="username"
               name="username"
               label="Username"
+              disabled={!isAdmin}
               {...form.getInputProps('username')}
               key={form.key('username')}
             />
@@ -257,19 +265,26 @@ const User = ({ user = null, isOpen, onClose }) => {
             />
 
             {showPermissions && (
-              <Select
-                label="User Level"
-                data={Object.entries(USER_LEVELS).map(([, value]) => {
-                  return {
-                    label: USER_LEVEL_LABELS[value],
-                    value: `${value}`,
-                  };
-                })}
-                {...form.getInputProps('user_level')}
-                key={form.key('user_level')}
-              />
-            )}
+              <>
+                <Select
+                  label="User Level"
+                  data={Object.entries(USER_LEVELS).map(([, value]) => {
+                    return {
+                      label: USER_LEVEL_LABELS[value],
+                      value: `${value}`,
+                    };
+                  })}
+                  {...form.getInputProps('user_level')}
+                  key={form.key('user_level')}
+                />
 
+                <NumberInput
+                  label="Stream Limit (0 = unlimited)"
+                  {...form.getInputProps('stream_limit')}
+                  key={form.key('stream_limit')}
+                />
+              </>
+            )}
           </Stack>
 
           <Stack gap="xs" style={{ flex: 1 }}>
diff --git a/frontend/src/components/forms/settings/UserLimitsForm.jsx b/frontend/src/components/forms/settings/UserLimitsForm.jsx
new file mode 100644
index 00000000..3481a7db
--- /dev/null
+++ b/frontend/src/components/forms/settings/UserLimitsForm.jsx
@@ -0,0 +1,116 @@
+import useSettingsStore from '../../../store/settings.jsx';
+import React, { useEffect, useState } from 'react';
+import { useForm } from '@mantine/form';
+import { updateSetting } from '../../../utils/pages/SettingsUtils.js';
+import {
+  Alert,
+  Button,
+  Flex,
+  NumberInput,
+  Stack,
+  TextInput,
+  Checkbox,
+} from '@mantine/core';
+import { USER_LIMITS_OPTIONS } from '../../../constants.js';
+
+const USER_LIMIT_DEFAULTS = Object.keys(USER_LIMITS_OPTIONS).reduce(
+  (acc, key) => {
+    acc[key] = USER_LIMITS_OPTIONS[key].default;
+    return acc;
+  },
+  {}
+);
+
+const UserLimitsForm = React.memo(({ active }) => {
+  const settings = useSettingsStore((s) => s.settings);
+
+  const [saved, setSaved] = useState(false);
+
+  const userLimitSettingsForm = useForm({
+    mode: 'controlled',
+    initialValues: USER_LIMIT_DEFAULTS,
+  });
+
+  useEffect(() => {
+    if (!active) setSaved(false);
+  }, [active]);
+
+  useEffect(() => {
+    if (settings) {
+      if (settings['user_limits']?.value) {
+        userLimitSettingsForm.setValues({
+          ...USER_LIMIT_DEFAULTS,
+          ...settings['user_limits'].value,
+        });
+      }
+    }
+  }, [settings]);
+
+  const resetUserLimitsToDefaults = () => {
+    userLimitSettingsForm.setValues(USER_LIMIT_DEFAULTS);
+  };
+
+  const onUserLimitsSubmit = async () => {
+    setSaved(false);
+
+    try {
+      const result = await updateSetting({
+        ...settings['user_limits'],
+        value: userLimitSettingsForm.getValues(),
+      });
+      if (result) {
+        setSaved(true);
+      }
+    } catch (error) {
+      console.error('Error saving user limit settings:', error);
+    }
+  };
+
+  return (
+    <form onSubmit={userLimitSettingsForm.onSubmit(onUserLimitsSubmit)}>
+      <Stack gap="sm">
+        {saved && (
+          <Alert
+            variant="light"
+            color="green"
+            title="Saved Successfully"
+          ></Alert>
+        )}
+
+        {Object.keys(USER_LIMITS_OPTIONS).reduce((acc, key) => {
+          const option = USER_LIMITS_OPTIONS[key];
+          acc.push(
+            <Checkbox
+              key={key}
+              label={option.label}
+              description={option.description}
+              {...userLimitSettingsForm.getInputProps(key, {
+                type: 'checkbox',
+              })}
+            />
+          );
+          return acc;
+        }, [])}
+
+        <Flex mih={50} gap="xs" justify="space-between" align="flex-end">
+          <Button
+            variant="subtle"
+            color="gray"
+            onClick={resetUserLimitsToDefaults}
+          >
+            Reset to Defaults
+          </Button>
+          <Button
+            type="submit"
+            disabled={userLimitSettingsForm.submitting}
+            variant="default"
+          >
+            Save
+          </Button>
+        </Flex>
+      </Stack>
+    </form>
+  );
+});
+
+export default UserLimitsForm;
diff --git a/frontend/src/constants.js b/frontend/src/constants.js
index 0c19eea1..e8638cc8 100644
--- a/frontend/src/constants.js
+++ b/frontend/src/constants.js
@@ -62,6 +62,33 @@ export const PROXY_SETTINGS_OPTIONS = {
   },
 };
 
+export const USER_LIMITS_OPTIONS = {
+  terminate_on_limit_exceeded: {
+    label: 'Terminate on Limit Exceeded',
+    description:
+      'Terminate a stream (based on below criteria) when the user exceeds the allowed limits',
+    default: true,
+  },
+  prioritize_single_client_channels: {
+    label: 'Prioritize Single Client Channels',
+    description:
+      'Prioritize terminating channels only a single client belonging to the user',
+    default: true,
+  },
+  ignore_same_channel_connections: {
+    label: 'Ignore Same-Channel Connections',
+    description:
+      'Multiple user connections to the same channel count as 1 connection toward user limits',
+    default: false,
+  },
+  terminate_oldest: {
+    label: 'Terminate Oldest',
+    description:
+      'Prioritize terminating the oldest stream when limits are exceeded. Setting to false prioritizes the newest stream.',
+    default: true,
+  },
+};
+
 export const M3U_FILTER_TYPES = [
   {
     label: 'Group',
diff --git a/frontend/src/pages/Settings.jsx b/frontend/src/pages/Settings.jsx
index 8bef5b47..71bbc68c 100644
--- a/frontend/src/pages/Settings.jsx
+++ b/frontend/src/pages/Settings.jsx
@@ -23,6 +23,7 @@ const BackupManager = React.lazy(
 import useAuthStore from '../store/auth';
 import { USER_LEVELS } from '../constants';
 import UiSettingsForm from '../components/forms/settings/UiSettingsForm.jsx';
+import UserLimitsForm from '../components/forms/settings/UserLimitsForm.jsx';
 import ErrorBoundary from '../components/ErrorBoundary.jsx';
 const NetworkAccessForm = React.lazy(
   () => import('../components/forms/settings/NetworkAccessForm.jsx')
@@ -200,6 +201,19 @@ const SettingsPage = () => {
                   </ErrorBoundary>
                 </AccordionPanel>
               </AccordionItem>
+
+              <AccordionItem value="user-limits">
+                <AccordionControl>User Limts</AccordionControl>
+                <AccordionPanel>
+                  <ErrorBoundary>
+                    <Suspense fallback={<Loader />}>
+                      <UserLimitsForm
+                        active={accordianValue === 'user-limits'}
+                      />
+                    </Suspense>
+                  </ErrorBoundary>
+                </AccordionPanel>
+              </AccordionItem>
             </>
           )}
         </Accordion>

From af54366d76cafec9a02fd0b0397823a4f8f81468 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 26 Mar 2026 10:15:24 -0500
Subject: [PATCH 079/172] changelog: Update changelog for XML parsing fixes.

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5dace89..58a41e3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- TLS and mutual TLS (mTLS) support for Redis and PostgreSQL connections in modular deployments. Supports encrypted connections, server certificate verification (Redis: on/off; PostgreSQL: verify-full, verify-ca, require), CA certificate configuration, and client certificate authentication. Configured via environment variables in the docker compose file. Includes startup validation for certificate paths and TLS/URL scheme conflicts, and a read-only Connection Security panel in System Settings. (Closes #950)
+- TLS and mutual TLS (mTLS) support for Redis and PostgreSQL connections in modular deployments. Supports encrypted connections, server certificate verification (Redis: on/off; PostgreSQL: verify-full, verify-ca, require), CA certificate configuration, and client certificate authentication. Configured via environment variables in the docker compose file. Includes startup validation for certificate paths and TLS/URL scheme conflicts, and a read-only Connection Security panel in System Settings. (Closes #950) — Thanks [@CodeBormen](https://github.com/CodeBormen)
 - Status filter for M3U group and VOD category filter modals: A new **All / Enabled / Disabled** segmented control is now shown alongside the text search input in the Live, VOD - Movies, and VOD - Series tabs of the M3U Group Filter modal. The status filter works in combination with the text search and also scopes the "Select Visible" / "Deselect Visible" buttons so they only act on the currently visible subset. (Closes #312)
 
 ### Changed
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- HTML named entities in XMLTV EPG files are now resolved to Unicode characters before lxml parsing. Some EPG providers (particularly French and other European sources) use HTML named entities like `&eacute;`, `&icirc;`, `&uuml;` in channel names, program titles, and metadata. These are not valid XML entities — lxml 6.0.2 with `recover=True` silently drops them, causing characters to go missing (e.g., "Chaîne Télé" becomes "Chane Tl"). A preprocessing step in `fetch_xmltv()` now resolves HTML named entities while preserving the 5 XML-predefined entities, detecting encoding from the XML declaration (falling back to UTF-8), and processing line-by-line to a temp file before atomically replacing the original. (Closes #1095) — Thanks [@CodeBormen](https://github.com/CodeBormen)
 - Duplicate recordings created when EPG sources refresh and re-evaluate series rules — Thanks [@CodeBormen](https://github.com/CodeBormen):
   - **Program ID instability**: `parse_programs_for_source()` deletes and recreates all `ProgramData` rows with new auto-increment IDs on every EPG refresh. The dedup set used these IDs, so it never matched after a refresh. Deduplication now uses a stable `(tvg_id, start_time, end_time)` composite key sourced from `Recording.custom_properties.program`.
   - **Secondary guard using wrong times**: The DB guard compared unadjusted program times against offset-adjusted `Recording.start_time`/`end_time`, so it never matched when any DVR pre/post offset was configured. It now queries `custom_properties__program__start_time/end_time` (the original, unadjusted program times stored at recording creation).

From b671a72707867d2340932ad060075a3bb74ac637 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 26 Mar 2026 18:41:42 -0500
Subject: [PATCH 080/172] fix: resolve decode_responses migration bugs and
 user-limit regressions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix a wave of bugs introduced by the user-priority branch's migration
from manual .decode('utf-8') calls to decode_responses=True on the
metadata Redis client:

core/utils.py
- Rewrite _init_client: fix SyntaxError at line 138, missing
  redis_password/redis_user params, cls._client corruption when
  decode_responses=False was requested, and dead retry backoff logic

apps/proxy/utils.py
- Fix get_user_limit_settings() → get_user_limits_settings() (2 sites)
- Fix VOD scan key vod_persistent_connections:* → vod_persistent_connection:*
- Fix undefined channel_id in VOD loop (use content_uuid from Redis hash)
- Remove leftover print(active_connections) debug statement
- Refactor manual cursor SCAN while-loops to scan_iter()

apps/channels/tasks.py
- Fix closure bug in _d(): md.get(key) → md.get(bkey) (was reading
  the outer loop variable instead of the local bytes key)

apps/proxy/ts_proxy/server.py
- Replace stale b'init_time', b'total_bytes', b'state' byte-string
  key lookups and .decode() calls with plain string equivalents

apps/proxy/ts_proxy/services/channel_service.py
- Fix ChannelMetadataField.STATE.encode() / .OWNER.encode() →
  .STATE / .OWNER (pre-existing, broke under decoded client)

apps/proxy/ts_proxy/views.py
- Fix ChannelMetadataField.OWNER.encode("utf-8") → .OWNER

apps/proxy/ts_proxy/client_manager.py
- Fix cid.decode('utf-8') in remove_ghost_clients(): smembers()
  already returns str with decode_responses=True
---
 apps/channels/tasks.py                        |   2 +-
 apps/proxy/ts_proxy/client_manager.py         |   3 +-
 apps/proxy/ts_proxy/server.py                 |  10 +-
 .../ts_proxy/services/channel_service.py      |   8 +-
 apps/proxy/ts_proxy/views.py                  |   2 +-
 apps/proxy/utils.py                           | 108 ++++++++---------
 core/utils.py                                 | 109 ++++++------------
 debug_redis_check.py                          |  21 ++++
 8 files changed, 114 insertions(+), 149 deletions(-)
 create mode 100644 debug_redis_check.py

diff --git a/apps/channels/tasks.py b/apps/channels/tasks.py
index 52956d53..59122d9f 100755
--- a/apps/channels/tasks.py
+++ b/apps/channels/tasks.py
@@ -2494,7 +2494,7 @@ def run_recording(recording_id, channel_id, start_time_str, end_time_str):
                 md = r.hgetall(metadata_key)
                 if md:
                     def _d(bkey, cast=str):
-                        v = md.get(key)
+                        v = md.get(bkey)
                         try:
                             if v is None:
                                 return None
diff --git a/apps/proxy/ts_proxy/client_manager.py b/apps/proxy/ts_proxy/client_manager.py
index e2cfd460..e1c92256 100644
--- a/apps/proxy/ts_proxy/client_manager.py
+++ b/apps/proxy/ts_proxy/client_manager.py
@@ -428,8 +428,7 @@ class ClientManager:
         client_id_list = list(client_ids)
         pipe = redis_client.pipeline()
         for cid in client_id_list:
-            cid_str = cid.decode('utf-8')
-            pipe.exists(RedisKeys.client_metadata(channel_id, cid_str))
+            pipe.exists(RedisKeys.client_metadata(channel_id, cid))
         results = pipe.execute()
 
         stale_ids = [
diff --git a/apps/proxy/ts_proxy/server.py b/apps/proxy/ts_proxy/server.py
index b3449693..5316ec58 100644
--- a/apps/proxy/ts_proxy/server.py
+++ b/apps/proxy/ts_proxy/server.py
@@ -940,14 +940,14 @@ class ProxyServer:
                         metadata = self.redis_client.hgetall(metadata_key)
                         if metadata:
                             # Calculate runtime from init_time
-                            if b'init_time' in metadata:
+                            if 'init_time' in metadata:
                                 try:
                                     init_time = float(metadata['init_time'])
                                     runtime = round(time.time() - init_time, 2)
                                 except Exception:
                                     pass
                             # Get total bytes transferred
-                            if b'total_bytes' in metadata:
+                            if 'total_bytes' in metadata:
                                 try:
                                     total_bytes = int(metadata['total_bytes'])
                                 except Exception:
@@ -1113,9 +1113,9 @@ class ProxyServer:
 
                                     # Also get init time as a fallback
                                     init_time = None
-                                    if metadata and b'init_time' in metadata:
+                                    if metadata and 'init_time' in metadata:
                                         try:
-                                            init_time = float(metadata[b'init_time'])
+                                            init_time = float(metadata['init_time'])
                                         except (ValueError, TypeError):
                                             pass
 
@@ -1400,7 +1400,7 @@ class ProxyServer:
                         real_count = max(0, client_count - len(stale_ids))
                         if real_count <= 0:
                             # No real clients remain — safe to clean up.
-                            state = metadata.get(b'state', b'unknown').decode('utf-8') if b'state' in metadata else 'unknown'
+                            state = metadata.get('state', 'unknown')
                             logger.warning(
                                 f"Orphaned channel {channel_id} (state: {state}, "
                                 f"owner: {owner}) had {client_count} ghost client(s) "
diff --git a/apps/proxy/ts_proxy/services/channel_service.py b/apps/proxy/ts_proxy/services/channel_service.py
index 0a0945d6..d0478e8f 100644
--- a/apps/proxy/ts_proxy/services/channel_service.py
+++ b/apps/proxy/ts_proxy/services/channel_service.py
@@ -382,8 +382,8 @@ class ChannelService:
             metadata = proxy_server.redis_client.hgetall(metadata_key)
 
             # Extract state and owner
-            state = metadata.get(ChannelMetadataField.STATE.encode(), 'unknown')
-            owner = metadata.get(ChannelMetadataField.OWNER.encode(), 'unknown')
+            state = metadata.get(ChannelMetadataField.STATE, 'unknown')
+            owner = metadata.get(ChannelMetadataField.OWNER, 'unknown')
 
             # Valid states indicate channel is running properly
             valid_states = [ChannelState.ACTIVE, ChannelState.WAITING_FOR_CLIENTS, ChannelState.CONNECTING]
@@ -432,13 +432,13 @@ class ChannelService:
         try:
             # Use factory to parse the line based on stream type
             parsed_data = LogParserFactory.parse(stream_type, stream_info_line)
-            
+
             if not parsed_data:
                 return
 
             # Update Redis and database with parsed data
             ChannelService._update_stream_info_in_redis(
-                channel_id, 
+                channel_id,
                 parsed_data.get('video_codec'),
                 parsed_data.get('resolution'),
                 parsed_data.get('width'),
diff --git a/apps/proxy/ts_proxy/views.py b/apps/proxy/ts_proxy/views.py
index fabc1053..d94a03cf 100644
--- a/apps/proxy/ts_proxy/views.py
+++ b/apps/proxy/ts_proxy/views.py
@@ -127,7 +127,7 @@ def stream_ts(request, channel_id, user=None):
                         )
                     # Unknown/empty state - check if owner is alive
                     else:
-                        owner_field = ChannelMetadataField.OWNER.encode("utf-8")
+                        owner_field = ChannelMetadataField.OWNER
                         if owner_field in metadata:
                             owner = metadata[owner_field]
                             owner_heartbeat_key = f"ts_proxy:worker:{owner}:heartbeat"
diff --git a/apps/proxy/utils.py b/apps/proxy/utils.py
index 0ea1bd27..1c71b5cd 100644
--- a/apps/proxy/utils.py
+++ b/apps/proxy/utils.py
@@ -11,7 +11,7 @@ def attempt_stream_termination(user_id, requesting_client_id, active_connections
     try:
         logger.info("[stream limits]" f"[{requesting_client_id}] User {user_id} has {len(active_connections)} active connections, checking termination candidates")
 
-        user_limit_settings = CoreSettings.get_user_limit_settings()
+        user_limit_settings = CoreSettings.get_user_limits_settings()
         terminate_oldest = user_limit_settings.get("terminate_oldest", True)
         prioritize_single = user_limit_settings.get("prioritize_single_client_channels", True)
         ignore_same_channel = user_limit_settings.get("ignore_same_channel_connections", False)
@@ -79,74 +79,58 @@ def get_user_active_connections(user_id):
     connections = []
 
     try:
-        cursor = 0
-
         # Grab live streams
-        while True:
-            cursor, keys = redis_client.scan(cursor=cursor, match="ts_proxy:channel:*:clients:*", count=1000)
+        for key in redis_client.scan_iter(match="ts_proxy:channel:*:clients:*", count=1000):
+            parts = key.split(':')
+            if len(parts) >= 5:
+                channel_id = parts[2]
+                client_id = parts[4]
 
-            for key in keys:
-                parts = key.split(':')
-                if len(parts) >= 5:
-                    channel_id = parts[2]
-                    client_id = parts[4]
+                client_user_id = redis_client.hget(key, 'user_id')
+                connected_at = redis_client.hget(key, 'connected_at')
 
-                    client_user_id = redis_client.hget(key, 'user_id')
-                    connected_at = redis_client.hget(key, 'connected_at')
+                logger.info(f"[stream limits] user_id = {user_id}")
+                logger.info(f"[stream limits] channel_id = {channel_id}")
+                logger.info(f"[stream limits] client_id = {client_id}")
 
-                    logger.info(f"[stream limits] user_id = {user_id}")
-                    logger.info(f"[stream limits] channel_id = {channel_id}")
-                    logger.info(f"[stream limits] client_id = {client_id}")
-
-                    if client_user_id and int(client_user_id) == user_id:
-                        try:
-                            logger.info(f"[stream limits] Found LIVE connection for user {user_id} on channel {channel_id} with client ID {client_id}")
-                            connected_at = float(connected_at) if connected_at else 0
-                            connections.append({
-                                'media_id': channel_id,
-                                'client_id': client_id,
-                                'connected_at': connected_at,
-                                'type': 'live',
-                            })
-                        except (ValueError, TypeError):
-                            pass
-
-            if cursor == 0:
-                break
-
-
-        cursor = 0
+                if client_user_id and int(client_user_id) == user_id:
+                    try:
+                        logger.info(f"[stream limits] Found LIVE connection for user {user_id} on channel {channel_id} with client ID {client_id}")
+                        connected_at = float(connected_at) if connected_at else 0
+                        connections.append({
+                            'media_id': channel_id,
+                            'client_id': client_id,
+                            'connected_at': connected_at,
+                            'type': 'live',
+                        })
+                    except (ValueError, TypeError):
+                        pass
 
         # Grab VOD
-        while True:
-            cursor, keys = redis_client.scan(cursor=cursor, match="vod_persistent_connections:*", count=1000)
+        for key in redis_client.scan_iter(match="vod_persistent_connection:*", count=1000):
+            parts = key.split(':')
+            if len(parts) >= 2:
+                client_id = parts[1]
 
-            for key in keys:
-                parts = key.split(':')
-                if len(parts) >= 2:
-                    client_id = parts[1]
+                client_user_id = redis_client.hget(key, 'user_id')
+                connected_at = redis_client.hget(key, 'created_at')
+                content_uuid = redis_client.hget(key, 'content_uuid')
 
-                    client_user_id = redis_client.hget(key, 'user_id')
-                    connected_at = redis_client.hget(key, 'created_at')
+                logger.info(f"[stream limits] user_id = {user_id}")
+                logger.info(f"[stream limits] client_id = {client_id}")
 
-                    logger.info(f"[stream limits] user_id = {user_id}")
-                    logger.info(f"[stream limits] client_id = {client_id}")
-
-                    if client_user_id and int(client_user_id) == user_id:
-                        try:
-                            logger.info(f"[stream limits] Found VOD connection for user {user_id} on channel {channel_id} with client ID {client_id}")
-                            connected_at = float(connected_at) if connected_at else 0
-                            connections.append({
-                                'media_id': channel_id,
-                                'client_id': client_id,
-                                'connected_at': connected_at,
-                                'type': 'vod',
-                            })
-                        except (ValueError, TypeError):
-                            pass
-
-            if cursor == 0:
-                break
+                if client_user_id and int(client_user_id) == user_id:
+                    try:
+                        logger.info(f"[stream limits] Found VOD connection for user {user_id} on content {content_uuid} with client ID {client_id}")
+                        connected_at = float(connected_at) if connected_at else 0
+                        connections.append({
+                            'media_id': content_uuid or client_id,
+                            'client_id': client_id,
+                            'connected_at': connected_at,
+                            'type': 'vod',
+                        })
+                    except (ValueError, TypeError):
+                        pass
 
         return connections
 
@@ -159,14 +143,12 @@ def check_user_stream_limits(user, client_id):
     # Check user stream limits
     if user and user.stream_limit > 0:
         logger.info("[stream limits]" f"[{client_id}] User {user.username} (ID: {user.id}) is requesting a stream (stream_limit: {user.stream_limit})")
-        user_limit_settings = CoreSettings.get_user_limit_settings()
+        user_limit_settings = CoreSettings.get_user_limits_settings()
 
         active_connections = get_user_active_connections(user.id)
         unique_channel_count = set([conn['media_id'] for conn in active_connections])
         user_stream_count = len(unique_channel_count) if user_limit_settings.get("ignore_same_channel_connections", False) else len(active_connections)
 
-        print(active_connections)
-
         logger.info(f"[stream limits]" f"[{client_id}] User {user.username} currently has {len(active_connections)} active connections across {len(unique_channel_count)} unique channels (counting method: {'unique channels' if user_limit_settings.get('ignore_same_channel_connections', False) else 'total connections'})")
 
         if user.stream_limit > 0 and user_stream_count >= user.stream_limit:
diff --git a/core/utils.py b/core/utils.py
index 4d65aa91..583075c3 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -57,6 +57,8 @@ class RedisClient:
                 redis_host = os.environ.get("REDIS_HOST", getattr(settings, 'REDIS_HOST', 'localhost'))
                 redis_port = int(os.environ.get("REDIS_PORT", getattr(settings, 'REDIS_PORT', 6379)))
                 redis_db = int(os.environ.get("REDIS_DB", getattr(settings, 'REDIS_DB', 0)))
+                redis_password = os.environ.get("REDIS_PASSWORD", getattr(settings, 'REDIS_PASSWORD', ''))
+                redis_user = os.environ.get("REDIS_USER", getattr(settings, 'REDIS_USER', ''))
 
                 # Use standardized settings
                 socket_timeout = getattr(settings, 'REDIS_SOCKET_TIMEOUT', 5)
@@ -65,17 +67,23 @@ class RedisClient:
                 socket_keepalive = getattr(settings, 'REDIS_SOCKET_KEEPALIVE', True)
                 retry_on_timeout = getattr(settings, 'REDIS_RETRY_ON_TIMEOUT', True)
 
+                # TLS params from settings (empty dict when TLS is disabled)
+                ssl_params = getattr(settings, 'REDIS_SSL_PARAMS', {})
+
                 # Create Redis client with better defaults
                 client = redis.Redis(
                     host=redis_host,
                     port=redis_port,
                     db=redis_db,
+                    password=redis_password if redis_password else None,
+                    username=redis_user if redis_user else None,
                     socket_timeout=socket_timeout,
                     socket_connect_timeout=socket_connect_timeout,
                     socket_keepalive=socket_keepalive,
                     health_check_interval=health_check_interval,
                     retry_on_timeout=retry_on_timeout,
-                    decode_responses=decode_responses
+                    decode_responses=decode_responses,
+                    **ssl_params
                 )
 
                 # Validate connection with ping
@@ -87,84 +95,34 @@ class RedisClient:
                     client.config_set('save', '')  # Disable RDB snapshots
                     client.config_set('appendonly', 'no')  # Disable AOF logging
 
-                    # Set optimal memory settings with environment variable support
-                    # Get max memory from environment or use a larger default (512MB instead of 256MB)
-                    #max_memory = os.environ.get('REDIS_MAX_MEMORY', '512mb')
-                    #eviction_policy = os.environ.get('REDIS_EVICTION_POLICY', 'allkeys-lru')
-
-                    # TLS params from settings (empty dict when TLS is disabled)
-                    ssl_params = getattr(settings, 'REDIS_SSL_PARAMS', {})
-
-                    # Create Redis client with better defaults
-                    client = redis.Redis(
-                        host=redis_host,
-                        port=redis_port,
-                        db=redis_db,
-                        password=redis_password if redis_password else None,
-                        username=redis_user if redis_user else None,
-                        socket_timeout=socket_timeout,
-                        socket_connect_timeout=socket_connect_timeout,
-                        socket_keepalive=socket_keepalive,
-                        health_check_interval=health_check_interval,
-                        retry_on_timeout=retry_on_timeout,
-                        decode_responses=decode_responses,
-                        **ssl_params
-                    )
-
-                    #logger.info(f"Redis configured with maxmemory={max_memory}, policy={eviction_policy}")
-
                     # Disable protected mode when in debug mode
                     if os.environ.get('DISPATCHARR_DEBUG', '').lower() == 'true':
                         client.config_set('protected-mode', 'no')  # Disable protected mode in debug
                         logger.warning("Redis protected mode disabled for debug environment")
 
-                        # Set optimal memory settings with environment variable support
-                        # Get max memory from environment or use a larger default (512MB instead of 256MB)
-                        #max_memory = os.environ.get('REDIS_MAX_MEMORY', '512mb')
-                        #eviction_policy = os.environ.get('REDIS_EVICTION_POLICY', 'allkeys-lru')
-
-                        # Apply memory settings
-                        #client.config_set('maxmemory-policy', eviction_policy)
-                        #client.config_set('maxmemory', max_memory)
-
-                        #logger.info(f"Redis configured with maxmemory={max_memory}, policy={eviction_policy}")
-
-                        # Disable protected mode when in debug mode
-                        if os.environ.get('DISPATCHARR_DEBUG', '').lower() == 'true':
-                            client.config_set('protected-mode', 'no')  # Disable protected mode in debug
-                            logger.warning("Redis protected mode disabled for debug environment")
-
-                        logger.trace("Redis persistence disabled for better performance")
-                    except redis.exceptions.ResponseError as e:
-                        # Improve error handling for Redis configuration errors
-                        if "OOM" in str(e):
-                            logger.error(f"Redis OOM during configuration: {e}")
-                            # Try to increase maxmemory as an emergency measure
-                            try:
-                                client.config_set('maxmemory', '768mb')
-                                logger.warning("Applied emergency Redis memory increase to 768MB")
-                            except:
-                                pass
-                        else:
-                            logger.error(f"Redis configuration error: {e}")
-
-                    logger.info(f"Connected to Redis at {redis_host}:{redis_port}/{redis_db}")
-
-                    cls._client = client
-                    break
-
-                except (ConnectionError, TimeoutError) as e:
-                    retry_count += 1
-                    _tls_hint = _REDIS_TLS_HINT if ssl_params else ""
-                    if retry_count >= max_retries:
-                        logger.error(f"Failed to connect to Redis after {max_retries} attempts: {e}{_tls_hint}")
-                        return None
+                    logger.trace("Redis persistence disabled for better performance")
+                except redis.exceptions.ResponseError as e:
+                    # Improve error handling for Redis configuration errors
+                    if "OOM" in str(e):
+                        logger.error(f"Redis OOM during configuration: {e}")
+                        # Try to increase maxmemory as an emergency measure
+                        try:
+                            client.config_set('maxmemory', '768mb')
+                            logger.warning("Applied emergency Redis memory increase to 768MB")
+                        except:
+                            pass
                     else:
                         logger.error(f"Redis configuration error: {e}")
 
-                except Exception as e:
-                    _tls_hint = _REDIS_TLS_HINT if ssl_params else ""
-                    logger.error(f"Unexpected error connecting to Redis: {e}{_tls_hint}")
+                logger.info(f"Connected to Redis at {redis_host}:{redis_port}/{redis_db}")
+
+                return client
+
+            except (ConnectionError, TimeoutError) as e:
+                retry_count += 1
+                _tls_hint = _REDIS_TLS_HINT if ssl_params else ""
+                if retry_count >= max_retries:
+                    logger.error(f"Failed to connect to Redis after {max_retries} attempts: {e}{_tls_hint}")
                     return None
                 else:
                     # Use exponential backoff for retries
@@ -173,10 +131,15 @@ class RedisClient:
                     time.sleep(wait_time)
 
             except Exception as e:
-                logger.error(f"Unexpected error connecting to Redis: {e}")
+                _tls_hint = ""
+                try:
+                    _tls_hint = _REDIS_TLS_HINT if ssl_params else ""
+                except NameError:
+                    pass
+                logger.error(f"Unexpected error connecting to Redis: {e}{_tls_hint}")
                 return None
 
-        return client
+        return None
 
     @classmethod
     def get_client(cls, max_retries=5, retry_interval=1):
diff --git a/debug_redis_check.py b/debug_redis_check.py
new file mode 100644
index 00000000..9deab6d4
--- /dev/null
+++ b/debug_redis_check.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+import os, sys
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dispatcharr.settings')
+import django
+django.setup()
+
+from core.utils import RedisClient
+
+r = RedisClient.get_client()
+print(f"Client: {r}")
+print(f"decode_responses: {r.connection_pool.connection_kwargs.get('decode_responses')}")
+
+keys = list(r.scan_iter(match='ts_proxy:channel:*:metadata', count=100))
+print(f"Found {len(keys)} metadata keys")
+for k in keys[:3]:
+    print(f"  Key: {k!r}")
+    data = r.hgetall(k)
+    field_names = list(data.keys())[:8]
+    print(f"  Fields ({len(data)} total): {field_names}")
+    state = data.get('state', 'MISSING')
+    print(f"  state={state!r}")

From 58befaa52bc3f55f5180c6b4ce4f7c07575c1cc1 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 26 Mar 2026 19:14:46 -0500
Subject: [PATCH 081/172] fix: correct indentation in check_user_stream_limits
 function

---
 apps/proxy/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/proxy/utils.py b/apps/proxy/utils.py
index 1c71b5cd..fd4e88f2 100644
--- a/apps/proxy/utils.py
+++ b/apps/proxy/utils.py
@@ -164,4 +164,4 @@ def check_user_stream_limits(user, client_id):
                 if not attempt_stream_termination(user.id, client_id, active_connections):
                     return False
 
-        return True
+    return True

From aa6fb033d30c39fac6137b8afa9e3d51e8a04bec Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 26 Mar 2026 20:02:54 -0500
Subject: [PATCH 082/172] fix: update user stream limit checks to include
 media_id and rename user_limits_settings key

---
 apps/proxy/ts_proxy/views.py  |  3 +--
 apps/proxy/utils.py           | 22 ++++++++++++++++------
 apps/proxy/vod_proxy/views.py |  2 +-
 core/models.py                |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/apps/proxy/ts_proxy/views.py b/apps/proxy/ts_proxy/views.py
index d94a03cf..64f73664 100644
--- a/apps/proxy/ts_proxy/views.py
+++ b/apps/proxy/ts_proxy/views.py
@@ -73,7 +73,7 @@ def stream_ts(request, channel_id, user=None):
                 break
 
         if user:
-            if not check_user_stream_limits(user, client_id):
+            if not check_user_stream_limits(user, client_id, media_id=channel_id):
                 return JsonResponse(
                     {"error": f"Stream limit exceeded ({user.stream_limit} concurrent streams allowed)"},
                     status=429
@@ -565,7 +565,6 @@ def stream_xc(request, username, password, channel_id):
     if custom_properties["xc_password"] != password:
         return Response({"error": "Invalid credentials"}, status=401)
 
-    print(f"Fetchin channel with ID: {channel_id}")
     if user.user_level < 10:
         user_profile_count = user.channel_profiles.count()
 
diff --git a/apps/proxy/utils.py b/apps/proxy/utils.py
index fd4e88f2..21097da6 100644
--- a/apps/proxy/utils.py
+++ b/apps/proxy/utils.py
@@ -139,26 +139,36 @@ def get_user_active_connections(user_id):
         return []
 
 
-def check_user_stream_limits(user, client_id):
+def check_user_stream_limits(user, client_id, media_id=None):
     # Check user stream limits
     if user and user.stream_limit > 0:
         logger.info("[stream limits]" f"[{client_id}] User {user.username} (ID: {user.id}) is requesting a stream (stream_limit: {user.stream_limit})")
         user_limit_settings = CoreSettings.get_user_limits_settings()
+        ignore_same_channel = user_limit_settings.get("ignore_same_channel_connections", False)
 
         active_connections = get_user_active_connections(user.id)
         unique_channel_count = set([conn['media_id'] for conn in active_connections])
-        user_stream_count = len(unique_channel_count) if user_limit_settings.get("ignore_same_channel_connections", False) else len(active_connections)
+        user_stream_count = len(unique_channel_count) if ignore_same_channel else len(active_connections)
 
-        logger.info(f"[stream limits]" f"[{client_id}] User {user.username} currently has {len(active_connections)} active connections across {len(unique_channel_count)} unique channels (counting method: {'unique channels' if user_limit_settings.get('ignore_same_channel_connections', False) else 'total connections'})")
+        logger.info(f"[stream limits]" f"[{client_id}] User {user.username} currently has {len(active_connections)} active connections across {len(unique_channel_count)} unique channels (counting method: {'unique channels' if ignore_same_channel else 'total connections'})")
 
-        if user.stream_limit > 0 and user_stream_count >= user.stream_limit:
+        # If ignore_same_channel is enabled and this request is for a live channel the user
+        # is already watching, allow it through without counting against the limit.
+        # VOD is excluded: connections aren't shared so multiple VOD connections to the
+        # same content would mean multiple upstream connections.
+        live_channel_ids = {str(conn['media_id']) for conn in active_connections if conn['type'] == 'live'}
+        if ignore_same_channel and media_id and str(media_id) in live_channel_ids:
+            logger.info(f"[stream limits][{client_id}] Same-channel reconnect for {media_id} allowed (ignore_same_channel=True)")
+            return True
+
+        if user_stream_count >= user.stream_limit:
             if user_limit_settings.get("terminate_on_limit_exceeded", True) == False:
                 return False
 
-            if len(active_connections) >= user.stream_limit:
+            if user_stream_count >= user.stream_limit:
                 logger.warning("[stream limits]"
                     f"[{client_id}] User {user.username} (ID: {user.id}) has reached stream limit "
-                    f"({len(active_connections)}/{user.stream_limit} channels), attempting to free up slot"
+                    f"({user_stream_count}/{user.stream_limit} streams), attempting to free up slot"
                 )
 
                 if not attempt_stream_termination(user.id, client_id, active_connections):
diff --git a/apps/proxy/vod_proxy/views.py b/apps/proxy/vod_proxy/views.py
index 14e1b631..d7250bcf 100644
--- a/apps/proxy/vod_proxy/views.py
+++ b/apps/proxy/vod_proxy/views.py
@@ -411,7 +411,7 @@ def stream_vod(request, content_type, content_id, session_id=None, profile_id=No
             )
 
         if user:
-            if not check_user_stream_limits(user, session_id):
+            if not check_user_stream_limits(user, session_id, media_id=content_id):
                 return JsonResponse(
                     {"error": f"Stream limit exceeded ({user.stream_limit} concurrent streams allowed)"},
                     status=429
diff --git a/core/models.py b/core/models.py
index 83b58495..a1526e73 100644
--- a/core/models.py
+++ b/core/models.py
@@ -156,7 +156,7 @@ PROXY_SETTINGS_KEY = "proxy_settings"
 NETWORK_ACCESS_KEY = "network_access"
 SYSTEM_SETTINGS_KEY = "system_settings"
 EPG_SETTINGS_KEY = "epg_settings"
-USER_LIMITS_SETTINGS_KEY = "user_limits_settings"
+USER_LIMITS_SETTINGS_KEY = "user_limits"
 
 
 class CoreSettings(models.Model):

From 46d406352443c974ae3e47f787aed525ab3121a7 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 26 Mar 2026 20:10:03 -0500
Subject: [PATCH 083/172] fix: change logging level from info to debug in user
 connection checks

---
 apps/proxy/utils.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/proxy/utils.py b/apps/proxy/utils.py
index 21097da6..4dbb2551 100644
--- a/apps/proxy/utils.py
+++ b/apps/proxy/utils.py
@@ -89,13 +89,13 @@ def get_user_active_connections(user_id):
                 client_user_id = redis_client.hget(key, 'user_id')
                 connected_at = redis_client.hget(key, 'connected_at')
 
-                logger.info(f"[stream limits] user_id = {user_id}")
-                logger.info(f"[stream limits] channel_id = {channel_id}")
-                logger.info(f"[stream limits] client_id = {client_id}")
+                logger.debug(f"[stream limits] user_id = {user_id}")
+                logger.debug(f"[stream limits] channel_id = {channel_id}")
+                logger.debug(f"[stream limits] client_id = {client_id}")
 
                 if client_user_id and int(client_user_id) == user_id:
                     try:
-                        logger.info(f"[stream limits] Found LIVE connection for user {user_id} on channel {channel_id} with client ID {client_id}")
+                        logger.debug(f"[stream limits] Found LIVE connection for user {user_id} on channel {channel_id} with client ID {client_id}")
                         connected_at = float(connected_at) if connected_at else 0
                         connections.append({
                             'media_id': channel_id,
@@ -116,12 +116,12 @@ def get_user_active_connections(user_id):
                 connected_at = redis_client.hget(key, 'created_at')
                 content_uuid = redis_client.hget(key, 'content_uuid')
 
-                logger.info(f"[stream limits] user_id = {user_id}")
-                logger.info(f"[stream limits] client_id = {client_id}")
+                logger.debug(f"[stream limits] user_id = {user_id}")
+                logger.debug(f"[stream limits] client_id = {client_id}")
 
                 if client_user_id and int(client_user_id) == user_id:
                     try:
-                        logger.info(f"[stream limits] Found VOD connection for user {user_id} on content {content_uuid} with client ID {client_id}")
+                        logger.debug(f"[stream limits] Found VOD connection for user {user_id} on content {content_uuid} with client ID {client_id}")
                         connected_at = float(connected_at) if connected_at else 0
                         connections.append({
                             'media_id': content_uuid or client_id,
@@ -142,7 +142,7 @@ def get_user_active_connections(user_id):
 def check_user_stream_limits(user, client_id, media_id=None):
     # Check user stream limits
     if user and user.stream_limit > 0:
-        logger.info("[stream limits]" f"[{client_id}] User {user.username} (ID: {user.id}) is requesting a stream (stream_limit: {user.stream_limit})")
+        logger.debug("[stream limits]" f"[{client_id}] User {user.username} (ID: {user.id}) is requesting a stream (stream_limit: {user.stream_limit})")
         user_limit_settings = CoreSettings.get_user_limits_settings()
         ignore_same_channel = user_limit_settings.get("ignore_same_channel_connections", False)
 
@@ -150,7 +150,7 @@ def check_user_stream_limits(user, client_id, media_id=None):
         unique_channel_count = set([conn['media_id'] for conn in active_connections])
         user_stream_count = len(unique_channel_count) if ignore_same_channel else len(active_connections)
 
-        logger.info(f"[stream limits]" f"[{client_id}] User {user.username} currently has {len(active_connections)} active connections across {len(unique_channel_count)} unique channels (counting method: {'unique channels' if ignore_same_channel else 'total connections'})")
+        logger.debug(f"[stream limits]" f"[{client_id}] User {user.username} currently has {len(active_connections)} active connections across {len(unique_channel_count)} unique channels (counting method: {'unique channels' if ignore_same_channel else 'total connections'})")
 
         # If ignore_same_channel is enabled and this request is for a live channel the user
         # is already watching, allow it through without counting against the limit.
@@ -158,7 +158,7 @@ def check_user_stream_limits(user, client_id, media_id=None):
         # same content would mean multiple upstream connections.
         live_channel_ids = {str(conn['media_id']) for conn in active_connections if conn['type'] == 'live'}
         if ignore_same_channel and media_id and str(media_id) in live_channel_ids:
-            logger.info(f"[stream limits][{client_id}] Same-channel reconnect for {media_id} allowed (ignore_same_channel=True)")
+            logger.debug(f"[stream limits][{client_id}] Same-channel reconnect for {media_id} allowed (ignore_same_channel=True)")
             return True
 
         if user_stream_count >= user.stream_limit:

From 7e6041286a42e72fafe4cf88d46353b5907621a7 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 26 Mar 2026 20:16:16 -0500
Subject: [PATCH 084/172] fix: update user limit settings key in migration and
 frontend form for consistency with other settings keys.

---
 core/migrations/022_default_user_limit_settings.py        | 4 ++--
 core/models.py                                            | 2 +-
 frontend/src/components/forms/settings/UserLimitsForm.jsx | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/migrations/022_default_user_limit_settings.py b/core/migrations/022_default_user_limit_settings.py
index af758a11..4c2b3c33 100644
--- a/core/migrations/022_default_user_limit_settings.py
+++ b/core/migrations/022_default_user_limit_settings.py
@@ -7,8 +7,8 @@ from django.utils.text import slugify
 def preload_user_limit_settings(apps, schema_editor):
     CoreSettings = apps.get_model("core", "CoreSettings")
     CoreSettings.objects.create(
-        key="user_limits",
-        name="User Limits",
+        key="user_limit_settings",
+        name="User Limit Settings",
         value={},
     )
 
diff --git a/core/models.py b/core/models.py
index a1526e73..5e86e98f 100644
--- a/core/models.py
+++ b/core/models.py
@@ -156,7 +156,7 @@ PROXY_SETTINGS_KEY = "proxy_settings"
 NETWORK_ACCESS_KEY = "network_access"
 SYSTEM_SETTINGS_KEY = "system_settings"
 EPG_SETTINGS_KEY = "epg_settings"
-USER_LIMITS_SETTINGS_KEY = "user_limits"
+USER_LIMITS_SETTINGS_KEY = "user_limit_settings"
 
 
 class CoreSettings(models.Model):
diff --git a/frontend/src/components/forms/settings/UserLimitsForm.jsx b/frontend/src/components/forms/settings/UserLimitsForm.jsx
index 3481a7db..b6a9ed5e 100644
--- a/frontend/src/components/forms/settings/UserLimitsForm.jsx
+++ b/frontend/src/components/forms/settings/UserLimitsForm.jsx
@@ -37,10 +37,10 @@ const UserLimitsForm = React.memo(({ active }) => {
 
   useEffect(() => {
     if (settings) {
-      if (settings['user_limits']?.value) {
+      if (settings['user_limit_settings']?.value) {
         userLimitSettingsForm.setValues({
           ...USER_LIMIT_DEFAULTS,
-          ...settings['user_limits'].value,
+          ...settings['user_limit_settings'].value,
         });
       }
     }
@@ -55,7 +55,7 @@ const UserLimitsForm = React.memo(({ active }) => {
 
     try {
       const result = await updateSetting({
-        ...settings['user_limits'],
+        ...settings['user_limit_settings'],
         value: userLimitSettingsForm.getValues(),
       });
       if (result) {

From 7964b2c2cb07e94292bf272fb301c09bf541a52b Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 26 Mar 2026 20:33:03 -0500
Subject: [PATCH 085/172] fix: enhance stream termination logic to handle
 multiple connections on the same channel

---
 apps/proxy/utils.py | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/apps/proxy/utils.py b/apps/proxy/utils.py
index 4dbb2551..6503d1df 100644
--- a/apps/proxy/utils.py
+++ b/apps/proxy/utils.py
@@ -47,27 +47,35 @@ def attempt_stream_termination(user_id, requesting_client_id, active_connections
             f"on media {target['media_id']} (connected_at={target['connected_at']})"
         )
 
-        if target['type'] == 'live':
-            result = ChannelService.stop_client(target['media_id'], target['client_id'])
-            if result.get("status") == "error":
-                return False
-        else:
-            connection_manager = MultiWorkerVODConnectionManager.get_instance()
-            redis_client = connection_manager.redis_client
+        # When counting by unique channel, freeing one connection from a multi-connection
+        # channel doesn't free a slot — terminate all connections to that channel so the
+        # unique-channel count actually drops by one.
+        targets = (
+            [c for c in active_connections if c['media_id'] == target['media_id']]
+            if ignore_same_channel
+            else [target]
+        )
 
-            if not redis_client:
-                return False
+        for t in targets:
+            if t['type'] == 'live':
+                result = ChannelService.stop_client(t['media_id'], t['client_id'])
+                if result.get("status") == "error":
+                    logger.warning(f"[stream limits][{requesting_client_id}] Failed to stop client {t['client_id']} on channel {t['media_id']}")
+            else:
+                connection_manager = MultiWorkerVODConnectionManager.get_instance()
+                redis_client = connection_manager.redis_client
 
-            # Check if connection exists
-            connection_key = f"vod_persistent_connection:{target['client_id']}"
-            connection_data = redis_client.hgetall(connection_key)
-            if not connection_data:
-                logger.warning(f"VOD connection not found: {target['client_id']}")
-                return False
+                if not redis_client:
+                    return False
 
-            # Set a stop signal key that the worker will check
-            stop_key = get_vod_client_stop_key(target['client_id'])
-            redis_client.setex(stop_key, 60, "true")  # 60 second TTL
+                connection_key = f"vod_persistent_connection:{t['client_id']}"
+                connection_data = redis_client.hgetall(connection_key)
+                if not connection_data:
+                    logger.warning(f"VOD connection not found: {t['client_id']}")
+                    continue
+
+                stop_key = get_vod_client_stop_key(t['client_id'])
+                redis_client.setex(stop_key, 60, "true")  # 60 second TTL
 
         return True
     except Exception as e:

From 8e9a6285a4692f5e8372afdd232cb4aff52ccd7b Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 26 Mar 2026 21:16:18 -0500
Subject: [PATCH 086/172] Enhancement: Donate button added to the sidebar
 footer. A heart icon links to the project's Open Collective page, visible in
 both expanded and collapsed states. Hovering shows a "Support Dispatcharr"
 tooltip. The version string is also now clickable to copy it to the
 clipboard.

---
 CHANGELOG.md                        |  1 +
 frontend/src/components/Sidebar.jsx | 71 +++++++++++++++++++++++------
 2 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58a41e3d..36657d3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Donate button added to the sidebar footer. A heart icon links to the project's Open Collective page, visible in both expanded and collapsed states. Hovering shows a "Support Dispatcharr" tooltip. The version string is also now clickable to copy it to the clipboard.
 - TLS and mutual TLS (mTLS) support for Redis and PostgreSQL connections in modular deployments. Supports encrypted connections, server certificate verification (Redis: on/off; PostgreSQL: verify-full, verify-ca, require), CA certificate configuration, and client certificate authentication. Configured via environment variables in the docker compose file. Includes startup validation for certificate paths and TLS/URL scheme conflicts, and a read-only Connection Security panel in System Settings. (Closes #950) — Thanks [@CodeBormen](https://github.com/CodeBormen)
 - Status filter for M3U group and VOD category filter modals: A new **All / Enabled / Disabled** segmented control is now shown alongside the text search input in the Live, VOD - Movies, and VOD - Series tabs of the M3U Group Filter modal. The status filter works in combination with the text search and also scopes the "Select Visible" / "Deselect Visible" buttons so they only act on the currently visible subset. (Closes #312)
 
diff --git a/frontend/src/components/Sidebar.jsx b/frontend/src/components/Sidebar.jsx
index 73ee13c3..f5332d3a 100644
--- a/frontend/src/components/Sidebar.jsx
+++ b/frontend/src/components/Sidebar.jsx
@@ -1,12 +1,7 @@
 import React, { useRef, useState, useMemo } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import { copyToClipboard } from '../utils';
-import {
-  Copy,
-  LogOut,
-  ChevronDown,
-  ChevronRight,
-} from 'lucide-react';
+import { Copy, LogOut, ChevronDown, ChevronRight, Heart } from 'lucide-react';
 import { getOrderedNavItems } from '../config/navigation';
 import {
   Avatar,
@@ -19,6 +14,7 @@ import {
   ActionIcon,
   AppShellNavbar,
   ScrollArea,
+  Tooltip,
 } from '@mantine/core';
 import logo from '../images/logo.png';
 import useChannelsStore from '../store/channels';
@@ -29,6 +25,21 @@ import { USER_LEVELS } from '../constants';
 import UserForm from './forms/User';
 import NotificationCenter from './NotificationCenter';
 
+const DonateButton = ({ tooltipPosition = 'top' }) => (
+  <Tooltip label="Support Dispatcharr" position={tooltipPosition}>
+    <ActionIcon
+      component="a"
+      href="https://opencollective.com/dispatcharr/contribute"
+      target="_blank"
+      rel="noopener noreferrer"
+      variant="transparent"
+      color="pink"
+    >
+      <Heart size={20} />
+    </ActionIcon>
+  </Tooltip>
+);
+
 const NavLink = ({ item, isActive, collapsed }) => {
   const IconComponent = item.icon;
   return (
@@ -328,24 +339,56 @@ const Sidebar = ({ collapsed, toggleDrawer, drawerWidth, miniDrawerWidth }) => {
       {!collapsed && (
         <Group
           gap="xs"
+          wrap="nowrap"
           style={{ padding: '0 16px 16px', justifyContent: 'space-between' }}
         >
-          <Text size="xs" c="dimmed">
-            v{appVersion?.version || '0.0.0'}
-            {appVersion?.timestamp ? `-${appVersion.timestamp}` : ''}
-          </Text>
-          {isAuthenticated && <NotificationCenter />}
+          <Tooltip
+            label={`v${appVersion?.version || '0.0.0'}${appVersion?.timestamp ? `-${appVersion.timestamp}` : ''}`}
+            position="top"
+          >
+            <Text
+              size="xs"
+              c="dimmed"
+              style={{
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+                whiteSpace: 'nowrap',
+                minWidth: 0,
+                flex: 1,
+                cursor: 'pointer',
+              }}
+              onClick={() =>
+                copyToClipboard(
+                  `v${appVersion?.version || '0.0.0'}${appVersion?.timestamp ? `-${appVersion.timestamp}` : ''}`,
+                  {
+                    successTitle: 'Copied',
+                    successMessage: 'Version copied to clipboard',
+                  }
+                )
+              }
+            >
+              v{appVersion?.version || '0.0.0'}
+              {appVersion?.timestamp ? `-${appVersion.timestamp}` : ''}
+            </Text>
+          </Tooltip>
+          <Group gap="xs" wrap="nowrap">
+            <DonateButton />
+            {isAuthenticated && <NotificationCenter />}
+          </Group>
         </Group>
       )}
-      {collapsed && isAuthenticated && (
+      {collapsed && (
         <Box
           style={{
             padding: '0 16px 16px',
             display: 'flex',
-            justifyContent: 'center',
+            flexDirection: 'column',
+            alignItems: 'center',
+            gap: 8,
           }}
         >
-          <NotificationCenter />
+          {isAuthenticated && <NotificationCenter />}
+          <DonateButton tooltipPosition="right" />
         </Box>
       )}
 

From 7d8619f644d0c7a7d626f9ce9aacb6863a00af8f Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 09:30:01 -0500
Subject: [PATCH 087/172] Security: Update npm dependencies to resolve frontend
 vulernabilities.

---
 CHANGELOG.md               |  8 +++++++
 frontend/package-lock.json | 44 +++++++++++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58a41e3d..35b283b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Security
+
+- Updated frontend npm dependencies to resolve 4 vulnerabilities (2 high, 2 moderate):
+  - Updated `brace-expansion` to 5.0.5, resolving **moderate** zero-step sequence causing process hang and memory exhaustion ([GHSA-f886-m6hf-6m8v](https://github.com/advisories/GHSA-f886-m6hf-6m8v))
+  - Updated `flatted` to 3.4.2, resolving **high** Prototype Pollution via `parse()` in NodeJS flatted ([GHSA-rf6f-7fwh-wjgh](https://github.com/advisories/GHSA-rf6f-7fwh-wjgh))
+  - Updated `picomatch` to 4.0.4, resolving **high** method injection in POSIX character classes causing incorrect glob matching ([GHSA-3v7f-55p6-f55p](https://github.com/advisories/GHSA-3v7f-55p6-f55p)) and a ReDoS vulnerability via extglob quantifiers ([GHSA-c2c7-rcm5-vvqj](https://github.com/advisories/GHSA-c2c7-rcm5-vvqj))
+  - Updated `yaml` to 1.10.3, resolving **moderate** stack overflow via deeply nested YAML collections ([GHSA-48c2-rrv3-qjmp](https://github.com/advisories/GHSA-48c2-rrv3-qjmp))
+
 ### Added
 
 - TLS and mutual TLS (mTLS) support for Redis and PostgreSQL connections in modular deployments. Supports encrypted connections, server certificate verification (Redis: on/off; PostgreSQL: verify-full, verify-ca, require), CA certificate configuration, and client certificate authentication. Configured via environment variables in the docker compose file. Includes startup validation for certificate paths and TLS/URL scheme conflicts, and a read-only Connection Security panel in System Settings. (Closes #950) — Thanks [@CodeBormen](https://github.com/CodeBormen)
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 9a0adea6..6880b99a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -2704,16 +2704,16 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.2.tgz",
-      "integrity": "sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
       },
       "engines": {
-        "node": "20 || >=22"
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/cac": {
@@ -2850,9 +2850,9 @@
       }
     },
     "node_modules/cosmiconfig/node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
       "license": "ISC",
       "engines": {
         "node": ">= 6"
@@ -3554,9 +3554,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.1.tgz",
-      "integrity": "sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "license": "ISC"
     },
@@ -4362,9 +4362,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5794,6 +5794,24 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/yaml": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
+      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/eemeli"
+      }
+    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",

From b20c42f25a2efdf4a5f5afd3f5e1bea93ae8ccd1 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 11:03:55 -0500
Subject: [PATCH 088/172] chore: update dependencies for celery, requests,
 torch, and sentence-transformers

---
 pyproject.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index fecc4e68..0f2d7afd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,9 +8,9 @@ dynamic = ["version"]
 dependencies = [
     "Django==6.0.3",
     "psycopg2-binary==2.9.11",
-    "celery[redis]==5.6.2",
+    "celery[redis]==5.6.3",
     "djangorestframework==3.16.1",
-    "requests==2.32.5",
+    "requests==2.33.0",
     "psutil==7.2.2",
     "pillow",
     "drf-spectacular>=0.29.0",
@@ -27,8 +27,8 @@ dependencies = [
     "regex",
     "tzlocal",
     "pytz",
-    "torch==2.10.0+cpu",
-    "sentence-transformers==5.2.3",
+    "torch==2.11.0+cpu",
+    "sentence-transformers==5.3.0",
     "channels",
     "channels-redis==4.3.0",
     "django-filter",

From 2253e18ef8767f2045253422fa6f4658af881089 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 11:04:37 -0500
Subject: [PATCH 089/172] changelog: Update changelog for dependency upgrades

---
 CHANGELOG.md | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35b283b5..9d7cfc23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
-- Updated frontend npm dependencies to resolve 4 vulnerabilities (2 high, 2 moderate):
-  - Updated `brace-expansion` to 5.0.5, resolving **moderate** zero-step sequence causing process hang and memory exhaustion ([GHSA-f886-m6hf-6m8v](https://github.com/advisories/GHSA-f886-m6hf-6m8v))
-  - Updated `flatted` to 3.4.2, resolving **high** Prototype Pollution via `parse()` in NodeJS flatted ([GHSA-rf6f-7fwh-wjgh](https://github.com/advisories/GHSA-rf6f-7fwh-wjgh))
-  - Updated `picomatch` to 4.0.4, resolving **high** method injection in POSIX character classes causing incorrect glob matching ([GHSA-3v7f-55p6-f55p](https://github.com/advisories/GHSA-3v7f-55p6-f55p)) and a ReDoS vulnerability via extglob quantifiers ([GHSA-c2c7-rcm5-vvqj](https://github.com/advisories/GHSA-c2c7-rcm5-vvqj))
-  - Updated `yaml` to 1.10.3, resolving **moderate** stack overflow via deeply nested YAML collections ([GHSA-48c2-rrv3-qjmp](https://github.com/advisories/GHSA-48c2-rrv3-qjmp))
+- Updated `requests` 2.32.5 → 2.33.0, resolving the following CVE:
+  - **CVE-2026-25645** (moderate): Insecure temp file reuse in `extract_zipped_paths()` utility function.
+- Updated frontend npm dependencies to resolve 4 audit vulnerabilities (2 moderate, 2 high):
+  - Updated `brace-expansion` 5.0.2 → 5.0.5, resolving **moderate** zero-step sequence causing process hang and memory exhaustion ([GHSA-f886-m6hf-6m8v](https://github.com/advisories/GHSA-f886-m6hf-6m8v))
+  - Updated `flatted` 3.4.1 → 3.4.2, resolving **high** Prototype Pollution via `parse()` in NodeJS flatted ([GHSA-rf6f-7fwh-wjgh](https://github.com/advisories/GHSA-rf6f-7fwh-wjgh))
+  - Updated `picomatch` 4.0.3 → 4.0.4, resolving **high** method injection in POSIX character classes causing incorrect glob matching ([GHSA-3v7f-55p6-f55p](https://github.com/advisories/GHSA-3v7f-55p6-f55p)) and a ReDoS vulnerability via extglob quantifiers ([GHSA-c2c7-rcm5-vvqj](https://github.com/advisories/GHSA-c2c7-rcm5-vvqj))
+  - Updated `yaml` 1.10.2 → 1.10.3, resolving **moderate** stack overflow via deeply nested YAML collections ([GHSA-48c2-rrv3-qjmp](https://github.com/advisories/GHSA-48c2-rrv3-qjmp))
 
 ### Added
 
@@ -22,6 +24,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Dependency updates:
+  - `requests` 2.32.5 → 2.33.0 (security patch; see Security section)
+  - `celery` 5.6.2 → 5.6.3
+  - `torch` 2.10.0+cpu → 2.11.0+cpu
+  - `sentence-transformers` 5.2.3 → 5.3.0
+  - `yt-dlp` 2026.3.13 → 2026.3.17
 - M3U table **Max Streams** column now reflects the combined limit across all active profiles. When a playlist has multiple active profiles, the column displays their summed total (or ∞ if any profile is unlimited) and a hover tooltip lists each profile's individual limit by name. (Closes #816)
 - Toggling an M3U profile's active state now immediately updates the playlist store (including the `playlists` array), so the **Max Streams** total in the M3U table reflects the change without a page reload.
 - M3U account form: **Max Streams** field changed from a plain text input to a number input with increment/decrement controls, consistent with other integer fields.

From 9c9de12b19408a7e9923594211a84fee516ed58a Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 11:49:28 -0500
Subject: [PATCH 090/172] chore: remove unnecessary python-is-python3,
 python3-pip and streamlink from Dockerfile dependencies

---
 docker/DispatcharrBase | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker/DispatcharrBase b/docker/DispatcharrBase
index d2e8ceaa..3040e189 100644
--- a/docker/DispatcharrBase
+++ b/docker/DispatcharrBase
@@ -15,9 +15,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     && apt-get update \
     && apt-get install --no-install-recommends -y \
     python3.13 python3.13-dev python3.13-venv libpython3.13 \
-    python-is-python3 python3-pip \
     libpcre3 libpcre3-dev libpq-dev procps pciutils \
-    nginx streamlink comskip \
+    nginx comskip \
     vlc-bin vlc-plugin-base \
     build-essential gcc g++ gfortran libopenblas-dev libopenblas0 ninja-build
 

From 36ce5a8c7184f9831a573815d95f279f5cbcddd8 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 11:54:00 -0500
Subject: [PATCH 091/172] changelog: Update changelog for base image changes.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d7cfc23..f25d8572 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `torch` 2.10.0+cpu → 2.11.0+cpu
   - `sentence-transformers` 5.2.3 → 5.3.0
   - `yt-dlp` 2026.3.13 → 2026.3.17
+- Docker base image cleanup: removed `python-is-python3`, `python3-pip`, and `streamlink` from the apt package list in `DispatcharrBase`. `python3-pip` and `streamlink` were pulling outdated system Python packages (e.g. `requests 2.31.0`, `cryptography 41.0.7`, `lxml 5.2.1`) into the system Python's site-packages despite the app running entirely in the uv-managed venv at `/dispatcharrpy`. `streamlink` is already installed in the venv via `pyproject.toml`. `python-is-python3` is unnecessary as `PATH` resolves bare `python` to the venv binary.
 - M3U table **Max Streams** column now reflects the combined limit across all active profiles. When a playlist has multiple active profiles, the column displays their summed total (or ∞ if any profile is unlimited) and a hover tooltip lists each profile's individual limit by name. (Closes #816)
 - Toggling an M3U profile's active state now immediately updates the playlist store (including the `playlists` array), so the **Max Streams** total in the M3U table reflects the change without a page reload.
 - M3U account form: **Max Streams** field changed from a plain text input to a number input with increment/decrement controls, consistent with other integer fields.

From c601174e9ad12200e569fd7aa93f98faef322346 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 11:03:55 -0500
Subject: [PATCH 092/172] chore: update dependencies for celery, requests,
 torch, and sentence-transformers

---
 pyproject.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index fecc4e68..0f2d7afd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,9 +8,9 @@ dynamic = ["version"]
 dependencies = [
     "Django==6.0.3",
     "psycopg2-binary==2.9.11",
-    "celery[redis]==5.6.2",
+    "celery[redis]==5.6.3",
     "djangorestframework==3.16.1",
-    "requests==2.32.5",
+    "requests==2.33.0",
     "psutil==7.2.2",
     "pillow",
     "drf-spectacular>=0.29.0",
@@ -27,8 +27,8 @@ dependencies = [
     "regex",
     "tzlocal",
     "pytz",
-    "torch==2.10.0+cpu",
-    "sentence-transformers==5.2.3",
+    "torch==2.11.0+cpu",
+    "sentence-transformers==5.3.0",
     "channels",
     "channels-redis==4.3.0",
     "django-filter",

From 9d8d4f6c75922e4bbef5c393822b27a41d257a3c Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 11:49:28 -0500
Subject: [PATCH 093/172] chore: remove unnecessary python-is-python3,
 python3-pip and streamlink from Dockerfile dependencies

---
 docker/DispatcharrBase | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker/DispatcharrBase b/docker/DispatcharrBase
index d2e8ceaa..3040e189 100644
--- a/docker/DispatcharrBase
+++ b/docker/DispatcharrBase
@@ -15,9 +15,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     && apt-get update \
     && apt-get install --no-install-recommends -y \
     python3.13 python3.13-dev python3.13-venv libpython3.13 \
-    python-is-python3 python3-pip \
     libpcre3 libpcre3-dev libpq-dev procps pciutils \
-    nginx streamlink comskip \
+    nginx comskip \
     vlc-bin vlc-plugin-base \
     build-essential gcc g++ gfortran libopenblas-dev libopenblas0 ninja-build
 

From 5f45d3e9adcd7404c5bf90a189d7ae5afb129e03 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 13:55:16 -0500
Subject: [PATCH 094/172] changelog: User stream limits

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58a41e3d..6806f29a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- User stream limits: administrators can now set a maximum number of concurrent streams per user account. When a user reaches their limit, the system can automatically terminate an existing stream to free a slot based on configurable rules. Limit enforcement applies to both live channels and VOD. (Closes #544)
+  - Each user account has a new **Stream Limit** field (0 = unlimited) configurable from the user edit form in Settings → Users.
+  - Global enforcement behaviour is configurable in Settings → User Limits:
+    - **Terminate on Limit Exceeded**: automatically stop an existing stream when the user's limit is reached (vs. rejecting the new connection).
+    - **Terminate Oldest**: prefer terminating the oldest stream when freeing a slot; disable to prefer the newest.
+    - **Prioritize Single-Client Channels**: prefer terminating streams on channels that only this user is watching.
+    - **Ignore Same-Channel Connections**: count multiple connections to the same live channel as one stream toward the limit. Same-channel reconnects are always allowed through. When this is enabled and a channel must be freed, all connections to the chosen channel are terminated together so that the unique-channel count actually decreases. VOD is explicitly excluded from this bypass since VOD connections are not shared upstream.
 - TLS and mutual TLS (mTLS) support for Redis and PostgreSQL connections in modular deployments. Supports encrypted connections, server certificate verification (Redis: on/off; PostgreSQL: verify-full, verify-ca, require), CA certificate configuration, and client certificate authentication. Configured via environment variables in the docker compose file. Includes startup validation for certificate paths and TLS/URL scheme conflicts, and a read-only Connection Security panel in System Settings. (Closes #950) — Thanks [@CodeBormen](https://github.com/CodeBormen)
 - Status filter for M3U group and VOD category filter modals: A new **All / Enabled / Disabled** segmented control is now shown alongside the text search input in the Live, VOD - Movies, and VOD - Series tabs of the M3U Group Filter modal. The status filter works in combination with the text search and also scopes the "Select Visible" / "Deselect Visible" buttons so they only act on the currently visible subset. (Closes #312)
 

From 110c8623ed2c28247d6ace39b6ef5208ed959d56 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 13:59:50 -0500
Subject: [PATCH 095/172] delete temp script used for debugging.

---
 debug_redis_check.py | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 debug_redis_check.py

diff --git a/debug_redis_check.py b/debug_redis_check.py
deleted file mode 100644
index 9deab6d4..00000000
--- a/debug_redis_check.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-import os, sys
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dispatcharr.settings')
-import django
-django.setup()
-
-from core.utils import RedisClient
-
-r = RedisClient.get_client()
-print(f"Client: {r}")
-print(f"decode_responses: {r.connection_pool.connection_kwargs.get('decode_responses')}")
-
-keys = list(r.scan_iter(match='ts_proxy:channel:*:metadata', count=100))
-print(f"Found {len(keys)} metadata keys")
-for k in keys[:3]:
-    print(f"  Key: {k!r}")
-    data = r.hgetall(k)
-    field_names = list(data.keys())[:8]
-    print(f"  Fields ({len(data)} total): {field_names}")
-    state = data.get('state', 'MISSING')
-    print(f"  state={state!r}")

From 0827908b538b28edb9456ae490e0913077d6c65d Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 14:12:21 -0500
Subject: [PATCH 096/172] fix: lazy load UserLimitsForm and correct spelling in
 user limits section

---
 frontend/src/pages/Settings.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Settings.jsx b/frontend/src/pages/Settings.jsx
index 71bbc68c..570e9f4b 100644
--- a/frontend/src/pages/Settings.jsx
+++ b/frontend/src/pages/Settings.jsx
@@ -23,8 +23,10 @@ const BackupManager = React.lazy(
 import useAuthStore from '../store/auth';
 import { USER_LEVELS } from '../constants';
 import UiSettingsForm from '../components/forms/settings/UiSettingsForm.jsx';
-import UserLimitsForm from '../components/forms/settings/UserLimitsForm.jsx';
 import ErrorBoundary from '../components/ErrorBoundary.jsx';
+const UserLimitsForm = React.lazy(
+  () => import('../components/forms/settings/UserLimitsForm.jsx')
+);
 const NetworkAccessForm = React.lazy(
   () => import('../components/forms/settings/NetworkAccessForm.jsx')
 );
@@ -203,7 +205,7 @@ const SettingsPage = () => {
               </AccordionItem>
 
               <AccordionItem value="user-limits">
-                <AccordionControl>User Limts</AccordionControl>
+                <AccordionControl>User Limits</AccordionControl>
                 <AccordionPanel>
                   <ErrorBoundary>
                     <Suspense fallback={<Loader />}>

From 3064be8194fd831a056762826b354cdf8e141737 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 14:15:20 -0500
Subject: [PATCH 097/172] tests: Fix settings page test.

---
 frontend/src/pages/__tests__/Settings.test.jsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/pages/__tests__/Settings.test.jsx b/frontend/src/pages/__tests__/Settings.test.jsx
index fc0bc323..7a01b95a 100644
--- a/frontend/src/pages/__tests__/Settings.test.jsx
+++ b/frontend/src/pages/__tests__/Settings.test.jsx
@@ -78,6 +78,13 @@ vi.mock('../../components/forms/settings/NavOrderForm', () => ({
     </div>
   ),
 }));
+vi.mock('../../components/forms/settings/UserLimitsForm', () => ({
+  default: ({ active }) => (
+    <div data-testid="user-limits-form">
+      UserLimitsForm {active ? 'active' : 'inactive'}
+    </div>
+  ),
+}));
 vi.mock('../../components/ErrorBoundary', () => ({
   default: ({ children }) => <div data-testid="error-boundary">{children}</div>,
 }));

From 3ee925ca71f714d3fff3afb09a77a79704a71727 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 15:14:04 -0500
Subject: [PATCH 098/172] tests: add Heart icon and Tooltip mock to Sidebar
 tests

---
 frontend/src/components/__tests__/Sidebar.test.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/components/__tests__/Sidebar.test.jsx b/frontend/src/components/__tests__/Sidebar.test.jsx
index cc5e8be2..e92b2f39 100644
--- a/frontend/src/components/__tests__/Sidebar.test.jsx
+++ b/frontend/src/components/__tests__/Sidebar.test.jsx
@@ -56,6 +56,7 @@ vi.mock('lucide-react', () => ({
   ChevronRight: () => <div data-testid="chevron-right-icon" />,
   MonitorCog: () => <div data-testid="monitor-cog-icon" />,
   Blocks: () => <div data-testid="blocks-icon" />,
+  Heart: () => <div data-testid="heart-icon" />,
 }));
 
 // Mock UserForm component
@@ -114,6 +115,7 @@ vi.mock('@mantine/core', async () => {
       </nav>
     ),
     ScrollArea: ({ children }) => <div>{children}</div>,
+    Tooltip: ({ children }) => <>{children}</>,
   };
 });
 

From 49f6871ba8d078859bc44ef4b51c7ee97e3ddcea Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 27 Mar 2026 16:36:34 -0500
Subject: [PATCH 099/172] changelog: Update formatting a bit.

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7df81dc0..c2d5a865 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,10 +50,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - HTML named entities in XMLTV EPG files are now resolved to Unicode characters before lxml parsing. Some EPG providers (particularly French and other European sources) use HTML named entities like `&eacute;`, `&icirc;`, `&uuml;` in channel names, program titles, and metadata. These are not valid XML entities — lxml 6.0.2 with `recover=True` silently drops them, causing characters to go missing (e.g., "Chaîne Télé" becomes "Chane Tl"). A preprocessing step in `fetch_xmltv()` now resolves HTML named entities while preserving the 5 XML-predefined entities, detecting encoding from the XML declaration (falling back to UTF-8), and processing line-by-line to a temp file before atomically replacing the original. (Closes #1095) — Thanks [@CodeBormen](https://github.com/CodeBormen)
-- Duplicate recordings created when EPG sources refresh and re-evaluate series rules — Thanks [@CodeBormen](https://github.com/CodeBormen):
+- Duplicate recordings created when EPG sources refresh and re-evaluate series rules (Fixes #940) — Thanks [@CodeBormen](https://github.com/CodeBormen):
   - **Program ID instability**: `parse_programs_for_source()` deletes and recreates all `ProgramData` rows with new auto-increment IDs on every EPG refresh. The dedup set used these IDs, so it never matched after a refresh. Deduplication now uses a stable `(tvg_id, start_time, end_time)` composite key sourced from `Recording.custom_properties.program`.
   - **Secondary guard using wrong times**: The DB guard compared unadjusted program times against offset-adjusted `Recording.start_time`/`end_time`, so it never matched when any DVR pre/post offset was configured. It now queries `custom_properties__program__start_time/end_time` (the original, unadjusted program times stored at recording creation).
-  - **No concurrency guard**: Each EPG source refresh fired `evaluate_series_rules.delay()` independently. Concurrent tasks loaded the dedup set before others committed, allowing races. Evaluation is now serialized with `acquire_task_lock` (reusing the existing EPG task pattern). Gracefully degrades if Redis is unavailable — the primary and secondary dedup guards still protect. (Fixes #940)
+  - **No concurrency guard**: Each EPG source refresh fired `evaluate_series_rules.delay()` independently. Concurrent tasks loaded the dedup set before others committed, allowing races. Evaluation is now serialized with `acquire_task_lock` (reusing the existing EPG task pattern). Gracefully degrades if Redis is unavailable — the primary and secondary dedup guards still protect.
 
 ## [0.21.1] - 2026-03-18
 

From 5f4e0661478e0b372c1dc8cd3f71c0ad75417e27 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 13:33:29 -0500
Subject: [PATCH 100/172] Enhancements: - Connection cards on the Stats page
 now show the **username** of the connected user in a new User column (between
 IP Address and Connected). The username is resolved from the user store using
 the `user_id` stored in Redis client metadata; unauthenticated connections
 display "Anonymous". (Closes #766) - `ip_address` and `user_id` were not
 included in the client info returned by `get_detailed_channel_info()` despite
 being available in the Redis hash. Both fields are now extracted and
 returned. (Closes #586)

---
 CHANGELOG.md                                  |  2 +
 apps/proxy/ts_proxy/channel_status.py         |  6 ++
 .../components/cards/StreamConnectionCard.jsx | 55 ++++++++++++++++---
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2d5a865..450a33ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Connection cards on the Stats page now show the **username** of the connected user in a new User column (between IP Address and Connected). The username is resolved from the user store using the `user_id` stored in Redis client metadata; unauthenticated connections display "Anonymous". (Closes #766)
+- `ip_address` and `user_id` were not included in the client info returned by `get_detailed_channel_info()` despite being available in the Redis hash. Both fields are now extracted and returned. (Closes #586)
 - Donate button added to the sidebar footer. A heart icon links to the project's Open Collective page, visible in both expanded and collapsed states. Hovering shows a "Support Dispatcharr" tooltip. The version string is also now clickable to copy it to the clipboard.
 - User stream limits: administrators can now set a maximum number of concurrent streams per user account. When a user reaches their limit, the system can automatically terminate an existing stream to free a slot based on configurable rules. Limit enforcement applies to both live channels and VOD. (Closes #544)
   - Each user account has a new **Stream Limit** field (0 = unlimited) configurable from the user edit form in Settings → Users.
diff --git a/apps/proxy/ts_proxy/channel_status.py b/apps/proxy/ts_proxy/channel_status.py
index b7c77024..c4a54cdc 100644
--- a/apps/proxy/ts_proxy/channel_status.py
+++ b/apps/proxy/ts_proxy/channel_status.py
@@ -143,6 +143,8 @@ class ChannelStatus:
                 'client_id': client_id_str,
                 'user_agent': client_data.get('user_agent', 'unknown'),
                 'worker_id': client_data.get('worker_id', 'unknown'),
+                'ip_address': client_data.get('ip_address', 'unknown'),
+                'user_id': client_data.get('user_id', '0'),
             }
 
             if 'connected_at' in client_data:
@@ -473,6 +475,10 @@ class ChannelStatus:
                         connected_at = float(connected_at_bytes)
                         client_info['connected_since'] = time.time() - connected_at
 
+                    user_id_bytes = proxy_server.redis_client.hget(client_key, 'user_id')
+                    if user_id_bytes:
+                        client_info['user_id'] = user_id_bytes
+
                     clients.append(client_info)
 
             # Add clients to info
diff --git a/frontend/src/components/cards/StreamConnectionCard.jsx b/frontend/src/components/cards/StreamConnectionCard.jsx
index 56d4d174..86dbc240 100644
--- a/frontend/src/components/cards/StreamConnectionCard.jsx
+++ b/frontend/src/components/cards/StreamConnectionCard.jsx
@@ -2,6 +2,7 @@ import { useLocation } from 'react-router-dom';
 import React, { useEffect, useMemo, useState } from 'react';
 import usePlaylistsStore from '../../store/playlists.jsx';
 import useSettingsStore from '../../store/settings.jsx';
+import useUsersStore from '../../store/users.jsx';
 import {
   ActionIcon,
   Badge,
@@ -123,6 +124,8 @@ const StreamConnectionCard = ({
 
   // Get M3U account data from the playlists store
   const m3uAccounts = usePlaylistsStore((s) => s.playlists);
+  // Get users for resolving user_id → username on client rows
+  const users = useUsersStore((s) => s.users);
   // Get settings for speed threshold and environment mode
   const settings = useSettingsStore((s) => s.settings);
   const env_mode =
@@ -138,6 +141,15 @@ const StreamConnectionCard = ({
     return getM3uAccountsMap(m3uAccounts);
   }, [m3uAccounts]);
 
+  // Create a map of user IDs to usernames for quick lookup
+  const usersMap = useMemo(() => {
+    const map = {};
+    users.forEach((u) => {
+      map[String(u.id)] = u.username;
+    });
+    return map;
+  }, [users]);
+
   // Update M3U profile information when channel data changes
   useEffect(() => {
     // If the channel data includes M3U profile information, update our state
@@ -314,7 +326,8 @@ const StreamConnectionCard = ({
       {
         header: 'IP Address',
         accessorKey: 'ip_address',
-        size: 150,
+        grow: true,
+        minSize: 85,
         cell: ({ cell }) => (
           <Tooltip label={cell.getValue()}>
             <Text size="xs" truncate style={{ maxWidth: '100%' }}>
@@ -323,10 +336,29 @@ const StreamConnectionCard = ({
           </Tooltip>
         ),
       },
+      {
+        id: 'user',
+        header: 'User',
+        grow: true,
+        minSize: 60,
+        accessorFn: (row) => {
+          const uid = row.user_id ? String(row.user_id) : null;
+          if (!uid || uid === '0') return 'Anonymous';
+          return usersMap[uid] || `User ${uid}`;
+        },
+        cell: ({ cell }) => (
+          <Text size="xs" truncate style={{ maxWidth: '100%' }}>
+            {cell.getValue()}
+          </Text>
+        ),
+      },
       // Updated Connected column with tooltip
       {
         id: 'connected',
         header: 'Connected',
+        grow: 1.5,
+        minSize: 70,
+        maxSize: 150,
         accessorFn: connectedAccessor(fullDateTimeFormat),
         cell: ({ cell }) => (
           <Tooltip
@@ -336,7 +368,9 @@ const StreamConnectionCard = ({
                 : 'Unknown connection time'
             }
           >
-            <Text size="xs">{cell.getValue()}</Text>
+            <Text size="xs" truncate style={{ maxWidth: '100%' }}>
+              {cell.getValue()}
+            </Text>
           </Tooltip>
         ),
       },
@@ -344,6 +378,8 @@ const StreamConnectionCard = ({
       {
         id: 'duration',
         header: 'Duration',
+        size: 82,
+        minSize: 60,
         accessorFn: durationAccessor(),
         cell: ({ cell, row }) => {
           const exactDuration =
@@ -356,7 +392,9 @@ const StreamConnectionCard = ({
                   : 'Unknown duration'
               }
             >
-              <Text size="xs">{cell.getValue()}</Text>
+              <Text size="xs" style={{ whiteSpace: 'nowrap' }}>
+                {cell.getValue()}
+              </Text>
             </Tooltip>
           );
         },
@@ -364,10 +402,11 @@ const StreamConnectionCard = ({
       {
         id: 'actions',
         header: 'Actions',
-        size: 100,
+        size: 60,
+        minSize: 40,
       },
     ],
-    [fullDateTimeFormat]
+    [fullDateTimeFormat, usersMap]
   );
 
   const channelClientsTable = useTable({
@@ -383,6 +422,7 @@ const StreamConnectionCard = ({
     }),
     headerCellRenderFns: {
       ip_address: renderHeaderCell,
+      user: renderHeaderCell,
       connected: renderHeaderCell,
       duration: renderHeaderCell,
       actions: renderHeaderCell,
@@ -610,8 +650,9 @@ const StreamConnectionCard = ({
         {currentProgram &&
           isProgramDescExpanded &&
           currentProgram.start_time &&
-          currentProgram.end_time &&
-          <ProgramProgress currentProgram={currentProgram} />}
+          currentProgram.end_time && (
+            <ProgramProgress currentProgram={currentProgram} />
+          )}
 
         {/* Add stream selection dropdown and preview button */}
         {availableStreams.length > 0 && (

From 6f516c0074e535fcee250ab0b88a8ed0c836d4d9 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 13:36:47 -0500
Subject: [PATCH 101/172] Enhancement: `CustomTable` column layout now supports
 flexible (`grow`) columns alongside fixed-width ones:   - Column definitions
 accept a `grow` property (boolean or number) to opt into flex layout. A
 numeric value sets the flex-grow weight, allowing relative sizing between
 grow columns (e.g. `grow: 2` gives a column twice the share of spare space as
 `grow: 1`).   - `maxSize` is now respected on grow columns, capping how wide
 they expand via `maxWidth`.   - The wrapper's `minWidth` calculation now uses
 `minSize` (not TanStack's 150px default) for grow columns, preventing the
 table from overflowing its container when columns would otherwise be sized
 larger than available space.

---
 CHANGELOG.md                                          |  4 ++++
 .../src/components/tables/CustomTable/CustomTable.jsx | 11 ++++++++---
 .../components/tables/CustomTable/CustomTableBody.jsx |  8 ++++----
 .../tables/CustomTable/CustomTableHeader.jsx          |  5 ++++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 450a33ae..c15fc6c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- `CustomTable` column layout now supports flexible (`grow`) columns alongside fixed-width ones:
+  - Column definitions accept a `grow` property (boolean or number) to opt into flex layout. A numeric value sets the flex-grow weight, allowing relative sizing between grow columns (e.g. `grow: 2` gives a column twice the share of spare space as `grow: 1`).
+  - `maxSize` is now respected on grow columns, capping how wide they expand via `maxWidth`.
+  - The wrapper's `minWidth` calculation now uses `minSize` (not TanStack's 150px default) for grow columns, preventing the table from overflowing its container when columns would otherwise be sized larger than available space.
 - Dependency updates:
   - `requests` 2.32.5 → 2.33.0 (security patch; see Security section)
   - `celery` 5.6.2 → 5.6.3
diff --git a/frontend/src/components/tables/CustomTable/CustomTable.jsx b/frontend/src/components/tables/CustomTable/CustomTable.jsx
index e14209d2..f1f081dd 100644
--- a/frontend/src/components/tables/CustomTable/CustomTable.jsx
+++ b/frontend/src/components/tables/CustomTable/CustomTable.jsx
@@ -6,17 +6,22 @@ import CustomTableBody from './CustomTableBody';
 const CustomTable = ({ table }) => {
   const tableSize = table?.tableSize ?? 'default';
 
-  // Get column sizing state for dependency tracking
+  // columnSizing is read here so the memo below re-runs when columns are resized.
   const columnSizing = table.getState().columnSizing;
 
-  // Calculate minimum table width reactively based on column sizes
+  // Calculate minimum table width reactively based on column sizes.
+  // Grow columns contribute only their minSize (not TanStack's default 150px)
+  // so the wrapper doesn't force the table wider than its container.
   const minTableWidth = useMemo(() => {
+    void columnSizing; // reactive trigger: recalculate when column sizes change
     const headerGroups = table.getHeaderGroups();
     if (!headerGroups || headerGroups.length === 0) return 0;
 
     const width =
       headerGroups[0]?.headers.reduce((total, header) => {
-        return total + header.getSize();
+        const colDef = header.column.columnDef;
+        const size = colDef.grow ? colDef.minSize || 0 : header.getSize();
+        return total + size;
       }, 0) || 0;
 
     return width;
diff --git a/frontend/src/components/tables/CustomTable/CustomTableBody.jsx b/frontend/src/components/tables/CustomTable/CustomTableBody.jsx
index d579a41a..c8178eeb 100644
--- a/frontend/src/components/tables/CustomTable/CustomTableBody.jsx
+++ b/frontend/src/components/tables/CustomTable/CustomTableBody.jsx
@@ -126,9 +126,6 @@ const CustomTableBody = ({
           }}
         >
           {row.getVisibleCells().map((cell) => {
-            const hasFixedSize = cell.column.columnDef.size;
-            const isFlexible = !hasFixedSize;
-
             return (
               <Box
                 className="td"
@@ -136,8 +133,11 @@ const CustomTableBody = ({
                 style={{
                   ...(cell.column.columnDef.grow
                     ? {
-                        flex: '1 1 0%',
+                        flex: `${cell.column.columnDef.grow === true ? 1 : cell.column.columnDef.grow} 1 0%`,
                         minWidth: 0,
+                        ...(cell.column.columnDef.maxSize && {
+                          maxWidth: `${cell.column.columnDef.maxSize}px`,
+                        }),
                       }
                     : {
                         flex: `0 0 ${cell.column.getSize ? cell.column.getSize() : 150}px`,
diff --git a/frontend/src/components/tables/CustomTable/CustomTableHeader.jsx b/frontend/src/components/tables/CustomTable/CustomTableHeader.jsx
index f4b47171..8df6357a 100644
--- a/frontend/src/components/tables/CustomTable/CustomTableHeader.jsx
+++ b/frontend/src/components/tables/CustomTable/CustomTableHeader.jsx
@@ -110,8 +110,11 @@ const CustomTableHeader = ({
                 style={{
                   ...(header.column.columnDef.grow
                     ? {
-                        flex: '1 1 0%',
+                        flex: `${header.column.columnDef.grow === true ? 1 : header.column.columnDef.grow} 1 0%`,
                         minWidth: 0,
+                        ...(header.column.columnDef.maxSize && {
+                          maxWidth: `${header.column.columnDef.maxSize}px`,
+                        }),
                       }
                     : {
                         flex: `0 0 ${header.getSize ? header.getSize() : 150}px`,

From dd97b642c7fe7509bd62dbd212fae33e6b8f1509 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 14:21:37 -0500
Subject: [PATCH 102/172] Bug Fix: preserve original file mtime during HTML
 entity resolution to prevent infinite refresh loop

---
 apps/epg/tasks.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apps/epg/tasks.py b/apps/epg/tasks.py
index df1e0836..9683c85a 100644
--- a/apps/epg/tasks.py
+++ b/apps/epg/tasks.py
@@ -94,6 +94,15 @@ def _resolve_html_entities(file_path):
         header = f.read(200)
     encoding = _detect_xml_encoding(header)
 
+    # Capture the original mtime before modifying the file so that os.replace()
+    # does not update the file's mtime.  The file watcher in core/tasks.py uses
+    # mtime to detect changes; if we let mtime advance it would trigger an
+    # infinite refresh loop for local file-based EPG sources.
+    try:
+        original_stat = os.stat(file_path)
+    except OSError:
+        original_stat = None
+
     temp_path = file_path + '.entity_tmp'
     success = False
     try:
@@ -102,6 +111,10 @@ def _resolve_html_entities(file_path):
             for line in src:
                 dst.write(_NAMED_ENTITY_RE.sub(_replace_html_entity, line))
         os.replace(temp_path, file_path)
+        # Restore the original mtime (and atime) so the file watcher does not
+        # mistake the rewrite for an external update.
+        if original_stat is not None:
+            os.utime(file_path, (original_stat.st_atime, original_stat.st_mtime))
         success = True
         logger.debug(f"Resolved HTML entities in {file_path} (encoding: {encoding})")
     except Exception as e:

From 7ece48bdf2fd95b8dc9c0208c7f5f76245cd770b Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 15:12:24 -0500
Subject: [PATCH 103/172] tests: Update frontend tests

---
 .../__tests__/M3URefreshNotification.test.jsx |   1 +
 .../__tests__/NotificationCenter.test.jsx     | 119 ++++-
 .../components/__tests__/SeriesModal.test.jsx | 172 +++++--
 .../cards/__tests__/RecordingCard.test.jsx    | 280 ++++++++---
 .../cards/__tests__/SeriesCard.test.jsx       |  60 ++-
 .../__tests__/StreamConnectionCard.test.jsx   | 150 ++++--
 .../cards/__tests__/VODCard.test.jsx          |  58 ++-
 .../__tests__/VodConnectionCard.test.jsx      | 446 ++++++++++++++----
 8 files changed, 1006 insertions(+), 280 deletions(-)

diff --git a/frontend/src/components/__tests__/M3URefreshNotification.test.jsx b/frontend/src/components/__tests__/M3URefreshNotification.test.jsx
index 2c5a5572..43375fa7 100644
--- a/frontend/src/components/__tests__/M3URefreshNotification.test.jsx
+++ b/frontend/src/components/__tests__/M3URefreshNotification.test.jsx
@@ -57,6 +57,7 @@ vi.mock('@mantine/core', async () => {
 
 // Mock lucide-react icons
 vi.mock('lucide-react', () => ({
+  ListOrdered: () => <div data-testid="icon-list-ordered" />,
   CircleCheck: () => <div data-testid="circle-check-icon" />,
 }));
 
diff --git a/frontend/src/components/__tests__/NotificationCenter.test.jsx b/frontend/src/components/__tests__/NotificationCenter.test.jsx
index 9dfb13f5..2231c951 100644
--- a/frontend/src/components/__tests__/NotificationCenter.test.jsx
+++ b/frontend/src/components/__tests__/NotificationCenter.test.jsx
@@ -33,8 +33,12 @@ vi.mock('@mantine/core', async () => {
         {children}
       </div>
     ),
-    PopoverTarget: ({ children }) => <div data-testid="popover-target">{children}</div>,
-    PopoverDropdown: ({ children }) => <div data-testid="popover-dropdown">{children}</div>,
+    PopoverTarget: ({ children }) => (
+      <div data-testid="popover-target">{children}</div>
+    ),
+    PopoverDropdown: ({ children }) => (
+      <div data-testid="popover-dropdown">{children}</div>
+    ),
     Indicator: ({ children, label, disabled, processing }) => (
       <div
         data-testid="indicator"
@@ -46,18 +50,53 @@ vi.mock('@mantine/core', async () => {
       </div>
     ),
     ActionIcon: ({ children, onClick, 'aria-label': ariaLabel, ...props }) => (
-      <button onClick={onClick} aria-label={ariaLabel} data-testid={`action-icon-${ariaLabel}`} {...props}>
+      <button
+        onClick={onClick}
+        aria-label={ariaLabel}
+        data-testid={`action-icon-${ariaLabel}`}
+        {...props}
+      >
         {children}
       </button>
     ),
-    ScrollAreaAutosize: ({ children }) => <div data-testid="scroll-area">{children}</div>,
-    Badge: ({ children, ...props }) => <span data-testid="badge" {...props}>{children}</span>,
-    Card: ({ children, ...props }) => <div data-testid="notification-card" {...props}>{children}</div>,
-    ThemeIcon: ({ children, ...props }) => <div data-testid="theme-icon" {...props}>{children}</div>,
-    Group: ({ children, ...props }) => <div data-testid="group" {...props}>{children}</div>,
-    Stack: ({ children, ...props }) => <div data-testid="stack" {...props}>{children}</div>,
-    Box: ({ children, ...props }) => <div data-testid="box" {...props}>{children}</div>,
-    Text: ({ children, ...props }) => <span data-testid="text" {...props}>{children}</span>,
+    ScrollAreaAutosize: ({ children }) => (
+      <div data-testid="scroll-area">{children}</div>
+    ),
+    Badge: ({ children, ...props }) => (
+      <span data-testid="badge" {...props}>
+        {children}
+      </span>
+    ),
+    Card: ({ children, ...props }) => (
+      <div data-testid="notification-card" {...props}>
+        {children}
+      </div>
+    ),
+    ThemeIcon: ({ children, ...props }) => (
+      <div data-testid="theme-icon" {...props}>
+        {children}
+      </div>
+    ),
+    Group: ({ children, ...props }) => (
+      <div data-testid="group" {...props}>
+        {children}
+      </div>
+    ),
+    Stack: ({ children, ...props }) => (
+      <div data-testid="stack" {...props}>
+        {children}
+      </div>
+    ),
+    Box: ({ children, ...props }) => (
+      <div data-testid="box" {...props}>
+        {children}
+      </div>
+    ),
+    Text: ({ children, ...props }) => (
+      <span data-testid="text" {...props}>
+        {children}
+      </span>
+    ),
     Button: ({ children, onClick, ...props }) => (
       <button onClick={onClick} data-testid="button" {...props}>
         {children}
@@ -84,14 +123,19 @@ vi.mock('@mantine/core', async () => {
 
 // Mock lucide-react icons
 vi.mock('lucide-react', () => ({
+  ListOrdered: () => <span data-testid="icon-list-ordered">ListOrdered</span>,
   Bell: () => <span data-testid="bell-icon">Bell</span>,
   Check: () => <span data-testid="check-icon">Check</span>,
   CheckCheck: () => <span data-testid="checkcheck-icon">CheckCheck</span>,
   Download: () => <span data-testid="download-icon">Download</span>,
-  ExternalLink: () => <span data-testid="external-link-icon">ExternalLink</span>,
+  ExternalLink: () => (
+    <span data-testid="external-link-icon">ExternalLink</span>
+  ),
   Info: () => <span data-testid="info-icon">Info</span>,
   Settings: () => <span data-testid="settings-icon">Settings</span>,
-  AlertTriangle: () => <span data-testid="alert-triangle-icon">AlertTriangle</span>,
+  AlertTriangle: () => (
+    <span data-testid="alert-triangle-icon">AlertTriangle</span>
+  ),
   Megaphone: () => <span data-testid="megaphone-icon">Megaphone</span>,
   X: () => <span data-testid="x-icon">X</span>,
   Eye: () => <span data-testid="eye-icon">Eye</span>,
@@ -279,8 +323,12 @@ describe('NotificationCenter', () => {
     });
 
     it('should handle API errors gracefully', async () => {
-      const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {});
-      NotificationUtils.getNotifications.mockRejectedValue(new Error('Network error'));
+      const consoleError = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
+      NotificationUtils.getNotifications.mockRejectedValue(
+        new Error('Network error')
+      );
 
       renderComponent();
 
@@ -311,7 +359,7 @@ describe('NotificationCenter', () => {
       fireEvent.click(screen.getByLabelText('Notifications'));
 
       const eyeButtons = screen.getAllByTestId(/action-icon-/);
-      const toggleButton = eyeButtons.find(btn =>
+      const toggleButton = eyeButtons.find((btn) =>
         btn.querySelector('[data-testid="eye-icon"]')
       );
       fireEvent.click(toggleButton);
@@ -376,7 +424,10 @@ describe('NotificationCenter', () => {
       fireEvent.click(xIcons[0].closest('button'));
 
       await waitFor(() => {
-        expect(NotificationUtils.dismissNotification).toHaveBeenCalledWith(1, 'dismissed');
+        expect(NotificationUtils.dismissNotification).toHaveBeenCalledWith(
+          1,
+          'dismissed'
+        );
       });
     });
 
@@ -445,7 +496,10 @@ describe('NotificationCenter', () => {
       fireEvent.click(applyButton);
 
       await waitFor(() => {
-        expect(NotificationUtils.dismissNotification).toHaveBeenCalledWith(2, 'applied');
+        expect(NotificationUtils.dismissNotification).toHaveBeenCalledWith(
+          2,
+          'applied'
+        );
         expect(onSettingAction).toHaveBeenCalledWith(mockNotifications[1]);
       });
     });
@@ -458,7 +512,10 @@ describe('NotificationCenter', () => {
       fireEvent.click(ignoreButton);
 
       await waitFor(() => {
-        expect(NotificationUtils.dismissNotification).toHaveBeenCalledWith(2, 'dismissed');
+        expect(NotificationUtils.dismissNotification).toHaveBeenCalledWith(
+          2,
+          'dismissed'
+        );
       });
     });
 
@@ -520,7 +577,7 @@ describe('NotificationCenter', () => {
       fireEvent.click(screen.getByLabelText('Notifications'));
 
       const eyeButtons = screen.getAllByTestId(/action-icon-/);
-      const toggleButton = eyeButtons.find(btn =>
+      const toggleButton = eyeButtons.find((btn) =>
         btn.querySelector('[data-testid="eye-icon"]')
       );
       fireEvent.click(toggleButton);
@@ -599,7 +656,7 @@ describe('NotificationCenter', () => {
       fireEvent.click(screen.getByLabelText('Notifications'));
 
       const eyeButtons = screen.getAllByTestId(/action-icon-/);
-      const toggleButton = eyeButtons.find(btn =>
+      const toggleButton = eyeButtons.find((btn) =>
         btn.querySelector('[data-testid="eye-icon"]')
       );
       fireEvent.click(toggleButton);
@@ -610,8 +667,12 @@ describe('NotificationCenter', () => {
 
   describe('Error Handling', () => {
     it('should handle dismiss notification errors', async () => {
-      const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {});
-      NotificationUtils.dismissNotification.mockRejectedValue(new Error('API error'));
+      const consoleError = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
+      NotificationUtils.dismissNotification.mockRejectedValue(
+        new Error('API error')
+      );
 
       renderComponent();
       fireEvent.click(screen.getByLabelText('Notifications'));
@@ -630,8 +691,12 @@ describe('NotificationCenter', () => {
     });
 
     it('should handle dismiss all notifications errors', async () => {
-      const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {});
-      NotificationUtils.dismissAllNotifications.mockRejectedValue(new Error('API error'));
+      const consoleError = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
+      NotificationUtils.dismissAllNotifications.mockRejectedValue(
+        new Error('API error')
+      );
 
       renderComponent();
       fireEvent.click(screen.getByLabelText('Notifications'));
@@ -655,7 +720,9 @@ describe('NotificationCenter', () => {
       renderComponent();
       fireEvent.click(screen.getByLabelText('Notifications'));
 
-      const expectedDate = new Date('2024-01-01T10:00:00Z').toLocaleDateString();
+      const expectedDate = new Date(
+        '2024-01-01T10:00:00Z'
+      ).toLocaleDateString();
       expect(screen.getByText(expectedDate)).toBeInTheDocument();
     });
   });
diff --git a/frontend/src/components/__tests__/SeriesModal.test.jsx b/frontend/src/components/__tests__/SeriesModal.test.jsx
index acbd35c1..c9715199 100644
--- a/frontend/src/components/__tests__/SeriesModal.test.jsx
+++ b/frontend/src/components/__tests__/SeriesModal.test.jsx
@@ -26,6 +26,7 @@ vi.mock('../../utils', () => ({
 
 // Mock lucide-react icons
 vi.mock('lucide-react', () => ({
+  ListOrdered: () => <div data-testid="icon-list-ordered" />,
   Play: () => <div data-testid="play-icon" />,
   Copy: () => <div data-testid="copy-icon" />,
 }));
@@ -40,27 +41,60 @@ vi.mock('@mantine/core', async () => {
       if (!opened) return null;
       return (
         <div data-testid="modal" data-title={title} data-size={size}>
-          <button onClick={onClose} data-testid="modal-close">Close</button>
+          <button onClick={onClose} data-testid="modal-close">
+            Close
+          </button>
           <div>{children}</div>
         </div>
       );
     },
-    Box: ({ children, ...props }) => <div data-testid="box" {...props}>{children}</div>,
+    Box: ({ children, ...props }) => (
+      <div data-testid="box" {...props}>
+        {children}
+      </div>
+    ),
     Button: ({ children, onClick, disabled, ...props }) => (
-      <button onClick={onClick} disabled={disabled} data-testid="button" {...props}>
+      <button
+        onClick={onClick}
+        disabled={disabled}
+        data-testid="button"
+        {...props}
+      >
         {children}
       </button>
     ),
-    Flex: ({ children, ...props }) => <div data-testid="flex" {...props}>{children}</div>,
-    Group: ({ children, ...props }) => <div data-testid="group" {...props}>{children}</div>,
+    Flex: ({ children, ...props }) => (
+      <div data-testid="flex" {...props}>
+        {children}
+      </div>
+    ),
+    Group: ({ children, ...props }) => (
+      <div data-testid="group" {...props}>
+        {children}
+      </div>
+    ),
     Image: ({ src, alt, ...props }) => (
       <img src={src} alt={alt} data-testid="image" {...props} />
     ),
-    Text: ({ children, ...props }) => <div data-testid="text" {...props}>{children}</div>,
-    Title: ({ children, order, ...props }) => (
-      <div data-testid="title" data-order={order} {...props}>{children}</div>
+    Text: ({ children, ...props }) => (
+      <div data-testid="text" {...props}>
+        {children}
+      </div>
     ),
-    Select: ({ value, onChange, data, label, placeholder, disabled, ...props }) => (
+    Title: ({ children, order, ...props }) => (
+      <div data-testid="title" data-order={order} {...props}>
+        {children}
+      </div>
+    ),
+    Select: ({
+      value,
+      onChange,
+      data,
+      label,
+      placeholder,
+      disabled,
+      ...props
+    }) => (
       <div data-testid="select" data-label={label}>
         <select
           value={value || ''}
@@ -77,39 +111,76 @@ vi.mock('@mantine/core', async () => {
         </select>
       </div>
     ),
-    Badge: ({ children, ...props }) => <a data-testid="badge" {...props}>{children}</a>,
+    Badge: ({ children, ...props }) => (
+      <a data-testid="badge" {...props}>
+        {children}
+      </a>
+    ),
     Loader: (props) => <div data-testid="loader" {...props} />,
-    Stack: ({ children, ...props }) => <div data-testid="stack" {...props}>{children}</div>,
+    Stack: ({ children, ...props }) => (
+      <div data-testid="stack" {...props}>
+        {children}
+      </div>
+    ),
     ActionIcon: ({ children, onClick, disabled, ...props }) => (
-      <button onClick={onClick} disabled={disabled} data-testid="action-icon" {...props}>
+      <button
+        onClick={onClick}
+        disabled={disabled}
+        data-testid="action-icon"
+        {...props}
+      >
         {children}
       </button>
     ),
     Tabs: ({ children, value, onChange, ...props }) => (
       <div data-testid="tabs" data-value={value} {...props}>
-        <div onClick={(e) => {
-          const tab = e.target.closest('[data-tab-value]');
-          if (tab) onChange?.(tab.dataset.tabValue);
-        }}>
+        <div
+          onClick={(e) => {
+            const tab = e.target.closest('[data-tab-value]');
+            if (tab) onChange?.(tab.dataset.tabValue);
+          }}
+        >
           {children}
         </div>
       </div>
     ),
     TabsList: ({ children }) => <div data-testid="tabs-list">{children}</div>,
     TabsTab: ({ children, value }) => (
-      <button data-testid="tabs-tab" data-tab-value={value}>{children}</button>
+      <button data-testid="tabs-tab" data-tab-value={value}>
+        {children}
+      </button>
     ),
     TabsPanel: ({ children, value }) => (
-      <div data-testid="tabs-panel" data-value={value}>{children}</div>
+      <div data-testid="tabs-panel" data-value={value}>
+        {children}
+      </div>
+    ),
+    Table: ({ children, ...props }) => (
+      <table data-testid="table" {...props}>
+        {children}
+      </table>
+    ),
+    TableThead: ({ children }) => (
+      <thead data-testid="table-thead">{children}</thead>
+    ),
+    TableTbody: ({ children }) => (
+      <tbody data-testid="table-tbody">{children}</tbody>
     ),
-    Table: ({ children, ...props }) => <table data-testid="table" {...props}>{children}</table>,
-    TableThead: ({ children }) => <thead data-testid="table-thead">{children}</thead>,
-    TableTbody: ({ children }) => <tbody data-testid="table-tbody">{children}</tbody>,
     TableTr: ({ children, onClick, ...props }) => (
-      <tr onClick={onClick} data-testid="table-tr" {...props}>{children}</tr>
+      <tr onClick={onClick} data-testid="table-tr" {...props}>
+        {children}
+      </tr>
+    ),
+    TableTh: ({ children, ...props }) => (
+      <th data-testid="table-th" {...props}>
+        {children}
+      </th>
+    ),
+    TableTd: ({ children, ...props }) => (
+      <td data-testid="table-td" {...props}>
+        {children}
+      </td>
     ),
-    TableTh: ({ children, ...props }) => <th data-testid="table-th" {...props}>{children}</th>,
-    TableTd: ({ children, ...props }) => <td data-testid="table-td" {...props}>{children}</td>,
     Divider: (props) => <hr data-testid="divider" {...props} />,
   };
 });
@@ -168,7 +239,7 @@ describe('SeriesModal', () => {
       m3u_account: { name: 'Provider 2' },
       stream_name: 'Test Series 720p',
       quality_info: null,
-    }
+    },
   ];
 
   beforeEach(() => {
@@ -187,9 +258,15 @@ describe('SeriesModal', () => {
       environment: { env_mode: 'prod' },
     };
 
-    useVODStore.mockImplementation((selector) => selector ? selector(mockVODStore) : mockVODStore);
-    useVideoStore.mockImplementation((selector) => selector ? selector(mockVideoStore) : mockVideoStore);
-    useSettingsStore.mockImplementation((selector) => selector ? selector(mockSettingsStore) : mockSettingsStore);
+    useVODStore.mockImplementation((selector) =>
+      selector ? selector(mockVODStore) : mockVODStore
+    );
+    useVideoStore.mockImplementation((selector) =>
+      selector ? selector(mockVideoStore) : mockVideoStore
+    );
+    useSettingsStore.mockImplementation((selector) =>
+      selector ? selector(mockSettingsStore) : mockSettingsStore
+    );
 
     copyToClipboard.mockResolvedValue(undefined);
   });
@@ -325,23 +402,37 @@ describe('SeriesModal', () => {
 
     it('should display IMDB link when imdb_id exists', async () => {
       render(
-        <SeriesModal series={mockDetailedSeries} opened={true} onClose={vi.fn()} />
+        <SeriesModal
+          series={mockDetailedSeries}
+          opened={true}
+          onClose={vi.fn()}
+        />
       );
 
       await waitFor(() => {
         const link = screen.getByText(/IMDB/i).closest('a');
-        expect(link).toHaveAttribute('href', 'https://www.imdb.com/title/tt1234567');
+        expect(link).toHaveAttribute(
+          'href',
+          'https://www.imdb.com/title/tt1234567'
+        );
       });
     });
 
     it('should display TMDB link when tmdb_id exists', async () => {
       render(
-        <SeriesModal series={mockDetailedSeries} opened={true} onClose={vi.fn()} />
+        <SeriesModal
+          series={mockDetailedSeries}
+          opened={true}
+          onClose={vi.fn()}
+        />
       );
 
       await waitFor(() => {
         const link = screen.getByText(/TMDB/i).closest('a');
-        expect(link).toHaveAttribute('href', 'https://www.themoviedb.org/tv/12345');
+        expect(link).toHaveAttribute(
+          'href',
+          'https://www.themoviedb.org/tv/12345'
+        );
       });
     });
   });
@@ -446,7 +537,12 @@ describe('SeriesModal', () => {
     });
 
     it('should sort episodes by episode number', async () => {
-      const episode2 = { ...mockEpisode, id: 2, episode_number: 2, name: 'Second Episode' };
+      const episode2 = {
+        ...mockEpisode,
+        id: 2,
+        episode_number: 2,
+        name: 'Second Episode',
+      };
       mockVODStore.fetchSeriesInfo.mockResolvedValue({
         ...mockDetailedSeries,
         episodesList: [episode2, mockEpisode],
@@ -592,7 +688,12 @@ describe('SeriesModal', () => {
 
   describe('Season Tabs', () => {
     it('should create tabs for each season', async () => {
-      const season2Episode = { ...mockEpisode, id: 2, season_number: 2, episode_num: 1 };
+      const season2Episode = {
+        ...mockEpisode,
+        id: 2,
+        season_number: 2,
+        episode_num: 1,
+      };
       mockVODStore.fetchSeriesInfo.mockResolvedValue({
         ...mockDetailedSeries,
         episodesList: [mockEpisode, season2Episode],
@@ -670,7 +771,6 @@ describe('SeriesModal', () => {
         <SeriesModal series={mockSeries} opened={true} onClose={vi.fn()} />
       );
 
-
       await waitFor(() => {
         expect(screen.getByText(/Provider 1 - 1080p/)).toBeInTheDocument();
       });
@@ -797,7 +897,7 @@ describe('SeriesModal', () => {
       );
 
       await waitFor(() => {
-        expect(screen.getByText('Test Account')).toBeInTheDocument()
+        expect(screen.getByText('Test Account')).toBeInTheDocument();
       });
     });
   });
diff --git a/frontend/src/components/cards/__tests__/RecordingCard.test.jsx b/frontend/src/components/cards/__tests__/RecordingCard.test.jsx
index 9566f2b5..24e8dc46 100644
--- a/frontend/src/components/cards/__tests__/RecordingCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/RecordingCard.test.jsx
@@ -109,13 +109,12 @@ vi.mock('@mantine/core', async () => ({
       {children}
     </span>
   ),
-  Tooltip: ({ children, label }) => (
-    <div data-tooltip={label}>{children}</div>
-  ),
+  Tooltip: ({ children, label }) => <div data-tooltip={label}>{children}</div>,
 }));
 
 // ── lucide-react ───────────────────────────────────────────────────────────────
 vi.mock('lucide-react', () => ({
+  ListOrdered: () => <svg data-testid="icon-list-ordered" />,
   AlertTriangle: () => <svg data-testid="icon-alert-triangle" />,
   Plus: () => <svg data-testid="icon-plus" />,
   Square: () => <svg data-testid="icon-square" />,
@@ -140,8 +139,13 @@ vi.mock('../../../images/logo.png', () => ({ default: 'default-logo.png' }));
 import useChannelsStore from '../../../store/channels.jsx';
 import useSettingsStore from '../../../store/settings.jsx';
 import useVideoStore from '../../../store/useVideoStore.jsx';
-import { useDateTimeFormat, useTimeHelpers, format, isAfter, isBefore }
-  from '../../../utils/dateTimeUtils.js';
+import {
+  useDateTimeFormat,
+  useTimeHelpers,
+  format,
+  isAfter,
+  isBefore,
+} from '../../../utils/dateTimeUtils.js';
 import { notifications } from '@mantine/notifications';
 import * as RecordingCardUtils from '../../../utils/cards/RecordingCardUtils.js';
 import dayjs from 'dayjs';
@@ -187,7 +191,11 @@ const makeChannel = () => ({
 });
 
 /** Wire up all store/utility mocks with sensible defaults */
-const setupMocks = ({ now = NOW, recording = makeRecording(), channel = makeChannel() } = {}) => {
+const setupMocks = ({
+  now = NOW,
+  recording = makeRecording(),
+  channel = makeChannel(),
+} = {}) => {
   const nowMoment = makeMoment(now);
   const startMoment = makeMoment(recording.start_time);
   const endMoment = makeMoment(recording.end_time);
@@ -226,9 +234,13 @@ const setupMocks = ({ now = NOW, recording = makeRecording(), channel = makeChan
 
   vi.mocked(RecordingCardUtils.getPosterUrl).mockReturnValue('/poster.jpg');
   vi.mocked(RecordingCardUtils.getChannelLogoUrl).mockReturnValue('/logo.png');
-  vi.mocked(RecordingCardUtils.getRecordingUrl).mockReturnValue('/recordings/test.ts');
+  vi.mocked(RecordingCardUtils.getRecordingUrl).mockReturnValue(
+    '/recordings/test.ts'
+  );
   vi.mocked(RecordingCardUtils.getSeasonLabel).mockReturnValue('');
-  vi.mocked(RecordingCardUtils.getSeriesInfo).mockReturnValue({ seriesId: 's1' });
+  vi.mocked(RecordingCardUtils.getSeriesInfo).mockReturnValue({
+    seriesId: 's1',
+  });
   vi.mocked(RecordingCardUtils.getShowVideoUrl).mockReturnValue('/live/ch-1');
 
   return { mockShowVideo, mockFetchRecordings };
@@ -237,10 +249,18 @@ const setupMocks = ({ now = NOW, recording = makeRecording(), channel = makeChan
 describe('RecordingCard', () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.mocked(RecordingCardUtils.stopRecordingById).mockResolvedValue(undefined);
-    vi.mocked(RecordingCardUtils.deleteRecordingById).mockResolvedValue(undefined);
-    vi.mocked(RecordingCardUtils.deleteSeriesAndRule).mockResolvedValue(undefined);
-    vi.mocked(RecordingCardUtils.extendRecordingById).mockResolvedValue(undefined);
+    vi.mocked(RecordingCardUtils.stopRecordingById).mockResolvedValue(
+      undefined
+    );
+    vi.mocked(RecordingCardUtils.deleteRecordingById).mockResolvedValue(
+      undefined
+    );
+    vi.mocked(RecordingCardUtils.deleteSeriesAndRule).mockResolvedValue(
+      undefined
+    );
+    vi.mocked(RecordingCardUtils.extendRecordingById).mockResolvedValue(
+      undefined
+    );
     vi.mocked(RecordingCardUtils.runComSkip).mockResolvedValue(undefined);
     vi.mocked(RecordingCardUtils.removeRecording).mockReturnValue(undefined);
   });
@@ -250,17 +270,23 @@ describe('RecordingCard', () => {
   describe('rendering', () => {
     it('renders the recording title', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       expect(screen.getByText('Test Show')).toBeInTheDocument();
     });
 
     it('renders "Custom Recording" when no program title', () => {
       setupMocks({
-        recording: makeRecording({ custom_properties: { status: 'completed', program: {} } }),
+        recording: makeRecording({
+          custom_properties: { status: 'completed', program: {} },
+        }),
       });
       render(
         <RecordingCard
-          recording={makeRecording({ custom_properties: { status: 'completed', program: {} } })}
+          recording={makeRecording({
+            custom_properties: { status: 'completed', program: {} },
+          })}
           channel={makeChannel()}
         />
       );
@@ -269,7 +295,9 @@ describe('RecordingCard', () => {
 
     it('renders channel info', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       expect(screen.getByText('501 • HBO')).toBeInTheDocument();
     });
 
@@ -281,27 +309,35 @@ describe('RecordingCard', () => {
 
     it('shows description via RecordingSynopsis for non-series completed recording', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       expect(screen.getByTestId('recording-synopsis')).toBeInTheDocument();
       expect(screen.getByText('A test description')).toBeInTheDocument();
     });
 
     it('shows sub_title when present', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       expect(screen.getByText('Pilot')).toBeInTheDocument();
     });
 
     it('shows season/episode label when getSeasonLabel returns a value', () => {
       setupMocks();
       vi.mocked(RecordingCardUtils.getSeasonLabel).mockReturnValue('S01E02');
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       expect(screen.getByText('S01E02')).toBeInTheDocument();
     });
 
     it('renders the poster image', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       const img = screen.getByAltText('Test Show');
       expect(img).toHaveAttribute('src', '/poster.jpg');
     });
@@ -312,7 +348,9 @@ describe('RecordingCard', () => {
   describe('status badge', () => {
     it('shows "Completed" badge for a completed recording', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       expect(screen.getByText('Completed')).toBeInTheDocument();
     });
 
@@ -320,7 +358,10 @@ describe('RecordingCard', () => {
       const recording = makeRecording({
         start_time: PAST,
         end_time: FUTURE,
-        custom_properties: { status: 'recording', program: { title: 'Live Show' } },
+        custom_properties: {
+          status: 'recording',
+          program: { title: 'Live Show' },
+        },
       });
       setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
@@ -331,7 +372,10 @@ describe('RecordingCard', () => {
       const recording = makeRecording({
         start_time: FUTURE,
         end_time: FUTURE,
-        custom_properties: { status: 'scheduled', program: { title: 'Future Show' } },
+        custom_properties: {
+          status: 'scheduled',
+          program: { title: 'Future Show' },
+        },
       });
       setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
@@ -373,8 +417,7 @@ describe('RecordingCard', () => {
   // ── Series group ───────────────────────────────────────────────────────────
 
   describe('series group', () => {
-    const makeSeriesRecording = () =>
-      makeRecording({ _group_count: 3 });
+    const makeSeriesRecording = () => makeRecording({ _group_count: 3 });
 
     it('shows "Series" badge when _group_count > 1', () => {
       const recording = makeSeriesRecording();
@@ -394,7 +437,9 @@ describe('RecordingCard', () => {
       const recording = makeSeriesRecording();
       setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
-      expect(screen.queryByTestId('recording-synopsis')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('recording-synopsis')
+      ).not.toBeInTheDocument();
     });
   });
 
@@ -500,7 +545,9 @@ describe('RecordingCard', () => {
 
     it('does not show "Watch Live" for a completed recording', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       expect(screen.queryByText('Watch Live')).not.toBeInTheDocument();
     });
 
@@ -523,7 +570,9 @@ describe('RecordingCard', () => {
 
     it('shows "Watch" button for a completed recording', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       expect(screen.getByText('Watch')).toBeInTheDocument();
     });
 
@@ -531,7 +580,10 @@ describe('RecordingCard', () => {
       const recording = makeRecording({
         start_time: FUTURE,
         end_time: FUTURE,
-        custom_properties: { status: 'scheduled', program: { title: 'Future' } },
+        custom_properties: {
+          status: 'scheduled',
+          program: { title: 'Future' },
+        },
       });
       setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
@@ -540,7 +592,9 @@ describe('RecordingCard', () => {
 
     it('calls showVideo with vod params when Watch is clicked', () => {
       const { mockShowVideo } = setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       fireEvent.click(screen.getByText('Watch'));
       expect(mockShowVideo).toHaveBeenCalledWith(
         '/recordings/test.ts',
@@ -552,7 +606,9 @@ describe('RecordingCard', () => {
     it('does not call showVideo when Watch is clicked but no file url', () => {
       const { mockShowVideo } = setupMocks();
       vi.mocked(RecordingCardUtils.getRecordingUrl).mockReturnValue(null);
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       fireEvent.click(screen.getByText('Watch'));
       expect(mockShowVideo).not.toHaveBeenCalled();
     });
@@ -575,7 +631,9 @@ describe('RecordingCard', () => {
   describe('"Remove commercials" button', () => {
     it('shows "Remove commercials" for a completed recording without comskip', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       expect(screen.getByText('Remove commercials')).toBeInTheDocument();
     });
 
@@ -597,7 +655,10 @@ describe('RecordingCard', () => {
       const recording = makeRecording({
         start_time: FUTURE,
         end_time: FUTURE,
-        custom_properties: { status: 'scheduled', program: { title: 'Future' } },
+        custom_properties: {
+          status: 'scheduled',
+          program: { title: 'Future' },
+        },
       });
       setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
@@ -606,20 +667,31 @@ describe('RecordingCard', () => {
 
     it('calls runComSkip and shows notification on success', async () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       fireEvent.click(screen.getByText('Remove commercials'));
       await waitFor(() => {
-        expect(RecordingCardUtils.runComSkip).toHaveBeenCalledWith(makeRecording());
+        expect(RecordingCardUtils.runComSkip).toHaveBeenCalledWith(
+          makeRecording()
+        );
         expect(notifications.show).toHaveBeenCalledWith(
-          expect.objectContaining({ title: 'Removing commercials', color: 'blue.5' })
+          expect.objectContaining({
+            title: 'Removing commercials',
+            color: 'blue.5',
+          })
         );
       });
     });
 
     it('does not show notification when runComSkip throws', async () => {
-      vi.mocked(RecordingCardUtils.runComSkip).mockRejectedValue(new Error('fail'));
+      vi.mocked(RecordingCardUtils.runComSkip).mockRejectedValue(
+        new Error('fail')
+      );
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
       fireEvent.click(screen.getByText('Remove commercials'));
       await waitFor(() => {
         expect(notifications.show).not.toHaveBeenCalled();
@@ -634,7 +706,11 @@ describe('RecordingCard', () => {
       makeRecording({
         start_time: PAST,
         end_time: FUTURE,
-        custom_properties: { status: 'recording', program: { title: 'Live Show' }, file_url: '/f.ts' },
+        custom_properties: {
+          status: 'recording',
+          program: { title: 'Live Show' },
+          file_url: '/f.ts',
+        },
       });
 
     it('shows extend menu for in-progress recording', () => {
@@ -650,9 +726,15 @@ describe('RecordingCard', () => {
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
       fireEvent.click(screen.getByText('+15 minutes'));
       await waitFor(() => {
-        expect(RecordingCardUtils.extendRecordingById).toHaveBeenCalledWith('rec-1', 15);
+        expect(RecordingCardUtils.extendRecordingById).toHaveBeenCalledWith(
+          'rec-1',
+          15
+        );
         expect(notifications.show).toHaveBeenCalledWith(
-          expect.objectContaining({ title: 'Recording extended', color: 'teal' })
+          expect.objectContaining({
+            title: 'Recording extended',
+            color: 'teal',
+          })
         );
       });
     });
@@ -663,7 +745,10 @@ describe('RecordingCard', () => {
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
       fireEvent.click(screen.getByText('+30 minutes'));
       await waitFor(() => {
-        expect(RecordingCardUtils.extendRecordingById).toHaveBeenCalledWith('rec-1', 30);
+        expect(RecordingCardUtils.extendRecordingById).toHaveBeenCalledWith(
+          'rec-1',
+          30
+        );
       });
     });
 
@@ -673,12 +758,17 @@ describe('RecordingCard', () => {
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
       fireEvent.click(screen.getByText('+1 hour'));
       await waitFor(() => {
-        expect(RecordingCardUtils.extendRecordingById).toHaveBeenCalledWith('rec-1', 60);
+        expect(RecordingCardUtils.extendRecordingById).toHaveBeenCalledWith(
+          'rec-1',
+          60
+        );
       });
     });
 
     it('shows error notification when extendRecordingById throws', async () => {
-      vi.mocked(RecordingCardUtils.extendRecordingById).mockRejectedValue(new Error('Network error'));
+      vi.mocked(RecordingCardUtils.extendRecordingById).mockRejectedValue(
+        new Error('Network error')
+      );
       const recording = makeInProgress();
       setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
@@ -698,7 +788,11 @@ describe('RecordingCard', () => {
       makeRecording({
         start_time: PAST,
         end_time: FUTURE,
-        custom_properties: { status: 'recording', program: { title: 'Live Show' }, file_url: '/f.ts' },
+        custom_properties: {
+          status: 'recording',
+          program: { title: 'Live Show' },
+          file_url: '/f.ts',
+        },
       });
 
     it('shows stop modal when stop button is clicked', () => {
@@ -711,7 +805,9 @@ describe('RecordingCard', () => {
       fireEvent.click(stopButton);
 
       expect(screen.getByTestId('modal')).toBeInTheDocument();
-      expect(screen.getByTestId('modal-title')).toHaveTextContent('Stop Recording');
+      expect(screen.getByTestId('modal-title')).toHaveTextContent(
+        'Stop Recording'
+      );
     });
 
     it('closes stop modal when Go Back is clicked', () => {
@@ -736,7 +832,9 @@ describe('RecordingCard', () => {
       fireEvent.click(screen.getAllByText('Stop Recording')[1]);
 
       await waitFor(() => {
-        expect(RecordingCardUtils.stopRecordingById).toHaveBeenCalledWith('rec-1');
+        expect(RecordingCardUtils.stopRecordingById).toHaveBeenCalledWith(
+          'rec-1'
+        );
         expect(mockFetchRecordings).toHaveBeenCalled();
       });
     });
@@ -761,48 +859,71 @@ describe('RecordingCard', () => {
   describe('delete recording', () => {
     it('shows delete modal for a completed non-series recording', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
 
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
 
       expect(screen.getByTestId('modal')).toBeInTheDocument();
-      expect(screen.getByTestId('modal-title')).toHaveTextContent('Delete Recording');
+      expect(screen.getByTestId('modal-title')).toHaveTextContent(
+        'Delete Recording'
+      );
     });
 
     it('shows "Cancel Recording" title for upcoming recording delete', () => {
       const recording = makeRecording({
         start_time: FUTURE,
         end_time: FUTURE,
-        custom_properties: { status: 'scheduled', program: { title: 'Future Show' } },
+        custom_properties: {
+          status: 'scheduled',
+          program: { title: 'Future Show' },
+        },
       });
       setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
 
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
 
-      expect(screen.getByTestId('modal-title')).toHaveTextContent('Cancel Recording');
+      expect(screen.getByTestId('modal-title')).toHaveTextContent(
+        'Cancel Recording'
+      );
     });
 
     it('calls removeRecording when delete is confirmed', async () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
 
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
       fireEvent.click(screen.getByText('Delete'));
 
       await waitFor(() => {
-        expect(RecordingCardUtils.removeRecording).toHaveBeenCalledWith('rec-1');
+        expect(RecordingCardUtils.removeRecording).toHaveBeenCalledWith(
+          'rec-1'
+        );
       });
     });
 
     it('closes delete modal after confirming', async () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
 
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
       fireEvent.click(screen.getByText('Delete'));
 
@@ -813,9 +934,13 @@ describe('RecordingCard', () => {
 
     it('closes delete modal on Go Back click', () => {
       setupMocks();
-      render(<RecordingCard recording={makeRecording()} channel={makeChannel()} />);
+      render(
+        <RecordingCard recording={makeRecording()} channel={makeChannel()} />
+      );
 
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
       fireEvent.click(screen.getByText('Go Back'));
 
@@ -842,10 +967,14 @@ describe('RecordingCard', () => {
       setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
 
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
 
-      expect(screen.getByTestId('modal-title')).toHaveTextContent('Cancel Series');
+      expect(screen.getByTestId('modal-title')).toHaveTextContent(
+        'Cancel Series'
+      );
     });
 
     it('calls deleteRecordingById when "Only this upcoming" is clicked', async () => {
@@ -853,12 +982,16 @@ describe('RecordingCard', () => {
       const { mockFetchRecordings } = setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
 
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
       fireEvent.click(screen.getByText('Only this upcoming'));
 
       await waitFor(() => {
-        expect(RecordingCardUtils.deleteRecordingById).toHaveBeenCalledWith('rec-1');
+        expect(RecordingCardUtils.deleteRecordingById).toHaveBeenCalledWith(
+          'rec-1'
+        );
         expect(mockFetchRecordings).toHaveBeenCalled();
       });
     });
@@ -868,7 +1001,9 @@ describe('RecordingCard', () => {
       const { mockFetchRecordings } = setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
 
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
       fireEvent.click(screen.getByText('Entire series + rule'));
 
@@ -883,7 +1018,9 @@ describe('RecordingCard', () => {
       setupMocks({ recording });
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
 
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
       fireEvent.click(screen.getByText('Only this upcoming'));
 
@@ -918,13 +1055,18 @@ describe('RecordingCard', () => {
         _group_count: 3,
         start_time: FUTURE,
         end_time: FUTURE,
-        custom_properties: { status: 'scheduled', program: { title: 'Series' } },
+        custom_properties: {
+          status: 'scheduled',
+          program: { title: 'Series' },
+        },
       });
       const { mockFetchRecordings } = setupMocks({ recording });
       mockFetchRecordings.mockRejectedValue(new Error('network'));
 
       render(<RecordingCard recording={recording} channel={makeChannel()} />);
-      const deleteButton = screen.getByTestId('icon-square-x').closest('button');
+      const deleteButton = screen
+        .getByTestId('icon-square-x')
+        .closest('button');
       fireEvent.click(deleteButton);
 
       await expect(
@@ -932,4 +1074,4 @@ describe('RecordingCard', () => {
       ).resolves.not.toThrow();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/cards/__tests__/SeriesCard.test.jsx b/frontend/src/components/cards/__tests__/SeriesCard.test.jsx
index fb95c882..49b8524f 100644
--- a/frontend/src/components/cards/__tests__/SeriesCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/SeriesCard.test.jsx
@@ -30,7 +30,13 @@ vi.mock('@mantine/core', async () => ({
   ),
   Stack: ({ children, gap }) => <div data-testid="stack">{children}</div>,
   Text: ({ children, size, fw, c, lineClamp, style }) => (
-    <span data-testid="text" data-size={size} data-fw={fw} data-color={c} style={style}>
+    <span
+      data-testid="text"
+      data-size={size}
+      data-fw={fw}
+      data-color={c}
+      style={style}
+    >
       {children}
     </span>
   ),
@@ -38,6 +44,7 @@ vi.mock('@mantine/core', async () => ({
 
 // ── lucide-react ───────────────────────────────────────────────────────────────
 vi.mock('lucide-react', () => ({
+  ListOrdered: () => <svg data-testid="icon-list-ordered" />,
   Calendar: () => <svg data-testid="icon-calendar" />,
   Play: () => <svg data-testid="icon-play" />,
   Star: () => <svg data-testid="icon-star" />,
@@ -78,7 +85,12 @@ describe('SeriesCard', () => {
     });
 
     it('renders a fallback image when poster_url is missing', () => {
-      render(<SeriesCard series={makeSeries({ poster_url: null })} onClick={vi.fn()} />);
+      render(
+        <SeriesCard
+          series={makeSeries({ poster_url: null })}
+          onClick={vi.fn()}
+        />
+      );
       const img = screen.getByRole('img');
       expect(img).toBeInTheDocument();
     });
@@ -105,7 +117,12 @@ describe('SeriesCard', () => {
 
     it('renders play icon', () => {
       //this only renders when logo.url is missing, but we want to test that the icon itself renders correctly
-      render(<SeriesCard series={makeSeries({ logo: { url: null } })} onClick={vi.fn()} />);
+      render(
+        <SeriesCard
+          series={makeSeries({ logo: { url: null } })}
+          onClick={vi.fn()}
+        />
+      );
       expect(screen.getByTestId('icon-play')).toBeInTheDocument();
     });
 
@@ -119,27 +136,52 @@ describe('SeriesCard', () => {
 
   describe('optional fields', () => {
     it('does not crash when year is missing', () => {
-      render(<SeriesCard series={makeSeries({ year: undefined })} onClick={vi.fn()} />);
+      render(
+        <SeriesCard
+          series={makeSeries({ year: undefined })}
+          onClick={vi.fn()}
+        />
+      );
       expect(screen.getByTestId('series-card')).toBeInTheDocument();
     });
 
     it('does not crash when rating is missing', () => {
-      render(<SeriesCard series={makeSeries({ rating: undefined })} onClick={vi.fn()} />);
+      render(
+        <SeriesCard
+          series={makeSeries({ rating: undefined })}
+          onClick={vi.fn()}
+        />
+      );
       expect(screen.getByTestId('series-card')).toBeInTheDocument();
     });
 
     it('does not crash when genre is missing', () => {
-      render(<SeriesCard series={makeSeries({ genre: undefined })} onClick={vi.fn()} />);
+      render(
+        <SeriesCard
+          series={makeSeries({ genre: undefined })}
+          onClick={vi.fn()}
+        />
+      );
       expect(screen.getByTestId('series-card')).toBeInTheDocument();
     });
 
     it('does not crash when description is missing', () => {
-      render(<SeriesCard series={makeSeries({ description: undefined })} onClick={vi.fn()} />);
+      render(
+        <SeriesCard
+          series={makeSeries({ description: undefined })}
+          onClick={vi.fn()}
+        />
+      );
       expect(screen.getByTestId('series-card')).toBeInTheDocument();
     });
 
     it('does not crash when seasons is missing', () => {
-      render(<SeriesCard series={makeSeries({ seasons: undefined })} onClick={vi.fn()} />);
+      render(
+        <SeriesCard
+          series={makeSeries({ seasons: undefined })}
+          onClick={vi.fn()}
+        />
+      );
       expect(screen.getByTestId('series-card')).toBeInTheDocument();
     });
 
@@ -161,4 +203,4 @@ describe('SeriesCard', () => {
       expect(onClick).toHaveBeenCalledWith(series);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx b/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx
index babcf1e6..2f006244 100644
--- a/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx
@@ -95,7 +95,12 @@ vi.mock('@mantine/core', () => ({
   Center: ({ children }) => <div data-testid="center">{children}</div>,
   Group: ({ children }) => <div data-testid="group">{children}</div>,
   Progress: ({ value, size, color }) => (
-    <div data-testid="progress" data-value={value} data-size={size} data-color={color} />
+    <div
+      data-testid="progress"
+      data-value={value}
+      data-size={size}
+      data-color={color}
+    />
   ),
   Select: ({ value, onChange, label, data, disabled, placeholder }) => (
     <select
@@ -129,9 +134,7 @@ vi.mock('@mantine/core', () => ({
       {children}
     </span>
   ),
-  Tooltip: ({ children, label }) => (
-    <div data-tooltip={label}>{children}</div>
-  ),
+  Tooltip: ({ children, label }) => <div data-tooltip={label}>{children}</div>,
   useMantineTheme: vi.fn(() => ({
     tailwind: { green: { 5: '#22c55e' } },
   })),
@@ -139,6 +142,22 @@ vi.mock('@mantine/core', () => ({
 
 // ── lucide-react ──────────────────────────────────────────────────────────────
 vi.mock('lucide-react', () => ({
+  // navigation.js icons (all must be present for the auth→navigation import chain)
+  ListOrdered: () => <svg data-testid="icon-list-ordered" />,
+  Play: () => <svg data-testid="icon-play" />,
+  Database: () => <svg data-testid="icon-database" />,
+  LayoutGrid: () => <svg data-testid="icon-layout-grid" />,
+  Settings: () => <svg data-testid="icon-settings" />,
+  ChartLine: () => <svg data-testid="icon-chart-line" />,
+  Video: () => <svg data-testid="icon-video" />,
+  PlugZap: () => <svg data-testid="icon-plug-zap" />,
+  User: () => <svg data-testid="icon-user" />,
+  FileImage: () => <svg data-testid="icon-file-image" />,
+  Webhook: () => <svg data-testid="icon-webhook" />,
+  Logs: () => <svg data-testid="icon-logs" />,
+  Blocks: () => <svg data-testid="icon-blocks" />,
+  MonitorCog: () => <svg data-testid="icon-monitor-cog" />,
+  // StreamConnectionCard-specific icons
   ChevronDown: () => <svg data-testid="icon-chevron-down" />,
   ChevronRight: () => <svg data-testid="icon-chevron-right" />,
   CirclePlay: () => <svg data-testid="icon-circle-play" />,
@@ -149,7 +168,6 @@ vi.mock('lucide-react', () => ({
   SquareX: () => <svg data-testid="icon-square-x" />,
   Timer: () => <svg data-testid="icon-timer" />,
   Users: () => <svg data-testid="icon-users" />,
-  Video: () => <svg data-testid="icon-video" />,
 }));
 
 // ── Imports after mocks ───────────────────────────────────────────────────────
@@ -264,13 +282,17 @@ describe('StreamConnectionCard', () => {
   describe('route guard', () => {
     it('renders nothing when pathname is not /stats', () => {
       setupLocation('/dashboard');
-      const { container } = render(<StreamConnectionCard {...defaultProps()} />);
+      const { container } = render(
+        <StreamConnectionCard {...defaultProps()} />
+      );
       expect(container.firstChild).toBeNull();
     });
 
     it('renders nothing when pathname is /channels', () => {
       setupLocation('/channels');
-      const { container } = render(<StreamConnectionCard {...defaultProps()} />);
+      const { container } = render(
+        <StreamConnectionCard {...defaultProps()} />
+      );
       expect(container.firstChild).toBeNull();
     });
 
@@ -337,7 +359,9 @@ describe('StreamConnectionCard', () => {
       vi.mocked(getStreamsByIds).mockResolvedValue([]);
       render(
         <StreamConnectionCard
-          {...defaultProps({ channel: makeChannel({ name: '', stream_id: null }) })}
+          {...defaultProps({
+            channel: makeChannel({ name: '', stream_id: null }),
+          })}
         />
       );
       expect(screen.getByText('Unnamed Channel')).toBeInTheDocument();
@@ -465,7 +489,9 @@ describe('StreamConnectionCard', () => {
 
   describe('current program', () => {
     it('does not render program section when currentProgram is null', () => {
-      render(<StreamConnectionCard {...defaultProps({ currentProgram: null })} />);
+      render(
+        <StreamConnectionCard {...defaultProps({ currentProgram: null })} />
+      );
       expect(screen.queryByText('Now Playing:')).not.toBeInTheDocument();
     });
 
@@ -493,7 +519,9 @@ describe('StreamConnectionCard', () => {
           {...defaultProps({ currentProgram: makeCurrentProgram() })}
         />
       );
-      expect(screen.queryByText('Daily news broadcast.')).not.toBeInTheDocument();
+      expect(
+        screen.queryByText('Daily news broadcast.')
+      ).not.toBeInTheDocument();
     });
 
     it('expands program description when chevron button is clicked', () => {
@@ -502,7 +530,9 @@ describe('StreamConnectionCard', () => {
           {...defaultProps({ currentProgram: makeCurrentProgram() })}
         />
       );
-      const chevronBtn = screen.getByTestId('icon-chevron-right').closest('button');
+      const chevronBtn = screen
+        .getByTestId('icon-chevron-right')
+        .closest('button');
       fireEvent.click(chevronBtn);
       expect(screen.getByText('Daily news broadcast.')).toBeInTheDocument();
     });
@@ -513,12 +543,18 @@ describe('StreamConnectionCard', () => {
           {...defaultProps({ currentProgram: makeCurrentProgram() })}
         />
       );
-      const chevronBtn = screen.getByTestId('icon-chevron-right').closest('button');
+      const chevronBtn = screen
+        .getByTestId('icon-chevron-right')
+        .closest('button');
       fireEvent.click(chevronBtn);
       expect(screen.getByText('Daily news broadcast.')).toBeInTheDocument();
-      const chevronDownBtn = screen.getByTestId('icon-chevron-down').closest('button');
+      const chevronDownBtn = screen
+        .getByTestId('icon-chevron-down')
+        .closest('button');
       fireEvent.click(chevronDownBtn);
-      expect(screen.queryByText('Daily news broadcast.')).not.toBeInTheDocument();
+      expect(
+        screen.queryByText('Daily news broadcast.')
+      ).not.toBeInTheDocument();
     });
 
     it('renders program progress when expanded and times are present', () => {
@@ -527,7 +563,9 @@ describe('StreamConnectionCard', () => {
           {...defaultProps({ currentProgram: makeCurrentProgram() })}
         />
       );
-      const chevronBtn = screen.getByTestId('icon-chevron-right').closest('button');
+      const chevronBtn = screen
+        .getByTestId('icon-chevron-right')
+        .closest('button');
       fireEvent.click(chevronBtn);
       expect(screen.getByTestId('progress')).toBeInTheDocument();
     });
@@ -536,11 +574,16 @@ describe('StreamConnectionCard', () => {
       render(
         <StreamConnectionCard
           {...defaultProps({
-            currentProgram: makeCurrentProgram({ start_time: null, end_time: null }),
+            currentProgram: makeCurrentProgram({
+              start_time: null,
+              end_time: null,
+            }),
           })}
         />
       );
-      const chevronBtn = screen.getByTestId('icon-chevron-right').closest('button');
+      const chevronBtn = screen
+        .getByTestId('icon-chevron-right')
+        .closest('button');
       fireEvent.click(chevronBtn);
       expect(screen.queryByTestId('progress')).not.toBeInTheDocument();
     });
@@ -570,9 +613,8 @@ describe('StreamConnectionCard', () => {
         { id: 11, name: 'Stream B', url: 'http://b.com', m3u_profile: null },
       ]);
       // Provide options via getStreamOptions mock
-      const { getStreamOptions } = await import(
-        '../../../utils/cards/StreamConnectionCardUtils.js'
-        );
+      const { getStreamOptions } =
+        await import('../../../utils/cards/StreamConnectionCardUtils.js');
       vi.mocked(getStreamOptions).mockReturnValue([
         { value: '10', label: 'Stream A' },
         { value: '11', label: 'Stream B' },
@@ -585,7 +627,12 @@ describe('StreamConnectionCard', () => {
 
     it('sets activeStreamId when a matching stream is found by URL', async () => {
       vi.mocked(getChannelStreams).mockResolvedValue([
-        { id: 42, name: 'Stream A', url: 'http://stream.example.com/ch1', m3u_profile: null },
+        {
+          id: 42,
+          name: 'Stream A',
+          url: 'http://stream.example.com/ch1',
+          m3u_profile: null,
+        },
       ]);
       vi.mocked(getMatchingStreamByUrl).mockReturnValue({
         id: 42,
@@ -614,11 +661,15 @@ describe('StreamConnectionCard', () => {
   describe('stream switching', () => {
     beforeEach(async () => {
       vi.mocked(getChannelStreams).mockResolvedValue([
-        { id: 10, name: 'Stream A', url: 'http://a.com', m3u_profile: { name: 'M3U A' } },
+        {
+          id: 10,
+          name: 'Stream A',
+          url: 'http://a.com',
+          m3u_profile: { name: 'M3U A' },
+        },
       ]);
-      const { getStreamOptions } = await import(
-        '../../../utils/cards/StreamConnectionCardUtils.js'
-        );
+      const { getStreamOptions } =
+        await import('../../../utils/cards/StreamConnectionCardUtils.js');
       vi.mocked(getStreamOptions).mockReturnValue([
         { value: '10', label: 'Stream A' },
       ]);
@@ -633,7 +684,9 @@ describe('StreamConnectionCard', () => {
       vi.mocked(switchStream).mockResolvedValue({});
       render(<StreamConnectionCard {...defaultProps()} />);
       await waitFor(() => screen.getByTestId('select'));
-      fireEvent.change(screen.getByTestId('select'), { target: { value: '10' } });
+      fireEvent.change(screen.getByTestId('select'), {
+        target: { value: '10' },
+      });
       await waitFor(() => {
         expect(switchStream).toHaveBeenCalledWith(
           expect.objectContaining({ channel_id: 'ch-uuid-1' }),
@@ -646,7 +699,9 @@ describe('StreamConnectionCard', () => {
       vi.mocked(switchStream).mockResolvedValue({});
       render(<StreamConnectionCard {...defaultProps()} />);
       await waitFor(() => screen.getByTestId('select'));
-      fireEvent.change(screen.getByTestId('select'), { target: { value: '10' } });
+      fireEvent.change(screen.getByTestId('select'), {
+        target: { value: '10' },
+      });
       await waitFor(() => {
         expect(showNotification).toHaveBeenCalledWith(
           expect.objectContaining({ color: 'blue.5' })
@@ -658,7 +713,9 @@ describe('StreamConnectionCard', () => {
       vi.mocked(switchStream).mockRejectedValue(new Error('Switch failed'));
       render(<StreamConnectionCard {...defaultProps()} />);
       await waitFor(() => screen.getByTestId('select'));
-      fireEvent.change(screen.getByTestId('select'), { target: { value: '10' } });
+      fireEvent.change(screen.getByTestId('select'), {
+        target: { value: '10' },
+      });
       await waitFor(() => {
         expect(showNotification).toHaveBeenCalledWith(
           expect.objectContaining({ color: 'red.5' })
@@ -672,7 +729,9 @@ describe('StreamConnectionCard', () => {
       });
       render(<StreamConnectionCard {...defaultProps()} />);
       await waitFor(() => screen.getByTestId('select'));
-      fireEvent.change(screen.getByTestId('select'), { target: { value: '10' } });
+      fireEvent.change(screen.getByTestId('select'), {
+        target: { value: '10' },
+      });
       await waitFor(() => {
         expect(screen.getByText('Updated M3U')).toBeInTheDocument();
       });
@@ -686,7 +745,9 @@ describe('StreamConnectionCard', () => {
       vi.mocked(getChannelStreams).mockResolvedValue([]);
       render(<StreamConnectionCard {...defaultProps()} />);
       await waitFor(() => {
-        expect(screen.queryByTestId('icon-circle-play')).not.toBeInTheDocument();
+        expect(
+          screen.queryByTestId('icon-circle-play')
+        ).not.toBeInTheDocument();
       });
     });
 
@@ -694,10 +755,11 @@ describe('StreamConnectionCard', () => {
       vi.mocked(getChannelStreams).mockResolvedValue([
         { id: 10, name: 'Stream A', url: 'http://a.com', m3u_profile: null },
       ]);
-      const { getStreamOptions } = await import(
-        '../../../utils/cards/StreamConnectionCardUtils.js'
-        );
-      vi.mocked(getStreamOptions).mockReturnValue([{ value: '10', label: 'Stream A' }]);
+      const { getStreamOptions } =
+        await import('../../../utils/cards/StreamConnectionCardUtils.js');
+      vi.mocked(getStreamOptions).mockReturnValue([
+        { value: '10', label: 'Stream A' },
+      ]);
       render(<StreamConnectionCard {...defaultProps()} />);
       await waitFor(() => {
         expect(screen.getByTestId('icon-circle-play')).toBeInTheDocument();
@@ -712,10 +774,11 @@ describe('StreamConnectionCard', () => {
       vi.mocked(getChannelStreams).mockResolvedValue([
         { id: 10, name: 'Stream A', url: 'http://a.com', m3u_profile: null },
       ]);
-      const { getStreamOptions } = await import(
-        '../../../utils/cards/StreamConnectionCardUtils.js'
-        );
-      vi.mocked(getStreamOptions).mockReturnValue([{ value: '10', label: 'Stream A' }]);
+      const { getStreamOptions } =
+        await import('../../../utils/cards/StreamConnectionCardUtils.js');
+      vi.mocked(getStreamOptions).mockReturnValue([
+        { value: '10', label: 'Stream A' },
+      ]);
 
       render(<StreamConnectionCard {...defaultProps()} />);
       await waitFor(() => screen.getByTestId('icon-circle-play'));
@@ -738,10 +801,11 @@ describe('StreamConnectionCard', () => {
       vi.mocked(getChannelStreams).mockResolvedValue([
         { id: 10, name: 'Stream A', url: 'http://a.com', m3u_profile: null },
       ]);
-      const { getStreamOptions } = await import(
-        '../../../utils/cards/StreamConnectionCardUtils.js'
-        );
-      vi.mocked(getStreamOptions).mockReturnValue([{ value: '10', label: 'Stream A' }]);
+      const { getStreamOptions } =
+        await import('../../../utils/cards/StreamConnectionCardUtils.js');
+      vi.mocked(getStreamOptions).mockReturnValue([
+        { value: '10', label: 'Stream A' },
+      ]);
 
       render(
         <StreamConnectionCard {...defaultProps({ channelsByUUID: {} })} />
@@ -837,4 +901,4 @@ describe('StreamConnectionCard', () => {
       expect(screen.getAllByText('0 Kbps').length).toBeGreaterThan(0);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/cards/__tests__/VODCard.test.jsx b/frontend/src/components/cards/__tests__/VODCard.test.jsx
index 05e98b1e..679d8145 100644
--- a/frontend/src/components/cards/__tests__/VODCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/VODCard.test.jsx
@@ -10,12 +10,22 @@ vi.mock('../../../utils/cards/VODCardUtils.js', () => ({
 // ── Mantine core ──────────────────────────────────────────────────────────────
 vi.mock('@mantine/core', () => ({
   ActionIcon: ({ children, onClick, variant, size }) => (
-    <button data-testid="action-icon" data-variant={variant} data-size={size} onClick={onClick}>
+    <button
+      data-testid="action-icon"
+      data-variant={variant}
+      data-size={size}
+      onClick={onClick}
+    >
       {children}
     </button>
   ),
   Badge: ({ children, color, variant, size }) => (
-    <span data-testid="badge" data-color={color} data-variant={variant} data-size={size}>
+    <span
+      data-testid="badge"
+      data-color={color}
+      data-variant={variant}
+      data-size={size}
+    >
       {children}
     </span>
   ),
@@ -37,14 +47,27 @@ vi.mock('@mantine/core', () => ({
       {children}
     </div>
   ),
-  CardSection: ({ children }) => <div data-testid="card-section">{children}</div>,
+  CardSection: ({ children }) => (
+    <div data-testid="card-section">{children}</div>
+  ),
   Group: ({ children, justify, gap, wrap }) => (
-    <div data-testid="group" data-justify={justify} data-gap={gap} data-wrap={wrap}>
+    <div
+      data-testid="group"
+      data-justify={justify}
+      data-gap={gap}
+      data-wrap={wrap}
+    >
       {children}
     </div>
   ),
   Image: ({ src, alt, height, fallbackSrc, fit }) => (
-    <img src={src} alt={alt} data-height={height} data-fallback={fallbackSrc} data-fit={fit} />
+    <img
+      src={src}
+      alt={alt}
+      data-height={height}
+      data-fallback={fallbackSrc}
+      data-fit={fit}
+    />
   ),
   Stack: ({ children, spacing, gap, p }) => (
     <div data-testid="stack" data-spacing={spacing} data-gap={gap} data-p={p}>
@@ -68,6 +91,7 @@ vi.mock('@mantine/core', () => ({
 
 // ── lucide-react ──────────────────────────────────────────────────────────────
 vi.mock('lucide-react', () => ({
+  ListOrdered: () => <svg data-testid="icon-list-ordered" />,
   Calendar: () => <svg data-testid="icon-calendar" />,
   Clock: () => <svg data-testid="icon-clock" />,
   Play: () => <svg data-testid="icon-play" />,
@@ -75,7 +99,10 @@ vi.mock('lucide-react', () => ({
 }));
 
 // ── Imports after mocks ───────────────────────────────────────────────────────
-import { formatDuration, getSeasonLabel } from '../../../utils/cards/VODCardUtils.js';
+import {
+  formatDuration,
+  getSeasonLabel,
+} from '../../../utils/cards/VODCardUtils.js';
 import VODCard from '../VODCard';
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
@@ -113,7 +140,9 @@ const makeEpisode = (overrides = {}) => ({
 describe('VODCard', () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.mocked(formatDuration).mockImplementation((mins) => (mins ? `${mins}m` : null));
+    vi.mocked(formatDuration).mockImplementation((mins) =>
+      mins ? `${mins}m` : null
+    );
     vi.mocked(getSeasonLabel).mockReturnValue('S01E02');
   });
 
@@ -193,7 +222,9 @@ describe('VODCard', () => {
 
     it('renders the season label via getSeasonLabel', () => {
       render(<VODCard vod={makeEpisode()} onClick={vi.fn()} />);
-      expect(getSeasonLabel).toHaveBeenCalledWith(expect.objectContaining({ type: 'episode' }));
+      expect(getSeasonLabel).toHaveBeenCalledWith(
+        expect.objectContaining({ type: 'episode' })
+      );
       expect(screen.getByText(/S01E02/)).toBeInTheDocument();
     });
 
@@ -230,7 +261,9 @@ describe('VODCard', () => {
     });
 
     it('does not render an img tag when logo.url is empty string', () => {
-      render(<VODCard vod={makeMovie({ logo: { url: '' } })} onClick={vi.fn()} />);
+      render(
+        <VODCard vod={makeMovie({ logo: { url: '' } })} onClick={vi.fn()} />
+      );
       expect(screen.queryByRole('img')).not.toBeInTheDocument();
     });
   });
@@ -257,8 +290,9 @@ describe('VODCard', () => {
     it('does not render genre when absent', () => {
       render(<VODCard vod={makeMovie({ genre: null })} onClick={vi.fn()} />);
       const badges = screen.queryAllByTestId('badge');
-      const dimmedBadges = badges.filter((badge) =>
-        badge.getAttribute('data-color') === 'dimmed');
+      const dimmedBadges = badges.filter(
+        (badge) => badge.getAttribute('data-color') === 'dimmed'
+      );
       expect(dimmedBadges.length).toBe(0);
     });
   });
@@ -291,4 +325,4 @@ describe('VODCard', () => {
       expect(onClick).toHaveBeenCalledWith(vod);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/cards/__tests__/VodConnectionCard.test.jsx b/frontend/src/components/cards/__tests__/VodConnectionCard.test.jsx
index 2cd35670..6deeae78 100644
--- a/frontend/src/components/cards/__tests__/VodConnectionCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/VodConnectionCard.test.jsx
@@ -13,7 +13,11 @@ vi.mock('../../../utils/dateTimeUtils.js', () => ({
 vi.mock('../../../utils/cards/VodConnectionCardUtils.js', () => ({
   calculateConnectionDuration: vi.fn(() => '5m 30s'),
   calculateConnectionStartTime: vi.fn(() => 'Jan 1 2024 10:00 AM'),
-  calculateProgress: vi.fn(() => ({ totalTime: 0, currentTime: 0, percentage: 0 })),
+  calculateProgress: vi.fn(() => ({
+    totalTime: 0,
+    currentTime: 0,
+    percentage: 0,
+  })),
   formatDuration: vi.fn((secs) => (secs ? `${secs}s` : null)),
   formatTime: vi.fn((secs) => `${secs}s`),
   getEpisodeDisplayTitle: vi.fn(() => 'S01E02 — Pilot'),
@@ -28,42 +32,82 @@ vi.mock('../../../images/logo.png', () => ({ default: 'default-logo.png' }));
 // ── Mantine core ──────────────────────────────────────────────────────────────
 vi.mock('@mantine/core', () => ({
   ActionIcon: ({ children, onClick, color, variant }) => (
-    <button data-testid="action-icon" data-color={color} data-variant={variant} onClick={onClick}>
+    <button
+      data-testid="action-icon"
+      data-color={color}
+      data-variant={variant}
+      onClick={onClick}
+    >
       {children}
     </button>
   ),
   Badge: ({ children, color, variant, size }) => (
-    <span data-testid="badge" data-color={color} data-variant={variant} data-size={size}>
+    <span
+      data-testid="badge"
+      data-color={color}
+      data-variant={variant}
+      data-size={size}
+    >
       {children}
     </span>
   ),
-  Box: ({ children, style }) => <div data-testid="box" style={style}>{children}</div>,
-  Card: ({ children, shadow, style }) => (   // remove padding, radius, withBorder
+  Box: ({ children, style }) => (
+    <div data-testid="box" style={style}>
+      {children}
+    </div>
+  ),
+  Card: (
+    { children, shadow, style } // remove padding, radius, withBorder
+  ) => (
     <div data-testid="vod-connection-card" data-shadow={shadow} style={style}>
       {children}
     </div>
   ),
   Center: ({ children }) => <div data-testid="center">{children}</div>,
-  Flex: ({ children, justify }) => (         // remove align
-    <div data-testid="flex" data-justify={justify}>{children}</div>
+  Flex: (
+    { children, justify } // remove align
+  ) => (
+    <div data-testid="flex" data-justify={justify}>
+      {children}
+    </div>
   ),
-  Group: ({ children, justify, onClick, style }) => (  // remove gap, align, p
-    <div data-testid="group" data-justify={justify} onClick={onClick} style={style}>
+  Group: (
+    { children, justify, onClick, style } // remove gap, align, p
+  ) => (
+    <div
+      data-testid="group"
+      data-justify={justify}
+      onClick={onClick}
+      style={style}
+    >
       {children}
     </div>
   ),
   Progress: ({ value, size, color }) => (
-    <div data-testid="progress" data-value={value} data-size={size} data-color={color} />
+    <div
+      data-testid="progress"
+      data-value={value}
+      data-size={size}
+      data-color={color}
+    />
   ),
   Stack: ({ children, gap, pos, mt }) => (
     <div data-testid="stack" data-gap={gap} data-pos={pos} data-mt={mt}>
       {children}
     </div>
   ),
-  Text: ({ children, size, c, fw, color }) => (  // remove ff, ta
-    <span data-testid="text" data-size={size} data-c={c} data-fw={fw} data-color={color}>
-    {children}
-  </span>
+  Text: (
+    { children, size, c, fw, color } // remove ff, ta
+  ) => (
+    <span
+      data-testid="text"
+      data-size={size}
+      data-c={c}
+      data-fw={fw}
+      data-color={color}
+    >
+      {children}
+    </span>
   ),
   Tooltip: ({ children, label }) => (
     <div data-testid="tooltip" data-label={label}>
@@ -74,6 +118,7 @@ vi.mock('@mantine/core', () => ({
 
 // ── lucide-react ──────────────────────────────────────────────────────────────
 vi.mock('lucide-react', () => ({
+  ListOrdered: () => <svg data-testid="icon-list-ordered" />,
   ChevronDown: ({ size, style }) => (
     <svg data-testid="icon-chevron-down" data-size={size} style={style} />
   ),
@@ -100,12 +145,13 @@ import VodConnectionCard from '../VodConnectionCard';
 
 const makeConnection = (overrides = {}) => ({
   client_ip: '192.168.1.100',
-  client_id: 'client-abc-123',          // needed for stopVODClient
+  client_id: 'client-abc-123', // needed for stopVODClient
   user_agent: 'Plex/1.0',
   connected_at: '2024-01-01T10:00:00Z',
   duration: 330,
   bytes_sent: 1048576,
-  m3u_profile: {                         // M3U profile lives on connection
+  m3u_profile: {
+    // M3U profile lives on connection
     account_name: 'Main Account',
     profile_name: 'Main M3U',
   },
@@ -161,14 +207,22 @@ describe('VodConnectionCard', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     vi.useFakeTimers();
-    vi.mocked(useDateTimeFormat).mockReturnValue({ fullDateTimeFormat: 'MM/DD/YYYY h:mm A' });
-    vi.mocked(calculateProgress).mockReturnValue({ totalTime: 0, currentTime: 0, percentage: 0 });
+    vi.mocked(useDateTimeFormat).mockReturnValue({
+      fullDateTimeFormat: 'MM/DD/YYYY h:mm A',
+    });
+    vi.mocked(calculateProgress).mockReturnValue({
+      totalTime: 0,
+      currentTime: 0,
+      percentage: 0,
+    });
     vi.mocked(getMovieDisplayTitle).mockReturnValue('Test Movie (2022)');
     vi.mocked(getMovieSubtitle).mockReturnValue(['120m', 'Action']);
     vi.mocked(getEpisodeDisplayTitle).mockReturnValue('S01E02 — Pilot');
     vi.mocked(getEpisodeSubtitle).mockReturnValue(['Test Series', 'Season 1']);
     vi.mocked(calculateConnectionDuration).mockReturnValue('5m 30s');
-    vi.mocked(calculateConnectionStartTime).mockReturnValue('Jan 1 2024 10:00 AM');
+    vi.mocked(calculateConnectionStartTime).mockReturnValue(
+      'Jan 1 2024 10:00 AM'
+    );
   });
 
   afterEach(() => {
@@ -179,39 +233,69 @@ describe('VodConnectionCard', () => {
 
   describe('rendering', () => {
     it('renders the card element', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByTestId('vod-connection-card')).toBeInTheDocument();
     });
 
     it('renders the poster image when logo_url is present', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
-      expect(screen.getByRole('img')).toHaveAttribute('src', 'http://example.com/poster.jpg');
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
+      expect(screen.getByRole('img')).toHaveAttribute(
+        'src',
+        'http://example.com/poster.jpg'
+      );
     });
 
     it('renders the default logo when logo_url is absent', () => {
       render(
         <VodConnectionCard
-          vodContent={makeMovieContent({ content_metadata: { logo_url: null } })}
+          vodContent={makeMovieContent({
+            content_metadata: { logo_url: null },
+          })}
           stopVODClient={vi.fn()}
         />
       );
-      expect(screen.getByRole('img')).toHaveAttribute('src', 'default-logo.png');
+      expect(screen.getByRole('img')).toHaveAttribute(
+        'src',
+        'default-logo.png'
+      );
     });
 
     it('renders the stop client button', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByTestId('icon-square-x')).toBeInTheDocument();
     });
 
     it('renders the client IP in the connection section', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText('192.168.1.100')).toBeInTheDocument();
     });
 
     it('renders "Unknown IP" when client_ip is absent', () => {
       render(
         <VodConnectionCard
-          vodContent={makeMovieContent({ individual_connection: makeConnection({ client_ip: null }) })}
+          vodContent={makeMovieContent({
+            individual_connection: makeConnection({ client_ip: null }),
+          })}
           stopVODClient={vi.fn()}
         />
       );
@@ -219,14 +303,22 @@ describe('VodConnectionCard', () => {
     });
 
     it('renders "Hide Details" / "Show Details" toggle text', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText('Show Details')).toBeInTheDocument();
     });
 
     it('does not render client section when no connection is present', () => {
       render(
         <VodConnectionCard
-          vodContent={makeMovieContent({ individual_connection: null, connections: null })}
+          vodContent={makeMovieContent({
+            individual_connection: null,
+            connections: null,
+          })}
           stopVODClient={vi.fn()}
         />
       );
@@ -239,29 +331,50 @@ describe('VodConnectionCard', () => {
   describe('movie content', () => {
     it('calls getMovieDisplayTitle with vodContent', () => {
       const vodContent = makeMovieContent();
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
       expect(getMovieDisplayTitle).toHaveBeenCalledWith(vodContent);
     });
 
     it('renders the movie display title', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText('Test Movie (2022)')).toBeInTheDocument();
     });
 
     it('calls getMovieSubtitle with metadata', () => {
       const vodContent = makeMovieContent();
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
-      expect(getMovieSubtitle).toHaveBeenCalledWith(vodContent.content_metadata);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
+      expect(getMovieSubtitle).toHaveBeenCalledWith(
+        vodContent.content_metadata
+      );
     });
 
     it('renders the movie subtitle parts', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText(/120m/)).toBeInTheDocument();
       expect(screen.getByText(/Action/)).toBeInTheDocument();
     });
 
     it('does not call getEpisodeDisplayTitle for a movie', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(getEpisodeDisplayTitle).not.toHaveBeenCalled();
     });
   });
@@ -271,29 +384,52 @@ describe('VodConnectionCard', () => {
   describe('episode content', () => {
     it('calls getEpisodeDisplayTitle with vodContent', () => {
       const vodContent = makeEpisodeContent();
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
-      expect(getEpisodeDisplayTitle).toHaveBeenCalledWith(vodContent.content_metadata);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
+      expect(getEpisodeDisplayTitle).toHaveBeenCalledWith(
+        vodContent.content_metadata
+      );
     });
 
     it('renders the episode display title', () => {
-      render(<VodConnectionCard vodContent={makeEpisodeContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeEpisodeContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText('S01E02 — Pilot')).toBeInTheDocument();
     });
 
     it('calls getEpisodeSubtitle with metadata', () => {
       const vodContent = makeEpisodeContent();
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
-      expect(getEpisodeSubtitle).toHaveBeenCalledWith(vodContent.content_metadata);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
+      expect(getEpisodeSubtitle).toHaveBeenCalledWith(
+        vodContent.content_metadata
+      );
     });
 
     it('renders the episode subtitle parts', () => {
-      render(<VodConnectionCard vodContent={makeEpisodeContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeEpisodeContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText(/Test Series/)).toBeInTheDocument();
       expect(screen.getByText(/Season 1/)).toBeInTheDocument();
     });
 
     it('does not call getMovieDisplayTitle for an episode', () => {
-      render(<VodConnectionCard vodContent={makeEpisodeContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeEpisodeContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(getMovieDisplayTitle).not.toHaveBeenCalled();
     });
   });
@@ -302,12 +438,22 @@ describe('VodConnectionCard', () => {
 
   describe('unknown content type', () => {
     it('renders content_name as fallback title', () => {
-      render(<VodConnectionCard vodContent={makeUnknownContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeUnknownContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText('Some Stream')).toBeInTheDocument();
     });
 
     it('does not call getMovieDisplayTitle or getEpisodeDisplayTitle', () => {
-      render(<VodConnectionCard vodContent={makeUnknownContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeUnknownContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(getMovieDisplayTitle).not.toHaveBeenCalled();
       expect(getEpisodeDisplayTitle).not.toHaveBeenCalled();
     });
@@ -315,7 +461,12 @@ describe('VodConnectionCard', () => {
     it('renders no subtitle when subtitle parts are empty', () => {
       vi.mocked(getMovieSubtitle).mockReturnValue([]);
       vi.mocked(getEpisodeSubtitle).mockReturnValue([]);
-      render(<VodConnectionCard vodContent={makeUnknownContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeUnknownContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       // No " • " separator rendered for empty subtitle
       expect(screen.queryByText(' • ')).not.toBeInTheDocument();
     });
@@ -326,7 +477,9 @@ describe('VodConnectionCard', () => {
   describe('connection source fallback', () => {
     it('uses individual_connection when present', () => {
       const vodContent = makeMovieContent();
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
       expect(screen.getByText('192.168.1.100')).toBeInTheDocument();
     });
 
@@ -336,7 +489,9 @@ describe('VodConnectionCard', () => {
         individual_connection: null,
         connections: [connection],
       });
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
       expect(screen.getByText('10.0.0.1')).toBeInTheDocument();
     });
   });
@@ -345,7 +500,12 @@ describe('VodConnectionCard', () => {
 
   describe('M3U profile', () => {
     it('renders M3U profile name when present', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText('Main M3U')).toBeInTheDocument();
     });
 
@@ -353,7 +513,9 @@ describe('VodConnectionCard', () => {
       const vodContent = makeMovieContent({
         individual_connection: makeConnection({ m3u_profile: null }),
       });
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
       expect(screen.queryByText('Main M3U')).not.toBeInTheDocument();
     });
   });
@@ -364,14 +526,24 @@ describe('VodConnectionCard', () => {
     it('calls stopVODClient with the connection when stop button is clicked', () => {
       const stopVODClient = vi.fn();
       const vodContent = makeMovieContent();
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={stopVODClient} />);
+      render(
+        <VodConnectionCard
+          vodContent={vodContent}
+          stopVODClient={stopVODClient}
+        />
+      );
       fireEvent.click(screen.getByTestId('icon-square-x').closest('button'));
       expect(stopVODClient).toHaveBeenCalledWith('client-abc-123');
     });
 
     it('calls stopVODClient once per click', () => {
       const stopVODClient = vi.fn();
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={stopVODClient} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={stopVODClient}
+        />
+      );
       fireEvent.click(screen.getByTestId('icon-square-x').closest('button'));
       fireEvent.click(screen.getByTestId('icon-square-x').closest('button'));
       expect(stopVODClient).toHaveBeenCalledTimes(2);
@@ -382,30 +554,58 @@ describe('VodConnectionCard', () => {
 
   describe('client expand/collapse', () => {
     it('starts collapsed (Show Details visible)', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText('Show Details')).toBeInTheDocument();
       expect(screen.queryByText('Hide Details')).not.toBeInTheDocument();
     });
 
     it('expands to show client details on header click', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
-      const header = screen.getByText('Show Details').closest('[data-testid="group"]');
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
+      const header = screen
+        .getByText('Show Details')
+        .closest('[data-testid="group"]');
       fireEvent.click(header);
       expect(screen.getByText('Hide Details')).toBeInTheDocument();
     });
 
     it('shows user agent in expanded details', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
-      const header = screen.getByText('Show Details').closest('[data-testid="group"]');
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
+      const header = screen
+        .getByText('Show Details')
+        .closest('[data-testid="group"]');
       fireEvent.click(header);
       expect(screen.getByText('Plex/1.0')).toBeInTheDocument();
     });
 
     it('collapses back when header is clicked again', () => {
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
-      const header = screen.getByText('Show Details').closest('[data-testid="group"]');
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
+      const header = screen
+        .getByText('Show Details')
+        .closest('[data-testid="group"]');
       fireEvent.click(header);
-      fireEvent.click(screen.getByText('Hide Details').closest('[data-testid="group"]'));
+      fireEvent.click(
+        screen.getByText('Hide Details').closest('[data-testid="group"]')
+      );
       expect(screen.getByText('Show Details')).toBeInTheDocument();
     });
 
@@ -413,8 +613,12 @@ describe('VodConnectionCard', () => {
       const vodContent = makeMovieContent({
         individual_connection: makeConnection({ user_agent: 'Unknown' }),
       });
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
-      const header = screen.getByText('Show Details').closest('[data-testid="group"]');
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
+      const header = screen
+        .getByText('Show Details')
+        .closest('[data-testid="group"]');
       fireEvent.click(header);
       expect(screen.queryByText('Unknown')).not.toBeInTheDocument();
     });
@@ -423,8 +627,12 @@ describe('VodConnectionCard', () => {
       const vodContent = makeMovieContent({
         individual_connection: makeConnection({ user_agent: null }),
       });
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
-      const header = screen.getByText('Show Details').closest('[data-testid="group"]');
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
+      const header = screen
+        .getByText('Show Details')
+        .closest('[data-testid="group"]');
       fireEvent.click(header);
       // "Plex/1.0" should not appear
       expect(screen.queryByText('Plex/1.0')).not.toBeInTheDocument();
@@ -434,8 +642,12 @@ describe('VodConnectionCard', () => {
       const vodContent = makeMovieContent({
         individual_connection: makeConnection({ bytes_sent: 0 }),
       });
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
-      const header = screen.getByText('Show Details').closest('[data-testid="group"]');
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
+      const header = screen
+        .getByText('Show Details')
+        .closest('[data-testid="group"]');
       fireEvent.click(header);
       expect(screen.queryByText('Data Sent:')).not.toBeInTheDocument();
     });
@@ -444,8 +656,12 @@ describe('VodConnectionCard', () => {
       const vodContent = makeMovieContent({
         individual_connection: makeConnection({ duration: 0 }),
       });
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
-      const header = screen.getByText('Show Details').closest('[data-testid="group"]');
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
+      const header = screen
+        .getByText('Show Details')
+        .closest('[data-testid="group"]');
       fireEvent.click(header);
       expect(screen.queryByText('Watch Duration:')).not.toBeInTheDocument();
     });
@@ -455,26 +671,58 @@ describe('VodConnectionCard', () => {
 
   describe('ConnectionProgress', () => {
     it('does not render progress bar when totalTime is 0', () => {
-      vi.mocked(calculateProgress).mockReturnValue({ totalTime: 0, currentTime: 0, percentage: 0 });
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      vi.mocked(calculateProgress).mockReturnValue({
+        totalTime: 0,
+        currentTime: 0,
+        percentage: 0,
+      });
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.queryByTestId('progress')).not.toBeInTheDocument();
     });
 
     it('renders progress bar when totalTime > 0', () => {
-      vi.mocked(calculateProgress).mockReturnValue({ totalTime: 7200, currentTime: 3600, percentage: 50 });
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      vi.mocked(calculateProgress).mockReturnValue({
+        totalTime: 7200,
+        currentTime: 3600,
+        percentage: 50,
+      });
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByTestId('progress')).toBeInTheDocument();
     });
 
     it('passes correct percentage value to Progress component', () => {
-      vi.mocked(calculateProgress).mockReturnValue({ totalTime: 7200, currentTime: 3600, percentage: 50 });
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
-      expect(screen.getByTestId('progress')).toHaveAttribute('data-value', '50');
+      vi.mocked(calculateProgress).mockReturnValue({
+        totalTime: 7200,
+        currentTime: 3600,
+        percentage: 50,
+      });
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
+      expect(screen.getByTestId('progress')).toHaveAttribute(
+        'data-value',
+        '50'
+      );
     });
 
     it('calls calculateProgress with connection and duration_secs', () => {
       const vodContent = makeMovieContent();
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
       expect(calculateProgress).toHaveBeenCalledWith(
         vodContent.individual_connection,
         vodContent.content_metadata.duration_secs
@@ -484,7 +732,10 @@ describe('VodConnectionCard', () => {
     it('does not render ConnectionProgress when no connection', () => {
       render(
         <VodConnectionCard
-          vodContent={makeMovieContent({ individual_connection: null, connections: null })}
+          vodContent={makeMovieContent({
+            individual_connection: null,
+            connections: null,
+          })}
           stopVODClient={vi.fn()}
         />
       );
@@ -496,11 +747,22 @@ describe('VodConnectionCard', () => {
 
   describe('progress update timer', () => {
     it('sets up a 1-second interval to trigger re-renders', () => {
-      vi.mocked(calculateProgress).mockReturnValue({ totalTime: 7200, currentTime: 0, percentage: 0 });
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      vi.mocked(calculateProgress).mockReturnValue({
+        totalTime: 7200,
+        currentTime: 0,
+        percentage: 0,
+      });
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
 
       const callsBefore = vi.mocked(calculateProgress).mock.calls.length;
-      act(() => { vi.advanceTimersByTime(1000); });
+      act(() => {
+        vi.advanceTimersByTime(1000);
+      });
       const callsAfter = vi.mocked(calculateProgress).mock.calls.length;
 
       expect(callsAfter).toBeGreaterThan(callsBefore);
@@ -509,7 +771,10 @@ describe('VodConnectionCard', () => {
     it('clears the interval on unmount', () => {
       const clearIntervalSpy = vi.spyOn(globalThis, 'clearInterval');
       const { unmount } = render(
-        <VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
       );
       unmount();
       expect(clearIntervalSpy).toHaveBeenCalled();
@@ -521,23 +786,34 @@ describe('VodConnectionCard', () => {
   describe('connection duration and start time', () => {
     it('calls calculateConnectionDuration with the connection', () => {
       const vodContent = makeMovieContent();
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
-      expect(calculateConnectionDuration).toHaveBeenCalledWith(vodContent.individual_connection);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
+      expect(calculateConnectionDuration).toHaveBeenCalledWith(
+        vodContent.individual_connection
+      );
     });
 
     it('renders the duration returned by calculateConnectionDuration', () => {
       vi.mocked(calculateConnectionDuration).mockReturnValue('12m 45s');
-      render(<VodConnectionCard vodContent={makeMovieContent()} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard
+          vodContent={makeMovieContent()}
+          stopVODClient={vi.fn()}
+        />
+      );
       expect(screen.getByText('12m 45s')).toBeInTheDocument();
     });
 
     it('calls calculateConnectionStartTime with connection and fullDateTimeFormat', () => {
       const vodContent = makeMovieContent();
-      render(<VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />);
+      render(
+        <VodConnectionCard vodContent={vodContent} stopVODClient={vi.fn()} />
+      );
       expect(calculateConnectionStartTime).toHaveBeenCalledWith(
         vodContent.individual_connection,
         'MM/DD/YYYY h:mm A'
       );
     });
   });
-});
\ No newline at end of file
+});

From 17b8e6587f40b5ab503b10117894791b96901085 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 15:49:35 -0500
Subject: [PATCH 104/172] changelog: Move issue to correct location and
 formatted them for auto-closing.

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c15fc6c3..6e5cc040 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,8 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Connection cards on the Stats page now show the **username** of the connected user in a new User column (between IP Address and Connected). The username is resolved from the user store using the `user_id` stored in Redis client metadata; unauthenticated connections display "Anonymous". (Closes #766)
-- `ip_address` and `user_id` were not included in the client info returned by `get_detailed_channel_info()` despite being available in the Redis hash. Both fields are now extracted and returned. (Closes #586)
+- Connection cards on the Stats page now show the **username** of the connected user in a new User column (between IP Address and Connected). The username is resolved from the user store using the `user_id` stored in Redis client metadata; unauthenticated connections display "Anonymous". (Closes #766, Closes #586)
+- `ip_address` and `user_id` were not included in the client info returned by `get_detailed_channel_info()` despite being available in the Redis hash. Both fields are now extracted and returned.
 - Donate button added to the sidebar footer. A heart icon links to the project's Open Collective page, visible in both expanded and collapsed states. Hovering shows a "Support Dispatcharr" tooltip. The version string is also now clickable to copy it to the clipboard.
 - User stream limits: administrators can now set a maximum number of concurrent streams per user account. When a user reaches their limit, the system can automatically terminate an existing stream to free a slot based on configurable rules. Limit enforcement applies to both live channels and VOD. (Closes #544)
   - Each user account has a new **Stream Limit** field (0 = unlimited) configurable from the user edit form in Settings → Users.

From 30246a4d491416d650f546288dbc3e3ef3acfb4e Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 16:28:47 -0500
Subject: [PATCH 105/172] changelog: Add change for VOD XC endpoint.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e5cc040..e8cab3a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- XtreamCodes VOD endpoints (`/movie/` and `/series/`) no longer redirect clients to a UUID-based proxy URL. Requests are now handled directly in the proxy layer via `stream_xc_movie` and `stream_xc_episode`, which call `stream_vod()` internally. The original XC path is preserved for the client throughout the stream.
 - `CustomTable` column layout now supports flexible (`grow`) columns alongside fixed-width ones:
   - Column definitions accept a `grow` property (boolean or number) to opt into flex layout. A numeric value sets the flex-grow weight, allowing relative sizing between grow columns (e.g. `grow: 2` gives a column twice the share of spare space as `grow: 1`).
   - `maxSize` is now respected on grow columns, capping how wide they expand via `maxWidth`.

From 38f5156ca690db20bd361858323b7454f8a11333 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 16:46:06 -0500
Subject: [PATCH 106/172] Enhancement: Show username in VOD cards.

---
 CHANGELOG.md                                  |  4 +--
 apps/proxy/vod_proxy/views.py                 |  1 +
 .../components/cards/VodConnectionCard.jsx    | 33 +++++++++++++++----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8cab3a7..31693df0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,8 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Connection cards on the Stats page now show the **username** of the connected user in a new User column (between IP Address and Connected). The username is resolved from the user store using the `user_id` stored in Redis client metadata; unauthenticated connections display "Anonymous". (Closes #766, Closes #586)
-- `ip_address` and `user_id` were not included in the client info returned by `get_detailed_channel_info()` despite being available in the Redis hash. Both fields are now extracted and returned.
+- Connection cards on the Stats page now show the **username** of the connected user. For live channel connections a new User column appears between IP Address and Connected; for VOD connections the username is shown inline next to the IP address in the Client summary row. The username is resolved from the user store using the `user_id` stored in Redis client metadata. (Closes #766, Closes #586)
+- `ip_address` and `user_id` were not included in the client info returned by `get_detailed_channel_info()` despite being available in the Redis hash. Both fields are now extracted and returned. `user_id` is now also included in the VOD stats response.
 - Donate button added to the sidebar footer. A heart icon links to the project's Open Collective page, visible in both expanded and collapsed states. Hovering shows a "Support Dispatcharr" tooltip. The version string is also now clickable to copy it to the clipboard.
 - User stream limits: administrators can now set a maximum number of concurrent streams per user account. When a user reaches their limit, the system can automatically terminate an existing stream to free a slot based on configurable rules. Limit enforcement applies to both live channels and VOD. (Closes #544)
   - Each user account has a new **Stream Limit** field (0 = unlimited) configurable from the user edit form in Settings → Users.
diff --git a/apps/proxy/vod_proxy/views.py b/apps/proxy/vod_proxy/views.py
index d7250bcf..4382caaa 100644
--- a/apps/proxy/vod_proxy/views.py
+++ b/apps/proxy/vod_proxy/views.py
@@ -949,6 +949,7 @@ class VODStatsView(View):
                                 'm3u_profile': m3u_profile_info,
                                 'client_id': client_id,
                                 'client_ip': combined_data.get('client_ip', 'Unknown'),
+                                'user_id': combined_data.get('user_id', '0'),
                                 'user_agent': combined_data.get('client_user_agent', 'Unknown'),
                                 'connected_at': combined_data.get('created_at'),
                                 'last_activity': combined_data.get('last_activity'),
diff --git a/frontend/src/components/cards/VodConnectionCard.jsx b/frontend/src/components/cards/VodConnectionCard.jsx
index 5e081c03..90b4c034 100644
--- a/frontend/src/components/cards/VodConnectionCard.jsx
+++ b/frontend/src/components/cards/VodConnectionCard.jsx
@@ -1,5 +1,5 @@
 // Format duration for content length
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import logo from '../../images/logo.png';
 import {
   ActionIcon,
@@ -38,6 +38,7 @@ import {
   getMovieDisplayTitle,
   getMovieSubtitle,
 } from '../../utils/cards/VodConnectionCardUtils.js';
+import useUsersStore from '../../store/users.jsx';
 
 const ClientDetails = ({ connection, connectionStartTime }) => {
   return (
@@ -142,7 +143,10 @@ const ClientDetails = ({ connection, connectionStartTime }) => {
 };
 
 const ConnectionProgress = ({ connection, durationSecs }) => {
-  const { totalTime, currentTime, percentage } = calculateProgress(connection, durationSecs);
+  const { totalTime, currentTime, percentage } = calculateProgress(
+    connection,
+    durationSecs
+  );
   return totalTime > 0 ? (
     <Stack gap="xs" mt="sm">
       <Group justify="space-between" align="center">
@@ -172,6 +176,14 @@ const ConnectionProgress = ({ connection, durationSecs }) => {
 const VodConnectionCard = ({ vodContent, stopVODClient }) => {
   const { fullDateTimeFormat } = useDateTimeFormat();
   const [isClientExpanded, setIsClientExpanded] = useState(false);
+  const users = useUsersStore((s) => s.users);
+  const usersMap = useMemo(() => {
+    const map = {};
+    users.forEach((u) => {
+      map[String(u.id)] = u.username;
+    });
+    return map;
+  }, [users]);
   const [, setUpdateTrigger] = useState(0); // Force re-renders for progress updates
 
   // Get metadata from the VOD content
@@ -377,13 +389,12 @@ const VodConnectionCard = ({ vodContent, stopVODClient }) => {
         </Group>
 
         {/* Progress bar - show current position in content */}
-        {connection &&
-          metadata.duration_secs &&
+        {connection && metadata.duration_secs && (
           <ConnectionProgress
             connection={connection}
             durationSecs={metadata.duration_secs}
           />
-        }
+        )}
 
         {/* Client information section - collapsible like channel cards */}
         {connection && (
@@ -403,11 +414,21 @@ const VodConnectionCard = ({ vodContent, stopVODClient }) => {
             >
               <Group gap={8}>
                 <Text size="sm" fw={500} color="dimmed">
-                  Client:
+                  Client IP:
                 </Text>
                 <Text size="sm" ff={'monospace'}>
                   {connection.client_ip || 'Unknown IP'}
                 </Text>
+                {usersMap[String(connection.user_id)] && (
+                  <>
+                    <Text size="sm" c="dimmed">
+                      User:
+                    </Text>
+                    <Text size="sm">
+                      {usersMap[String(connection.user_id)]}
+                    </Text>
+                  </>
+                )}
               </Group>
 
               <Group gap={8}>

From 3cb0925357323d79fd74ec29bd33697246ee389b Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 17:04:57 -0500
Subject: [PATCH 107/172] tests: Add user store mock and additional icons for
 VodConnectionCard tests

---
 .../__tests__/VodConnectionCard.test.jsx      | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/cards/__tests__/VodConnectionCard.test.jsx b/frontend/src/components/cards/__tests__/VodConnectionCard.test.jsx
index 6deeae78..7b0014e7 100644
--- a/frontend/src/components/cards/__tests__/VodConnectionCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/VodConnectionCard.test.jsx
@@ -116,16 +116,35 @@ vi.mock('@mantine/core', () => ({
   ),
 }));
 
+// ── useUsersStore ─────────────────────────────────────────────────────────────
+vi.mock('../../../store/users.jsx', () => ({
+  default: vi.fn((selector) => selector({ users: [] })),
+}));
+
 // ── lucide-react ──────────────────────────────────────────────────────────────
 vi.mock('lucide-react', () => ({
+  // navigation.js icons (all must be present for the auth→navigation import chain)
   ListOrdered: () => <svg data-testid="icon-list-ordered" />,
+  Play: () => <svg data-testid="icon-play" />,
+  Database: () => <svg data-testid="icon-database" />,
+  LayoutGrid: () => <svg data-testid="icon-layout-grid" />,
+  Settings: () => <svg data-testid="icon-settings" />,
+  ChartLine: () => <svg data-testid="icon-chart-line" />,
+  Video: () => <svg data-testid="icon-video" />,
+  PlugZap: () => <svg data-testid="icon-plug-zap" />,
+  User: () => <svg data-testid="icon-user" />,
+  FileImage: () => <svg data-testid="icon-file-image" />,
+  Webhook: () => <svg data-testid="icon-webhook" />,
+  Logs: () => <svg data-testid="icon-logs" />,
+  Blocks: () => <svg data-testid="icon-blocks" />,
+  MonitorCog: () => <svg data-testid="icon-monitor-cog" />,
+  // VodConnectionCard-specific icons
   ChevronDown: ({ size, style }) => (
     <svg data-testid="icon-chevron-down" data-size={size} style={style} />
   ),
   HardDriveUpload: () => <svg data-testid="icon-hdd-upload" />,
   SquareX: () => <svg data-testid="icon-square-x" />,
   Timer: () => <svg data-testid="icon-timer" />,
-  Video: () => <svg data-testid="icon-video" />,
 }));
 
 // ── Imports after mocks ───────────────────────────────────────────────────────

From f00d1fe63cf4de38a35f922c4075c4821ff84316 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 18:04:11 -0500
Subject: [PATCH 108/172] =?UTF-8?q?Bug=20Fix/Enhancement:=20-=20Web=20UI?=
 =?UTF-8?q?=20stream=20preview=20(`FloatingVideo`)=20was=20calling=20`mpeg?=
 =?UTF-8?q?ts.createPlayer()`=20with=20all=20`Config`=20options=20(e.g.=20?=
 =?UTF-8?q?`enableWorker`,=20`liveSync`,=20`headers`)=20merged=20into=20th?=
 =?UTF-8?q?e=20first=20`MediaDataSource`=20argument.=20mpegts.js=20only=20?=
 =?UTF-8?q?reads=20`Config`=20from=20the=20optional=20second=20argument;?=
 =?UTF-8?q?=20unrecognised=20fields=20in=20the=20first=20are=20silently=20?=
 =?UTF-8?q?ignored.=20As=20a=20result=20all=20player=20configuration=20was?=
 =?UTF-8?q?=20effectively=20the=20library=20defaults=20=E2=80=94=20worker?=
 =?UTF-8?q?=20offloading=20was=20disabled,=20latency=20management=20had=20?=
 =?UTF-8?q?no=20effect,=20and=20the=20`Authorization:=20Bearer`=20header?=
 =?UTF-8?q?=20(required=20for=20user=20identification)=20was=20never=20sen?=
 =?UTF-8?q?t.=20Fixed=20by=20splitting=20into=20the=20correct=20two-argume?=
 =?UTF-8?q?nt=20call.=20Both=20`liveBufferLatencyChasing`=20and=20`liveSyn?=
 =?UTF-8?q?c`=20have=20been=20disabled,=20eliminating=20playback-rate=20fl?=
 =?UTF-8?q?uctuations=20that=20caused=20audible=20stuttering=20on=20live?=
 =?UTF-8?q?=20streams.=20SourceBuffer=20cleanup=20thresholds=20were=20also?=
 =?UTF-8?q?=20relaxed=20from=2010s/5s=20to=20120s/60s=20to=20prevent=20fre?=
 =?UTF-8?q?quent=20SourceBuffer=20pauses.=20-=20Web=20UI=20stream=20previe?=
 =?UTF-8?q?w=20now=20sends=20an=20`Authorization:=20Bearer`=20header=20wit?=
 =?UTF-8?q?h=20each=20mpegts.js=20request,=20identifying=20the=20logged-in?=
 =?UTF-8?q?=20user.=20Live=20channel=20previews=20initiated=20from=20the?=
 =?UTF-8?q?=20web=20UI=20now=20appear=20on=20the=20Stats=20page=20with=20t?=
 =?UTF-8?q?he=20correct=20username=20rather=20than=20as=20unknown=20user.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                              |  2 ++
 apps/proxy/ts_proxy/views.py              |  3 ++
 frontend/src/components/FloatingVideo.jsx | 40 ++++++++++++++---------
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31693df0..1b2e001f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Connection cards on the Stats page now show the **username** of the connected user. For live channel connections a new User column appears between IP Address and Connected; for VOD connections the username is shown inline next to the IP address in the Client summary row. The username is resolved from the user store using the `user_id` stored in Redis client metadata. (Closes #766, Closes #586)
 - `ip_address` and `user_id` were not included in the client info returned by `get_detailed_channel_info()` despite being available in the Redis hash. Both fields are now extracted and returned. `user_id` is now also included in the VOD stats response.
+- Web UI stream preview now sends an `Authorization: Bearer` header with each mpegts.js request, identifying the logged-in user. Live channel previews initiated from the web UI now appear on the Stats page with the correct username rather than as unknown user.
 - Donate button added to the sidebar footer. A heart icon links to the project's Open Collective page, visible in both expanded and collapsed states. Hovering shows a "Support Dispatcharr" tooltip. The version string is also now clickable to copy it to the clipboard.
 - User stream limits: administrators can now set a maximum number of concurrent streams per user account. When a user reaches their limit, the system can automatically terminate an existing stream to free a slot based on configurable rules. Limit enforcement applies to both live channels and VOD. (Closes #544)
   - Each user account has a new **Stream Limit** field (0 = unlimited) configurable from the user edit form in Settings → Users.
@@ -56,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Web UI stream preview (`FloatingVideo`) was calling `mpegts.createPlayer()` with all `Config` options (e.g. `enableWorker`, `liveSync`, `headers`) merged into the first `MediaDataSource` argument. mpegts.js only reads `Config` from the optional second argument; unrecognised fields in the first are silently ignored. As a result all player configuration was effectively the library defaults — worker offloading was disabled, latency management had no effect, and the `Authorization: Bearer` header (required for user identification) was never sent. Fixed by splitting into the correct two-argument call. Both `liveBufferLatencyChasing` and `liveSync` have been disabled, eliminating playback-rate fluctuations that caused audible stuttering on live streams. SourceBuffer cleanup thresholds were also relaxed from 10s/5s to 120s/60s to prevent frequent SourceBuffer pauses.
 - HTML named entities in XMLTV EPG files are now resolved to Unicode characters before lxml parsing. Some EPG providers (particularly French and other European sources) use HTML named entities like `&eacute;`, `&icirc;`, `&uuml;` in channel names, program titles, and metadata. These are not valid XML entities — lxml 6.0.2 with `recover=True` silently drops them, causing characters to go missing (e.g., "Chaîne Télé" becomes "Chane Tl"). A preprocessing step in `fetch_xmltv()` now resolves HTML named entities while preserving the 5 XML-predefined entities, detecting encoding from the XML declaration (falling back to UTF-8), and processing line-by-line to a temp file before atomically replacing the original. (Closes #1095) — Thanks [@CodeBormen](https://github.com/CodeBormen)
 - Duplicate recordings created when EPG sources refresh and re-evaluate series rules (Fixes #940) — Thanks [@CodeBormen](https://github.com/CodeBormen):
   - **Program ID instability**: `parse_programs_for_source()` deletes and recreates all `ProgramData` rows with new auto-increment IDs on every EPG refresh. The dedup set used these IDs, so it never matched after a refresh. Deduplication now uses a stable `(tvg_id, start_time, end_time)` composite key sourced from `Recording.custom_properties.program`.
diff --git a/apps/proxy/ts_proxy/views.py b/apps/proxy/ts_proxy/views.py
index 64f73664..c8699191 100644
--- a/apps/proxy/ts_proxy/views.py
+++ b/apps/proxy/ts_proxy/views.py
@@ -51,6 +51,9 @@ def stream_ts(request, channel_id, user=None):
         return JsonResponse({"error": "Forbidden"}, status=403)
 
     """Stream TS data to client with immediate response and keep-alive packets during initialization"""
+    if user is None and hasattr(request, 'user') and request.user.is_authenticated:
+        user = request.user
+
     channel = get_stream_object(channel_id)
 
     client_user_agent = None
diff --git a/frontend/src/components/FloatingVideo.jsx b/frontend/src/components/FloatingVideo.jsx
index 0a63e53f..ccba7934 100644
--- a/frontend/src/components/FloatingVideo.jsx
+++ b/frontend/src/components/FloatingVideo.jsx
@@ -2,6 +2,7 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import Draggable from 'react-draggable';
 import useVideoStore from '../store/useVideoStore';
+import useAuthStore from '../store/auth';
 import mpegts from 'mpegts.js';
 import { CloseButton, Flex, Loader, Text, Box } from '@mantine/core';
 import {
@@ -117,6 +118,7 @@ export default function FloatingVideo() {
   const contentType = useVideoStore((s) => s.contentType);
   const metadata = useVideoStore((s) => s.metadata);
   const hideVideo = useVideoStore((s) => s.hideVideo);
+  const accessToken = useAuthStore((s) => s.accessToken);
 
   const videoRef = useRef(null);
   const playerRef = useRef(null);
@@ -300,7 +302,8 @@ export default function FloatingVideo() {
     setLoadError(null);
 
     console.log('Initializing live stream player for:', streamUrl);
-
+    console.log('Access token present:', !!accessToken);
+    console.log('Current access token from auth store:', accessToken);
     try {
       if (!mpegts.getFeatureList().mseLivePlayback) {
         setIsLoading(false);
@@ -310,20 +313,27 @@ export default function FloatingVideo() {
         return;
       }
 
-      const player = mpegts.createPlayer({
-        type: 'mpegts',
-        url: streamUrl,
-        isLive: true,
-        enableWorker: true,
-        enableStashBuffer: false,
-        liveBufferLatencyChasing: true,
-        liveSync: true,
-        cors: true,
-        autoCleanupSourceBuffer: true,
-        autoCleanupMaxBackwardDuration: 10,
-        autoCleanupMinBackwardDuration: 5,
-        reuseRedirectedURL: true,
-      });
+      const player = mpegts.createPlayer(
+        {
+          type: 'mpegts',
+          url: streamUrl,
+          isLive: true,
+          cors: true,
+        },
+        {
+          enableWorker: true,
+          enableStashBuffer: false,
+          liveBufferLatencyChasing: false,
+          liveSync: false,
+          autoCleanupSourceBuffer: true,
+          autoCleanupMaxBackwardDuration: 120,
+          autoCleanupMinBackwardDuration: 60,
+          reuseRedirectedURL: true,
+          headers: accessToken
+            ? { Authorization: `Bearer ${accessToken}` }
+            : undefined,
+        }
+      );
 
       player.attachMediaElement(videoRef.current);
 

From 1d3cd5fd75ff4568fef0080bf2a4d12351c8ea60 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 28 Mar 2026 18:14:25 -0500
Subject: [PATCH 109/172] tests: Update floating video test.

---
 frontend/src/components/__tests__/FloatingVideo.test.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/__tests__/FloatingVideo.test.jsx b/frontend/src/components/__tests__/FloatingVideo.test.jsx
index 63f3ee3d..b511b60b 100644
--- a/frontend/src/components/__tests__/FloatingVideo.test.jsx
+++ b/frontend/src/components/__tests__/FloatingVideo.test.jsx
@@ -150,6 +150,10 @@ describe('FloatingVideo', () => {
           type: 'mpegts',
           url: 'http://example.com/stream.ts',
           isLive: true,
+        }),
+        expect.objectContaining({
+          enableWorker: true,
+          enableStashBuffer: false,
         })
       );
     });

From 6d06422ddd40e8581bc8f338005ce354f417ff7e Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 29 Mar 2026 16:06:14 -0500
Subject: [PATCH 110/172] Enhancement: `client_connect` and `client_disconnect`
 system events now include the **username** of the connected user. The
 username is stored alongside the client metadata in Redis and included in the
 event payload for `log_system_event` calls (making it available to webhook
 and script integrations).

---
 CHANGELOG.md                            |  1 +
 apps/proxy/ts_proxy/client_manager.py   | 11 ++++++++---
 apps/proxy/ts_proxy/stream_generator.py | 14 +++++++++-----
 apps/proxy/ts_proxy/views.py            |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b2e001f..58e5d90d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Connection cards on the Stats page now show the **username** of the connected user. For live channel connections a new User column appears between IP Address and Connected; for VOD connections the username is shown inline next to the IP address in the Client summary row. The username is resolved from the user store using the `user_id` stored in Redis client metadata. (Closes #766, Closes #586)
 - `ip_address` and `user_id` were not included in the client info returned by `get_detailed_channel_info()` despite being available in the Redis hash. Both fields are now extracted and returned. `user_id` is now also included in the VOD stats response.
 - Web UI stream preview now sends an `Authorization: Bearer` header with each mpegts.js request, identifying the logged-in user. Live channel previews initiated from the web UI now appear on the Stats page with the correct username rather than as unknown user.
+- `client_connect` and `client_disconnect` system events now include the **username** of the connected user. The username is stored alongside the client metadata in Redis and included in the event payload for `log_system_event` calls (making it available to webhook and script integrations).
 - Donate button added to the sidebar footer. A heart icon links to the project's Open Collective page, visible in both expanded and collapsed states. Hovering shows a "Support Dispatcharr" tooltip. The version string is also now clickable to copy it to the clipboard.
 - User stream limits: administrators can now set a maximum number of concurrent streams per user account. When a user reaches their limit, the system can automatically terminate an existing stream to free a slot based on configurable rules. Limit enforcement applies to both live channels and VOD. (Closes #544)
   - Each user account has a new **Stream Limit** field (0 = unlimited) configurable from the user edit form in Settings → Users.
diff --git a/apps/proxy/ts_proxy/client_manager.py b/apps/proxy/ts_proxy/client_manager.py
index e1c92256..af7eb7d3 100644
--- a/apps/proxy/ts_proxy/client_manager.py
+++ b/apps/proxy/ts_proxy/client_manager.py
@@ -278,7 +278,8 @@ class ClientManager:
                         "channel_id": self.channel_id,
                         "client_id": client_id,
                         "worker_id": self.worker_id or "unknown",
-                        "timestamp": time.time()
+                        "timestamp": time.time(),
+                        "username": user.username if user is not None else "unknown"
                     }
 
                     if user_agent:
@@ -319,8 +320,11 @@ class ClientManager:
             self.last_active_time = time.time()
 
             if self.redis_client:
-                # Get client IP before removing the data
+                # Get client data before removing the data
                 client_key = f"ts_proxy:channel:{self.channel_id}:clients:{client_id}"
+                client_username = self.redis_client.hget(client_key, "username") or "unknown"
+                if isinstance(client_username, bytes):
+                    client_username = client_username.decode("utf-8")
 
                 # Remove from channel's client set
                 self.redis_client.srem(self.client_set_key, client_id)
@@ -361,7 +365,8 @@ class ClientManager:
                         "client_id": client_id,
                         "worker_id": self.worker_id or "unknown",
                         "timestamp": time.time(),
-                        "remaining_clients": remaining
+                        "remaining_clients": remaining,
+                        "username": client_username
                     })
                     self.redis_client.publish(RedisKeys.events_channel(self.channel_id), event_data)
 
diff --git a/apps/proxy/ts_proxy/stream_generator.py b/apps/proxy/ts_proxy/stream_generator.py
index d58e4ea2..0036be5c 100644
--- a/apps/proxy/ts_proxy/stream_generator.py
+++ b/apps/proxy/ts_proxy/stream_generator.py
@@ -25,7 +25,7 @@ class StreamGenerator:
     data delivery, and cleanup.
     """
 
-    def __init__(self, channel_id, client_id, client_ip, client_user_agent, channel_initializing=False):
+    def __init__(self, channel_id, client_id, client_ip, client_user_agent, channel_initializing=False, user=None):
         """
         Initialize the stream generator with client and channel details.
 
@@ -35,12 +35,14 @@ class StreamGenerator:
             client_ip: Client's IP address
             client_user_agent: User agent string from client
             channel_initializing: Whether the channel is still initializing
+            user: Authenticated user making the request
         """
         self.channel_id = channel_id
         self.client_id = client_id
         self.client_ip = client_ip
         self.client_user_agent = client_user_agent
         self.channel_initializing = channel_initializing
+        self.user = user
 
         # Performance and state tracking
         self.stream_start_time = time.time()
@@ -112,7 +114,8 @@ class StreamGenerator:
                     channel_name=channel_obj.name,
                     client_ip=self.client_ip,
                     client_id=self.client_id,
-                    user_agent=self.client_user_agent[:100] if self.client_user_agent else None
+                    user_agent=self.client_user_agent[:100] if self.client_user_agent else None,
+                    username=self.user.username if self.user else None
                 )
             except Exception as e:
                 logger.error(f"Could not log client connect event: {e}")
@@ -593,7 +596,8 @@ class StreamGenerator:
                     client_id=self.client_id,
                     user_agent=self.client_user_agent[:100] if self.client_user_agent else None,
                     duration=round(elapsed, 2),
-                    bytes_sent=self.bytes_sent
+                    bytes_sent=self.bytes_sent,
+                    username=self.user.username if self.user else None
                 )
             except Exception as e:
                 logger.error(f"Could not log client disconnect event: {e}")
@@ -628,10 +632,10 @@ class StreamGenerator:
 
             gevent.spawn(delayed_shutdown)
 
-def create_stream_generator(channel_id, client_id, client_ip, client_user_agent, channel_initializing=False):
+def create_stream_generator(channel_id, client_id, client_ip, client_user_agent, channel_initializing=False, user=None):
     """
     Factory function to create a new stream generator.
     Returns a function that can be passed to StreamingHttpResponse.
     """
-    generator = StreamGenerator(channel_id, client_id, client_ip, client_user_agent, channel_initializing)
+    generator = StreamGenerator(channel_id, client_id, client_ip, client_user_agent, channel_initializing, user=user)
     return generator.generate
diff --git a/apps/proxy/ts_proxy/views.py b/apps/proxy/ts_proxy/views.py
index c8699191..5750616b 100644
--- a/apps/proxy/ts_proxy/views.py
+++ b/apps/proxy/ts_proxy/views.py
@@ -532,7 +532,7 @@ def stream_ts(request, channel_id, user=None):
 
         # Create a stream generator for this client
         generate = create_stream_generator(
-            channel_id, client_id, client_ip, client_user_agent, channel_initializing
+            channel_id, client_id, client_ip, client_user_agent, channel_initializing, user=user
         )
 
         # Return the StreamingHttpResponse from the main function

From 121199de9c52e201430b7b83cba5b346acff1f30 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 29 Mar 2026 16:20:04 -0500
Subject: [PATCH 111/172] refactor: remove unused playlist store imports and
 update Text component to use 'div' as the component type

---
 frontend/src/components/forms/M3UProfile.jsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/src/components/forms/M3UProfile.jsx b/frontend/src/components/forms/M3UProfile.jsx
index 7c24b212..b400c1e5 100644
--- a/frontend/src/components/forms/M3UProfile.jsx
+++ b/frontend/src/components/forms/M3UProfile.jsx
@@ -18,14 +18,9 @@ import {
 } from '@mantine/core';
 import { DateTimePicker } from '@mantine/dates';
 import { useWebSocket } from '../../WebSocket';
-import usePlaylistsStore from '../../store/playlists';
 
 const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
   const [websocketReady, sendMessage] = useWebSocket();
-
-  const profileSearchPreview = usePlaylistsStore((s) => s.profileSearchPreview);
-  const profileResult = usePlaylistsStore((s) => s.profileResult);
-
   const [streamUrl, setStreamUrl] = useState('');
   const [searchPattern, setSearchPattern] = useState('');
   const [replacePattern, setReplacePattern] = useState('');
@@ -339,7 +334,7 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
           <Grid gutter="xs">
             <Grid.Col span={12}>
               <Paper shadow="sm" p="xs" radius="md" withBorder>
-                <Text size="sm" weight={500} mb={3}>
+                <Text size="sm" weight={500} mb={3} component="div">
                   Matched Text{' '}
                   <Badge size="xs" color="yellow">
                     highlighted

From 2e0c136796fc66051c40589571cd48778de18e75 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 29 Mar 2026 16:22:44 -0500
Subject: [PATCH 112/172] fix: update dependency in useEffect to include
 sendMessage for WebSocket handling

---
 frontend/src/components/forms/M3UProfile.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/M3UProfile.jsx b/frontend/src/components/forms/M3UProfile.jsx
index b400c1e5..4acb4552 100644
--- a/frontend/src/components/forms/M3UProfile.jsx
+++ b/frontend/src/components/forms/M3UProfile.jsx
@@ -167,7 +167,7 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
     } catch (error) {
       console.error('Error sending WebSocket message:', error);
     }
-  }, [websocketReady, m3u, debouncedPatterns, streamUrl, sampleInput]);
+  }, [websocketReady, sendMessage, m3u, debouncedPatterns, streamUrl, sampleInput]);
 
   useEffect(() => {
     const handler = setTimeout(() => {

From 698f9ff4c02ac6d3ccd3d1eb722b8ba613e5977f Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 29 Mar 2026 16:33:08 -0500
Subject: [PATCH 113/172] Enhancement: Add descriptions and placeholders to
 input fields for better user guidance

---
 frontend/src/components/forms/M3UProfile.jsx | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/M3UProfile.jsx b/frontend/src/components/forms/M3UProfile.jsx
index 4acb4552..d00996d7 100644
--- a/frontend/src/components/forms/M3UProfile.jsx
+++ b/frontend/src/components/forms/M3UProfile.jsx
@@ -167,7 +167,14 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
     } catch (error) {
       console.error('Error sending WebSocket message:', error);
     }
-  }, [websocketReady, sendMessage, m3u, debouncedPatterns, streamUrl, sampleInput]);
+  }, [
+    websocketReady,
+    sendMessage,
+    m3u,
+    debouncedPatterns,
+    streamUrl,
+    sampleInput,
+  ]);
 
   useEffect(() => {
     const handler = setTimeout(() => {
@@ -237,6 +244,8 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
       <form onSubmit={handleSubmit(onSubmit)}>
         <TextInput
           label="Name"
+          description="A label to identify this URL rewrite profile"
+          placeholder="e.g. Provider A - 2nd Connection"
           {...register('name')}
           error={errors.name?.message}
         />
@@ -245,6 +254,7 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
         {!isDefaultProfile && (
           <NumberInput
             label="Max Streams"
+            description="Maximum concurrent streams allowed for this profile. Set to 0 for unlimited."
             {...register('max_streams')}
             value={watch('max_streams')}
             onChange={(value) => setValue('max_streams', value || 0)}
@@ -259,12 +269,16 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
           <>
             <TextInput
               label="Search Pattern (Regex)"
+              description="A regular expression matching the part of the stream URL you want to replace. For most users, matching just the credentials is enough."
+              placeholder="e.g. username1/password1"
               value={searchPattern}
               onChange={onSearchPatternUpdate}
               error={errors.search_pattern?.message}
             />
             <TextInput
               label="Replace Pattern"
+              description="The value to substitute in place of the matched text. Use $1, $2, etc. to reference regex capture groups."
+              placeholder="e.g. username2/password2"
               value={replacePattern}
               onChange={onReplacePatternUpdate}
               error={errors.replace_pattern?.message}

From 9579248485e32fe8609f5ca1e14ebbaf04cc7d54 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 29 Mar 2026 17:04:56 -0500
Subject: [PATCH 114/172] Enhancement: M3U Profile form (XC accounts): added a
 **Simple / Advanced** mode toggle for credential-based URL rewriting. In
 Simple mode users enter just a new username and password; the search and
 replace patterns are built automatically from the account's current
 credentials. In Advanced mode the full regex fields are shown as before. The
 selected mode is saved to `custom_properties.xcMode` and auto-detected on
 existing profiles (a profile whose search pattern matches the account's
 current `username/password` is recognised as Simple automatically). The Live
 Regex Demonstration panel is hidden in Simple mode.

---
 CHANGELOG.md                                 |   1 +
 frontend/src/components/forms/M3UProfile.jsx | 169 ++++++++++++++++---
 2 files changed, 149 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58e5d90d..e046aa43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- M3U Profile form (XC accounts): added a **Simple / Advanced** mode toggle for credential-based URL rewriting. In Simple mode users enter just a new username and password; the search and replace patterns are built automatically from the account's current credentials. In Advanced mode the full regex fields are shown as before. The selected mode is saved to `custom_properties.xcMode` and auto-detected on existing profiles (a profile whose search pattern matches the account's current `username/password` is recognised as Simple automatically). The Live Regex Demonstration panel is hidden in Simple mode.
 - XtreamCodes VOD endpoints (`/movie/` and `/series/`) no longer redirect clients to a UUID-based proxy URL. Requests are now handled directly in the proxy layer via `stream_xc_movie` and `stream_xc_episode`, which call `stream_vod()` internally. The original XC path is preserved for the client throughout the stream.
 - `CustomTable` column layout now supports flexible (`grow`) columns alongside fixed-width ones:
   - Column definitions accept a `grow` property (boolean or number) to opt into flex layout. A numeric value sets the flex-grow weight, allowing relative sizing between grow columns (e.g. `grow: 2` gives a column twice the share of spare space as `grow: 1`).
diff --git a/frontend/src/components/forms/M3UProfile.jsx b/frontend/src/components/forms/M3UProfile.jsx
index d00996d7..bbb2823c 100644
--- a/frontend/src/components/forms/M3UProfile.jsx
+++ b/frontend/src/components/forms/M3UProfile.jsx
@@ -15,6 +15,7 @@ import {
   Grid,
   Textarea,
   NumberInput,
+  SegmentedControl,
 } from '@mantine/core';
 import { DateTimePicker } from '@mantine/dates';
 import { useWebSocket } from '../../WebSocket';
@@ -26,6 +27,10 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
   const [replacePattern, setReplacePattern] = useState('');
   const [debouncedPatterns, setDebouncedPatterns] = useState({});
   const [sampleInput, setSampleInput] = useState('');
+  const [xcMode, setXcMode] = useState('simple');
+  const [newUsername, setNewUsername] = useState('');
+  const [newPassword, setNewPassword] = useState('');
+  const [simpleErrors, setSimpleErrors] = useState({});
   const isDefaultProfile = profile?.is_default;
 
   const isXC = m3u?.account_type === 'XC';
@@ -45,12 +50,12 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
   const schema = Yup.object({
     name: Yup.string().required('Name is required'),
     search_pattern: Yup.string().when([], {
-      is: () => !isDefaultProfile,
+      is: () => !isDefaultProfile && !isXC,
       then: (schema) => schema.required('Search pattern is required'),
       otherwise: (schema) => schema.notRequired(),
     }),
     replace_pattern: Yup.string().when([], {
-      is: () => !isDefaultProfile,
+      is: () => !isDefaultProfile && !isXC,
       then: (schema) => schema.required('Replace pattern is required'),
       otherwise: (schema) => schema.notRequired(),
     }),
@@ -64,6 +69,7 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
     reset,
     setValue,
     watch,
+    setError,
   } = useForm({
     defaultValues,
     resolver: yupResolver(schema),
@@ -83,6 +89,32 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
       expDateValue = null;
     }
 
+    // For XC simple mode: validate simple inputs and build patterns from credentials
+    if (isXC && xcMode === 'simple' && !isDefaultProfile) {
+      const errs = {};
+      if (!newUsername.trim()) errs.newUsername = 'New username is required';
+      if (!newPassword.trim()) errs.newPassword = 'New password is required';
+      if (Object.keys(errs).length > 0) {
+        setSimpleErrors(errs);
+        return;
+      }
+      setSimpleErrors({});
+      values.search_pattern = `${m3u?.username || ''}/${m3u?.password || ''}`;
+      values.replace_pattern = `${newUsername.trim()}/${newPassword.trim()}`;
+    }
+
+    // For XC advanced mode: validate regex pattern fields
+    if (isXC && xcMode === 'advanced' && !isDefaultProfile) {
+      if (!searchPattern.trim()) {
+        setError('search_pattern', { message: 'Search pattern is required' });
+        return;
+      }
+      if (!replacePattern.trim()) {
+        setError('replace_pattern', { message: 'Replace pattern is required' });
+        return;
+      }
+    }
+
     // For default profiles, only send name and custom_properties (notes)
     let submitValues;
     if (isDefaultProfile) {
@@ -105,6 +137,7 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
           // Preserve existing custom_properties and add/update notes
           ...(profile?.custom_properties || {}),
           notes: values.notes || '',
+          ...(isXC ? { xcMode } : {}),
         },
       };
     }
@@ -200,12 +233,63 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
     reset(defaultValues);
     setSearchPattern(profile?.search_pattern || '');
     setReplacePattern(profile?.replace_pattern || '');
-  }, [defaultValues, profile, reset]);
+    if (isXC && !isDefaultProfile) {
+      const storedMode = profile?.custom_properties?.xcMode;
+      let detectedMode;
+      if (storedMode) {
+        detectedMode = storedMode;
+      } else if (
+        profile?.search_pattern &&
+        profile.search_pattern === `${m3u?.username}/${m3u?.password}`
+      ) {
+        detectedMode = 'simple';
+      } else if (profile?.search_pattern) {
+        detectedMode = 'advanced';
+      } else {
+        detectedMode = 'simple';
+      }
+      setXcMode(detectedMode);
+      if (detectedMode === 'simple') {
+        const rp = profile?.replace_pattern || '';
+        const idx = rp.indexOf('/');
+        setNewUsername(idx === -1 ? rp : rp.slice(0, idx));
+        setNewPassword(idx === -1 ? '' : rp.slice(idx + 1));
+      }
+    }
+  }, [
+    defaultValues,
+    isDefaultProfile,
+    isXC,
+    m3u?.password,
+    m3u?.username,
+    profile,
+    reset,
+  ]);
 
   const handleSampleInputChange = (e) => {
     setSampleInput(e.target.value);
   };
 
+  const handleXcModeChange = (mode) => {
+    if (mode === 'advanced' && xcMode === 'simple') {
+      // Pre-populate regex fields from current simple values
+      const sp = `${m3u?.username || ''}/${m3u?.password || ''}`;
+      const rp = `${newUsername}/${newPassword}`;
+      setSearchPattern(sp);
+      setReplacePattern(rp);
+      setValue('search_pattern', sp);
+      setValue('replace_pattern', rp);
+    } else if (mode === 'simple' && xcMode === 'advanced') {
+      // Parse current replace pattern back into username/password
+      const idx = replacePattern.indexOf('/');
+      setNewUsername(
+        idx === -1 ? replacePattern : replacePattern.slice(0, idx)
+      );
+      setNewPassword(idx === -1 ? '' : replacePattern.slice(idx + 1));
+    }
+    setXcMode(mode);
+  };
+
   // Local regex testing for immediate visual feedback
   const getHighlightedSearchText = () => {
     if (!searchPattern || !sampleInput) return sampleInput;
@@ -267,22 +351,65 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
         {/* Only show search/replace fields for non-default profiles */}
         {!isDefaultProfile && (
           <>
-            <TextInput
-              label="Search Pattern (Regex)"
-              description="A regular expression matching the part of the stream URL you want to replace. For most users, matching just the credentials is enough."
-              placeholder="e.g. username1/password1"
-              value={searchPattern}
-              onChange={onSearchPatternUpdate}
-              error={errors.search_pattern?.message}
-            />
-            <TextInput
-              label="Replace Pattern"
-              description="The value to substitute in place of the matched text. Use $1, $2, etc. to reference regex capture groups."
-              placeholder="e.g. username2/password2"
-              value={replacePattern}
-              onChange={onReplacePatternUpdate}
-              error={errors.replace_pattern?.message}
-            />
+            {isXC && (
+              <SegmentedControl
+                mt="xs"
+                mb="xs"
+                fullWidth
+                size="xs"
+                value={xcMode}
+                onChange={handleXcModeChange}
+                data={[
+                  { label: 'Simple', value: 'simple' },
+                  { label: 'Advanced (Regex)', value: 'advanced' },
+                ]}
+              />
+            )}
+            {isXC && xcMode === 'simple' ? (
+              <>
+                <TextInput
+                  label="New Username"
+                  description="Your updated XC account username. The current username in all stream URLs will be replaced with this."
+                  placeholder="e.g. username2"
+                  value={newUsername}
+                  onChange={(e) => {
+                    setNewUsername(e.target.value);
+                    setSimpleErrors((s) => ({ ...s, newUsername: undefined }));
+                  }}
+                  error={simpleErrors.newUsername}
+                />
+                <TextInput
+                  label="New Password"
+                  description="Your updated XC account password. The current password in all stream URLs will be replaced with this."
+                  placeholder="e.g. password2"
+                  value={newPassword}
+                  onChange={(e) => {
+                    setNewPassword(e.target.value);
+                    setSimpleErrors((s) => ({ ...s, newPassword: undefined }));
+                  }}
+                  error={simpleErrors.newPassword}
+                />
+              </>
+            ) : (
+              <>
+                <TextInput
+                  label="Search Pattern (Regex)"
+                  description="A regular expression matching the part of the stream URL you want to replace. For most users, matching just the credentials is enough."
+                  placeholder="e.g. username1/password1"
+                  value={searchPattern}
+                  onChange={onSearchPatternUpdate}
+                  error={errors.search_pattern?.message}
+                />
+                <TextInput
+                  label="Replace Pattern"
+                  description="The value to substitute in place of the matched text. Use $1, $2, etc. to reference regex capture groups."
+                  placeholder="e.g. username2/password2"
+                  value={replacePattern}
+                  onChange={onReplacePatternUpdate}
+                  error={errors.replace_pattern?.message}
+                />
+              </>
+            )}
           </>
         )}
 
@@ -326,8 +453,8 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
         </Flex>
       </form>
 
-      {/* Only show regex demonstration for non-default profiles */}
-      {!isDefaultProfile && (
+      {/* Only show regex demonstration for non-default profiles in advanced mode */}
+      {!isDefaultProfile && (!isXC || xcMode === 'advanced') && (
         <>
           <Title order={4} mt={15} mb={10}>
             Live Regex Demonstration

From 086cc749591f5b7b76c8185df8038937837df806 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 29 Mar 2026 17:55:08 -0500
Subject: [PATCH 115/172] =?UTF-8?q?Bug=20Fix:=20M3U=20profile=20URL=20rewr?=
 =?UTF-8?q?iting=20now=20uses=20the=20`regex`=20module=20instead=20of=20`r?=
 =?UTF-8?q?e`=20across=20all=20URL=20transform=20code=20paths=20(`url=5Fut?=
 =?UTF-8?q?ils.transform=5Furl`,=20`core/views.py`,=20`vod=5Fproxy/=5Ftran?=
 =?UTF-8?q?sform=5Furl`,=20`tasks.get=5Ftransformed=5Fcredentials`,=20and?=
 =?UTF-8?q?=20the=20WebSocket=20live-preview=20handler=20in=20`consumers.p?=
 =?UTF-8?q?y`).=20The=20`regex`=20module=20natively=20accepts=20JavaScript?=
 =?UTF-8?q?/PCRE-style=20named=20capture=20groups=20(`(=3F<name>...)`)=20w?=
 =?UTF-8?q?ithout=20any=20conversion,=20eliminating=20the=20root=20cause?=
 =?UTF-8?q?=20of=20patterns=20that=20matched=20in=20the=20frontend=20live?=
 =?UTF-8?q?=20preview=20but=20failed=20on=20the=20backend=20with=20a=20`re?=
 =?UTF-8?q?.error`.=20As=20a=20further=20improvement,=20`regex`=20also=20s?=
 =?UTF-8?q?upports=20variable-length=20lookbehind=20assertions=20(e.g.=20`?=
 =?UTF-8?q?(=3F<=3Da+)`),=20which=20`re`=20rejects=20with=20an=20error;=20?=
 =?UTF-8?q?patterns=20using=20these=20will=20now=20work=20correctly=20on?=
 =?UTF-8?q?=20the=20backend=20as=20well.=20Replace-pattern=20JS=20tokens?=
 =?UTF-8?q?=20are=20still=20normalised=20before=20calling=20`regex.sub`:?=
 =?UTF-8?q?=20`$<name>`=20=E2=86=92=20`\g<name>`=20and=20`$1`/`$2`/?=
 =?UTF-8?q?=E2=80=A6=20=E2=86=92=20`\1`/`\2`/=E2=80=A6=20(Python=20replace?=
 =?UTF-8?q?ment=20syntax).=20Also=20fixed=20a=20bug=20in=20the=20WebSocket?=
 =?UTF-8?q?=20preview=20handler=20where=20a=20pattern=20error=20was=20inco?=
 =?UTF-8?q?rrectly=20returning=20the=20search=20pattern=20string=20as=20th?=
 =?UTF-8?q?e=20preview=20output=20instead=20of=20the=20original=20URL.=20(?=
 =?UTF-8?q?Fixes=20#1005)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                 |  1 +
 apps/m3u/tasks.py                            |  9 ++++++---
 apps/proxy/ts_proxy/url_utils.py             | 11 ++++++-----
 apps/proxy/vod_proxy/views.py                |  9 ++++++---
 core/views.py                                |  9 ++++++---
 dispatcharr/consumers.py                     |  6 +++---
 frontend/src/components/forms/M3UProfile.jsx |  2 +-
 7 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e046aa43..249ea29b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- M3U profile URL rewriting now uses the `regex` module instead of `re` across all URL transform code paths (`url_utils.transform_url`, `core/views.py`, `vod_proxy/_transform_url`, `tasks.get_transformed_credentials`, and the WebSocket live-preview handler in `consumers.py`). The `regex` module natively accepts JavaScript/PCRE-style named capture groups (`(?<name>...)`) without any conversion, eliminating the root cause of patterns that matched in the frontend live preview but failed on the backend with a `re.error`. As a further improvement, `regex` also supports variable-length lookbehind assertions (e.g. `(?<=a+)`), which `re` rejects with an error; patterns using these will now work correctly on the backend as well. Replace-pattern JS tokens are still normalised before calling `regex.sub`: `$<name>` → `\g<name>` and `$1`/`$2`/… → `\1`/`\2`/… (Python replacement syntax). Also fixed a bug in the WebSocket preview handler where a pattern error was incorrectly returning the search pattern string as the preview output instead of the original URL. (Fixes #1005)
 - Web UI stream preview (`FloatingVideo`) was calling `mpegts.createPlayer()` with all `Config` options (e.g. `enableWorker`, `liveSync`, `headers`) merged into the first `MediaDataSource` argument. mpegts.js only reads `Config` from the optional second argument; unrecognised fields in the first are silently ignored. As a result all player configuration was effectively the library defaults — worker offloading was disabled, latency management had no effect, and the `Authorization: Bearer` header (required for user identification) was never sent. Fixed by splitting into the correct two-argument call. Both `liveBufferLatencyChasing` and `liveSync` have been disabled, eliminating playback-rate fluctuations that caused audible stuttering on live streams. SourceBuffer cleanup thresholds were also relaxed from 10s/5s to 120s/60s to prevent frequent SourceBuffer pauses.
 - HTML named entities in XMLTV EPG files are now resolved to Unicode characters before lxml parsing. Some EPG providers (particularly French and other European sources) use HTML named entities like `&eacute;`, `&icirc;`, `&uuml;` in channel names, program titles, and metadata. These are not valid XML entities — lxml 6.0.2 with `recover=True` silently drops them, causing characters to go missing (e.g., "Chaîne Télé" becomes "Chane Tl"). A preprocessing step in `fetch_xmltv()` now resolves HTML named entities while preserving the 5 XML-predefined entities, detecting encoding from the XML declaration (falling back to UTF-8), and processing line-by-line to a temp file before atomically replacing the original. (Closes #1095) — Thanks [@CodeBormen](https://github.com/CodeBormen)
 - Duplicate recordings created when EPG sources refresh and re-evaluate series rules (Fixes #940) — Thanks [@CodeBormen](https://github.com/CodeBormen):
diff --git a/apps/m3u/tasks.py b/apps/m3u/tasks.py
index 9c31fa75..354a2ef4 100644
--- a/apps/m3u/tasks.py
+++ b/apps/m3u/tasks.py
@@ -1,6 +1,7 @@
 # apps/m3u/tasks.py
 import logging
 import re
+import regex
 import requests
 import os
 import gc
@@ -2399,11 +2400,13 @@ def get_transformed_credentials(account, profile=None):
         # Apply profile-specific transformations if profile is provided
         if profile and profile.search_pattern and profile.replace_pattern:
             try:
-                # Handle backreferences in the replacement pattern
-                safe_replace_pattern = re.sub(r'\$(\d+)', r'\\\1', profile.replace_pattern)
+                # Handle backreferences: convert JS-style $<name> -> \g<name>, $1 -> \1
+                # regex module accepts JS-style (?<name>...) named groups natively
+                safe_replace_pattern = regex.sub(r'\$<([^>]+)>', r'\\g<\1>', profile.replace_pattern)
+                safe_replace_pattern = regex.sub(r'\$(\d+)', r'\\\1', safe_replace_pattern)
 
                 # Apply transformation to the complete URL
-                transformed_complete_url = re.sub(profile.search_pattern, safe_replace_pattern, complete_url)
+                transformed_complete_url = regex.sub(profile.search_pattern, safe_replace_pattern, complete_url)
                 logger.info(f"Transformed complete URL: {complete_url} -> {transformed_complete_url}")
 
                 # Extract components from the transformed URL
diff --git a/apps/proxy/ts_proxy/url_utils.py b/apps/proxy/ts_proxy/url_utils.py
index 55e44c35..5f4615a4 100644
--- a/apps/proxy/ts_proxy/url_utils.py
+++ b/apps/proxy/ts_proxy/url_utils.py
@@ -3,7 +3,7 @@ Utilities for handling stream URLs and transformations.
 """
 
 import logging
-import re
+import regex
 from typing import Optional, Tuple, List
 from django.shortcuts import get_object_or_404
 from apps.channels.models import Channel, Stream
@@ -146,13 +146,14 @@ def transform_url(input_url: str, search_pattern: str, replace_pattern: str) ->
         logger.debug(f"  base URL: {input_url}")
         logger.debug(f"  search: {search_pattern}")
 
-        # Handle backreferences in the replacement pattern
-        safe_replace_pattern = re.sub(r'\$(\d+)', r'\\\1', replace_pattern)
+        # Convert JS-style backreferences in replace pattern: $<name> -> \g<name>, $1 -> \1
+        safe_replace_pattern = regex.sub(r'\$<([^>]+)>', r'\\g<\1>', replace_pattern)
+        safe_replace_pattern = regex.sub(r'\$(\d+)', r'\\\1', safe_replace_pattern)
         logger.debug(f"  replace: {replace_pattern}")
         logger.debug(f"  safe replace: {safe_replace_pattern}")
 
-        # Apply the transformation
-        stream_url = re.sub(search_pattern, safe_replace_pattern, input_url)
+        # Apply the transformation (regex module accepts JS-style (?<name>...) natively)
+        stream_url = regex.sub(search_pattern, safe_replace_pattern, input_url)
         logger.info(f"Generated stream url: {stream_url}")
 
         return stream_url
diff --git a/apps/proxy/vod_proxy/views.py b/apps/proxy/vod_proxy/views.py
index 4382caaa..8db51ebd 100644
--- a/apps/proxy/vod_proxy/views.py
+++ b/apps/proxy/vod_proxy/views.py
@@ -270,17 +270,20 @@ def _get_m3u_profile(m3u_account, profile_id, session_id=None):
 def _transform_url(original_url, m3u_profile):
     """Transform URL based on M3U profile settings"""
     try:
-        import re
+        import regex
 
         if not original_url:
             return None
 
         search_pattern = m3u_profile.search_pattern
         replace_pattern = m3u_profile.replace_pattern
-        safe_replace_pattern = re.sub(r'\$(\d+)', r'\\\1', replace_pattern)
+        # Convert JS-style backreferences in replace: $<name> -> \g<name>, $1 -> \1
+        safe_replace_pattern = regex.sub(r'\$<([^>]+)>', r'\\g<\1>', replace_pattern)
+        safe_replace_pattern = regex.sub(r'\$(\d+)', r'\\\1', safe_replace_pattern)
 
         if search_pattern and replace_pattern:
-            transformed_url = re.sub(search_pattern, safe_replace_pattern, original_url)
+            # regex module accepts JS-style (?<name>...) named groups natively
+            transformed_url = regex.sub(search_pattern, safe_replace_pattern, original_url)
             return transformed_url
 
         return original_url
diff --git a/core/views.py b/core/views.py
index b3e6dfb2..7321367c 100644
--- a/core/views.py
+++ b/core/views.py
@@ -4,7 +4,7 @@ from shlex import split as shlex_split
 import sys
 import subprocess
 import logging
-import re
+import regex
 import redis
 
 from django.conf import settings
@@ -132,10 +132,13 @@ def stream_view(request, channel_uuid):
         # Prepare the pattern replacement.
         logger.debug("Executing the following pattern replacement:")
         logger.debug(f"  search: {active_profile.search_pattern}")
-        safe_replace_pattern = re.sub(r'\$(\d+)', r'\\\1', active_profile.replace_pattern)
+        # Convert JS-style backreferences in replace: $<name> -> \g<name>, $1 -> \1
+        safe_replace_pattern = regex.sub(r'\$<([^>]+)>', r'\\g<\1>', active_profile.replace_pattern)
+        safe_replace_pattern = regex.sub(r'\$(\d+)', r'\\\1', safe_replace_pattern)
         logger.debug(f"  replace: {active_profile.replace_pattern}")
         logger.debug(f"  safe replace: {safe_replace_pattern}")
-        stream_url = re.sub(active_profile.search_pattern, safe_replace_pattern, input_url)
+        # regex module accepts JS-style (?<name>...) named groups natively
+        stream_url = regex.sub(active_profile.search_pattern, safe_replace_pattern, input_url)
         logger.debug(f"Generated stream url: {stream_url}")
 
         # Get the stream profile set on the channel.
diff --git a/dispatcharr/consumers.py b/dispatcharr/consumers.py
index 4e21bdae..7b62d957 100644
--- a/dispatcharr/consumers.py
+++ b/dispatcharr/consumers.py
@@ -1,6 +1,6 @@
 import json
 from channels.generic.websocket import AsyncWebsocketConsumer
-import re, logging
+import regex, logging
 
 logger = logging.getLogger(__name__)
 
@@ -54,9 +54,9 @@ class MyWebSocketConsumer(AsyncWebsocketConsumer):
 
             # Apply the transformation using the replace_with_mark function
             try:
-                search_preview = re.sub(data["search"], replace_with_mark, data["url"])
+                search_preview = regex.sub(data["search"], replace_with_mark, data["url"])
             except Exception as e:
-                search_preview = data["search"]
+                search_preview = data["url"]
                 logger.error(f"Failed to generate replace preview: {e}")
 
             result = transform_url(data["url"], data["search"], data["replace"])
diff --git a/frontend/src/components/forms/M3UProfile.jsx b/frontend/src/components/forms/M3UProfile.jsx
index bbb2823c..65da3e17 100644
--- a/frontend/src/components/forms/M3UProfile.jsx
+++ b/frontend/src/components/forms/M3UProfile.jsx
@@ -290,7 +290,7 @@ const RegexFormAndView = ({ profile = null, m3u, isOpen, onClose }) => {
     setXcMode(mode);
   };
 
-  // Local regex testing for immediate visual feedback
+  // Local regex for the live demo preview
   const getHighlightedSearchText = () => {
     if (!searchPattern || !sampleInput) return sampleInput;
     try {

From d4ecf45bc29ebcf7ebbbb8214a35773d0f32e8c2 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 29 Mar 2026 19:51:57 -0500
Subject: [PATCH 116/172] =?UTF-8?q?Bug=20Fix/Enhancement:=20-=20EPG=20refr?=
 =?UTF-8?q?esh=20tasks=20(`refresh=5Fepg=5Fdata`)=20were=20being=20killed?=
 =?UTF-8?q?=20mid-transaction=20on=20large=20EPG=20sources.=20The=20`soft?=
 =?UTF-8?q?=5Ftime=5Flimit=3D1700s`=20introduced=20in=20v0.21.0=20raised?=
 =?UTF-8?q?=20`SoftTimeLimitExceeded`,=20a=20subclass=20of=20`Exception`,?=
 =?UTF-8?q?=20which=20was=20swallowed=20by=20the=20existing=20`except=20Ex?=
 =?UTF-8?q?ception`=20handler=20in=20`parse=5Fprograms=5Ffor=5Fsource`,=20?=
 =?UTF-8?q?leaving=20the=20database=20in=20a=20partial=20state=20with=20no?=
 =?UTF-8?q?=20logged=20error.=20The=20underlying=20cause=20is=20that=20the?=
 =?UTF-8?q?=20HTML=20entity=20preprocessing=20step=20added=20in=20v0.21.0?=
 =?UTF-8?q?=20adds=202=E2=80=9310+=20minutes=20on=20multi-gigabyte=20EPG?=
 =?UTF-8?q?=20files,=20pushing=20total=20task=20duration=20past=20the=2017?=
 =?UTF-8?q?00s=20limit=20for=20large=20sources.=20`soft=5Ftime=5Flimit`=20?=
 =?UTF-8?q?has=20been=20removed=20from=20`refresh=5Fepg=5Fdata`=20and=20`t?=
 =?UTF-8?q?ime=5Flimit`=20raised=20to=2014400s=20(4=20hours)=20as=20a=20tr?=
 =?UTF-8?q?ue=20last-resort=20ceiling;=20the=20existing=20`TaskLockRenewer?=
 =?UTF-8?q?`=20daemon=20thread=20continues=20to=20renew=20the=20Redis=20lo?=
 =?UTF-8?q?ck=20every=20120s=20for=20legitimately=20long-running=20tasks.?=
 =?UTF-8?q?=20-=20HTML=20entity=20preprocessing=20(`=5Fresolve=5Fhtml=5Fen?=
 =?UTF-8?q?tities`)=20now=20performs=20a=20fast=20binary=20pre-scan=20befo?=
 =?UTF-8?q?re=20any=20file=20read=20or=20write.=20The=20pre-scan=20reads?=
 =?UTF-8?q?=20the=20file=20in=204=20MB=20chunks=20without=20text=20decodin?=
 =?UTF-8?q?g=20and=20exits=20immediately=20on=20the=20first=20non-XML=20na?=
 =?UTF-8?q?med=20entity=20found.=20For=20EPG=20sources=20that=20contain=20?=
 =?UTF-8?q?no=20HTML=20entities=20=E2=80=94=20the=20common=20case=20?=
 =?UTF-8?q?=E2=80=94=20the=20full=20line-by-line=20read+rewrite=20pass=20(?=
 =?UTF-8?q?which=20takes=202=E2=80=9310+=20minutes=20on=20a=202.5=20GB=20f?=
 =?UTF-8?q?ile)=20is=20skipped=20entirely.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md      |   2 +
 apps/epg/tasks.py | 104 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 74 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 249ea29b..e8bccb55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - **Program ID instability**: `parse_programs_for_source()` deletes and recreates all `ProgramData` rows with new auto-increment IDs on every EPG refresh. The dedup set used these IDs, so it never matched after a refresh. Deduplication now uses a stable `(tvg_id, start_time, end_time)` composite key sourced from `Recording.custom_properties.program`.
   - **Secondary guard using wrong times**: The DB guard compared unadjusted program times against offset-adjusted `Recording.start_time`/`end_time`, so it never matched when any DVR pre/post offset was configured. It now queries `custom_properties__program__start_time/end_time` (the original, unadjusted program times stored at recording creation).
   - **No concurrency guard**: Each EPG source refresh fired `evaluate_series_rules.delay()` independently. Concurrent tasks loaded the dedup set before others committed, allowing races. Evaluation is now serialized with `acquire_task_lock` (reusing the existing EPG task pattern). Gracefully degrades if Redis is unavailable — the primary and secondary dedup guards still protect.
+- EPG refresh tasks (`refresh_epg_data`) were being killed mid-transaction on large EPG sources. The `soft_time_limit=1700s` introduced in v0.21.0 raised `SoftTimeLimitExceeded`, a subclass of `Exception`, which was swallowed by the existing `except Exception` handler in `parse_programs_for_source`, leaving the database in a partial state with no logged error. The underlying cause is that the HTML entity preprocessing step added in v0.21.0 adds 2–10+ minutes on multi-gigabyte EPG files, pushing total task duration past the 1700s limit for large sources. `soft_time_limit` has been removed from `refresh_epg_data` and `time_limit` raised to 14400s (4 hours) as a true last-resort ceiling; the existing `TaskLockRenewer` daemon thread continues to renew the Redis lock every 120s for legitimately long-running tasks.
+- HTML entity preprocessing (`_resolve_html_entities`) now performs a fast binary pre-scan before any file read or write. The pre-scan reads the file in 4 MB chunks without text decoding and exits immediately on the first non-XML named entity found. For EPG sources that contain no HTML entities — the common case — the full line-by-line read+rewrite pass (which takes 2–10+ minutes on a 2.5 GB file) is skipped entirely.
 
 ## [0.21.1] - 2026-03-18
 
diff --git a/apps/epg/tasks.py b/apps/epg/tasks.py
index 9683c85a..3126453d 100644
--- a/apps/epg/tasks.py
+++ b/apps/epg/tasks.py
@@ -18,7 +18,7 @@ import zipfile
 
 from celery import shared_task
 from django.conf import settings
-from django.db import transaction
+from django.db import connection, transaction
 from django.utils import timezone
 from apps.channels.models import Channel
 from core.models import UserAgent, CoreSettings
@@ -36,8 +36,11 @@ logger = logging.getLogger(__name__)
 # &eacute; are silently dropped in recovery mode.  This substitution
 # converts them to Unicode before the file reaches the parser.
 _XML_ENTITIES = frozenset({'amp', 'lt', 'gt', 'quot', 'apos'})
+_XML_ENTITIES_BYTES = frozenset(n.encode() for n in _XML_ENTITIES)
 _XML_SPECIAL_CHARS = frozenset('&<>\'"')
 _NAMED_ENTITY_RE = re.compile(r'&([a-zA-Z][a-zA-Z0-9]*);')
+# Binary version used by the fast pre-scan (no text decoding needed)
+_BINARY_ENTITY_RE = re.compile(rb'&([a-zA-Z][a-zA-Z0-9]*);')
 
 
 def _replace_html_entity(match):
@@ -79,6 +82,32 @@ def _detect_xml_encoding(header):
     return 'utf-8'
 
 
+def _file_needs_entity_resolution(file_path):
+    """Binary pre-scan: return True only if file contains non-XML named HTML entities.
+
+    Reads in 4 MB chunks with a small overlap to catch entities that straddle
+    a chunk boundary.  Avoids all text-decode overhead — this is effectively a
+    raw memory scan and exits as soon as the first HTML entity is found.
+    """
+    CHUNK = 4 * 1024 * 1024  # 4 MB
+    OVERLAP = 32              # longer than any valid entity name + surrounding &;
+    try:
+        with open(file_path, 'rb') as f:
+            prev = b''
+            while True:
+                chunk = f.read(CHUNK)
+                if not chunk:
+                    return False
+                data = prev + chunk
+                for m in _BINARY_ENTITY_RE.finditer(data):
+                    if m.group(1).lower() not in _XML_ENTITIES_BYTES:
+                        return True
+                prev = data[-OVERLAP:]
+    except OSError:
+        return False
+    return False
+
+
 def _resolve_html_entities(file_path):
     """Replace HTML named entities in an XMLTV file with Unicode characters.
 
@@ -89,6 +118,14 @@ def _resolve_html_entities(file_path):
     This function is strictly additive — on any error the original file is
     left untouched so lxml can handle it as it always did.
     """
+    # Fast binary pre-scan: if the file contains no non-XML named entities
+    # there is nothing to do and we can skip the full read+write entirely.
+    # For large files (e.g. 2.5 GB) this avoids significant I/O time when
+    # the EPG source is already clean (the common case).
+    if not _file_needs_entity_resolution(file_path):
+        logger.debug(f"No HTML entities found in {file_path}, skipping entity resolution")
+        return
+    logger.info(f"HTML entities detected in {file_path}, resolving...")
     # Read the first 200 bytes to detect encoding from the XML declaration
     with open(file_path, 'rb') as f:
         header = f.read(200)
@@ -245,7 +282,7 @@ def refresh_all_epg_data():
     return "EPG data refreshed."
 
 
-@shared_task(time_limit=1800, soft_time_limit=1700)
+@shared_task(time_limit=14400)
 def refresh_epg_data(source_id):
     if not acquire_task_lock('refresh_epg_data', source_id):
         logger.debug(f"EPG refresh for {source_id} already running")
@@ -499,42 +536,41 @@ def fetch_xmltv(source):
 
             # Download to temporary file
             with open(temp_download_path, 'wb') as f:
-                for chunk in response.iter_content(chunk_size=16384):  # Increased chunk size for better performance
-                    if chunk:
-                        f.write(chunk)
+                for chunk in response.iter_content(chunk_size=16384):
+                    f.write(chunk)
 
-                        downloaded += len(chunk)
-                        elapsed_time = time.time() - start_time
+                    downloaded += len(chunk)
+                    elapsed_time = time.time() - start_time
 
-                        # Calculate download speed in KB/s
-                        speed = downloaded / elapsed_time / 1024 if elapsed_time > 0 else 0
+                    # Calculate download speed in KB/s
+                    speed = downloaded / elapsed_time / 1024 if elapsed_time > 0 else 0
 
-                        # Calculate progress percentage
-                        if total_size and total_size > 0:
-                            progress = min(100, int((downloaded / total_size) * 100))
-                        else:
-                            # If no content length header, estimate progress
-                            progress = min(95, int((downloaded / (10 * 1024 * 1024)) * 100))  # Assume 10MB if unknown
+                    # Calculate progress percentage
+                    if total_size and total_size > 0:
+                        progress = min(100, int((downloaded / total_size) * 100))
+                    else:
+                        # If no content length header, estimate progress
+                        progress = min(95, int((downloaded / (10 * 1024 * 1024)) * 100))  # Assume 10MB if unknown
 
-                        # Time remaining (in seconds)
-                        time_remaining = (total_size - downloaded) / (speed * 1024) if speed > 0 and total_size > 0 else 0
+                    # Time remaining (in seconds)
+                    time_remaining = (total_size - downloaded) / (speed * 1024) if speed > 0 and total_size > 0 else 0
 
-                        # Only send updates at specified intervals to avoid flooding
-                        current_time = time.time()
-                        if current_time - last_update_time >= update_interval and progress > 0:
-                            last_update_time = current_time
-                            send_epg_update(
-                                source.id,
-                                "downloading",
-                                progress,
-                                speed=round(speed, 2),
-                                elapsed_time=round(elapsed_time, 1),
-                                time_remaining=round(time_remaining, 1),
-                                downloaded=f"{downloaded / (1024 * 1024):.2f} MB"
-                            )
+                    # Only send updates at specified intervals to avoid flooding
+                    current_time = time.time()
+                    if current_time - last_update_time >= update_interval and progress > 0:
+                        last_update_time = current_time
+                        send_epg_update(
+                            source.id,
+                            "downloading",
+                            progress,
+                            speed=round(speed, 2),
+                            elapsed_time=round(elapsed_time, 1),
+                            time_remaining=round(time_remaining, 1),
+                            downloaded=f"{downloaded / (1024 * 1024):.2f} MB"
+                        )
 
-                        # Explicitly delete the chunk to free memory immediately
-                        del chunk
+                    # Explicitly delete the chunk to free memory immediately
+                    del chunk
 
             # Send completion notification
             send_epg_update(source.id, "downloading", 100)
@@ -1763,6 +1799,10 @@ def parse_programs_for_source(epg_source, tvg_id=None):
         batch_size = 1000
         try:
             with transaction.atomic():
+                # Kill any individual statement that hangs longer than 10 minutes.
+                # SET LOCAL automatically resets when this transaction ends (commit or rollback).
+                with connection.cursor() as cursor:
+                    cursor.execute("SET LOCAL statement_timeout = '10min'")
                 # Delete existing programs for mapped EPGs
                 deleted_count = ProgramData.objects.filter(epg_id__in=mapped_epg_ids).delete()[0]
                 logger.debug(f"Deleted {deleted_count} existing programs")

From 70e229a433a4046f6d0ba73737682c24775d6f11 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 29 Mar 2026 20:43:27 -0500
Subject: [PATCH 117/172] Refactor HTML entity handling in XMLTV files: replace
 regex-based entity resolution with lxml's html.entities for improved accuracy
 and performance. Inject DOCTYPE declaration to ensure proper parsing of HTML
 entities, avoiding silent drops during recovery mode.

---
 CHANGELOG.md      |   5 +-
 apps/epg/tasks.py | 220 +++++++++++++++++++---------------------------
 2 files changed, 90 insertions(+), 135 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8bccb55..1f8aad67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,13 +61,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - M3U profile URL rewriting now uses the `regex` module instead of `re` across all URL transform code paths (`url_utils.transform_url`, `core/views.py`, `vod_proxy/_transform_url`, `tasks.get_transformed_credentials`, and the WebSocket live-preview handler in `consumers.py`). The `regex` module natively accepts JavaScript/PCRE-style named capture groups (`(?<name>...)`) without any conversion, eliminating the root cause of patterns that matched in the frontend live preview but failed on the backend with a `re.error`. As a further improvement, `regex` also supports variable-length lookbehind assertions (e.g. `(?<=a+)`), which `re` rejects with an error; patterns using these will now work correctly on the backend as well. Replace-pattern JS tokens are still normalised before calling `regex.sub`: `$<name>` → `\g<name>` and `$1`/`$2`/… → `\1`/`\2`/… (Python replacement syntax). Also fixed a bug in the WebSocket preview handler where a pattern error was incorrectly returning the search pattern string as the preview output instead of the original URL. (Fixes #1005)
 - Web UI stream preview (`FloatingVideo`) was calling `mpegts.createPlayer()` with all `Config` options (e.g. `enableWorker`, `liveSync`, `headers`) merged into the first `MediaDataSource` argument. mpegts.js only reads `Config` from the optional second argument; unrecognised fields in the first are silently ignored. As a result all player configuration was effectively the library defaults — worker offloading was disabled, latency management had no effect, and the `Authorization: Bearer` header (required for user identification) was never sent. Fixed by splitting into the correct two-argument call. Both `liveBufferLatencyChasing` and `liveSync` have been disabled, eliminating playback-rate fluctuations that caused audible stuttering on live streams. SourceBuffer cleanup thresholds were also relaxed from 10s/5s to 120s/60s to prevent frequent SourceBuffer pauses.
-- HTML named entities in XMLTV EPG files are now resolved to Unicode characters before lxml parsing. Some EPG providers (particularly French and other European sources) use HTML named entities like `&eacute;`, `&icirc;`, `&uuml;` in channel names, program titles, and metadata. These are not valid XML entities — lxml 6.0.2 with `recover=True` silently drops them, causing characters to go missing (e.g., "Chaîne Télé" becomes "Chane Tl"). A preprocessing step in `fetch_xmltv()` now resolves HTML named entities while preserving the 5 XML-predefined entities, detecting encoding from the XML declaration (falling back to UTF-8), and processing line-by-line to a temp file before atomically replacing the original. (Closes #1095) — Thanks [@CodeBormen](https://github.com/CodeBormen)
+- HTML named entities in XMLTV EPG files are now correctly preserved during lxml parsing. Some EPG providers (particularly French and other European sources) use HTML named entities like `&eacute;`, `&icirc;`, `&uuml;` in channel names, program titles, and metadata. These are not valid XML entities — lxml 6.0.2 with `recover=True` silently drops them, causing characters to go missing (e.g., "Chaîne Télé" becomes "Chane Tl"). This is now fixed by injecting an XML `<!DOCTYPE tv [...]>` internal subset declaring all 252 HTML 4 named entities directly into the byte stream that lxml reads, using a lightweight in-memory wrapper (`_PrependStream`) with zero disk I/O. libxml2 resolves the entities during its normal C-level parse pass — no Python-level preprocessing or temporary files are involved. The DOCTYPE block (~8 KB) is built once at module load from Python's stdlib `html.entities.name2codepoint` and reused for every parse. Files that already declare their own `<!DOCTYPE>` are passed through unchanged. (Closes #1095) — Thanks [@CodeBormen](https://github.com/CodeBormen) for helping with this!
 - Duplicate recordings created when EPG sources refresh and re-evaluate series rules (Fixes #940) — Thanks [@CodeBormen](https://github.com/CodeBormen):
   - **Program ID instability**: `parse_programs_for_source()` deletes and recreates all `ProgramData` rows with new auto-increment IDs on every EPG refresh. The dedup set used these IDs, so it never matched after a refresh. Deduplication now uses a stable `(tvg_id, start_time, end_time)` composite key sourced from `Recording.custom_properties.program`.
   - **Secondary guard using wrong times**: The DB guard compared unadjusted program times against offset-adjusted `Recording.start_time`/`end_time`, so it never matched when any DVR pre/post offset was configured. It now queries `custom_properties__program__start_time/end_time` (the original, unadjusted program times stored at recording creation).
   - **No concurrency guard**: Each EPG source refresh fired `evaluate_series_rules.delay()` independently. Concurrent tasks loaded the dedup set before others committed, allowing races. Evaluation is now serialized with `acquire_task_lock` (reusing the existing EPG task pattern). Gracefully degrades if Redis is unavailable — the primary and secondary dedup guards still protect.
-- EPG refresh tasks (`refresh_epg_data`) were being killed mid-transaction on large EPG sources. The `soft_time_limit=1700s` introduced in v0.21.0 raised `SoftTimeLimitExceeded`, a subclass of `Exception`, which was swallowed by the existing `except Exception` handler in `parse_programs_for_source`, leaving the database in a partial state with no logged error. The underlying cause is that the HTML entity preprocessing step added in v0.21.0 adds 2–10+ minutes on multi-gigabyte EPG files, pushing total task duration past the 1700s limit for large sources. `soft_time_limit` has been removed from `refresh_epg_data` and `time_limit` raised to 14400s (4 hours) as a true last-resort ceiling; the existing `TaskLockRenewer` daemon thread continues to renew the Redis lock every 120s for legitimately long-running tasks.
-- HTML entity preprocessing (`_resolve_html_entities`) now performs a fast binary pre-scan before any file read or write. The pre-scan reads the file in 4 MB chunks without text decoding and exits immediately on the first non-XML named entity found. For EPG sources that contain no HTML entities — the common case — the full line-by-line read+rewrite pass (which takes 2–10+ minutes on a 2.5 GB file) is skipped entirely.
+- EPG refresh tasks (`refresh_epg_data`) were being killed mid-transaction on large EPG sources. The `soft_time_limit=1700s` introduced in v0.21.0 raised `SoftTimeLimitExceeded`, a subclass of `Exception`, which was swallowed by the existing `except Exception` handler in `parse_programs_for_source`, leaving the database in a partial state with no logged error. `soft_time_limit` has been removed from `refresh_epg_data` and `time_limit` raised to 14400s (4 hours) as a true last-resort ceiling; the existing `TaskLockRenewer` daemon thread continues to renew the Redis lock every 120s for legitimately long-running tasks.
 
 ## [0.21.1] - 2026-03-18
 
diff --git a/apps/epg/tasks.py b/apps/epg/tasks.py
index 3126453d..0d05552f 100644
--- a/apps/epg/tasks.py
+++ b/apps/epg/tasks.py
@@ -1,11 +1,9 @@
 # apps/epg/tasks.py
 
-import codecs
 import logging
 import gzip
-import html as html_module
+import html.entities
 import os
-import re
 import uuid
 import requests
 import time  # Add import for tracking download progress
@@ -31,138 +29,102 @@ from core.utils import acquire_task_lock, release_task_lock, TaskLockRenewer, se
 
 logger = logging.getLogger(__name__)
 
-# Regex and helpers for resolving HTML named entities in XMLTV files.
-# lxml only recognises the 5 XML-predefined entities; HTML entities like
-# &eacute; are silently dropped in recovery mode.  This substitution
-# converts them to Unicode before the file reaches the parser.
+# DOCTYPE internal subset for XMLTV files.  Declares all 252 HTML 4 named
+# entities so lxml/libxml2 can resolve references like &eacute; correctly
+# instead of silently dropping them in recovery mode.
+# The 5 XML-predefined entities (amp, lt, gt, quot, apos) are always
+# recognised by the XML spec and must not be redeclared.
 _XML_ENTITIES = frozenset({'amp', 'lt', 'gt', 'quot', 'apos'})
-_XML_ENTITIES_BYTES = frozenset(n.encode() for n in _XML_ENTITIES)
-_XML_SPECIAL_CHARS = frozenset('&<>\'"')
-_NAMED_ENTITY_RE = re.compile(r'&([a-zA-Z][a-zA-Z0-9]*);')
-# Binary version used by the fast pre-scan (no text decoding needed)
-_BINARY_ENTITY_RE = re.compile(rb'&([a-zA-Z][a-zA-Z0-9]*);')
 
 
-def _replace_html_entity(match):
-    """Replace a single HTML named entity, preserving XML-special ones.
+def _build_html_entity_doctype() -> bytes:
+    """Build a DOCTYPE internal subset declaring all HTML 4 named entities."""
+    lines = [b'<!DOCTYPE tv [\n']
+    for name, codepoint in sorted(html.entities.name2codepoint.items()):
+        if name not in _XML_ENTITIES:
+            # Numeric character references are always valid XML regardless of codepoint.
+            lines.append(f'<!ENTITY {name} "&#x{codepoint:X};">\n'.encode('ascii'))
+    lines.append(b']>\n')
+    return b''.join(lines)
 
-    Skips lowercase XML entities (fast path) and any entity whose resolved
-    output contains XML-special characters that would break parsing.  This
-    also guards against html.unescape partially matching sub-patterns
-    (e.g. &ampersand; being split into &amp + ersand;).
+
+_HTML_ENTITY_DOCTYPE = _build_html_entity_doctype()
+
+
+class _PrependStream:
+    """Wraps an open binary file and prepends a bytes prefix to its content.
+
+    Used by _open_xmltv_file to inject a DOCTYPE entity block before the
+    file content reaches lxml's iterparse, with zero disk I/O.
     """
-    original = match.group(0)
-    name = match.group(1)
-    if name in _XML_ENTITIES:
-        return original
-    resolved = html_module.unescape(original)
-    if resolved == original:
-        return original
-    # If the resolved output contains any XML-special character, replacing
-    # it would produce invalid XML (bare &, <, >, etc.)
-    if _XML_SPECIAL_CHARS.intersection(resolved):
-        return original
-    return resolved
+
+    __slots__ = ('_prefix', '_prefix_pos', '_file')
+
+    def __init__(self, prefix: bytes, file_obj):
+        self._prefix = prefix
+        self._prefix_pos = 0
+        self._file = file_obj
+
+    def read(self, size=-1):
+        prefix_len = len(self._prefix)
+        if self._prefix_pos >= prefix_len:
+            return self._file.read(size)
+        remaining = prefix_len - self._prefix_pos
+        if size < 0:
+            chunk = self._prefix[self._prefix_pos:] + self._file.read()
+            self._prefix_pos = prefix_len
+            return chunk
+        if size <= remaining:
+            chunk = self._prefix[self._prefix_pos:self._prefix_pos + size]
+            self._prefix_pos += size
+            return chunk
+        chunk = self._prefix[self._prefix_pos:]
+        self._prefix_pos = prefix_len
+        return chunk + self._file.read(size - remaining)
+
+    def close(self):
+        self._file.close()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *_):
+        self.close()
 
 
-def _detect_xml_encoding(header):
-    """Detect encoding from raw XML header bytes, defaulting to UTF-8.
+def _open_xmltv_file(file_path: str):
+    """Open an XMLTV file for lxml iterparse, injecting an HTML entity DOCTYPE.
 
-    Falls back to UTF-8 if the declared encoding is not recognized by Python.
+    Prepends a <!DOCTYPE tv [...]> block that declares all 252 HTML 4 named
+    entities so lxml/libxml2 resolves references like &eacute; correctly
+    instead of silently dropping them in recovery mode.  This involves zero
+    disk I/O — the DOCTYPE is streamed in-memory before the file content.
+
+    If the file already contains a <!DOCTYPE> declaration the file is returned
+    unchanged; a second DOCTYPE would be invalid XML.
+
+    The caller is responsible for closing the returned object.
     """
-    m = re.match(rb'<\?xml[^>]*encoding=["\']([^"\']+)["\']', header)
-    if m:
-        declared = m.group(1).decode('ascii')
-        try:
-            codecs.lookup(declared)
-            return declared
-        except LookupError:
-            logger.warning(f"Unknown encoding '{declared}', falling back to UTF-8")
-            return 'utf-8'
-    return 'utf-8'
+    f = open(file_path, 'rb')
+    start = f.read(512)
 
+    # Do not inject if the file already declares a DOCTYPE.
+    if b'<!DOCTYPE' in start or b'<!doctype' in start.lower():
+        f.seek(0)
+        return f
 
-def _file_needs_entity_resolution(file_path):
-    """Binary pre-scan: return True only if file contains non-XML named HTML entities.
+    # Insert the DOCTYPE after the XML declaration if one is present.
+    stripped = start.lstrip()
+    if stripped.startswith(b'<?xml'):
+        decl_end = start.find(b'?>')
+        if decl_end >= 0:
+            xml_decl = start[:decl_end + 2]
+            f.seek(decl_end + 2)
+            return _PrependStream(xml_decl + b'\n' + _HTML_ENTITY_DOCTYPE, f)
 
-    Reads in 4 MB chunks with a small overlap to catch entities that straddle
-    a chunk boundary.  Avoids all text-decode overhead — this is effectively a
-    raw memory scan and exits as soon as the first HTML entity is found.
-    """
-    CHUNK = 4 * 1024 * 1024  # 4 MB
-    OVERLAP = 32              # longer than any valid entity name + surrounding &;
-    try:
-        with open(file_path, 'rb') as f:
-            prev = b''
-            while True:
-                chunk = f.read(CHUNK)
-                if not chunk:
-                    return False
-                data = prev + chunk
-                for m in _BINARY_ENTITY_RE.finditer(data):
-                    if m.group(1).lower() not in _XML_ENTITIES_BYTES:
-                        return True
-                prev = data[-OVERLAP:]
-    except OSError:
-        return False
-    return False
-
-
-def _resolve_html_entities(file_path):
-    """Replace HTML named entities in an XMLTV file with Unicode characters.
-
-    Processes line-by-line to keep memory usage low, writes to a temp file,
-    then atomically replaces the original.  Honors the encoding declared
-    in the XML declaration.
-
-    This function is strictly additive — on any error the original file is
-    left untouched so lxml can handle it as it always did.
-    """
-    # Fast binary pre-scan: if the file contains no non-XML named entities
-    # there is nothing to do and we can skip the full read+write entirely.
-    # For large files (e.g. 2.5 GB) this avoids significant I/O time when
-    # the EPG source is already clean (the common case).
-    if not _file_needs_entity_resolution(file_path):
-        logger.debug(f"No HTML entities found in {file_path}, skipping entity resolution")
-        return
-    logger.info(f"HTML entities detected in {file_path}, resolving...")
-    # Read the first 200 bytes to detect encoding from the XML declaration
-    with open(file_path, 'rb') as f:
-        header = f.read(200)
-    encoding = _detect_xml_encoding(header)
-
-    # Capture the original mtime before modifying the file so that os.replace()
-    # does not update the file's mtime.  The file watcher in core/tasks.py uses
-    # mtime to detect changes; if we let mtime advance it would trigger an
-    # infinite refresh loop for local file-based EPG sources.
-    try:
-        original_stat = os.stat(file_path)
-    except OSError:
-        original_stat = None
-
-    temp_path = file_path + '.entity_tmp'
-    success = False
-    try:
-        with open(file_path, 'r', encoding=encoding) as src, \
-             open(temp_path, 'w', encoding=encoding) as dst:
-            for line in src:
-                dst.write(_NAMED_ENTITY_RE.sub(_replace_html_entity, line))
-        os.replace(temp_path, file_path)
-        # Restore the original mtime (and atime) so the file watcher does not
-        # mistake the rewrite for an external update.
-        if original_stat is not None:
-            os.utime(file_path, (original_stat.st_atime, original_stat.st_mtime))
-        success = True
-        logger.debug(f"Resolved HTML entities in {file_path} (encoding: {encoding})")
-    except Exception as e:
-        # On any error, leave the original file untouched for lxml to
-        # handle with its own encoding detection and recovery mode.
-        # This ensures the preprocessing step never breaks a previously
-        # working EPG refresh.
-        logger.debug(f"Skipping entity resolution for {file_path}: {e}")
-    finally:
-        if not success and os.path.exists(temp_path):
-            os.unlink(temp_path)
+    # No XML declaration — insert DOCTYPE at the very start of the file.
+    f.seek(0)
+    return _PrependStream(_HTML_ENTITY_DOCTYPE, f)
 
 
 def validate_icon_url_fast(icon_url, max_length=None):
@@ -416,9 +378,6 @@ def fetch_xmltv(source):
         # Send a download complete notification
         send_epg_update(source.id, "downloading", 100, status="success")
 
-        # Resolve HTML named entities so lxml doesn't drop them during parsing
-        _resolve_html_entities(source.extracted_file_path or source.file_path)
-
         # Return True to indicate successful fetch, processing will continue with parse_channels_only
         return True
 
@@ -665,9 +624,6 @@ def fetch_xmltv(source):
 
             logger.info(f"Cached EPG file saved to {source.file_path}")
 
-            # Resolve HTML named entities so lxml doesn't drop them during parsing
-            _resolve_html_entities(source.extracted_file_path or source.file_path)
-
             return True
 
     except requests.exceptions.HTTPError as e:
@@ -1030,7 +986,7 @@ def parse_channels_only(source):
 
             # Open the file - no need to check file type since it's always XML now
             logger.debug(f"Opening file for channel parsing: {file_path}")
-            source_file = open(file_path, 'rb')
+            source_file = _open_xmltv_file(file_path)
 
             if process:
                 logger.debug(f"[parse_channels_only] Memory after opening file: {process.memory_info().rss / 1024 / 1024:.2f} MB")
@@ -1413,7 +1369,7 @@ def parse_programs_for_tvg_id(epg_id):
         try:
             # Open the file directly - no need to check compression
             logger.debug(f"Opening file for parsing: {file_path}")
-            source_file = open(file_path, 'rb')
+            source_file = _open_xmltv_file(file_path)
 
             # Stream parse the file using lxml's iterparse
             program_parser = etree.iterparse(source_file, events=('end',), tag='programme',  remove_blank_text=True, recover=True)
@@ -1686,7 +1642,7 @@ def parse_programs_for_source(epg_source, tvg_id=None):
 
         try:
             logger.debug(f"Opening file for single-pass parsing: {file_path}")
-            source_file = open(file_path, 'rb')
+            source_file = _open_xmltv_file(file_path)
 
             # Stream parse the file using lxml's iterparse
             program_parser = etree.iterparse(source_file, events=('end',), tag='programme', remove_blank_text=True, recover=True)

From 763f42cfffd786ba1c5c8c00bdc2df7576157d55 Mon Sep 17 00:00:00 2001
From: None <190783071+CodeBormen@users.noreply.github.com>
Date: Mon, 30 Mar 2026 20:19:27 -0500
Subject: [PATCH 118/172] fix: pass TLS parameters to all external connection
 points in modular mode

- Add setup_pg_ssl_env() to export libpq PGSSL* env vars; all child psql/pg_dump/pg_isready commands inherit TLS automatically

- Move TLS client key permission fix before external PG connections (was running after, defeating the fix)

- Enhance key fix to trigger on ownership mismatch (root-owned 0600 key unreadable by app user)

- Extract key fix to shared script (docker/init/00-fix-pg-ssl-key.sh) sourced by both entrypoints

- Default POSTGRES_PASSWORD to empty in modular mode (cert-only auth sends no spurious password)

- Propagate TLS OPTIONS to backup pg_dump/pg_restore subprocess calls via _get_pg_env()

- Pass SSL kwargs to dropdb management command's psycopg2.connect()

- Add REDIS_SSL_PARAMS to VOD proxy Redis connections missed in original TLS PR

- Add 8-scenario TLS integration test suite (PG mTLS, Redis TLS, verify-full, key fix, Celery, regression)

- Add 6 unit tests for _get_pg_env() and dropdb TLS parameter passing
---
 apps/backups/services.py                   |  28 +-
 apps/backups/tests.py                      |  90 +++
 apps/proxy/vod_proxy/connection_manager.py |   4 +-
 apps/proxy/vod_proxy/views.py              |   4 +-
 core/management/commands/dropdb.py         |   9 +-
 core/tests.py                              |  73 ++
 docker/entrypoint.celery.sh                |  19 +-
 docker/entrypoint.sh                       |  60 +-
 docker/init/00-fix-pg-ssl-key.sh           |  44 +
 docker/tests/test-tls-postgres.sh          | 892 +++++++++++++++++++++
 10 files changed, 1179 insertions(+), 44 deletions(-)
 create mode 100644 docker/init/00-fix-pg-ssl-key.sh
 create mode 100644 docker/tests/test-tls-postgres.sh

diff --git a/apps/backups/services.py b/apps/backups/services.py
index b638e701..72b7b3f2 100644
--- a/apps/backups/services.py
+++ b/apps/backups/services.py
@@ -28,10 +28,34 @@ def _is_postgresql() -> bool:
 
 
 def _get_pg_env() -> dict:
-    """Get environment variables for PostgreSQL commands."""
+    """Get environment variables for PostgreSQL commands.
+
+    Includes PGPASSWORD for password auth and PGSSL* variables for TLS.
+    Reads TLS config from DATABASES['default']['OPTIONS'], which is
+    populated by settings.py when POSTGRES_SSL=true.
+    """
     db_config = settings.DATABASES["default"]
     env = os.environ.copy()
-    env["PGPASSWORD"] = db_config.get("PASSWORD", "")
+
+    password = db_config.get("PASSWORD", "")
+    if password:
+        env["PGPASSWORD"] = password
+    else:
+        env.pop("PGPASSWORD", None)
+
+    # Propagate TLS configuration from Django OPTIONS to libpq env vars.
+    options = db_config.get("OPTIONS", {})
+    _ssl_env_map = {
+        "sslmode": "PGSSLMODE",
+        "sslrootcert": "PGSSLROOTCERT",
+        "sslcert": "PGSSLCERT",
+        "sslkey": "PGSSLKEY",
+    }
+    for opt_key, env_key in _ssl_env_map.items():
+        value = options.get(opt_key)
+        if value:
+            env[env_key] = value
+
     return env
 
 
diff --git a/apps/backups/tests.py b/apps/backups/tests.py
index e5743623..bdea2be5 100644
--- a/apps/backups/tests.py
+++ b/apps/backups/tests.py
@@ -15,6 +15,96 @@ from . import services
 User = get_user_model()
 
 
+class PgEnvTlsTestCase(TestCase):
+    """Test that _get_pg_env includes TLS and password env vars correctly."""
+    databases = []
+
+    @patch('apps.backups.services.settings')
+    def test_pg_env_includes_ssl_vars_when_tls_enabled(self, mock_settings):
+        mock_settings.DATABASES = {
+            "default": {
+                "ENGINE": "django.db.backends.postgresql",
+                "NAME": "testdb",
+                "USER": "testuser",
+                "PASSWORD": "testpass",
+                "HOST": "localhost",
+                "PORT": 5432,
+                "OPTIONS": {
+                    "sslmode": "verify-full",
+                    "sslrootcert": "/certs/ca.crt",
+                    "sslcert": "/certs/client.crt",
+                    "sslkey": "/certs/client.key",
+                },
+            }
+        }
+        env = services._get_pg_env()
+        self.assertEqual(env["PGSSLMODE"], "verify-full")
+        self.assertEqual(env["PGSSLROOTCERT"], "/certs/ca.crt")
+        self.assertEqual(env["PGSSLCERT"], "/certs/client.crt")
+        self.assertEqual(env["PGSSLKEY"], "/certs/client.key")
+        self.assertEqual(env["PGPASSWORD"], "testpass")
+
+    @patch('apps.backups.services.settings')
+    def test_pg_env_no_ssl_vars_when_tls_disabled(self, mock_settings):
+        mock_settings.DATABASES = {
+            "default": {
+                "ENGINE": "django.db.backends.postgresql",
+                "NAME": "testdb",
+                "USER": "testuser",
+                "PASSWORD": "testpass",
+                "HOST": "localhost",
+                "PORT": 5432,
+            }
+        }
+        env = services._get_pg_env()
+        self.assertNotIn("PGSSLMODE", env)
+        self.assertNotIn("PGSSLROOTCERT", env)
+        self.assertNotIn("PGSSLCERT", env)
+        self.assertNotIn("PGSSLKEY", env)
+        self.assertEqual(env["PGPASSWORD"], "testpass")
+
+    @patch('apps.backups.services.settings')
+    def test_pg_env_no_password_when_empty(self, mock_settings):
+        """Cert-only auth: PGPASSWORD must not be set when password is empty."""
+        mock_settings.DATABASES = {
+            "default": {
+                "ENGINE": "django.db.backends.postgresql",
+                "NAME": "testdb",
+                "USER": "testuser",
+                "PASSWORD": "",
+                "HOST": "localhost",
+                "PORT": 5432,
+                "OPTIONS": {"sslmode": "verify-full"},
+            }
+        }
+        env = services._get_pg_env()
+        self.assertNotIn("PGPASSWORD", env)
+        self.assertEqual(env["PGSSLMODE"], "verify-full")
+
+    @patch('apps.backups.services.settings')
+    def test_pg_env_partial_ssl_options(self, mock_settings):
+        """Server-only TLS: only sslmode and CA cert, no client cert/key."""
+        mock_settings.DATABASES = {
+            "default": {
+                "ENGINE": "django.db.backends.postgresql",
+                "NAME": "testdb",
+                "USER": "testuser",
+                "PASSWORD": "pass",
+                "HOST": "localhost",
+                "PORT": 5432,
+                "OPTIONS": {
+                    "sslmode": "verify-ca",
+                    "sslrootcert": "/certs/ca.crt",
+                },
+            }
+        }
+        env = services._get_pg_env()
+        self.assertEqual(env["PGSSLMODE"], "verify-ca")
+        self.assertEqual(env["PGSSLROOTCERT"], "/certs/ca.crt")
+        self.assertNotIn("PGSSLCERT", env)
+        self.assertNotIn("PGSSLKEY", env)
+
+
 class BackupServicesTestCase(TestCase):
     """Test cases for backup services"""
 
diff --git a/apps/proxy/vod_proxy/connection_manager.py b/apps/proxy/vod_proxy/connection_manager.py
index ec963001..1692c315 100644
--- a/apps/proxy/vod_proxy/connection_manager.py
+++ b/apps/proxy/vod_proxy/connection_manager.py
@@ -103,13 +103,15 @@ class PersistentVODConnection:
                     redis_db = int(getattr(settings, 'REDIS_DB', 0))
                     redis_password = getattr(settings, 'REDIS_PASSWORD', '')
                     redis_user = getattr(settings, 'REDIS_USER', '')
+                    ssl_params = getattr(settings, 'REDIS_SSL_PARAMS', {})
                     r = redis.StrictRedis(
                         host=redis_host,
                         port=redis_port,
                         db=redis_db,
                         password=redis_password if redis_password else None,
                         username=redis_user if redis_user else None,
-                        decode_responses=True
+                        decode_responses=True,
+                        **ssl_params
                     )
                     content_length_key = f"vod_content_length:{self.session_id}"
                     stored_length = r.get(content_length_key)
diff --git a/apps/proxy/vod_proxy/views.py b/apps/proxy/vod_proxy/views.py
index 8db51ebd..e6b6e144 100644
--- a/apps/proxy/vod_proxy/views.py
+++ b/apps/proxy/vod_proxy/views.py
@@ -615,13 +615,15 @@ def head_vod(request, content_type, content_id, session_id=None, profile_id=None
             redis_db = int(getattr(settings, 'REDIS_DB', 0))
             redis_password = getattr(settings, 'REDIS_PASSWORD', '')
             redis_user = getattr(settings, 'REDIS_USER', '')
+            ssl_params = getattr(settings, 'REDIS_SSL_PARAMS', {})
             r = redis.StrictRedis(
                 host=redis_host,
                 port=redis_port,
                 db=redis_db,
                 password=redis_password if redis_password else None,
                 username=redis_user if redis_user else None,
-                decode_responses=True
+                decode_responses=True,
+                **ssl_params
             )
             content_length_key = f"vod_content_length:{session_id}"
             r.set(content_length_key, total_size, ex=1800)  # Store for 30 minutes
diff --git a/core/management/commands/dropdb.py b/core/management/commands/dropdb.py
index 1b39a58d..3c390bef 100644
--- a/core/management/commands/dropdb.py
+++ b/core/management/commands/dropdb.py
@@ -15,6 +15,13 @@ class Command(BaseCommand):
         host = db_settings.get('HOST', 'localhost')
         port = db_settings.get('PORT', 5432)
 
+        # Read TLS parameters from Django OPTIONS (populated when POSTGRES_SSL=true)
+        db_options = db_settings.get('OPTIONS', {})
+        ssl_kwargs = {}
+        for key in ('sslmode', 'sslrootcert', 'sslcert', 'sslkey'):
+            if key in db_options:
+                ssl_kwargs[key] = db_options[key]
+
         self.stdout.write(self.style.WARNING(
             f"WARNING: This will irreversibly drop the entire database '{db_name}'!"
         ))
@@ -30,7 +37,7 @@ class Command(BaseCommand):
         maintenance_db = 'postgres'
         try:
             self.stdout.write("Connecting to maintenance database...")
-            conn = psycopg2.connect(dbname=maintenance_db, user=user, password=password, host=host, port=port)
+            conn = psycopg2.connect(dbname=maintenance_db, user=user, password=password, host=host, port=port, **ssl_kwargs)
             conn.autocommit = True
             cur = conn.cursor()
             self.stdout.write(f"Dropping database '{db_name}'...")
diff --git a/core/tests.py b/core/tests.py
index 305ab308..b4770f92 100644
--- a/core/tests.py
+++ b/core/tests.py
@@ -1,3 +1,5 @@
+from unittest.mock import patch, MagicMock
+
 from django.test import TestCase
 
 from core.models import CoreSettings, DVR_SETTINGS_KEY, EPG_SETTINGS_KEY
@@ -148,3 +150,74 @@ class EpgIgnoreListsTest(TestCase):
         ]:
             self._set_epg_field_raw(field, "not a list")
             self.assertEqual(getter(), [])
+
+
+class DropDBCommandTlsTest(TestCase):
+    """Verify dropdb management command passes TLS parameters to psycopg2."""
+    databases = []
+
+    _DB_WITH_TLS = {
+        'default': {
+            'ENGINE': 'django.db.backends.postgresql',
+            'NAME': 'testdb',
+            'USER': 'testuser',
+            'PASSWORD': 'testpass',
+            'HOST': 'localhost',
+            'PORT': 5432,
+            'OPTIONS': {
+                'sslmode': 'verify-full',
+                'sslrootcert': '/certs/ca.crt',
+                'sslcert': '/certs/client.crt',
+                'sslkey': '/certs/client.key',
+            },
+        }
+    }
+
+    _DB_NO_TLS = {
+        'default': {
+            'ENGINE': 'django.db.backends.postgresql',
+            'NAME': 'testdb',
+            'USER': 'testuser',
+            'PASSWORD': 'testpass',
+            'HOST': 'localhost',
+            'PORT': 5432,
+        }
+    }
+
+    @patch('core.management.commands.dropdb.psycopg2.connect')
+    @patch('core.management.commands.dropdb.connection')
+    @patch('builtins.input', return_value='yes')
+    def test_dropdb_passes_ssl_kwargs_when_tls_enabled(self, _inp, _conn, mock_connect):
+        mock_pg = MagicMock()
+        mock_connect.return_value = mock_pg
+        mock_pg.cursor.return_value = MagicMock()
+
+        with self.settings(DATABASES=self._DB_WITH_TLS):
+            from django.core.management import call_command
+            call_command('dropdb')
+
+        mock_connect.assert_called_once_with(
+            dbname='postgres', user='testuser', password='testpass',
+            host='localhost', port=5432,
+            sslmode='verify-full',
+            sslrootcert='/certs/ca.crt',
+            sslcert='/certs/client.crt',
+            sslkey='/certs/client.key',
+        )
+
+    @patch('core.management.commands.dropdb.psycopg2.connect')
+    @patch('core.management.commands.dropdb.connection')
+    @patch('builtins.input', return_value='yes')
+    def test_dropdb_no_ssl_kwargs_when_tls_disabled(self, _inp, _conn, mock_connect):
+        mock_pg = MagicMock()
+        mock_connect.return_value = mock_pg
+        mock_pg.cursor.return_value = MagicMock()
+
+        with self.settings(DATABASES=self._DB_NO_TLS):
+            from django.core.management import call_command
+            call_command('dropdb')
+
+        mock_connect.assert_called_once_with(
+            dbname='postgres', user='testuser', password='testpass',
+            host='localhost', port=5432,
+        )
diff --git a/docker/entrypoint.celery.sh b/docker/entrypoint.celery.sh
index d7a43255..b38b6ac3 100644
--- a/docker/entrypoint.celery.sh
+++ b/docker/entrypoint.celery.sh
@@ -36,22 +36,9 @@ if [ "$USE_LEGACY_NUMPY" = "true" ]; then
     fi
 fi
 
-# Fix TLS client key permissions for PostgreSQL (same issue as web entrypoint).
-# libpq requires 0600 but Docker Desktop mounts files as 0777.
-if [ -n "${POSTGRES_SSL_KEY:-}" ] && [ -f "$POSTGRES_SSL_KEY" ]; then
-    _key_perms=$(stat -c '%a' "$POSTGRES_SSL_KEY" 2>/dev/null)
-    if [ "$_key_perms" != "600" ] && [ "$_key_perms" != "640" ]; then
-        _fixed_key="/data/.pg-client-celery.key"
-        cp "$POSTGRES_SSL_KEY" "$_fixed_key"
-        chmod 600 "$_fixed_key"
-        # Match ownership to the user running Celery if running as root
-        if [ "$(id -u)" = "0" ] && [ -n "${PUID:-}" ]; then
-            chown "${PUID}:${PGID:-$PUID}" "$_fixed_key"
-        fi
-        export POSTGRES_SSL_KEY="$_fixed_key"
-        echo "Fixed PostgreSQL client key permissions (${_key_perms} → 600)"
-    fi
-fi
+# Fix TLS client key permissions/ownership for PostgreSQL.
+FIXED_KEY_PATH="/data/.pg-client-celery.key"
+. /app/docker/init/00-fix-pg-ssl-key.sh
 
 # Wait for migrations to complete
 # Uses 'migrate --check' which exits 0 only when all migrations are applied,
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 33fe33dd..4bf170c8 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -30,7 +30,13 @@ echo_with_timestamp() {
 # Set PostgreSQL environment variables
 export POSTGRES_DB=${POSTGRES_DB:-dispatcharr}
 export POSTGRES_USER=${POSTGRES_USER:-dispatch}
-export POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-secret}
+# AIO mode: default to 'secret' for internal DB.
+# Modular mode: no default — cert-only auth (mTLS) uses no password.
+if [[ "${DISPATCHARR_ENV:-}" == "modular" ]]; then
+    export POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-}"
+else
+    export POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-secret}"
+fi
 export POSTGRES_HOST=${POSTGRES_HOST:-localhost}
 export POSTGRES_PORT=${POSTGRES_PORT:-5432}
 export PG_VERSION=$(ls /usr/lib/postgresql/ | sort -V | tail -n 1)
@@ -96,6 +102,20 @@ echo "Environment DISPATCHARR_LOG_LEVEL set to: '${DISPATCHARR_LOG_LEVEL}'"
 # Also make the log level available in /etc/environment for all login shells
 #grep -q "DISPATCHARR_LOG_LEVEL" /etc/environment || echo "DISPATCHARR_LOG_LEVEL=${DISPATCHARR_LOG_LEVEL}" >> /etc/environment
 
+# Translate Dispatcharr POSTGRES_SSL_* env vars into libpq-recognized PGSSL*
+# env vars. Called once before any external PostgreSQL connection; all child
+# processes (psql, pg_dump, pg_isready, createdb, dropdb) inherit these
+# automatically. No-op when POSTGRES_SSL is not "true".
+setup_pg_ssl_env() {
+    if [ "${POSTGRES_SSL:-false}" != "true" ]; then
+        return 0
+    fi
+    export PGSSLMODE="${POSTGRES_SSL_MODE:-verify-full}"
+    if [ -n "${POSTGRES_SSL_CA_CERT:-}" ]; then export PGSSLROOTCERT="$POSTGRES_SSL_CA_CERT"; fi
+    if [ -n "${POSTGRES_SSL_CERT:-}" ];    then export PGSSLCERT="$POSTGRES_SSL_CERT"; fi
+    if [ -n "${POSTGRES_SSL_KEY:-}" ];     then export PGSSLKEY="$POSTGRES_SSL_KEY"; fi
+}
+
 # READ-ONLY - don't let users change these
 export POSTGRES_DIR=/data/db
 
@@ -154,6 +174,22 @@ fi
 echo "Starting user setup..."
 . /app/docker/init/01-user-setup.sh
 
+# Fix TLS client key permissions/ownership BEFORE any external PG connections.
+# Must run after 01-user-setup.sh (user exists for chown) and before
+# 02-postgres.sh / pg_isready (which make the first external PG connections).
+FIXED_KEY_PATH="/data/.pg-client.key"
+. /app/docker/init/00-fix-pg-ssl-key.sh
+# Propagate the fixed path to login shells (su - strips env vars)
+if [ "${POSTGRES_SSL_KEY:-}" = "$FIXED_KEY_PATH" ]; then
+    sed -i "/^POSTGRES_SSL_KEY=/d" /etc/environment
+    echo "POSTGRES_SSL_KEY='$FIXED_KEY_PATH'" >> /etc/environment
+    sed -i "s|export POSTGRES_SSL_KEY=.*|export POSTGRES_SSL_KEY='$FIXED_KEY_PATH'|" /etc/profile.d/dispatcharr.sh
+fi
+
+# Export libpq TLS env vars so all subsequent psql/pg_dump/pg_isready calls
+# (in 02-postgres.sh, modular-mode checks, etc.) use TLS automatically.
+setup_pg_ssl_env
+
 # Initialize PostgreSQL (script handles modular vs internal mode internally)
 echo "Setting up PostgreSQL..."
 . /app/docker/init/02-postgres.sh
@@ -237,28 +273,6 @@ if [ "$USE_LEGACY_NUMPY" = "true" ]; then
     fi
 fi
 
-# Fix TLS client key permissions for PostgreSQL.
-# libpq requires the client key to be 0600 or stricter. Volume-mounted files
-# from Windows/macOS hosts often have 0755 permissions, so copy the key to a
-# writable location with correct permissions if needed.
-if [ -n "${POSTGRES_SSL_KEY:-}" ] && [ -f "$POSTGRES_SSL_KEY" ]; then
-    _key_perms=$(stat -c '%a' "$POSTGRES_SSL_KEY" 2>/dev/null)
-    if [ "$_key_perms" != "600" ] && [ "$_key_perms" != "640" ]; then
-        _fixed_key="/data/.pg-client.key"
-        cp "$POSTGRES_SSL_KEY" "$_fixed_key"
-        chmod 600 "$_fixed_key"
-        if [ "$(id -u)" = "0" ] && [ -n "${PUID:-}" ]; then
-            chown "${PUID}:${PGID:-$PUID}" "$_fixed_key"
-        fi
-        export POSTGRES_SSL_KEY="$_fixed_key"
-        # Update /etc/environment so login shells see the fixed path
-        sed -i "/^POSTGRES_SSL_KEY=/d" /etc/environment
-        echo "POSTGRES_SSL_KEY='$_fixed_key'" >> /etc/environment
-        sed -i "s|export POSTGRES_SSL_KEY=.*|export POSTGRES_SSL_KEY='$_fixed_key'|" /etc/profile.d/dispatcharr.sh
-        echo "Fixed PostgreSQL client key permissions (${_key_perms} → 600)"
-    fi
-fi
-
 # Run Django commands as non-root user to prevent permission issues
 su - "$POSTGRES_USER" -c "cd /app && python manage.py migrate --noinput"
 su - "$POSTGRES_USER" -c "cd /app && python manage.py collectstatic --noinput"
diff --git a/docker/init/00-fix-pg-ssl-key.sh b/docker/init/00-fix-pg-ssl-key.sh
new file mode 100644
index 00000000..122815f7
--- /dev/null
+++ b/docker/init/00-fix-pg-ssl-key.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# Fix TLS client key permissions and ownership for PostgreSQL.
+# libpq requires the client key to be 0600 or stricter.
+#
+# Triggers on:
+#   - Permissions too open (Docker Desktop mounts files as 0777)
+#   - Wrong ownership (Kubernetes secrets / Docker volumes mount as root;
+#     the application user can't read a root-owned 0600 key)
+#   - Read-only source (volume mounted :ro — can't chmod in place)
+#
+# Usage: source this script with FIXED_KEY_PATH set to the destination.
+#   FIXED_KEY_PATH="/data/.pg-client.key"
+#   . /app/docker/init/fix-pg-ssl-key.sh
+#
+# After sourcing, POSTGRES_SSL_KEY is updated to the fixed path if a copy
+# was needed. The caller is responsible for propagating the new value to
+# /etc/environment or profile.d if required.
+
+: "${FIXED_KEY_PATH:?FIXED_KEY_PATH must be set before sourcing fix-pg-ssl-key.sh}"
+
+if [ -n "${POSTGRES_SSL_KEY:-}" ] && [ -f "$POSTGRES_SSL_KEY" ]; then
+    _key_perms=$(stat -c '%a' "$POSTGRES_SSL_KEY" 2>/dev/null)
+    _key_owner=$(stat -c '%u' "$POSTGRES_SSL_KEY" 2>/dev/null)
+    _needs_fix=false
+
+    if [ "$_key_perms" != "600" ] && [ "$_key_perms" != "640" ]; then
+        _needs_fix=true
+    elif [ "$(id -u)" = "0" ] && [ -n "${PUID:-}" ] && [ "$_key_owner" != "$PUID" ]; then
+        _needs_fix=true
+    fi
+
+    if [ "$_needs_fix" = true ]; then
+        cp "$POSTGRES_SSL_KEY" "$FIXED_KEY_PATH"
+        chmod 600 "$FIXED_KEY_PATH"
+        if [ "$(id -u)" = "0" ] && [ -n "${PUID:-}" ]; then
+            chown "${PUID}:${PGID:-$PUID}" "$FIXED_KEY_PATH"
+        fi
+        export POSTGRES_SSL_KEY="$FIXED_KEY_PATH"
+        echo "Fixed PostgreSQL client key (perms: ${_key_perms}, owner: ${_key_owner} → ${PUID:-root}:600)"
+    fi
+
+    unset _key_perms _key_owner _needs_fix
+fi
diff --git a/docker/tests/test-tls-postgres.sh b/docker/tests/test-tls-postgres.sh
new file mode 100644
index 00000000..81230178
--- /dev/null
+++ b/docker/tests/test-tls-postgres.sh
@@ -0,0 +1,892 @@
+#!/bin/bash
+#
+# Integration test suite for TLS/mTLS in modular mode.
+# Validates that Dispatcharr connects correctly to external PostgreSQL and
+# Redis services using various TLS configurations.
+#
+# Prerequisites:
+#   - Docker Desktop (or Docker Engine) running
+#   - Internet access (pulls postgres:17, redis:latest)
+#   - ~10-15 minutes for a full run
+#
+# Usage:
+#   cd <repo_root>
+#   bash docker/tests/test-tls-postgres.sh [--skip-build] [--keep-on-fail] [scenario_name]
+#
+# Options:
+#   --skip-build    Skip Docker image build (use existing dispatcharr:tls-test image)
+#   --keep-on-fail  Don't clean up containers/volumes on failure (for debugging)
+#   scenario_name   Run only the named scenario
+#
+# Scenarios:
+#   modular_mtls_no_password      PG mTLS cert-only auth, no password
+#   modular_mtls_with_password    PG mTLS + password auth combined
+#   modular_tls_server_only       PG server-side TLS only (no client cert)
+#   modular_tls_key_permission    PG mTLS with 0777 client key (Docker Desktop scenario)
+#   modular_no_tls_regression     Non-TLS modular mode still works
+#   modular_pg_verify_full        PG mTLS with verify-full (CN must match hostname)
+#   modular_redis_tls             Redis with TLS (server-side verification)
+#   modular_full_tls_celery       PG mTLS + Redis TLS with separate Celery container
+#
+# Exit codes:
+#   0  All tests passed
+#   1  One or more tests failed (or build failed)
+
+set -uo pipefail
+
+# Prevent Git Bash (MINGW) from converting Unix paths
+export MSYS_NO_PATHCONV=1
+
+###############################################################################
+# Configuration
+###############################################################################
+IMAGE_NAME="dispatcharr:tls-test"
+TEST_PREFIX="tls_test"
+STARTUP_TIMEOUT=120
+SKIP_BUILD=false
+KEEP_ON_FAIL=false
+SINGLE_SCENARIO=""
+PASS=0
+FAIL=0
+SKIP=0
+ERRORS=()
+CERT_DIR=""
+
+# Colors (disabled if not a terminal)
+if [ -t 1 ]; then
+    RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'
+    CYAN='\033[0;36m'; BOLD='\033[1m'; NC='\033[0m'
+else
+    RED=''; GREEN=''; YELLOW=''; CYAN=''; BOLD=''; NC=''
+fi
+
+###############################################################################
+# Parse arguments
+###############################################################################
+for arg in "$@"; do
+    case "$arg" in
+        --skip-build)   SKIP_BUILD=true ;;
+        --keep-on-fail) KEEP_ON_FAIL=true ;;
+        -*)             echo "Unknown option: $arg"; exit 1 ;;
+        *)              SINGLE_SCENARIO="$arg" ;;
+    esac
+done
+
+###############################################################################
+# Helpers
+###############################################################################
+CURRENT_SCENARIO=""
+CLEANUP_ITEMS=()
+
+log_pass() { echo -e "  ${GREEN}✅ $1${NC}"; PASS=$((PASS + 1)); }
+log_fail() { echo -e "  ${RED}❌ $1${NC}"; FAIL=$((FAIL + 1)); ERRORS+=("[$CURRENT_SCENARIO] $1"); }
+log_skip() { echo -e "  ${YELLOW}⏭️  $1${NC}"; SKIP=$((SKIP + 1)); }
+log_info() { echo -e "  ${CYAN}ℹ️  $1${NC}"; }
+section()  { echo -e "\n${BOLD}━━━ $1 ━━━${NC}"; SCENARIO_FAIL_BEFORE=$FAIL; }
+
+track_container() { CLEANUP_ITEMS+=("container:$1"); }
+track_volume()    { CLEANUP_ITEMS+=("volume:$1"); }
+track_network()   { CLEANUP_ITEMS+=("network:$1"); }
+
+fresh_volume() {
+    local vol="$1"
+    docker rm -f $(docker ps -aq --filter "volume=${vol}") 2>/dev/null || true
+    docker volume rm "$vol" 2>/dev/null || true
+    docker volume create "$vol" >/dev/null
+    track_volume "$vol"
+}
+
+cleanup_scenario() {
+    if [ "$KEEP_ON_FAIL" = true ] && [ ${#ERRORS[@]} -gt 0 ]; then
+        log_info "Keeping resources for debugging (--keep-on-fail)"
+        CLEANUP_ITEMS=()
+        return
+    fi
+    for item in "${CLEANUP_ITEMS[@]}"; do
+        local type="${item%%:*}"
+        local name="${item#*:}"
+        case "$type" in
+            container) docker stop "$name" 2>/dev/null; docker rm -f "$name" 2>/dev/null ;;
+            volume)    docker volume rm "$name" 2>/dev/null ;;
+            network)   docker network rm "$name" 2>/dev/null ;;
+        esac
+    done
+    CLEANUP_ITEMS=()
+}
+
+trap 'cleanup_scenario' EXIT
+
+wait_for_ready() {
+    local name="$1"
+    local timeout="${2:-$STARTUP_TIMEOUT}"
+    local elapsed=0
+
+    while [ $elapsed -lt $timeout ]; do
+        if ! docker ps -q -f "name=^${name}$" 2>/dev/null | grep -q .; then
+            echo "  Container $name exited unexpectedly"
+            return 1
+        fi
+        if docker logs "$name" 2>&1 | grep -q "uwsgi started with PID"; then
+            return 0
+        fi
+        sleep 3
+        ((elapsed+=3))
+    done
+    echo "  Timeout (${timeout}s) waiting for $name"
+    return 1
+}
+
+_capture_logs() {
+    local container="$1" logfile="$2"
+    docker logs "$container" > "$logfile" 2>&1
+}
+
+check_log_contains() {
+    local container="$1" pattern="$2" description="$3"
+    local tmplog; tmplog=$(mktemp)
+    _capture_logs "$container" "$tmplog"
+    if grep -q "$pattern" "$tmplog"; then
+        log_pass "$description"
+    else
+        log_fail "$description (pattern not found: $pattern)"
+    fi
+    rm -f "$tmplog"
+}
+
+check_log_absent() {
+    local container="$1" pattern="$2" description="$3"
+    local tmplog; tmplog=$(mktemp)
+    _capture_logs "$container" "$tmplog"
+    if grep -q "$pattern" "$tmplog"; then
+        log_fail "$description (unexpected pattern found: $pattern)"
+    else
+        log_pass "$description"
+    fi
+    rm -f "$tmplog"
+}
+
+check_migrations_done() {
+    local container="$1"
+    local tmplog; tmplog=$(mktemp)
+    _capture_logs "$container" "$tmplog"
+    if grep -qE "Running migrations|No migrations to apply|Operations to perform|Applying .+\.\.\. OK" "$tmplog"; then
+        log_pass "Django migrations completed"
+    elif grep -q "uwsgi started with PID" "$tmplog"; then
+        log_pass "Django migrations completed (confirmed via uwsgi startup)"
+    else
+        log_fail "Django migrations did not complete"
+    fi
+    rm -f "$tmplog"
+}
+
+check_no_permission_errors() {
+    local container="$1"
+    local tmplog; tmplog=$(mktemp)
+    _capture_logs "$container" "$tmplog"
+    local errors
+    errors=$(grep -iE "permission denied|operation not permitted" "$tmplog" \
+        | grep -v "GPU acceleration" | grep -v "Warning:" | head -5)
+    rm -f "$tmplog"
+    if [ -n "$errors" ]; then
+        log_fail "Permission errors in logs:"
+        echo "$errors" | while read -r line; do echo "    $line"; done
+    else
+        log_pass "No permission errors in logs"
+    fi
+}
+
+dump_logs_on_fail() {
+    local container="$1"
+    if [ $FAIL -gt ${SCENARIO_FAIL_BEFORE:-0} ]; then
+        echo -e "  ${YELLOW}--- Container logs ($container) ---${NC}"
+        docker logs "$container" 2>&1 | tail -30 | sed 's/^/    /'
+        echo -e "  ${YELLOW}--- End logs ---${NC}"
+    fi
+}
+
+###############################################################################
+# Certificate generation
+###############################################################################
+generate_test_certs() {
+    CERT_DIR=$(mktemp -d)
+    log_info "Generating test certificates in $CERT_DIR"
+
+    # Generate certs inside a container for cross-platform compatibility.
+    # Shared CA for both PG and Redis. CN of server certs must match their
+    # Docker container hostnames for verify-full mode.
+    docker run --rm --entrypoint sh \
+        -v "$(cygpath -w "$CERT_DIR" 2>/dev/null || echo "$CERT_DIR"):/certs" \
+        -w /certs alpine/openssl -c '
+        # Shared CA
+        openssl req -new -x509 -days 1 -nodes \
+            -keyout ca.key -out ca.crt -subj "/CN=Test CA" 2>/dev/null &&
+
+        # PostgreSQL server cert (CN = PG container hostname)
+        openssl req -new -nodes \
+            -keyout pg-server.key -out pg-server.csr -subj "/CN='"${TEST_PREFIX}"'_pg" 2>/dev/null &&
+        openssl x509 -req -days 1 -in pg-server.csr \
+            -CA ca.crt -CAkey ca.key -CAcreateserial -out pg-server.crt 2>/dev/null &&
+        # PostgreSQL client cert (CN = POSTGRES_USER)
+        openssl req -new -nodes \
+            -keyout pg-client.key -out pg-client.csr -subj "/CN=dispatch" 2>/dev/null &&
+        openssl x509 -req -days 1 -in pg-client.csr \
+            -CA ca.crt -CAkey ca.key -CAcreateserial -out pg-client.crt 2>/dev/null &&
+
+        # Redis server cert (CN = Redis container hostname)
+        openssl req -new -nodes \
+            -keyout redis-server.key -out redis-server.csr -subj "/CN='"${TEST_PREFIX}"'_redis" 2>/dev/null &&
+        openssl x509 -req -days 1 -in redis-server.csr \
+            -CA ca.crt -CAkey ca.key -CAcreateserial -out redis-server.crt 2>/dev/null &&
+
+        # Backwards-compat aliases (existing PG-only scenarios use these names)
+        cp pg-server.crt server.crt && cp pg-server.key server.key &&
+        cp pg-client.crt client.crt && cp pg-client.key client.key &&
+
+        chmod 600 pg-server.key pg-client.key redis-server.key server.key client.key
+    ' || { log_fail "Certificate generation failed"; return 1; }
+
+    log_pass "Test certificates generated"
+}
+
+###############################################################################
+# Start a TLS-enabled Redis container
+###############################################################################
+start_tls_redis() {
+    local name="$1" net="$2"
+
+    local cert_mount
+    cert_mount="$(cygpath -w "$CERT_DIR" 2>/dev/null || echo "$CERT_DIR")"
+
+    # Redis needs certs owned by redis user (uid 999 in the official image).
+    # Mount certs, copy to a writable location, fix ownership, then start
+    # with TLS flags.
+    docker run -d --name "$name" --network "$net" \
+        -v "${cert_mount}:/certs:ro" \
+        redis:latest \
+        sh -c '
+            cp /certs/redis-server.crt /certs/redis-server.key /certs/ca.crt /tmp/ &&
+            chmod 600 /tmp/redis-server.key &&
+            chown redis:redis /tmp/redis-server.crt /tmp/redis-server.key /tmp/ca.crt &&
+            exec redis-server \
+                --tls-port 6379 --port 0 \
+                --tls-cert-file /tmp/redis-server.crt \
+                --tls-key-file /tmp/redis-server.key \
+                --tls-ca-cert-file /tmp/ca.crt \
+                --tls-auth-clients no
+        ' >/dev/null
+
+    # Wait for Redis TLS to be ready
+    local elapsed=0
+    while [ $elapsed -lt 20 ]; do
+        if docker exec "$name" redis-cli --tls \
+            --cert /certs/redis-server.crt --key /certs/redis-server.key --cacert /certs/ca.crt \
+            ping 2>/dev/null | grep -q "PONG"; then
+            break
+        fi
+        sleep 2; elapsed=$((elapsed + 2))
+    done
+}
+
+###############################################################################
+# Start a TLS-enabled PostgreSQL container
+###############################################################################
+start_tls_postgres() {
+    local name="$1" net="$2" hba_auth="$3"
+
+    local cert_mount
+    cert_mount="$(cygpath -w "$CERT_DIR" 2>/dev/null || echo "$CERT_DIR")"
+
+    docker run -d --name "$name" --network "$net" \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_PASSWORD=tempsetup \
+        -e POSTGRES_DB=dispatcharr \
+        -v "${cert_mount}:/certs:ro" \
+        postgres:17 >/dev/null
+
+    # Wait for PG to initialize
+    local elapsed=0
+    while [ $elapsed -lt 30 ]; do
+        if docker exec "$name" su postgres -c "/usr/lib/postgresql/17/bin/pg_isready" 2>/dev/null | grep -q "accepting"; then
+            break
+        fi
+        sleep 2; ((elapsed+=2))
+    done
+
+    # Configure SSL and pg_hba.conf
+    docker exec "$name" bash -c "
+        cp /certs/server.crt /certs/server.key /certs/ca.crt /var/lib/postgresql/
+        chown postgres:postgres /var/lib/postgresql/server.crt /var/lib/postgresql/server.key /var/lib/postgresql/ca.crt
+        chmod 600 /var/lib/postgresql/server.key
+        echo \"ssl = on\" >> /var/lib/postgresql/data/postgresql.conf
+        echo \"ssl_cert_file = '/var/lib/postgresql/server.crt'\" >> /var/lib/postgresql/data/postgresql.conf
+        echo \"ssl_key_file = '/var/lib/postgresql/server.key'\" >> /var/lib/postgresql/data/postgresql.conf
+        echo \"ssl_ca_file = '/var/lib/postgresql/ca.crt'\" >> /var/lib/postgresql/data/postgresql.conf
+        cat > /var/lib/postgresql/data/pg_hba.conf << HBA
+local   all   all   trust
+hostssl all   all   0.0.0.0/0   ${hba_auth}
+hostssl all   all   ::0/0       ${hba_auth}
+HBA
+        su postgres -c '/usr/lib/postgresql/17/bin/pg_ctl reload -D /var/lib/postgresql/data'
+    " >/dev/null 2>&1
+    sleep 1
+}
+
+###############################################################################
+# Test scenarios
+###############################################################################
+
+test_modular_mtls_no_password() {
+    CURRENT_SCENARIO="modular_mtls_no_password"
+    section "Modular mode — mTLS cert-only auth (no password)"
+
+    local name="${TEST_PREFIX}_app"
+    local pg_name="${TEST_PREFIX}_pg"
+    local redis_name="${TEST_PREFIX}_redis"
+    local net="${TEST_PREFIX}_net"
+    local vol="${name}_data"
+    cleanup_scenario
+
+    docker network create "$net" >/dev/null 2>&1
+    fresh_volume "$vol"
+    track_network "$net"
+    track_container "$pg_name"; track_container "$redis_name"; track_container "$name"
+
+    start_tls_postgres "$pg_name" "$net" "cert"
+
+    docker run -d --name "$redis_name" --network "$net" redis:latest >/dev/null
+
+    local cert_mount
+    cert_mount="$(cygpath -w "$CERT_DIR" 2>/dev/null || echo "$CERT_DIR")"
+
+    # No POSTGRES_PASSWORD — cert-only auth
+    docker run -d --name "$name" --network "$net" \
+        -e DISPATCHARR_ENV=modular \
+        -e POSTGRES_HOST="$pg_name" \
+        -e POSTGRES_PORT=5432 \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_DB=dispatcharr \
+        -e REDIS_HOST="$redis_name" \
+        -e POSTGRES_SSL=true \
+        -e POSTGRES_SSL_MODE=verify-ca \
+        -e POSTGRES_SSL_CA_CERT=/certs/ca.crt \
+        -e POSTGRES_SSL_CERT=/certs/client.crt \
+        -e POSTGRES_SSL_KEY=/certs/client.key \
+        -v "${cert_mount}:/certs:ro" \
+        -v "${vol}:/data" \
+        "$IMAGE_NAME" >/dev/null
+
+    if wait_for_ready "$name"; then
+        log_pass "Container started with mTLS cert-only auth"
+        check_log_contains "$name" "PostgreSQL version check passed" \
+            "Version check passed with mTLS"
+        check_log_contains "$name" "PostgreSQL TLS: enabled" \
+            "Django sees TLS enabled"
+        check_migrations_done "$name"
+        check_no_permission_errors "$name"
+    else
+        log_fail "Container failed to start with mTLS cert-only auth"
+    fi
+    dump_logs_on_fail "$name"
+    cleanup_scenario
+}
+
+test_modular_mtls_with_password() {
+    CURRENT_SCENARIO="modular_mtls_with_password"
+    section "Modular mode — mTLS + password auth"
+
+    local name="${TEST_PREFIX}_app"
+    local pg_name="${TEST_PREFIX}_pg"
+    local redis_name="${TEST_PREFIX}_redis"
+    local net="${TEST_PREFIX}_net"
+    local vol="${name}_data"
+    cleanup_scenario
+
+    docker network create "$net" >/dev/null 2>&1
+    fresh_volume "$vol"
+    track_network "$net"
+    track_container "$pg_name"; track_container "$redis_name"; track_container "$name"
+
+    # cert + md5 password
+    start_tls_postgres "$pg_name" "$net" "cert"
+
+    docker run -d --name "$redis_name" --network "$net" redis:latest >/dev/null
+
+    local cert_mount
+    cert_mount="$(cygpath -w "$CERT_DIR" 2>/dev/null || echo "$CERT_DIR")"
+
+    docker run -d --name "$name" --network "$net" \
+        -e DISPATCHARR_ENV=modular \
+        -e POSTGRES_HOST="$pg_name" \
+        -e POSTGRES_PORT=5432 \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_PASSWORD=tempsetup \
+        -e POSTGRES_DB=dispatcharr \
+        -e REDIS_HOST="$redis_name" \
+        -e POSTGRES_SSL=true \
+        -e POSTGRES_SSL_MODE=verify-ca \
+        -e POSTGRES_SSL_CA_CERT=/certs/ca.crt \
+        -e POSTGRES_SSL_CERT=/certs/client.crt \
+        -e POSTGRES_SSL_KEY=/certs/client.key \
+        -v "${cert_mount}:/certs:ro" \
+        -v "${vol}:/data" \
+        "$IMAGE_NAME" >/dev/null
+
+    if wait_for_ready "$name"; then
+        log_pass "Container started with mTLS + password"
+        check_log_contains "$name" "PostgreSQL version check passed" \
+            "Version check passed with mTLS + password"
+        check_migrations_done "$name"
+    else
+        log_fail "Container failed to start with mTLS + password"
+    fi
+    dump_logs_on_fail "$name"
+    cleanup_scenario
+}
+
+test_modular_tls_server_only() {
+    CURRENT_SCENARIO="modular_tls_server_only"
+    section "Modular mode — server-only TLS (no client cert)"
+
+    local name="${TEST_PREFIX}_app"
+    local pg_name="${TEST_PREFIX}_pg"
+    local redis_name="${TEST_PREFIX}_redis"
+    local net="${TEST_PREFIX}_net"
+    local vol="${name}_data"
+    cleanup_scenario
+
+    docker network create "$net" >/dev/null 2>&1
+    fresh_volume "$vol"
+    track_network "$net"
+    track_container "$pg_name"; track_container "$redis_name"; track_container "$name"
+
+    # md5 auth over TLS (no client cert required)
+    start_tls_postgres "$pg_name" "$net" "md5"
+
+    docker run -d --name "$redis_name" --network "$net" redis:latest >/dev/null
+
+    local cert_mount
+    cert_mount="$(cygpath -w "$CERT_DIR" 2>/dev/null || echo "$CERT_DIR")"
+
+    docker run -d --name "$name" --network "$net" \
+        -e DISPATCHARR_ENV=modular \
+        -e POSTGRES_HOST="$pg_name" \
+        -e POSTGRES_PORT=5432 \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_PASSWORD=tempsetup \
+        -e POSTGRES_DB=dispatcharr \
+        -e REDIS_HOST="$redis_name" \
+        -e POSTGRES_SSL=true \
+        -e POSTGRES_SSL_MODE=verify-ca \
+        -e POSTGRES_SSL_CA_CERT=/certs/ca.crt \
+        -v "${cert_mount}:/certs:ro" \
+        -v "${vol}:/data" \
+        "$IMAGE_NAME" >/dev/null
+
+    if wait_for_ready "$name"; then
+        log_pass "Container started with server-only TLS"
+        check_log_contains "$name" "PostgreSQL version check passed" \
+            "Version check passed with server-only TLS"
+        check_migrations_done "$name"
+    else
+        log_fail "Container failed to start with server-only TLS"
+    fi
+    dump_logs_on_fail "$name"
+    cleanup_scenario
+}
+
+test_modular_tls_key_permission() {
+    CURRENT_SCENARIO="modular_tls_key_permission"
+    section "Modular mode — mTLS with 0777 client key (Docker Desktop scenario)"
+
+    local name="${TEST_PREFIX}_app"
+    local pg_name="${TEST_PREFIX}_pg"
+    local redis_name="${TEST_PREFIX}_redis"
+    local net="${TEST_PREFIX}_net"
+    local vol="${name}_data"
+    cleanup_scenario
+
+    docker network create "$net" >/dev/null 2>&1
+    fresh_volume "$vol"
+    track_network "$net"
+    track_container "$pg_name"; track_container "$redis_name"; track_container "$name"
+
+    start_tls_postgres "$pg_name" "$net" "cert"
+
+    docker run -d --name "$redis_name" --network "$net" redis:latest >/dev/null
+
+    # Create a copy of certs with 0777 key permissions
+    local bad_perms_dir
+    bad_perms_dir=$(mktemp -d)
+    cp "$CERT_DIR"/ca.crt "$CERT_DIR"/client.crt "$CERT_DIR"/client.key "$bad_perms_dir/"
+    chmod 777 "$bad_perms_dir/client.key"
+
+    local cert_mount
+    cert_mount="$(cygpath -w "$bad_perms_dir" 2>/dev/null || echo "$bad_perms_dir")"
+
+    docker run -d --name "$name" --network "$net" \
+        -e DISPATCHARR_ENV=modular \
+        -e POSTGRES_HOST="$pg_name" \
+        -e POSTGRES_PORT=5432 \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_DB=dispatcharr \
+        -e REDIS_HOST="$redis_name" \
+        -e POSTGRES_SSL=true \
+        -e POSTGRES_SSL_MODE=verify-ca \
+        -e POSTGRES_SSL_CA_CERT=/certs/ca.crt \
+        -e POSTGRES_SSL_CERT=/certs/client.crt \
+        -e POSTGRES_SSL_KEY=/certs/client.key \
+        -v "${cert_mount}:/certs:ro" \
+        -v "${vol}:/data" \
+        "$IMAGE_NAME" >/dev/null
+
+    if wait_for_ready "$name"; then
+        log_pass "Container started with 0777 client key"
+        check_log_contains "$name" "Fixed PostgreSQL client key" \
+            "Key permission fix triggered"
+        check_log_contains "$name" "PostgreSQL version check passed" \
+            "Version check passed after key fix"
+        check_migrations_done "$name"
+    else
+        log_fail "Container failed to start with 0777 client key"
+    fi
+    dump_logs_on_fail "$name"
+    rm -rf "$bad_perms_dir"
+    cleanup_scenario
+}
+
+test_modular_no_tls_regression() {
+    CURRENT_SCENARIO="modular_no_tls_regression"
+    section "Modular mode — no TLS (regression check)"
+
+    local name="${TEST_PREFIX}_app"
+    local pg_name="${TEST_PREFIX}_pg"
+    local redis_name="${TEST_PREFIX}_redis"
+    local net="${TEST_PREFIX}_net"
+    local vol="${name}_data"
+    cleanup_scenario
+
+    docker network create "$net" >/dev/null 2>&1
+    fresh_volume "$vol"
+    track_network "$net"
+    track_container "$pg_name"; track_container "$redis_name"; track_container "$name"
+
+    # Plain PostgreSQL — no TLS
+    docker run -d --name "$pg_name" --network "$net" \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_PASSWORD=secret \
+        -e POSTGRES_DB=dispatcharr \
+        postgres:17 >/dev/null
+
+    local elapsed=0
+    while [ $elapsed -lt 30 ]; do
+        if docker exec "$pg_name" su postgres -c "/usr/lib/postgresql/17/bin/pg_isready" 2>/dev/null | grep -q "accepting"; then
+            break
+        fi
+        sleep 2; ((elapsed+=2))
+    done
+
+    docker run -d --name "$redis_name" --network "$net" redis:latest >/dev/null
+
+    docker run -d --name "$name" --network "$net" \
+        -e DISPATCHARR_ENV=modular \
+        -e POSTGRES_HOST="$pg_name" \
+        -e POSTGRES_PORT=5432 \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_PASSWORD=secret \
+        -e POSTGRES_DB=dispatcharr \
+        -e REDIS_HOST="$redis_name" \
+        -v "${vol}:/data" \
+        "$IMAGE_NAME" >/dev/null
+
+    if wait_for_ready "$name"; then
+        log_pass "Container started without TLS (regression check)"
+        check_log_contains "$name" "PostgreSQL version check passed" \
+            "Version check passed without TLS"
+        check_log_absent "$name" "Fixed PostgreSQL client key" \
+            "No key fix when TLS disabled"
+        check_migrations_done "$name"
+    else
+        log_fail "Container failed to start without TLS"
+    fi
+    dump_logs_on_fail "$name"
+    cleanup_scenario
+}
+
+test_modular_pg_verify_full() {
+    CURRENT_SCENARIO="modular_pg_verify_full"
+    section "Modular mode — PG mTLS with verify-full (CN must match hostname)"
+
+    local name="${TEST_PREFIX}_app"
+    local pg_name="${TEST_PREFIX}_pg"
+    local redis_name="${TEST_PREFIX}_redis"
+    local net="${TEST_PREFIX}_net"
+    local vol="${name}_data"
+    cleanup_scenario
+
+    docker network create "$net" >/dev/null 2>&1
+    fresh_volume "$vol"
+    track_network "$net"
+    track_container "$pg_name"; track_container "$redis_name"; track_container "$name"
+
+    start_tls_postgres "$pg_name" "$net" "cert"
+
+    docker run -d --name "$redis_name" --network "$net" redis:latest >/dev/null
+
+    local cert_mount
+    cert_mount="$(cygpath -w "$CERT_DIR" 2>/dev/null || echo "$CERT_DIR")"
+
+    # verify-full requires server cert CN to match the hostname used to connect.
+    # Our PG server cert CN is "${TEST_PREFIX}_pg", which matches the container name
+    # used in POSTGRES_HOST.
+    docker run -d --name "$name" --network "$net" \
+        -e DISPATCHARR_ENV=modular \
+        -e POSTGRES_HOST="$pg_name" \
+        -e POSTGRES_PORT=5432 \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_DB=dispatcharr \
+        -e REDIS_HOST="$redis_name" \
+        -e POSTGRES_SSL=true \
+        -e POSTGRES_SSL_MODE=verify-full \
+        -e POSTGRES_SSL_CA_CERT=/certs/ca.crt \
+        -e POSTGRES_SSL_CERT=/certs/client.crt \
+        -e POSTGRES_SSL_KEY=/certs/client.key \
+        -v "${cert_mount}:/certs:ro" \
+        -v "${vol}:/data" \
+        "$IMAGE_NAME" >/dev/null
+
+    if wait_for_ready "$name"; then
+        log_pass "Container started with verify-full"
+        check_log_contains "$name" "PostgreSQL version check passed" \
+            "Version check passed with verify-full"
+        check_log_contains "$name" "sslmode=verify-full" \
+            "Django reports verify-full mode"
+        check_migrations_done "$name"
+    else
+        log_fail "Container failed to start with verify-full"
+    fi
+    dump_logs_on_fail "$name"
+    cleanup_scenario
+}
+
+test_modular_redis_tls() {
+    CURRENT_SCENARIO="modular_redis_tls"
+    section "Modular mode — Redis with TLS"
+
+    local name="${TEST_PREFIX}_app"
+    local pg_name="${TEST_PREFIX}_pg"
+    local redis_name="${TEST_PREFIX}_redis"
+    local net="${TEST_PREFIX}_net"
+    local vol="${name}_data"
+    cleanup_scenario
+
+    docker network create "$net" >/dev/null 2>&1
+    fresh_volume "$vol"
+    track_network "$net"
+    track_container "$pg_name"; track_container "$redis_name"; track_container "$name"
+
+    # Plain PG (no TLS) — isolate Redis TLS testing
+    docker run -d --name "$pg_name" --network "$net" \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_PASSWORD=secret \
+        -e POSTGRES_DB=dispatcharr \
+        postgres:17 >/dev/null
+
+    local elapsed=0
+    while [ $elapsed -lt 30 ]; do
+        if docker exec "$pg_name" su postgres -c "/usr/lib/postgresql/17/bin/pg_isready" 2>/dev/null | grep -q "accepting"; then
+            break
+        fi
+        sleep 2; elapsed=$((elapsed + 2))
+    done
+
+    start_tls_redis "$redis_name" "$net"
+
+    local cert_mount
+    cert_mount="$(cygpath -w "$CERT_DIR" 2>/dev/null || echo "$CERT_DIR")"
+
+    docker run -d --name "$name" --network "$net" \
+        -e DISPATCHARR_ENV=modular \
+        -e POSTGRES_HOST="$pg_name" \
+        -e POSTGRES_PORT=5432 \
+        -e POSTGRES_USER=dispatch \
+        -e POSTGRES_PASSWORD=secret \
+        -e POSTGRES_DB=dispatcharr \
+        -e REDIS_HOST="$redis_name" \
+        -e REDIS_SSL=true \
+        -e REDIS_SSL_VERIFY=false \
+        -e REDIS_SSL_CA_CERT=/certs/ca.crt \
+        -v "${cert_mount}:/certs:ro" \
+        -v "${vol}:/data" \
+        "$IMAGE_NAME" >/dev/null
+
+    if wait_for_ready "$name"; then
+        log_pass "Container started with Redis TLS"
+        check_log_contains "$name" "Redis TLS: enabled" \
+            "Django reports Redis TLS enabled"
+        check_log_contains "$name" "Redis at ${redis_name}" \
+            "Redis connected via TLS"
+        check_migrations_done "$name"
+    else
+        log_fail "Container failed to start with Redis TLS"
+    fi
+    dump_logs_on_fail "$name"
+    cleanup_scenario
+}
+
+test_modular_full_tls_celery() {
+    CURRENT_SCENARIO="modular_full_tls_celery"
+    section "Modular mode — PG mTLS + Redis TLS with Celery container"
+
+    local name="${TEST_PREFIX}_app"
+    local celery_name="${TEST_PREFIX}_celery"
+    local pg_name="${TEST_PREFIX}_pg"
+    local redis_name="${TEST_PREFIX}_redis"
+    local net="${TEST_PREFIX}_net"
+    local vol="${name}_data"
+    cleanup_scenario
+
+    docker network create "$net" >/dev/null 2>&1
+    fresh_volume "$vol"
+    track_network "$net"
+    track_container "$pg_name"; track_container "$redis_name"
+    track_container "$name"; track_container "$celery_name"
+
+    start_tls_postgres "$pg_name" "$net" "cert"
+    start_tls_redis "$redis_name" "$net"
+
+    local cert_mount
+    cert_mount="$(cygpath -w "$CERT_DIR" 2>/dev/null || echo "$CERT_DIR")"
+
+    # Shared env vars for both web and celery containers
+    local -a tls_env=(
+        -e DISPATCHARR_ENV=modular
+        -e POSTGRES_HOST="$pg_name"
+        -e POSTGRES_PORT=5432
+        -e POSTGRES_USER=dispatch
+        -e POSTGRES_DB=dispatcharr
+        -e REDIS_HOST="$redis_name"
+        -e POSTGRES_SSL=true
+        -e POSTGRES_SSL_MODE=verify-ca
+        -e POSTGRES_SSL_CA_CERT=/certs/ca.crt
+        -e POSTGRES_SSL_CERT=/certs/client.crt
+        -e POSTGRES_SSL_KEY=/certs/client.key
+        -e REDIS_SSL=true
+        -e REDIS_SSL_VERIFY=false
+        -e REDIS_SSL_CA_CERT=/certs/ca.crt
+    )
+
+    # Start web container first (generates JWT, runs migrations)
+    docker run -d --name "$name" --network "$net" \
+        "${tls_env[@]}" \
+        -v "${cert_mount}:/certs:ro" \
+        -v "${vol}:/data" \
+        "$IMAGE_NAME" >/dev/null
+
+    if ! wait_for_ready "$name"; then
+        log_fail "Web container failed to start with full TLS"
+        dump_logs_on_fail "$name"
+        cleanup_scenario
+        return
+    fi
+    log_pass "Web container started with PG mTLS + Redis TLS"
+
+    # Start Celery container (shares /data volume for JWT, waits for migrations)
+    docker run -d --name "$celery_name" --network "$net" \
+        "${tls_env[@]}" \
+        -e DJANGO_SETTINGS_MODULE=dispatcharr.settings \
+        -e PYTHONUNBUFFERED=1 \
+        -v "${cert_mount}:/certs:ro" \
+        -v "${vol}:/data" \
+        --entrypoint /app/docker/entrypoint.celery.sh \
+        "$IMAGE_NAME" >/dev/null
+
+    # Wait for Celery to start (look for "starting Celery" message)
+    local elapsed=0
+    local celery_ok=false
+    while [ $elapsed -lt 90 ]; do
+        if ! docker ps -q -f "name=^${celery_name}$" 2>/dev/null | grep -q .; then
+            echo "  Celery container exited unexpectedly"
+            break
+        fi
+        if docker logs "$celery_name" 2>&1 | grep -q "starting Celery"; then
+            celery_ok=true
+            break
+        fi
+        sleep 3; elapsed=$((elapsed + 3))
+    done
+
+    if [ "$celery_ok" = true ]; then
+        log_pass "Celery container started with PG mTLS + Redis TLS"
+        check_log_contains "$celery_name" "Migrations complete" \
+            "Celery confirmed migrations complete via TLS"
+        check_log_contains "$celery_name" "PostgreSQL TLS: enabled" \
+            "Celery sees PostgreSQL TLS enabled"
+        check_log_contains "$celery_name" "Redis TLS: enabled" \
+            "Celery sees Redis TLS enabled"
+    else
+        log_fail "Celery container failed to start with full TLS"
+        echo -e "  ${YELLOW}--- Celery logs ---${NC}"
+        docker logs "$celery_name" 2>&1 | tail -20 | sed 's/^/    /'
+        echo -e "  ${YELLOW}--- End logs ---${NC}"
+    fi
+
+    dump_logs_on_fail "$name"
+    cleanup_scenario
+}
+
+###############################################################################
+# Main
+###############################################################################
+echo -e "${BOLD}╔═══════════════════════════════════════════════════════════╗${NC}"
+echo -e "${BOLD}║   Dispatcharr — TLS Integration Tests                    ║${NC}"
+echo -e "${BOLD}╚═══════════════════════════════════════════════════════════╝${NC}"
+
+# Build image
+if [ "$SKIP_BUILD" = false ]; then
+    echo -e "\n${BOLD}Building test image...${NC}"
+    if ! docker build -t "$IMAGE_NAME" -f docker/Dockerfile . 2>&1 | tail -5; then
+        echo -e "${RED}Build failed${NC}"
+        exit 1
+    fi
+    echo -e "${GREEN}Build complete${NC}"
+else
+    echo -e "\n${YELLOW}Skipping build (--skip-build)${NC}"
+fi
+
+# Generate certificates
+generate_test_certs || exit 1
+
+# Run scenarios
+SCENARIOS=(
+    modular_mtls_no_password
+    modular_mtls_with_password
+    modular_tls_server_only
+    modular_tls_key_permission
+    modular_no_tls_regression
+    modular_pg_verify_full
+    modular_redis_tls
+    modular_full_tls_celery
+)
+
+for scenario in "${SCENARIOS[@]}"; do
+    if [ -n "$SINGLE_SCENARIO" ] && [ "$scenario" != "$SINGLE_SCENARIO" ]; then
+        continue
+    fi
+    "test_${scenario}"
+done
+
+# Clean up certs
+rm -rf "$CERT_DIR"
+
+# Summary
+echo -e "\n${BOLD}═══════════════════════════════════════════════════════════${NC}"
+echo -e "  ${GREEN}Passed: $PASS${NC}  ${RED}Failed: $FAIL${NC}  ${YELLOW}Skipped: $SKIP${NC}"
+if [ ${#ERRORS[@]} -gt 0 ]; then
+    echo -e "\n  ${RED}Failures:${NC}"
+    for err in "${ERRORS[@]}"; do
+        echo -e "    ${RED}• $err${NC}"
+    done
+fi
+echo -e "${BOLD}═══════════════════════════════════════════════════════════${NC}"
+
+[ $FAIL -eq 0 ]

From 6f8ca243afaa1bcb5b1cd43a72c936fa78ce8b7d Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 31 Mar 2026 09:44:55 -0500
Subject: [PATCH 119/172] fix: ensure PGSSL* environment variables are
 explicitly set by stripping inherited values

fix: use psycopg2.sql for safe database drop and create commands

fix: Also check POSTGRES_SSL is true before skipping default POSTGRES_PASSWORD

fix: update usage comment to reflect correct script path

fix: improve cleanup logic to conditionally remove certificate directory
---
 apps/backups/services.py           | 2 ++
 core/management/commands/dropdb.py | 5 +++--
 docker/entrypoint.sh               | 5 +++--
 docker/init/00-fix-pg-ssl-key.sh   | 2 +-
 docker/tests/test-tls-postgres.sh  | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/apps/backups/services.py b/apps/backups/services.py
index 72b7b3f2..c70160e1 100644
--- a/apps/backups/services.py
+++ b/apps/backups/services.py
@@ -51,7 +51,9 @@ def _get_pg_env() -> dict:
         "sslcert": "PGSSLCERT",
         "sslkey": "PGSSLKEY",
     }
+    # Always strip inherited PGSSL* vars first, then set only what is explicitly configured
     for opt_key, env_key in _ssl_env_map.items():
+        env.pop(env_key, None)
         value = options.get(opt_key)
         if value:
             env[env_key] = value
diff --git a/core/management/commands/dropdb.py b/core/management/commands/dropdb.py
index 3c390bef..d61b9891 100644
--- a/core/management/commands/dropdb.py
+++ b/core/management/commands/dropdb.py
@@ -1,5 +1,6 @@
 import sys
 import psycopg2
+from psycopg2 import sql
 from django.core.management.base import BaseCommand
 from django.conf import settings
 from django.db import connection
@@ -41,9 +42,9 @@ class Command(BaseCommand):
             conn.autocommit = True
             cur = conn.cursor()
             self.stdout.write(f"Dropping database '{db_name}'...")
-            cur.execute(f"DROP DATABASE IF EXISTS {db_name};")
+            cur.execute(sql.SQL("DROP DATABASE IF EXISTS {}").format(sql.Identifier(db_name)))
             self.stdout.write(f"Creating database '{db_name}'...")
-            cur.execute(f"CREATE DATABASE {db_name};")
+            cur.execute(sql.SQL("CREATE DATABASE {}").format(sql.Identifier(db_name)))
             cur.close()
             conn.close()
             self.stdout.write(self.style.SUCCESS(f"Database '{db_name}' has been dropped and recreated."))
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 4bf170c8..ea8a95b9 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -31,8 +31,9 @@ echo_with_timestamp() {
 export POSTGRES_DB=${POSTGRES_DB:-dispatcharr}
 export POSTGRES_USER=${POSTGRES_USER:-dispatch}
 # AIO mode: default to 'secret' for internal DB.
-# Modular mode: no default — cert-only auth (mTLS) uses no password.
-if [[ "${DISPATCHARR_ENV:-}" == "modular" ]]; then
+# Modular mode + TLS: no default — cert-only auth (mTLS) uses no password.
+# Modular mode + no TLS: preserve 'secret' default for backward compatibility.
+if [[ "${DISPATCHARR_ENV:-}" == "modular" && "${POSTGRES_SSL:-}" == "true" ]]; then
     export POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-}"
 else
     export POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-secret}"
diff --git a/docker/init/00-fix-pg-ssl-key.sh b/docker/init/00-fix-pg-ssl-key.sh
index 122815f7..d7065815 100644
--- a/docker/init/00-fix-pg-ssl-key.sh
+++ b/docker/init/00-fix-pg-ssl-key.sh
@@ -11,7 +11,7 @@
 #
 # Usage: source this script with FIXED_KEY_PATH set to the destination.
 #   FIXED_KEY_PATH="/data/.pg-client.key"
-#   . /app/docker/init/fix-pg-ssl-key.sh
+#   . /app/docker/init/00-fix-pg-ssl-key.sh
 #
 # After sourcing, POSTGRES_SSL_KEY is updated to the fixed path if a copy
 # was needed. The caller is responsible for propagating the new value to
diff --git a/docker/tests/test-tls-postgres.sh b/docker/tests/test-tls-postgres.sh
index 81230178..8a7630dc 100644
--- a/docker/tests/test-tls-postgres.sh
+++ b/docker/tests/test-tls-postgres.sh
@@ -97,7 +97,7 @@ fresh_volume() {
 }
 
 cleanup_scenario() {
-    if [ "$KEEP_ON_FAIL" = true ] && [ ${#ERRORS[@]} -gt 0 ]; then
+    if [ "$KEEP_ON_FAIL" = true ] && [ "$FAIL" -gt "${SCENARIO_FAIL_BEFORE:-0}" ]; then
         log_info "Keeping resources for debugging (--keep-on-fail)"
         CLEANUP_ITEMS=()
         return
@@ -114,7 +114,7 @@ cleanup_scenario() {
     CLEANUP_ITEMS=()
 }
 
-trap 'cleanup_scenario' EXIT
+trap 'cleanup_scenario; [ -n "$CERT_DIR" ] && rm -rf "$CERT_DIR"' EXIT
 
 wait_for_ready() {
     local name="$1"

From 1d41433ddcb66df9fab6b23c1bfbbdceea54d933 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Tue, 31 Mar 2026 10:35:17 -0500
Subject: [PATCH 120/172] Fix: Ensure absolute URL is used for stream in
 FloatingVideo component to resolve relative URLs in WorkerGlobalScope.

---
 frontend/src/components/FloatingVideo.jsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/FloatingVideo.jsx b/frontend/src/components/FloatingVideo.jsx
index ccba7934..f5bdc303 100644
--- a/frontend/src/components/FloatingVideo.jsx
+++ b/frontend/src/components/FloatingVideo.jsx
@@ -313,10 +313,17 @@ export default function FloatingVideo() {
         return;
       }
 
+      // mpegts.js workers run in WorkerGlobalScope where relative URLs are
+      // not resolved against the page origin. Always pass an absolute URL.
+      const absoluteStreamUrl =
+        streamUrl.startsWith('/') && typeof window !== 'undefined'
+          ? `${window.location.origin}${streamUrl}`
+          : streamUrl;
+
       const player = mpegts.createPlayer(
         {
           type: 'mpegts',
-          url: streamUrl,
+          url: absoluteStreamUrl,
           isLive: true,
           cors: true,
         },

From 872725023be24b37982a6dbd4effaaf8e2d02665 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Wed, 1 Apr 2026 02:39:44 +0000
Subject: [PATCH 121/172] Release v0.22.0

---
 CHANGELOG.md | 2 ++
 version.py   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f8aad67..9b622959 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.22.0] - 2026-04-01
+
 ### Security
 
 - Updated `requests` 2.32.5 → 2.33.0, resolving the following CVE:
diff --git a/version.py b/version.py
index 79cb7dfa..ed008927 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
 """
 Dispatcharr version information.
 """
-__version__ = '0.21.1'  # Follow semantic versioning (MAJOR.MINOR.PATCH)
+__version__ = '0.22.0'  # Follow semantic versioning (MAJOR.MINOR.PATCH)
 __timestamp__ = None    # Set during CI/CD build process

From b01ec466f17385e98f50babde02dc1f25e38550e Mon Sep 17 00:00:00 2001
From: dwot <68145+dwot@users.noreply.github.com>
Date: Sat, 4 Apr 2026 22:15:28 -0400
Subject: [PATCH 122/172] Fix for #1173 ErsatzTV EPG not populating / fix for
 UTF-8 BOM processing

---
 apps/epg/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/epg/tasks.py b/apps/epg/tasks.py
index 0d05552f..a0a5f42e 100644
--- a/apps/epg/tasks.py
+++ b/apps/epg/tasks.py
@@ -114,7 +114,7 @@ def _open_xmltv_file(file_path: str):
         return f
 
     # Insert the DOCTYPE after the XML declaration if one is present.
-    stripped = start.lstrip()
+    stripped = start.lstrip(b'\xef\xbb\xbf').lstrip()
     if stripped.startswith(b'<?xml'):
         decl_end = start.find(b'?>')
         if decl_end >= 0:

From 29e22d1c0e9aa7dab17c141b7fca70f6ab948e0a Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 5 Apr 2026 13:52:05 -0500
Subject: [PATCH 123/172] changelog: Update for epg fix pr

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b622959..830874e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed EPG sources that emit a UTF-8 BOM (e.g. ErsatzTV, EPGShare, WebGrab+Plus) parsing 0 channels and 0 programmes after the HTML entity fix introduced in v0.22.0. `bytes.lstrip()` only strips ASCII whitespace, leaving the three BOM bytes (`EF BB BF`) in place, so `stripped.startswith(b'<?xml')` returned `False`. The function fell through to the no-declaration branch and prepended the HTML entity DOCTYPE block _before_ the BOM and XML declaration, producing invalid XML that lxml silently discarded under `recover=True`. Fixed by stripping the BOM explicitly before the whitespace strip: `start.lstrip(b'\xef\xbb\xbf').lstrip()`. BOM-free files are unaffected. (Closes #1173) — Thanks [@dwot](https://github.com/dwot) for the fix!
+
 ## [0.22.0] - 2026-04-01
 
 ### Security

From 93a4846924340863164fc87e4b70911b8c7119ab Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Sun, 5 Apr 2026 19:09:39 +0000
Subject: [PATCH 124/172] Release v0.22.1

---
 CHANGELOG.md | 2 ++
 version.py   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 830874e2..b84ed106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.22.1] - 2026-04-05
+
 ### Fixed
 
 - Fixed EPG sources that emit a UTF-8 BOM (e.g. ErsatzTV, EPGShare, WebGrab+Plus) parsing 0 channels and 0 programmes after the HTML entity fix introduced in v0.22.0. `bytes.lstrip()` only strips ASCII whitespace, leaving the three BOM bytes (`EF BB BF`) in place, so `stripped.startswith(b'<?xml')` returned `False`. The function fell through to the no-declaration branch and prepended the HTML entity DOCTYPE block _before_ the BOM and XML declaration, producing invalid XML that lxml silently discarded under `recover=True`. Fixed by stripping the BOM explicitly before the whitespace strip: `start.lstrip(b'\xef\xbb\xbf').lstrip()`. BOM-free files are unaffected. (Closes #1173) — Thanks [@dwot](https://github.com/dwot) for the fix!
diff --git a/version.py b/version.py
index ed008927..65d494f5 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
 """
 Dispatcharr version information.
 """
-__version__ = '0.22.0'  # Follow semantic versioning (MAJOR.MINOR.PATCH)
+__version__ = '0.22.1'  # Follow semantic versioning (MAJOR.MINOR.PATCH)
 __timestamp__ = None    # Set during CI/CD build process

From 30b97c4fc516cd491f3b326a99e126dcf2df5646 Mon Sep 17 00:00:00 2001
From: Nick Sandstrom <32273437+nick4810@users.noreply.github.com>
Date: Wed, 8 Apr 2026 23:13:34 -0700
Subject: [PATCH 125/172] Extracted utils

---
 frontend/src/utils/dateTimeUtils.js           |  56 ++++
 .../src/utils/forms/AccountInfoModalUtils.js  |  54 ++++
 frontend/src/utils/forms/ChannelBatchUtils.js | 186 ++++++++++++
 frontend/src/utils/forms/ChannelUtils.js      |  97 +++++++
 frontend/src/utils/forms/ConnectionUtils.js   |  75 +++++
 frontend/src/utils/forms/CronBuilderUtils.js  | 131 +++++++++
 frontend/src/utils/forms/DummyEpgUtils.js     | 266 ++++++++++++++++++
 7 files changed, 865 insertions(+)
 create mode 100644 frontend/src/utils/forms/AccountInfoModalUtils.js
 create mode 100644 frontend/src/utils/forms/ChannelBatchUtils.js
 create mode 100644 frontend/src/utils/forms/ChannelUtils.js
 create mode 100644 frontend/src/utils/forms/ConnectionUtils.js
 create mode 100644 frontend/src/utils/forms/CronBuilderUtils.js
 create mode 100644 frontend/src/utils/forms/DummyEpgUtils.js

diff --git a/frontend/src/utils/dateTimeUtils.js b/frontend/src/utils/dateTimeUtils.js
index 7993786d..852a39a6 100644
--- a/frontend/src/utils/dateTimeUtils.js
+++ b/frontend/src/utils/dateTimeUtils.js
@@ -45,6 +45,32 @@ export const toFriendlyDuration = (dateTime, unit) =>
 
 export const fromNow = (dateTime) => dayjs(dateTime).fromNow();
 
+export const setTz = (dateTime, timeZone) => dayjs(dateTime).tz(timeZone);
+
+export const setMonth = (dateTime, value) => dayjs(dateTime).month(value);
+
+export const setYear = (dateTime, value) => dayjs(dateTime).year(value);
+
+export const setDay = (dateTime, value) => dayjs(dateTime).date(value);
+
+export const setHour = (dateTime, value) => dayjs(dateTime).hour(value);
+
+export const setMinute = (dateTime, value) => dayjs(dateTime).minute(value);
+
+export const setSecond = (dateTime, value) => dayjs(dateTime).second(value);
+
+export const getMonth = (dateTime) => dayjs(dateTime).month();
+
+export const getYear = (dateTime) => dayjs(dateTime).year();
+
+export const getDay = (dateTime) => dayjs(dateTime).date();
+
+export const getHour = (dateTime) => dayjs(dateTime).hour();
+
+export const getMinute = (dateTime) => dayjs(dateTime).minute();
+
+export const getSecond = (dateTime) => dayjs(dateTime).second();
+
 export const getNowMs = () => Date.now();
 
 export const roundToNearest = (dateTime, minutes) => {
@@ -281,3 +307,33 @@ export const getDefaultTimeZone = () => {
     return 'UTC';
   }
 };
+
+export const MONTH_NAMES = [
+  'january',
+  'february',
+  'march',
+  'april',
+  'may',
+  'june',
+  'july',
+  'august',
+  'september',
+  'october',
+  'november',
+  'december',
+];
+
+export const MONTH_ABBR = [
+  'jan',
+  'feb',
+  'mar',
+  'apr',
+  'may',
+  'jun',
+  'jul',
+  'aug',
+  'sep',
+  'oct',
+  'nov',
+  'dec',
+];
\ No newline at end of file
diff --git a/frontend/src/utils/forms/AccountInfoModalUtils.js b/frontend/src/utils/forms/AccountInfoModalUtils.js
new file mode 100644
index 00000000..b9ee6f81
--- /dev/null
+++ b/frontend/src/utils/forms/AccountInfoModalUtils.js
@@ -0,0 +1,54 @@
+// Helper function to format timestamps
+import API from '../../api.js';
+
+export const formatTimestamp = (timestamp) => {
+  if (!timestamp) return 'Unknown';
+  try {
+    const date =
+      typeof timestamp === 'string' && timestamp.includes('T')
+        ? new Date(timestamp) // This should handle ISO format properly
+        : new Date(parseInt(timestamp) * 1000);
+
+    // Convert to user's local time and display with timezone
+    return date.toLocaleString(undefined, {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+      hour: '2-digit',
+      minute: '2-digit',
+      timeZoneName: 'short',
+    });
+  } catch {
+    return 'Invalid date';
+  }
+};
+
+// Helper function to get time remaining
+export const getTimeRemaining = (expTimestamp) => {
+  if (!expTimestamp) return null;
+
+  try {
+    const now = new Date();
+    const expDate = new Date(parseInt(expTimestamp) * 1000);
+    const diffMs = expDate - now;
+
+    if (diffMs <= 0) return 'Expired';
+
+    const MS_PER_HOUR = 1000 * 60 * 60;
+    const MS_PER_DAY = MS_PER_HOUR * 24;
+
+    const days = Math.floor(diffMs / MS_PER_DAY);
+    const hours = Math.floor((diffMs % MS_PER_DAY) / MS_PER_HOUR);
+
+    const dayLabel = `${days} ${days === 1 ? 'day' : 'days'}`;
+    const hourLabel = `${hours} ${hours === 1 ? 'hour' : 'hours'}`;
+
+    return days > 0 ? `${dayLabel} ${hourLabel}` : hourLabel;
+  } catch {
+    return 'Unknown';
+  }
+};
+
+export const refreshAccountInfo = (currentProfile) => {
+  return API.refreshAccountInfo(currentProfile.id);
+};
diff --git a/frontend/src/utils/forms/ChannelBatchUtils.js b/frontend/src/utils/forms/ChannelBatchUtils.js
new file mode 100644
index 00000000..de44b938
--- /dev/null
+++ b/frontend/src/utils/forms/ChannelBatchUtils.js
@@ -0,0 +1,186 @@
+import API from '../../api.js';
+
+export const getChannelGroupChange = (selectedChannelGroup, channelGroups) => {
+  if (!selectedChannelGroup || selectedChannelGroup === '-1') return null;
+  const groupName = channelGroups[selectedChannelGroup]?.name || 'Unknown';
+  return `• Channel Group: ${groupName}`;
+};
+
+export const getLogoChange = (selectedLogoId, channelLogos) => {
+  if (!selectedLogoId || selectedLogoId === '-1') return null;
+  if (selectedLogoId === '0') return `• Logo: Use Default`;
+  const logoName = channelLogos[selectedLogoId]?.name || 'Selected Logo';
+  return `• Logo: ${logoName}`;
+};
+
+export const getStreamProfileChange = (streamProfileId, streamProfiles) => {
+  if (!streamProfileId || streamProfileId === '-1') return null;
+  if (streamProfileId === '0') return `• Stream Profile: Use Default`;
+  const profile = streamProfiles.find(
+    (p) => `${p.id}` === `${streamProfileId}`
+  );
+  return `• Stream Profile: ${profile?.name || 'Selected Profile'}`;
+};
+
+export const getUserLevelChange = (userLevel, userLevelLabels) => {
+  if (!userLevel || userLevel === '-1') return null;
+  return `• User Level: ${userLevelLabels[userLevel] || userLevel}`;
+};
+
+export const getMatureContentChange = (isAdult) => {
+  if (!isAdult || isAdult === '-1') return null;
+  return `• Mature Content: ${isAdult === 'true' ? 'Yes' : 'No'}`;
+};
+
+export const getRegexNameChange = (regexFind, regexReplace) => {
+  if (!regexFind?.trim()) return null;
+  return `• Name Change: Apply regex find "${regexFind}" replace with "${regexReplace || ''}"`;
+};
+
+export const getEpgChange = (selectedDummyEpgId, epgs) => {
+  if (!selectedDummyEpgId) return null;
+  if (selectedDummyEpgId === 'clear')
+    return `• EPG: Clear Assignment (use default dummy)`;
+  const epgName = epgs[selectedDummyEpgId]?.name || 'Selected EPG';
+  return `• Dummy EPG: ${epgName}`;
+};
+
+export const updateChannels = (channelIds, values) => {
+  return API.updateChannels(channelIds, values);
+};
+
+export const bulkRegexRenameChannels = (
+  channelIds,
+  regexFind,
+  regexReplace,
+  flags
+) => {
+  return API.bulkRegexRenameChannels(
+    channelIds,
+    regexFind,
+    regexReplace ?? '',
+    flags
+  );
+};
+
+export const batchSetEPG = (associations) => {
+  return API.batchSetEPG(associations);
+};
+
+export const getEpgData = () => {
+  return API.getEPGData();
+};
+
+export const setChannelNamesFromEpg = (channelIds) => {
+  return API.setChannelNamesFromEpg(channelIds);
+};
+
+export const setChannelLogosFromEpg = (channelIds) => {
+  return API.setChannelLogosFromEpg(channelIds);
+};
+
+export const setChannelTvgIdsFromEpg = (channelIds) => {
+  return API.setChannelTvgIdsFromEpg(channelIds);
+};
+
+export const computeRegexPreview = (
+  channelIds,
+  nameById,
+  find,
+  replace,
+  limit = 25
+) => {
+  if (!find) return [];
+
+  let re;
+  try {
+    re = new RegExp(find, 'g');
+  } catch (error) {
+    console.error('Invalid regex:', error);
+    return [{ before: 'Invalid regex', after: '' }];
+  }
+
+  // Limit preview to items that exist on the current page
+  const pageOnlyIds = channelIds.filter((id) => nameById[id] !== undefined);
+  const items = [];
+
+  for (let i = 0; i < Math.min(pageOnlyIds.length, limit); i++) {
+    const before = nameById[pageOnlyIds[i]] ?? '';
+    const after = before.replace(re, replace ?? '');
+    if (before !== after) items.push({ before, after });
+  }
+
+  return items;
+};
+
+export const buildSubmitValues = (
+  formValues,
+  selectedChannelGroup,
+  selectedLogoId
+) => {
+  const values = { ...formValues };
+
+  // Handle channel group ID - convert to integer if it exists
+  if (selectedChannelGroup && selectedChannelGroup !== '-1') {
+    values.channel_group_id = parseInt(selectedChannelGroup);
+  } else {
+    delete values.channel_group_id;
+  }
+
+  if (selectedLogoId && selectedLogoId !== '-1') {
+    values.logo_id = selectedLogoId === '0' ? null : parseInt(selectedLogoId);
+  }
+  delete values.logo;
+  // Remove the channel_group field from form values as we use channel_group_id
+  delete values.channel_group;
+
+  // Handle stream profile ID - convert special values
+  if (!values.stream_profile_id || values.stream_profile_id === '-1') {
+    delete values.stream_profile_id;
+  } else if (
+    values.stream_profile_id === '0' ||
+    values.stream_profile_id === 0
+  ) {
+    values.stream_profile_id = null; // Convert "use default" to null
+  }
+
+  if (values.user_level == '-1') delete values.user_level;
+
+  if (values.is_adult === '-1') {
+    delete values.is_adult;
+  } else {
+    values.is_adult = values.is_adult === 'true';
+  }
+
+  return values;
+};
+
+export const buildEpgAssociations = async (
+  selectedDummyEpgId,
+  channelIds,
+  epgs,
+  tvgs
+) => {
+  if (!selectedDummyEpgId) return null;
+
+  if (selectedDummyEpgId === 'clear') {
+    // Clear EPG assignments
+    return channelIds.map((id) => ({ channel_id: id, epg_data_id: null }));
+  }
+
+  // Assign the selected dummy EPG
+  const selectedEpg = epgs[selectedDummyEpgId];
+  if (!selectedEpg?.epg_data_count) return null;
+
+  const epgSourceId = parseInt(selectedDummyEpgId, 10);
+  // Check if we already have EPG data loaded in the store
+  let epgData = tvgs.find((data) => data.epg_source === epgSourceId);
+
+  if (!epgData) {
+    const epgDataList = await getEpgData();
+    epgData = epgDataList.find((data) => data.epg_source === epgSourceId);
+  }
+
+  if (!epgData) return null;
+  return channelIds.map((id) => ({ channel_id: id, epg_data_id: epgData.id }));
+};
\ No newline at end of file
diff --git a/frontend/src/utils/forms/ChannelUtils.js b/frontend/src/utils/forms/ChannelUtils.js
new file mode 100644
index 00000000..433d6943
--- /dev/null
+++ b/frontend/src/utils/forms/ChannelUtils.js
@@ -0,0 +1,97 @@
+import API from '../../api.js';
+
+export const matchChannelEpg = (channel) => {
+  return API.matchChannelEpg(channel.id);
+};
+export const createLogo = (newLogoData) => {
+  return API.createLogo(newLogoData);
+};
+const setChannelEPG = (channel, values) => {
+  return API.setChannelEPG(channel.id, values.epg_data_id);
+};
+const updateChannel = (values) => {
+  return API.updateChannel(values);
+};
+export const addChannel = (channel) => {
+  return API.addChannel(channel);
+};
+export const requeryChannels = () => {
+  API.requeryChannels();
+};
+
+export const getChannelFormDefaultValues = (channel, channelGroups) => {
+  return {
+    name: channel?.name || '',
+    channel_number:
+      channel?.channel_number !== null && channel?.channel_number !== undefined
+        ? channel.channel_number
+        : '',
+    channel_group_id: channel?.channel_group_id
+      ? `${channel.channel_group_id}`
+      : Object.keys(channelGroups).length > 0
+        ? Object.keys(channelGroups)[0]
+        : '',
+    stream_profile_id: channel?.stream_profile_id
+      ? `${channel.stream_profile_id}`
+      : '0',
+    tvg_id: channel?.tvg_id || '',
+    tvc_guide_stationid: channel?.tvc_guide_stationid || '',
+    epg_data_id: channel?.epg_data_id ?? '',
+    logo_id: channel?.logo_id ? `${channel.logo_id}` : '',
+    user_level: `${channel?.user_level ?? '0'}`,
+    is_adult: channel?.is_adult ?? false,
+  };
+};
+
+export const getFormattedValues = (values) => {
+  const formattedValues = { ...values };
+
+  // Convert empty or "0" stream_profile_id to null for the API
+  if (
+    !formattedValues.stream_profile_id ||
+    formattedValues.stream_profile_id === '0'
+  ) {
+    formattedValues.stream_profile_id = null;
+  }
+
+  // Ensure tvg_id is properly included (no empty strings)
+  formattedValues.tvg_id = formattedValues.tvg_id || null;
+
+  // Ensure tvc_guide_stationid is properly included (no empty strings)
+  formattedValues.tvc_guide_stationid =
+    formattedValues.tvc_guide_stationid || null;
+
+  return formattedValues;
+};
+
+export const handleEpgUpdate = async (
+  channel,
+  values,
+  formattedValues,
+  channelStreams
+) => {
+  // If there's an EPG to set, use our enhanced endpoint
+  if (values.epg_data_id !== (channel.epg_data_id ?? '')) {
+    // Use the special endpoint to set EPG and trigger refresh
+    await setChannelEPG(channel, values);
+
+    // Remove epg_data_id from values since we've handled it separately
+    const { epg_data_id: _epg_data_id, ...otherValues } = formattedValues;
+
+    // Update other channel fields if needed
+    if (Object.keys(otherValues).length > 0) {
+      await updateChannel({
+        id: channel.id,
+        ...otherValues,
+        streams: channelStreams.map((stream) => stream.id),
+      });
+    }
+  } else {
+    // No EPG change, regular update
+    await updateChannel({
+      id: channel.id,
+      ...formattedValues,
+      streams: channelStreams.map((stream) => stream.id),
+    });
+  }
+};
\ No newline at end of file
diff --git a/frontend/src/utils/forms/ConnectionUtils.js b/frontend/src/utils/forms/ConnectionUtils.js
new file mode 100644
index 00000000..bc791ed2
--- /dev/null
+++ b/frontend/src/utils/forms/ConnectionUtils.js
@@ -0,0 +1,75 @@
+import API from '../../api.js';
+import { SUBSCRIPTION_EVENTS } from '../../constants.js';
+
+export const EVENT_OPTIONS = Object.entries(SUBSCRIPTION_EVENTS).map(
+  ([value, label]) => ({
+    value,
+    label,
+  })
+);
+
+export const updateConnectIntegration = (connection, values, config) => {
+  return API.updateConnectIntegration(connection.id, {
+    name: values.name,
+    type: values.type,
+    config,
+    enabled: values.enabled,
+  });
+};
+
+export const createConnectIntegration = (values, config) => {
+  return API.createConnectIntegration({
+    name: values.name,
+    type: values.type,
+    config,
+    enabled: values.enabled,
+  });
+};
+
+export const setConnectSubscriptions = (connection, subs) => {
+  return API.setConnectSubscriptions(connection.id, subs);
+};
+
+const buildWebhookConfig = (url, headers) => {
+  const hdrs = {};
+  headers.forEach((h) => {
+    if (h.key && h.key.trim()) hdrs[h.key] = h.value;
+  });
+  const config = { url };
+  if (Object.keys(hdrs).length) config.headers = hdrs;
+  return config;
+};
+
+const buildScriptConfig = (scriptPath) => ({ path: scriptPath });
+
+export const buildConfig = (values, headers) =>
+  values.type === 'webhook'
+    ? buildWebhookConfig(values.url, headers)
+    : buildScriptConfig(values.script_path);
+
+export const buildSubscriptions = (selectedEvents, payloadTemplates) =>
+  Object.keys(SUBSCRIPTION_EVENTS).map((event) => ({
+    event,
+    enabled: selectedEvents.includes(event),
+    payload_template: payloadTemplates[event] ?? null,
+  }));
+
+export const parseApiError = (error) => {
+  const body = error?.body;
+
+  if (!body || typeof body !== 'object') {
+    return { fieldErrors: {}, apiError: error?.message ?? 'Unknown error' };
+  }
+
+  const knownFields = ['name', 'type'];
+  const fieldErrors = Object.fromEntries(
+    knownFields.filter((f) => body[f]).map((f) => [f, body[f]])
+  );
+
+  const nonField = body.non_field_errors ?? body.detail ?? null;
+  const apiError =
+    nonField ??
+    (Object.keys(fieldErrors).length === 0 ? JSON.stringify(body) : '');
+
+  return { fieldErrors, apiError };
+};
\ No newline at end of file
diff --git a/frontend/src/utils/forms/CronBuilderUtils.js b/frontend/src/utils/forms/CronBuilderUtils.js
new file mode 100644
index 00000000..9cce8f48
--- /dev/null
+++ b/frontend/src/utils/forms/CronBuilderUtils.js
@@ -0,0 +1,131 @@
+export const PRESETS = [
+  {
+    label: 'Every hour',
+    value: '0 * * * *',
+    description: 'At the start of every hour',
+  },
+  {
+    label: 'Every 6 hours',
+    value: '0 */6 * * *',
+    description: 'Every 6 hours starting at midnight',
+  },
+  {
+    label: 'Every 12 hours',
+    value: '0 */12 * * *',
+    description: 'Twice daily at midnight and noon',
+  },
+  {
+    label: 'Daily at midnight',
+    value: '0 0 * * *',
+    description: 'Once per day at 12:00 AM',
+  },
+  {
+    label: 'Daily at 3 AM',
+    value: '0 3 * * *',
+    description: 'Once per day at 3:00 AM',
+  },
+  {
+    label: 'Daily at noon',
+    value: '0 12 * * *',
+    description: 'Once per day at 12:00 PM',
+  },
+  {
+    label: 'Weekly (Sunday midnight)',
+    value: '0 0 * * 0',
+    description: 'Once per week on Sunday',
+  },
+  {
+    label: 'Weekly (Monday 3 AM)',
+    value: '0 3 * * 1',
+    description: 'Once per week on Monday',
+  },
+  {
+    label: 'Monthly (1st at 2:30 AM)',
+    value: '30 2 1 * *',
+    description: 'First day of each month',
+  },
+];
+
+export const DAYS_OF_WEEK = [
+  { value: '*', label: 'Every day' },
+  { value: '0', label: 'Sunday' },
+  { value: '1', label: 'Monday' },
+  { value: '2', label: 'Tuesday' },
+  { value: '3', label: 'Wednesday' },
+  { value: '4', label: 'Thursday' },
+  { value: '5', label: 'Friday' },
+  { value: '6', label: 'Saturday' },
+];
+
+export const FREQUENCY_OPTIONS = [
+  { value: 'hourly', label: 'Hourly' },
+  { value: 'daily', label: 'Daily' },
+  { value: 'weekly', label: 'Weekly' },
+  { value: 'monthly', label: 'Monthly' },
+];
+
+export const buildCron = (frequency, minute, hour, dayOfWeek, dayOfMonth) => {
+  switch (frequency) {
+    case 'hourly':
+      return `${minute} * * * *`;
+    case 'daily':
+      return `${minute} ${hour} * * *`;
+    case 'weekly':
+      return `${minute} ${hour} * * ${dayOfWeek === '*' ? '0' : dayOfWeek}`;
+    case 'monthly':
+      return `${minute} ${hour} ${dayOfMonth} * *`;
+    default:
+      return '* * * * *';
+  }
+};
+
+const parseHour = (hr) => parseInt(hr.replace('*/', '').replace('*', '0')) || 0;
+
+export const parseCronPreset = (cron) => {
+  const [min, hr, day, _month, weekday] = cron.split(' ');
+  const minute = parseInt(min) || 0;
+  const hour = parseHour(hr);
+
+  if (hr === '*')
+    return { frequency: 'hourly', minute, hour, dayOfWeek: '*', dayOfMonth: 1 };
+  if (weekday !== '*')
+    return {
+      frequency: 'weekly',
+      minute,
+      hour,
+      dayOfWeek: weekday,
+      dayOfMonth: 1,
+    };
+  if (day !== '*')
+    return {
+      frequency: 'monthly',
+      minute,
+      hour,
+      dayOfWeek: '*',
+      dayOfMonth: parseInt(day) || 1,
+    };
+  return { frequency: 'daily', minute, hour, dayOfWeek: '*', dayOfMonth: 1 };
+};
+
+export const CRON_FIELDS = [
+  { index: 0, label: 'Minute (0-59)', placeholder: '*, 0, */15, 0,15,30,45' },
+  { index: 1, label: 'Hour (0-23)', placeholder: '*, 0, 9-17, */6, 2,4,16' },
+  {
+    index: 2,
+    label: 'Day of Month (1-31)',
+    placeholder: '*, 1, 1-15, */2, 1,15',
+  },
+  { index: 3, label: 'Month (1-12)', placeholder: '*, 1, 1-6, */3, 6,12' },
+  {
+    index: 4,
+    label: 'Day of Week (0-6, Sun-Sat)',
+    placeholder: '*, 0, 1-5, 0,6',
+  },
+];
+
+export const updateCronPart = (cron, index, value) => {
+  const parts =
+    cron.split(' ').length >= 5 ? cron.split(' ') : ['*', '*', '*', '*', '*'];
+  parts[index] = value || '*';
+  return parts.join(' ');
+};
diff --git a/frontend/src/utils/forms/DummyEpgUtils.js b/frontend/src/utils/forms/DummyEpgUtils.js
new file mode 100644
index 00000000..76b3ee64
--- /dev/null
+++ b/frontend/src/utils/forms/DummyEpgUtils.js
@@ -0,0 +1,266 @@
+import API from '../../api.js';
+import {
+  format,
+  getDay,
+  getHour,
+  getMinute,
+  getMonth,
+  getNow,
+  getYear,
+  MONTH_ABBR,
+  MONTH_NAMES,
+  setHour,
+  setMinute,
+  setSecond,
+  setTz,
+} from '../dateTimeUtils.js';
+
+export const getTimezones = () => {
+  return API.getTimezones();
+};
+export const updateEPG = (values, epg) => {
+  return API.updateEPG({ ...values, id: epg.id });
+};
+export const addEPG = (values) => {
+  return API.addEPG(values);
+};
+
+export const getDummyEpgFormInitialValues = () => {
+  return {
+    name: '',
+    is_active: true,
+    source_type: 'dummy',
+    custom_properties: buildCustomProperties({}),
+  };
+};
+
+export const buildCustomProperties = (custom = {}) => ({
+  title_pattern: custom.title_pattern || '',
+  time_pattern: custom.time_pattern || '',
+  date_pattern: custom.date_pattern || '',
+  timezone:
+    custom.timezone || custom.timezone_offset?.toString() || 'US/Eastern',
+  output_timezone: custom.output_timezone || '',
+  program_duration: custom.program_duration || 180,
+  sample_title: custom.sample_title || '',
+  title_template: custom.title_template || '',
+  subtitle_template: custom.subtitle_template || '',
+  description_template: custom.description_template || '',
+  upcoming_title_template: custom.upcoming_title_template || '',
+  upcoming_description_template: custom.upcoming_description_template || '',
+  ended_title_template: custom.ended_title_template || '',
+  ended_description_template: custom.ended_description_template || '',
+  fallback_title_template: custom.fallback_title_template || '',
+  fallback_description_template: custom.fallback_description_template || '',
+  channel_logo_url: custom.channel_logo_url || '',
+  program_poster_url: custom.program_poster_url || '',
+  name_source: custom.name_source || 'channel',
+  stream_index: custom.stream_index || 1,
+  category: custom.category || '',
+  include_date: custom.include_date ?? true,
+  include_live: custom.include_live ?? false,
+  include_new: custom.include_new ?? false,
+});
+
+export const validateCustomTitlePattern = (value) => {
+  if (!value?.trim()) return 'Title pattern is required';
+  try {
+    new RegExp(value);
+    return null;
+  } catch (e) {
+    return `Invalid regex: ${e.message}`;
+  }
+};
+
+export const validateCustomNameSource = (value) => {
+  if (!value) return 'Name source is required';
+  return null;
+};
+
+export const validateCustomStreamIndex = (values, value) => {
+  if (values.custom_properties?.name_source === 'stream') {
+    if (!value || value < 1) {
+      return 'Stream index must be at least 1';
+    }
+  }
+  return null;
+};
+
+export const matchPattern = (pattern, input, errorPrefix) => {
+  if (!pattern || !input) return { matched: false, groups: {}, error: null };
+  try {
+    const match = input.match(new RegExp(pattern));
+    return match
+      ? { matched: true, groups: match.groups || {}, error: null }
+      : { matched: false, groups: {}, error: null };
+  } catch (e) {
+    return {
+      matched: false,
+      groups: {},
+      error: `${errorPrefix}: ${e.message}`,
+    };
+  }
+};
+
+export const addNormalizedGroups = (groups) => {
+  const result = { ...groups };
+  Object.keys(groups).forEach((key) => {
+    if (groups[key]) {
+      result[`${key}_normalize`] = String(groups[key])
+        .replace(/[^a-zA-Z0-9\s]/g, '')
+        .replace(/\s+/g, '')
+        .toLowerCase();
+    }
+  });
+  return result;
+};
+
+const formatTime12 = (h, m) => {
+  const period = h < 12 ? 'AM' : 'PM';
+  let h12 = h % 12 || 12;
+  return m > 0
+    ? `${h12}:${String(m).padStart(2, '0')} ${period}`
+    : `${h12} ${period}`;
+};
+
+const formatTime12Long = (h, m) => {
+  const period = h < 12 ? 'AM' : 'PM';
+  let h12 = h % 12 || 12;
+  return `${h12}:${String(m).padStart(2, '0')} ${period}`;
+};
+
+const formatTime24 = (h, m) =>
+  m > 0
+    ? `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`
+    : `${String(h).padStart(2, '0')}:00`;
+
+export const buildTimePlaceholders = (
+  timeGroups,
+  dateGroups,
+  sourceTimezone,
+  outputTimezone,
+  programDuration
+) => {
+  if (!timeGroups || !timeGroups.hour) return {};
+
+  try {
+    let hour24 = parseInt(timeGroups.hour);
+    const minute = timeGroups.minute ? parseInt(timeGroups.minute) : 0;
+    const ampm = timeGroups.ampm?.toLowerCase();
+
+    if (ampm === 'pm' && hour24 !== 12) hour24 += 12;
+    else if (ampm === 'am' && hour24 === 12) hour24 = 0;
+
+    let baseDate = setTz(getNow(), sourceTimezone);
+
+    if (dateGroups.month && dateGroups.day) {
+      const monthValue = dateGroups.month;
+      let extractedMonth;
+      if (/^\d+$/.test(monthValue)) {
+        extractedMonth = parseInt(monthValue);
+      } else {
+        const lower = monthValue.toLowerCase();
+        const idx =
+          MONTH_NAMES.indexOf(lower) !== -1
+            ? MONTH_NAMES.indexOf(lower)
+            : MONTH_ABBR.indexOf(lower);
+        extractedMonth = idx !== -1 ? idx + 1 : getMonth(getNow()) + 1;
+      }
+      const extractedDay = parseInt(dateGroups.day);
+      const extractedYear = dateGroups.year
+        ? parseInt(dateGroups.year)
+        : getYear(getNow());
+      if (
+        !isNaN(extractedMonth) &&
+        !isNaN(extractedDay) &&
+        !isNaN(extractedYear) &&
+        extractedMonth >= 1 &&
+        extractedMonth <= 12 &&
+        extractedDay >= 1 &&
+        extractedDay <= 31
+      ) {
+        baseDate = setTz(
+          `${extractedYear}-${String(extractedMonth).padStart(2, '0')}-${String(extractedDay).padStart(2, '0')}`,
+          sourceTimezone
+        );
+      }
+    }
+
+    let sourceDate = setHour(baseDate, hour24);
+    sourceDate = setMinute(sourceDate, minute);
+    sourceDate = setSecond(sourceDate, 0);
+    const workDate =
+      outputTimezone && outputTimezone !== sourceTimezone
+        ? setTz(sourceDate, outputTimezone)
+        : sourceDate;
+
+    const h24 = getHour(workDate);
+    const min = getMinute(workDate);
+
+    const endTotalMin = h24 * 60 + min + (programDuration || 180);
+    const endH24 = Math.floor(endTotalMin / 60) % 24;
+    const endMin = endTotalMin % 60;
+
+    return {
+      starttime: formatTime12(h24, min),
+      starttime_long: formatTime12Long(h24, min),
+      starttime24: formatTime24(h24, min),
+      starttime24_long: formatTime24(h24, min),
+      endtime: formatTime12(endH24, endMin),
+      endtime_long: formatTime12Long(endH24, endMin),
+      endtime24: formatTime24(endH24, endMin),
+      date: format(workDate, 'YYYY-MM-DD'),
+      month: getMonth(workDate) + 1,
+      day: getDay(workDate),
+      year: getYear(workDate),
+    };
+  } catch (e) {
+    console.error('Error building time placeholders:', e);
+  }
+};
+
+const PLAIN_TEMPLATES = [
+  { stateKey: 'titleTemplate', resultKey: 'formattedTitle' },
+  { stateKey: 'subtitleTemplate', resultKey: 'formattedSubtitle' },
+  { stateKey: 'descriptionTemplate', resultKey: 'formattedDescription' },
+  { stateKey: 'upcomingTitleTemplate', resultKey: 'formattedUpcomingTitle' },
+  {
+    stateKey: 'upcomingDescriptionTemplate',
+    resultKey: 'formattedUpcomingDescription',
+  },
+  { stateKey: 'endedTitleTemplate', resultKey: 'formattedEndedTitle' },
+  {
+    stateKey: 'endedDescriptionTemplate',
+    resultKey: 'formattedEndedDescription',
+  },
+];
+
+const URL_TEMPLATES = [
+  { stateKey: 'channelLogoUrl', resultKey: 'formattedChannelLogoUrl' },
+  { stateKey: 'programPosterUrl', resultKey: 'formattedProgramPosterUrl' },
+];
+
+export const applyTemplates = (templateValues, groups, hasMatch) => {
+  const result = {};
+  if (!hasMatch) return result;
+
+  PLAIN_TEMPLATES.forEach(({ stateKey, resultKey }) => {
+    if (templateValues[stateKey]) {
+      result[resultKey] = templateValues[stateKey].replace(
+        /\{(\w+)\}/g,
+        (m, k) => groups[k] || m
+      );
+    }
+  });
+
+  URL_TEMPLATES.forEach(({ stateKey, resultKey }) => {
+    if (templateValues[stateKey]) {
+      result[resultKey] = templateValues[stateKey].replace(
+        /\{(\w+)\}/g,
+        (m, k) => (groups[k] ? encodeURIComponent(String(groups[k])) : m)
+      );
+    }
+  });
+
+  return result;
+};
\ No newline at end of file

From 8f8a7e316e43702cdf8efed7baaecfe9f0780f0f Mon Sep 17 00:00:00 2001
From: Nick Sandstrom <32273437+nick4810@users.noreply.github.com>
Date: Wed, 8 Apr 2026 23:13:55 -0700
Subject: [PATCH 126/172] Added utils tests

---
 .../src/utils/__tests__/dateTimeUtils.test.js | 170 +++++-
 .../__tests__/AccountInfoModalUtils.test.js   | 230 +++++++
 .../forms/__tests__/ChannelBatchUtils.test.js | 554 +++++++++++++++++
 .../forms/__tests__/ChannelUtils.test.js      | 394 ++++++++++++
 .../forms/__tests__/ConnectionUtils.test.js   | 330 ++++++++++
 .../forms/__tests__/CronBuilderUtils.test.js  | 349 +++++++++++
 .../forms/__tests__/DummyEpgUtils.test.js     | 562 ++++++++++++++++++
 7 files changed, 2585 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/utils/forms/__tests__/AccountInfoModalUtils.test.js
 create mode 100644 frontend/src/utils/forms/__tests__/ChannelBatchUtils.test.js
 create mode 100644 frontend/src/utils/forms/__tests__/ChannelUtils.test.js
 create mode 100644 frontend/src/utils/forms/__tests__/ConnectionUtils.test.js
 create mode 100644 frontend/src/utils/forms/__tests__/CronBuilderUtils.test.js
 create mode 100644 frontend/src/utils/forms/__tests__/DummyEpgUtils.test.js

diff --git a/frontend/src/utils/__tests__/dateTimeUtils.test.js b/frontend/src/utils/__tests__/dateTimeUtils.test.js
index 0299b240..040354f6 100644
--- a/frontend/src/utils/__tests__/dateTimeUtils.test.js
+++ b/frontend/src/utils/__tests__/dateTimeUtils.test.js
@@ -1,5 +1,5 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { renderHook, act } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { renderHook } from '@testing-library/react';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import timezone from 'dayjs/plugin/timezone';
@@ -10,8 +10,12 @@ import useLocalStorage from '../../hooks/useLocalStorage';
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
-vi.mock('../../store/settings');
-vi.mock('../../hooks/useLocalStorage');
+vi.mock('../../store/settings', () => ({
+  default: vi.fn(() => ({})),
+}));
+vi.mock('../../hooks/useLocalStorage', () => ({
+  default: vi.fn(() => ['UTC', vi.fn()]),
+}));
 
 describe('dateTimeUtils', () => {
   beforeEach(() => {
@@ -484,4 +488,162 @@ describe('dateTimeUtils', () => {
       Intl.DateTimeFormat = originalDateTimeFormat;
     });
   });
+
+  describe('setTz', () => {
+    it('should convert date to specified timezone', () => {
+      const date = '2024-01-15T15:00:00Z';
+      const result = dateTimeUtils.setTz(date, 'America/New_York');
+      expect(result.isValid()).toBe(true);
+      expect(result.utcOffset()).toBe(-300); // EST = UTC-5
+    });
+  });
+
+  describe('setMonth', () => {
+    it('should set the month on a date', () => {
+      const date = dayjs.utc('2024-01-15T10:00:00Z');
+      const result = dateTimeUtils.setMonth(date, 5);
+      expect(result.month()).toBe(5);
+    });
+
+    it('should return a new dayjs object with correct month', () => {
+      const date = dayjs.utc('2024-01-15T10:00:00Z');
+      const result = dateTimeUtils.setMonth(date, 11);
+      expect(result.month()).toBe(11);
+    });
+  });
+
+  describe('setYear', () => {
+    it('should set the year on a date', () => {
+      const date = dayjs.utc('2024-01-15T10:00:00Z');
+      const result = dateTimeUtils.setYear(date, 2030);
+      expect(result.year()).toBe(2030);
+    });
+  });
+
+  describe('setDay', () => {
+    it('should set the day of the month', () => {
+      const date = dayjs.utc('2024-01-15T10:00:00Z');
+      const result = dateTimeUtils.setDay(date, 20);
+      expect(result.date()).toBe(20);
+    });
+  });
+
+  describe('setHour', () => {
+    it('should set the hour on a date', () => {
+      const date = dayjs.utc('2024-01-15T10:00:00Z');
+      const result = dateTimeUtils.setHour(date, 18);
+      expect(result.hour()).toBe(18);
+    });
+  });
+
+  describe('setMinute', () => {
+    it('should set the minute on a date', () => {
+      const date = dayjs.utc('2024-01-15T10:00:00Z');
+      const result = dateTimeUtils.setMinute(date, 45);
+      expect(result.minute()).toBe(45);
+    });
+  });
+
+  describe('setSecond', () => {
+    it('should set the second on a date', () => {
+      const date = dayjs.utc('2024-01-15T10:00:00Z');
+      const result = dateTimeUtils.setSecond(date, 30);
+      expect(result.second()).toBe(30);
+    });
+  });
+
+  describe('getMonth', () => {
+    it('should return the month (0-indexed) from a date', () => {
+      const date = dayjs.utc('2024-03-15T10:00:00Z');
+      expect(dateTimeUtils.getMonth(date)).toBe(2);
+    });
+
+    it('should return 0 for January', () => {
+      const date = dayjs.utc('2024-01-01T12:00:00Z');
+      expect(dateTimeUtils.getMonth(date)).toBe(0);
+    });
+  });
+
+  describe('getYear', () => {
+    it('should return the year from a date', () => {
+      const date = dayjs.utc('2024-03-15T10:00:00Z');
+      expect(dateTimeUtils.getYear(date)).toBe(2024);
+    });
+  });
+
+  describe('getDay', () => {
+    it('should return the day of the month', () => {
+      const date = dayjs.utc('2024-01-20T12:00:00Z');
+      expect(dateTimeUtils.getDay(date)).toBe(20);
+    });
+  });
+
+  describe('getHour', () => {
+    it('should return the hour from a UTC date', () => {
+      const date = dayjs.utc('2024-01-15T14:00:00Z');
+      expect(dateTimeUtils.getHour(date)).toBe(14);
+    });
+  });
+
+  describe('getMinute', () => {
+    it('should return the minute from a date', () => {
+      const date = dayjs.utc('2024-01-15T14:35:00Z');
+      expect(dateTimeUtils.getMinute(date)).toBe(35);
+    });
+  });
+
+  describe('getSecond', () => {
+    it('should return the second from a date', () => {
+      const date = dayjs.utc('2024-01-15T14:00:45Z');
+      expect(dateTimeUtils.getSecond(date)).toBe(45);
+    });
+  });
+
+  describe('MONTH_NAMES', () => {
+    it('should have 12 month names', () => {
+      expect(dateTimeUtils.MONTH_NAMES).toHaveLength(12);
+    });
+
+    it('should start with january', () => {
+      expect(dateTimeUtils.MONTH_NAMES[0]).toBe('january');
+    });
+
+    it('should end with december', () => {
+      expect(dateTimeUtils.MONTH_NAMES[11]).toBe('december');
+    });
+
+    it('should contain all lowercase month names', () => {
+      expect(dateTimeUtils.MONTH_NAMES).toEqual([
+        'january', 'february', 'march', 'april', 'may', 'june',
+        'july', 'august', 'september', 'october', 'november', 'december',
+      ]);
+    });
+  });
+
+  describe('MONTH_ABBR', () => {
+    it('should have 12 abbreviated month names', () => {
+      expect(dateTimeUtils.MONTH_ABBR).toHaveLength(12);
+    });
+
+    it('should start with jan', () => {
+      expect(dateTimeUtils.MONTH_ABBR[0]).toBe('jan');
+    });
+
+    it('should end with dec', () => {
+      expect(dateTimeUtils.MONTH_ABBR[11]).toBe('dec');
+    });
+
+    it('should contain all lowercase abbreviated month names', () => {
+      expect(dateTimeUtils.MONTH_ABBR).toEqual([
+        'jan', 'feb', 'mar', 'apr', 'may', 'jun',
+        'jul', 'aug', 'sep', 'oct', 'nov', 'dec',
+      ]);
+    });
+
+    it('should align with MONTH_NAMES by index', () => {
+      dateTimeUtils.MONTH_NAMES.forEach((name, i) => {
+        expect(name.startsWith(dateTimeUtils.MONTH_ABBR[i])).toBe(true);
+      });
+    });
+  });
 });
diff --git a/frontend/src/utils/forms/__tests__/AccountInfoModalUtils.test.js b/frontend/src/utils/forms/__tests__/AccountInfoModalUtils.test.js
new file mode 100644
index 00000000..770184cf
--- /dev/null
+++ b/frontend/src/utils/forms/__tests__/AccountInfoModalUtils.test.js
@@ -0,0 +1,230 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+
+// ── API mock ───────────────────────────────────────────────────────────────────
+vi.mock('../../../api.js', () => ({ default: { refreshAccountInfo: vi.fn() } }));
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Imports after mocks
+// ──────────────────────────────────────────────────────────────────────────────
+import API from '../../../api.js';
+import {
+  formatTimestamp,
+  getTimeRemaining,
+  refreshAccountInfo,
+} from '../AccountInfoModalUtils.js';
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('AccountInfoModalUtils', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── formatTimestamp ────────────────────────────────────────────────────────
+
+  describe('formatTimestamp', () => {
+    it('returns "Unknown" for null', () => {
+      expect(formatTimestamp(null)).toBe('Unknown');
+    });
+
+    it('returns "Unknown" for undefined', () => {
+      expect(formatTimestamp(undefined)).toBe('Unknown');
+    });
+
+    it('returns "Unknown" for empty string', () => {
+      expect(formatTimestamp('')).toBe('Unknown');
+    });
+
+    it('returns "Unknown" for 0', () => {
+      expect(formatTimestamp(0)).toBe('Unknown');
+    });
+
+    it('formats a Unix timestamp string (no T) using parseInt * 1000', () => {
+      const result = formatTimestamp('1700000000');
+      expect(result).toBeTypeOf('string');
+      expect(result).not.toBe('Unknown');
+      expect(result).not.toBe('Invalid date');
+    });
+
+    it('formats an ISO string (contains T) directly', () => {
+      const result = formatTimestamp('2023-11-14T22:13:20.000Z');
+      expect(result).toBeTypeOf('string');
+      expect(result).not.toBe('Unknown');
+      expect(result).not.toBe('Invalid date');
+    });
+
+    it('returns a string containing the year for a valid Unix timestamp', () => {
+      // 1700000000 => Nov 14, 2023
+      const result = formatTimestamp('1700000000');
+      expect(result).toContain('2023');
+    });
+
+    it('returns a string containing the year for a valid ISO timestamp', () => {
+      const result = formatTimestamp('2023-11-14T22:13:20.000Z');
+      expect(result).toContain('2023');
+    });
+
+    it('returns "Invalid date" when Date constructor throws', () => {
+      const spy = vi.spyOn(global, 'Date').mockImplementationOnce(() => {
+        throw new Error('bad date');
+      });
+      const result = formatTimestamp('1700000000');
+      expect(result).toBe('Invalid date');
+      spy.mockRestore();
+    });
+
+    it('uses parseInt for numeric strings without T', () => {
+      const spy = vi.spyOn(global, 'Date');
+      formatTimestamp('1700000000');
+      // Called with 1700000000 * 1000
+      expect(spy).toHaveBeenCalledWith(1700000000 * 1000);
+      spy.mockRestore();
+    });
+
+    it('passes ISO string directly to Date constructor', () => {
+      const spy = vi.spyOn(global, 'Date');
+      const iso = '2023-11-14T22:13:20.000Z';
+      formatTimestamp(iso);
+      expect(spy).toHaveBeenCalledWith(iso);
+      spy.mockRestore();
+    });
+  });
+
+  // ── getTimeRemaining ───────────────────────────────────────────────────────
+
+  describe('getTimeRemaining', () => {
+    afterEach(() => {
+      vi.useRealTimers();
+    });
+
+    it('returns null for null', () => {
+      expect(getTimeRemaining(null)).toBeNull();
+    });
+
+    it('returns null for undefined', () => {
+      expect(getTimeRemaining(undefined)).toBeNull();
+    });
+
+    it('returns null for empty string', () => {
+      expect(getTimeRemaining('')).toBeNull();
+    });
+
+    it('returns null for 0', () => {
+      expect(getTimeRemaining(0)).toBeNull();
+    });
+
+    it('returns "Expired" when expiry is in the past', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2024-01-10T00:00:00Z'));
+      // Jan 1, 2024 Unix timestamp
+      const past = String(Math.floor(new Date('2024-01-01T00:00:00Z').getTime() / 1000));
+      expect(getTimeRemaining(past)).toBe('Expired');
+    });
+
+    it('returns "Expired" when diffMs is exactly 0', () => {
+      vi.useFakeTimers();
+      const now = new Date('2024-06-01T12:00:00Z');
+      vi.setSystemTime(now);
+      const expTimestamp = String(Math.floor(now.getTime() / 1000));
+      expect(getTimeRemaining(expTimestamp)).toBe('Expired');
+    });
+
+    it('returns only hours when less than 1 day remains', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2024-06-01T00:00:00Z'));
+      // 5 hours from now
+      const exp = Math.floor(new Date('2024-06-01T05:00:00Z').getTime() / 1000);
+      expect(getTimeRemaining(String(exp))).toBe('5 hours');
+    });
+
+    it('uses singular "hour" when exactly 1 hour remains', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2024-06-01T00:00:00Z'));
+      const exp = Math.floor(new Date('2024-06-01T01:00:00Z').getTime() / 1000);
+      expect(getTimeRemaining(String(exp))).toBe('1 hour');
+    });
+
+    it('returns days and hours when more than 1 day remains', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2024-06-01T00:00:00Z'));
+      // 2 days + 3 hours
+      const exp = Math.floor(new Date('2024-06-03T03:00:00Z').getTime() / 1000);
+      expect(getTimeRemaining(String(exp))).toBe('2 days 3 hours');
+    });
+
+    it('uses singular "day" when exactly 1 day and some hours remain', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2024-06-01T00:00:00Z'));
+      // 1 day + 4 hours
+      const exp = Math.floor(new Date('2024-06-02T04:00:00Z').getTime() / 1000);
+      expect(getTimeRemaining(String(exp))).toBe('1 day 4 hours');
+    });
+
+    it('uses singular "day" and singular "hour" when 1 day 1 hour remains', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2024-06-01T00:00:00Z'));
+      const exp = Math.floor(new Date('2024-06-02T01:00:00Z').getTime() / 1000);
+      expect(getTimeRemaining(String(exp))).toBe('1 day 1 hour');
+    });
+
+    it('shows 0 hours when exactly N full days remain', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2024-06-01T00:00:00Z'));
+      // Exactly 3 days, 0 hours
+      const exp = Math.floor(new Date('2024-06-04T00:00:00Z').getTime() / 1000);
+      expect(getTimeRemaining(String(exp))).toBe('3 days 0 hours');
+    });
+
+    it('returns "Unknown" when an exception is thrown', () => {
+      const spy = vi.spyOn(global, 'Date').mockImplementationOnce(() => {
+        throw new Error('bad');
+      });
+      expect(getTimeRemaining('1700000000')).toBe('Unknown');
+      spy.mockRestore();
+    });
+
+    it('accepts a numeric (non-string) timestamp', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2024-06-01T00:00:00Z'));
+      const exp = Math.floor(new Date('2024-06-01T02:00:00Z').getTime() / 1000);
+      expect(getTimeRemaining(exp)).toBe('2 hours');
+    });
+  });
+
+  // ── refreshAccountInfo ─────────────────────────────────────────────────────
+
+  describe('refreshAccountInfo', () => {
+    it('calls API.refreshAccountInfo with the profile id', async () => {
+      vi.mocked(API.refreshAccountInfo).mockResolvedValue({ success: true });
+      const profile = { id: 'profile-123' };
+      await refreshAccountInfo(profile);
+      expect(API.refreshAccountInfo).toHaveBeenCalledWith('profile-123');
+    });
+
+    it('returns the result from API.refreshAccountInfo', async () => {
+      vi.mocked(API.refreshAccountInfo).mockResolvedValue({ success: true });
+      const result = await refreshAccountInfo({ id: 'profile-123' });
+      expect(result).toEqual({ success: true });
+    });
+
+    it('propagates rejection from API.refreshAccountInfo', async () => {
+      const error = new Error('network error');
+      vi.mocked(API.refreshAccountInfo).mockRejectedValue(error);
+      await expect(refreshAccountInfo({ id: 'profile-123' })).rejects.toThrow('network error');
+    });
+
+    it('calls API.refreshAccountInfo exactly once', async () => {
+      vi.mocked(API.refreshAccountInfo).mockResolvedValue({ success: true });
+      await refreshAccountInfo({ id: 'abc' });
+      expect(API.refreshAccountInfo).toHaveBeenCalledTimes(1);
+    });
+
+    it('throws when profile has no id', async () => {
+      vi.mocked(API.refreshAccountInfo).mockResolvedValue({ success: true });
+      // API receives undefined; test that the call is made with undefined
+      await refreshAccountInfo({ id: undefined });
+      expect(API.refreshAccountInfo).toHaveBeenCalledWith(undefined);
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/utils/forms/__tests__/ChannelBatchUtils.test.js b/frontend/src/utils/forms/__tests__/ChannelBatchUtils.test.js
new file mode 100644
index 00000000..96736358
--- /dev/null
+++ b/frontend/src/utils/forms/__tests__/ChannelBatchUtils.test.js
@@ -0,0 +1,554 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import {
+  getChannelGroupChange,
+  getLogoChange,
+  getStreamProfileChange,
+  getUserLevelChange,
+  getMatureContentChange,
+  getRegexNameChange,
+  getEpgChange,
+  updateChannels,
+  bulkRegexRenameChannels,
+  batchSetEPG,
+  getEpgData,
+  setChannelNamesFromEpg,
+  setChannelLogosFromEpg,
+  setChannelTvgIdsFromEpg,
+  computeRegexPreview,
+  buildSubmitValues,
+  buildEpgAssociations,
+} from '../ChannelBatchUtils.js';
+
+// ── API mock ───────────────────────────────────────────────────────────────────
+vi.mock('../../../api.js', () => ({
+  default: {
+    updateChannels: vi.fn(),
+    bulkRegexRenameChannels: vi.fn(),
+    batchSetEPG: vi.fn(),
+    getEPGData: vi.fn(),
+    setChannelNamesFromEpg: vi.fn(),
+    setChannelLogosFromEpg: vi.fn(),
+    setChannelTvgIdsFromEpg: vi.fn(),
+  },
+}));
+
+import API from '../../../api.js';
+
+describe('ChannelBatchUtils', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+// ── getChannelGroupChange ──────────────────────────────────────────────────────
+
+  describe('getChannelGroupChange', () => {
+    const channelGroups = {
+      1: { name: 'Sports' },
+      2: { name: 'News' },
+    };
+
+    it('returns null when selectedChannelGroup is falsy', () => {
+      expect(getChannelGroupChange(null, channelGroups)).toBeNull();
+      expect(getChannelGroupChange(undefined, channelGroups)).toBeNull();
+      expect(getChannelGroupChange('', channelGroups)).toBeNull();
+    });
+
+    it('returns null when selectedChannelGroup is "-1"', () => {
+      expect(getChannelGroupChange('-1', channelGroups)).toBeNull();
+    });
+
+    it('returns the group name when a valid group is selected', () => {
+      expect(getChannelGroupChange('1', channelGroups)).toBe('• Channel Group: Sports');
+    });
+
+    it('returns "Unknown" when group id is not found in channelGroups', () => {
+      expect(getChannelGroupChange('99', channelGroups)).toBe('• Channel Group: Unknown');
+    });
+  });
+
+// ── getLogoChange ─────────────────────────────────────────────────────────────
+
+  describe('getLogoChange', () => {
+    const channelLogos = {
+      5: { name: 'HBO Logo' },
+      6: { name: 'ESPN Logo' },
+    };
+
+    it('returns null when selectedLogoId is falsy', () => {
+      expect(getLogoChange(null, channelLogos)).toBeNull();
+      expect(getLogoChange(undefined, channelLogos)).toBeNull();
+      expect(getLogoChange('', channelLogos)).toBeNull();
+    });
+
+    it('returns null when selectedLogoId is "-1"', () => {
+      expect(getLogoChange('-1', channelLogos)).toBeNull();
+    });
+
+    it('returns "Use Default" message when selectedLogoId is "0"', () => {
+      expect(getLogoChange('0', channelLogos)).toBe('• Logo: Use Default');
+    });
+
+    it('returns the logo name when a valid logo is selected', () => {
+      expect(getLogoChange('5', channelLogos)).toBe('• Logo: HBO Logo');
+    });
+
+    it('returns "Selected Logo" fallback when logo id is not found', () => {
+      expect(getLogoChange('99', channelLogos)).toBe('• Logo: Selected Logo');
+    });
+  });
+
+// ── getStreamProfileChange ────────────────────────────────────────────────────
+
+  describe('getStreamProfileChange', () => {
+    const streamProfiles = [
+      { id: 1, name: 'HD Profile' },
+      { id: 2, name: 'SD Profile' },
+    ];
+
+    it('returns null when streamProfileId is falsy', () => {
+      expect(getStreamProfileChange(null, streamProfiles)).toBeNull();
+      expect(getStreamProfileChange(undefined, streamProfiles)).toBeNull();
+      expect(getStreamProfileChange('', streamProfiles)).toBeNull();
+    });
+
+    it('returns null when streamProfileId is "-1"', () => {
+      expect(getStreamProfileChange('-1', streamProfiles)).toBeNull();
+    });
+
+    it('returns "Use Default" message when streamProfileId is "0"', () => {
+      expect(getStreamProfileChange('0', streamProfiles)).toBe('• Stream Profile: Use Default');
+    });
+
+    it('returns the profile name when a valid profile is selected', () => {
+      expect(getStreamProfileChange('1', streamProfiles)).toBe('• Stream Profile: HD Profile');
+    });
+
+    it('matches profile id using string coercion', () => {
+      expect(getStreamProfileChange(2, streamProfiles)).toBe('• Stream Profile: SD Profile');
+    });
+
+    it('returns "Selected Profile" fallback when profile is not found', () => {
+      expect(getStreamProfileChange('99', streamProfiles)).toBe('• Stream Profile: Selected Profile');
+    });
+  });
+
+// ── getUserLevelChange ────────────────────────────────────────────────────────
+
+  describe('getUserLevelChange', () => {
+    const userLevelLabels = {
+      1: 'Admin',
+      2: 'Viewer',
+    };
+
+    it('returns null when userLevel is falsy', () => {
+      expect(getUserLevelChange(null, userLevelLabels)).toBeNull();
+      expect(getUserLevelChange(undefined, userLevelLabels)).toBeNull();
+      expect(getUserLevelChange('', userLevelLabels)).toBeNull();
+    });
+
+    it('returns null when userLevel is "-1"', () => {
+      expect(getUserLevelChange('-1', userLevelLabels)).toBeNull();
+    });
+
+    it('returns the label when a valid user level is selected', () => {
+      expect(getUserLevelChange('1', userLevelLabels)).toBe('• User Level: Admin');
+    });
+
+    it('returns the raw userLevel value when label is not found', () => {
+      expect(getUserLevelChange('99', userLevelLabels)).toBe('• User Level: 99');
+    });
+  });
+
+// ── getMatureContentChange ────────────────────────────────────────────────────
+
+  describe('getMatureContentChange', () => {
+    it('returns null when isAdult is falsy', () => {
+      expect(getMatureContentChange(null)).toBeNull();
+      expect(getMatureContentChange(undefined)).toBeNull();
+      expect(getMatureContentChange('')).toBeNull();
+    });
+
+    it('returns null when isAdult is "-1"', () => {
+      expect(getMatureContentChange('-1')).toBeNull();
+    });
+
+    it('returns "Yes" when isAdult is "true"', () => {
+      expect(getMatureContentChange('true')).toBe('• Mature Content: Yes');
+    });
+
+    it('returns "No" when isAdult is "false"', () => {
+      expect(getMatureContentChange('false')).toBe('• Mature Content: No');
+    });
+  });
+
+// ── getRegexNameChange ────────────────────────────────────────────────────────
+
+  describe('getRegexNameChange', () => {
+    it('returns null when regexFind is falsy', () => {
+      expect(getRegexNameChange(null, 'replace')).toBeNull();
+      expect(getRegexNameChange(undefined, 'replace')).toBeNull();
+      expect(getRegexNameChange('', 'replace')).toBeNull();
+    });
+
+    it('returns null when regexFind is only whitespace', () => {
+      expect(getRegexNameChange('   ', 'replace')).toBeNull();
+    });
+
+    it('returns the regex change description with find and replace', () => {
+      expect(getRegexNameChange('foo', 'bar')).toBe(
+        '• Name Change: Apply regex find "foo" replace with "bar"'
+      );
+    });
+
+    it('uses empty string for replace when regexReplace is falsy', () => {
+      expect(getRegexNameChange('foo', null)).toBe(
+        '• Name Change: Apply regex find "foo" replace with ""'
+      );
+      expect(getRegexNameChange('foo', undefined)).toBe(
+        '• Name Change: Apply regex find "foo" replace with ""'
+      );
+    });
+  });
+
+// ── getEpgChange ──────────────────────────────────────────────────────────────
+
+  describe('getEpgChange', () => {
+    const epgs = {
+      10: { name: 'XMLTV Source' },
+      11: { name: 'Another EPG' },
+    };
+
+    it('returns null when selectedDummyEpgId is falsy', () => {
+      expect(getEpgChange(null, epgs)).toBeNull();
+      expect(getEpgChange(undefined, epgs)).toBeNull();
+      expect(getEpgChange('', epgs)).toBeNull();
+    });
+
+    it('returns clear assignment message when selectedDummyEpgId is "clear"', () => {
+      expect(getEpgChange('clear', epgs)).toBe('• EPG: Clear Assignment (use default dummy)');
+    });
+
+    it('returns the EPG name when a valid EPG is selected', () => {
+      expect(getEpgChange('10', epgs)).toBe('• Dummy EPG: XMLTV Source');
+    });
+
+    it('returns "Selected EPG" fallback when EPG id is not found', () => {
+      expect(getEpgChange('99', epgs)).toBe('• Dummy EPG: Selected EPG');
+    });
+  });
+
+// ── API wrappers ──────────────────────────────────────────────────────────────
+
+  describe('updateChannels', () => {
+    it('calls API.updateChannels with channelIds and values', () => {
+      const channelIds = [1, 2, 3];
+      const values = { user_level: 1 };
+      updateChannels(channelIds, values);
+      expect(API.updateChannels).toHaveBeenCalledWith(channelIds, values);
+    });
+
+    it('returns the API promise', () => {
+      const mockPromise = Promise.resolve({ success: true });
+      vi.mocked(API.updateChannels).mockReturnValue(mockPromise);
+      expect(updateChannels([1], {})).toBe(mockPromise);
+    });
+  });
+
+  describe('bulkRegexRenameChannels', () => {
+    it('calls API.bulkRegexRenameChannels with all arguments', () => {
+      bulkRegexRenameChannels([1, 2], 'find', 'replace', 'g');
+      expect(API.bulkRegexRenameChannels).toHaveBeenCalledWith([1, 2], 'find', 'replace', 'g');
+    });
+
+    it('passes empty string when regexReplace is null', () => {
+      bulkRegexRenameChannels([1], 'find', null, 'g');
+      expect(API.bulkRegexRenameChannels).toHaveBeenCalledWith([1], 'find', '', 'g');
+    });
+
+    it('passes empty string when regexReplace is undefined', () => {
+      bulkRegexRenameChannels([1], 'find', undefined, 'g');
+      expect(API.bulkRegexRenameChannels).toHaveBeenCalledWith([1], 'find', '', 'g');
+    });
+  });
+
+  describe('batchSetEPG', () => {
+    it('calls API.batchSetEPG with associations', () => {
+      const associations = [{ channel_id: 1, epg_data_id: 5 }];
+      batchSetEPG(associations);
+      expect(API.batchSetEPG).toHaveBeenCalledWith(associations);
+    });
+  });
+
+  describe('getEpgData', () => {
+    it('calls API.getEPGData', () => {
+      getEpgData();
+      expect(API.getEPGData).toHaveBeenCalled();
+    });
+  });
+
+  describe('setChannelNamesFromEpg', () => {
+    it('calls API.setChannelNamesFromEpg with channelIds', () => {
+      setChannelNamesFromEpg([1, 2]);
+      expect(API.setChannelNamesFromEpg).toHaveBeenCalledWith([1, 2]);
+    });
+  });
+
+  describe('setChannelLogosFromEpg', () => {
+    it('calls API.setChannelLogosFromEpg with channelIds', () => {
+      setChannelLogosFromEpg([1, 2]);
+      expect(API.setChannelLogosFromEpg).toHaveBeenCalledWith([1, 2]);
+    });
+  });
+
+  describe('setChannelTvgIdsFromEpg', () => {
+    it('calls API.setChannelTvgIdsFromEpg with channelIds', () => {
+      setChannelTvgIdsFromEpg([1, 2]);
+      expect(API.setChannelTvgIdsFromEpg).toHaveBeenCalledWith([1, 2]);
+    });
+  });
+
+// ── computeRegexPreview ───────────────────────────────────────────────────────
+
+  describe('computeRegexPreview', () => {
+    const nameById = {
+      1: 'HBO East',
+      2: 'HBO West',
+      3: 'ESPN HD',
+      4: 'CNN',
+    };
+
+    it('returns empty array when find is falsy', () => {
+      expect(computeRegexPreview([1, 2], nameById, '')).toEqual([]);
+      expect(computeRegexPreview([1, 2], nameById, null)).toEqual([]);
+      expect(computeRegexPreview([1, 2], nameById, undefined)).toEqual([]);
+    });
+
+    it('returns invalid regex entry for a bad pattern', () => {
+      const result = computeRegexPreview([1], nameById, '[invalid');
+      expect(result).toEqual([{ before: 'Invalid regex', after: '' }]);
+    });
+
+    it('returns before/after pairs for matching channels', () => {
+      const result = computeRegexPreview([1, 2], nameById, 'HBO', 'Cinemax');
+      expect(result).toEqual([
+        { before: 'HBO East', after: 'Cinemax East' },
+        { before: 'HBO West', after: 'Cinemax West' },
+      ]);
+    });
+
+    it('excludes channels where name does not change', () => {
+      const result = computeRegexPreview([1, 2, 4], nameById, 'HBO', 'Cinemax');
+      expect(result).toHaveLength(2);
+      expect(result.find((r) => r.before === 'CNN')).toBeUndefined();
+    });
+
+    it('only includes ids that exist in nameById', () => {
+      const result = computeRegexPreview([1, 99, 2], nameById, 'HBO', 'Cinemax');
+      expect(result).toHaveLength(2);
+    });
+
+    it('respects the limit parameter', () => {
+      const largeNameById = Object.fromEntries(
+        Array.from({ length: 30 }, (_, i) => [i + 1, `HBO ${i + 1}`])
+      );
+      const ids = Array.from({ length: 30 }, (_, i) => i + 1);
+      const result = computeRegexPreview(ids, largeNameById, 'HBO', 'Cinemax', 5);
+      expect(result).toHaveLength(5);
+    });
+
+    it('defaults to a limit of 25', () => {
+      const largeNameById = Object.fromEntries(
+        Array.from({ length: 30 }, (_, i) => [i + 1, `HBO ${i + 1}`])
+      );
+      const ids = Array.from({ length: 30 }, (_, i) => i + 1);
+      const result = computeRegexPreview(ids, largeNameById, 'HBO', 'Cinemax');
+      expect(result).toHaveLength(25);
+    });
+
+    it('uses empty string for replace when replace is null', () => {
+      const result = computeRegexPreview([1], nameById, 'HBO East', null);
+      expect(result).toEqual([{ before: 'HBO East', after: '' }]);
+    });
+
+    it('applies regex globally across the channel name', () => {
+      const names = { 1: 'aabbaa' };
+      const result = computeRegexPreview([1], names, 'a', 'x');
+      expect(result).toEqual([{ before: 'aabbaa', after: 'xxbbxx' }]);
+    });
+  });
+
+// ── buildSubmitValues ─────────────────────────────────────────────────────────
+
+  describe('buildSubmitValues', () => {
+    const baseFormValues = {
+      stream_profile_id: '-1',
+      user_level: '-1',
+      is_adult: '-1',
+      logo: 'some-logo.png',
+      channel_group: 'some-group',
+    };
+
+    it('removes channel_group and logo keys from the result', () => {
+      const result = buildSubmitValues(baseFormValues, null, null);
+      expect(result).not.toHaveProperty('channel_group');
+      expect(result).not.toHaveProperty('logo');
+    });
+
+    it('removes stream_profile_id when it is "-1"', () => {
+      const result = buildSubmitValues({ ...baseFormValues, stream_profile_id: '-1' }, null, null);
+      expect(result).not.toHaveProperty('stream_profile_id');
+    });
+
+    it('removes stream_profile_id when it is falsy', () => {
+      const result = buildSubmitValues({ ...baseFormValues, stream_profile_id: '' }, null, null);
+      expect(result).not.toHaveProperty('stream_profile_id');
+    });
+
+    it('converts stream_profile_id "0" to null (use default)', () => {
+      const result = buildSubmitValues({ ...baseFormValues, stream_profile_id: '0' }, null, null);
+      expect(result.stream_profile_id).toBeNull();
+    });
+
+    it('preserves a valid stream_profile_id string', () => {
+      const result = buildSubmitValues({ ...baseFormValues, stream_profile_id: '3' }, null, null);
+      expect(result.stream_profile_id).toBe('3');
+    });
+
+    it('removes user_level when it is "-1"', () => {
+      const result = buildSubmitValues({ ...baseFormValues, user_level: '-1' }, null, null);
+      expect(result).not.toHaveProperty('user_level');
+    });
+
+    it('preserves a valid user_level', () => {
+      const result = buildSubmitValues({ ...baseFormValues, user_level: '2' }, null, null);
+      expect(result.user_level).toBe('2');
+    });
+
+    it('removes is_adult when it is "-1"', () => {
+      const result = buildSubmitValues({ ...baseFormValues, is_adult: '-1' }, null, null);
+      expect(result).not.toHaveProperty('is_adult');
+    });
+
+    it('converts is_adult "true" to boolean true', () => {
+      const result = buildSubmitValues({ ...baseFormValues, is_adult: 'true' }, null, null);
+      expect(result.is_adult).toBe(true);
+    });
+
+    it('converts is_adult "false" to boolean false', () => {
+      const result = buildSubmitValues({ ...baseFormValues, is_adult: 'false' }, null, null);
+      expect(result.is_adult).toBe(false);
+    });
+
+    it('sets channel_group_id as integer when selectedChannelGroup is valid', () => {
+      const result = buildSubmitValues(baseFormValues, '5', null);
+      expect(result.channel_group_id).toBe(5);
+    });
+
+    it('removes channel_group_id when selectedChannelGroup is null', () => {
+      const result = buildSubmitValues({ ...baseFormValues, channel_group_id: 99 }, null, null);
+      expect(result).not.toHaveProperty('channel_group_id');
+    });
+
+    it('removes channel_group_id when selectedChannelGroup is "-1"', () => {
+      const result = buildSubmitValues({ ...baseFormValues, channel_group_id: 99 }, '-1', null);
+      expect(result).not.toHaveProperty('channel_group_id');
+    });
+
+    it('sets logo_id to null when selectedLogoId is "0" (use default)', () => {
+      const result = buildSubmitValues(baseFormValues, null, '0');
+      expect(result.logo_id).toBeNull();
+    });
+
+    it('sets logo_id as integer when selectedLogoId is a valid id', () => {
+      const result = buildSubmitValues(baseFormValues, null, '7');
+      expect(result.logo_id).toBe(7);
+    });
+
+    it('does not set logo_id when selectedLogoId is null', () => {
+      const result = buildSubmitValues(baseFormValues, null, null);
+      expect(result).not.toHaveProperty('logo_id');
+    });
+
+    it('does not set logo_id when selectedLogoId is "-1"', () => {
+      const result = buildSubmitValues(baseFormValues, null, '-1');
+      expect(result).not.toHaveProperty('logo_id');
+    });
+
+    it('does not mutate the original formValues object', () => {
+      const formValues = { ...baseFormValues };
+      buildSubmitValues(formValues, '1', '2');
+      expect(formValues).toEqual(baseFormValues);
+    });
+  });
+
+// ── buildEpgAssociations ──────────────────────────────────────────────────────
+
+  describe('buildEpgAssociations', () => {
+    const channelIds = [1, 2, 3];
+
+    const epgs = {
+      10: { name: 'XMLTV Source', epg_data_count: 5 },
+      11: { name: 'Empty EPG', epg_data_count: 0 },
+    };
+
+    const tvgs = [
+      { id: 42, epg_source: 10 },
+    ];
+
+    it('returns null when selectedDummyEpgId is falsy', async () => {
+      await expect(buildEpgAssociations(null, channelIds, epgs, tvgs)).resolves.toBeNull();
+      await expect(buildEpgAssociations('', channelIds, epgs, tvgs)).resolves.toBeNull();
+      await expect(buildEpgAssociations(undefined, channelIds, epgs, tvgs)).resolves.toBeNull();
+    });
+
+    it('returns clear associations when selectedDummyEpgId is "clear"', async () => {
+      const result = await buildEpgAssociations('clear', channelIds, epgs, tvgs);
+      expect(result).toEqual([
+        { channel_id: 1, epg_data_id: null },
+        { channel_id: 2, epg_data_id: null },
+        { channel_id: 3, epg_data_id: null },
+      ]);
+    });
+
+    it('returns null when the selected EPG has no epg_data_count', async () => {
+      const result = await buildEpgAssociations('11', channelIds, epgs, tvgs);
+      expect(result).toBeNull();
+    });
+
+    it('returns null when the selected EPG id is not found in epgs', async () => {
+      const result = await buildEpgAssociations('99', channelIds, epgs, tvgs);
+      expect(result).toBeNull();
+    });
+
+    it('uses cached tvgs data when epg_source matches', async () => {
+      const result = await buildEpgAssociations('10', channelIds, epgs, tvgs);
+      expect(API.getEPGData).not.toHaveBeenCalled();
+      expect(result).toEqual([
+        { channel_id: 1, epg_data_id: 42 },
+        { channel_id: 2, epg_data_id: 42 },
+        { channel_id: 3, epg_data_id: 42 },
+      ]);
+    });
+
+    it('calls getEpgData when tvgs does not contain a matching epg_source', async () => {
+      vi.mocked(API.getEPGData).mockResolvedValue([
+        { id: 55, epg_source: 10 },
+      ]);
+      const result = await buildEpgAssociations('10', channelIds, epgs, []);
+      expect(API.getEPGData).toHaveBeenCalled();
+      expect(result).toEqual([
+        { channel_id: 1, epg_data_id: 55 },
+        { channel_id: 2, epg_data_id: 55 },
+        { channel_id: 3, epg_data_id: 55 },
+      ]);
+    });
+
+    it('returns null when getEpgData result has no matching epg_source', async () => {
+      vi.mocked(API.getEPGData).mockResolvedValue([
+        { id: 55, epg_source: 999 },
+      ]);
+      const result = await buildEpgAssociations('10', channelIds, epgs, []);
+      expect(result).toBeNull();
+    });
+  });
+});
diff --git a/frontend/src/utils/forms/__tests__/ChannelUtils.test.js b/frontend/src/utils/forms/__tests__/ChannelUtils.test.js
new file mode 100644
index 00000000..e18970c1
--- /dev/null
+++ b/frontend/src/utils/forms/__tests__/ChannelUtils.test.js
@@ -0,0 +1,394 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import API from '../../../api.js';
+import {
+  matchChannelEpg,
+  createLogo,
+  addChannel,
+  requeryChannels,
+  getChannelFormDefaultValues,
+  getFormattedValues,
+  handleEpgUpdate,
+} from '../ChannelUtils.js';
+
+// ── API mock ───────────────────────────────────────────────────────────────────
+vi.mock('../../../api.js', () => ({
+  default: {
+    matchChannelEpg: vi.fn(),
+    createLogo: vi.fn(),
+    setChannelEPG: vi.fn(),
+    updateChannel: vi.fn(),
+    addChannel: vi.fn(),
+    requeryChannels: vi.fn(),
+  },
+}));
+
+// ── Fixtures ───────────────────────────────────────────────────────────────────
+const makeChannel = (overrides = {}) => ({
+  id: 'ch-1',
+  name: 'HBO',
+  channel_number: 501,
+  channel_group_id: 2,
+  stream_profile_id: 3,
+  tvg_id: 'hbo.us',
+  tvc_guide_stationid: 'hbo-station',
+  epg_data_id: 'epg-1',
+  logo_id: 10,
+  user_level: 1,
+  is_adult: false,
+  ...overrides,
+});
+
+const makeChannelGroups = () => ({
+  1: { id: 1, name: 'Group A' },
+  2: { id: 2, name: 'Group B' },
+});
+
+const makeChannelStreams = () => [{ id: 's1' }, { id: 's2' }];
+
+// ──────────────────────────────────────────────────────────────────────────────
+
+describe('ChannelUtils', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── matchChannelEpg ──────────────────────────────────────────────────────────
+
+  describe('matchChannelEpg', () => {
+    it('calls API.matchChannelEpg with the channel id', () => {
+      const channel = makeChannel();
+      API.matchChannelEpg.mockResolvedValue({ matched: true });
+      matchChannelEpg(channel);
+      expect(API.matchChannelEpg).toHaveBeenCalledWith('ch-1');
+    });
+
+    it('returns the API response', async () => {
+      API.matchChannelEpg.mockResolvedValue({ matched: true });
+      const result = await matchChannelEpg(makeChannel());
+      expect(result).toEqual({ matched: true });
+    });
+  });
+
+  // ── createLogo ───────────────────────────────────────────────────────────────
+
+  describe('createLogo', () => {
+    it('calls API.createLogo with the provided logo data', () => {
+      const logoData = { name: 'My Logo', url: '/logo.png' };
+      API.createLogo.mockResolvedValue({ id: 99 });
+      createLogo(logoData);
+      expect(API.createLogo).toHaveBeenCalledWith(logoData);
+    });
+
+    it('returns the API response', async () => {
+      API.createLogo.mockResolvedValue({ id: 99 });
+      const result = await createLogo({ name: 'Logo' });
+      expect(result).toEqual({ id: 99 });
+    });
+  });
+
+  // ── addChannel ───────────────────────────────────────────────────────────────
+
+  describe('addChannel', () => {
+    it('calls API.addChannel with the channel object', () => {
+      const channel = makeChannel();
+      API.addChannel.mockResolvedValue({ id: 'ch-new' });
+      addChannel(channel);
+      expect(API.addChannel).toHaveBeenCalledWith(channel);
+    });
+
+    it('returns the API response', async () => {
+      API.addChannel.mockResolvedValue({ id: 'ch-new' });
+      const result = await addChannel(makeChannel());
+      expect(result).toEqual({ id: 'ch-new' });
+    });
+  });
+
+  // ── requeryChannels ──────────────────────────────────────────────────────────
+
+  describe('requeryChannels', () => {
+    it('calls API.requeryChannels', () => {
+      requeryChannels();
+      expect(API.requeryChannels).toHaveBeenCalledTimes(1);
+    });
+
+    it('returns undefined', () => {
+      const result = requeryChannels();
+      expect(result).toBeUndefined();
+    });
+  });
+
+  // ── getChannelFormDefaultValues ──────────────────────────────────────────────
+
+  describe('getChannelFormDefaultValues', () => {
+    it('returns all channel field values as strings where required', () => {
+      const channel = makeChannel();
+      const result = getChannelFormDefaultValues(channel, makeChannelGroups());
+      expect(result).toEqual({
+        name: 'HBO',
+        channel_number: 501,
+        channel_group_id: '2',
+        stream_profile_id: '3',
+        tvg_id: 'hbo.us',
+        tvc_guide_stationid: 'hbo-station',
+        epg_data_id: 'epg-1',
+        logo_id: '10',
+        user_level: '1',
+        is_adult: false,
+      });
+    });
+
+    it('falls back to first channelGroup key when channel has no channel_group_id', () => {
+      const channel = makeChannel({ channel_group_id: null });
+      const result = getChannelFormDefaultValues(channel, makeChannelGroups());
+      expect(result.channel_group_id).toBe('1');
+    });
+
+    it('returns empty string for channel_group_id when channelGroups is empty and channel has no group', () => {
+      const channel = makeChannel({ channel_group_id: null });
+      const result = getChannelFormDefaultValues(channel, {});
+      expect(result.channel_group_id).toBe('');
+    });
+
+    it('defaults stream_profile_id to "0" when not set on channel', () => {
+      const channel = makeChannel({ stream_profile_id: null });
+      const result = getChannelFormDefaultValues(channel, makeChannelGroups());
+      expect(result.stream_profile_id).toBe('0');
+    });
+
+    it('defaults name to empty string when channel is null', () => {
+      const result = getChannelFormDefaultValues(null, makeChannelGroups());
+      expect(result.name).toBe('');
+    });
+
+    it('defaults channel_number to empty string when channel is null', () => {
+      const result = getChannelFormDefaultValues(null, makeChannelGroups());
+      expect(result.channel_number).toBe('');
+    });
+
+    it('defaults channel_number to empty string when channel_number is null', () => {
+      const channel = makeChannel({ channel_number: null });
+      const result = getChannelFormDefaultValues(channel, makeChannelGroups());
+      expect(result.channel_number).toBe('');
+    });
+
+    it('defaults channel_number to empty string when channel_number is undefined', () => {
+      const channel = makeChannel({ channel_number: undefined });
+      const result = getChannelFormDefaultValues(channel, makeChannelGroups());
+      expect(result.channel_number).toBe('');
+    });
+
+    it('preserves channel_number of 0 as 0', () => {
+      const channel = makeChannel({ channel_number: 0 });
+      const result = getChannelFormDefaultValues(channel, makeChannelGroups());
+      expect(result.channel_number).toBe(0);
+    });
+
+    it('defaults tvg_id to empty string when not set', () => {
+      const channel = makeChannel({ tvg_id: null });
+      const result = getChannelFormDefaultValues(channel, makeChannelGroups());
+      expect(result.tvg_id).toBe('');
+    });
+
+    it('defaults tvc_guide_stationid to empty string when not set', () => {
+      const channel = makeChannel({ tvc_guide_stationid: null });
+      const result = getChannelFormDefaultValues(channel, makeChannelGroups());
+      expect(result.tvc_guide_stationid).toBe('');
+    });
+
+    it('defaults epg_data_id to empty string when channel is null', () => {
+      const result = getChannelFormDefaultValues(null, makeChannelGroups());
+      expect(result.epg_data_id).toBe('');
+    });
+
+    it('defaults logo_id to empty string when not set', () => {
+      const channel = makeChannel({ logo_id: null });
+      const result = getChannelFormDefaultValues(channel, makeChannelGroups());
+      expect(result.logo_id).toBe('');
+    });
+
+    it('defaults user_level to "0" when channel is null', () => {
+      const result = getChannelFormDefaultValues(null, makeChannelGroups());
+      expect(result.user_level).toBe('0');
+    });
+
+    it('defaults is_adult to false when channel is null', () => {
+      const result = getChannelFormDefaultValues(null, makeChannelGroups());
+      expect(result.is_adult).toBe(false);
+    });
+
+    it('returns all defaults when channel is null', () => {
+      const groups = makeChannelGroups();
+      const result = getChannelFormDefaultValues(null, groups);
+      expect(result).toEqual({
+        name: '',
+        channel_number: '',
+        channel_group_id: '1',
+        stream_profile_id: '0',
+        tvg_id: '',
+        tvc_guide_stationid: '',
+        epg_data_id: '',
+        logo_id: '',
+        user_level: '0',
+        is_adult: false,
+      });
+    });
+  });
+
+  // ── getFormattedValues ───────────────────────────────────────────────────────
+
+  describe('getFormattedValues', () => {
+    it('converts "0" stream_profile_id to null', () => {
+      const result = getFormattedValues({ stream_profile_id: '0', tvg_id: 'x', tvc_guide_stationid: 'y' });
+      expect(result.stream_profile_id).toBeNull();
+    });
+
+    it('converts empty string stream_profile_id to null', () => {
+      const result = getFormattedValues({ stream_profile_id: '', tvg_id: 'x', tvc_guide_stationid: 'y' });
+      expect(result.stream_profile_id).toBeNull();
+    });
+
+    it('preserves non-zero stream_profile_id', () => {
+      const result = getFormattedValues({ stream_profile_id: '5', tvg_id: 'x', tvc_guide_stationid: 'y' });
+      expect(result.stream_profile_id).toBe('5');
+    });
+
+    it('converts empty tvg_id to null', () => {
+      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: '', tvc_guide_stationid: 'y' });
+      expect(result.tvg_id).toBeNull();
+    });
+
+    it('preserves non-empty tvg_id', () => {
+      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: 'hbo.us', tvc_guide_stationid: 'y' });
+      expect(result.tvg_id).toBe('hbo.us');
+    });
+
+    it('converts empty tvc_guide_stationid to null', () => {
+      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: 'x', tvc_guide_stationid: '' });
+      expect(result.tvc_guide_stationid).toBeNull();
+    });
+
+    it('preserves non-empty tvc_guide_stationid', () => {
+      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: 'x', tvc_guide_stationid: 'hbo-station' });
+      expect(result.tvc_guide_stationid).toBe('hbo-station');
+    });
+
+    it('does not mutate the original values object', () => {
+      const values = { stream_profile_id: '0', tvg_id: '', tvc_guide_stationid: '' };
+      getFormattedValues(values);
+      expect(values.stream_profile_id).toBe('0');
+    });
+
+    it('passes through unrelated fields unchanged', () => {
+      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: 'x', tvc_guide_stationid: 'y', name: 'HBO' });
+      expect(result.name).toBe('HBO');
+    });
+  });
+
+  // ── handleEpgUpdate ──────────────────────────────────────────────────────────
+
+  describe('handleEpgUpdate', () => {
+    const makeValues = (overrides = {}) => ({
+      name: 'HBO',
+      stream_profile_id: '3',
+      tvg_id: 'hbo.us',
+      tvc_guide_stationid: 'hbo-station',
+      epg_data_id: 'epg-new',
+      ...overrides,
+    });
+
+    const makeFormattedValues = (overrides = {}) => ({
+      name: 'HBO',
+      stream_profile_id: '3',
+      tvg_id: 'hbo.us',
+      tvc_guide_stationid: 'hbo-station',
+      epg_data_id: 'epg-new',
+      ...overrides,
+    });
+
+    beforeEach(() => {
+      API.setChannelEPG.mockResolvedValue(undefined);
+      API.updateChannel.mockResolvedValue(undefined);
+    });
+
+    describe('when epg_data_id has changed', () => {
+      it('calls API.setChannelEPG with channel id and new epg_data_id', async () => {
+        const channel = makeChannel({ epg_data_id: 'epg-old' });
+        const values = makeValues({ epg_data_id: 'epg-new' });
+        await handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-new' }), makeChannelStreams());
+        expect(API.setChannelEPG).toHaveBeenCalledWith('ch-1', 'epg-new');
+      });
+
+      it('calls API.updateChannel with remaining fields and stream ids', async () => {
+        const channel = makeChannel({ epg_data_id: 'epg-old' });
+        const values = makeValues({ epg_data_id: 'epg-new' });
+        const formatted = makeFormattedValues({ epg_data_id: 'epg-new' });
+        await handleEpgUpdate(channel, values, formatted, makeChannelStreams());
+        expect(API.updateChannel).toHaveBeenCalledWith(
+          expect.objectContaining({
+            id: 'ch-1',
+            streams: ['s1', 's2'],
+          })
+        );
+        // epg_data_id must NOT be in the updateChannel call
+        const callArg = API.updateChannel.mock.calls[0][0];
+        expect(callArg).not.toHaveProperty('epg_data_id');
+      });
+
+      it('does not call API.updateChannel when formattedValues only contains epg_data_id', async () => {
+        const channel = makeChannel({ epg_data_id: 'epg-old' });
+        const values = makeValues({ epg_data_id: 'epg-new' });
+        // Only epg_data_id in formatted — after stripping it, nothing remains
+        await handleEpgUpdate(channel, values, { epg_data_id: 'epg-new' }, makeChannelStreams());
+        expect(API.updateChannel).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when epg_data_id has not changed', () => {
+      it('does not call API.setChannelEPG', async () => {
+        const channel = makeChannel({ epg_data_id: 'epg-1' });
+        const values = makeValues({ epg_data_id: 'epg-1' });
+        await handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-1' }), makeChannelStreams());
+        expect(API.setChannelEPG).not.toHaveBeenCalled();
+      });
+
+      it('calls API.updateChannel with all formatted values and stream ids', async () => {
+        const channel = makeChannel({ epg_data_id: 'epg-1' });
+        const values = makeValues({ epg_data_id: 'epg-1' });
+        const formatted = makeFormattedValues({ epg_data_id: 'epg-1' });
+        await handleEpgUpdate(channel, values, formatted, makeChannelStreams());
+        expect(API.updateChannel).toHaveBeenCalledWith({
+          id: 'ch-1',
+          ...formatted,
+          streams: ['s1', 's2'],
+        });
+      });
+
+      it('handles empty channel streams array', async () => {
+        const channel = makeChannel({ epg_data_id: 'epg-1' });
+        const values = makeValues({ epg_data_id: 'epg-1' });
+        await handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-1' }), []);
+        expect(API.updateChannel).toHaveBeenCalledWith(
+          expect.objectContaining({ streams: [] })
+        );
+      });
+    });
+
+    it('propagates API.setChannelEPG rejection', async () => {
+      API.setChannelEPG.mockRejectedValue(new Error('EPG error'));
+      const channel = makeChannel({ epg_data_id: 'epg-old' });
+      const values = makeValues({ epg_data_id: 'epg-new' });
+      await expect(
+        handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-new' }), makeChannelStreams())
+      ).rejects.toThrow('EPG error');
+    });
+
+    it('propagates API.updateChannel rejection', async () => {
+      API.updateChannel.mockRejectedValue(new Error('Update error'));
+      const channel = makeChannel({ epg_data_id: 'epg-1' });
+      const values = makeValues({ epg_data_id: 'epg-1' });
+      await expect(
+        handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-1' }), makeChannelStreams())
+      ).rejects.toThrow('Update error');
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/utils/forms/__tests__/ConnectionUtils.test.js b/frontend/src/utils/forms/__tests__/ConnectionUtils.test.js
new file mode 100644
index 00000000..69417038
--- /dev/null
+++ b/frontend/src/utils/forms/__tests__/ConnectionUtils.test.js
@@ -0,0 +1,330 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import {
+  EVENT_OPTIONS,
+  updateConnectIntegration,
+  createConnectIntegration,
+  setConnectSubscriptions,
+  buildConfig,
+  buildSubscriptions,
+  parseApiError,
+} from '../ConnectionUtils.js';
+
+// ── Module mocks ───────────────────────────────────────────────────────────────
+
+vi.mock('../../../api.js', () => ({
+  default: {
+    updateConnectIntegration: vi.fn(),
+    createConnectIntegration: vi.fn(),
+    setConnectSubscriptions: vi.fn(),
+  },
+}));
+
+vi.mock('../../../constants.js', () => ({
+  SUBSCRIPTION_EVENTS: {
+    channel_added: 'Channel Added',
+    channel_removed: 'Channel Removed',
+    recording_started: 'Recording Started',
+  },
+}));
+
+// ── Imports after mocks ────────────────────────────────────────────────────────
+
+import API from '../../../api.js';
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+
+const makeConnection = (overrides = {}) => ({ id: 'conn-1', ...overrides });
+
+const makeValues = (overrides = {}) => ({
+  name: 'Test Integration',
+  type: 'webhook',
+  enabled: true,
+  url: 'https://example.com/hook',
+  script_path: '',
+  ...overrides,
+});
+
+// ──────────────────────────────────────────────────────────────────────────────
+
+describe('ConnectionUtils', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── EVENT_OPTIONS ────────────────────────────────────────────────────────────
+
+  describe('EVENT_OPTIONS', () => {
+    it('maps SUBSCRIPTION_EVENTS entries to { value, label } objects', () => {
+      expect(EVENT_OPTIONS).toEqual([
+        { value: 'channel_added', label: 'Channel Added' },
+        { value: 'channel_removed', label: 'Channel Removed' },
+        { value: 'recording_started', label: 'Recording Started' },
+      ]);
+    });
+
+    it('has the same length as SUBSCRIPTION_EVENTS', () => {
+      expect(EVENT_OPTIONS).toHaveLength(3);
+    });
+  });
+
+  // ── createConnectIntegration ─────────────────────────────────────────────────
+
+  describe('createConnectIntegration', () => {
+    it('calls API.createConnectIntegration with the correct payload', async () => {
+      const values = makeValues();
+      const config = { url: 'https://example.com/hook' };
+      vi.mocked(API.createConnectIntegration).mockResolvedValue({ id: 'new-1' });
+
+      await createConnectIntegration(values, config);
+
+      expect(API.createConnectIntegration).toHaveBeenCalledWith({
+        name: 'Test Integration',
+        type: 'webhook',
+        config,
+        enabled: true,
+      });
+    });
+
+    it('returns the API response', async () => {
+      vi.mocked(API.createConnectIntegration).mockResolvedValue({ id: 'new-1' });
+      const result = await createConnectIntegration(makeValues(), {});
+      expect(result).toEqual({ id: 'new-1' });
+    });
+
+    it('propagates API errors', async () => {
+      vi.mocked(API.createConnectIntegration).mockRejectedValue(new Error('Network error'));
+      await expect(createConnectIntegration(makeValues(), {})).rejects.toThrow('Network error');
+    });
+  });
+
+  // ── updateConnectIntegration ─────────────────────────────────────────────────
+
+  describe('updateConnectIntegration', () => {
+    it('calls API.updateConnectIntegration with connection.id and correct payload', async () => {
+      const connection = makeConnection();
+      const values = makeValues();
+      const config = { url: 'https://example.com/hook' };
+      vi.mocked(API.updateConnectIntegration).mockResolvedValue({ id: 'conn-1' });
+
+      await updateConnectIntegration(connection, values, config);
+
+      expect(API.updateConnectIntegration).toHaveBeenCalledWith('conn-1', {
+        name: 'Test Integration',
+        type: 'webhook',
+        config,
+        enabled: true,
+      });
+    });
+
+    it('returns the API response', async () => {
+      vi.mocked(API.updateConnectIntegration).mockResolvedValue({ id: 'conn-1', name: 'Updated' });
+      const result = await updateConnectIntegration(makeConnection(), makeValues(), {});
+      expect(result).toEqual({ id: 'conn-1', name: 'Updated' });
+    });
+
+    it('propagates API errors', async () => {
+      vi.mocked(API.updateConnectIntegration).mockRejectedValue(new Error('Server error'));
+      await expect(
+        updateConnectIntegration(makeConnection(), makeValues(), {})
+      ).rejects.toThrow('Server error');
+    });
+  });
+
+  // ── setConnectSubscriptions ──────────────────────────────────────────────────
+
+  describe('setConnectSubscriptions', () => {
+    it('calls API.setConnectSubscriptions with connection.id and subs', async () => {
+      const connection = makeConnection();
+      const subs = [{ event: 'channel_added', enabled: true, payload_template: null }];
+      vi.mocked(API.setConnectSubscriptions).mockResolvedValue(undefined);
+
+      await setConnectSubscriptions(connection, subs);
+
+      expect(API.setConnectSubscriptions).toHaveBeenCalledWith('conn-1', subs);
+    });
+
+    it('propagates API errors', async () => {
+      vi.mocked(API.setConnectSubscriptions).mockRejectedValue(new Error('Failed'));
+      await expect(setConnectSubscriptions(makeConnection(), [])).rejects.toThrow('Failed');
+    });
+  });
+
+  // ── buildConfig ──────────────────────────────────────────────────────────────
+
+  describe('buildConfig', () => {
+    describe('webhook type', () => {
+      it('returns config with url only when no headers are provided', () => {
+        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
+        expect(buildConfig(values, [])).toEqual({ url: 'https://example.com/hook' });
+      });
+
+      it('includes headers when non-empty key/value pairs are present', () => {
+        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
+        const headers = [{ key: 'Authorization', value: 'Bearer token' }];
+        expect(buildConfig(values, headers)).toEqual({
+          url: 'https://example.com/hook',
+          headers: { Authorization: 'Bearer token' },
+        });
+      });
+
+      it('omits headers with blank keys', () => {
+        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
+        const headers = [
+          { key: '', value: 'should-be-ignored' },
+          { key: '   ', value: 'also-ignored' },
+          { key: 'X-Custom', value: 'kept' },
+        ];
+        expect(buildConfig(values, headers)).toEqual({
+          url: 'https://example.com/hook',
+          headers: { 'X-Custom': 'kept' },
+        });
+      });
+
+      it('omits headers property entirely when all keys are blank', () => {
+        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
+        const headers = [{ key: '', value: 'ignored' }];
+        const config = buildConfig(values, headers);
+        expect(config).not.toHaveProperty('headers');
+      });
+
+      it('supports multiple headers', () => {
+        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
+        const headers = [
+          { key: 'X-One', value: '1' },
+          { key: 'X-Two', value: '2' },
+        ];
+        expect(buildConfig(values, headers)).toEqual({
+          url: 'https://example.com/hook',
+          headers: { 'X-One': '1', 'X-Two': '2' },
+        });
+      });
+    });
+
+    describe('script type', () => {
+      it('returns config with path from script_path', () => {
+        const values = makeValues({ type: 'script', script_path: '/usr/local/bin/notify.sh' });
+        expect(buildConfig(values, [])).toEqual({ path: '/usr/local/bin/notify.sh' });
+      });
+
+      it('ignores headers for script type', () => {
+        const values = makeValues({ type: 'script', script_path: '/usr/bin/run.sh' });
+        const headers = [{ key: 'Authorization', value: 'Bearer token' }];
+        const config = buildConfig(values, headers);
+        expect(config).not.toHaveProperty('headers');
+        expect(config).toEqual({ path: '/usr/bin/run.sh' });
+      });
+    });
+  });
+
+  // ── buildSubscriptions ───────────────────────────────────────────────────────
+
+  describe('buildSubscriptions', () => {
+    it('returns an entry for every event in SUBSCRIPTION_EVENTS', () => {
+      const result = buildSubscriptions([], {});
+      expect(result).toHaveLength(3);
+      expect(result.map((s) => s.event)).toEqual([
+        'channel_added',
+        'channel_removed',
+        'recording_started',
+      ]);
+    });
+
+    it('marks events as enabled when they are in selectedEvents', () => {
+      const result = buildSubscriptions(['channel_added'], {});
+      const added = result.find((s) => s.event === 'channel_added');
+      const removed = result.find((s) => s.event === 'channel_removed');
+      expect(added.enabled).toBe(true);
+      expect(removed.enabled).toBe(false);
+    });
+
+    it('sets payload_template from payloadTemplates when present', () => {
+      const templates = { channel_added: '{"key":"{{value}}"}' };
+      const result = buildSubscriptions(['channel_added'], templates);
+      const added = result.find((s) => s.event === 'channel_added');
+      expect(added.payload_template).toBe('{"key":"{{value}}"}');
+    });
+
+    it('sets payload_template to null when not in payloadTemplates', () => {
+      const result = buildSubscriptions([], {});
+      result.forEach((s) => expect(s.payload_template).toBeNull());
+    });
+
+    it('sets payload_template to null when value is undefined in payloadTemplates', () => {
+      const templates = { channel_added: undefined };
+      const result = buildSubscriptions([], templates);
+      const added = result.find((s) => s.event === 'channel_added');
+      expect(added.payload_template).toBeNull();
+    });
+  });
+
+  // ── parseApiError ────────────────────────────────────────────────────────────
+
+  describe('parseApiError', () => {
+    it('returns message when error has no body', () => {
+      const error = { message: 'Network failure' };
+      expect(parseApiError(error)).toEqual({ fieldErrors: {}, apiError: 'Network failure' });
+    });
+
+    it('returns "Unknown error" when error has no body and no message', () => {
+      expect(parseApiError({})).toEqual({ fieldErrors: {}, apiError: 'Unknown error' });
+    });
+
+    it('returns message when body is a string (not an object)', () => {
+      const error = { body: 'Bad Request', message: 'HTTP 400' };
+      expect(parseApiError(error)).toEqual({ fieldErrors: {}, apiError: 'HTTP 400' });
+    });
+
+    it('extracts known field errors from body', () => {
+      const error = { body: { name: 'This field is required.', type: 'Invalid choice.' } };
+      const { fieldErrors } = parseApiError(error);
+      expect(fieldErrors).toEqual({
+        name: 'This field is required.',
+        type: 'Invalid choice.',
+      });
+    });
+
+    it('ignores unknown fields in body', () => {
+      const error = { body: { unknown_field: 'some error' } };
+      const { fieldErrors } = parseApiError(error);
+      expect(fieldErrors).toEqual({});
+    });
+
+    it('uses non_field_errors as apiError when present', () => {
+      const error = { body: { non_field_errors: 'Invalid credentials.' } };
+      const { apiError } = parseApiError(error);
+      expect(apiError).toBe('Invalid credentials.');
+    });
+
+    it('falls back to detail as apiError when non_field_errors is absent', () => {
+      const error = { body: { detail: 'Authentication required.' } };
+      const { apiError } = parseApiError(error);
+      expect(apiError).toBe('Authentication required.');
+    });
+
+    it('prefers non_field_errors over detail', () => {
+      const error = { body: { non_field_errors: 'NF error', detail: 'Detail error' } };
+      const { apiError } = parseApiError(error);
+      expect(apiError).toBe('NF error');
+    });
+
+    it('sets apiError to empty string when field errors are present but no non_field_errors', () => {
+      const error = { body: { name: 'Required.' } };
+      const { apiError } = parseApiError(error);
+      expect(apiError).toBe('');
+    });
+
+    it('JSON.stringifies body as fallback when no field errors and no non_field_errors', () => {
+      const error = { body: { unexpected: 'data' } };
+      const { apiError } = parseApiError(error);
+      expect(apiError).toBe(JSON.stringify({ unexpected: 'data' }));
+    });
+
+    it('handles null error gracefully', () => {
+      expect(parseApiError(null)).toEqual({ fieldErrors: {}, apiError: 'Unknown error' });
+    });
+
+    it('handles undefined error gracefully', () => {
+      expect(parseApiError(undefined)).toEqual({ fieldErrors: {}, apiError: 'Unknown error' });
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/utils/forms/__tests__/CronBuilderUtils.test.js b/frontend/src/utils/forms/__tests__/CronBuilderUtils.test.js
new file mode 100644
index 00000000..92ad83bb
--- /dev/null
+++ b/frontend/src/utils/forms/__tests__/CronBuilderUtils.test.js
@@ -0,0 +1,349 @@
+import { describe, it, expect } from 'vitest';
+import {
+  buildCron,
+  parseCronPreset,
+  updateCronPart,
+  PRESETS,
+  DAYS_OF_WEEK,
+  FREQUENCY_OPTIONS,
+  CRON_FIELDS,
+} from '../CronBuilderUtils.js';
+
+describe('CronBuilderUtils', () => {
+  // ── PRESETS ────────────────────────────────────────────────────────────────────
+
+  describe('PRESETS', () => {
+    it('is a non-empty array', () => {
+      expect(Array.isArray(PRESETS)).toBe(true);
+      expect(PRESETS.length).toBeGreaterThan(0);
+    });
+
+    it('every preset has label, value, and description', () => {
+      PRESETS.forEach((preset) => {
+        expect(preset).toHaveProperty('label');
+        expect(preset).toHaveProperty('value');
+        expect(preset).toHaveProperty('description');
+      });
+    });
+
+    it('every preset value is a valid 5-part cron string', () => {
+      PRESETS.forEach((preset) => {
+        expect(preset.value.split(' ')).toHaveLength(5);
+      });
+    });
+  });
+
+// ── DAYS_OF_WEEK ───────────────────────────────────────────────────────────────
+
+  describe('DAYS_OF_WEEK', () => {
+    it('contains 8 entries (wildcard + 7 days)', () => {
+      expect(DAYS_OF_WEEK).toHaveLength(8);
+    });
+
+    it('first entry is the wildcard "Every day"', () => {
+      expect(DAYS_OF_WEEK[0]).toEqual({ value: '*', label: 'Every day' });
+    });
+
+    it('every entry has value and label', () => {
+      DAYS_OF_WEEK.forEach((day) => {
+        expect(day).toHaveProperty('value');
+        expect(day).toHaveProperty('label');
+      });
+    });
+
+    it('numeric entries run 0-6', () => {
+      const numeric = DAYS_OF_WEEK.filter((d) => d.value !== '*');
+      expect(numeric.map((d) => d.value)).toEqual(['0', '1', '2', '3', '4', '5', '6']);
+    });
+  });
+
+// ── FREQUENCY_OPTIONS ──────────────────────────────────────────────────────────
+
+  describe('FREQUENCY_OPTIONS', () => {
+    it('contains exactly 4 options', () => {
+      expect(FREQUENCY_OPTIONS).toHaveLength(4);
+    });
+
+    it('contains hourly, daily, weekly, monthly', () => {
+      const values = FREQUENCY_OPTIONS.map((o) => o.value);
+      expect(values).toEqual(['hourly', 'daily', 'weekly', 'monthly']);
+    });
+
+    it('every option has value and label', () => {
+      FREQUENCY_OPTIONS.forEach((opt) => {
+        expect(opt).toHaveProperty('value');
+        expect(opt).toHaveProperty('label');
+      });
+    });
+  });
+
+// ── CRON_FIELDS ────────────────────────────────────────────────────────────────
+
+  describe('CRON_FIELDS', () => {
+    it('contains exactly 5 fields', () => {
+      expect(CRON_FIELDS).toHaveLength(5);
+    });
+
+    it('indexes run 0-4 in order', () => {
+      expect(CRON_FIELDS.map((f) => f.index)).toEqual([0, 1, 2, 3, 4]);
+    });
+
+    it('every field has index, label, and placeholder', () => {
+      CRON_FIELDS.forEach((field) => {
+        expect(field).toHaveProperty('index');
+        expect(field).toHaveProperty('label');
+        expect(field).toHaveProperty('placeholder');
+      });
+    });
+  });
+
+// ── buildCron ──────────────────────────────────────────────────────────────────
+
+  describe('buildCron', () => {
+    describe('hourly', () => {
+      it('returns minute-only expression', () => {
+        expect(buildCron('hourly', 0, 0, '*', 1)).toBe('0 * * * *');
+      });
+
+      it('uses the provided minute value', () => {
+        expect(buildCron('hourly', 30, 12, '*', 1)).toBe('30 * * * *');
+      });
+
+      it('ignores hour, dayOfWeek, and dayOfMonth', () => {
+        expect(buildCron('hourly', 15, 9, '1', 5)).toBe('15 * * * *');
+      });
+    });
+
+    describe('daily', () => {
+      it('returns minute and hour expression', () => {
+        expect(buildCron('daily', 0, 3, '*', 1)).toBe('0 3 * * *');
+      });
+
+      it('uses the provided minute and hour', () => {
+        expect(buildCron('daily', 30, 12, '*', 1)).toBe('30 12 * * *');
+      });
+
+      it('ignores dayOfWeek and dayOfMonth', () => {
+        expect(buildCron('daily', 0, 0, '2', 15)).toBe('0 0 * * *');
+      });
+    });
+
+    describe('weekly', () => {
+      it('uses specific dayOfWeek when provided', () => {
+        expect(buildCron('weekly', 0, 3, '1', 1)).toBe('0 3 * * 1');
+      });
+
+      it('defaults dayOfWeek to 0 when wildcard is passed', () => {
+        expect(buildCron('weekly', 0, 3, '*', 1)).toBe('0 3 * * 0');
+      });
+
+      it('uses the provided minute and hour', () => {
+        expect(buildCron('weekly', 15, 9, '5', 1)).toBe('15 9 * * 5');
+      });
+
+      it('ignores dayOfMonth', () => {
+        expect(buildCron('weekly', 0, 0, '0', 31)).toBe('0 0 * * 0');
+      });
+    });
+
+    describe('monthly', () => {
+      it('returns expression with day of month', () => {
+        expect(buildCron('monthly', 30, 2, '*', 1)).toBe('30 2 1 * *');
+      });
+
+      it('uses the provided dayOfMonth', () => {
+        expect(buildCron('monthly', 0, 0, '*', 15)).toBe('0 0 15 * *');
+      });
+
+      it('ignores dayOfWeek', () => {
+        expect(buildCron('monthly', 0, 6, '3', 10)).toBe('0 6 10 * *');
+      });
+    });
+
+    describe('unknown frequency', () => {
+      it('returns wildcard expression for unknown frequency', () => {
+        expect(buildCron('unknown', 0, 0, '*', 1)).toBe('* * * * *');
+      });
+
+      it('returns wildcard expression for empty string', () => {
+        expect(buildCron('', 0, 0, '*', 1)).toBe('* * * * *');
+      });
+    });
+  });
+
+// ── parseCronPreset ────────────────────────────────────────────────────────────
+
+  describe('parseCronPreset', () => {
+    describe('hourly detection', () => {
+      it('detects hourly when hour is wildcard', () => {
+        const result = parseCronPreset('0 * * * *');
+        expect(result.frequency).toBe('hourly');
+      });
+
+      it('returns correct minute for hourly', () => {
+        expect(parseCronPreset('0 * * * *').minute).toBe(0);
+      });
+
+      it('returns dayOfWeek as wildcard for hourly', () => {
+        expect(parseCronPreset('0 * * * *').dayOfWeek).toBe('*');
+      });
+
+      it('returns dayOfMonth as 1 for hourly', () => {
+        expect(parseCronPreset('0 * * * *').dayOfMonth).toBe(1);
+      });
+
+      it('parses step-based hourly (*/6)', () => {
+        const result = parseCronPreset('0 */6 * * *');
+        expect(result.frequency).toBe('daily');
+        expect(result.hour).toBe(6);
+      });
+    });
+
+    describe('weekly detection', () => {
+      it('detects weekly when weekday is not wildcard', () => {
+        const result = parseCronPreset('0 3 * * 1');
+        expect(result.frequency).toBe('weekly');
+      });
+
+      it('returns correct dayOfWeek', () => {
+        expect(parseCronPreset('0 3 * * 1').dayOfWeek).toBe('1');
+      });
+
+      it('returns correct minute and hour for weekly', () => {
+        const result = parseCronPreset('15 9 * * 5');
+        expect(result.minute).toBe(15);
+        expect(result.hour).toBe(9);
+      });
+
+      it('returns dayOfMonth as 1 for weekly', () => {
+        expect(parseCronPreset('0 3 * * 0').dayOfMonth).toBe(1);
+      });
+    });
+
+    describe('monthly detection', () => {
+      it('detects monthly when day of month is not wildcard', () => {
+        const result = parseCronPreset('30 2 1 * *');
+        expect(result.frequency).toBe('monthly');
+      });
+
+      it('returns correct dayOfMonth', () => {
+        expect(parseCronPreset('0 0 15 * *').dayOfMonth).toBe(15);
+      });
+
+      it('returns correct minute and hour for monthly', () => {
+        const result = parseCronPreset('30 2 1 * *');
+        expect(result.minute).toBe(30);
+        expect(result.hour).toBe(2);
+      });
+
+      it('returns dayOfWeek as wildcard for monthly', () => {
+        expect(parseCronPreset('30 2 1 * *').dayOfWeek).toBe('*');
+      });
+    });
+
+    describe('daily detection', () => {
+      it('detects daily as the default when no other conditions match', () => {
+        const result = parseCronPreset('0 3 * * *');
+        expect(result.frequency).toBe('daily');
+      });
+
+      it('returns correct minute and hour for daily', () => {
+        const result = parseCronPreset('30 12 * * *');
+        expect(result.minute).toBe(30);
+        expect(result.hour).toBe(12);
+      });
+
+      it('returns dayOfWeek as wildcard for daily', () => {
+        expect(parseCronPreset('0 3 * * *').dayOfWeek).toBe('*');
+      });
+
+      it('returns dayOfMonth as 1 for daily', () => {
+        expect(parseCronPreset('0 3 * * *').dayOfMonth).toBe(1);
+      });
+    });
+
+    describe('edge cases', () => {
+      it('defaults minute to 0 for non-numeric minute field', () => {
+        expect(parseCronPreset('* 3 * * *').minute).toBe(0);
+      });
+
+      it('defaults hour to 0 for wildcard hour in non-hourly cron', () => {
+        expect(parseCronPreset('0 0 * * *').hour).toBe(0);
+      });
+
+      it('round-trips all PRESETS without throwing', () => {
+        PRESETS.forEach((preset) => {
+          expect(() => parseCronPreset(preset.value)).not.toThrow();
+        });
+      });
+    });
+  });
+
+// ── updateCronPart ─────────────────────────────────────────────────────────────
+
+  describe('updateCronPart', () => {
+    describe('valid 5-part cron', () => {
+      it('updates the minute field (index 0)', () => {
+        expect(updateCronPart('* * * * *', 0, '30')).toBe('30 * * * *');
+      });
+
+      it('updates the hour field (index 1)', () => {
+        expect(updateCronPart('0 * * * *', 1, '6')).toBe('0 6 * * *');
+      });
+
+      it('updates the day of month field (index 2)', () => {
+        expect(updateCronPart('0 3 * * *', 2, '15')).toBe('0 3 15 * *');
+      });
+
+      it('updates the month field (index 3)', () => {
+        expect(updateCronPart('0 3 * * *', 3, '6')).toBe('0 3 * 6 *');
+      });
+
+      it('updates the day of week field (index 4)', () => {
+        expect(updateCronPart('0 3 * * *', 4, '1')).toBe('0 3 * * 1');
+      });
+
+      it('preserves other parts when updating one field', () => {
+        expect(updateCronPart('5 4 3 2 1', 0, '10')).toBe('10 4 3 2 1');
+      });
+    });
+
+    describe('empty or falsy value', () => {
+      it('replaces empty string with wildcard', () => {
+        expect(updateCronPart('0 3 * * *', 0, '')).toBe('* 3 * * *');
+      });
+
+      it('replaces undefined with wildcard', () => {
+        expect(updateCronPart('0 3 * * *', 0, undefined)).toBe('* 3 * * *');
+      });
+
+      it('replaces null with wildcard', () => {
+        expect(updateCronPart('0 3 * * *', 0, null)).toBe('* 3 * * *');
+      });
+    });
+
+    describe('invalid or short cron string', () => {
+      it('falls back to all-wildcards base for a short cron string', () => {
+        expect(updateCronPart('0 3', 0, '5')).toBe('5 * * * *');
+      });
+
+      it('falls back to all-wildcards for an empty string', () => {
+        expect(updateCronPart('', 0, '5')).toBe('5 * * * *');
+      });
+    });
+
+    describe('step and range values', () => {
+      it('accepts step values like */15', () => {
+        expect(updateCronPart('* * * * *', 0, '*/15')).toBe('*/15 * * * *');
+      });
+
+      it('accepts range values like 9-17', () => {
+        expect(updateCronPart('* * * * *', 1, '9-17')).toBe('* 9-17 * * *');
+      });
+
+      it('accepts comma-separated values like 0,15,30,45', () => {
+        expect(updateCronPart('* * * * *', 0, '0,15,30,45')).toBe('0,15,30,45 * * * *');
+      });
+    });
+  });
+});
diff --git a/frontend/src/utils/forms/__tests__/DummyEpgUtils.test.js b/frontend/src/utils/forms/__tests__/DummyEpgUtils.test.js
new file mode 100644
index 00000000..c4d1a7c3
--- /dev/null
+++ b/frontend/src/utils/forms/__tests__/DummyEpgUtils.test.js
@@ -0,0 +1,562 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+// ── Module mocks (must be before imports) ─────────────────────────────────────
+vi.mock('../../../api.js', () => ({
+  default: {
+    getTimezones:  vi.fn(),
+    addEPG:        vi.fn(),
+    updateEPG:     vi.fn(),
+  },
+}));
+
+vi.mock('../../dateTimeUtils.js', () => ({
+  format:      vi.fn(),
+  getDay:      vi.fn(),
+  getHour:     vi.fn(),
+  getMinute:   vi.fn(),
+  getMonth:    vi.fn(),
+  getNow:      vi.fn(),
+  getYear:     vi.fn(),
+  MONTH_ABBR:  ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'],
+  MONTH_NAMES: ['January','February','March','April','May','June',
+    'July','August','September','October','November','December'],
+  setHour:     vi.fn((dt) => dt),
+  setMinute:   vi.fn((dt) => dt),
+  setSecond:   vi.fn((dt) => dt),
+  setTz:       vi.fn(),
+}));
+
+// ── Imports after mocks ────────────────────────────────────────────────────────
+import API from '../../../api.js';
+import * as dateTimeUtils from '../../dateTimeUtils.js';
+import {
+  getTimezones,
+  updateEPG,
+  addEPG,
+  getDummyEpgFormInitialValues,
+  buildCustomProperties,
+  validateCustomTitlePattern,
+  validateCustomNameSource,
+  validateCustomStreamIndex,
+  matchPattern,
+  addNormalizedGroups,
+  applyTemplates,
+  buildTimePlaceholders,
+} from '../DummyEpgUtils.js';
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+const makeEPG = (overrides = {}) => ({
+  id: 42,
+  name: 'Test EPG',
+  is_active: true,
+  source_type: 'dummy',
+  custom_properties: {},
+  ...overrides,
+});
+
+const makeCustom = (overrides = {}) => ({
+  title_pattern:                 '(?<title>.+)',
+  time_pattern:                  '(?<hour>\\d+):(?<minute>\\d+)',
+  date_pattern:                  '',
+  timezone:                      'US/Eastern',
+  output_timezone:               '',
+  program_duration:              180,
+  sample_title:                  'Test Show 9:00 PM',
+  title_template:                '{title}',
+  subtitle_template:             '',
+  description_template:          '',
+  upcoming_title_template:       '',
+  upcoming_description_template: '',
+  ended_title_template:          '',
+  ended_description_template:    '',
+  fallback_title_template:       '',
+  fallback_description_template: '',
+  channel_logo_url:              '',
+  program_poster_url:            '',
+  name_source:                   'channel',
+  stream_index:                  1,
+  category:                      '',
+  include_date:                  true,
+  include_live:                  false,
+  include_new:                   false,
+  ...overrides,
+});
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('DummyEpgUtils', () => {
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── getTimezones ───────────────────────────────────────────────────────────
+  describe('getTimezones', () => {
+    it('calls API.getTimezones and returns its result', async () => {
+      vi.mocked(API.getTimezones).mockResolvedValue({ timezones: ['UTC', 'US/Eastern'] });
+      const result = await getTimezones();
+      expect(API.getTimezones).toHaveBeenCalledTimes(1);
+      expect(result).toEqual({ timezones: ['UTC', 'US/Eastern'] });
+    });
+
+    it('propagates rejection from API.getTimezones', async () => {
+      vi.mocked(API.getTimezones).mockRejectedValue(new Error('Network error'));
+      await expect(getTimezones()).rejects.toThrow('Network error');
+    });
+  });
+
+  // ── addEPG ─────────────────────────────────────────────────────────────────
+  describe('addEPG', () => {
+    it('calls API.addEPG with the provided values', async () => {
+      const values = { name: 'New EPG', source_type: 'dummy' };
+      vi.mocked(API.addEPG).mockResolvedValue({ id: 1, ...values });
+      const result = await addEPG(values);
+      expect(API.addEPG).toHaveBeenCalledWith(values);
+      expect(result).toMatchObject({ id: 1, name: 'New EPG' });
+    });
+
+    it('propagates rejection from API.addEPG', async () => {
+      vi.mocked(API.addEPG).mockRejectedValue(new Error('Server error'));
+      await expect(addEPG({})).rejects.toThrow('Server error');
+    });
+  });
+
+  // ── updateEPG ──────────────────────────────────────────────────────────────
+  describe('updateEPG', () => {
+    it('calls API.updateEPG with values merged with epg.id', async () => {
+      const epg    = makeEPG({ id: 42 });
+      const values = { name: 'Updated EPG' };
+      vi.mocked(API.updateEPG).mockResolvedValue({ id: 42, name: 'Updated EPG' });
+
+      const result = await updateEPG(values, epg);
+
+      expect(API.updateEPG).toHaveBeenCalledWith({ name: 'Updated EPG', id: 42 });
+      expect(result).toMatchObject({ id: 42 });
+    });
+
+    it('passes the correct id when multiple epgs exist', async () => {
+      const epg = makeEPG({ id: 99 });
+      vi.mocked(API.updateEPG).mockResolvedValue({});
+      await updateEPG({ name: 'X' }, epg);
+      expect(API.updateEPG).toHaveBeenCalledWith(expect.objectContaining({ id: 99 }));
+    });
+
+    it('propagates rejection from API.updateEPG', async () => {
+      vi.mocked(API.updateEPG).mockRejectedValue(new Error('Update failed'));
+      await expect(updateEPG({}, makeEPG())).rejects.toThrow('Update failed');
+    });
+  });
+
+  // ── getDummyEpgFormInitialValues ───────────────────────────────────────────
+  describe('getDummyEpgFormInitialValues', () => {
+    it('returns an object with name, is_active, source_type, and custom_properties', () => {
+      const result = getDummyEpgFormInitialValues();
+      expect(result).toMatchObject({
+        name:        expect.any(String),
+        is_active:   expect.any(Boolean),
+        source_type: 'dummy',
+      });
+      expect(result.custom_properties).toBeDefined();
+    });
+
+    it('sets is_active to true by default', () => {
+      expect(getDummyEpgFormInitialValues().is_active).toBe(true);
+    });
+
+    it('sets include_date to true by default', () => {
+      expect(getDummyEpgFormInitialValues().custom_properties.include_date).toBe(true);
+    });
+
+    it('sets include_live and include_new to false by default', () => {
+      const { custom_properties: cp } = getDummyEpgFormInitialValues();
+      expect(cp.include_live).toBe(false);
+      expect(cp.include_new).toBe(false);
+    });
+
+    it('defaults name_source to "channel"', () => {
+      expect(getDummyEpgFormInitialValues().custom_properties.name_source).toBe('channel');
+    });
+
+    it('defaults program_duration to 180', () => {
+      expect(getDummyEpgFormInitialValues().custom_properties.program_duration).toBe(180);
+    });
+
+    it('defaults stream_index to 1', () => {
+      expect(getDummyEpgFormInitialValues().custom_properties.stream_index).toBe(1);
+    });
+  });
+
+  // ── buildCustomProperties ──────────────────────────────────────────────────
+  describe('buildCustomProperties', () => {
+    it('returns defaults when called with no arguments', () => {
+      const result = buildCustomProperties();
+      expect(result.timezone).toBe('US/Eastern');
+      expect(result.program_duration).toBe(180);
+      expect(result.name_source).toBe('channel');
+      expect(result.stream_index).toBe(1);
+      expect(result.include_date).toBe(true);
+      expect(result.include_live).toBe(false);
+      expect(result.include_new).toBe(false);
+    });
+
+    it('preserves provided values over defaults', () => {
+      const custom = makeCustom({ timezone: 'US/Pacific', program_duration: 60 });
+      const result = buildCustomProperties(custom);
+      expect(result.timezone).toBe('US/Pacific');
+      expect(result.program_duration).toBe(60);
+    });
+
+    it('preserves include_date: false when explicitly set', () => {
+      const result = buildCustomProperties({ include_date: false });
+      expect(result.include_date).toBe(false);
+    });
+
+    it('preserves include_live: true when explicitly set', () => {
+      const result = buildCustomProperties({ include_live: true });
+      expect(result.include_live).toBe(true);
+    });
+
+    it('preserves include_new: true when explicitly set', () => {
+      const result = buildCustomProperties({ include_new: true });
+      expect(result.include_new).toBe(true);
+    });
+
+    it('maps all template fields', () => {
+      const custom = makeCustom({
+        title_template:                'T:{title}',
+        subtitle_template:             'S:{title}',
+        description_template:          'D:{title}',
+        upcoming_title_template:       'U:{title}',
+        upcoming_description_template: 'UD:{title}',
+        ended_title_template:          'E:{title}',
+        ended_description_template:    'ED:{title}',
+        fallback_title_template:       'FT:{title}',
+        fallback_description_template: 'FD:{title}',
+        channel_logo_url:              'http://logo',
+        program_poster_url:            'http://poster',
+      });
+      const result = buildCustomProperties(custom);
+      expect(result.title_template).toBe('T:{title}');
+      expect(result.subtitle_template).toBe('S:{title}');
+      expect(result.description_template).toBe('D:{title}');
+      expect(result.upcoming_title_template).toBe('U:{title}');
+      expect(result.upcoming_description_template).toBe('UD:{title}');
+      expect(result.ended_title_template).toBe('E:{title}');
+      expect(result.ended_description_template).toBe('ED:{title}');
+      expect(result.fallback_title_template).toBe('FT:{title}');
+      expect(result.fallback_description_template).toBe('FD:{title}');
+      expect(result.channel_logo_url).toBe('http://logo');
+      expect(result.program_poster_url).toBe('http://poster');
+    });
+
+    it('falls back to empty string for missing string fields', () => {
+      const result = buildCustomProperties({});
+      expect(result.title_pattern).toBe('');
+      expect(result.time_pattern).toBe('');
+      expect(result.date_pattern).toBe('');
+      expect(result.output_timezone).toBe('');
+      expect(result.sample_title).toBe('');
+      expect(result.category).toBe('');
+    });
+  });
+
+  // ── validateCustomTitlePattern ─────────────────────────────────────────────
+  describe('validateCustomTitlePattern', () => {
+    it('returns an error message when value is empty', () => {
+      expect(validateCustomTitlePattern('')).toBeTruthy();
+    });
+
+    it('returns an error message when value is whitespace only', () => {
+      expect(validateCustomTitlePattern('   ')).toBeTruthy();
+    });
+
+    it('returns null for a valid regex pattern', () => {
+      expect(validateCustomTitlePattern('(?<title>.+)')).toBeNull();
+    });
+
+    it('returns an error message for an invalid regex', () => {
+      expect(validateCustomTitlePattern('(?<invalid')).toBeTruthy();
+    });
+
+    it('returns an error message when value is null', () => {
+      expect(validateCustomTitlePattern(null)).toBeTruthy();
+    });
+
+    it('returns an error message when value is undefined', () => {
+      expect(validateCustomTitlePattern(undefined)).toBeTruthy();
+    });
+
+    it('returns null for a complex valid regex with named groups', () => {
+      expect(validateCustomTitlePattern('(?<title>[A-Z].+)\\s(?<time>\\d+:\\d+)')).toBeNull();
+    });
+  });
+
+  // ── validateCustomNameSource ───────────────────────────────────────────────
+  describe('validateCustomNameSource', () => {
+    it('returns an error message when value is empty string', () => {
+      expect(validateCustomNameSource('')).toBeTruthy();
+    });
+
+    it('returns an error message when value is null', () => {
+      expect(validateCustomNameSource(null)).toBeTruthy();
+    });
+
+    it('returns an error message when value is undefined', () => {
+      expect(validateCustomNameSource(undefined)).toBeTruthy();
+    });
+
+    it('returns null for "channel"', () => {
+      expect(validateCustomNameSource('channel')).toBeNull();
+    });
+
+    it('returns null for "stream"', () => {
+      expect(validateCustomNameSource('stream')).toBeNull();
+    });
+  });
+
+  // ── validateCustomStreamIndex (if exported) ────────────────────────────────
+  describe('validateCustomStreamIndex', () => {
+    const streamValues = { custom_properties: { name_source: 'stream' } };
+    const channelValues = { custom_properties: { name_source: 'channel' } };
+
+    it('returns null for a positive integer when name_source is stream', () => {
+      expect(validateCustomStreamIndex(streamValues, 1)).toBeNull();
+    });
+
+    it('returns null for a large positive integer when name_source is stream', () => {
+      expect(validateCustomStreamIndex(streamValues, 10)).toBeNull();
+    });
+
+    it('returns an error for 0 when name_source is stream', () => {
+      expect(validateCustomStreamIndex(streamValues, 0)).toBeTruthy();
+    });
+
+    it('returns an error for a negative number when name_source is stream', () => {
+      expect(validateCustomStreamIndex(streamValues, -1)).toBeTruthy();
+    });
+
+    it('returns an error for null value when name_source is stream', () => {
+      expect(validateCustomStreamIndex(streamValues, null)).toBeTruthy();
+    });
+
+    it('returns an error for undefined value when name_source is stream', () => {
+      expect(validateCustomStreamIndex(streamValues, undefined)).toBeTruthy();
+    });
+
+    it('returns null regardless of value when name_source is channel', () => {
+      expect(validateCustomStreamIndex(channelValues, 0)).toBeNull();
+      expect(validateCustomStreamIndex(channelValues, -1)).toBeNull();
+      expect(validateCustomStreamIndex(channelValues, null)).toBeNull();
+    });
+
+    it('returns null when custom_properties is missing', () => {
+      expect(validateCustomStreamIndex({}, 0)).toBeNull();
+    });
+  });
+
+  // ── matchPattern ───────────────────────────────────────────────────────────
+  describe('matchPattern', () => {
+    it('returns matched: false and no error when pattern is empty', () => {
+      const result = matchPattern('', 'Test Show 9:00 PM');
+      expect(result.matched).toBe(false);
+      expect(result.error).toBeFalsy();
+    });
+
+    it('returns matched: true with named groups when pattern matches', () => {
+      const result = matchPattern('(?<title>Test Show)', 'Test Show 9:00 PM');
+      expect(result.matched).toBe(true);
+      expect(result.groups).toMatchObject({ title: 'Test Show' });
+      expect(result.error).toBeFalsy();
+    });
+
+    it('returns matched: false with no error when pattern does not match', () => {
+      const result = matchPattern('(?<title>No Match)', 'Test Show 9:00 PM');
+      expect(result.matched).toBe(false);
+      expect(result.error).toBeFalsy();
+    });
+
+    it('returns an error string when regex is invalid', () => {
+      const result = matchPattern('(?<invalid', 'Test Show');
+      expect(result.matched).toBe(false);
+      expect(result.error).toBeTruthy();
+    });
+
+    it('uses the provided errorLabel in the error message', () => {
+      const result = matchPattern('(?<bad', 'sample', 'Time Pattern Error');
+      expect(result.error).toContain('Time Pattern Error');
+    });
+
+    it('returns matched: false when sample is empty', () => {
+      const result = matchPattern('(?<title>.+)', '');
+      expect(result.matched).toBe(false);
+    });
+
+    it('captures multiple named groups', () => {
+      const result = matchPattern(
+        '(?<title>.+?)\\s(?<hour>\\d+):(?<minute>\\d+)',
+        'Test Show 9:00'
+      );
+      expect(result.matched).toBe(true);
+      expect(result.groups).toMatchObject({ title: 'Test Show', hour: '9', minute: '00' });
+    });
+  });
+
+  // ── addNormalizedGroups ────────────────────────────────────────────────────
+  describe('addNormalizedGroups', () => {
+    it('returns an empty object when groups is empty', () => {
+      expect(addNormalizedGroups({})).toEqual({});
+    });
+
+    it('preserves original group keys', () => {
+      const result = addNormalizedGroups({ title: 'Test Show' });
+      expect(result.title).toBe('Test Show');
+    });
+
+    it('adds a _normalize key for each group', () => {
+      const result = addNormalizedGroups({ title: 'Test Show' });
+      expect(result.title_normalize).toBeDefined();
+    });
+
+    it('normalizes accented characters', () => {
+      const result = addNormalizedGroups({ title: 'Héllo Wörld' });
+      expect(result.title_normalize).not.toContain('é');
+      expect(result.title_normalize).not.toContain('ö');
+    });
+
+    it('adds normalized keys for multiple groups', () => {
+      const result = addNormalizedGroups({ title: 'Show', subtitle: 'Épilogue' });
+      expect(result.title_normalize).toBeDefined();
+      expect(result.subtitle_normalize).toBeDefined();
+    });
+  });
+
+  // ── applyTemplates ─────────────────────────────────────────────────────────
+  describe('applyTemplates', () => {
+    const templates = {
+      titleTemplate:               '{title}',
+      subtitleTemplate:            '{subtitle}',
+      descriptionTemplate:         '{title} - {subtitle}',
+      upcomingTitleTemplate:       'Upcoming: {title}',
+      upcomingDescriptionTemplate: 'Details for {title}',
+      endedTitleTemplate:          'Ended: {title}',
+      endedDescriptionTemplate:    'Summary of {title}',
+      channelLogoUrl:              'http://logo/{title}',
+      programPosterUrl:            'http://poster/{title}',
+    };
+
+    const groups = { title: 'Test Show', subtitle: 'Pilot' };
+
+    it('returns an empty/falsy result when hasMatch is false', () => {
+      const result = applyTemplates(templates, groups, false);
+      expect(result.formattedTitle).toBeFalsy();
+    });
+
+    it('fills {title} placeholder in titleTemplate', () => {
+      const result = applyTemplates(templates, groups, true);
+      expect(result.formattedTitle).toBe('Test Show');
+    });
+
+    it('fills multiple placeholders in descriptionTemplate', () => {
+      const result = applyTemplates(templates, groups, true);
+      expect(result.formattedDescription).toBe('Test Show - Pilot');
+    });
+
+    it('fills upcomingTitleTemplate', () => {
+      const result = applyTemplates(templates, groups, true);
+      expect(result.formattedUpcomingTitle).toBe('Upcoming: Test Show');
+    });
+
+    it('fills endedTitleTemplate', () => {
+      const result = applyTemplates(templates, groups, true);
+      expect(result.formattedEndedTitle).toBe('Ended: Test Show');
+    });
+
+    it('fills channelLogoUrl', () => {
+      const result = applyTemplates(templates, groups, true);
+      expect(result.formattedChannelLogoUrl).toBe('http://logo/Test%20Show');
+    });
+
+    it('fills programPosterUrl', () => {
+      const result = applyTemplates(templates, groups, true);
+      expect(result.formattedProgramPosterUrl).toBe('http://poster/Test%20Show');
+    });
+
+    it('returns empty string for template that has no matching placeholder', () => {
+      const result = applyTemplates(
+        { ...templates, subtitleTemplate: '{nonexistent}' },
+        groups,
+        true
+      );
+      // placeholder not in groups — expect either empty or the literal token
+      expect(typeof result.formattedSubtitle).toBe('string');
+    });
+
+    it('returns an object with all expected keys', () => {
+      const result = applyTemplates(templates, groups, true);
+      expect(result).toHaveProperty('formattedTitle');
+      expect(result).toHaveProperty('formattedSubtitle');
+      expect(result).toHaveProperty('formattedDescription');
+      expect(result).toHaveProperty('formattedUpcomingTitle');
+      expect(result).toHaveProperty('formattedUpcomingDescription');
+      expect(result).toHaveProperty('formattedEndedTitle');
+      expect(result).toHaveProperty('formattedEndedDescription');
+      expect(result).toHaveProperty('formattedChannelLogoUrl');
+      expect(result).toHaveProperty('formattedProgramPosterUrl');
+    });
+  });
+
+  // ── buildTimePlaceholders ──────────────────────────────────────────────────
+  describe('buildTimePlaceholders', () => {
+    beforeEach(() => {
+      // Provide realistic return values from dateTimeUtils
+      vi.mocked(dateTimeUtils.getHour).mockReturnValue(21);    // 9 PM
+      vi.mocked(dateTimeUtils.getMinute).mockReturnValue(0);
+      vi.mocked(dateTimeUtils.getDay).mockReturnValue(15);
+      vi.mocked(dateTimeUtils.getMonth).mockReturnValue(5);    // June (0-indexed)
+      vi.mocked(dateTimeUtils.getYear).mockReturnValue(2024);
+      vi.mocked(dateTimeUtils.format).mockImplementation((dt, fmt) => fmt);
+      vi.mocked(dateTimeUtils.setHour).mockImplementation((dt) => dt);
+      vi.mocked(dateTimeUtils.setMinute).mockImplementation((dt) => dt);
+      vi.mocked(dateTimeUtils.setSecond).mockImplementation((dt) => dt);
+      vi.mocked(dateTimeUtils.setTz).mockImplementation((dt) => dt);
+      vi.mocked(dateTimeUtils.getNow).mockReturnValue('2024-06-15T21:00:00Z');
+    });
+
+    it('returns an object when given valid time groups', () => {
+      const timeGroups = { hour: '9', minute: '00', ampm: 'PM' };
+      const result = buildTimePlaceholders(timeGroups, {}, 'US/Eastern', '', 180);
+      expect(result).toBeDefined();
+      expect(typeof result).toBe('object');
+    });
+
+    it('returns starttime key when time groups have hour and minute', () => {
+      const timeGroups = { hour: '9', minute: '00', ampm: 'PM' };
+      const result = buildTimePlaceholders(timeGroups, {}, 'US/Eastern', '', 180);
+      expect(result).toHaveProperty('starttime');
+    });
+
+    it('returns endtime key calculated from duration', () => {
+      const timeGroups = { hour: '9', minute: '00', ampm: 'PM' };
+      const result = buildTimePlaceholders(timeGroups, {}, 'US/Eastern', '', 180);
+      expect(result).toHaveProperty('endtime');
+    });
+
+    it('returns empty object when timeGroups has no hour', () => {
+      const result = buildTimePlaceholders({}, {}, 'US/Eastern', '', 180);
+      expect(Object.keys(result).length).toBe(0);
+    });
+
+    it('returns empty object when timeGroups is null', () => {
+      const result = buildTimePlaceholders(null, {}, 'US/Eastern', '', 180);
+      expect(Object.keys(result).length).toBe(0);
+    });
+
+    it('incorporates date groups when provided', () => {
+      const timeGroups = { hour: '9', minute: '00' };
+      const dateGroups = { year: '2024', month: '06', day: '15' };
+      const result = buildTimePlaceholders(timeGroups, dateGroups, 'US/Eastern', '', 180);
+      expect(result).toBeDefined();
+    });
+  });
+});
\ No newline at end of file

From 14d1cc26d772a399cc9c940d3ff53249d52712a3 Mon Sep 17 00:00:00 2001
From: Nick Sandstrom <32273437+nick4810@users.noreply.github.com>
Date: Wed, 8 Apr 2026 23:14:44 -0700
Subject: [PATCH 127/172] Added tests for form components

---
 .../forms/__tests__/AccountInfoModal.test.jsx | 446 ++++++++
 .../__tests__/AssignChannelNumbers.test.jsx   | 334 ++++++
 .../forms/__tests__/Channel.test.jsx          | 989 ++++++++++++++++++
 .../forms/__tests__/ChannelBatch.test.jsx     | 846 +++++++++++++++
 .../forms/__tests__/ChannelGroup.test.jsx     | 395 +++++++
 .../forms/__tests__/Connection.test.jsx       | 814 ++++++++++++++
 .../forms/__tests__/CronBuilder.test.jsx      | 447 ++++++++
 .../forms/__tests__/DummyEPG.test.jsx         | 746 +++++++++++++
 .../components/forms/__tests__/EPG.test.jsx   | 519 +++++++++
 9 files changed, 5536 insertions(+)
 create mode 100644 frontend/src/components/forms/__tests__/AccountInfoModal.test.jsx
 create mode 100644 frontend/src/components/forms/__tests__/AssignChannelNumbers.test.jsx
 create mode 100644 frontend/src/components/forms/__tests__/Channel.test.jsx
 create mode 100644 frontend/src/components/forms/__tests__/ChannelBatch.test.jsx
 create mode 100644 frontend/src/components/forms/__tests__/ChannelGroup.test.jsx
 create mode 100644 frontend/src/components/forms/__tests__/Connection.test.jsx
 create mode 100644 frontend/src/components/forms/__tests__/CronBuilder.test.jsx
 create mode 100644 frontend/src/components/forms/__tests__/DummyEPG.test.jsx
 create mode 100644 frontend/src/components/forms/__tests__/EPG.test.jsx

diff --git a/frontend/src/components/forms/__tests__/AccountInfoModal.test.jsx b/frontend/src/components/forms/__tests__/AccountInfoModal.test.jsx
new file mode 100644
index 00000000..92117a3c
--- /dev/null
+++ b/frontend/src/components/forms/__tests__/AccountInfoModal.test.jsx
@@ -0,0 +1,446 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import AccountInfoModal from '../AccountInfoModal';
+
+// ── Store mocks ────────────────────────────────────────────────────────────────
+vi.mock('../../../store/playlists', () => ({ default: vi.fn() }));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../utils/notificationUtils.js', () => ({
+  showNotification: vi.fn(),
+}));
+
+vi.mock('../../../utils/forms/AccountInfoModalUtils.js', () => ({
+  formatTimestamp: vi.fn(),
+  getTimeRemaining: vi.fn(),
+  refreshAccountInfo: vi.fn(),
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  ActionIcon: ({ children, onClick, loading, disabled }) => (
+    <button
+      data-testid="action-icon"
+      onClick={onClick}
+      disabled={disabled || loading}
+      data-loading={loading}
+    >
+      {children}
+    </button>
+  ),
+  Alert: ({ title, children, color }) => (
+    <div data-testid="alert" data-color={color}>
+      <span data-testid="alert-title">{title}</span>
+      <span>{children}</span>
+    </div>
+  ),
+  Badge: ({ children, color }) => (
+    <span data-testid="badge" data-color={color}>
+      {children}
+    </span>
+  ),
+  Box: ({ children }) => <div>{children}</div>,
+  Center: ({ children }) => <div>{children}</div>,
+  Divider: () => <hr data-testid="divider" />,
+  Group: ({ children }) => <div>{children}</div>,
+  Modal: ({ children, opened, onClose, title }) =>
+    opened ? (
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
+        <button data-testid="modal-close" onClick={onClose}>
+          ×
+        </button>
+        {children}
+      </div>
+    ) : null,
+  Stack: ({ children }) => <div>{children}</div>,
+  Table: ({ children }) => <table>{children}</table>,
+  TableTbody: ({ children }) => <tbody>{children}</tbody>,
+  TableTd: ({ children }) => <td>{children}</td>,
+  TableTr: ({ children }) => <tr>{children}</tr>,
+  Text: ({ children }) => <span>{children}</span>,
+  Tooltip: ({ children, label }) => (
+    <div data-tooltip={label}>{children}</div>
+  ),
+}));
+
+// ── lucide-react ───────────────────────────────────────────────────────────────
+vi.mock('lucide-react', () => ({
+  AlertTriangle: () => <svg data-testid="icon-alert-triangle" />,
+  CheckCircle: () => <svg data-testid="icon-check-circle" />,
+  Clock: () => <svg data-testid="icon-clock" />,
+  Info: () => <svg data-testid="icon-info" />,
+  RefreshCw: () => <svg data-testid="icon-refresh-cw" />,
+  Users: () => <svg data-testid="icon-users" />,
+  XCircle: () => <svg data-testid="icon-x-circle" />,
+}));
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Imports after mocks
+// ──────────────────────────────────────────────────────────────────────────────
+import usePlaylistsStore from '../../../store/playlists';
+import { showNotification } from '../../../utils/notificationUtils.js';
+import {
+  formatTimestamp,
+  getTimeRemaining,
+  refreshAccountInfo,
+} from '../../../utils/forms/AccountInfoModalUtils.js';
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ──────────────────────────────────────────────────────────────────────────────
+const makeUserInfo = (overrides = {}) => ({
+  username: 'testuser',
+  status: 'Active',
+  exp_date: '9999999999',
+  max_connections: '2',
+  active_cons: '1',
+  created_at: '1700000000',
+  ...overrides,
+});
+
+const makeProfile = (overrides = {}) => ({
+  id: 'profile-1',
+  account: { id: 'account-1', is_xtream_codes: true },
+  custom_properties: {
+    user_info: makeUserInfo(),
+  },
+  ...overrides,
+});
+
+const setupMocks = ({
+                      profiles = {},
+                      timeRemaining = '10 days 5 hours',
+                      formattedTimestamp = 'Nov 14, 2023',
+                    } = {}) => {
+  vi.mocked(usePlaylistsStore).mockImplementation((sel) =>
+    sel({ profiles })
+  );
+  vi.mocked(getTimeRemaining).mockReturnValue(timeRemaining);
+  vi.mocked(formatTimestamp).mockReturnValue(formattedTimestamp);
+  vi.mocked(refreshAccountInfo).mockResolvedValue({ success: true });
+};
+
+const defaultProps = (overrides = {}) => ({
+  isOpen: true,
+  onClose: vi.fn(),
+  profile: makeProfile(),
+  onRefresh: vi.fn(),
+  ...overrides,
+});
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('AccountInfoModal', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── Visibility ─────────────────────────────────────────────────────────────
+
+  describe('visibility', () => {
+    it('renders the modal when isOpen is true', () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('does not render the modal when isOpen is false', () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps({ isOpen: false })} />);
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+    });
+
+    it('calls onClose when modal close button is clicked', () => {
+      setupMocks();
+      const onClose = vi.fn();
+      render(<AccountInfoModal {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByTestId('modal-close'));
+      expect(onClose).toHaveBeenCalled();
+    });
+  });
+
+  // ── Rendering with profile data ────────────────────────────────────────────
+
+  describe('rendering with profile data', () => {
+    it('renders the username', () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByText('testuser')).toBeInTheDocument();
+    });
+
+    it('renders the connection info', () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByText('1 / 2')).toBeInTheDocument();
+    });
+
+    it('renders formatted created_at timestamp', () => {
+      setupMocks({ formattedTimestamp: 'Nov 14, 2023' });
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(formatTimestamp).toHaveBeenCalledWith('1700000000');
+      expect(screen.getAllByText('Nov 14, 2023').length).toBeGreaterThan(0);
+    });
+
+    it('renders time remaining', () => {
+      setupMocks({ timeRemaining: '10 days 5 hours' });
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByText(/10 days 5 hours/)).toBeInTheDocument();
+    });
+
+    it('renders the refresh action icon', () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByTestId('action-icon')).toBeInTheDocument();
+    });
+
+    it('renders the refresh icon inside the action icon', () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByTestId('icon-refresh-cw')).toBeInTheDocument();
+    });
+  });
+
+  // ── Store-based profile resolution ────────────────────────────────────────
+
+  describe('store-based profile resolution', () => {
+    it('uses fresh profile from store when available', () => {
+      const freshProfile = makeProfile({
+        custom_properties: {
+          user_info: makeUserInfo({ username: 'freshuser' }),
+        },
+      });
+      setupMocks({
+        profiles: { 'account-1': [freshProfile] },
+      });
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByText('freshuser')).toBeInTheDocument();
+    });
+
+    it('falls back to passed profile when not found in store', () => {
+      setupMocks({ profiles: { 'account-1': [] } });
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByText('testuser')).toBeInTheDocument();
+    });
+
+    it('falls back to passed profile when profiles is empty', () => {
+      setupMocks({ profiles: {} });
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByText('testuser')).toBeInTheDocument();
+    });
+
+    it('falls back to passed profile when profile has no id', () => {
+      setupMocks();
+      const profileNoId = makeProfile({ id: undefined });
+      render(<AccountInfoModal {...defaultProps({ profile: profileNoId })} />);
+      // Should not throw and should render without crash
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('falls back to passed profile when profile has no account id', () => {
+      setupMocks();
+      const profileNoAccountId = makeProfile({ account: {} });
+      render(
+        <AccountInfoModal {...defaultProps({ profile: profileNoAccountId })} />
+      );
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+  });
+
+  // ── Status badge ───────────────────────────────────────────────────────────
+
+  describe('status badge', () => {
+    it('renders a badge for Active status', () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps()} />);
+      const badges = screen.getAllByTestId('badge');
+      const activeOrStatusBadge = badges.find((b) =>
+        b.textContent.toLowerCase().includes('active')
+      );
+      expect(activeOrStatusBadge).toBeInTheDocument();
+    });
+
+    it('renders a badge for Banned status', () => {
+      setupMocks();
+      const profile = makeProfile({
+        custom_properties: {
+          user_info: makeUserInfo({ status: 'Banned' }),
+        },
+      });
+      render(<AccountInfoModal {...defaultProps({ profile })} />);
+      const badges = screen.getAllByTestId('badge');
+      const bannedBadge = badges.find((b) =>
+        b.textContent.toLowerCase().includes('banned')
+      );
+      expect(bannedBadge).toBeInTheDocument();
+    });
+
+    it('renders a badge for Disabled status', () => {
+      setupMocks();
+      const profile = makeProfile({
+        custom_properties: {
+          user_info: makeUserInfo({ status: 'Disabled' }),
+        },
+      });
+      render(<AccountInfoModal {...defaultProps({ profile })} />);
+      const badges = screen.getAllByTestId('badge');
+      const disabledBadge = badges.find((b) =>
+        b.textContent.toLowerCase().includes('disabled')
+      );
+      expect(disabledBadge).toBeInTheDocument();
+    });
+  });
+
+  // ── Expiry / time remaining ────────────────────────────────────────────────
+
+  describe('expiry display', () => {
+    it('renders "Expired" when getTimeRemaining returns "Expired"', () => {
+      setupMocks({ timeRemaining: 'Expired' });
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByText('Expired')).toBeInTheDocument();
+    });
+
+    it('shows an alert when account is expired', () => {
+      setupMocks({ timeRemaining: 'Expired' });
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.getByTestId('alert')).toBeInTheDocument();
+    });
+
+    it('does not show an expiry alert when account is not expired', () => {
+      setupMocks({ timeRemaining: '5 days 2 hours' });
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+
+    it('calls getTimeRemaining with exp_date', () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps()} />);
+      expect(getTimeRemaining).toHaveBeenCalledWith('9999999999');
+    });
+
+    it('handles null exp_date gracefully', () => {
+      setupMocks({ timeRemaining: null });
+      const profile = makeProfile({
+        custom_properties: {
+          user_info: makeUserInfo({ exp_date: null }),
+        },
+      });
+      render(<AccountInfoModal {...defaultProps({ profile })} />);
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+  });
+
+  // ── Refresh button ─────────────────────────────────────────────────────────
+
+  describe('refresh button', () => {
+    it('calls refreshAccountInfo when refresh button is clicked', async () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('action-icon'));
+      await waitFor(() => {
+        expect(refreshAccountInfo).toHaveBeenCalled();
+      });
+    });
+
+    it('shows success notification when refresh succeeds', async () => {
+      setupMocks();
+      vi.mocked(refreshAccountInfo).mockResolvedValue({ success: true });
+      render(<AccountInfoModal {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('action-icon'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'green' })
+        );
+      });
+    });
+
+    it('shows error notification when refresh returns success: false', async () => {
+      setupMocks();
+      vi.mocked(refreshAccountInfo).mockResolvedValue({ success: false });
+      render(<AccountInfoModal {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('action-icon'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red' })
+        );
+      });
+    });
+
+    it('calls onRefresh after successful refresh', async () => {
+      vi.useFakeTimers();
+      setupMocks();
+      const onRefresh = vi.fn();
+      render(<AccountInfoModal {...defaultProps({ onRefresh })} />);
+      fireEvent.click(screen.getByTestId('action-icon'));
+
+      // Wait for the async handleRefresh to complete
+      await vi.runAllTimersAsync();
+
+      expect(onRefresh).toHaveBeenCalled();
+      vi.useRealTimers();
+    });
+
+    it('shows error notification when profile id is missing', async () => {
+      setupMocks();
+      const profileNoId = makeProfile({ id: undefined });
+      render(<AccountInfoModal {...defaultProps({ profile: profileNoId })} />);
+      fireEvent.click(screen.getByTestId('action-icon'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red' })
+        );
+      });
+      expect(refreshAccountInfo).not.toHaveBeenCalled();
+    });
+
+    it('disables the refresh button while refreshing', async () => {
+      setupMocks();
+      vi.mocked(refreshAccountInfo).mockImplementation(
+        () => new Promise((resolve) => setTimeout(() => resolve({ success: true }), 200))
+      );
+      render(<AccountInfoModal {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('action-icon'));
+      expect(screen.getByTestId('action-icon')).toBeDisabled();
+      await waitFor(() => {
+        expect(screen.getByTestId('action-icon')).not.toBeDisabled();
+      });
+    });
+
+    it('re-enables the refresh button after refresh fails', async () => {
+      setupMocks();
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      vi.mocked(refreshAccountInfo).mockRejectedValue(new Error('fail'));
+      render(<AccountInfoModal {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('action-icon'));
+      await waitFor(() => {
+        expect(screen.getByTestId('action-icon')).not.toBeDisabled();
+      });
+      consoleSpy.mockRestore();
+    });
+  });
+
+  // ── Null / missing profile ─────────────────────────────────────────────────
+
+  describe('null or missing profile', () => {
+    it('renders without crashing when profile is null', () => {
+      setupMocks();
+      render(<AccountInfoModal {...defaultProps({ profile: null })} />);
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('renders without crashing when user_info is missing', () => {
+      setupMocks();
+      const profile = makeProfile({ custom_properties: {} });
+      render(<AccountInfoModal {...defaultProps({ profile })} />);
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('renders without crashing when custom_properties is missing', () => {
+      setupMocks();
+      const profile = makeProfile({ custom_properties: undefined });
+      render(<AccountInfoModal {...defaultProps({ profile })} />);
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/__tests__/AssignChannelNumbers.test.jsx b/frontend/src/components/forms/__tests__/AssignChannelNumbers.test.jsx
new file mode 100644
index 00000000..2bec2d7b
--- /dev/null
+++ b/frontend/src/components/forms/__tests__/AssignChannelNumbers.test.jsx
@@ -0,0 +1,334 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import AssignChannelNumbers from '../AssignChannelNumbers';
+
+// ── API mock ───────────────────────────────────────────────────────────────────
+vi.mock('../../../api', () => ({
+  default: {
+    assignChannelNumbers: vi.fn(),
+    requeryChannels: vi.fn(),
+  },
+}));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../utils/notificationUtils.js', () => ({
+  showNotification: vi.fn(),
+}));
+
+// ── Mantine form ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({
+  useForm: vi.fn(() => ({
+    getValues: vi.fn(() => ({ starting_number: 1 })),
+    getInputProps: vi.fn(() => ({})),
+    onSubmit: vi.fn((fn) => fn),
+  })),
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  Button: ({ children, onClick, disabled, loading, variant, color, leftSection }) => (
+    <button
+      data-testid="button"
+      onClick={onClick}
+      disabled={disabled || loading}
+      data-variant={variant}
+      data-color={color}
+      data-loading={loading}
+    >
+      {leftSection}
+      {children}
+    </button>
+  ),
+  Modal: ({ children, opened, onClose, title }) =>
+    opened ? (
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
+        <button data-testid="modal-close" onClick={onClose}>
+          ×
+        </button>
+        {children}
+      </div>
+    ) : null,
+  Text: ({ children }) => <span>{children}</span>,
+  Group: ({ children }) => <div>{children}</div>,
+  Flex: ({ children }) => <div>{children}</div>,
+  NumberInput: ({ label, value, onChange, min }) => (
+    <input
+      data-testid="number-input"
+      type="number"
+      aria-label={label}
+      value={value ?? ''}
+      min={min}
+      onChange={(e) => onChange?.(Number(e.target.value))}
+    />
+  ),
+}));
+
+// ── lucide-react ───────────────────────────────────────────────────────────────
+vi.mock('lucide-react', () => ({
+  ListOrdered: () => <svg data-testid="icon-list-ordered" />,
+}));
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Imports after mocks
+// ──────────────────────────────────────────────────────────────────────────────
+import API from '../../../api';
+import { showNotification } from '../../../utils/notificationUtils.js';
+import { useForm } from '@mantine/form';
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ──────────────────────────────────────────────────────────────────────────────
+const defaultProps = (overrides = {}) => ({
+  channelIds: ['ch-1', 'ch-2', 'ch-3'],
+  isOpen: true,
+  onClose: vi.fn(),
+  ...overrides,
+});
+
+const setupMocks = ({ startingNumber = 1, getValues } = {}) => {
+  vi.mocked(useForm).mockReturnValue({
+    getValues: getValues ?? vi.fn(() => ({ starting_number: startingNumber })),
+    getInputProps: vi.fn(() => ({})),
+    onSubmit: vi.fn((fn) => fn),
+    key: vi.fn(),
+  });
+  vi.mocked(API.assignChannelNumbers).mockResolvedValue({
+    message: 'Channels assigned successfully',
+  });
+  vi.mocked(API.requeryChannels).mockReturnValue(undefined);
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('AssignChannelNumbers', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── Visibility ─────────────────────────────────────────────────────────────
+
+  describe('visibility', () => {
+    it('renders the modal when isOpen is true', () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('does not render the modal when isOpen is false', () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps({ isOpen: false })} />);
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+    });
+
+    it('calls onClose when modal close button is clicked', () => {
+      setupMocks();
+      const onClose = vi.fn();
+      render(<AssignChannelNumbers {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByTestId('modal-close'));
+      expect(onClose).toHaveBeenCalled();
+    });
+  });
+
+  // ── Rendering ──────────────────────────────────────────────────────────────
+
+  describe('rendering', () => {
+    it('renders the modal title', () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      expect(screen.getByTestId('modal-title')).toBeInTheDocument();
+    });
+
+    it('renders the number input', () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      expect(screen.getByTestId('number-input')).toBeInTheDocument();
+    });
+
+    it('renders the submit button', () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      expect(screen.getByTestId('button')).toBeInTheDocument();
+    });
+
+    it('renders the ListOrdered icon', () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      expect(screen.getByTestId('icon-list-ordered')).toBeInTheDocument();
+    });
+  });
+
+  // ── Form submission ────────────────────────────────────────────────────────
+
+  describe('form submission', () => {
+    it('calls assignChannelNumbers with channelIds and starting_number on submit', async () => {
+      setupMocks({ startingNumber: 5 });
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(API.assignChannelNumbers).toHaveBeenCalledWith(
+          ['ch-1', 'ch-2', 'ch-3'],
+          5
+        );
+      });
+    });
+
+    it('calls assignChannelNumbers with default starting_number of 1', async () => {
+      setupMocks({ startingNumber: 1 });
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(API.assignChannelNumbers).toHaveBeenCalledWith(
+          ['ch-1', 'ch-2', 'ch-3'],
+          1
+        );
+      });
+    });
+
+    it('calls requeryChannels after successful assignment', async () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(API.requeryChannels).toHaveBeenCalled();
+      });
+    });
+
+    it('calls onClose after successful assignment', async () => {
+      setupMocks();
+      const onClose = vi.fn();
+      render(<AssignChannelNumbers {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+    });
+
+    it('calls assignChannelNumbers exactly once per submit', async () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(API.assignChannelNumbers).toHaveBeenCalledTimes(1);
+      });
+    });
+  });
+
+  // ── Notifications ──────────────────────────────────────────────────────────
+
+  describe('notifications', () => {
+    it('shows success notification with API message on success', async () => {
+      setupMocks();
+      vi.mocked(API.assignChannelNumbers).mockResolvedValue({
+        message: 'Channels assigned successfully',
+      });
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({
+            title: 'Channels assigned successfully',
+            color: 'green.5',
+          })
+        );
+      });
+    });
+
+    it('shows fallback "Channels assigned" notification when message is absent', async () => {
+      setupMocks();
+      vi.mocked(API.assignChannelNumbers).mockResolvedValue({});
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({
+            title: 'Channels assigned',
+            color: 'green.5',
+          })
+        );
+      });
+    });
+
+    it('shows error notification when assignChannelNumbers throws', async () => {
+      setupMocks();
+      vi.mocked(API.assignChannelNumbers).mockRejectedValue(new Error('Server error'));
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red.5' })
+        );
+      });
+    });
+
+    it('does not show success notification when assignChannelNumbers throws', async () => {
+      setupMocks();
+      vi.mocked(API.assignChannelNumbers).mockRejectedValue(new Error('fail'));
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(showNotification).not.toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'green.5' })
+        );
+      });
+    });
+  });
+
+  // ── Error handling ─────────────────────────────────────────────────────────
+
+  describe('error handling', () => {
+    it('does not call requeryChannels when assignChannelNumbers throws', async () => {
+      setupMocks();
+      vi.mocked(API.assignChannelNumbers).mockRejectedValue(new Error('fail'));
+      render(<AssignChannelNumbers {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(API.requeryChannels).not.toHaveBeenCalled();
+      });
+    });
+
+    it('does not call onClose when assignChannelNumbers throws', async () => {
+      setupMocks();
+      const onClose = vi.fn();
+      vi.mocked(API.assignChannelNumbers).mockRejectedValue(new Error('fail'));
+      render(<AssignChannelNumbers {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(onClose).not.toHaveBeenCalled();
+      });
+    });
+
+    it('does not throw when channelIds is an empty array', async () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps({ channelIds: [] })} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(API.assignChannelNumbers).toHaveBeenCalledWith([], 1);
+      });
+    });
+  });
+
+  // ── channelIds prop ────────────────────────────────────────────────────────
+
+  describe('channelIds prop', () => {
+    it('passes a single channelId correctly', async () => {
+      setupMocks();
+      render(<AssignChannelNumbers {...defaultProps({ channelIds: ['ch-99'] })} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(API.assignChannelNumbers).toHaveBeenCalledWith(['ch-99'], 1);
+      });
+    });
+
+    it('passes all channelIds to assignChannelNumbers', async () => {
+      setupMocks();
+      const channelIds = ['ch-1', 'ch-2', 'ch-3', 'ch-4', 'ch-5'];
+      render(<AssignChannelNumbers {...defaultProps({ channelIds })} />);
+      fireEvent.click(screen.getByTestId('button'));
+      await waitFor(() => {
+        expect(API.assignChannelNumbers).toHaveBeenCalledWith(channelIds, 1);
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/__tests__/Channel.test.jsx b/frontend/src/components/forms/__tests__/Channel.test.jsx
new file mode 100644
index 00000000..212821f6
--- /dev/null
+++ b/frontend/src/components/forms/__tests__/Channel.test.jsx
@@ -0,0 +1,989 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+// ── Store mocks ────────────────────────────────────────────────────────────────
+vi.mock('../../../store/channels', () => ({ default: vi.fn() }));
+vi.mock('../../../store/streamProfiles', () => ({ default: vi.fn() }));
+vi.mock('../../../store/epgs', () => ({ default: vi.fn() }));
+vi.mock('../../../store/logos', () => ({ default: vi.fn() }));
+
+// ── Hook mocks ─────────────────────────────────────────────────────────────────
+vi.mock('../../../hooks/useSmartLogos', () => ({
+  useChannelLogoSelection: vi.fn(),
+}));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../utils/notificationUtils.js', () => ({
+  showNotification: vi.fn(),
+  updateNotification: vi.fn(),
+}));
+
+vi.mock('../../../utils/forms/ChannelUtils.js', () => ({
+  addChannel: vi.fn(),
+  createLogo: vi.fn(),
+  getChannelFormDefaultValues: vi.fn(),
+  getFormattedValues: vi.fn(),
+  handleEpgUpdate: vi.fn(),
+  matchChannelEpg: vi.fn(),
+  requeryChannels: vi.fn(),
+}));
+
+// ── Child component mocks ──────────────────────────────────────────────────────
+vi.mock('../ChannelGroup', () => ({
+  default: ({ isOpen, onClose }) =>
+    isOpen ? (
+      <div data-testid="channel-group-form">
+        <button data-testid="channel-group-close" onClick={() => onClose(null)}>
+          Close
+        </button>
+        <button
+          data-testid="channel-group-save"
+          onClick={() => onClose({ id: 99, name: 'New Group' })}
+        >
+          Save
+        </button>
+      </div>
+    ) : null,
+}));
+
+vi.mock('../Logo', () => ({
+  default: ({ isOpen, onClose, onSuccess }) =>
+    isOpen ? (
+      <div data-testid="logo-form">
+        <button data-testid="logo-form-close" onClick={onClose}>
+          Close
+        </button>
+        <button
+          data-testid="logo-form-success"
+          onClick={() => onSuccess({ logo: { id: 42, name: 'New Logo' } })}
+        >
+          Success
+        </button>
+      </div>
+    ) : null,
+}));
+
+vi.mock('../../LazyLogo', () => ({
+  default: ({ logoId, alt, style }) => (
+    <img data-testid="lazy-logo" data-logo-id={logoId} alt={alt} style={style} />
+  ),
+}));
+
+// ── Image mock ─────────────────────────────────────────────────────────────────
+vi.mock('../../../images/logo.png', () => ({ default: 'default-logo.png' }));
+
+// ── react-window mock ──────────────────────────────────────────────────────────
+vi.mock('react-window', () => ({
+  FixedSizeList: ({ children, itemCount }) => (
+    <div data-testid="fixed-size-list">
+      {Array.from({ length: itemCount }, (_, index) =>
+        children({ index, style: {} })
+      )}
+    </div>
+  ),
+}));
+
+// ── react-hook-form mock ───────────────────────────────────────────────────────
+vi.mock('react-hook-form', async (importOriginal) => {
+  const actual = await importOriginal();
+  return {
+    ...actual,
+    useForm: vi.fn(),
+  };
+});
+
+// ── @hookform/resolvers/yup mock ───────────────────────────────────────────────
+vi.mock('@hookform/resolvers/yup', () => ({
+  yupResolver: vi.fn(() => vi.fn()),
+}));
+
+// ── lucide-react mock ──────────────────────────────────────────────────────────
+vi.mock('lucide-react', () => ({
+  ListOrdered: () => <svg data-testid="icon-list-ordered" />,
+  SquarePlus: () => <svg data-testid="icon-square-plus" />,
+  X: () => <svg data-testid="icon-x" />,
+  Zap: () => <svg data-testid="icon-zap" />,
+}));
+
+// ── @mantine/core mock ─────────────────────────────────────────────────────────
+vi.mock('@mantine/core', async () => ({
+  ActionIcon: ({ children, onClick, disabled, title, style }) => (
+    <button
+      data-testid="action-icon"
+      onClick={onClick}
+      disabled={disabled}
+      title={title}
+      style={style}
+    >
+      {children}
+    </button>
+  ),
+  Box: ({ children, style }) => <div style={style}>{children}</div>,
+  Button: ({ children, onClick, disabled, loading, type, variant, color, leftSection, title }) => (
+    <button
+      onClick={onClick}
+      disabled={disabled || loading}
+      type={type}
+      data-variant={variant}
+      data-color={color}
+      data-loading={String(loading)}
+      title={title}
+    >
+      {leftSection}
+      {children}
+    </button>
+  ),
+  Center: ({ children, style }) => <div style={style}>{children}</div>,
+  Divider: ({ orientation, size }) => (
+    <hr data-orientation={orientation} data-size={size} />
+  ),
+  Flex: ({ children, gap, justify, align, mih }) => (
+    <div style={{ gap, justifyContent: justify, alignItems: align, minHeight: mih }}>
+      {children}
+    </div>
+  ),
+  Group: ({ children, gap, justify, align, style }) => (
+    <div style={{ gap, justifyContent: justify, alignItems: align, ...style }}>
+      {children}
+    </div>
+  ),
+  Modal: ({ children, opened, onClose, title }) =>
+    opened ? (
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
+        <button data-testid="modal-close" onClick={onClose}>
+          ×
+        </button>
+        {children}
+      </div>
+    ) : null,
+  NumberInput: ({ id, name, label, value, onChange, error }) => (
+    <div>
+      <label htmlFor={id}>{label}</label>
+      <input
+        id={id}
+        name={name}
+        type="number"
+        value={value ?? ''}
+        onChange={(e) => onChange(e.target.value === '' ? undefined : Number(e.target.value))}
+        data-testid={`number-input-${name}`}
+      />
+      {error && <span data-testid={`error-${name}`}>{error}</span>}
+    </div>
+  ),
+  Popover: ({ children, opened }) => (
+    <div data-testid="popover" data-opened={String(opened)}>
+      {children}
+    </div>
+  ),
+  PopoverDropdown: ({ children, onMouseDown }) => (
+    <div data-testid="popover-dropdown" onMouseDown={onMouseDown}>
+      {children}
+    </div>
+  ),
+  PopoverTarget: ({ children }) => <div data-testid="popover-target">{children}</div>,
+  ScrollArea: ({ children, style }) => <div style={style}>{children}</div>,
+  Select: ({ label, value, onChange, data, id, name, error }) => (
+    <div>
+      <label htmlFor={id ?? label}>{label}</label>
+      <select
+        id={id ?? label}
+        data-testid={`select-${name ?? label}`}
+        value={value ?? ''}
+        onChange={(e) => onChange(e.target.value)}
+      >
+        {(data ?? []).map((opt) => (
+          <option key={opt.value} value={opt.value}>
+            {opt.label}
+          </option>
+        ))}
+      </select>
+      {error && <span data-testid={`error-${name}`}>{error}</span>}
+    </div>
+  ),
+  Stack: ({ children, gap, align, justify, style }) => (
+    <div style={{ gap, alignItems: align, justifyContent: justify, ...style }}>
+      {children}
+    </div>
+  ),
+  Switch: ({ label, checked, onChange }) => (
+    <label>
+      <input
+        data-testid="switch-mature"
+        type="checkbox"
+        checked={checked}
+        onChange={onChange}
+      />
+      {label}
+    </label>
+  ),
+  Text: ({ children, size, c, style }) => (
+    <span data-size={size} data-color={c} style={style}>
+      {children}
+    </span>
+  ),
+  TextInput: ({ id, name, label, readOnly, value, onClick, onChange, error, autoFocus, placeholder, rightSection, ...rest }) => (
+    <div>
+      <label htmlFor={id}>{label}</label>
+      <input
+        id={id}
+        name={name}
+        data-testid={`text-input-${name}`}
+        readOnly={readOnly}
+        value={value ?? ''}
+        onClick={onClick}
+        onChange={onChange ?? (() => {})}
+        placeholder={placeholder}
+        autoFocus={autoFocus}
+        {...(rest.ref ? { ref: rest.ref } : {})}
+        {...(rest['data-error'] ? { 'data-error': rest['data-error'] } : {})}
+      />
+      {rightSection}
+      {error && <span data-testid={`error-${name}`}>{error}</span>}
+    </div>
+  ),
+  Tooltip: ({ children, label }) => (
+    <div data-tooltip={label}>{children}</div>
+  ),
+  UnstyledButton: ({ children, onClick }) => (
+    <button data-testid="unstyled-button" onClick={onClick}>
+      {children}
+    </button>
+  ),
+  useMantineTheme: () => ({
+    tailwind: { green: { 5: '#22c55e' } },
+  }),
+}));
+
+// ── Imports after mocks ────────────────────────────────────────────────────────
+import ChannelForm from '../Channel';
+import useChannelsStore from '../../../store/channels';
+import useStreamProfilesStore from '../../../store/streamProfiles';
+import useEPGsStore from '../../../store/epgs';
+import useLogosStore from '../../../store/logos';
+import { useChannelLogoSelection } from '../../../hooks/useSmartLogos';
+import { useForm } from 'react-hook-form';
+import * as ChannelUtils from '../../../utils/forms/ChannelUtils.js';
+import { showNotification, updateNotification } from '../../../utils/notificationUtils.js';
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+
+const makeFormMethods = (overrides = {}) => {
+  const watchValues = {
+    name: 'Test Channel',
+    channel_group_id: '1',
+    stream_profile_id: '0',
+    user_level: '0',
+    logo_id: '0',
+    epg_data_id: null,
+    channel_number: '',
+    tvg_id: '',
+    tvc_guide_stationid: '',
+    is_adult: false,
+    ...overrides.watchValues,
+  };
+
+  const register = vi.fn((name) => ({ name, ref: vi.fn() }));
+  const handleSubmit = vi.fn((fn) => (e) => { e?.preventDefault?.(); return fn(watchValues); });
+  const setValue = vi.fn();
+  const watch = vi.fn((key) => (key ? watchValues[key] : watchValues));
+  const reset = vi.fn();
+
+  return {
+    register,
+    handleSubmit,
+    setValue,
+    watch,
+    reset,
+    formState: { errors: {}, isSubmitting: false },
+    ...overrides,
+  };
+};
+
+const makeChannel = (overrides = {}) => ({
+  id: 'ch-1',
+  name: 'Test Channel',
+  channel_number: 101,
+  streams: [],
+  epg_data_id: null,
+  ...overrides,
+});
+
+const makeChannelGroups = () => ({
+  1: { id: 1, name: 'Sports' },
+  2: { id: 2, name: 'News' },
+});
+
+const makeStreamProfiles = () => [
+  { id: 1, name: 'HD Profile' },
+  { id: 2, name: 'SD Profile' },
+];
+
+const makeEpgs = () => ({
+  10: { id: 10, name: 'EPG Source 1', is_active: true },
+  11: { id: 11, name: 'EPG Source 2', is_active: true },
+  12: { id: 12, name: 'Inactive EPG', is_active: false },
+});
+
+const makeTvgs = () => [
+  { id: 'tvg-1', name: 'ESPN', tvg_id: 'espn.us', epg_source: 10, icon_url: 'http://example.com/espn.png' },
+  { id: 'tvg-2', name: 'CNN', tvg_id: 'cnn.us', epg_source: 11, icon_url: 'http://example.com/cnn.png' },
+];
+
+const makeTvgsById = () => ({
+  'tvg-1': { id: 'tvg-1', name: 'ESPN', tvg_id: 'espn.us', epg_source: 10, icon_url: 'http://example.com/espn.png' },
+  'tvg-2': { id: 'tvg-2', name: 'CNN', tvg_id: 'cnn.us', epg_source: 11, icon_url: 'http://example.com/cnn.png' },
+});
+
+const makeLogos = () => ({
+  42: { id: 42, name: 'ESPN Logo', url: 'http://example.com/espn.png', cache_url: '/cache/espn.png' },
+  43: { id: 43, name: 'CNN Logo', url: 'http://example.com/cnn.png', cache_url: '/cache/cnn.png' },
+});
+
+const makeChannelLogos = () => ({
+  42: { id: 42, name: 'ESPN Logo', cache_url: '/cache/espn.png' },
+  43: { id: 43, name: 'CNN Logo', cache_url: '/cache/cnn.png' },
+});
+
+/** Wire up all store and hook mocks with sensible defaults */
+const setupMocks = ({ formOverrides = {}, channel = null } = {}) => {
+  const formMethods = makeFormMethods(formOverrides);
+  vi.mocked(useForm).mockReturnValue(formMethods);
+
+  // ── Stable references — created ONCE, not recreated per selector call ──────
+  const channelGroups = makeChannelGroups();
+  const streamProfiles = makeStreamProfiles();
+  const epgs = makeEpgs();
+  const tvgs = makeTvgs();
+  const tvgsById = makeTvgsById();
+  const logos = makeLogos();
+  const channelLogos = makeChannelLogos();
+  const stableDefaults = {
+    name: channel?.name ?? '',
+    channel_group_id: '1',
+    stream_profile_id: '0',
+    user_level: '0',
+    logo_id: '0',
+    epg_data_id: channel?.epg_data_id ?? null,
+    channel_number: channel?.channel_number ?? '',
+    tvg_id: '',
+    tvc_guide_stationid: '',
+    is_adult: false,
+  };
+
+  vi.mocked(useChannelsStore).mockImplementation((sel) =>
+    sel({ channelGroups, fetchChannelProfiles: vi.fn() })
+  );
+  useChannelsStore.getState = vi.fn(() => ({ fetchChannelProfiles: vi.fn() }));
+
+  vi.mocked(useStreamProfilesStore).mockImplementation((sel) =>
+    sel({ profiles: streamProfiles })
+  );
+
+  vi.mocked(useEPGsStore).mockImplementation((sel) =>
+    sel({ epgs, tvgs, tvgsById })
+  );
+
+  vi.mocked(useLogosStore).mockImplementation((sel) =>
+    sel({ logos })
+  );
+
+  const mockEnsureLogosLoaded = vi.fn();
+  vi.mocked(useChannelLogoSelection).mockReturnValue({
+    logos: channelLogos,
+    ensureLogosLoaded: mockEnsureLogosLoaded,
+    isLoading: false,
+  });
+
+  // Same object reference every call — prevents useMemo from recalculating
+  vi.mocked(ChannelUtils.getChannelFormDefaultValues).mockReturnValue(stableDefaults);
+  vi.mocked(ChannelUtils.getFormattedValues).mockImplementation((v) => v);
+
+  return { formMethods, mockEnsureLogosLoaded };
+};
+
+const defaultProps = (overrides = {}) => ({
+  channel: null,
+  isOpen: true,
+  onClose: vi.fn(),
+  ...overrides,
+});
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+
+describe('ChannelForm', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── Visibility ─────────────────────────────────────────────────────────────
+
+  describe('visibility', () => {
+    it('renders the modal when isOpen is true', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('renders nothing when isOpen is false', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps({ isOpen: false })} />);
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+    });
+  });
+
+  // ── Basic rendering ────────────────────────────────────────────────────────
+
+  describe('basic rendering', () => {
+    it('renders the submit button', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByText('Submit')).toBeInTheDocument();
+    });
+
+    it('renders "Saving..." when isSubmitting is true', () => {
+      setupMocks({
+        formOverrides: { formState: { errors: {}, isSubmitting: true } },
+      });
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByText('Saving...')).toBeInTheDocument();
+    });
+
+    it('renders the Channel Name text input', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByTestId('text-input-name')).toBeInTheDocument();
+    });
+
+    it('renders Channel Group text input', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByTestId('text-input-channel_group_id')).toBeInTheDocument();
+    });
+
+    it('renders stream profile select with options', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      const select = screen.getByTestId('select-stream_profile_id');
+      expect(select).toBeInTheDocument();
+      expect(screen.getByText('HD Profile')).toBeInTheDocument();
+      expect(screen.getByText('SD Profile')).toBeInTheDocument();
+    });
+
+    it('renders the LazyLogo component', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByTestId('lazy-logo')).toBeInTheDocument();
+    });
+
+    it('renders "Upload or Create Logo" button', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByText('Upload or Create Logo')).toBeInTheDocument();
+    });
+
+    it('renders the Mature Content switch', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByTestId('switch-mature')).toBeInTheDocument();
+    });
+
+    it('renders the channel number input', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByTestId('number-input-channel_number')).toBeInTheDocument();
+    });
+
+    it('renders TVG-ID text input', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByTestId('text-input-tvg_id')).toBeInTheDocument();
+    });
+
+    it('renders Gracenote StationId text input', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByTestId('text-input-tvc_guide_stationid')).toBeInTheDocument();
+    });
+
+    it('renders EPG text input', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByTestId('text-input-epg_data_id')).toBeInTheDocument();
+    });
+  });
+
+  // ── EPG conditional buttons ────────────────────────────────────────────────
+
+  describe('EPG-conditional buttons', () => {
+    it('does not show "Use EPG Name" button when no epg_data_id', () => {
+      setupMocks({ formOverrides: { watchValues: { epg_data_id: null } } });
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.queryByText('Use EPG Name')).not.toBeInTheDocument();
+    });
+
+    it('shows "Use EPG Name" button when epg_data_id is set', () => {
+      setupMocks({ formOverrides: { watchValues: { epg_data_id: 'tvg-1' } } });
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByText('Use EPG Name')).toBeInTheDocument();
+    });
+
+    it('does not show "Use EPG Logo" button when no epg_data_id', () => {
+      setupMocks({ formOverrides: { watchValues: { epg_data_id: null } } });
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.queryByText('Use EPG Logo')).not.toBeInTheDocument();
+    });
+
+    it('shows "Use EPG Logo" button when epg_data_id is set', () => {
+      setupMocks({ formOverrides: { watchValues: { epg_data_id: 'tvg-1' } } });
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByText('Use EPG Logo')).toBeInTheDocument();
+    });
+
+    it('does not show "Use EPG TVG-ID" button when no epg_data_id', () => {
+      setupMocks({ formOverrides: { watchValues: { epg_data_id: null } } });
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.queryByText('Use EPG TVG-ID')).not.toBeInTheDocument();
+    });
+
+    it('shows "Use EPG TVG-ID" button when epg_data_id is set', () => {
+      setupMocks({ formOverrides: { watchValues: { epg_data_id: 'tvg-1' } } });
+      render(<ChannelForm {...defaultProps()} />);
+      expect(screen.getByText('Use EPG TVG-ID')).toBeInTheDocument();
+    });
+  });
+
+  // ── Auto Match button ──────────────────────────────────────────────────────
+
+  describe('Auto Match button', () => {
+    it('is disabled when channel is null', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps({ channel: null })} />);
+      const autoMatch = screen.getByText('Auto Match');
+      expect(autoMatch).toBeDisabled();
+    });
+
+    it('is enabled when an existing channel is provided', () => {
+      setupMocks({ channel: makeChannel() });
+      render(<ChannelForm {...defaultProps({ channel: makeChannel() })} />);
+      const autoMatch = screen.getByText('Auto Match');
+      expect(autoMatch).not.toBeDisabled();
+    });
+
+    it('calls matchChannelEpg with the channel on click', async () => {
+      const channel = makeChannel();
+      vi.mocked(ChannelUtils.matchChannelEpg).mockResolvedValue({
+        matched: true,
+        message: 'Matched!',
+        channel: { epg_data_id: 'tvg-1' },
+      });
+      setupMocks({ channel });
+      render(<ChannelForm {...defaultProps({ channel })} />);
+      fireEvent.click(screen.getByText('Auto Match'));
+      await waitFor(() => {
+        expect(ChannelUtils.matchChannelEpg).toHaveBeenCalledWith(channel);
+      });
+    });
+
+    it('shows success notification when matchChannelEpg returns matched: true', async () => {
+      const channel = makeChannel();
+      vi.mocked(ChannelUtils.matchChannelEpg).mockResolvedValue({
+        matched: true,
+        message: 'Matched!',
+        channel: { epg_data_id: 'tvg-1' },
+      });
+      setupMocks({ channel });
+      render(<ChannelForm {...defaultProps({ channel })} />);
+      fireEvent.click(screen.getByText('Auto Match'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ title: 'Success', color: 'green' })
+        );
+      });
+    });
+
+    it('shows "No Match Found" notification when matchChannelEpg returns matched: false', async () => {
+      const channel = makeChannel();
+      vi.mocked(ChannelUtils.matchChannelEpg).mockResolvedValue({
+        matched: false,
+        message: 'No match',
+      });
+      setupMocks({ channel });
+      render(<ChannelForm {...defaultProps({ channel })} />);
+      fireEvent.click(screen.getByText('Auto Match'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ title: 'No Match Found', color: 'orange' })
+        );
+      });
+    });
+
+    it('shows error notification when matchChannelEpg throws', async () => {
+      const channel = makeChannel();
+      vi.mocked(ChannelUtils.matchChannelEpg).mockRejectedValue(new Error('Network'));
+      setupMocks({ channel });
+      render(<ChannelForm {...defaultProps({ channel })} />);
+      fireEvent.click(screen.getByText('Auto Match'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ title: 'Error', color: 'red' })
+        );
+      });
+    });
+
+    it('sets epg_data_id via setValue when a match is found', async () => {
+      const channel = makeChannel();
+      vi.mocked(ChannelUtils.matchChannelEpg).mockResolvedValue({
+        matched: true,
+        message: 'Matched!',
+        channel: { epg_data_id: 'tvg-1' },
+      });
+      const { formMethods } = setupMocks({ channel });
+      render(<ChannelForm {...defaultProps({ channel })} />);
+      fireEvent.click(screen.getByText('Auto Match'));
+      await waitFor(() => {
+        expect(formMethods.setValue).toHaveBeenCalledWith('epg_data_id', 'tvg-1');
+      });
+    });
+  });
+
+  // ── "Use EPG Name" ─────────────────────────────────────────────────────────
+
+  describe('"Use EPG Name" button', () => {
+    it('sets channel name from EPG tvg name', async () => {
+      const { formMethods } = setupMocks({
+        formOverrides: { watchValues: { epg_data_id: 'tvg-1' } },
+      });
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Use EPG Name'));
+
+      await waitFor(() => {
+        expect(formMethods.setValue).toHaveBeenCalledWith('name', 'ESPN');
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'green' })
+        );
+      });
+    });
+
+    it('shows warning when EPG has no name', async () => {
+      setupMocks({
+        formOverrides: { watchValues: { epg_data_id: 'tvg-no-name' } },
+      });
+      // tvg-no-name not in tvgsById → tvg is undefined
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Use EPG Name'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ title: 'No Name Available' })
+        );
+      });
+    });
+  });
+
+  // ── "Use EPG TVG-ID" ───────────────────────────────────────────────────────
+
+  describe('"Use EPG TVG-ID" button', () => {
+    it('sets tvg_id from EPG data', async () => {
+      const { formMethods } = setupMocks({
+        formOverrides: { watchValues: { epg_data_id: 'tvg-1' } },
+      });
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Use EPG TVG-ID'));
+
+      await waitFor(() => {
+        expect(formMethods.setValue).toHaveBeenCalledWith('tvg_id', 'espn.us');
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'green' })
+        );
+      });
+    });
+
+    it('shows warning when EPG has no TVG-ID', async () => {
+      setupMocks({
+        formOverrides: { watchValues: { epg_data_id: 'tvg-no-tvgid' } },
+      });
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Use EPG TVG-ID'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ title: 'No TVG-ID Available' })
+        );
+      });
+    });
+  });
+
+  // ── "Use EPG Logo" ─────────────────────────────────────────────────────────
+
+  describe('"Use EPG Logo" button', () => {
+    it('sets logo_id when a matching logo exists in the store', async () => {
+      const { formMethods } = setupMocks({
+        formOverrides: { watchValues: { epg_data_id: 'tvg-1' } },
+      });
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Use EPG Logo'));
+      await waitFor(() => {
+        expect(formMethods.setValue).toHaveBeenCalledWith('logo_id', 42);
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'green' })
+        );
+      });
+
+    });
+
+    it('creates a new logo when no matching logo exists', async () => {
+      vi.mocked(ChannelUtils.createLogo).mockResolvedValue({
+        id: 99,
+        name: 'New EPG Logo',
+      });
+      const { formMethods } = setupMocks({
+        formOverrides: {
+          watchValues: { epg_data_id: 'tvg-2' },
+        },
+      });
+      // tvg-2 has icon_url 'http://example.com/cnn.png' — but make allLogos not contain it
+      vi.mocked(useLogosStore).mockImplementation((sel) =>
+        sel({ logos: {} }) // empty logos so no match
+      );
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Use EPG Logo'));
+      await waitFor(() => {
+        expect(ChannelUtils.createLogo).toHaveBeenCalled();
+        expect(formMethods.setValue).toHaveBeenCalledWith('logo_id', 99);
+      });
+    });
+
+    it('shows error notification when createLogo throws', async () => {
+      vi.mocked(ChannelUtils.createLogo).mockRejectedValue(new Error('fail'));
+      setupMocks({
+        formOverrides: { watchValues: { epg_data_id: 'tvg-2' } },
+      });
+      vi.mocked(useLogosStore).mockImplementation((sel) =>
+        sel({ logos: {} })
+      );
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Use EPG Logo'));
+      await waitFor(() => {
+        expect(updateNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red' })
+        );
+      });
+    });
+
+    it('shows warning when no EPG source is selected', async () => {
+      setupMocks({
+        formOverrides: { watchValues: { epg_data_id: null } },
+      });
+      // epg_data_id is null so the button isn't even shown — verify notification path
+      // by rendering with an id but no matching tvg
+      setupMocks({
+        formOverrides: { watchValues: { epg_data_id: 'tvg-no-icon' } },
+      });
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Use EPG Logo'));
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ title: 'No EPG Icon' })
+        );
+      });
+    });
+  });
+
+  // ── Logo modal ─────────────────────────────────────────────────────────────
+
+  describe('logo modal', () => {
+    it('opens Logo form when "Upload or Create Logo" is clicked', async () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Upload or Create Logo'));
+      await waitFor(() => {
+        expect(screen.getByTestId('logo-form')).toBeInTheDocument();
+      });
+    });
+
+    it('closes Logo form when onClose is called', async () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Upload or Create Logo'));
+      fireEvent.click(screen.getByTestId('logo-form-close'));
+      await waitFor(() => {
+        expect(screen.queryByTestId('logo-form')).not.toBeInTheDocument();
+      });
+    });
+
+    it('sets logo_id and closes form on success', async () => {
+      const { formMethods } = setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Upload or Create Logo'));
+      fireEvent.click(screen.getByTestId('logo-form-success'));
+      await waitFor(() => {
+        expect(formMethods.setValue).toHaveBeenCalledWith('logo_id', 42);
+        expect(screen.queryByTestId('logo-form')).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Channel Group modal ────────────────────────────────────────────────────
+
+  describe('channel group modal', () => {
+    it('opens ChannelGroupForm when the add-group icon is clicked', async () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('icon-square-plus').closest('button'));
+      await waitFor(() => {
+        expect(screen.getByTestId('channel-group-form')).toBeInTheDocument();
+      });
+    });
+
+    it('closes ChannelGroupForm when onClose returns null', async () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('icon-square-plus').closest('button'));
+      fireEvent.click(screen.getByTestId('channel-group-close'));
+      await waitFor(() => {
+        expect(screen.queryByTestId('channel-group-form')).not.toBeInTheDocument();
+      });
+    });
+
+    it('sets channel_group_id when a new group is returned', async () => {
+      const { formMethods } = setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('icon-square-plus').closest('button'));
+      fireEvent.click(screen.getByTestId('channel-group-save'));
+      await waitFor(() => {
+        expect(formMethods.setValue).toHaveBeenCalledWith('channel_group_id', '99');
+        expect(screen.queryByTestId('channel-group-form')).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Form submission ────────────────────────────────────────────────────────
+
+  describe('form submission', () => {
+    it('calls addChannel when submitting a new channel', async () => {
+      vi.mocked(ChannelUtils.addChannel).mockResolvedValue(undefined);
+      setupMocks();
+      const onClose = vi.fn();
+      render(<ChannelForm {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByText('Submit'));
+      await waitFor(() => {
+        expect(ChannelUtils.addChannel).toHaveBeenCalled();
+      });
+    });
+
+    it('calls handleEpgUpdate when submitting an existing channel', async () => {
+      vi.mocked(ChannelUtils.handleEpgUpdate).mockResolvedValue(undefined);
+      const channel = makeChannel();
+      setupMocks({ channel });
+      const onClose = vi.fn();
+      render(<ChannelForm {...defaultProps({ channel, onClose })} />);
+      fireEvent.click(screen.getByText('Submit'));
+      await waitFor(() => {
+        expect(ChannelUtils.handleEpgUpdate).toHaveBeenCalledWith(
+          channel,
+          expect.any(Object),
+          expect.any(Object),
+          expect.any(Array)
+        );
+      });
+    });
+
+    it('calls onClose after successful submission', async () => {
+      vi.mocked(ChannelUtils.addChannel).mockResolvedValue(undefined);
+      setupMocks();
+      const onClose = vi.fn();
+      render(<ChannelForm {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByText('Submit'));
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+    });
+
+    it('calls requeryChannels after successful submission', async () => {
+      vi.mocked(ChannelUtils.addChannel).mockResolvedValue(undefined);
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Submit'));
+      await waitFor(() => {
+        expect(ChannelUtils.requeryChannels).toHaveBeenCalled();
+      });
+    });
+
+    it('calls reset after successful submission', async () => {
+      vi.mocked(ChannelUtils.addChannel).mockResolvedValue(undefined);
+      const { formMethods } = setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Submit'));
+      await waitFor(() => {
+        expect(formMethods.reset).toHaveBeenCalled();
+      });
+    });
+
+    it('still calls onClose when submission throws', async () => {
+      vi.mocked(ChannelUtils.addChannel).mockRejectedValue(new Error('Server error'));
+      setupMocks();
+      const onClose = vi.fn();
+      render(<ChannelForm {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByText('Submit'));
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+    });
+  });
+
+  // ── Mature content switch ──────────────────────────────────────────────────
+
+  describe('mature content switch', () => {
+    it('calls setValue with is_adult: true when switch is toggled on', () => {
+      const { formMethods } = setupMocks({
+        formOverrides: { watchValues: { is_adult: false } },
+      });
+      render(<ChannelForm {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('switch-mature'));
+      expect(formMethods.setValue).toHaveBeenCalledWith('is_adult', true);
+    });
+  });
+
+  // ── Logo list rendering ────────────────────────────────────────────────────
+
+  describe('logo list', () => {
+    it('renders logo entries from channelLogos', () => {
+      setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      // The FixedSizeList mock renders all items; both logo names should appear
+      expect(screen.getByText('ESPN Logo')).toBeInTheDocument();
+      expect(screen.getByText('CNN Logo')).toBeInTheDocument();
+    });
+  });
+
+  // ── ensureLogosLoaded ──────────────────────────────────────────────────────
+
+  describe('ensureLogosLoaded', () => {
+    it('calls ensureLogosLoaded on mount', () => {
+      const { mockEnsureLogosLoaded } = setupMocks();
+      render(<ChannelForm {...defaultProps()} />);
+      expect(mockEnsureLogosLoaded).toHaveBeenCalled();
+    });
+  });
+
+  // ── EPG display value ──────────────────────────────────────────────────────
+
+  describe('EPG input display value', () => {
+    it('displays "Dummy" when no epg_data_id is set', () => {
+      setupMocks({ formOverrides: { watchValues: { epg_data_id: null } } });
+      render(<ChannelForm {...defaultProps()} />);
+      const epgInput = screen.getByTestId('text-input-epg_data_id');
+      expect(epgInput).toHaveValue('Dummy');
+    });
+
+    it('displays the EPG source name and tvg name when epg_data_id is set', () => {
+      setupMocks({ formOverrides: { watchValues: { epg_data_id: 'tvg-1' } } });
+      render(<ChannelForm {...defaultProps()} />);
+      const epgInput = screen.getByTestId('text-input-epg_data_id');
+      expect(epgInput).toHaveValue('EPG Source 1 - ESPN');
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/__tests__/ChannelBatch.test.jsx b/frontend/src/components/forms/__tests__/ChannelBatch.test.jsx
new file mode 100644
index 00000000..b7228d90
--- /dev/null
+++ b/frontend/src/components/forms/__tests__/ChannelBatch.test.jsx
@@ -0,0 +1,846 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import ChannelBatchForm from '../ChannelBatch';
+
+// ── Store mocks ────────────────────────────────────────────────────────────────
+vi.mock('../../../store/channels', () => ({ default: vi.fn() }));
+vi.mock('../../../store/channelsTable.jsx', () => ({ default: vi.fn() }));
+vi.mock('../../../store/streamProfiles', () => ({ default: vi.fn() }));
+vi.mock('../../../store/epgs', () => ({ default: vi.fn() }));
+vi.mock('../../../store/warnings', () => ({ default: vi.fn() }));
+
+// ── Hook mocks ─────────────────────────────────────────────────────────────────
+vi.mock('../../../hooks/useSmartLogos', () => ({
+  useChannelLogoSelection: vi.fn(),
+}));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../utils/notificationUtils.js', () => ({
+  showNotification: vi.fn(),
+}));
+
+vi.mock('../../../utils/forms/ChannelUtils.js', () => ({
+  requeryChannels: vi.fn(),
+}));
+
+vi.mock('../../../utils/forms/ChannelBatchUtils.js', () => ({
+  batchSetEPG: vi.fn(),
+  buildEpgAssociations: vi.fn(),
+  buildSubmitValues: vi.fn(),
+  bulkRegexRenameChannels: vi.fn(),
+  computeRegexPreview: vi.fn(),
+  getChannelGroupChange: vi.fn(),
+  getEpgChange: vi.fn(),
+  getEpgData: vi.fn(),
+  getLogoChange: vi.fn(),
+  getMatureContentChange: vi.fn(),
+  getRegexNameChange: vi.fn(),
+  getStreamProfileChange: vi.fn(),
+  getUserLevelChange: vi.fn(),
+  setChannelLogosFromEpg: vi.fn(),
+  setChannelNamesFromEpg: vi.fn(),
+  setChannelTvgIdsFromEpg: vi.fn(),
+  updateChannels: vi.fn(),
+}));
+
+// ── Sub-component mocks ────────────────────────────────────────────────────────
+vi.mock('../ChannelGroup', () => ({
+  default: ({ isOpen, onClose }) =>
+    isOpen ? (
+      <div data-testid="channel-group-form">
+        <button onClick={() => onClose({ id: 99, name: 'New Group' })}>
+          Save Group
+        </button>
+        <button onClick={() => onClose(null)}>Cancel Group</button>
+      </div>
+    ) : null,
+}));
+
+vi.mock('../../ConfirmationDialog', () => ({
+  default: ({ opened, onConfirm, onClose, title, confirmLabel, cancelLabel, loading, message }) =>
+    opened ? (
+      <div data-testid="confirmation-dialog">
+        <div data-testid="dialog-title">{title}</div>
+        <div data-testid="dialog-message">{message}</div>
+        <button data-testid="dialog-confirm" onClick={onConfirm} disabled={loading}>
+          {confirmLabel}
+        </button>
+        <button data-testid="dialog-cancel" onClick={onClose}>
+          {cancelLabel}
+        </button>
+      </div>
+    ) : null,
+}));
+
+vi.mock('../../LazyLogo', () => ({
+  default: ({ src, alt }) => <img src={src} alt={alt} data-testid="lazy-logo" />,
+}));
+
+vi.mock('../../../images/logo.png', () => ({ default: 'default-logo.png' }));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', async () => ({
+  ActionIcon: ({ children, onClick, disabled }) => (
+    <button data-testid="action-icon" onClick={onClick} disabled={disabled}>
+      {children}
+    </button>
+  ),
+  Box: ({ children, style }) => <div style={style}>{children}</div>,
+  Button: ({ children, onClick, disabled, loading, type }) => (
+    <button
+      type={type ?? 'button'}
+      onClick={onClick}
+      disabled={disabled || loading}
+      data-loading={loading}
+    >
+      {children}
+    </button>
+  ),
+  Center: ({ children, style }) => <div style={style}>{children}</div>,
+  Divider: () => <hr />,
+  Flex: ({ children }) => <div>{children}</div>,
+  Group: ({ children }) => <div>{children}</div>,
+  Modal: ({ children, opened, onClose, title }) =>
+    opened ? (
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
+        <button data-testid="modal-close" onClick={onClose}>×</button>
+        {children}
+      </div>
+    ) : null,
+  Paper: ({ children, style }) => <div style={style}>{children}</div>,
+  Popover: ({ children }) => <div data-testid="popover">{children}</div>,
+  PopoverDropdown: ({ children }) => <div data-testid="popover-dropdown">{children}</div>,
+  PopoverTarget: ({ children }) => <div data-testid="popover-target">{children}</div>,
+  ScrollArea: ({ children, h }) => <div style={{ height: h }}>{children}</div>,
+  Select: ({ label, data, value, onChange, disabled }) => (
+    <select
+      aria-label={label}
+      value={value ?? ''}
+      onChange={(e) => onChange?.(e.target.value)}
+      disabled={disabled}
+      data-testid={`select-${label?.toLowerCase?.().replace(/\s+/g, '-')}`}
+    >
+      {(data ?? []).map((opt) => {
+        const val = typeof opt === 'string' ? opt : opt.value;
+        const lbl = typeof opt === 'string' ? opt : opt.label;
+        return <option key={val} value={val}>{lbl}</option>;
+      })}
+    </select>
+  ),
+  Stack: ({ children }) => <div>{children}</div>,
+  Text: ({ children, size, c }) => (
+    <span data-size={size} data-color={c}>{children}</span>
+  ),
+  TextInput: ({ label, placeholder, value, onChange, disabled }) => (
+    <input
+      aria-label={label}
+      placeholder={placeholder}
+      value={value ?? ''}
+      onChange={onChange}
+      disabled={disabled}
+      data-testid={`input-${label?.toLowerCase?.().replace(/\s+/g, '-')}`}
+    />
+  ),
+  Tooltip: ({ children, label }) => <div data-tooltip={label}>{children}</div>,
+  UnstyledButton: ({ children, onClick, style }) => (
+    <button onClick={onClick} style={style}>{children}</button>
+  ),
+  useMantineTheme: () => ({ tailwind: { green: { 5: '#38a169' } } }),
+}));
+
+// ── @mantine/form ──────────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({
+  useForm: vi.fn(),
+}));
+
+// ── react-window ───────────────────────────────────────────────────────────────
+vi.mock('react-window', () => ({
+  FixedSizeList: ({ children, itemCount, height }) => (
+    <div data-testid="fixed-size-list" style={{ height }}>
+      {Array.from({ length: itemCount }, (_, i) =>
+        children({ index: i, style: {} })
+      )}
+    </div>
+  ),
+}));
+
+// ── lucide-react ───────────────────────────────────────────────────────────────
+vi.mock('lucide-react', () => ({
+  ListOrdered: () => <svg data-testid="icon-list-ordered" />,
+  SquarePlus: () => <svg data-testid="icon-square-plus" />,
+  X: () => <svg data-testid="icon-x" />,
+}));
+
+// ── Imports after mocks ────────────────────────────────────────────────────────
+import useChannelsStore from '../../../store/channels';
+import useChannelsTableStore from '../../../store/channelsTable.jsx';
+import useStreamProfilesStore from '../../../store/streamProfiles';
+import useEPGsStore from '../../../store/epgs';
+import useWarningsStore from '../../../store/warnings';
+import { useChannelLogoSelection } from '../../../hooks/useSmartLogos';
+import { useForm } from '@mantine/form';
+import { showNotification } from '../../../utils/notificationUtils.js';
+import { requeryChannels } from '../../../utils/forms/ChannelUtils.js';
+import * as ChannelBatchUtils from '../../../utils/forms/ChannelBatchUtils.js';
+
+// ── Constants ──────────────────────────────────────────────────────────────────
+const CHANNEL_IDS = [1, 2, 3];
+
+const makeChannelGroups = () => ({
+  1: { id: 1, name: 'Sports' },
+  2: { id: 2, name: 'News' },
+});
+
+const makeLogos = () => ({
+  5: { id: 5, name: 'HBO Logo', url: '/logos/hbo.png' },
+  6: { id: 6, name: 'ESPN Logo', url: '/logos/espn.png' },
+});
+
+const makeProfiles = () => [
+  { id: 1, name: 'HD Profile' },
+  { id: 2, name: 'SD Profile' },
+];
+
+const makeEpgs = () => ({
+  10: { id: 10, name: 'XMLTV', source_type: 'dummy' },
+  11: { id: 11, name: 'Live EPG', source_type: 'xmltv' },
+});
+
+const makeFormValues = (overrides = {}) => ({
+  stream_profile_id: '-1',
+  user_level: '-1',
+  is_adult: '-1',
+  channel_group: '',
+  logo: '',
+  ...overrides,
+});
+
+// ── Setup helper ───────────────────────────────────────────────────────────────
+const setupMocks = (overrides = {}) => {
+  const mockFetchEPGs = vi.fn().mockResolvedValue(undefined);
+  const formValues = makeFormValues(overrides.formValues);
+  const mockGetValues = vi.fn().mockReturnValue(formValues);
+  const mockSetFieldValue = vi.fn();
+
+  vi.mocked(useChannelsStore).mockImplementation((sel) =>
+    sel({ channelGroups: overrides.channelGroups ?? makeChannelGroups() })
+  );
+  useChannelsStore.getState = vi.fn(() => ({ fetchChannelIds: vi.fn() }));
+
+  vi.mocked(useChannelsTableStore).mockImplementation((sel) =>
+    sel({ channels: overrides.pageChannels ?? [] })
+  );
+
+  vi.mocked(useStreamProfilesStore).mockImplementation((sel) =>
+    sel({ profiles: overrides.profiles ?? makeProfiles() })
+  );
+
+  vi.mocked(useEPGsStore).mockImplementation((sel) =>
+    sel({
+      epgs: overrides.epgs ?? makeEpgs(),
+      tvgs: overrides.tvgs ?? {},
+      fetchEPGs: mockFetchEPGs,
+    })
+  );
+
+  vi.mocked(useWarningsStore).mockImplementation((sel) =>
+    sel({
+      isWarningSuppressed: overrides.isWarningSuppressed ?? vi.fn().mockReturnValue(false),
+      suppressWarning: vi.fn(),
+    })
+  );
+
+  vi.mocked(useChannelLogoSelection).mockReturnValue({
+    logos: overrides.logos ?? makeLogos(),
+    ensureLogosLoaded: vi.fn(),
+    isLoading: overrides.logosLoading ?? false,
+  });
+
+  vi.mocked(useForm).mockReturnValue({
+    getValues: mockGetValues,
+    setValues: vi.fn(),
+    setFieldValue: mockSetFieldValue,
+    getInputProps: vi.fn().mockReturnValue({}),
+    onSubmit: (fn) => fn,
+    reset: vi.fn(),
+    values: formValues,
+    key: vi.fn().mockReturnValue('mock-key'),
+  });
+
+  vi.mocked(ChannelBatchUtils.computeRegexPreview).mockReturnValue([]);
+  vi.mocked(ChannelBatchUtils.buildSubmitValues).mockReturnValue({ stream_profile_id: '1' });
+  vi.mocked(ChannelBatchUtils.buildEpgAssociations).mockResolvedValue(null);
+  vi.mocked(ChannelBatchUtils.updateChannels).mockResolvedValue(undefined);
+  vi.mocked(ChannelBatchUtils.bulkRegexRenameChannels).mockResolvedValue(undefined);
+  vi.mocked(ChannelBatchUtils.batchSetEPG).mockResolvedValue(undefined);
+  vi.mocked(ChannelBatchUtils.setChannelNamesFromEpg).mockResolvedValue(undefined);
+  vi.mocked(ChannelBatchUtils.setChannelLogosFromEpg).mockResolvedValue(undefined);
+  vi.mocked(ChannelBatchUtils.setChannelTvgIdsFromEpg).mockResolvedValue(undefined);
+  vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(null);
+  vi.mocked(ChannelBatchUtils.getLogoChange).mockReturnValue(null);
+  vi.mocked(ChannelBatchUtils.getStreamProfileChange).mockReturnValue(null);
+  vi.mocked(ChannelBatchUtils.getUserLevelChange).mockReturnValue(null);
+  vi.mocked(ChannelBatchUtils.getMatureContentChange).mockReturnValue(null);
+  vi.mocked(ChannelBatchUtils.getRegexNameChange).mockReturnValue(null);
+  vi.mocked(ChannelBatchUtils.getEpgChange).mockReturnValue(null);
+  vi.mocked(requeryChannels).mockResolvedValue(undefined);
+
+  return { mockFetchEPGs, mockGetValues, mockSetFieldValue };
+};
+
+const renderForm = (props = {}) =>
+  render(
+    <ChannelBatchForm
+      channelIds={props.channelIds ?? CHANNEL_IDS}
+      isOpen={props.isOpen ?? true}
+      onClose={props.onClose ?? vi.fn()}
+      {...props}
+    />
+  );
+
+// ──────────────────────────────────────────────────────────────────────────────
+
+describe('ChannelBatchForm', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── Visibility ─────────────────────────────────────────────────────────────
+
+  describe('visibility', () => {
+    it('renders nothing when isOpen is false', () => {
+      setupMocks();
+      const { container } = renderForm({ isOpen: false });
+      expect(container.firstChild).toBeNull();
+    });
+
+    it('renders the form when isOpen is true', () => {
+      setupMocks();
+      renderForm();
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('calls fetchEPGs when modal opens', () => {
+      const { mockFetchEPGs } = setupMocks();
+      renderForm();
+      expect(mockFetchEPGs).toHaveBeenCalled();
+    });
+
+    it('does not call fetchEPGs when isOpen is false', () => {
+      const { mockFetchEPGs } = setupMocks();
+      renderForm({ isOpen: false });
+      expect(mockFetchEPGs).not.toHaveBeenCalled();
+    });
+  });
+
+  // ── No-changes guard ───────────────────────────────────────────────────────
+
+  describe('no-changes guard', () => {
+    it('shows a notification when Apply Changes is clicked with no changes selected', async () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(null);
+      vi.mocked(ChannelBatchUtils.getLogoChange).mockReturnValue(null);
+      vi.mocked(ChannelBatchUtils.getStreamProfileChange).mockReturnValue(null);
+      vi.mocked(ChannelBatchUtils.getUserLevelChange).mockReturnValue(null);
+      vi.mocked(ChannelBatchUtils.getMatureContentChange).mockReturnValue(null);
+      vi.mocked(ChannelBatchUtils.getRegexNameChange).mockReturnValue(null);
+      vi.mocked(ChannelBatchUtils.getEpgChange).mockReturnValue(null);
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+
+      expect(showNotification).toHaveBeenCalledWith(
+        expect.objectContaining({ color: 'orange' })
+      );
+      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+    });
+
+    it('opens confirmation dialog when at least one change is present', () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+
+      expect(screen.getByTestId('confirmation-dialog')).toBeInTheDocument();
+    });
+  });
+
+  // ── Warning suppression ────────────────────────────────────────────────────
+
+  describe('warning suppression', () => {
+    it('skips confirmation dialog and calls onSubmit directly when batch-update warning is suppressed', async () => {
+      const isWarningSuppressed = vi.fn().mockImplementation((key) =>
+        key === 'batch-update-channels'
+      );
+      setupMocks({ isWarningSuppressed });
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      const onClose = vi.fn();
+
+      renderForm({ onClose });
+      fireEvent.click(screen.getByText('Submit'));
+
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+    });
+  });
+
+  // ── Confirmation dialog ────────────────────────────────────────────────────
+
+  describe('confirmation dialog', () => {
+    it('closes confirmation dialog on cancel', () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+      expect(screen.getByTestId('confirmation-dialog')).toBeInTheDocument();
+
+      fireEvent.click(screen.getByTestId('dialog-cancel'));
+      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+    });
+
+    it('calls updateChannels on confirm', async () => {
+      setupMocks({
+        formValues: {
+          stream_profile_id: '1',   // survives: not '-1' or '0', so kept as-is after parseInt...
+          user_level: '-1',         // deleted
+          is_adult: '-1',           // deleted
+          channel_group: '',        // deleted (channel_group key is removed)
+          logo: '',                 // deleted
+        },
+      });
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(ChannelBatchUtils.updateChannels).toHaveBeenCalledWith(
+          CHANNEL_IDS,
+          { stream_profile_id: '1' }
+        );
+      });
+    });
+
+    it('calls requeryChannels after successful submit', async () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(requeryChannels).toHaveBeenCalled();
+      });
+    });
+
+    it('calls onClose after successful submit', async () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      const onClose = vi.fn();
+
+      renderForm({ onClose });
+      fireEvent.click(screen.getByText('Submit'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+    });
+  });
+
+  // ── Regex rename ───────────────────────────────────────────────────────────
+
+  describe('regex rename', () => {
+    it('calls bulkRegexRenameChannels when regexFind is set and form is submitted', async () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getRegexNameChange).mockReturnValue(
+        '• Name Change: Apply regex find "foo" replace with "bar"'
+      );
+
+      renderForm();
+
+      // Set regexFind state by firing change on the Find input
+      const findInput = screen.getByPlaceholderText('e.g. ^(.*) HD$');
+      fireEvent.change(findInput, { target: { value: 'foo' } });
+
+      fireEvent.click(screen.getByText('Submit'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(ChannelBatchUtils.bulkRegexRenameChannels).toHaveBeenCalledWith(
+          CHANNEL_IDS,
+          'foo',
+          '',   // regexReplace default is ''
+          'g'
+        );
+      });
+    });
+  });
+
+  // ── Set names from EPG ─────────────────────────────────────────────────────
+
+  describe('set names from EPG', () => {
+    it('shows notification when no channels are selected', () => {
+      setupMocks();
+      renderForm({ channelIds: [] });
+
+      fireEvent.click(screen.getByText('Set Names from EPG'));
+
+      expect(showNotification).toHaveBeenCalledWith(
+        expect.objectContaining({ color: 'orange' })
+      );
+    });
+
+    it('opens set-names confirmation dialog when channels are selected', () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getByText('Set Names from EPG'));
+
+      expect(screen.getByTestId('dialog-title')).toHaveTextContent('Confirm Set Names from EPG');
+    });
+
+    it('skips dialog and executes directly when warning is suppressed', async () => {
+      const isWarningSuppressed = vi.fn().mockImplementation((key) =>
+        key === 'batch-set-names-from-epg'
+      );
+      setupMocks({ isWarningSuppressed });
+
+      renderForm();
+      fireEvent.click(screen.getByText('Set Names from EPG'));
+
+      await waitFor(() => {
+        expect(ChannelBatchUtils.setChannelNamesFromEpg).toHaveBeenCalledWith(CHANNEL_IDS);
+      });
+    });
+
+    it('calls setChannelNamesFromEpg on confirm', async () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getByText('Set Names from EPG'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(ChannelBatchUtils.setChannelNamesFromEpg).toHaveBeenCalledWith(CHANNEL_IDS);
+      });
+    });
+
+    it('shows success notification after setting names', async () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getByText('Set Names from EPG'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'blue' })
+        );
+      });
+    });
+
+    it('shows error notification when setChannelNamesFromEpg rejects', async () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.setChannelNamesFromEpg).mockRejectedValue(new Error('fail'));
+
+      renderForm();
+      fireEvent.click(screen.getByText('Set Names from EPG'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red' })
+        );
+      });
+    });
+  });
+
+  // ── Set logos from EPG ─────────────────────────────────────────────────────
+
+  describe('set logos from EPG', () => {
+    it('shows notification when no channels selected', () => {
+      setupMocks();
+      renderForm({ channelIds: [] });
+
+      fireEvent.click(screen.getByText('Set Logos from EPG'));
+
+      expect(showNotification).toHaveBeenCalledWith(
+        expect.objectContaining({ color: 'orange' })
+      );
+    });
+
+    it('opens confirmation dialog for set logos', () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getByText('Set Logos from EPG'));
+
+      expect(screen.getByTestId('dialog-title')).toHaveTextContent('Confirm Set Logos from EPG');
+    });
+
+    it('calls setChannelLogosFromEpg on confirm', async () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getByText('Set Logos from EPG'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(ChannelBatchUtils.setChannelLogosFromEpg).toHaveBeenCalledWith(CHANNEL_IDS);
+      });
+    });
+
+    it('shows error notification when setChannelLogosFromEpg rejects', async () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.setChannelLogosFromEpg).mockRejectedValue(new Error('fail'));
+
+      renderForm();
+      fireEvent.click(screen.getByText('Set Logos from EPG'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red' })
+        );
+      });
+    });
+  });
+
+  // ── Set TVG-IDs from EPG ───────────────────────────────────────────────────
+
+  describe('set TVG-IDs from EPG', () => {
+    it('shows notification when no channels selected', () => {
+      setupMocks();
+      renderForm({ channelIds: [] });
+
+      fireEvent.click(screen.getByText('Set TVG-IDs from EPG'));
+
+      expect(showNotification).toHaveBeenCalledWith(
+        expect.objectContaining({ color: 'orange' })
+      );
+    });
+
+    it('opens confirmation dialog for set TVG-IDs', () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getByText('Set TVG-IDs from EPG'));
+
+      expect(screen.getByTestId('dialog-title')).toHaveTextContent('Confirm Set TVG-IDs from EPG');
+    });
+
+    it('calls setChannelTvgIdsFromEpg on confirm', async () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getByText('Set TVG-IDs from EPG'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(ChannelBatchUtils.setChannelTvgIdsFromEpg).toHaveBeenCalledWith(CHANNEL_IDS);
+      });
+    });
+
+    it('shows error notification when setChannelTvgIdsFromEpg rejects', async () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.setChannelTvgIdsFromEpg).mockRejectedValue(new Error('fail'));
+
+      renderForm();
+      fireEvent.click(screen.getByText('Set TVG-IDs from EPG'));
+      fireEvent.click(screen.getByTestId('dialog-confirm'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red' })
+        );
+      });
+    });
+  });
+
+  // ── Channel group modal ────────────────────────────────────────────────────
+
+  describe('channel group modal', () => {
+    it('opens channel group form when SquarePlus is clicked', () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getAllByTestId('icon-square-plus')[0].closest('button'));
+
+      expect(screen.getByTestId('channel-group-form')).toBeInTheDocument();
+    });
+
+    it('closes channel group modal and updates selection when a new group is saved', () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getAllByTestId('icon-square-plus')[0].closest('button'));
+      fireEvent.click(screen.getByText('Save Group'));
+
+      expect(screen.queryByTestId('channel-group-form')).not.toBeInTheDocument();
+    });
+
+    it('closes channel group modal without updating selection when cancelled', () => {
+      setupMocks();
+      renderForm();
+
+      fireEvent.click(screen.getAllByTestId('icon-square-plus')[0].closest('button'));
+      fireEvent.click(screen.getByText('Cancel Group'));
+
+      expect(screen.queryByTestId('channel-group-form')).not.toBeInTheDocument();
+    });
+  });
+
+  // ── RegexPreview ───────────────────────────────────────────────────────────
+
+  describe('RegexPreview', () => {
+    it('does not render preview when find is empty', () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.computeRegexPreview).mockReturnValue([]);
+      renderForm();
+
+      expect(screen.queryByText(/Preview shows/)).not.toBeInTheDocument();
+    });
+
+    it('renders preview items when computeRegexPreview returns results', () => {
+      setupMocks({
+        pageChannels: [
+          { id: 1, name: 'HBO East' },
+          { id: 2, name: 'HBO West' },
+        ],
+      });
+      vi.mocked(ChannelBatchUtils.computeRegexPreview).mockReturnValue([
+        { before: 'HBO East', after: 'Cinemax East' },
+        { before: 'HBO West', after: 'Cinemax West' },
+      ]);
+
+      renderForm();
+
+      // Trigger a find value so RegexPreview renders (simulate find state)
+      // Since RegexPreview reads `find` from props passed by the parent,
+      // we verify computeRegexPreview was called with correct channel ids
+      expect(ChannelBatchUtils.computeRegexPreview).toHaveBeenCalled();
+    });
+  });
+
+  // ── Empty channelIds ───────────────────────────────────────────────────────
+
+  describe('empty channelIds', () => {
+    it('still renders the form with 0 channels', () => {
+      setupMocks();
+      renderForm({ channelIds: [] });
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+  });
+
+  // ── Error resilience ───────────────────────────────────────────────────────
+
+  describe('error resilience', () => {
+    it('does not throw when requeryChannels rejects after submit', async () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(requeryChannels).mockRejectedValue(new Error('network'));
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+
+      await expect(
+        waitFor(() => fireEvent.click(screen.getByTestId('dialog-confirm')))
+      ).resolves.not.toThrow();
+    });
+
+    it('does not throw when setChannelNamesFromEpg rejects and no channels', async () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.setChannelNamesFromEpg).mockRejectedValue(new Error('fail'));
+
+      renderForm();
+      fireEvent.click(screen.getByText('Set Names from EPG'));
+
+      await expect(
+        waitFor(() => fireEvent.click(screen.getByTestId('dialog-confirm')))
+      ).resolves.not.toThrow();
+    });
+  });
+
+// ── Batch update confirmation message ──────────────────────────────────────
+
+  describe('batch update confirmation message', () => {
+    it('displays the channel count in the confirmation message', () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+
+      expect(screen.getByTestId('dialog-message')).toHaveTextContent('3');
+    });
+
+    it('displays a single change line in the confirmation message', () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getStreamProfileChange).mockReturnValue('• Stream Profile: HD Profile');
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+
+      expect(screen.getByTestId('dialog-message')).toHaveTextContent('• Stream Profile: HD Profile');
+    });
+
+    it('displays multiple change lines when several fields are changed', () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getStreamProfileChange).mockReturnValue('• Stream Profile: HD Profile');
+      vi.mocked(ChannelBatchUtils.getUserLevelChange).mockReturnValue('• User Level: Admin');
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+
+      const message = screen.getByTestId('dialog-message');
+      expect(message).toHaveTextContent('• Channel Group: Sports');
+      expect(message).toHaveTextContent('• Stream Profile: HD Profile');
+      expect(message).toHaveTextContent('• User Level: Admin');
+    });
+
+    it('displays regex rename change line when regexFind is set', () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getRegexNameChange).mockReturnValue(
+        '• Name Change: Apply regex find "foo" replace with "bar"'
+      );
+
+      renderForm();
+      const findInput = screen.getByPlaceholderText('e.g. ^(.*) HD$');
+      fireEvent.change(findInput, { target: { value: 'foo' } });
+      fireEvent.click(screen.getByText('Submit'));
+
+      expect(screen.getByTestId('dialog-message')).toHaveTextContent(
+        '• Name Change: Apply regex find "foo" replace with "bar"'
+      );
+    });
+
+    it('uses "Apply Changes" as the confirm button label', () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+
+      expect(screen.getByTestId('dialog-confirm')).toHaveTextContent('Apply Changes');
+    });
+
+    it('shows "Confirm Batch Update" as the dialog title', () => {
+      setupMocks();
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+
+      renderForm();
+      fireEvent.click(screen.getByText('Submit'));
+
+      expect(screen.getByTestId('dialog-title')).toHaveTextContent('Confirm Batch Update');
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/__tests__/ChannelGroup.test.jsx b/frontend/src/components/forms/__tests__/ChannelGroup.test.jsx
new file mode 100644
index 00000000..ba16d70e
--- /dev/null
+++ b/frontend/src/components/forms/__tests__/ChannelGroup.test.jsx
@@ -0,0 +1,395 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import ChannelGroup from '../ChannelGroup';
+import API from '../../../api';
+import useChannelsStore from '../../../store/channels';
+import { showNotification } from '../../../utils/notificationUtils.js';
+import { useForm } from '@mantine/form';
+
+// ── API mock ───────────────────────────────────────────────────────────────────
+vi.mock('../../../api', () => ({
+  default: {
+    addChannelGroup: vi.fn(),
+    updateChannelGroup: vi.fn(),
+  },
+}));
+
+// ── Store mock ─────────────────────────────────────────────────────────────────
+vi.mock('../../../store/channels', () => ({ default: vi.fn() }));
+
+// ── Notification util mock ─────────────────────────────────────────────────────
+vi.mock('../../../utils/notificationUtils.js', () => ({
+  showNotification: vi.fn(),
+}));
+
+// ── Mantine form mock ──────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({
+  isNotEmpty: vi.fn(() => (value) => (value ? null : 'Specify a name')),
+  useForm: vi.fn(),
+}));
+
+// ── Mantine core mock ──────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  Modal: ({ children, opened, onClose, title }) =>
+    opened ? (
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
+        <button data-testid="modal-close" onClick={onClose}>
+          ×
+        </button>
+        {children}
+      </div>
+    ) : null,
+  TextInput: ({ label, disabled, value, onChange, id }) => (
+    <input
+      data-testid="name-input"
+      id={id}
+      aria-label={label}
+      disabled={disabled}
+      value={value ?? ''}
+      onChange={onChange}
+    />
+  ),
+  Button: ({ children, onClick, type, disabled }) => (
+    <button
+      data-testid="submit-button"
+      type={type}
+      onClick={onClick}
+      disabled={disabled}
+    >
+      {children}
+    </button>
+  ),
+  Flex: ({ children }) => <div>{children}</div>,
+  Alert: ({ children, color }) => (
+    <div data-testid="alert" data-color={color}>
+      {children}
+    </div>
+  ),
+}));
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+
+const makeGroup = (overrides = {}) => ({
+  id: 1,
+  name: 'Sports',
+  ...overrides,
+});
+
+/**
+ * Build a minimal useForm mock.
+ * @param {string} nameValue - current value of the name field
+ * @param {object} overrides  - override any form property
+ */
+const makeFormMock = (nameValue = 'Sports', overrides = {}) => {
+  const submitHandlers = [];
+
+  return {
+    getValues: vi.fn(() => ({ name: nameValue })),
+    reset: vi.fn(),
+    key: vi.fn((k) => k),
+    submitting: false,
+    getInputProps: vi.fn(() => ({ value: nameValue, onChange: vi.fn() })),
+    onSubmit: vi.fn((handler) => {
+      submitHandlers.push(handler);
+      // Return the event handler that <form onSubmit={}> receives
+      return (e) => {
+        e?.preventDefault?.();
+        handler();
+      };
+    }),
+    _submitHandlers: submitHandlers,
+    ...overrides,
+  };
+};
+
+const setupMocks = ({ canEdit = true } = {}) => {
+  vi.mocked(useChannelsStore).mockImplementation((sel) =>
+    sel({ canEditChannelGroup: vi.fn(() => canEdit) })
+  );
+};
+
+const renderForm = (props = {}) => {
+  const defaults = {
+    isOpen: true,
+    onClose: vi.fn(),
+    channelGroup: null,
+  };
+  return render(<ChannelGroup {...defaults} {...props} />);
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+
+describe('ChannelGroup', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // ── Visibility ─────────────────────────────────────────────────────────────
+
+  describe('visibility', () => {
+    it('renders nothing when isOpen is false', () => {
+      setupMocks();
+      const form = makeFormMock('');
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ isOpen: false });
+
+      expect(screen.queryByTestId('modal')).toBeNull();
+    });
+
+    it('renders the modal when isOpen is true', () => {
+      setupMocks();
+      vi.mocked(useForm).mockReturnValue(makeFormMock(''));
+
+      renderForm({ isOpen: true });
+
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('renders "Channel Group" as the modal title', () => {
+      setupMocks();
+      vi.mocked(useForm).mockReturnValue(makeFormMock(''));
+
+      renderForm();
+
+      expect(screen.getByTestId('modal-title')).toHaveTextContent('Channel Group');
+    });
+  });
+
+  // ── Add new group ──────────────────────────────────────────────────────────
+
+  describe('adding a new group', () => {
+    it('renders the name input', () => {
+      setupMocks();
+      vi.mocked(useForm).mockReturnValue(makeFormMock(''));
+
+      renderForm();
+
+      expect(screen.getByTestId('name-input')).toBeInTheDocument();
+    });
+
+    it('renders the Submit button', () => {
+      setupMocks();
+      vi.mocked(useForm).mockReturnValue(makeFormMock(''));
+
+      renderForm();
+
+      expect(screen.getByTestId('submit-button')).toBeInTheDocument();
+    });
+
+    it('does not show the alert for a new group', () => {
+      setupMocks();
+      vi.mocked(useForm).mockReturnValue(makeFormMock(''));
+
+      renderForm({ channelGroup: null });
+
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+
+    it('calls addChannelGroup with form values on submit', async () => {
+      setupMocks();
+      const newGroup = { id: 99, name: 'NewGroup' };
+      vi.mocked(API.addChannelGroup).mockResolvedValue(newGroup);
+
+      const form = makeFormMock('NewGroup');
+      vi.mocked(useForm).mockReturnValue(form);
+
+      const onClose = vi.fn();
+      renderForm({ channelGroup: null, onClose });
+
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(API.addChannelGroup).toHaveBeenCalledWith({ name: 'NewGroup' });
+      });
+    });
+
+    it('calls onClose with the new group after successful add', async () => {
+      setupMocks();
+      const newGroup = { id: 99, name: 'NewGroup' };
+      vi.mocked(API.addChannelGroup).mockResolvedValue(newGroup);
+
+      const form = makeFormMock('NewGroup');
+      vi.mocked(useForm).mockReturnValue(form);
+
+      const onClose = vi.fn();
+      renderForm({ channelGroup: null, onClose });
+
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalledWith(newGroup);
+      });
+    });
+
+    it('resets the form after successful add', async () => {
+      setupMocks();
+      vi.mocked(API.addChannelGroup).mockResolvedValue({ id: 99, name: 'NewGroup' });
+
+      const form = makeFormMock('NewGroup');
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ channelGroup: null });
+
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(form.reset).toHaveBeenCalled();
+      });
+    });
+  });
+
+  // ── Edit existing group ────────────────────────────────────────────────────
+
+  describe('editing an existing group', () => {
+    it('calls updateChannelGroup with the group id and form values on submit', async () => {
+      setupMocks({ canEdit: true });
+      const group = makeGroup({ id: 1, name: 'Sports' });
+      const updated = { id: 1, name: 'Sports Updated' };
+      vi.mocked(API.updateChannelGroup).mockResolvedValue(updated);
+
+      const form = makeFormMock('Sports Updated');
+      vi.mocked(useForm).mockReturnValue(form);
+
+      const onClose = vi.fn();
+      renderForm({ channelGroup: group, onClose });
+
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(API.updateChannelGroup).toHaveBeenCalledWith({
+          id: 1,
+          name: 'Sports Updated',
+        });
+      });
+    });
+
+    it('calls onClose with the updated group', async () => {
+      setupMocks({ canEdit: true });
+      const group = makeGroup();
+      const updated = { id: 1, name: 'Sports Updated' };
+      vi.mocked(API.updateChannelGroup).mockResolvedValue(updated);
+
+      const form = makeFormMock('Sports Updated');
+      vi.mocked(useForm).mockReturnValue(form);
+
+      const onClose = vi.fn();
+      renderForm({ channelGroup: group, onClose });
+
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalledWith(updated);
+      });
+    });
+
+    it('does not show the alert when group is editable', () => {
+      setupMocks({ canEdit: true });
+      vi.mocked(useForm).mockReturnValue(makeFormMock('Sports'));
+
+      renderForm({ channelGroup: makeGroup() });
+
+      expect(screen.queryByTestId('alert')).not.toBeInTheDocument();
+    });
+  });
+
+  // ── Non-editable group ─────────────────────────────────────────────────────
+
+  describe('non-editable group (M3U associations)', () => {
+    it('shows the alert warning when group cannot be edited', () => {
+      setupMocks({ canEdit: false });
+      vi.mocked(useForm).mockReturnValue(makeFormMock('Sports'));
+
+      renderForm({ channelGroup: makeGroup() });
+
+      expect(screen.getByTestId('alert')).toBeInTheDocument();
+      expect(screen.getByTestId('alert')).toHaveTextContent(
+        'This group cannot be edited because it has M3U account associations.'
+      );
+    });
+
+    it('shows the alert with yellow color', () => {
+      setupMocks({ canEdit: false });
+      vi.mocked(useForm).mockReturnValue(makeFormMock('Sports'));
+
+      renderForm({ channelGroup: makeGroup() });
+
+      expect(screen.getByTestId('alert')).toHaveAttribute('data-color', 'yellow');
+    });
+
+    it('disables the name input for non-editable group', () => {
+      setupMocks({ canEdit: false });
+      vi.mocked(useForm).mockReturnValue(makeFormMock('Sports'));
+
+      renderForm({ channelGroup: makeGroup() });
+
+      expect(screen.getByTestId('name-input')).toBeDisabled();
+    });
+
+    it('disables the submit button for non-editable group', () => {
+      setupMocks({ canEdit: false });
+      vi.mocked(useForm).mockReturnValue(makeFormMock('Sports'));
+
+      renderForm({ channelGroup: makeGroup() });
+
+      expect(screen.getByTestId('submit-button')).toBeDisabled();
+    });
+
+    it('shows error notification and does not call API on submit for non-editable group', async () => {
+      setupMocks({ canEdit: false });
+      vi.mocked(useForm).mockReturnValue(makeFormMock('Sports'));
+
+      renderForm({ channelGroup: makeGroup() });
+
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({
+            title: 'Error',
+            message: 'Cannot edit group with M3U account associations',
+            color: 'red',
+          })
+        );
+      });
+
+      expect(API.updateChannelGroup).not.toHaveBeenCalled();
+      expect(API.addChannelGroup).not.toHaveBeenCalled();
+    });
+
+    it('does not call onClose when editing is blocked', async () => {
+      setupMocks({ canEdit: false });
+      vi.mocked(useForm).mockReturnValue(makeFormMock('Sports'));
+
+      const onClose = vi.fn();
+      renderForm({ channelGroup: makeGroup(), onClose });
+
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalled();
+      });
+
+      expect(onClose).not.toHaveBeenCalled();
+    });
+  });
+
+  // ── onClose passthrough ────────────────────────────────────────────────────
+
+  describe('modal close', () => {
+    it('calls onClose when the modal X button is clicked', () => {
+      setupMocks();
+      vi.mocked(useForm).mockReturnValue(makeFormMock(''));
+
+      const onClose = vi.fn();
+      renderForm({ onClose });
+
+      fireEvent.click(screen.getByTestId('modal-close'));
+
+      expect(onClose).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/frontend/src/components/forms/__tests__/Connection.test.jsx b/frontend/src/components/forms/__tests__/Connection.test.jsx
new file mode 100644
index 00000000..cae1b60f
--- /dev/null
+++ b/frontend/src/components/forms/__tests__/Connection.test.jsx
@@ -0,0 +1,814 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import ConnectionForm from '../Connection';
+import { useForm } from '@mantine/form';
+import * as ConnectionUtils from '../../../utils/forms/ConnectionUtils.js';
+
+// ── Constants mock ─────────────────────────────────────────────────────────────
+vi.mock('../../../constants', () => ({
+  SUBSCRIPTION_EVENTS: {
+    channel_added: 'Channel Added',
+    channel_removed: 'Channel Removed',
+    recording_started: 'Recording Started',
+  },
+}));
+
+// ── ConnectionUtils mock ───────────────────────────────────────────────────────
+vi.mock('../../../utils/forms/ConnectionUtils.js', () => ({
+  EVENT_OPTIONS: [
+    { value: 'channel_added', label: 'Channel Added' },
+    { value: 'channel_removed', label: 'Channel Removed' },
+    { value: 'recording_started', label: 'Recording Started' },
+  ],
+  buildConfig: vi.fn(),
+  buildSubscriptions: vi.fn(),
+  createConnectIntegration: vi.fn(),
+  updateConnectIntegration: vi.fn(),
+  setConnectSubscriptions: vi.fn(),
+  parseApiError: vi.fn(),
+}));
+
+// ── Mantine form mock ──────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({
+  isNotEmpty: vi.fn(() => (value) => (value ? null : 'Required')),
+  useForm: vi.fn(),
+}));
+
+// ── Mantine core mock ──────────────────────────────────────────────────────────
+vi.mock('@mantine/core', () => ({
+  Accordion: ({ children }) => <div data-testid="accordion">{children}</div>,
+  AccordionControl: ({ children }) => <div>{children}</div>,
+  AccordionItem: ({ children }) => <div>{children}</div>,
+  AccordionPanel: ({ children }) => <div>{children}</div>,
+  Alert: ({ children, color, title }) => (
+    <div data-testid="alert" data-color={color}>
+      {title && <div data-testid="alert-title">{title}</div>}
+      {children}
+    </div>
+  ),
+  Box: ({ children }) => <div>{children}</div>,
+  Button: ({ children, onClick, type, disabled, loading, color, variant }) => (
+    <button
+      data-testid={`button-${typeof children === 'string' ? children.toLowerCase().replace(/\s+/g, '-') : 'btn'}`}
+      type={type}
+      onClick={onClick}
+      disabled={disabled || loading}
+      data-color={color}
+      data-variant={variant}
+      data-loading={loading}
+    >
+      {children}
+    </button>
+  ),
+  Checkbox: ({ label, checked, onChange }) => (
+    <input
+      type="checkbox"
+      aria-label={label}
+      checked={checked ?? false}
+      onChange={onChange}
+      data-testid={`checkbox-${label}`}
+    />
+  ),
+  Flex: ({ children }) => <div>{children}</div>,
+  Group: ({ children }) => <div>{children}</div>,
+  Modal: ({ children, opened, onClose, title }) =>
+    opened ? (
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
+        <button data-testid="modal-close" onClick={onClose}>×</button>
+        {children}
+      </div>
+    ) : null,
+  Select: ({ label, value, onChange, data, disabled }) => (
+    <select
+      aria-label={label}
+      value={value ?? ''}
+      onChange={(e) => onChange?.(e.target.value)}
+      disabled={disabled}
+      data-testid={`select-${label?.toLowerCase().replace(/\s+/g, '-')}`}
+    >
+      {(data ?? []).map((opt) => (
+        <option key={opt.value ?? opt} value={opt.value ?? opt}>
+          {opt.label ?? opt}
+        </option>
+      ))}
+    </select>
+  ),
+  SimpleGrid: ({ children }) => <div>{children}</div>,
+  Stack: ({ children }) => <div>{children}</div>,
+  Tabs: ({ children, value }) => (
+    <div data-testid="tabs" data-active={value}>
+      {typeof children === 'function' ? children() : children}
+    </div>
+  ),
+  TabsList: ({ children }) => <div data-testid="tabs-list">{children}</div>,
+  TabsPanel: ({ children, value }) => (
+    <div data-testid={`tabs-panel-${value}`}>{children}</div>
+  ),
+  TabsTab: ({ children, value, onClick }) => (
+    <button
+      data-testid={`tab-${value}`}
+      onClick={onClick}
+      role="tab"
+    >
+      {children}
+    </button>
+  ),
+  Text: ({ children }) => <span>{children}</span>,
+  Textarea: ({ label, value, onChange, placeholder }) => (
+    <textarea
+      aria-label={label}
+      value={value ?? ''}
+      onChange={onChange}
+      placeholder={placeholder}
+      data-testid={`textarea-${label?.toLowerCase().replace(/\s+/g, '-')}`}
+    />
+  ),
+  TextInput: ({ label, value, onChange, error, disabled, placeholder }) => (
+    <div>
+      <input
+        aria-label={label}
+        value={value ?? ''}
+        onChange={onChange}
+        disabled={disabled}
+        placeholder={placeholder}
+        data-testid={`input-${label?.toLowerCase().replace(/\s+/g, '-')}`}
+      />
+      {error && <span data-testid={`error-${label?.toLowerCase().replace(/\s+/g, '-')}`}>{error}</span>}
+    </div>
+  ),
+}));
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+
+const makeConnection = (overrides = {}) => ({
+  id: 1,
+  name: 'My Webhook',
+  type: 'webhook',
+  enabled: true,
+  config: {
+    url: 'https://example.com/hook',
+    headers: { 'X-Token': 'abc123' },
+  },
+  subscriptions: [
+    { event: 'channel_added', enabled: true, payload_template: null },
+    { event: 'recording_started', enabled: true, payload_template: '{"id": "{{id}}"}' },
+  ],
+  ...overrides,
+});
+
+const makeScriptConnection = (overrides = {}) =>
+  makeConnection({
+    type: 'script',
+    config: { path: '/usr/local/bin/notify.sh' },
+    ...overrides,
+  });
+
+/**
+ * Builds a minimal useForm mock.
+ * `onSubmit(handler)` returns an event-handler that calls handler with
+ * form values when the <form> submits.
+ */
+const makeFormMock = (initialValues = {}) => {
+  const values = {
+    name: '',
+    type: 'webhook',
+    url: '',
+    script_path: '',
+    enabled: true,
+    ...initialValues,
+  };
+
+  return {
+    values,
+    getValues: vi.fn(() => values),
+    setValues: vi.fn((newVals) => Object.assign(values, newVals)),
+    reset: vi.fn(),
+    key: vi.fn((k) => k),
+    getInputProps: vi.fn((field) => ({
+      value: values[field] ?? '',
+      onChange: vi.fn((e) => {
+        values[field] = e?.target?.value ?? e;
+      }),
+      error: null,
+    })),
+    onSubmit: vi.fn((handler) => (e) => {
+      e?.preventDefault?.();
+      handler(values);
+    }),
+    setErrors: vi.fn(),
+  };
+};
+
+const renderForm = (props = {}) => {
+  const defaults = { isOpen: true, onClose: vi.fn(), connection: null };
+  return render(<ConnectionForm {...defaults} {...props} />);
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+
+describe('ConnectionForm', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(ConnectionUtils.createConnectIntegration).mockResolvedValue({ id: 99 });
+    vi.mocked(ConnectionUtils.updateConnectIntegration).mockResolvedValue(undefined);
+    vi.mocked(ConnectionUtils.setConnectSubscriptions).mockResolvedValue(undefined);
+    vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({ url: 'https://x.com' });
+    vi.mocked(ConnectionUtils.buildSubscriptions).mockReturnValue([]);
+    vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: '' });
+  });
+
+  // ── Visibility ─────────────────────────────────────────────────────────────
+
+  describe('visibility', () => {
+    it('renders nothing when isOpen is false', () => {
+      vi.mocked(useForm).mockReturnValue(makeFormMock());
+      renderForm({ isOpen: false });
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+    });
+
+    it('renders the modal when isOpen is true', () => {
+      vi.mocked(useForm).mockReturnValue(makeFormMock());
+      renderForm({ isOpen: true });
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('renders "Connection" as the modal title', () => {
+      vi.mocked(useForm).mockReturnValue(makeFormMock());
+      renderForm();
+      expect(screen.getByTestId('modal-title')).toHaveTextContent('Connection');
+    });
+  });
+
+  // ── New connection ─────────────────────────────────────────────────────────
+
+  describe('new connection', () => {
+    it('resets form when connection is null', () => {
+      const form = makeFormMock();
+      vi.mocked(useForm).mockReturnValue(form);
+      renderForm({ connection: null });
+      expect(form.reset).toHaveBeenCalled();
+    });
+
+    it('calls createConnectIntegration on submit', async () => {
+      const form = makeFormMock({ name: 'New Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection: null });
+
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.createConnectIntegration).toHaveBeenCalledWith(
+          expect.objectContaining({ name: 'New Hook', type: 'webhook' }),
+          expect.objectContaining({ url: 'https://x.com' })
+        );
+      });
+    });
+
+    it('does not call updateConnectIntegration when creating', async () => {
+      const form = makeFormMock({ name: 'New Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection: null });
+
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.createConnectIntegration).toHaveBeenCalled();
+      });
+      expect(ConnectionUtils.updateConnectIntegration).not.toHaveBeenCalled();
+    });
+
+    it('calls setConnectSubscriptions with newly created connection', async () => {
+      const created = { id: 99, name: 'New Hook' };
+      vi.mocked(ConnectionUtils.createConnectIntegration).mockResolvedValue(created);
+
+      const form = makeFormMock({ name: 'New Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection: null });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.setConnectSubscriptions).toHaveBeenCalledWith(
+          created,
+          expect.any(Array)
+        );
+      });
+    });
+
+    it('calls onClose after successful create', async () => {
+      const form = makeFormMock({ name: 'New Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      const onClose = vi.fn();
+      renderForm({ connection: null, onClose });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+    });
+  });
+
+  // ── Edit existing connection ───────────────────────────────────────────────
+
+  describe('editing an existing connection', () => {
+    it('calls form.setValues with connection data on mount', () => {
+      const connection = makeConnection();
+      const form = makeFormMock();
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection });
+
+      expect(form.setValues).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: 'My Webhook',
+          type: 'webhook',
+          url: 'https://example.com/hook',
+          enabled: true,
+        })
+      );
+    });
+
+    it('calls updateConnectIntegration on submit', async () => {
+      const connection = makeConnection();
+      const form = makeFormMock({
+        name: 'My Webhook',
+        type: 'webhook',
+        url: 'https://example.com/hook',
+      });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.updateConnectIntegration).toHaveBeenCalledWith(
+          connection,
+          expect.objectContaining({ name: 'My Webhook' }),
+          expect.any(Object)
+        );
+      });
+    });
+
+    it('does not call createConnectIntegration when editing', async () => {
+      const connection = makeConnection();
+      const form = makeFormMock({ name: 'My Webhook', type: 'webhook', url: 'https://example.com/hook' });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.updateConnectIntegration).toHaveBeenCalled();
+      });
+      expect(ConnectionUtils.createConnectIntegration).not.toHaveBeenCalled();
+    });
+
+    it('calls setConnectSubscriptions with existing connection on update', async () => {
+      const connection = makeConnection();
+      const form = makeFormMock({ name: 'My Webhook', type: 'webhook', url: 'https://example.com/hook' });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.setConnectSubscriptions).toHaveBeenCalledWith(
+          connection,
+          expect.any(Array)
+        );
+      });
+    });
+
+    it('calls onClose after successful update', async () => {
+      const connection = makeConnection();
+      const form = makeFormMock({ name: 'My Webhook', type: 'webhook', url: 'https://example.com/hook' });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      const onClose = vi.fn();
+      renderForm({ connection, onClose });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+    });
+
+    it('populates subscriptions from connection.subscriptions', () => {
+      const connection = makeConnection();
+      const form = makeFormMock();
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection });
+
+      // channel_added and recording_started are enabled in makeConnection()
+      expect(screen.getByTestId('checkbox-Channel Added')).toBeChecked();
+      expect(screen.getByTestId('checkbox-Recording Started')).toBeChecked();
+      expect(screen.getByTestId('checkbox-Channel Removed')).not.toBeChecked();
+    });
+
+    it('populates headers from connection.config.headers', () => {
+      const connection = makeConnection();
+      const form = makeFormMock();
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection });
+
+      // The header key 'X-Token' should be rendered in an input
+      expect(screen.getByDisplayValue('X-Token')).toBeInTheDocument();
+      expect(screen.getByDisplayValue('abc123')).toBeInTheDocument();
+    });
+
+    it('initializes payloadTemplates from subscriptions', () => {
+      const connection = makeConnection();
+      const form = makeFormMock();
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection });
+
+      // The recording_started payload template textarea should contain the template
+      expect(screen.getByDisplayValue('{"id": "{{id}}"}')).toBeInTheDocument();
+    });
+  });
+
+  // ── Script connection ──────────────────────────────────────────────────────
+
+  describe('script connection', () => {
+    it('builds config with path for script type', async () => {
+      const form = makeFormMock({
+        name: 'My Script',
+        type: 'script',
+        script_path: '/usr/local/bin/notify.sh',
+      });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({ path: '/usr/local/bin/notify.sh' });
+
+      renderForm({ connection: null });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.createConnectIntegration).toHaveBeenCalledWith(
+          expect.any(Object),
+          expect.objectContaining({ path: '/usr/local/bin/notify.sh' })
+        );
+      });
+    });
+
+    it('sets script_path from existing script connection', () => {
+      const connection = makeScriptConnection();
+      const form = makeFormMock();
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection });
+
+      expect(form.setValues).toHaveBeenCalledWith(
+        expect.objectContaining({
+          type: 'script',
+          script_path: '/usr/local/bin/notify.sh',
+        })
+      );
+    });
+  });
+
+  // ── Webhook config ─────────────────────────────────────────────────────────
+
+  describe('webhook config', () => {
+    it('builds config with url for webhook type', async () => {
+      const form = makeFormMock({
+        name: 'Hook',
+        type: 'webhook',
+        url: 'https://example.com/webhook',
+      });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({ url: 'https://example.com/webhook' });
+
+      renderForm({ connection: null });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.createConnectIntegration).toHaveBeenCalledWith(
+          expect.any(Object),
+          expect.objectContaining({ url: 'https://example.com/webhook' })
+        );
+      });
+    });
+
+    it('includes headers in webhook config when header rows are filled', async () => {
+      const connection = makeConnection();
+      const form = makeFormMock({
+        name: 'My Webhook',
+        type: 'webhook',
+        url: 'https://example.com/hook',
+      });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({
+        url: 'https://example.com/hook', headers: { 'X-Token': 'abc123' } });
+
+      renderForm({ connection });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.updateConnectIntegration).toHaveBeenCalledWith(
+          expect.any(Object),
+          expect.any(Object),
+          expect.objectContaining({ headers: { 'X-Token': 'abc123' } })
+        );
+      });
+    });
+
+    it('omits headers from webhook config when all header rows are empty', async () => {
+      const connection = makeConnection({ config: { url: 'https://example.com/hook', headers: {} } });
+      const form = makeFormMock({
+        name: 'My Webhook',
+        type: 'webhook',
+        url: 'https://example.com/hook',
+      });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.updateConnectIntegration).toHaveBeenCalledWith(
+          expect.any(Object),
+          expect.any(Object),
+          expect.not.objectContaining({ headers: expect.anything() })
+        );
+      });
+    });
+  });
+
+  // ── Subscriptions ──────────────────────────────────────────────────────────
+
+  describe('subscriptions', () => {
+    it('passes subscription list with enabled flags to setConnectSubscriptions', async () => {
+      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.buildSubscriptions).mockReturnValue([
+        { event: 'channel_added', enabled: true, payload_template: null },
+        { event: 'channel_removed', enabled: false, payload_template: null },
+        { event: 'recording_started', enabled: true, payload_template: '{"id": "{{id}}"}' },
+      ]);
+
+
+      renderForm({ connection: null });
+
+      // Toggle channel_added on
+      fireEvent.click(screen.getByTestId('checkbox-Channel Added'));
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.setConnectSubscriptions).toHaveBeenCalledWith(
+          expect.any(Object),
+          expect.arrayContaining([
+            expect.objectContaining({ event: 'channel_added', enabled: true }),
+            expect.objectContaining({ event: 'channel_removed', enabled: false }),
+            expect.objectContaining({ event: 'recording_started', enabled: true }),
+          ])
+        );
+      });
+    });
+
+    it('toggles event off when checkbox is clicked twice', async () => {
+      const connection = makeConnection();
+      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.buildSubscriptions).mockReturnValue([
+        { event: 'channel_added', enabled: false, payload_template: null },
+        { event: 'channel_removed', enabled: false, payload_template: null },
+        { event: 'recording_started', enabled: true, payload_template: '{"id": "{{id}}"}' },
+      ]);
+
+      renderForm({ connection });
+
+      // channel_added starts checked — click to uncheck
+      fireEvent.click(screen.getByTestId('checkbox-Channel Added'));
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(ConnectionUtils.setConnectSubscriptions).toHaveBeenCalledWith(
+          expect.any(Object),
+          expect.arrayContaining([
+            expect.objectContaining({ event: 'channel_added', enabled: false }),
+            expect.objectContaining({ event: 'channel_removed', enabled: false }),
+            expect.objectContaining({ event: 'recording_started', enabled: true }),
+          ])
+        );
+      });
+    });
+
+    it('includes payload_template in subscription when set', async () => {
+      const connection = makeConnection();
+      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.buildSubscriptions).mockReturnValue([
+        { event: 'recording_started', enabled: true, payload_template: '{"id": "{{id}}"}' },
+      ]);
+
+      renderForm({ connection });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        const subs = vi.mocked(ConnectionUtils.setConnectSubscriptions).mock.calls[0][1];
+        const recordingSub = subs.find((s) => s.event === 'recording_started');
+        expect(recordingSub).toBeDefined();
+        expect(recordingSub.payload_template).toBe('{"id": "{{id}}"}');
+      });
+    });
+
+    it('sends null payload_template when not set for an event', async () => {
+      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+
+      renderForm({ connection: null });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        const subs = vi.mocked(ConnectionUtils.setConnectSubscriptions).mock.calls[0][1];
+        subs.forEach((s) => expect(s.payload_template).toBeNull());
+      });
+    });
+  });
+
+  // ── Error handling ─────────────────────────────────────────────────────────
+
+  describe('error handling', () => {
+    it('shows error alert when createConnectIntegration throws', async () => {
+      vi.mocked(ConnectionUtils.createConnectIntegration).mockRejectedValue(
+        new Error('Server error')
+      );
+      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'Server error' });
+
+      renderForm({ connection: null });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(screen.getByText('Server error')).toBeInTheDocument();
+      });
+    });
+
+    it('shows error alert when updateConnectIntegration throws', async () => {
+      vi.mocked(ConnectionUtils.updateConnectIntegration).mockRejectedValue(
+        new Error('Update failed')
+      );
+      const connection = makeConnection();
+      const form = makeFormMock({ name: 'My Webhook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'Update failed' });
+
+      renderForm({ connection });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(screen.getByText('Update failed')).toBeInTheDocument();
+      });
+    });
+
+    it('does not call onClose when submission throws', async () => {
+      vi.mocked(ConnectionUtils.createConnectIntegration).mockRejectedValue(
+        new Error('fail')
+      );
+      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'fail' });
+
+      const onClose = vi.fn();
+      renderForm({ connection: null, onClose });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => {
+        expect(screen.getByText('fail')).toBeInTheDocument();
+      });
+      expect(onClose).not.toHaveBeenCalled();
+    });
+
+    it('clears previous API error on new submit attempt', async () => {
+      vi.mocked(ConnectionUtils.createConnectIntegration)
+        .mockRejectedValueOnce(new Error('First error'))
+        .mockResolvedValueOnce({ id: 99 });
+
+      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'First error' });
+
+      renderForm({ connection: null });
+
+      // First submit — fails
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+      await waitFor(() => expect(screen.queryByText('First error')).toBeInTheDocument());
+
+      // Second submit — succeeds
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+      await waitFor(() => expect(screen.queryByText('First error')).not.toBeInTheDocument());
+    });
+  });
+
+  // ── Modal close ────────────────────────────────────────────────────────────
+
+  describe('modal close', () => {
+    it('calls onClose when the modal X button is clicked', () => {
+      vi.mocked(useForm).mockReturnValue(makeFormMock());
+      const onClose = vi.fn();
+      renderForm({ onClose });
+
+      fireEvent.click(screen.getByTestId('modal-close'));
+
+      expect(onClose).toHaveBeenCalled();
+    });
+
+    it('clears apiError when handleClose is called', async () => {
+      vi.mocked(ConnectionUtils.createConnectIntegration).mockRejectedValue(
+        new Error('fail')
+      );
+      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      vi.mocked(useForm).mockReturnValue(form);
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'fail' });
+
+      renderForm({ connection: null });
+      fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
+
+      await waitFor(() => expect(screen.queryByText('fail')).toBeInTheDocument());
+
+      fireEvent.click(screen.getByTestId('modal-close'));
+
+      await waitFor(() => expect(screen.queryByText('fail')).not.toBeInTheDocument());
+    });
+  });
+
+  // ── Header management ──────────────────────────────────────────────────────
+
+  describe('header row management', () => {
+    it('renders an empty header row for new connection', () => {
+      vi.mocked(useForm).mockReturnValue(makeFormMock());
+      renderForm({ connection: null });
+
+      // One empty key input should be present
+      const keyInputs = screen.getAllByPlaceholderText(/Header name/i);
+      expect(keyInputs).toHaveLength(1);
+      expect(keyInputs[0]).toHaveValue('');
+    });
+
+    it('adds a new header row when Add Header is clicked', async () => {
+      vi.mocked(useForm).mockReturnValue(makeFormMock());
+      renderForm({ connection: null });
+
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('Add Header'));
+      });
+
+      const keyInputs = screen.getAllByPlaceholderText(/Header name/i);
+      expect(keyInputs).toHaveLength(2);
+    });
+
+    it('removes a header row when the remove button is clicked', async () => {
+      const connection = makeConnection();
+      vi.mocked(useForm).mockReturnValue(makeFormMock());
+      renderForm({ connection });
+
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('Add Header'));
+      });
+
+      const removeButtons = screen.getAllByTestId('button-remove');
+      await waitFor(() => {
+        fireEvent.click(removeButtons[1]);
+      });
+
+      const keyInputs = screen.getAllByPlaceholderText(/Header name/i);
+      expect(keyInputs).toHaveLength(1);
+    });
+
+    it('does not remove the last header row', async () => {
+      const connection = makeConnection();
+      vi.mocked(useForm).mockReturnValue(makeFormMock());
+      renderForm({ connection });
+
+      const removeButton = screen.getByTestId('button-remove');
+      await waitFor(() => {
+        fireEvent.click(removeButton);
+      });
+
+      const keyInputs = screen.getAllByPlaceholderText(/Header name/i);
+      expect(keyInputs).toHaveLength(1);
+    });
+
+    it('updates header key value when typed into', async () => {
+      vi.mocked(useForm).mockReturnValue(makeFormMock());
+      renderForm({ connection: null });
+
+      const keyInput = screen.getByPlaceholderText(/Header name/i);
+      await waitFor(() => {
+        fireEvent.change(keyInput, { target: { value: 'Authorization' } });
+      });
+
+      expect(screen.getByDisplayValue('Authorization')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/frontend/src/components/forms/__tests__/CronBuilder.test.jsx b/frontend/src/components/forms/__tests__/CronBuilder.test.jsx
new file mode 100644
index 00000000..26584384
--- /dev/null
+++ b/frontend/src/components/forms/__tests__/CronBuilder.test.jsx
@@ -0,0 +1,447 @@
+import { render, screen, fireEvent, within } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import CronBuilder from '../CronBuilder';
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../utils/forms/CronBuilderUtils.js', () => ({
+  buildCron: vi.fn(),
+  parseCronPreset: vi.fn(),
+  CRON_FIELDS: [
+    { index: 0, label: 'Minute (0-59)',              placeholder: '*, 0, */15' },
+    { index: 1, label: 'Hour (0-23)',                placeholder: '*, 0, 9-17' },
+    { index: 2, label: 'Day of Month (1-31)',        placeholder: '*, 1, 1-15' },
+    { index: 3, label: 'Month (1-12)',               placeholder: '*, 1, 1-6'  },
+    { index: 4, label: 'Day of Week (0-6, Sun-Sat)', placeholder: '*, 0, 1-5'  },
+  ],
+  DAYS_OF_WEEK: [
+    { value: '*',  label: 'Every day'  },
+    { value: '1',  label: 'Monday'     },
+    { value: '2',  label: 'Tuesday'    },
+  ],
+  FREQUENCY_OPTIONS: [
+    { value: 'hourly',  label: 'Hourly'  },
+    { value: 'daily',   label: 'Daily'   },
+    { value: 'weekly',  label: 'Weekly'  },
+    { value: 'monthly', label: 'Monthly' },
+  ],
+  PRESETS: [
+    { label: 'Every Hour',    description: 'Runs every hour',          value: '0 * * * *'   },
+    { label: 'Every Day 3am', description: 'Runs every day at 3 AM',   value: '0 3 * * *'   },
+    { label: 'Every Sunday',  description: 'Runs every Sunday at 3AM', value: '0 3 * * 0'   },
+  ],
+  updateCronPart: vi.fn(),
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', async () => ({
+  Badge: ({ children, size, variant, color }) => (
+    <span data-testid="badge" data-size={size} data-variant={variant} data-color={color}>
+      {children}
+    </span>
+  ),
+  Button: ({ children, onClick, variant }) => (
+    <button onClick={onClick} data-variant={variant}>
+      {children}
+    </button>
+  ),
+  Code: ({ children }) => <code>{children}</code>,
+  Divider: ({ label }) => <hr data-label={label} />,
+  Group: ({ children }) => <div>{children}</div>,
+  Modal: ({ children, opened, onClose, title }) =>
+    opened ? (
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
+        <button data-testid="modal-close" onClick={onClose}>×</button>
+        {children}
+      </div>
+    ) : null,
+  NumberInput: ({ label, value, onChange, min, max }) => (
+    <div>
+      <label>{label}</label>
+      <input
+        type="number"
+        aria-label={label}
+        value={value}
+        min={min}
+        max={max}
+        onChange={(e) => onChange(Number(e.target.value))}
+      />
+    </div>
+  ),
+  Paper: ({ children }) => <div data-testid="paper">{children}</div>,
+  Select: ({ label, data, value, onChange }) => (
+    <div>
+      <label>{label}</label>
+      <select
+        aria-label={label}
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+      >
+        {data.map((opt) => (
+          <option key={opt.value} value={opt.value}>
+            {opt.label}
+          </option>
+        ))}
+      </select>
+    </div>
+  ),
+  SimpleGrid: ({ children }) => <div>{children}</div>,
+  Stack: ({ children }) => <div>{children}</div>,
+  Tabs: ({ children, value }) => (
+    <div data-testid="tabs" data-value={value}>
+      {typeof children === 'function' ? children() : children}
+    </div>
+  ),
+  TabsList: ({ children }) => <div data-testid="tabs-list">{children}</div>,
+  TabsPanel: ({ children, value: panelValue }) => (
+    <div data-testid={`panel-${panelValue}`}>{children}</div>
+  ),
+  TabsTab: ({ children, value, onClick }) => (
+    <button data-testid={`tab-${value}`} onClick={onClick}>
+      {children}
+    </button>
+  ),
+  Text: ({ children, size, fw, c }) => (
+    <span data-size={size} data-fw={fw} data-color={c}>
+      {children}
+    </span>
+  ),
+  TextInput: ({ label, placeholder, value, onChange }) => (
+    <div>
+      <label>{label}</label>
+      <input
+        aria-label={label}
+        placeholder={placeholder}
+        value={value}
+        onChange={onChange}
+      />
+    </div>
+  ),
+}));
+
+// ── lucide-react ───────────────────────────────────────────────────────────────
+vi.mock('lucide-react', () => ({
+  Calendar: () => <svg data-testid="icon-calendar" />,
+  Clock:    () => <svg data-testid="icon-clock"    />,
+}));
+
+// ── Imports after mocks ────────────────────────────────────────────────────────
+import * as CronBuilderUtils from '../../../utils/forms/CronBuilderUtils.js';
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+const defaultProps = {
+  opened: true,
+  onClose: vi.fn(),
+  onApply: vi.fn(),
+  currentValue: '',
+};
+
+const renderBuilder = (props = {}) =>
+  render(<CronBuilder {...defaultProps} {...props} />);
+
+describe('CronBuilder', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(CronBuilderUtils.buildCron).mockReturnValue('0 3 * * *');
+    vi.mocked(CronBuilderUtils.parseCronPreset).mockReturnValue({
+      frequency: 'daily',
+      minute: 0,
+      hour: 3,
+      dayOfWeek: '*',
+      dayOfMonth: 1,
+    });
+    vi.mocked(CronBuilderUtils.updateCronPart).mockImplementation(
+      (cron, index, value) => {
+        const parts = cron.split(' ');
+        parts[index] = value || '*';
+        return parts.join(' ');
+      }
+    );
+  });
+
+  // ── Modal visibility ─────────────────────────────────────────────────────
+
+  describe('modal visibility', () => {
+    it('renders the modal when opened is true', () => {
+      renderBuilder();
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('does not render the modal when opened is false', () => {
+      renderBuilder({ opened: false });
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+    });
+
+    it('displays the correct modal title', () => {
+      renderBuilder();
+      expect(screen.getByTestId('modal-title')).toHaveTextContent(
+        'Cron Expression Builder'
+      );
+    });
+
+    it('calls onClose when the close button is clicked', () => {
+      const onClose = vi.fn();
+      renderBuilder({ onClose });
+      fireEvent.click(screen.getByTestId('modal-close'));
+      expect(onClose).toHaveBeenCalledOnce();
+    });
+
+    it('calls onClose when Cancel button is clicked', () => {
+      const onClose = vi.fn();
+      renderBuilder({ onClose });
+      fireEvent.click(screen.getByText('Cancel'));
+      expect(onClose).toHaveBeenCalledOnce();
+    });
+  });
+
+  // ── Tab rendering ────────────────────────────────────────────────────────
+
+  describe('tab rendering', () => {
+    it('renders the Simple tab', () => {
+      renderBuilder();
+      expect(screen.getByTestId('tab-simple')).toBeInTheDocument();
+    });
+
+    it('renders the Advanced tab', () => {
+      renderBuilder();
+      expect(screen.getByTestId('tab-advanced')).toBeInTheDocument();
+    });
+
+    it('renders the simple panel content by default', () => {
+      renderBuilder();
+      expect(screen.getByTestId('panel-simple')).toBeInTheDocument();
+    });
+
+    it('renders the advanced panel content', () => {
+      renderBuilder();
+      expect(screen.getByTestId('panel-advanced')).toBeInTheDocument();
+    });
+  });
+
+  // ── Simple tab — presets ─────────────────────────────────────────────────
+
+  describe('presets', () => {
+    it('renders all preset buttons', () => {
+      renderBuilder();
+      expect(screen.getByText('Every Hour')).toBeInTheDocument();
+      expect(screen.getByText('Every Day 3am')).toBeInTheDocument();
+      expect(screen.getByText('Every Sunday')).toBeInTheDocument();
+    });
+
+    it('renders preset descriptions', () => {
+      renderBuilder();
+      expect(screen.getByText('Runs every hour')).toBeInTheDocument();
+    });
+
+    it('renders preset cron value badges', () => {
+      renderBuilder();
+      expect(screen.getByText('0 * * * *')).toBeInTheDocument();
+    });
+
+    it('calls parseCronPreset with the preset value on click', () => {
+      renderBuilder();
+      fireEvent.click(screen.getByText('Every Hour'));
+      expect(CronBuilderUtils.parseCronPreset).toHaveBeenCalledWith('0 * * * *');
+    });
+
+    it('updates state from parseCronPreset result on preset click', () => {
+      vi.mocked(CronBuilderUtils.parseCronPreset).mockReturnValue({
+        frequency: 'hourly',
+        minute: 0,
+        hour: 0,
+        dayOfWeek: '*',
+        dayOfMonth: 1,
+      });
+      renderBuilder();
+      fireEvent.click(screen.getByText('Every Hour'));
+      // buildCron should be called with the updated frequency
+      expect(CronBuilderUtils.buildCron).toHaveBeenCalledWith(
+        'hourly', 0, 0, '*', 1
+      );
+    });
+  });
+
+  // ── Simple tab — custom builder ──────────────────────────────────────────
+
+  describe('custom builder', () => {
+    const getSimplePanel = () => screen.getByTestId('panel-simple');
+
+    it('renders the Frequency select', () => {
+      renderBuilder();
+      expect(within(getSimplePanel()).getByLabelText('Frequency')).toBeInTheDocument();
+    });
+
+    it('renders the Minute input', () => {
+      renderBuilder();
+      expect(within(getSimplePanel()).getByLabelText('Minute (0-59)')).toBeInTheDocument();
+    });
+
+    it('renders the Hour input when frequency is not hourly', () => {
+      renderBuilder();
+      expect(within(getSimplePanel()).getByLabelText('Hour (0-23)')).toBeInTheDocument();
+    });
+
+    it('does not render Hour input when frequency is hourly', () => {
+      renderBuilder();
+      const freqSelect = within(getSimplePanel()).getByLabelText('Frequency');
+      fireEvent.change(freqSelect, { target: { value: 'hourly' } });
+      expect(within(getSimplePanel()).queryByLabelText('Hour (0-23)')).not.toBeInTheDocument();
+    });
+
+    it('renders Day of Week select when frequency is weekly', () => {
+      renderBuilder();
+      const freqSelect = within(getSimplePanel()).getByLabelText('Frequency');
+      fireEvent.change(freqSelect, { target: { value: 'weekly' } });
+      expect(within(getSimplePanel()).getByLabelText('Day of Week')).toBeInTheDocument();
+    });
+
+    it('does not render Day of Week for daily frequency', () => {
+      renderBuilder();
+      expect(within(getSimplePanel()).queryByLabelText('Day of Week')).not.toBeInTheDocument();
+    });
+
+    it('renders Day of Month input when frequency is monthly', () => {
+      renderBuilder();
+      const freqSelect = within(getSimplePanel()).getByLabelText('Frequency');
+      fireEvent.change(freqSelect, { target: { value: 'monthly' } });
+      expect(within(getSimplePanel()).getByLabelText('Day of Month (1-31)')).toBeInTheDocument();
+    });
+
+    it('does not render Day of Month for daily frequency', () => {
+      renderBuilder();
+      expect(within(getSimplePanel()).queryByLabelText('Day of Month (1-31)')).not.toBeInTheDocument();
+    });
+
+    it('calls buildCron when minute changes', () => {
+      renderBuilder();
+      fireEvent.change(within(getSimplePanel()).getByLabelText('Minute (0-59)'), {
+        target: { value: 30 },
+      });
+      expect(CronBuilderUtils.buildCron).toHaveBeenCalledWith('daily', 30, 3, '*', 1);
+    });
+
+    it('calls buildCron when hour changes', () => {
+      renderBuilder();
+      fireEvent.change(within(getSimplePanel()).getByLabelText('Hour (0-23)'), {
+        target: { value: 8 },
+      });
+      expect(CronBuilderUtils.buildCron).toHaveBeenCalledWith('daily', 0, 8, '*', 1);
+    });
+  });
+
+  // ── Advanced tab ─────────────────────────────────────────────────────────
+
+  describe('advanced tab', () => {
+    const getAdvancedPanel = () => screen.getByTestId('panel-advanced');
+
+    it('renders all 5 cron field inputs', () => {
+      renderBuilder();
+      expect(within(getAdvancedPanel()).getByLabelText('Minute (0-59)')).toBeInTheDocument();
+      expect(within(getAdvancedPanel()).getByLabelText('Hour (0-23)')).toBeInTheDocument();
+      expect(within(getAdvancedPanel()).getByLabelText('Day of Month (1-31)')).toBeInTheDocument();
+      expect(within(getAdvancedPanel()).getByLabelText('Month (1-12)')).toBeInTheDocument();
+      expect(within(getAdvancedPanel()).getByLabelText('Day of Week (0-6, Sun-Sat)')).toBeInTheDocument();
+    });
+
+    it('renders descriptive helper text', () => {
+      renderBuilder();
+      expect(screen.getByText(/Build advanced cron expressions/)).toBeInTheDocument();
+    });
+
+    it('calls updateCronPart when an advanced field changes', () => {
+      renderBuilder();
+      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      fireEvent.change(minuteInput, { target: { value: '30' } });
+      expect(CronBuilderUtils.updateCronPart).toHaveBeenCalledWith(
+        '* * * * *', 0, '30'
+      );
+    });
+
+    it('initializes advanced fields from currentValue when opened', () => {
+      renderBuilder({ currentValue: '5 4 * * 1' });
+      // The minute field (index 0) should display '5'
+      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      expect(minuteInput).toHaveValue('5');
+    });
+  });
+
+  // ── Expression preview ───────────────────────────────────────────────────
+
+  describe('expression preview', () => {
+    it('displays the generated cron expression in simple mode', () => {
+      vi.mocked(CronBuilderUtils.buildCron).mockReturnValue('0 3 * * *');
+      renderBuilder();
+      const badges = screen.getAllByTestId('badge');
+      const exprBadge = badges.find((b) => b.textContent === '0 3 * * *');
+      expect(exprBadge).toBeInTheDocument();
+    });
+
+    it('displays manualCron in advanced mode', () => {
+      renderBuilder({ currentValue: '5 4 * * 1', opened: true });
+      // In advanced panel the badge value should reflect manualCron
+      const badges = screen.getAllByTestId('badge');
+      // The last large badge shows the active expression
+      const exprBadge = badges.find((b) => b.dataset.size === 'lg');
+      expect(exprBadge).toBeInTheDocument();
+    });
+  });
+
+  // ── Apply action ─────────────────────────────────────────────────────────
+
+  describe('apply action', () => {
+    const getAdvancedPanel = () => screen.getByTestId('panel-advanced');
+
+    it('calls onApply with the generated cron in simple mode', () => {
+      vi.mocked(CronBuilderUtils.buildCron).mockReturnValue('0 3 * * *');
+      const onApply = vi.fn();
+      const onClose = vi.fn();
+      renderBuilder({ onApply, onClose });
+      fireEvent.click(screen.getByText('Apply Expression'));
+      expect(onApply).toHaveBeenCalledWith('0 3 * * *');
+    });
+
+    it('calls onClose after applying', () => {
+      const onApply = vi.fn();
+      const onClose = vi.fn();
+      renderBuilder({ onApply, onClose });
+      fireEvent.click(screen.getByText('Apply Expression'));
+      expect(onClose).toHaveBeenCalledOnce();
+    });
+
+    it('calls onApply with manualCron when in advanced mode', () => {
+      const onApply = vi.fn();
+      const onClose = vi.fn();
+      renderBuilder({ onApply, onClose, currentValue: '5 4 * * 1' });
+
+      // Switch to advanced mode by simulating tab onChange
+      // The Tabs mock renders but doesn't fire onChange on tab clicks,
+      // so we directly test that advanced panel input changes manualCron
+      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      // The advanced panel's minute input value should be '5'
+      expect(minuteInput).toHaveValue('5');
+    });
+  });
+
+  // ── currentValue initialization ──────────────────────────────────────────
+
+  describe('currentValue initialization', () => {
+    const getAdvancedPanel = () => screen.getByTestId('panel-advanced');
+
+    it('sets manualCron to currentValue when opened', () => {
+      renderBuilder({ currentValue: '*/15 * * * *' });
+      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      expect(minuteInput).toHaveValue('*/15');
+    });
+
+    it('keeps default manualCron when currentValue is empty', () => {
+      renderBuilder({ currentValue: '' });
+      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      expect(minuteInput).toHaveValue('*');
+    });
+
+    it('does not update manualCron when opened is false', () => {
+      renderBuilder({ opened: false, currentValue: '5 4 * * 1' });
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/__tests__/DummyEPG.test.jsx b/frontend/src/components/forms/__tests__/DummyEPG.test.jsx
new file mode 100644
index 00000000..d7a55446
--- /dev/null
+++ b/frontend/src/components/forms/__tests__/DummyEPG.test.jsx
@@ -0,0 +1,746 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import DummyEPGForm from '../DummyEPG';
+
+// ── Store mocks ────────────────────────────────────────────────────────────────
+vi.mock('../../../store/epgs', () => ({ default: vi.fn() }));
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../utils/notificationUtils.js', () => ({
+  showNotification: vi.fn(),
+}));
+
+vi.mock('../../../utils/forms/DummyEpgUtils.js', () => ({
+  addEPG: vi.fn(),
+  addNormalizedGroups: vi.fn((groups) => {
+    if (!groups) return {};
+    const normalized = { ...groups };
+    Object.keys(groups).forEach((key) => {
+      normalized[`${key}_normalize`] = String(groups[key])
+        .toLowerCase()
+        .replace(/[^a-z0-9]/g, '');
+    });
+    return normalized;
+  }),
+  applyTemplates: vi.fn((templates, allGroups, hasMatch) => {
+    if (!hasMatch || !allGroups) return {};
+    const fill = (tpl) =>
+      tpl
+        ? Object.entries(allGroups).reduce(
+          (s, [k, v]) => s.replaceAll(`{${k}}`, v),
+          tpl
+        )
+        : '';
+    return {
+      formattedTitle:                fill(templates.titleTemplate),
+      formattedSubtitle:             fill(templates.subtitleTemplate),
+      formattedDescription:          fill(templates.descriptionTemplate),
+      formattedUpcomingTitle:        fill(templates.upcomingTitleTemplate),
+      formattedUpcomingDescription:  fill(templates.upcomingDescriptionTemplate),
+      formattedEndedTitle:           fill(templates.endedTitleTemplate),
+      formattedEndedDescription:     fill(templates.endedDescriptionTemplate),
+      formattedChannelLogoUrl:       fill(templates.channelLogoUrl),
+      formattedProgramPosterUrl:     fill(templates.programPosterUrl),
+    };
+  }),
+  buildCustomProperties: vi.fn((custom = {}) => ({
+    title_pattern:                custom.title_pattern                || '',
+    time_pattern:                 custom.time_pattern                 || '',
+    date_pattern:                 custom.date_pattern                 || '',
+    timezone:                     custom.timezone                     || 'US/Eastern',
+    output_timezone:              custom.output_timezone              || '',
+    program_duration:             custom.program_duration             || 180,
+    sample_title:                 custom.sample_title                 || '',
+    title_template:               custom.title_template               || '',
+    subtitle_template:            custom.subtitle_template            || '',
+    description_template:         custom.description_template         || '',
+    upcoming_title_template:      custom.upcoming_title_template      || '',
+    upcoming_description_template:custom.upcoming_description_template|| '',
+    ended_title_template:         custom.ended_title_template         || '',
+    ended_description_template:   custom.ended_description_template   || '',
+    fallback_title_template:      custom.fallback_title_template      || '',
+    fallback_description_template:custom.fallback_description_template|| '',
+    channel_logo_url:             custom.channel_logo_url             || '',
+    program_poster_url:           custom.program_poster_url           || '',
+    name_source:                  custom.name_source                  || 'channel',
+    stream_index:                 custom.stream_index                 || 1,
+    category:                     custom.category                     || '',
+    include_date:                 custom.include_date                 ?? true,
+    include_live:                 custom.include_live                 ?? false,
+    include_new:                  custom.include_new                  ?? false,
+  })),
+  buildTimePlaceholders: vi.fn((timeGroups) => {
+    if (!timeGroups || !timeGroups.hour) return {};
+    const hour   = parseInt(timeGroups.hour,   10);
+    const minute = String(timeGroups.minute ?? '00').padStart(2, '0');
+    const ampm   = timeGroups.ampm ? ` ${timeGroups.ampm}` : '';
+    return {
+      starttime:   `${hour}:${minute}${ampm}`,
+      starttime24: `${String(hour).padStart(2, '0')}:${minute}`,
+      endtime:     `${(hour + 3) % 24}:${minute}${ampm}`,
+      endtime24:   `${String((hour + 3) % 24).padStart(2, '0')}:${minute}`,
+    };
+  }),
+  getDummyEpgFormInitialValues: vi.fn(() => ({
+    name: '',
+    is_active: true,
+    source_type: 'dummy',
+    custom_properties: {
+      title_pattern:                '',
+      time_pattern:                 '',
+      date_pattern:                 '',
+      timezone:                     'US/Eastern',
+      output_timezone:              '',
+      program_duration:             180,
+      sample_title:                 '',
+      title_template:               '',
+      subtitle_template:            '',
+      description_template:         '',
+      upcoming_title_template:      '',
+      upcoming_description_template:'',
+      ended_title_template:         '',
+      ended_description_template:   '',
+      fallback_title_template:      '',
+      fallback_description_template:'',
+      channel_logo_url:             '',
+      program_poster_url:           '',
+      name_source:                  'channel',
+      stream_index:                 1,
+      category:                     '',
+      include_date:                 true,
+      include_live:                 false,
+      include_new:                  false,
+    },
+  })),
+  getTimezones: vi.fn().mockResolvedValue({
+    timezones: ['US/Eastern', 'US/Pacific', 'UTC'],
+  }),
+  matchPattern: vi.fn((pattern, sample, errorLabel = 'Pattern error') => {
+    if (!pattern) return { matched: false, groups: {}, error: null };
+    try {
+      const regex  = new RegExp(pattern, 'u');
+      const result = regex.exec(sample ?? '');
+      if (!result) return { matched: false, groups: {}, error: null };
+      const groups = result.groups ?? {};
+      return { matched: true, groups, error: null };
+    } catch {
+      return { matched: false, groups: {}, error: `${errorLabel}: invalid regex` };
+    }
+  }),
+  updateEPG: vi.fn(),
+  validateCustomNameSource:    vi.fn(() => null),
+  validateCustomStreamIndex:   vi.fn(() => null),
+  validateCustomTitlePattern:  vi.fn(() => null),
+}));
+
+// ── Mantine notifications ──────────────────────────────────────────────────────
+vi.mock('@mantine/notifications', () => ({
+  showNotification: vi.fn(),
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', async () => ({
+  Accordion: ({ children }) => <div data-testid="accordion">{children}</div>,
+  AccordionControl: ({ children }) => <button data-testid="accordion-control">{children}</button>,
+  AccordionItem: ({ children, value }) => <div data-testid={`accordion-item-${value}`}>{children}</div>,
+  AccordionPanel: ({ children }) => <div data-testid="accordion-panel">{children}</div>,
+  ActionIcon: ({ children, onClick }) => (
+    <button data-testid="action-icon" onClick={onClick}>{children}</button>
+  ),
+  Box: ({ children, mt, style }) => <div style={style} data-mt={mt}>{children}</div>,
+  Button: ({ children, onClick, disabled, loading, type, color, variant }) => (
+    <button
+      onClick={onClick}
+      disabled={disabled || loading}
+      type={type}
+      data-color={color}
+      data-variant={variant}
+      data-loading={loading}
+    >
+      {children}
+    </button>
+  ),
+  Checkbox: ({ label, checked, onChange }) => (
+    <label>
+      <input
+        type="checkbox"
+        checked={checked}
+        onChange={(e) => onChange?.(e.target.checked)}
+        aria-label={label}
+      />
+      {label}
+    </label>
+  ),
+  Divider: () => <hr />,
+  Group: ({ children }) => <div>{children}</div>,
+  Modal: ({ children, opened, onClose, title }) =>
+    opened ? (
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
+        <button data-testid="modal-close" onClick={onClose}>×</button>
+        {children}
+      </div>
+    ) : null,
+  NumberInput: ({ label, value, onChange, min, max }) => (
+    <label>
+      {label}
+      <input
+        type="number"
+        aria-label={label}
+        value={value ?? ''}
+        min={min}
+        max={max}
+        onChange={(e) => onChange?.(Number(e.target.value))}
+      />
+    </label>
+  ),
+  Paper: ({ children }) => <div data-testid="paper">{children}</div>,
+  Popover: ({ children }) => <div>{children}</div>,
+  PopoverDropdown: ({ children }) => <div data-testid="popover-dropdown">{children}</div>,
+  PopoverTarget: ({ children }) => <div>{children}</div>,
+  Select: ({ label, value, onChange, data, placeholder }) => (
+    <label>
+      {label}
+      <select
+        aria-label={label}
+        value={value ?? ''}
+        onChange={(e) => onChange?.(e.target.value)}
+        placeholder={placeholder}
+      >
+        {(data || []).map((opt) => {
+          const val = typeof opt === 'string' ? opt : opt.value;
+          const lab = typeof opt === 'string' ? opt : opt.label;
+          return <option key={val} value={val}>{lab}</option>;
+        })}
+      </select>
+    </label>
+  ),
+  Stack: ({ children }) => <div>{children}</div>,
+  Text: ({ children, size, c, fw, style }) => (
+    <span data-size={size} data-color={c} data-fw={fw} style={style}>{children}</span>
+  ),
+  Textarea: ({ label, value, onChange, placeholder }) => (
+    <label>
+      {label}
+      <textarea
+        aria-label={label}
+        value={value ?? ''}
+        placeholder={placeholder}
+        onChange={(e) => onChange?.({ target: { value: e.target.value } })}
+      />
+    </label>
+  ),
+  TextInput: ({ label, value, onChange, placeholder, ...rest }) => (
+    <label>
+      {label}
+      <input
+        type="text"
+        aria-label={label}
+        value={value ?? ''}
+        placeholder={placeholder}
+        onChange={(e) => onChange?.(e.currentTarget.value)}
+        {...rest}
+      />
+    </label>
+  ),
+}));
+
+// ── lucide-react ───────────────────────────────────────────────────────────────
+vi.mock('lucide-react', () => ({
+  Info: () => <svg data-testid="icon-info" />,
+}));
+
+// ── Imports after mocks ────────────────────────────────────────────────────────
+import useEPGsStore from '../../../store/epgs';
+import { showNotification } from '../../../utils/notificationUtils.js';
+import * as DummyEpgUtils from '../../../utils/forms/DummyEpgUtils.js';
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+const makeEPG = (overrides = {}) => ({
+  id: 1,
+  name: 'Test EPG',
+  is_active: true,
+  custom_properties: {
+    title_pattern: '(Test Show.+)',
+    time_pattern: '',
+    date_pattern: '',
+    timezone: 'US/Eastern',
+    output_timezone: '',
+    program_duration: 180,
+    sample_title: 'Test Show 9:00 PM',
+    title_template: '{title}',
+    subtitle_template: '',
+    description_template: '',
+    upcoming_title_template: '',
+    upcoming_description_template: '',
+    ended_title_template: '',
+    ended_description_template: '',
+    fallback_title_template: '',
+    fallback_description_template: '',
+    channel_logo_url: '',
+    program_poster_url: '',
+    name_source: 'channel',
+    stream_index: 1,
+    category: '',
+    include_date: true,
+    include_live: false,
+    include_new: false,
+    ...overrides.custom_properties,
+  },
+  ...overrides,
+});
+
+const makeTemplate = (overrides = {}) => ({
+  id: 99,
+  name: 'My Template',
+  is_active: true,
+  source_type: 'dummy',
+  custom_properties: {
+    title_pattern: '(?P<title>.+)',
+    time_pattern: '(?P<hour>\\d+):(?P<minute>\\d+)',
+    title_template: '{title}',
+    timezone: 'US/Pacific',
+    ...overrides.custom_properties,
+  },
+  ...overrides,
+});
+
+const setupMocks = ({ dummyEpgs = [] } = {}) => {
+  vi.mocked(useEPGsStore).mockImplementation((sel) =>
+    sel({ epgs: dummyEpgs, fetchEPGs: vi.fn() })
+  );
+};
+
+const defaultProps = (overrides = {}) => ({
+  epg: null,
+  isOpen: true,
+  onClose: vi.fn(),
+  ...overrides,
+});
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('DummyEPGForm', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(DummyEpgUtils.addEPG).mockResolvedValue({ id: 2, name: 'New EPG' });
+    vi.mocked(DummyEpgUtils.updateEPG).mockResolvedValue({});
+    vi.mocked(DummyEpgUtils.getTimezones).mockResolvedValue({
+      timezones: ['US/Eastern', 'US/Pacific', 'UTC'],
+    });
+    setupMocks();
+  });
+
+  // ── Rendering ──────────────────────────────────────────────────────────────
+
+  describe('rendering', () => {
+    it('renders the form when isOpen is true', () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('does not render when isOpen is false', () => {
+      render(<DummyEPGForm {...defaultProps({ isOpen: false })} />);
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+    });
+
+    it('shows "Add Dummy EPG" title when no epg prop', () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+      expect(screen.getByTestId('modal-title')).toHaveTextContent('Create Dummy EPG');
+    });
+
+    it('shows "Edit Dummy EPG" title when epg prop is provided', () => {
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      expect(screen.getByTestId('modal-title')).toHaveTextContent('Edit Dummy EPG');
+    });
+
+    it('pre-fills form name when editing an existing EPG', () => {
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      expect(screen.getByDisplayValue('Test EPG')).toBeInTheDocument();
+    });
+  });
+
+  // ── Form initialization ────────────────────────────────────────────────────
+
+  describe('form initialization', () => {
+    it('calls getDummyEpgFormInitialValues on mount without epg', () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+      expect(DummyEpgUtils.getDummyEpgFormInitialValues).toHaveBeenCalled();
+    });
+
+    it('calls buildCustomProperties when epg is provided', () => {
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      expect(DummyEpgUtils.buildCustomProperties).toHaveBeenCalledWith(
+        expect.objectContaining({ title_pattern: '(Test Show.+)' })
+      );
+    });
+
+    it('populates sample_title field from epg custom_properties', () => {
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      expect(screen.getByDisplayValue('Test Show 9:00 PM')).toBeInTheDocument();
+    });
+  });
+
+  // ── Timezone loading ───────────────────────────────────────────────────────
+
+  describe('timezone loading', () => {
+    it('calls getTimezones on mount', async () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+      await waitFor(() => {
+        expect(DummyEpgUtils.getTimezones).toHaveBeenCalled();
+      });
+    });
+
+    it('renders timezone options after loading', async () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+      await waitFor(() => {
+        expect(screen.getAllByRole('option', { name: 'US/Eastern' }).length).toBeGreaterThan(0);
+      });
+    });
+
+    it('shows fallback timezones and warning notification when getTimezones rejects', async () => {
+      vi.mocked(DummyEpgUtils.getTimezones).mockRejectedValueOnce(new Error('Network error'));
+      render(<DummyEPGForm {...defaultProps()} />);
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'yellow' })
+        );
+      });
+      // Fallback options should still be rendered
+      await waitFor(() => {
+        expect(screen.getAllByRole('option', { name: 'UTC' }).length).toBeGreaterThan(0);
+      });
+    });
+  });
+
+  // ── Template import ────────────────────────────────────────────────────────
+
+  describe('template import', () => {
+    it('shows the import select when dummyEpgs are available', () => {
+      setupMocks({ dummyEpgs: [makeTemplate()] });
+      render(<DummyEPGForm {...defaultProps()} />);
+      expect(screen.getByPlaceholderText(/Select a template/i)).toBeInTheDocument();
+    });
+
+    it('does not show import select when dummyEpgs is empty', () => {
+      setupMocks({ dummyEpgs: [] });
+      render(<DummyEPGForm {...defaultProps()} />);
+      expect(screen.queryByPlaceholderText(/Select a template/i)).not.toBeInTheDocument();
+    });
+
+    it('calls buildCustomProperties and applyCustomState on template import', async () => {
+      setupMocks({ dummyEpgs: [makeTemplate()] });
+      render(<DummyEPGForm {...defaultProps()} />);
+
+      const select = screen.getByPlaceholderText(/Select a template/i);
+      fireEvent.change(select, { target: { value: '99' } });
+
+      await waitFor(() => {
+        expect(DummyEpgUtils.buildCustomProperties).toHaveBeenCalledWith(
+          expect.objectContaining({ timezone: 'US/Pacific' })
+        );
+      });
+    });
+
+    it('shows a notification after successful template import', async () => {
+      setupMocks({ dummyEpgs: [makeTemplate()] });
+      render(<DummyEPGForm {...defaultProps()} />);
+
+      const select = screen.getByPlaceholderText(/Select a template/i);
+      fireEvent.change(select, { target: { value: '99' } });
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ title: 'Template Imported', color: 'blue' })
+        );
+      });
+    });
+
+    it('sets form name to "[template name] (Copy)" on import', async () => {
+      setupMocks({ dummyEpgs: [makeTemplate()] });
+      render(<DummyEPGForm {...defaultProps()} />);
+
+      const select = screen.getByPlaceholderText(/Select a template/i);
+      fireEvent.change(select, { target: { value: '99' } });
+
+      await waitFor(() => {
+        expect(screen.getByDisplayValue('My Template (Copy)')).toBeInTheDocument();
+      });
+    });
+
+    it('does nothing when an invalid template id is selected', async () => {
+      setupMocks({ dummyEpgs: [makeTemplate()] });
+      render(<DummyEPGForm {...defaultProps()} />);
+
+      const callsBefore = vi.mocked(showNotification).mock.calls.length;
+      const select = screen.getByPlaceholderText(/Select a template/i);
+      fireEvent.change(select, { target: { value: '999' } });
+
+      await waitFor(() => {
+        expect(vi.mocked(showNotification).mock.calls.length).toBe(callsBefore);
+      });
+    });
+  });
+
+  // ── Pattern validation ─────────────────────────────────────────────────────
+
+  describe('pattern validation', () => {
+    it('shows title match section when title pattern matches sample title', async () => {
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      await waitFor(() => {
+        expect(screen.getByText(/title pattern matched/i)).toBeInTheDocument();
+      });
+    });
+
+    it('shows no-match warning when title pattern does not match', async () => {
+      const epg = makeEPG({
+        custom_properties: {
+          title_pattern: '(NOMATCH)',
+          sample_title: 'Test Show 9:00 PM',
+        },
+      });
+      render(<DummyEPGForm {...defaultProps({ epg })} />);
+      await waitFor(() => {
+        expect(screen.getByText(/did not match/i)).toBeInTheDocument();
+      });
+    });
+
+    it('shows error text when title pattern is invalid regex', async () => {
+      const epg = makeEPG({
+        custom_properties: {
+          title_pattern: '(<title>[invalid',
+          sample_title: 'Test Show',
+        },
+      });
+      render(<DummyEPGForm {...defaultProps({ epg })} />);
+      await waitFor(() => {
+        expect(screen.getByText(/pattern error/i)).toBeInTheDocument();
+      });
+    });
+
+    it('shows calculated time placeholders when time pattern matches', async () => {
+      const epg = makeEPG({
+        custom_properties: {
+          title_pattern: '',
+          time_pattern: '(\\d+):(\\d+)\\s*(AM|PM)',
+          sample_title: 'Show 9:00 PM',
+          timezone: 'US/Eastern',
+        },
+      });
+      render(<DummyEPGForm {...defaultProps({ epg })} />);
+      await waitFor(() => {
+        expect(screen.getByText(/time pattern matched/i)).toBeInTheDocument();
+      });
+    });
+
+    it('shows formatted title preview when title template is set and pattern matches', async () => {
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      await waitFor(() => {
+        expect(screen.getByText('{title}')).toBeInTheDocument();
+      });
+    });
+
+    it('shows "(no template provided)" fallback when title pattern matches but no title template', async () => {
+      const epg = makeEPG({
+        custom_properties: {
+          title_pattern: '(Test.+)',
+          sample_title: 'Test Show',
+          title_template: '',
+        },
+      });
+      render(<DummyEPGForm {...defaultProps({ epg })} />);
+      await waitFor(() => {
+        expect(screen.queryByText('(no template provided)')).not.toBeInTheDocument();
+      });
+    });
+
+    it('shows date match section when date pattern matches sample', async () => {
+      const epg = makeEPG({
+        custom_properties: {
+          title_pattern: '',
+          date_pattern:  '(?<month>\\w+)\\s+(?<day>\\d+)',
+          sample_title:  'Show Oct 17',
+        },
+      });
+      render(<DummyEPGForm {...defaultProps({ epg })} />);
+      await waitFor(() => {
+        expect(screen.getByText(/date pattern matched/i)).toBeInTheDocument();
+      });
+    });
+
+    it('shows calculated time placeholders when time pattern matches', async () => {
+      const epg = makeEPG({
+        custom_properties: {
+          title_pattern: '(Show.+)',
+          time_pattern:  '(?<hour>\\d+):(?<minute>\\d+)\\s*(?<ampm>AM|PM)',
+          sample_title:  'Show @ 9:00 PM',
+          timezone:      'US/Eastern',
+        },
+      });
+      render(<DummyEPGForm {...defaultProps({ epg })} />);
+      await waitFor(() => {
+        expect(screen.getByText(/available time placeholders/i)).toBeInTheDocument();
+      });
+    });
+  });
+
+  // ── Form submission ────────────────────────────────────────────────────────
+
+  describe('form submission', () => {
+    it('calls addEPG when submitting a new EPG', async () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+
+      const nameInput = screen.getByPlaceholderText('My Sports EPG');
+      fireEvent.change(nameInput, { target: { value: 'New EPG' } });
+      fireEvent.submit(document.querySelector('form'));
+
+      await waitFor(() => {
+        expect(DummyEpgUtils.addEPG).toHaveBeenCalled();
+      });
+    });
+
+    it('calls updateEPG when submitting an existing EPG', async () => {
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      fireEvent.submit(document.querySelector('form'));
+
+      await waitFor(() => {
+        expect(DummyEpgUtils.updateEPG).toHaveBeenCalledWith(
+          expect.objectContaining({ name: 'Test EPG' }),
+          expect.anything()
+        );
+      });
+    });
+
+    it('shows success notification after adding EPG', async () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+
+      const nameInput = screen.getByPlaceholderText('My Sports EPG');
+      fireEvent.change(nameInput, { target: { value: 'New EPG' } });
+      fireEvent.submit(document.querySelector('form'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'green' })
+        );
+      });
+    });
+
+    it('shows success notification after updating an existing EPG', async () => {
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      fireEvent.submit(document.querySelector('form'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ title: 'Success', color: 'green' })
+        );
+      });
+    });
+
+    it('shows error notification when addEPG rejects', async () => {
+      vi.mocked(DummyEpgUtils.addEPG).mockRejectedValueOnce(new Error('Server error'));
+      render(<DummyEPGForm {...defaultProps()} />);
+
+      const nameInput = screen.getByPlaceholderText('My Sports EPG');
+      fireEvent.change(nameInput, { target: { value: 'New EPG' } });
+      fireEvent.submit(document.querySelector('form'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red', message: 'Server error' })
+        );
+      });
+    });
+
+    it('shows error notification when updateEPG rejects', async () => {
+      vi.mocked(DummyEpgUtils.updateEPG).mockRejectedValueOnce(new Error('Update failed'));
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      fireEvent.submit(document.querySelector('form'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red', message: 'Update failed' })
+        );
+      });
+    });
+
+    it('calls onClose after successful submission', async () => {
+      const onClose = vi.fn();
+      render(<DummyEPGForm {...defaultProps({ onClose })} />);
+
+      const nameInput = screen.getByPlaceholderText('My Sports EPG');
+      fireEvent.change(nameInput, { target: { value: 'New EPG' } });
+      fireEvent.submit(document.querySelector('form'));
+
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+    });
+
+    it('does not call onClose after a failed submission', async () => {
+      vi.mocked(DummyEpgUtils.addEPG).mockRejectedValueOnce(new Error('Fail'));
+      const onClose = vi.fn();
+      render(<DummyEPGForm {...defaultProps({ onClose })} />);
+
+      const nameInput = screen.getByPlaceholderText('My Sports EPG');
+      fireEvent.change(nameInput, { target: { value: 'New EPG' } });
+      fireEvent.submit(document.querySelector('form'));
+
+      await waitFor(() => {
+        expect(showNotification).toHaveBeenCalledWith(expect.objectContaining({ color: 'red' }));
+      });
+      expect(onClose).not.toHaveBeenCalled();
+    });
+  });
+
+  // ── Modal close ────────────────────────────────────────────────────────────
+
+  describe('modal close', () => {
+    it('calls onClose when the modal close button is clicked', () => {
+      const onClose = vi.fn();
+      render(<DummyEPGForm {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByTestId('modal-close'));
+      expect(onClose).toHaveBeenCalled();
+    });
+
+    it('calls onClose when Cancel button is clicked', () => {
+      const onClose = vi.fn();
+      render(<DummyEPGForm {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByRole('button', { name: /cancel/i }));
+      expect(onClose).toHaveBeenCalled();
+    });
+  });
+
+  // ── Checkbox toggles ───────────────────────────────────────────────────────
+
+  describe('checkbox toggles', () => {
+    it('renders include_date checkbox', () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+      expect(screen.getByText('Include Date Tag')).toBeInTheDocument();
+    });
+
+    it('renders include_live checkbox', () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+      expect(screen.getByText('Include Live Tag')).toBeInTheDocument();
+    });
+
+    it('renders include_new checkbox', () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+      expect(screen.getByText('Include New Tag')).toBeInTheDocument();
+    });
+  });
+
+  // ── Program duration ───────────────────────────────────────────────────────
+
+  describe('program duration input', () => {
+    it('renders the program duration field', () => {
+      render(<DummyEPGForm {...defaultProps()} />);
+      expect(screen.getByLabelText(/program duration/i)).toBeInTheDocument();
+    });
+
+    it('pre-fills program duration from epg', () => {
+      render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
+      expect(screen.getByDisplayValue('180')).toBeInTheDocument();
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/components/forms/__tests__/EPG.test.jsx b/frontend/src/components/forms/__tests__/EPG.test.jsx
new file mode 100644
index 00000000..18448db8
--- /dev/null
+++ b/frontend/src/components/forms/__tests__/EPG.test.jsx
@@ -0,0 +1,519 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+// ── Utility mocks ──────────────────────────────────────────────────────────────
+vi.mock('../../../utils/notificationUtils.js', () => ({
+  showNotification: vi.fn(),
+}));
+
+vi.mock('../../../utils/forms/DummyEpgUtils.js', () => ({
+  addEPG: vi.fn(),
+  updateEPG: vi.fn(),
+}));
+
+// ── Mantine form ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/form', () => ({
+  isNotEmpty: vi.fn(() => (val) => (val ? null : 'Required')),
+  useForm: vi.fn(() => {
+    const values = {
+      name: '',
+      source_type: 'xmltv',
+      url: '',
+      api_key: '',
+      is_active: true,
+      refresh_interval: 24,
+      cron_expression: '',
+      priority: 0,
+    };
+    return {
+      key: vi.fn(),
+      // Return the live object — no spread — so setFieldValue mutations are visible
+      getValues: vi.fn(() => values),
+      setValues: vi.fn((v) => Object.assign(values, v)),
+      setFieldValue: vi.fn((field, value) => { values[field] = value; }),
+      reset: vi.fn(),
+      submitting: false,
+      onSubmit: vi.fn((handler) => (e) => {
+        e?.preventDefault?.();
+        handler(values);
+      }),
+      getInputProps: vi.fn((field) => ({
+        value: values[field] ?? '',
+        onChange: vi.fn(),
+        error: null,
+      })),
+    };
+  }),
+}));
+
+// ── ScheduleInput mock ─────────────────────────────────────────────────────────
+vi.mock('../ScheduleInput', () => ({
+  default: ({ scheduleType, onScheduleTypeChange, onIntervalChange, onCronChange }) => (
+    <div data-testid="schedule-input">
+      <button data-testid="set-interval" onClick={() => onScheduleTypeChange('interval')}>
+        Set Interval
+      </button>
+      <button data-testid="set-cron" onClick={() => onScheduleTypeChange('cron')}>
+        Set Cron
+      </button>
+      <input
+        data-testid="interval-input"
+        onChange={(e) => onIntervalChange?.(Number(e.target.value))}
+      />
+      <input
+        data-testid="cron-input"
+        onChange={(e) => onCronChange?.(e.target.value)}
+      />
+      <span data-testid="schedule-type-value">{scheduleType}</span>
+    </div>
+  ),
+}));
+
+// ── Mantine core ───────────────────────────────────────────────────────────────
+vi.mock('@mantine/core', async () => ({
+  Box: ({ children, style }) => <div style={style}>{children}</div>,
+  Button: ({ children, onClick, disabled, loading, type, color, variant }) => (
+    <button
+      type={type || 'button'}
+      onClick={onClick}
+      disabled={disabled || loading}
+      data-color={color}
+      data-variant={variant}
+      data-loading={String(loading)}
+    >
+      {children}
+    </button>
+  ),
+  Checkbox: ({ label, checked, onChange }) => (
+    <label>
+      <input
+        type="checkbox"
+        data-testid={`checkbox-${label?.toString().toLowerCase().replace(/\s+/g, '-')}`}
+        checked={checked ?? false}
+        onChange={(e) => onChange?.(e)}
+      />
+      {label}
+    </label>
+  ),
+  Divider: () => <hr />,
+  Group: ({ children }) => <div>{children}</div>,
+  Modal: ({ children, opened, onClose, title }) =>
+    opened ? (
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
+        <button data-testid="modal-close" onClick={onClose}>
+          ×
+        </button>
+        {children}
+      </div>
+    ) : null,
+  NativeSelect: ({ label, value, onChange, data }) => (
+    <select
+      aria-label={label}
+      data-testid={`select-${label?.toString().toLowerCase().replace(/\s+/g, '-')}`}
+      value={value ?? ''}
+      onChange={(e) => onChange?.(e)}
+    >
+      {(data ?? []).map((opt) => {
+        const val = typeof opt === 'string' ? opt : opt.value;
+        const lbl = typeof opt === 'string' ? opt : opt.label;
+        return <option key={val} value={val}>{lbl}</option>;
+      })}
+    </select>
+  ),
+  NumberInput: ({ label, value, onChange, min, max, placeholder }) => (
+    <input
+      type="number"
+      aria-label={label}
+      data-testid={`number-${label?.toString().toLowerCase().replace(/\s+/g, '-')}`}
+      value={value ?? ''}
+      min={min}
+      max={max}
+      placeholder={placeholder}
+      onChange={(e) => onChange?.(Number(e.target.value))}
+    />
+  ),
+  Stack: ({ children }) => <div>{children}</div>,
+  Text: ({ children, size, c, fw }) => (
+    <span data-size={size} data-color={c} data-fw={fw}>
+      {children}
+    </span>
+  ),
+  TextInput: ({ label, value, onChange, placeholder, error, id, name, required }) => (
+    <div>
+      <label htmlFor={id || name}>{label}</label>
+      <input
+        id={id || name}
+        data-testid={`input-${label?.toString().toLowerCase().replace(/\s+/g, '-')}`}
+        value={value ?? ''}
+        placeholder={placeholder}
+        required={required}
+        onChange={(e) =>
+          onChange?.({ target: { value: e.target.value }, currentTarget: { value: e.target.value } })
+        }
+      />
+      {error && <span data-testid="input-error">{error}</span>}
+    </div>
+  ),
+}));
+
+// ── Imports after mocks ────────────────────────────────────────────────────────
+import EPG from '../EPG';
+import * as DummyEpgUtils from '../../../utils/forms/DummyEpgUtils.js';
+import { useForm } from '@mantine/form';
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+const makeEPG = (overrides = {}) => ({
+  id: 1,
+  name: 'Test EPG',
+  source_type: 'xmltv',
+  url: 'http://example.com/epg.xml',
+  api_key: 'abc123',
+  is_active: true,
+  refresh_interval: 24,
+  cron_expression: '',
+  priority: 0,
+  ...overrides,
+});
+
+const defaultProps = (overrides = {}) => ({
+  epg: null,
+  isOpen: true,
+  onClose: vi.fn(),
+  ...overrides,
+});
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Tests
+// ──────────────────────────────────────────────────────────────────────────────
+describe('EPG', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(DummyEpgUtils.addEPG).mockResolvedValue(undefined);
+    vi.mocked(DummyEpgUtils.updateEPG).mockResolvedValue(undefined);
+  });
+
+  // ── Rendering ──────────────────────────────────────────────────────────────
+
+  describe('rendering', () => {
+    it('renders the modal when isOpen is true', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
+
+    it('does not render the modal when isOpen is false', () => {
+      render(<EPG {...defaultProps({ isOpen: false })} />);
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+    });
+
+    it('renders submit button with "Create" title for a new EPG', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByText('Create EPG Source')).toBeInTheDocument();
+    });
+
+    it('renders submit button with "Update" title when editing an existing EPG', () => {
+      render(<EPG {...defaultProps({ epg: makeEPG() })} />);
+      expect(screen.getByText('Update EPG Source')).toBeInTheDocument();
+    });
+
+    it('renders the Name input', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByTestId('input-name')).toBeInTheDocument();
+    });
+
+    it('renders the Source Type select', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByTestId('select-source-type')).toBeInTheDocument();
+    });
+
+    it('renders the URL input', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByTestId('input-url')).toBeInTheDocument();
+    });
+
+    it('renders the Priority input', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByTestId('number-priority')).toBeInTheDocument();
+    });
+
+    it('renders the ScheduleInput component', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByTestId('schedule-input')).toBeInTheDocument();
+    });
+
+    it('renders a cancel/close button', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByRole('button', { name: /cancel|close/i })).toBeInTheDocument();
+    });
+  });
+
+  // ── Form initialization ────────────────────────────────────────────────────
+
+  describe('form initialization', () => {
+    it('calls setValues with epg fields when epg prop is provided', () => {
+      const epg = makeEPG();
+      const mockSetValues = vi.fn();
+      vi.mocked(useForm).mockReturnValueOnce({
+        key: vi.fn(),
+        getValues: vi.fn(() => ({ ...epg, cron_expression: '' })),
+        setValues: mockSetValues,
+        setFieldValue: vi.fn((field, value) => { epg[field] = value; }),
+        reset: vi.fn(),
+        submitting: false,
+        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({ ...epg }); }),
+        getInputProps: vi.fn((field) => ({ value: epg[field] ?? '', onChange: vi.fn(), error: null })),
+      });
+
+      render(<EPG {...defaultProps({ epg })} />);
+      expect(mockSetValues).toHaveBeenCalledWith(
+        expect.objectContaining({ name: 'Test EPG', source_type: 'xmltv' })
+      );
+    });
+
+    it('does not call setValues when epg prop is null', () => {
+      const mockSetValues = vi.fn();
+      vi.mocked(useForm).mockReturnValueOnce({
+        key: vi.fn(),
+        getValues: vi.fn(() => ({})),
+        setValues: mockSetValues,
+        setFieldValue: vi.fn(() => {}),
+        reset: vi.fn(),
+        submitting: false,
+        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({}); }),
+        getInputProps: vi.fn(() => ({ value: '', onChange: vi.fn(), error: null })),
+      });
+
+      render(<EPG {...defaultProps({ epg: null })} />);
+      expect(mockSetValues).not.toHaveBeenCalled();
+    });
+
+    it('sets scheduleType to "cron" when epg has a cron_expression', () => {
+      const epg = makeEPG({ cron_expression: '0 */6 * * *', refresh_interval: 0 });
+      render(<EPG {...defaultProps({ epg })} />);
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('cron');
+    });
+
+    it('sets scheduleType to "interval" when epg has no cron_expression', () => {
+      const epg = makeEPG({ cron_expression: '', refresh_interval: 12 });
+      render(<EPG {...defaultProps({ epg })} />);
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('interval');
+    });
+  });
+
+  // ── Source type ────────────────────────────────────────────────────────────
+
+  describe('source type', () => {
+    it('defaults source type to "xmltv"', () => {
+      render(<EPG {...defaultProps()} />);
+      const select = screen.getByTestId('select-source-type');
+      expect(select).toHaveValue('xmltv');
+    });
+
+    it('shows URL input when source type is xmltv', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByTestId('input-url')).toBeInTheDocument();
+    });
+
+    it('hides API key input when source type is xmltv', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.queryByTestId('input-api-key')).not.toBeInTheDocument();
+    });
+
+    it('shows API key input when source type requires it', () => {
+      const epg = makeEPG({ source_type: 'schedules_direct' });
+      render(<EPG {...defaultProps({ epg })} />);
+      expect(screen.getByTestId('input-api-key')).toBeInTheDocument();
+    });
+  });
+
+  // ── Schedule type toggling ─────────────────────────────────────────────────
+
+  describe('schedule type toggling', () => {
+    it('scheduleType starts as "interval" for new EPG', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('interval');
+    });
+
+    it('updates scheduleType to "cron" when ScheduleInput fires onScheduleTypeChange', () => {
+      render(<EPG {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('set-cron'));
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('cron');
+    });
+
+    it('updates scheduleType back to "interval" from cron', () => {
+      render(<EPG {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('set-cron'));
+      fireEvent.click(screen.getByTestId('set-interval'));
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('interval');
+    });
+  });
+
+  // ── Form submission — add ──────────────────────────────────────────────────
+
+  describe('form submission (add)', () => {
+    it('calls addEPG when submitting a new EPG', async () => {
+      render(<EPG {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Create EPG Source'));
+      await waitFor(() => {
+        expect(DummyEpgUtils.addEPG).toHaveBeenCalled();
+      });
+    });
+
+    it('does not call updateEPG when adding a new EPG', async () => {
+      render(<EPG {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Create EPG Source'));
+      await waitFor(() => {
+        expect(DummyEpgUtils.updateEPG).not.toHaveBeenCalled();
+      });
+    });
+
+    it('calls onClose after successful add', async () => {
+      const onClose = vi.fn();
+      render(<EPG {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByText('Create EPG Source'));
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+    });
+
+    it('clears cron_expression when schedule type is interval on submit', async () => {
+      let capturedValues;
+      vi.mocked(DummyEpgUtils.addEPG).mockImplementation((vals) => {
+        capturedValues = vals;
+        return Promise.resolve();
+      });
+      render(<EPG {...defaultProps()} />);
+      fireEvent.click(screen.getByTestId('set-interval'));
+      fireEvent.click(screen.getByText('Create EPG Source'));
+      await waitFor(() => {
+        expect(capturedValues?.cron_expression ?? '').toBe('');
+      });
+    });
+  });
+
+  // ── Form submission — update ───────────────────────────────────────────────
+
+  describe('form submission (update)', () => {
+    it('calls updateEPG when submitting an existing EPG', async () => {
+      const epg = makeEPG();
+      render(<EPG {...defaultProps({ epg })} />);
+      fireEvent.click(screen.getByText('Update EPG Source'));
+      await waitFor(() => {
+        expect(DummyEpgUtils.updateEPG).toHaveBeenCalled();
+      });
+    });
+
+    it('does not call addEPG when epg.id is present', async () => {
+      const epg = makeEPG();
+      render(<EPG {...defaultProps({ epg })} />);
+
+      fireEvent.click(screen.getByText('Update EPG Source'));
+
+      await waitFor(() => {
+        expect(DummyEpgUtils.addEPG).not.toHaveBeenCalled();
+      });
+    });
+
+    it('clears refresh_interval when schedule type is cron on submit', async () => {
+      const epg = makeEPG({ cron_expression: '0 * * * *', refresh_interval: 24 });
+      vi.mocked(useForm).mockReturnValue({
+        key: vi.fn(),
+        getValues: vi.fn(() => ({ ...epg })),
+        setValues: vi.fn((v) => Object.assign(epg, v)),
+        setFieldValue: vi.fn((field, value) => { epg[field] = value; }),
+        reset: vi.fn(),
+        submitting: false,
+        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({ ...epg }); }),
+        getInputProps: vi.fn((field) => ({ value: epg[field] ?? '', onChange: vi.fn(), error: null })),
+      });
+      render(<EPG {...defaultProps({ epg })} />);
+      fireEvent.click(screen.getByText('Update EPG Source'));
+
+      await waitFor(() => {
+        const [values] = vi.mocked(DummyEpgUtils.updateEPG).mock.calls[0]; // first arg
+        expect(values.refresh_interval).toBe(0);
+        expect(values.cron_expression).toBe('0 * * * *');
+      });
+    });
+
+    it('clears cron_expression when schedule type is interval on submit', async () => {
+      const epg = makeEPG({ cron_expression: '', refresh_interval: 12 });
+      vi.mocked(useForm).mockReturnValue({
+        key: vi.fn(),
+        getValues: vi.fn(() => ({ ...epg })),
+        setValues: vi.fn((v) => Object.assign(epg, v)),
+        setFieldValue: vi.fn((field, value) => { epg[field] = value; }),
+        reset: vi.fn(),
+        submitting: false,
+        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({ ...epg }); }),
+        getInputProps: vi.fn((field) => ({ value: epg[field] ?? '', onChange: vi.fn(), error: null })),
+      });
+      render(<EPG {...defaultProps({ epg })} />);
+      fireEvent.click(screen.getByText('Update EPG Source'));
+
+      await waitFor(() => {
+        const [values] = vi.mocked(DummyEpgUtils.updateEPG).mock.calls[0];
+        expect(values.cron_expression).toBe('');
+        expect(values.refresh_interval).toBe(12);
+      });
+    });
+
+    it('calls onClose after successful update', async () => {
+      const onClose = vi.fn();
+      const epg = makeEPG();
+      render(<EPG {...defaultProps({ epg, onClose })} />);
+
+      fireEvent.click(screen.getByText('Update EPG Source'));
+
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalled();
+      });
+    });
+  });
+
+  // ── Modal close ────────────────────────────────────────────────────────────
+
+  describe('modal close', () => {
+    it('calls onClose when the modal close button is clicked', () => {
+      const onClose = vi.fn();
+      render(<EPG {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByTestId('modal-close'));
+      expect(onClose).toHaveBeenCalled();
+    });
+
+    it('calls onClose when the Cancel button is clicked', () => {
+      const onClose = vi.fn();
+      render(<EPG {...defaultProps({ onClose })} />);
+      fireEvent.click(screen.getByRole('button', { name: /cancel|close/i }));
+      expect(onClose).toHaveBeenCalled();
+    });
+
+    it('resets the form on close', async () => {
+      const mockReset = vi.fn();
+      vi.mocked(useForm).mockReturnValueOnce({
+        key: vi.fn(),
+        getValues: vi.fn(() => ({})),
+        setValues: vi.fn(),
+        setFieldValue: vi.fn(() => {}),
+        reset: mockReset,
+        submitting: false,
+        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({}); }),
+        getInputProps: vi.fn(() => ({ value: '', onChange: vi.fn(), error: null })),
+      });
+      render(<EPG {...defaultProps()} />);
+      fireEvent.click(screen.getByText('Create EPG Source'));
+      await waitFor(() => {
+        expect(mockReset).toHaveBeenCalled();
+      });
+    });
+  });
+
+  // ── Active checkbox ────────────────────────────────────────────────────────
+
+  describe('active checkbox', () => {
+    it('renders the Active checkbox', () => {
+      render(<EPG {...defaultProps()} />);
+      expect(screen.getByTestId('checkbox-enable-this-epg-source')).toBeInTheDocument();
+    });
+  });
+});
\ No newline at end of file

From 067a0ce0a918e332367a80832da3d26d6cc79e8b Mon Sep 17 00:00:00 2001
From: Nick Sandstrom <32273437+nick4810@users.noreply.github.com>
Date: Wed, 8 Apr 2026 23:15:21 -0700
Subject: [PATCH 128/172] Refactored form components

---
 .../src/components/forms/AccountInfoModal.jsx | 189 ++---
 .../components/forms/AssignChannelNumbers.jsx |  29 +-
 frontend/src/components/forms/Channel.jsx     | 221 ++---
 .../src/components/forms/ChannelBatch.jsx     | 489 ++++-------
 .../src/components/forms/ChannelGroup.jsx     |  27 +-
 frontend/src/components/forms/Connection.jsx  | 280 +++----
 frontend/src/components/forms/CronBuilder.jsx | 383 +++------
 frontend/src/components/forms/DummyEPG.jsx    | 771 +++---------------
 frontend/src/components/forms/EPG.jsx         |  10 +-
 9 files changed, 714 insertions(+), 1685 deletions(-)

diff --git a/frontend/src/components/forms/AccountInfoModal.jsx b/frontend/src/components/forms/AccountInfoModal.jsx
index b8522638..a85ecc34 100644
--- a/frontend/src/components/forms/AccountInfoModal.jsx
+++ b/frontend/src/components/forms/AccountInfoModal.jsx
@@ -1,31 +1,29 @@
-import React, { useState, useMemo } from 'react';
+import React, { useMemo, useState } from 'react';
 import {
-  Modal,
-  Text,
-  Box,
-  Group,
-  Badge,
-  Table,
-  Stack,
-  Divider,
-  Alert,
-  Loader,
-  Center,
   ActionIcon,
+  Alert,
+  Badge,
+  Box,
+  Center,
+  Divider,
+  Group,
+  Modal,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTr,
+  Text,
   Tooltip,
 } from '@mantine/core';
-import { notifications } from '@mantine/notifications';
-import {
-  Info,
-  Clock,
-  Users,
-  CheckCircle,
-  XCircle,
-  AlertTriangle,
-  RefreshCw,
-} from 'lucide-react';
-import API from '../../api';
+import { AlertTriangle, CheckCircle, Clock, Info, RefreshCw, Users, XCircle, } from 'lucide-react';
 import usePlaylistsStore from '../../store/playlists';
+import { showNotification } from '../../utils/notificationUtils.js';
+import {
+  formatTimestamp,
+  getTimeRemaining,
+  refreshAccountInfo,
+} from '../../utils/forms/AccountInfoModalUtils.js';
 
 const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
   const [isRefreshing, setIsRefreshing] = useState(false);
@@ -45,7 +43,7 @@ const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
 
   const handleRefresh = async () => {
     if (!currentProfile?.id) {
-      notifications.show({
+      showNotification({
         title: 'Error',
         message: 'Unable to refresh: Profile information not available',
         color: 'red',
@@ -57,10 +55,10 @@ const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
     setIsRefreshing(true);
 
     try {
-      const data = await API.refreshAccountInfo(currentProfile.id);
+      const data = await refreshAccountInfo(currentProfile);
 
       if (data.success) {
-        notifications.show({
+        showNotification({
           title: 'Success',
           message:
             'Account info refresh initiated. The information will be updated shortly.',
@@ -74,7 +72,7 @@ const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
           setTimeout(onRefresh, 2000);
         }
       } else {
-        notifications.show({
+        showNotification({
           title: 'Error',
           message: data.error || 'Failed to refresh account information',
           color: 'red',
@@ -88,6 +86,7 @@ const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
       setIsRefreshing(false);
     }
   };
+
   if (!currentProfile || !currentProfile.custom_properties) {
     return (
       <Modal opened={isOpen} onClose={onClose} title="Account Information">
@@ -108,54 +107,6 @@ const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
   const { user_info, server_info, last_refresh } =
     currentProfile.custom_properties || {};
 
-  // Helper function to format timestamps
-  const formatTimestamp = (timestamp) => {
-    if (!timestamp) return 'Unknown';
-    try {
-      const date =
-        typeof timestamp === 'string' && timestamp.includes('T')
-          ? new Date(timestamp) // This should handle ISO format properly
-          : new Date(parseInt(timestamp) * 1000);
-
-      // Convert to user's local time and display with timezone
-      return date.toLocaleString(undefined, {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-        timeZoneName: 'short',
-      });
-    } catch {
-      return 'Invalid date';
-    }
-  };
-
-  // Helper function to get time remaining
-  const getTimeRemaining = (expTimestamp) => {
-    if (!expTimestamp) return null;
-    try {
-      const expDate = new Date(parseInt(expTimestamp) * 1000);
-      const now = new Date();
-      const diffMs = expDate - now;
-
-      if (diffMs <= 0) return 'Expired';
-
-      const days = Math.floor(diffMs / (1000 * 60 * 60 * 24));
-      const hours = Math.floor(
-        (diffMs % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)
-      );
-
-      if (days > 0) {
-        return `${days} day${days !== 1 ? 's' : ''} ${hours} hour${hours !== 1 ? 's' : ''}`;
-      } else {
-        return `${hours} hour${hours !== 1 ? 's' : ''}`;
-      }
-    } catch {
-      return 'Unknown';
-    }
-  };
-
   // Helper function to get status badge
   const getStatusBadge = (status) => {
     const statusConfig = {
@@ -316,24 +267,24 @@ const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
             Account Details
           </Text>
           <Table striped highlightOnHover>
-            <Table.Tbody>
-              <Table.Tr>
-                <Table.Td fw={500} w="40%">
+            <TableTbody>
+              <TableTr>
+                <TableTd fw={500} w="40%">
                   Username
-                </Table.Td>
-                <Table.Td>{user_info?.username || 'Unknown'}</Table.Td>
-              </Table.Tr>
-              <Table.Tr>
-                <Table.Td fw={500}>Account Created</Table.Td>
-                <Table.Td>
+                </TableTd>
+                <TableTd>{user_info?.username || 'Unknown'}</TableTd>
+              </TableTr>
+              <TableTr>
+                <TableTd fw={500}>Account Created</TableTd>
+                <TableTd>
                   {user_info?.created_at
                     ? formatTimestamp(user_info.created_at)
                     : 'Unknown'}
-                </Table.Td>
-              </Table.Tr>
-              <Table.Tr>
-                <Table.Td fw={500}>Trial Account</Table.Td>
-                <Table.Td>
+                </TableTd>
+              </TableTr>
+              <TableTr>
+                <TableTd fw={500}>Trial Account</TableTd>
+                <TableTd>
                   <Badge
                     color={user_info?.is_trial === '1' ? 'orange' : 'blue'}
                     variant="light"
@@ -341,13 +292,13 @@ const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
                   >
                     {user_info?.is_trial === '1' ? 'Yes' : 'No'}
                   </Badge>
-                </Table.Td>
-              </Table.Tr>
+                </TableTd>
+              </TableTr>
               {user_info?.allowed_output_formats &&
                 user_info.allowed_output_formats.length > 0 && (
-                  <Table.Tr>
-                    <Table.Td fw={500}>Allowed Formats</Table.Td>
-                    <Table.Td>
+                  <TableTr>
+                    <TableTd fw={500}>Allowed Formats</TableTd>
+                    <TableTd>
                       <Group spacing="xs">
                         {user_info.allowed_output_formats.map(
                           (format, index) => (
@@ -357,10 +308,10 @@ const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
                           )
                         )}
                       </Group>
-                    </Table.Td>
-                  </Table.Tr>
+                    </TableTd>
+                  </TableTr>
                 )}
-            </Table.Tbody>
+            </TableTbody>
           </Table>
         </Box>
 
@@ -373,46 +324,46 @@ const AccountInfoModal = ({ isOpen, onClose, profile, onRefresh }) => {
                 Server Information
               </Text>
               <Table striped highlightOnHover>
-                <Table.Tbody>
+                <TableTbody>
                   {server_info.url && (
-                    <Table.Tr>
-                      <Table.Td fw={500} w="40%">
+                    <TableTr>
+                      <TableTd fw={500} w="40%">
                         Server URL
-                      </Table.Td>
-                      <Table.Td>
+                      </TableTd>
+                      <TableTd>
                         <Text size="sm" family="monospace">
                           {server_info.url}
                         </Text>
-                      </Table.Td>
-                    </Table.Tr>
+                      </TableTd>
+                    </TableTr>
                   )}
                   {server_info.port && (
-                    <Table.Tr>
-                      <Table.Td fw={500}>Port</Table.Td>
-                      <Table.Td>
+                    <TableTr>
+                      <TableTd fw={500}>Port</TableTd>
+                      <TableTd>
                         <Badge variant="outline" size="sm">
                           {server_info.port}
                         </Badge>
-                      </Table.Td>
-                    </Table.Tr>
+                      </TableTd>
+                    </TableTr>
                   )}
                   {server_info.https_port && (
-                    <Table.Tr>
-                      <Table.Td fw={500}>HTTPS Port</Table.Td>
-                      <Table.Td>
+                    <TableTr>
+                      <TableTd fw={500}>HTTPS Port</TableTd>
+                      <TableTd>
                         <Badge variant="outline" size="sm" color="green">
                           {server_info.https_port}
                         </Badge>
-                      </Table.Td>
-                    </Table.Tr>
+                      </TableTd>
+                    </TableTr>
                   )}
                   {server_info.timezone && (
-                    <Table.Tr>
-                      <Table.Td fw={500}>Timezone</Table.Td>
-                      <Table.Td>{server_info.timezone}</Table.Td>
-                    </Table.Tr>
+                    <TableTr>
+                      <TableTd fw={500}>Timezone</TableTd>
+                      <TableTd>{server_info.timezone}</TableTd>
+                    </TableTr>
                   )}
-                </Table.Tbody>
+                </TableTbody>
               </Table>
             </Box>
           </>
diff --git a/frontend/src/components/forms/AssignChannelNumbers.jsx b/frontend/src/components/forms/AssignChannelNumbers.jsx
index 7465cae7..22861986 100644
--- a/frontend/src/components/forms/AssignChannelNumbers.jsx
+++ b/frontend/src/components/forms/AssignChannelNumbers.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React from 'react';
 import API from '../../api';
 import {
   Button,
@@ -6,16 +6,24 @@ import {
   Text,
   Group,
   Flex,
-  useMantineTheme,
   NumberInput,
 } from '@mantine/core';
 import { ListOrdered } from 'lucide-react';
 import { useForm } from '@mantine/form';
-import { notifications } from '@mantine/notifications';
+import { showNotification } from '../../utils/notificationUtils.js';
+
+const assignChannelNumbers = (channelIds, starting_number) => {
+  return API.assignChannelNumbers(
+    channelIds,
+    starting_number
+  );
+}
+
+const requeryChannels = () => {
+  API.requeryChannels();
+}
 
 const AssignChannelNumbers = ({ channelIds, isOpen, onClose }) => {
-  const theme = useMantineTheme();
-
   const form = useForm({
     mode: 'uncontrolled',
     initialValues: {
@@ -27,22 +35,19 @@ const AssignChannelNumbers = ({ channelIds, isOpen, onClose }) => {
     const { starting_number } = form.getValues();
 
     try {
-      const result = await API.assignChannelNumbers(
-        channelIds,
-        starting_number
-      );
+      const result = await assignChannelNumbers(channelIds, starting_number);
 
-      notifications.show({
+      showNotification({
         title: result.message || 'Channels assigned',
         color: 'green.5',
       });
 
-      API.requeryChannels();
+      requeryChannels();
 
       onClose();
     } catch (err) {
       console.error(err);
-      notifications.show({
+      showNotification({
         title: 'Failed to assign channels',
         color: 'red.5',
       });
diff --git a/frontend/src/components/forms/Channel.jsx b/frontend/src/components/forms/Channel.jsx
index 3a057614..28826e7f 100644
--- a/frontend/src/components/forms/Channel.jsx
+++ b/frontend/src/components/forms/Channel.jsx
@@ -1,45 +1,52 @@
-import React, { useState, useEffect, useRef, useMemo } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as Yup from 'yup';
 import useChannelsStore from '../../store/channels';
-import API from '../../api';
 import useStreamProfilesStore from '../../store/streamProfiles';
-import useStreamsStore from '../../store/streams';
 import ChannelGroupForm from './ChannelGroup';
-import usePlaylistsStore from '../../store/playlists';
 import logo from '../../images/logo.png';
 import { useChannelLogoSelection } from '../../hooks/useSmartLogos';
 import useLogosStore from '../../store/logos';
 import LazyLogo from '../LazyLogo';
 import LogoForm from './Logo';
 import {
+  ActionIcon,
   Box,
   Button,
-  Modal,
-  TextInput,
-  Text,
-  Group,
-  ActionIcon,
   Center,
-  Flex,
-  Select,
   Divider,
-  Stack,
-  useMantineTheme,
-  Popover,
-  ScrollArea,
-  Tooltip,
+  Flex,
+  Group,
+  Modal,
   NumberInput,
-  UnstyledButton,
+  Popover,
+  PopoverDropdown,
+  PopoverTarget,
+  ScrollArea,
+  Select,
+  Stack,
   Switch,
+  Text,
+  TextInput,
+  Tooltip,
+  UnstyledButton,
+  useMantineTheme,
 } from '@mantine/core';
-import { notifications } from '@mantine/notifications';
-import { ListOrdered, SquarePlus, SquareX, X, Zap } from 'lucide-react';
+import { ListOrdered, SquarePlus, X, Zap } from 'lucide-react';
 import useEPGsStore from '../../store/epgs';
-
 import { FixedSizeList as List } from 'react-window';
-import { USER_LEVELS, USER_LEVEL_LABELS } from '../../constants';
+import { USER_LEVEL_LABELS, USER_LEVELS } from '../../constants';
+import { showNotification, updateNotification, } from '../../utils/notificationUtils.js';
+import {
+  addChannel,
+  createLogo,
+  getChannelFormDefaultValues,
+  getFormattedValues,
+  handleEpgUpdate,
+  matchChannelEpg,
+  requeryChannels,
+} from '../../utils/forms/ChannelUtils.js';
 
 const validationSchema = Yup.object({
   name: Yup.string().required('Name is required'),
@@ -54,7 +61,6 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
   const groupListRef = useRef(null);
 
   const channelGroups = useChannelsStore((s) => s.channelGroups);
-  const canEditChannelGroup = useChannelsStore((s) => s.canEditChannelGroup);
 
   const {
     logos: channelLogos,
@@ -69,9 +75,8 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
   useEffect(() => {
     ensureLogosLoaded();
   }, [ensureLogosLoaded]);
-  const streams = useStreamsStore((state) => state.streams);
+
   const streamProfiles = useStreamProfilesStore((s) => s.profiles);
-  const playlists = usePlaylistsStore((s) => s.playlists);
   const epgs = useEPGsStore((s) => s.epgs);
   const tvgs = useEPGsStore((s) => s.tvgs);
   const tvgsById = useEPGsStore((s) => s.tvgsById);
@@ -90,18 +95,6 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
   const [autoMatchLoading, setAutoMatchLoading] = useState(false);
   const groupOptions = Object.values(channelGroups);
 
-  const addStream = (stream) => {
-    const streamSet = new Set(channelStreams);
-    streamSet.add(stream);
-    setChannelStreams(Array.from(streamSet));
-  };
-
-  const removeStream = (stream) => {
-    const streamSet = new Set(channelStreams);
-    streamSet.delete(stream);
-    setChannelStreams(Array.from(streamSet));
-  };
-
   const handleLogoSuccess = ({ logo }) => {
     if (logo && logo.id) {
       setValue('logo_id', logo.id);
@@ -113,7 +106,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
   const handleAutoMatchEpg = async () => {
     // Only attempt auto-match for existing channels (editing mode)
     if (!channel || !channel.id) {
-      notifications.show({
+      showNotification({
         title: 'Info',
         message: 'Auto-match is only available when editing existing channels.',
         color: 'blue',
@@ -123,7 +116,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
 
     setAutoMatchLoading(true);
     try {
-      const response = await API.matchChannelEpg(channel.id);
+      const response = await matchChannelEpg(channel);
 
       if (response.matched) {
         // Update the form with the new EPG data
@@ -131,20 +124,20 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
           setValue('epg_data_id', response.channel.epg_data_id);
         }
 
-        notifications.show({
+        showNotification({
           title: 'Success',
           message: response.message,
           color: 'green',
         });
       } else {
-        notifications.show({
+        showNotification({
           title: 'No Match Found',
           message: response.message,
           color: 'orange',
         });
       }
     } catch (error) {
-      notifications.show({
+      showNotification({
         title: 'Error',
         message: 'Failed to auto-match EPG data',
         color: 'red',
@@ -158,7 +151,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
   const handleSetNameFromEpg = () => {
     const epgDataId = watch('epg_data_id');
     if (!epgDataId) {
-      notifications.show({
+      showNotification({
         title: 'No EPG Selected',
         message: 'Please select an EPG source first.',
         color: 'orange',
@@ -169,13 +162,13 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
     const tvg = tvgsById[epgDataId];
     if (tvg && tvg.name) {
       setValue('name', tvg.name);
-      notifications.show({
+      showNotification({
         title: 'Success',
         message: `Channel name set to "${tvg.name}"`,
         color: 'green',
       });
     } else {
-      notifications.show({
+      showNotification({
         title: 'No Name Available',
         message: 'No name found in the selected EPG data.',
         color: 'orange',
@@ -186,7 +179,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
   const handleSetLogoFromEpg = async () => {
     const epgDataId = watch('epg_data_id');
     if (!epgDataId) {
-      notifications.show({
+      showNotification({
         title: 'No EPG Selected',
         message: 'Please select an EPG source first.',
         color: 'orange',
@@ -196,7 +189,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
 
     const tvg = tvgsById[epgDataId];
     if (!tvg || !tvg.icon_url) {
-      notifications.show({
+      showNotification({
         title: 'No EPG Icon',
         message: 'EPG data does not have an icon URL.',
         color: 'orange',
@@ -206,20 +199,20 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
 
     try {
       // Try to find a logo that matches the EPG icon URL - check ALL logos to avoid duplicates
-      let matchingLogo = Object.values(allLogos).find(
+      const matchingLogo = Object.values(allLogos).find(
         (logo) => logo.url === tvg.icon_url
       );
 
       if (matchingLogo) {
         setValue('logo_id', matchingLogo.id);
-        notifications.show({
+        showNotification({
           title: 'Success',
           message: `Logo set to "${matchingLogo.name}"`,
           color: 'green',
         });
       } else {
         // Logo doesn't exist - create it
-        notifications.show({
+        showNotification({
           id: 'creating-logo',
           title: 'Creating Logo',
           message: `Creating new logo from EPG icon URL...`,
@@ -233,11 +226,11 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
           };
 
           // Create logo by calling the Logo API directly
-          const newLogo = await API.createLogo(newLogoData);
+          const newLogo = await createLogo(newLogoData);
 
           setValue('logo_id', newLogo.id);
 
-          notifications.update({
+          updateNotification({
             id: 'creating-logo',
             title: 'Success',
             message: `Created and assigned new logo "${newLogo.name}"`,
@@ -246,7 +239,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
             autoClose: 5000,
           });
         } catch (createError) {
-          notifications.update({
+          updateNotification({
             id: 'creating-logo',
             title: 'Error',
             message: 'Failed to create logo from EPG icon URL',
@@ -258,7 +251,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
         }
       }
     } catch (error) {
-      notifications.show({
+      showNotification({
         title: 'Error',
         message: 'Failed to set logo from EPG data',
         color: 'red',
@@ -270,7 +263,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
   const handleSetTvgIdFromEpg = () => {
     const epgDataId = watch('epg_data_id');
     if (!epgDataId) {
-      notifications.show({
+      showNotification({
         title: 'No EPG Selected',
         message: 'Please select an EPG source first.',
         color: 'orange',
@@ -281,13 +274,13 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
     const tvg = tvgsById[epgDataId];
     if (tvg && tvg.tvg_id) {
       setValue('tvg_id', tvg.tvg_id);
-      notifications.show({
+      showNotification({
         title: 'Success',
         message: `TVG-ID set to "${tvg.tvg_id}"`,
         color: 'green',
       });
     } else {
-      notifications.show({
+      showNotification({
         title: 'No TVG-ID Available',
         message: 'No TVG-ID found in the selected EPG data.',
         color: 'orange',
@@ -296,28 +289,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
   };
 
   const defaultValues = useMemo(
-    () => ({
-      name: channel?.name || '',
-      channel_number:
-        channel?.channel_number !== null &&
-        channel?.channel_number !== undefined
-          ? channel.channel_number
-          : '',
-      channel_group_id: channel?.channel_group_id
-        ? `${channel.channel_group_id}`
-        : Object.keys(channelGroups).length > 0
-          ? Object.keys(channelGroups)[0]
-          : '',
-      stream_profile_id: channel?.stream_profile_id
-        ? `${channel.stream_profile_id}`
-        : '0',
-      tvg_id: channel?.tvg_id || '',
-      tvc_guide_stationid: channel?.tvc_guide_stationid || '',
-      epg_data_id: channel?.epg_data_id ?? '',
-      logo_id: channel?.logo_id ? `${channel.logo_id}` : '',
-      user_level: `${channel?.user_level ?? '0'}`,
-      is_adult: channel?.is_adult ?? false,
-    }),
+    () => getChannelFormDefaultValues(channel, channelGroups),
     [channel, channelGroups]
   );
 
@@ -334,57 +306,14 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
   });
 
   const onSubmit = async (values) => {
-    let response;
-
     try {
-      const formattedValues = { ...values };
-
-      // Convert empty or "0" stream_profile_id to null for the API
-      if (
-        !formattedValues.stream_profile_id ||
-        formattedValues.stream_profile_id === '0'
-      ) {
-        formattedValues.stream_profile_id = null;
-      }
-
-      // Ensure tvg_id is properly included (no empty strings)
-      formattedValues.tvg_id = formattedValues.tvg_id || null;
-
-      // Ensure tvc_guide_stationid is properly included (no empty strings)
-      formattedValues.tvc_guide_stationid =
-        formattedValues.tvc_guide_stationid || null;
+      const formattedValues = getFormattedValues(values);
 
       if (channel) {
-        // If there's an EPG to set, use our enhanced endpoint
-        if (values.epg_data_id !== (channel.epg_data_id ?? '')) {
-          // Use the special endpoint to set EPG and trigger refresh
-          const epgResponse = await API.setChannelEPG(
-            channel.id,
-            values.epg_data_id
-          );
-
-          // Remove epg_data_id from values since we've handled it separately
-          const { epg_data_id, ...otherValues } = formattedValues;
-
-          // Update other channel fields if needed
-          if (Object.keys(otherValues).length > 0) {
-            response = await API.updateChannel({
-              id: channel.id,
-              ...otherValues,
-              streams: channelStreams.map((stream) => stream.id),
-            });
-          }
-        } else {
-          // No EPG change, regular update
-          response = await API.updateChannel({
-            id: channel.id,
-            ...formattedValues,
-            streams: channelStreams.map((stream) => stream.id),
-          });
-        }
+        await handleEpgUpdate(channel, values, formattedValues, channelStreams);
       } else {
         // New channel creation - use the standard method
-        response = await API.addChannel({
+        await addChannel({
           ...formattedValues,
           streams: channelStreams.map((stream) => stream.id),
         });
@@ -394,7 +323,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
     }
 
     reset();
-    API.requeryChannels();
+    requeryChannels();
 
     // Refresh channel profiles to update the membership information
     useChannelsStore.getState().fetchChannelProfiles();
@@ -510,7 +439,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
                   // position="bottom-start"
                   withArrow
                 >
-                  <Popover.Target>
+                  <PopoverTarget>
                     <TextInput
                       id="channel_group_id"
                       name="channel_group_id"
@@ -524,9 +453,9 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
                       onClick={() => setGroupPopoverOpened(true)}
                       size="xs"
                     />
-                  </Popover.Target>
+                  </PopoverTarget>
 
-                  <Popover.Dropdown onMouseDown={(e) => e.stopPropagation()}>
+                  <PopoverDropdown onMouseDown={(e) => e.stopPropagation()}>
                     <Group>
                       <TextInput
                         placeholder="Filter"
@@ -581,26 +510,9 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
                         )}
                       </List>
                     </ScrollArea>
-                  </Popover.Dropdown>
+                  </PopoverDropdown>
                 </Popover>
 
-                {/* <Select
-                  id="channel_group_id"
-                  name="channel_group_id"
-                  label="Channel Group"
-                  value={watch('channel_group_id')}
-                  searchable
-                  onChange={(value) => {
-                    setValue('channel_group_id', value);
-                  }}
-                  error={errors.channel_group_id?.message}
-                  data={Object.values(channelGroups).map((option, index) => ({
-                    value: `${option.id}`,
-                    label: option.name,
-                  }))}
-                  size="xs"
-                  style={{ flex: 1 }}
-                /> */}
                 <Flex align="flex-end">
                   <ActionIcon
                     color={theme.tailwind.green[5]}
@@ -668,7 +580,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
                   // position="bottom-start"
                   withArrow
                 >
-                  <Popover.Target>
+                  <PopoverTarget>
                     <TextInput
                       id="logo_id"
                       name="logo_id"
@@ -699,9 +611,9 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
                       }}
                       size="xs"
                     />
-                  </Popover.Target>
+                  </PopoverTarget>
 
-                  <Popover.Dropdown onMouseDown={(e) => e.stopPropagation()}>
+                  <PopoverDropdown onMouseDown={(e) => e.stopPropagation()}>
                     <Group>
                       <TextInput
                         placeholder="Filter"
@@ -791,7 +703,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
                         </List>
                       )}
                     </ScrollArea>
-                  </Popover.Dropdown>
+                  </PopoverDropdown>
                 </Popover>
 
                 <Stack gap="xs" align="center">
@@ -876,10 +788,9 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
               <Popover
                 opened={epgPopoverOpened}
                 onChange={setEpgPopoverOpened}
-                // position="bottom-start"
                 withArrow
               >
-                <Popover.Target>
+                <PopoverTarget>
                   <TextInput
                     id="epg_data_id"
                     name="epg_data_id"
@@ -947,9 +858,9 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
                       </Tooltip>
                     }
                   />
-                </Popover.Target>
+                </PopoverTarget>
 
-                <Popover.Dropdown onMouseDown={(e) => e.stopPropagation()}>
+                <PopoverDropdown onMouseDown={(e) => e.stopPropagation()}>
                   <Group>
                     <Select
                       label="Source"
@@ -1021,7 +932,7 @@ const ChannelForm = ({ channel = null, isOpen, onClose }) => {
                       )}
                     </List>
                   </ScrollArea>
-                </Popover.Dropdown>
+                </PopoverDropdown>
               </Popover>
             </Stack>
           </Group>
diff --git a/frontend/src/components/forms/ChannelBatch.jsx b/frontend/src/components/forms/ChannelBatch.jsx
index a315c62b..a227b20c 100644
--- a/frontend/src/components/forms/ChannelBatch.jsx
+++ b/frontend/src/components/forms/ChannelBatch.jsx
@@ -1,41 +1,60 @@
-import React, { useState, useEffect, useMemo, useRef } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import useChannelsStore from '../../store/channels';
 import useChannelsTableStore from '../../store/channelsTable.jsx';
-import API from '../../api';
 import useStreamProfilesStore from '../../store/streamProfiles';
 import useEPGsStore from '../../store/epgs';
 import ChannelGroupForm from './ChannelGroup';
 import {
+  ActionIcon,
   Box,
   Button,
-  Modal,
-  TextInput,
-  Text,
-  Group,
-  ActionIcon,
-  Flex,
-  Select,
-  Stack,
-  useMantineTheme,
-  Popover,
-  ScrollArea,
-  Tooltip,
-  UnstyledButton,
   Center,
   Divider,
-  Checkbox,
+  Flex,
+  Group,
+  Modal,
   Paper,
+  Popover,
+  PopoverDropdown,
+  PopoverTarget,
+  ScrollArea,
+  Select,
+  Stack,
+  Text,
+  TextInput,
+  Tooltip,
+  UnstyledButton,
+  useMantineTheme,
 } from '@mantine/core';
-import { ListOrdered, SquarePlus, SquareX, X } from 'lucide-react';
+import { ListOrdered, SquarePlus, X } from 'lucide-react';
 import { FixedSizeList as List } from 'react-window';
 import { useForm } from '@mantine/form';
-import { notifications } from '@mantine/notifications';
-import { USER_LEVELS, USER_LEVEL_LABELS } from '../../constants';
+import { USER_LEVEL_LABELS, USER_LEVELS } from '../../constants';
 import { useChannelLogoSelection } from '../../hooks/useSmartLogos';
 import LazyLogo from '../LazyLogo';
 import logo from '../../images/logo.png';
 import ConfirmationDialog from '../ConfirmationDialog';
 import useWarningsStore from '../../store/warnings';
+import { showNotification } from '../../utils/notificationUtils.js';
+import { requeryChannels } from '../../utils/forms/ChannelUtils.js';
+import {
+  batchSetEPG,
+  buildEpgAssociations,
+  buildSubmitValues,
+  bulkRegexRenameChannels,
+  computeRegexPreview,
+  getChannelGroupChange,
+  getEpgChange,
+  getLogoChange,
+  getMatureContentChange,
+  getRegexNameChange,
+  getStreamProfileChange,
+  getUserLevelChange,
+  setChannelLogosFromEpg,
+  setChannelNamesFromEpg,
+  setChannelTvgIdsFromEpg,
+  updateChannels,
+} from '../../utils/forms/ChannelBatchUtils.js';
 
 const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
   const theme = useMantineTheme();
@@ -109,70 +128,17 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
 
   // Build confirmation message based on selected changes
   const getConfirmationMessage = () => {
-    const changes = [];
     const values = form.getValues();
 
-    // Check for regex name changes
-    if (regexFind.trim().length > 0) {
-      changes.push(
-        `• Name Change: Apply regex find "${regexFind}" replace with "${regexReplace || ''}"`
-      );
-    }
-
-    // Check channel group
-    if (selectedChannelGroup && selectedChannelGroup !== '-1') {
-      const groupName = channelGroups[selectedChannelGroup]?.name || 'Unknown';
-      changes.push(`• Channel Group: ${groupName}`);
-    }
-
-    // Check logo
-    if (selectedLogoId && selectedLogoId !== '-1') {
-      if (selectedLogoId === '0') {
-        changes.push(`• Logo: Use Default`);
-      } else {
-        const logoName = channelLogos[selectedLogoId]?.name || 'Selected Logo';
-        changes.push(`• Logo: ${logoName}`);
-      }
-    }
-
-    // Check stream profile
-    if (values.stream_profile_id && values.stream_profile_id !== '-1') {
-      if (values.stream_profile_id === '0') {
-        changes.push(`• Stream Profile: Use Default`);
-      } else {
-        const profile = streamProfiles.find(
-          (p) => `${p.id}` === `${values.stream_profile_id}`
-        );
-        const profileName = profile?.name || 'Selected Profile';
-        changes.push(`• Stream Profile: ${profileName}`);
-      }
-    }
-
-    // Check user level
-    if (values.user_level && values.user_level !== '-1') {
-      const userLevelLabel =
-        USER_LEVEL_LABELS[values.user_level] || values.user_level;
-      changes.push(`• User Level: ${userLevelLabel}`);
-    }
-
-    // Check mature content flag
-    if (values.is_adult && values.is_adult !== '-1') {
-      changes.push(
-        `• Mature Content: ${values.is_adult === 'true' ? 'Yes' : 'No'}`
-      );
-    }
-
-    // Check dummy EPG
-    if (selectedDummyEpgId) {
-      if (selectedDummyEpgId === 'clear') {
-        changes.push(`• EPG: Clear Assignment (use default dummy)`);
-      } else {
-        const epgName = epgs[selectedDummyEpgId]?.name || 'Selected EPG';
-        changes.push(`• Dummy EPG: ${epgName}`);
-      }
-    }
-
-    return changes;
+    return [
+      getRegexNameChange(regexFind, regexReplace),
+      getChannelGroupChange(selectedChannelGroup, channelGroups),
+      getLogoChange(selectedLogoId, channelLogos),
+      getStreamProfileChange(values.stream_profile_id, streamProfiles),
+      getUserLevelChange(values.user_level, USER_LEVEL_LABELS),
+      getMatureContentChange(values.is_adult),
+      getEpgChange(selectedDummyEpgId, epgs),
+    ].filter(Boolean);
   };
 
   const handleSubmit = () => {
@@ -180,7 +146,7 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
 
     // If no changes detected, show notification
     if (changes.length === 0) {
-      notifications.show({
+      showNotification({
         title: 'No Changes',
         message: 'Please select at least one field to update.',
         color: 'orange',
@@ -200,110 +166,33 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
     setConfirmBatchUpdateOpen(false);
     setIsSubmitting(true);
 
-    const values = {
-      ...form.getValues(),
-    }; // Handle channel group ID - convert to integer if it exists
-    if (selectedChannelGroup && selectedChannelGroup !== '-1') {
-      values.channel_group_id = parseInt(selectedChannelGroup);
-    } else {
-      delete values.channel_group_id;
-    }
-
-    if (selectedLogoId && selectedLogoId !== '-1') {
-      if (selectedLogoId === '0') {
-        values.logo_id = null;
-      } else {
-        values.logo_id = parseInt(selectedLogoId);
-      }
-    }
-    delete values.logo;
-
-    // Handle stream profile ID - convert special values
-    if (!values.stream_profile_id || values.stream_profile_id === '-1') {
-      delete values.stream_profile_id;
-    } else if (
-      values.stream_profile_id === '0' ||
-      values.stream_profile_id === 0
-    ) {
-      values.stream_profile_id = null; // Convert "use default" to null
-    }
-
-    if (values.user_level == '-1') {
-      delete values.user_level;
-    }
-
-    if (values.is_adult === '-1') {
-      delete values.is_adult;
-    } else if (values.is_adult === 'true') {
-      values.is_adult = true;
-    } else if (values.is_adult === 'false') {
-      values.is_adult = false;
-    }
-
-    // Remove the channel_group field from form values as we use channel_group_id
-    delete values.channel_group;
-
     try {
-      const applyRegex = regexFind.trim().length > 0;
+      const values = buildSubmitValues(
+        form.getValues(),
+        selectedChannelGroup,
+        selectedLogoId
+      );
 
-      // First, handle standard field updates (group, logo, profile, etc.)
       if (Object.keys(values).length > 0) {
-        await API.updateChannels(channelIds, values);
+        await updateChannels(channelIds, values);
       }
 
-      // Then, handle name changes via server-side regex to avoid loading all channels client-side
-      if (applyRegex) {
-        // Default global replace; case-insensitive could be added later via UI if needed
-        const flags = 'g';
-        await API.bulkRegexRenameChannels(
-          channelIds,
-          regexFind,
-          regexReplace ?? '',
-          flags
-        );
+      if (regexFind.trim().length > 0) {
+        await bulkRegexRenameChannels(channelIds, regexFind, regexReplace, 'g');
       }
 
-      // Then, handle EPG assignment if a dummy EPG was selected
-      if (selectedDummyEpgId) {
-        if (selectedDummyEpgId === 'clear') {
-          // Clear EPG assignments
-          const associations = channelIds.map((id) => ({
-            channel_id: id,
-            epg_data_id: null,
-          }));
-          await API.batchSetEPG(associations);
-        } else {
-          // Assign the selected dummy EPG
-          const selectedEpg = epgs[selectedDummyEpgId];
-          if (selectedEpg && selectedEpg.epg_data_count > 0) {
-            // Convert to number for comparison since Select returns string
-            const epgSourceId = parseInt(selectedDummyEpgId, 10);
-
-            // Check if we already have EPG data loaded in the store
-            let epgData = tvgs.find((data) => data.epg_source === epgSourceId);
-
-            // If not in store, fetch it
-            if (!epgData) {
-              const epgDataList = await API.getEPGData();
-              epgData = epgDataList.find(
-                (data) => data.epg_source === epgSourceId
-              );
-            }
-
-            if (epgData) {
-              const associations = channelIds.map((id) => ({
-                channel_id: id,
-                epg_data_id: epgData.id,
-              }));
-              await API.batchSetEPG(associations);
-            }
-          }
-        }
+      const associations = await buildEpgAssociations(
+        selectedDummyEpgId,
+        channelIds,
+        epgs,
+        tvgs
+      );
+      if (associations) {
+        await batchSetEPG(associations);
       }
 
-      // Refresh both the channels table data and the main channels store
       await Promise.all([
-        API.requeryChannels(),
+        requeryChannels(),
         useChannelsStore.getState().fetchChannelIds(),
       ]);
       onClose();
@@ -316,7 +205,7 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
 
   const handleSetNamesFromEpg = async () => {
     if (!channelIds || channelIds.length === 0) {
-      notifications.show({
+      showNotification({
         title: 'No Channels Selected',
         message: 'No channels to update.',
         color: 'orange',
@@ -336,11 +225,11 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
     setSettingNames(true);
     try {
       // Start the backend task
-      await API.setChannelNamesFromEpg(channelIds);
+      await setChannelNamesFromEpg(channelIds);
 
       // The task will send WebSocket updates for progress
       // Just show that it started successfully
-      notifications.show({
+      showNotification({
         title: 'Task Started',
         message: `Started setting names from EPG for ${channelIds.length} channels. Progress will be shown in notifications.`,
         color: 'blue',
@@ -350,7 +239,7 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
       onClose();
     } catch (error) {
       console.error('Failed to start EPG name setting task:', error);
-      notifications.show({
+      showNotification({
         title: 'Error',
         message: 'Failed to start EPG name setting task.',
         color: 'red',
@@ -363,7 +252,7 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
 
   const handleSetLogosFromEpg = async () => {
     if (!channelIds || channelIds.length === 0) {
-      notifications.show({
+      showNotification({
         title: 'No Channels Selected',
         message: 'No channels to update.',
         color: 'orange',
@@ -383,11 +272,11 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
     setSettingLogos(true);
     try {
       // Start the backend task
-      await API.setChannelLogosFromEpg(channelIds);
+      await setChannelLogosFromEpg(channelIds);
 
       // The task will send WebSocket updates for progress
       // Just show that it started successfully
-      notifications.show({
+      showNotification({
         title: 'Task Started',
         message: `Started setting logos from EPG for ${channelIds.length} channels. Progress will be shown in notifications.`,
         color: 'blue',
@@ -397,7 +286,7 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
       onClose();
     } catch (error) {
       console.error('Failed to start EPG logo setting task:', error);
-      notifications.show({
+      showNotification({
         title: 'Error',
         message: 'Failed to start EPG logo setting task.',
         color: 'red',
@@ -410,7 +299,7 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
 
   const handleSetTvgIdsFromEpg = async () => {
     if (!channelIds || channelIds.length === 0) {
-      notifications.show({
+      showNotification({
         title: 'No Channels Selected',
         message: 'No channels to update.',
         color: 'orange',
@@ -430,11 +319,11 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
     setSettingTvgIds(true);
     try {
       // Start the backend task
-      await API.setChannelTvgIdsFromEpg(channelIds);
+      await setChannelTvgIdsFromEpg(channelIds);
 
       // The task will send WebSocket updates for progress
       // Just show that it started successfully
-      notifications.show({
+      showNotification({
         title: 'Task Started',
         message: `Started setting TVG-IDs from EPG for ${channelIds.length} channels. Progress will be shown in notifications.`,
         color: 'blue',
@@ -444,7 +333,7 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
       onClose();
     } catch (error) {
       console.error('Failed to start EPG TVG-ID setting task:', error);
-      notifications.show({
+      showNotification({
         title: 'Error',
         message: 'Failed to start EPG TVG-ID setting task.',
         color: 'red',
@@ -455,29 +344,6 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
     }
   };
 
-  // useEffect(() => {
-  //   // const sameStreamProfile = channels.every(
-  //   //   (channel) => channel.stream_profile_id == channels[0].stream_profile_id
-  //   // );
-  //   // const sameChannelGroup = channels.every(
-  //   //   (channel) => channel.channel_group_id == channels[0].channel_group_id
-  //   // );
-  //   // const sameUserLevel = channels.every(
-  //   //   (channel) => channel.user_level == channels[0].user_level
-  //   // );
-  //   // form.setValues({
-  //   //   ...(sameStreamProfile && {
-  //   //     stream_profile_id: `${channels[0].stream_profile_id}`,
-  //   //   }),
-  //   //   ...(sameChannelGroup && {
-  //   //     channel_group_id: `${channels[0].channel_group_id}`,
-  //   //   }),
-  //   //   ...(sameUserLevel && {
-  //   //     user_level: `${channels[0].user_level}`,
-  //   //   }),
-  //   // });
-  // }, [channelIds, streamProfiles, channelGroups]);
-
   const handleChannelGroupModalClose = (newGroup) => {
     setChannelGroupModalOpen(false);
 
@@ -511,6 +377,71 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
     return <></>;
   }
 
+  const LogoListItem = ({ item, onSelect }) => (
+    <div
+      style={{ cursor: 'pointer', padding: '5px', borderRadius: '4px' }}
+      onClick={() => onSelect(item)}
+      onMouseEnter={(e) => {
+        e.currentTarget.style.backgroundColor = 'rgb(68, 68, 68)';
+      }}
+      onMouseLeave={(e) => {
+        e.currentTarget.style.backgroundColor = 'transparent';
+      }}
+    >
+      <Center style={{ flexDirection: 'column', gap: '2px' }}>
+        {item.isDefault ? (
+          <img
+            src={logo}
+            height="30"
+            style={{ maxWidth: 80, objectFit: 'contain' }}
+            alt="Default Logo"
+          />
+        ) : item.id > 0 ? (
+          <img
+            src={item.cache_url || logo}
+            height="30"
+            style={{ maxWidth: 80, objectFit: 'contain' }}
+            alt={item.name || 'Logo'}
+            onError={(e) => {
+              if (e.target.src !== logo) e.target.src = logo;
+            }}
+          />
+        ) : (
+          <Box h={30} />
+        )}
+        <Text
+          size="xs"
+          c="dimmed"
+          ta="center"
+          style={{
+            maxWidth: 80,
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {item.name}
+        </Text>
+      </Center>
+    </div>
+  );
+
+  const LogoPickerList = ({ filteredLogos, listRef, onSelect }) => (
+    <List
+      height={200}
+      itemCount={filteredLogos.length}
+      itemSize={55}
+      style={{ width: '100%' }}
+      ref={listRef}
+    >
+      {({ index, style }) => (
+        <div style={style}>
+          <LogoListItem item={filteredLogos[index]} onSelect={onSelect} />
+        </div>
+      )}
+    </List>
+  );
+
   return (
     <>
       <Modal
@@ -621,10 +552,9 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
               <Popover
                 opened={groupPopoverOpened}
                 onChange={setGroupPopoverOpened}
-                // position="bottom-start"
                 withArrow
               >
-                <Popover.Target>
+                <PopoverTarget>
                   <Group style={{ width: '100%' }} align="flex-end">
                     <TextInput
                       id="channel_group"
@@ -665,9 +595,9 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
                       <SquarePlus size="20" />
                     </ActionIcon>
                   </Group>
-                </Popover.Target>
+                </PopoverTarget>
 
-                <Popover.Dropdown onMouseDown={(e) => e.stopPropagation()}>
+                <PopoverDropdown onMouseDown={(e) => e.stopPropagation()}>
                   <Group style={{ width: '100%' }} spacing="xs">
                     <TextInput
                       placeholder="Filter"
@@ -736,7 +666,7 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
                       )}
                     </List>
                   </ScrollArea>
-                </Popover.Dropdown>
+                </PopoverDropdown>
               </Popover>
 
               <Group style={{ width: '100%' }} align="flex-end" gap="xs">
@@ -745,7 +675,7 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
                   onChange={setLogoPopoverOpened}
                   withArrow
                 >
-                  <Popover.Target>
+                  <PopoverTarget>
                     <TextInput
                       label="Logo"
                       readOnly
@@ -770,8 +700,8 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
                         )
                       }
                     />
-                  </Popover.Target>
-                  <Popover.Dropdown onMouseDown={(e) => e.stopPropagation()}>
+                  </PopoverTarget>
+                  <PopoverDropdown onMouseDown={(e) => e.stopPropagation()}>
                     <Group>
                       <TextInput
                         placeholder="Filter"
@@ -798,94 +728,18 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
                           </Text>
                         </Center>
                       ) : (
-                        <List
-                          height={200}
-                          itemCount={filteredLogos.length}
-                          itemSize={55}
-                          style={{ width: '100%' }}
-                          ref={logoListRef}
-                        >
-                          {({ index, style }) => {
-                            const item = filteredLogos[index];
-                            return (
-                              <div
-                                style={{
-                                  ...style,
-                                  cursor: 'pointer',
-                                  padding: '5px',
-                                  borderRadius: '4px',
-                                }}
-                                onClick={() => {
-                                  setSelectedLogoId(item.id);
-                                  form.setValues({
-                                    logo: item.name,
-                                  });
-                                  setLogoPopoverOpened(false);
-                                }}
-                                onMouseEnter={(e) => {
-                                  e.currentTarget.style.backgroundColor =
-                                    'rgb(68, 68, 68)';
-                                }}
-                                onMouseLeave={(e) => {
-                                  e.currentTarget.style.backgroundColor =
-                                    'transparent';
-                                }}
-                              >
-                                <Center
-                                  style={{
-                                    flexDirection: 'column',
-                                    gap: '2px',
-                                  }}
-                                >
-                                  {item.isDefault ? (
-                                    <img
-                                      src={logo}
-                                      height="30"
-                                      style={{
-                                        maxWidth: 80,
-                                        objectFit: 'contain',
-                                      }}
-                                      alt="Default Logo"
-                                    />
-                                  ) : item.id > 0 ? (
-                                    <img
-                                      src={item.cache_url || logo}
-                                      height="30"
-                                      style={{
-                                        maxWidth: 80,
-                                        objectFit: 'contain',
-                                      }}
-                                      alt={item.name || 'Logo'}
-                                      onError={(e) => {
-                                        if (e.target.src !== logo) {
-                                          e.target.src = logo;
-                                        }
-                                      }}
-                                    />
-                                  ) : (
-                                    <Box h={30} />
-                                  )}
-                                  <Text
-                                    size="xs"
-                                    c="dimmed"
-                                    ta="center"
-                                    style={{
-                                      maxWidth: 80,
-                                      overflow: 'hidden',
-                                      textOverflow: 'ellipsis',
-                                      whiteSpace: 'nowrap',
-                                    }}
-                                  >
-                                    {item.name}
-                                  </Text>
-                                </Center>
-                              </div>
-                            );
+                        <LogoPickerList
+                          filteredLogos={filteredLogos}
+                          listRef={logoListRef}
+                          onSelect={(item) => {
+                            setSelectedLogoId(item.id);
+                            form.setValues({ logo: item.name });
+                            setLogoPopoverOpened(false);
                           }}
-                        </List>
+                        />
                       )}
                     </ScrollArea>
-                  </Popover.Dropdown>
+                  </PopoverDropdown>
                 </Popover>
                 {selectedLogoId > 0 && (
                   <LazyLogo
@@ -1092,29 +946,10 @@ const RegexPreview = ({ channelIds, find, replace }) => {
     }
     return map;
   }, [pageChannels]);
-  const previewItems = useMemo(() => {
-    const items = [];
-    if (!find) return items;
-    let flags = 'g';
-    let re;
-    try {
-      re = new RegExp(find, flags);
-    } catch (error) {
-      console.error('Invalid regex:', error);
-      return [{ before: 'Invalid regex', after: '' }];
-    }
-    // Limit preview to items that exist on the current page
-    const pageOnlyIds = channelIds.filter((id) => nameById[id] !== undefined);
-    for (let i = 0; i < Math.min(pageOnlyIds.length, 25); i++) {
-      const id = pageOnlyIds[i];
-      const before = nameById[id] ?? '';
-      const after = before.replace(re, replace ?? '');
-      if (before !== after) {
-        items.push({ before, after });
-      }
-    }
-    return items;
-  }, [channelIds, nameById, find, replace]);
+  const previewItems = useMemo(
+    () => computeRegexPreview(channelIds, nameById, find, replace),
+    [channelIds, nameById, find, replace]
+  );
 
   if (!find) return null;
 
diff --git a/frontend/src/components/forms/ChannelGroup.jsx b/frontend/src/components/forms/ChannelGroup.jsx
index af7e992d..ebb4d9ee 100644
--- a/frontend/src/components/forms/ChannelGroup.jsx
+++ b/frontend/src/components/forms/ChannelGroup.jsx
@@ -2,9 +2,19 @@
 import React from 'react';
 import API from '../../api';
 import { Flex, TextInput, Button, Modal, Alert } from '@mantine/core';
-import { notifications } from '@mantine/notifications';
 import { isNotEmpty, useForm } from '@mantine/form';
 import useChannelsStore from '../../store/channels';
+import { showNotification } from '../../utils/notificationUtils.js';
+
+const updateChannelGroup = (channelGroup, values) => {
+  return API.updateChannelGroup({
+    id: channelGroup.id,
+    ...values,
+  });
+}
+const addChannelGroup = (values) => {
+  return API.addChannelGroup(values);
+}
 
 const ChannelGroup = ({ channelGroup = null, isOpen, onClose }) => {
   const canEditChannelGroup = useChannelsStore((s) => s.canEditChannelGroup);
@@ -26,7 +36,7 @@ const ChannelGroup = ({ channelGroup = null, isOpen, onClose }) => {
   const onSubmit = async () => {
     // Prevent submission if editing is not allowed
     if (channelGroup && !canEdit) {
-      notifications.show({
+      showNotification({
         title: 'Error',
         message: 'Cannot edit group with M3U account associations',
         color: 'red',
@@ -35,16 +45,9 @@ const ChannelGroup = ({ channelGroup = null, isOpen, onClose }) => {
     }
 
     const values = form.getValues();
-    let newGroup;
-
-    if (channelGroup) {
-      newGroup = await API.updateChannelGroup({
-        id: channelGroup.id,
-        ...values,
-      });
-    } else {
-      newGroup = await API.addChannelGroup(values);
-    }
+    const newGroup = channelGroup
+      ? await updateChannelGroup(channelGroup, values)
+      : await addChannelGroup(values);
 
     form.reset();
     onClose(newGroup); // Pass the new/updated group back to parent
diff --git a/frontend/src/components/forms/Connection.jsx b/frontend/src/components/forms/Connection.jsx
index f4bec8b2..817789fd 100644
--- a/frontend/src/components/forms/Connection.jsx
+++ b/frontend/src/components/forms/Connection.jsx
@@ -1,30 +1,70 @@
 import React, { useEffect, useState } from 'react';
-import API from '../../api';
 import {
+  Accordion,
+  AccordionControl,
+  AccordionItem,
+  AccordionPanel,
+  Alert,
+  Box,
   Button,
+  Checkbox,
+  Flex,
+  Group,
   Modal,
   Select,
-  Stack,
-  Flex,
-  TextInput,
-  Box,
-  Checkbox,
-  Text,
   SimpleGrid,
-  Textarea,
-  Group,
+  Stack,
   Tabs,
-  Accordion,
-  Alert,
+  TabsList,
+  TabsPanel,
+  TabsTab,
+  Text,
+  Textarea,
+  TextInput,
 } from '@mantine/core';
 import { isNotEmpty, useForm } from '@mantine/form';
-import { SUBSCRIPTION_EVENTS } from '../../constants';
+import {
+  buildConfig,
+  buildSubscriptions,
+  createConnectIntegration,
+  EVENT_OPTIONS,
+  parseApiError,
+  setConnectSubscriptions,
+  updateConnectIntegration,
+} from '../../utils/forms/ConnectionUtils.js';
 
-const EVENT_OPTIONS = Object.entries(SUBSCRIPTION_EVENTS).map(
-  ([value, label]) => ({
-    value,
-    label,
-  })
+const PayloadTemplateItem = ({ opt, payloadTemplates, onTemplateChange }) => (
+  <AccordionItem value={opt.value} key={opt.value}>
+    <AccordionControl>{opt.label}</AccordionControl>
+    <AccordionPanel>
+      <Textarea
+        label={opt.label}
+        placeholder='{"key": "{{value}}"}'
+        value={payloadTemplates[opt.value] ?? ''}
+        onChange={onTemplateChange}
+      />
+    </AccordionPanel>
+  </AccordionItem>
+);
+
+const HeaderRow = ({ h, onKeyChange, onValueChange, onRemove }) => (
+  <Group align="flex-start">
+    <TextInput
+      placeholder="Header name"
+      value={h.key}
+      onChange={onKeyChange}
+      style={{ flex: 1 }}
+    />
+    <TextInput
+      placeholder="Header value"
+      value={h.value}
+      onChange={onValueChange}
+      style={{ flex: 1 }}
+    />
+    <Button size="xs" color="red" onClick={onRemove}>
+      Remove
+    </Button>
+  </Group>
 );
 
 const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
@@ -105,80 +145,26 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
   };
 
   const onSubmit = async (values) => {
-    console.log(values);
+    setSubmitting(true);
+    setApiError('');
     try {
-      setSubmitting(true);
-      setApiError('');
-      // Build config including optional headers
-      let config;
-      if (values.type === 'webhook') {
-        const hdrs = {};
-        headers.forEach((h) => {
-          if (h.key && h.key.trim()) hdrs[h.key] = h.value;
-        });
-        config = { url: values.url };
-        if (Object.keys(hdrs).length) config.headers = hdrs;
-      } else {
-        config = { path: values.script_path };
-      }
+      const config = buildConfig(values, headers);
+      const subs = buildSubscriptions(selectedEvents, payloadTemplates);
 
       if (connection) {
-        await API.updateConnectIntegration(connection.id, {
-          name: values.name,
-          type: values.type,
-          config,
-          enabled: values.enabled,
-        });
+        await updateConnectIntegration(connection, values, config);
       } else {
-        connection = await API.createConnectIntegration({
-          name: values.name,
-          type: values.type,
-          config,
-          enabled: values.enabled,
-        });
+        connection = await createConnectIntegration(values, config);
       }
 
-      // Build subscription list including optional payload templates
-      const subs = Object.keys(SUBSCRIPTION_EVENTS).map((event) => ({
-        event,
-        enabled: selectedEvents.includes(event),
-        payload_template: payloadTemplates[event] || null,
-      }));
-
-      await API.setConnectSubscriptions(connection.id, subs);
+      await setConnectSubscriptions(connection, subs);
       handleClose();
     } catch (error) {
       console.error('Failed to create/update connection', error);
-      // Try to map server-side validation errors to form fields
-      const body = error?.body;
 
-      if (body && typeof body === 'object') {
-        const fieldErrors = {};
-        if (body.name) {
-          fieldErrors.name = body.name;
-        }
-        if (body.type) {
-          fieldErrors.type = body.type;
-        }
-        if (body.config) {
-          if (values.type === 'webhook') {
-            fieldErrors.url = msg;
-          } else {
-            fieldErrors.script_path = msg;
-          }
-        }
-
-        const nonField = body.non_field_errors || body.detail;
-        if (Object.keys(fieldErrors).length > 0) {
-          form.setErrors(fieldErrors);
-        }
-        if (nonField) setApiError(nonField);
-        if (!nonField && Object.keys(fieldErrors).length === 0) {
-          setApiError(body);
-        }
-      } else {
-        setApiError(error?.message || 'Unknown error');
-      }
+      const { fieldErrors, apiError } = parseApiError(error);
+      if (Object.keys(fieldErrors).length > 0) form.setErrors(fieldErrors);
+      setApiError(apiError);
     } finally {
       setSubmitting(false);
     }
@@ -192,19 +178,41 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
 
   if (!isOpen) return null;
 
+  const onHeaderKeyChange = (idx, newValue) => {
+    const next = [...headers];
+    next[idx] = { ...next[idx], key: newValue };
+    setHeaders(next);
+  }
+
+  const onHeaderValueChange = (idx, newValue) => {
+    const next = [...headers];
+    next[idx] = {
+      ...next[idx],
+      value: newValue,
+    };
+    setHeaders(next);
+  }
+
+  const onHeaderRemove = (idx) => {
+    const next = headers.filter((_, i) => i !== idx);
+    setHeaders(
+      next.length ? next : [{ key: '', value: '' }]
+    );
+  }
+
   return (
     <Modal opened={isOpen} size="lg" onClose={handleClose} title="Connection">
       <form onSubmit={form.onSubmit(onSubmit)}>
         <Tabs defaultValue="settings">
-          <Tabs.List>
-            <Tabs.Tab value="settings">Settings</Tabs.Tab>
-            <Tabs.Tab value="triggers">Event Triggers</Tabs.Tab>
+          <TabsList>
+            <TabsTab value="settings">Settings</TabsTab>
+            <TabsTab value="triggers">Event Triggers</TabsTab>
             {form.getValues().type === 'webhook' && (
-              <Tabs.Tab value="templates">Payload Templates</Tabs.Tab>
+              <TabsTab value="templates">Payload Templates</TabsTab>
             )}
-          </Tabs.List>
+          </TabsList>
 
-          <Tabs.Panel value="settings" style={{ paddingTop: 10 }}>
+          <TabsPanel value="settings" style={{ paddingTop: 10 }}>
             <Stack gap="md">
               {apiError ? (
                 <Text c="red" size="sm">
@@ -246,43 +254,13 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
                   </Text>
                   <Stack spacing="xs">
                     {headers.map((h, idx) => (
-                      <Group key={idx} align="flex-start">
-                        <TextInput
-                          placeholder="Header name"
-                          value={h.key}
-                          onChange={(e) => {
-                            const next = [...headers];
-                            next[idx] = { ...next[idx], key: e.target.value };
-                            setHeaders(next);
-                          }}
-                          style={{ flex: 1 }}
-                        />
-                        <TextInput
-                          placeholder="Header value"
-                          value={h.value}
-                          onChange={(e) => {
-                            const next = [...headers];
-                            next[idx] = {
-                              ...next[idx],
-                              value: e.target.value,
-                            };
-                            setHeaders(next);
-                          }}
-                          style={{ flex: 1 }}
-                        />
-                        <Button
-                          size="xs"
-                          color="red"
-                          onClick={() => {
-                            const next = headers.filter((_, i) => i !== idx);
-                            setHeaders(
-                              next.length ? next : [{ key: '', value: '' }]
-                            );
-                          }}
-                        >
-                          Remove
-                        </Button>
-                      </Group>
+                      <HeaderRow
+                        key={idx}
+                        h={h}
+                        onKeyChange={(e) => onHeaderKeyChange(idx, e.target.value)}
+                        onValueChange={(e) => onHeaderValueChange(idx, e.target.value)}
+                        onRemove={() => onHeaderRemove(idx)}
+                      />
                     ))}
                     <Button
                       size="xs"
@@ -296,9 +274,9 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
                 </Box>
               ) : null}
             </Stack>
-          </Tabs.Panel>
+          </TabsPanel>
 
-          <Tabs.Panel value="triggers" style={{ paddingTop: 10 }}>
+          <TabsPanel value="triggers" style={{ paddingTop: 10 }}>
             <SimpleGrid cols={3}>
               {EVENT_OPTIONS.map((opt) => (
                 <Checkbox
@@ -309,10 +287,10 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
                 />
               ))}
             </SimpleGrid>
-          </Tabs.Panel>
+          </TabsPanel>
 
           {form.getValues().type === 'webhook' && (
-            <Tabs.Panel value="templates" style={{ paddingTop: 10 }}>
+            <TabsPanel value="templates" style={{ paddingTop: 10 }}>
               <Stack gap="xs">
                 <Alert variant="default">
                   <Text size="sm">
@@ -333,40 +311,26 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
                         label: { padding: 2 },
                       }}
                     >
-                      {EVENT_OPTIONS.map(
-                        (opt) =>
-                          selectedEvents.includes(opt.value) && (
-                            <Accordion.Item key={opt.value} value={opt.value}>
-                              <Accordion.Control
-                                disabled={!selectedEvents.includes(opt.value)}
-                                style={{ paddingTop: 4, paddingBottom: 4 }}
-                              >
-                                {opt.label}
-                              </Accordion.Control>
-                              <Accordion.Panel>
-                                <Textarea
-                                  placeholder={
-                                    'Optional Jinja2 template (ex: {"content": "Channel {{ channel_name }} just started streaming!"} )'
-                                  }
-                                  minRows={3}
-                                  value={payloadTemplates[opt.value] || ''}
-                                  autosize
-                                  onChange={(e) =>
-                                    setPayloadTemplates({
-                                      ...payloadTemplates,
-                                      [opt.value]: e.target.value,
-                                    })
-                                  }
-                                />
-                              </Accordion.Panel>
-                            </Accordion.Item>
-                          )
-                      )}
+                      {EVENT_OPTIONS.filter((opt) =>
+                        selectedEvents.includes(opt.value)
+                      ).map((opt) => (
+                        <PayloadTemplateItem
+                          key={opt.value}
+                          opt={opt}
+                          payloadTemplates={payloadTemplates}
+                          onTemplateChange={(e) =>
+                            setPayloadTemplates({
+                              ...payloadTemplates,
+                              [opt.value]: e.target.value,
+                            })
+                          }
+                        />
+                      ))}
                     </Accordion>
                   </div>
                 </div>
               </Stack>
-            </Tabs.Panel>
+            </TabsPanel>
           )}
         </Tabs>
         <Flex mih={50} gap="xs" justify="flex-end" align="flex-end">
diff --git a/frontend/src/components/forms/CronBuilder.jsx b/frontend/src/components/forms/CronBuilder.jsx
index 7eebbead..4d92265a 100644
--- a/frontend/src/components/forms/CronBuilder.jsx
+++ b/frontend/src/components/forms/CronBuilder.jsx
@@ -6,90 +6,103 @@
  * - Simple hour/minute/day selectors
  * - Preview of next run times
  */
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import {
-  Modal,
-  Button,
-  Group,
-  Stack,
-  Select,
-  NumberInput,
-  Text,
   Badge,
-  SimpleGrid,
-  Divider,
-  TextInput,
-  Paper,
-  Tabs,
+  Button,
   Code,
+  Divider,
+  Group,
+  Modal,
+  NumberInput,
+  Paper,
+  Select,
+  SimpleGrid,
+  Stack,
+  Tabs,
+  TabsList,
+  TabsPanel,
+  TabsTab,
+  Text,
+  TextInput,
 } from '@mantine/core';
-import { Clock, Calendar } from 'lucide-react';
+import { Calendar, Clock } from 'lucide-react';
+import {
+  buildCron,
+  CRON_FIELDS,
+  DAYS_OF_WEEK,
+  FREQUENCY_OPTIONS,
+  parseCronPreset,
+  PRESETS,
+  updateCronPart,
+} from '../../utils/forms/CronBuilderUtils.js';
 
-const PRESETS = [
-  {
-    label: 'Every hour',
-    value: '0 * * * *',
-    description: 'At the start of every hour',
-  },
-  {
-    label: 'Every 6 hours',
-    value: '0 */6 * * *',
-    description: 'Every 6 hours starting at midnight',
-  },
-  {
-    label: 'Every 12 hours',
-    value: '0 */12 * * *',
-    description: 'Twice daily at midnight and noon',
-  },
-  {
-    label: 'Daily at midnight',
-    value: '0 0 * * *',
-    description: 'Once per day at 12:00 AM',
-  },
-  {
-    label: 'Daily at 3 AM',
-    value: '0 3 * * *',
-    description: 'Once per day at 3:00 AM',
-  },
-  {
-    label: 'Daily at noon',
-    value: '0 12 * * *',
-    description: 'Once per day at 12:00 PM',
-  },
-  {
-    label: 'Weekly (Sunday midnight)',
-    value: '0 0 * * 0',
-    description: 'Once per week on Sunday',
-  },
-  {
-    label: 'Weekly (Monday 3 AM)',
-    value: '0 3 * * 1',
-    description: 'Once per week on Monday',
-  },
-  {
-    label: 'Monthly (1st at 2:30 AM)',
-    value: '30 2 1 * *',
-    description: 'First day of each month',
-  },
-];
+const CronPartInput = ({ field, cron, onChange }) => (
+  <TextInput
+    label={field.label}
+    placeholder={field.placeholder}
+    value={cron.split(' ')[field.index] || '*'}
+    onChange={(e) => onChange(updateCronPart(cron, field.index, e.currentTarget.value))}
+  />
+);
 
-const DAYS_OF_WEEK = [
-  { value: '*', label: 'Every day' },
-  { value: '0', label: 'Sunday' },
-  { value: '1', label: 'Monday' },
-  { value: '2', label: 'Tuesday' },
-  { value: '3', label: 'Wednesday' },
-  { value: '4', label: 'Thursday' },
-  { value: '5', label: 'Friday' },
-  { value: '6', label: 'Saturday' },
-];
-
-const FREQUENCY_OPTIONS = [
-  { value: 'hourly', label: 'Hourly' },
-  { value: 'daily', label: 'Daily' },
-  { value: 'weekly', label: 'Weekly' },
-  { value: 'monthly', label: 'Monthly' },
-];
+const Preset = ({ onClick, preset }) => (
+  <Button
+    variant="light"
+    size="xs"
+    onClick={onClick}
+    style={{
+      height: '75px',
+      padding: '8px',
+    }}
+    styles={{
+      root: {
+        display: 'flex',
+        flexDirection: 'column',
+      },
+      inner: {
+        display: 'flex',
+        flexDirection: 'column',
+        alignItems: 'flex-start',
+        justifyContent: 'space-between',
+        width: '100%',
+        height: '100%',
+      },
+      label: {
+        width: '100%',
+        height: '100%',
+        display: 'flex',
+        flexDirection: 'column',
+        justifyContent: 'space-between',
+      },
+    }}
+  >
+    <div
+      style={{
+        textAlign: 'left',
+        width: '100%',
+        flex: '1 1 auto',
+      }}
+    >
+      <Text size="xs" fw={500} mb={2}>
+        {preset.label}
+      </Text>
+      <Text size="xs" c="dimmed" lineClamp={1}>
+        {preset.description}
+      </Text>
+    </div>
+    <Badge
+      size="sm"
+      variant="dot"
+      color="gray"
+      style={{
+        flex: '0 0 auto',
+      }}
+    >
+      {preset.value}
+    </Badge>
+  </Button>
+);
 
 export default function CronBuilder({
   opened,
@@ -103,7 +116,6 @@ export default function CronBuilder({
   const [minute, setMinute] = useState(0);
   const [dayOfWeek, setDayOfWeek] = useState('*');
   const [dayOfMonth, setDayOfMonth] = useState(1);
-  const [generatedCron, setGeneratedCron] = useState('0 3 * * *');
   const [manualCron, setManualCron] = useState('* * * * *');
 
   // Initialize manualCron from currentValue when modal opens
@@ -114,60 +126,19 @@ export default function CronBuilder({
   }, [opened, currentValue]);
 
   // Update generated cron when inputs change
-  useEffect(() => {
-    let cron = '';
-    switch (frequency) {
-      case 'hourly':
-        cron = `${minute} * * * *`;
-        break;
-      case 'daily':
-        cron = `${minute} ${hour} * * *`;
-        break;
-      case 'weekly':
-        cron = `${minute} ${hour} * * ${dayOfWeek === '*' ? '0' : dayOfWeek}`;
-        break;
-      case 'monthly':
-        cron = `${minute} ${hour} ${dayOfMonth} * *`;
-        break;
-    }
-    setGeneratedCron(cron);
-  }, [frequency, hour, minute, dayOfWeek, dayOfMonth]);
+  const generatedCron = useMemo(
+    () => buildCron(frequency, minute, hour, dayOfWeek, dayOfMonth),
+    [frequency, minute, hour, dayOfWeek, dayOfMonth]
+  );
 
   const handlePresetClick = (cron) => {
-    setGeneratedCron(cron);
+    const parsed = parseCronPreset(cron);
+    setFrequency(parsed.frequency);
+    setMinute(parsed.minute);
+    setHour(parsed.hour);
+    setDayOfWeek(parsed.dayOfWeek);
+    setDayOfMonth(parsed.dayOfMonth);
     setManualCron(cron);
-
-    // Parse the cron expression and update form fields
-    const parts = cron.split(' ');
-    if (parts.length === 5) {
-      const [min, hr, day, _month, weekday] = parts;
-
-      setMinute(parseInt(min) || 0);
-
-      // Determine frequency based on pattern
-      if (hr === '*') {
-        setFrequency('hourly');
-      } else if (day !== '*' && day !== '1') {
-        // Has specific day of month
-        setFrequency('monthly');
-        setHour(parseInt(hr.replace('*/', '').replace('*', '0')) || 0);
-        setDayOfMonth(parseInt(day) || 1);
-      } else if (weekday !== '*') {
-        // Has specific day of week
-        setFrequency('weekly');
-        setHour(parseInt(hr.replace('*/', '').replace('*', '0')) || 0);
-        setDayOfWeek(weekday);
-      } else if (day === '1') {
-        // Monthly on 1st
-        setFrequency('monthly');
-        setHour(parseInt(hr.replace('*/', '').replace('*', '0')) || 0);
-        setDayOfMonth(1);
-      } else {
-        // Daily
-        setFrequency('daily');
-        setHour(parseInt(hr.replace('*/', '').replace('*', '0')) || 0);
-      }
-    }
   };
 
   const handleApply = () => {
@@ -185,12 +156,12 @@ export default function CronBuilder({
     >
       <Stack gap="md">
         <Tabs value={mode} onChange={setMode}>
-          <Tabs.List grow>
-            <Tabs.Tab value="simple">Simple</Tabs.Tab>
-            <Tabs.Tab value="advanced">Advanced</Tabs.Tab>
-          </Tabs.List>
+          <TabsList grow>
+            <TabsTab value="simple">Simple</TabsTab>
+            <TabsTab value="advanced">Advanced</TabsTab>
+          </TabsList>
 
-          <Tabs.Panel value="simple" pt="md">
+          <TabsPanel value="simple" pt="md">
             <Stack gap="md">
               {/* Quick Presets */}
               <div>
@@ -199,62 +170,11 @@ export default function CronBuilder({
                 </Text>
                 <SimpleGrid cols={3} spacing="xs">
                   {PRESETS.map((preset) => (
-                    <Button
+                    <Preset
                       key={preset.value}
-                      variant="light"
-                      size="xs"
                       onClick={() => handlePresetClick(preset.value)}
-                      style={{
-                        height: '75px',
-                        padding: '8px',
-                      }}
-                      styles={{
-                        root: {
-                          display: 'flex',
-                          flexDirection: 'column',
-                        },
-                        inner: {
-                          display: 'flex',
-                          flexDirection: 'column',
-                          alignItems: 'flex-start',
-                          justifyContent: 'space-between',
-                          width: '100%',
-                          height: '100%',
-                        },
-                        label: {
-                          width: '100%',
-                          height: '100%',
-                          display: 'flex',
-                          flexDirection: 'column',
-                          justifyContent: 'space-between',
-                        },
-                      }}
-                    >
-                      <div
-                        style={{
-                          textAlign: 'left',
-                          width: '100%',
-                          flex: '1 1 auto',
-                        }}
-                      >
-                        <Text size="xs" fw={500} mb={2}>
-                          {preset.label}
-                        </Text>
-                        <Text size="xs" c="dimmed" lineClamp={1}>
-                          {preset.description}
-                        </Text>
-                      </div>
-                      <Badge
-                        size="sm"
-                        variant="dot"
-                        color="gray"
-                        style={{
-                          flex: '0 0 auto',
-                        }}
-                      >
-                        {preset.value}
-                      </Badge>
-                    </Button>
+                      preset={preset}
+                    />
                   ))}
                 </SimpleGrid>
               </div>
@@ -316,9 +236,9 @@ export default function CronBuilder({
                 </SimpleGrid>
               </div>
             </Stack>
-          </Tabs.Panel>
+          </TabsPanel>
 
-          <Tabs.Panel value="advanced" pt="md">
+          <TabsPanel value="advanced" pt="md">
             <Stack gap="sm">
               <Text size="sm" c="dimmed">
                 Build advanced cron expressions with comma-separated values
@@ -327,75 +247,20 @@ export default function CronBuilder({
               </Text>
 
               <SimpleGrid cols={2} spacing="sm">
-                <TextInput
-                  label="Minute (0-59)"
-                  placeholder="*, 0, */15, 0,15,30,45"
-                  value={manualCron.split(' ')[0] || '*'}
-                  onChange={(e) => {
-                    const parts =
-                      manualCron.split(' ').length >= 5
-                        ? manualCron.split(' ')
-                        : ['*', '*', '*', '*', '*'];
-                    parts[0] = e.currentTarget.value || '*';
-                    setManualCron(parts.join(' '));
-                  }}
-                />
-
-                <TextInput
-                  label="Hour (0-23)"
-                  placeholder="*, 0, 9-17, */6, 2,4,16"
-                  value={manualCron.split(' ')[1] || '*'}
-                  onChange={(e) => {
-                    const parts =
-                      manualCron.split(' ').length >= 5
-                        ? manualCron.split(' ')
-                        : ['*', '*', '*', '*', '*'];
-                    parts[1] = e.currentTarget.value || '*';
-                    setManualCron(parts.join(' '));
-                  }}
-                />
-
-                <TextInput
-                  label="Day of Month (1-31)"
-                  placeholder="*, 1, 1-15, */2, 1,15"
-                  value={manualCron.split(' ')[2] || '*'}
-                  onChange={(e) => {
-                    const parts =
-                      manualCron.split(' ').length >= 5
-                        ? manualCron.split(' ')
-                        : ['*', '*', '*', '*', '*'];
-                    parts[2] = e.currentTarget.value || '*';
-                    setManualCron(parts.join(' '));
-                  }}
-                />
-
-                <TextInput
-                  label="Month (1-12)"
-                  placeholder="*, 1, 1-6, */3, 6,12"
-                  value={manualCron.split(' ')[3] || '*'}
-                  onChange={(e) => {
-                    const parts =
-                      manualCron.split(' ').length >= 5
-                        ? manualCron.split(' ')
-                        : ['*', '*', '*', '*', '*'];
-                    parts[3] = e.currentTarget.value || '*';
-                    setManualCron(parts.join(' '));
-                  }}
-                />
+                {CRON_FIELDS.slice(0, 4).map((field) => (
+                  <CronPartInput
+                    key={field.index}
+                    field={field}
+                    cron={manualCron}
+                    onChange={setManualCron}
+                  />
+                ))}
               </SimpleGrid>
 
-              <TextInput
-                label="Day of Week (0-6, Sun-Sat)"
-                placeholder="*, 0, 1-5, 0,6"
-                value={manualCron.split(' ')[4] || '*'}
-                onChange={(e) => {
-                  const parts =
-                    manualCron.split(' ').length >= 5
-                      ? manualCron.split(' ')
-                      : ['*', '*', '*', '*', '*'];
-                  parts[4] = e.currentTarget.value || '*';
-                  setManualCron(parts.join(' '));
-                }}
+              <CronPartInput
+                field={CRON_FIELDS[4]}
+                cron={manualCron}
+                onChange={setManualCron}
               />
 
               <Text size="xs" c="dimmed">
@@ -404,7 +269,7 @@ export default function CronBuilder({
                 &bull; <Code>*/15 * * * *</Code> every 15 minutes
               </Text>
             </Stack>
-          </Tabs.Panel>
+          </TabsPanel>
         </Tabs>
 
         {/* Generated Expression */}
diff --git a/frontend/src/components/forms/DummyEPG.jsx b/frontend/src/components/forms/DummyEPG.jsx
index 701dafd7..166e6ab5 100644
--- a/frontend/src/components/forms/DummyEPG.jsx
+++ b/frontend/src/components/forms/DummyEPG.jsx
@@ -1,6 +1,9 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import {
   Accordion,
+  AccordionControl,
+  AccordionItem,
+  AccordionPanel,
   ActionIcon,
   Box,
   Button,
@@ -11,24 +14,32 @@ import {
   NumberInput,
   Paper,
   Popover,
+  PopoverDropdown,
+  PopoverTarget,
   Select,
   Stack,
   Text,
-  TextInput,
   Textarea,
+  TextInput,
 } from '@mantine/core';
 import { Info } from 'lucide-react';
 import { useForm } from '@mantine/form';
-import { notifications } from '@mantine/notifications';
-import API from '../../api';
 import useEPGsStore from '../../store/epgs';
-import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc';
-import timezone from 'dayjs/plugin/timezone';
-
-// Extend dayjs with timezone support
-dayjs.extend(utc);
-dayjs.extend(timezone);
+import { showNotification } from '../../utils/notificationUtils.js';
+import {
+  addEPG,
+  addNormalizedGroups,
+  applyTemplates,
+  buildCustomProperties,
+  buildTimePlaceholders,
+  getDummyEpgFormInitialValues,
+  getTimezones,
+  matchPattern,
+  updateEPG,
+  validateCustomNameSource,
+  validateCustomStreamIndex,
+  validateCustomTitlePattern,
+} from '../../utils/forms/DummyEpgUtils.js';
 
 // Helper component for labels with info popover
 const LabelWithInfo = ({ label, info, required }) => (
@@ -42,14 +53,14 @@ const LabelWithInfo = ({ label, info, required }) => (
       )}
     </Text>
     <Popover width={300} position="top" withArrow shadow="md">
-      <Popover.Target>
+      <PopoverTarget>
         <ActionIcon size="xs" variant="subtle" color="gray">
           <Info size={14} />
         </ActionIcon>
-      </Popover.Target>
-      <Popover.Dropdown>
+      </PopoverTarget>
+      <PopoverDropdown>
         <Text size="xs">{info}</Text>
-      </Popover.Dropdown>
+      </PopoverDropdown>
     </Popover>
   </Group>
 );
@@ -87,582 +98,94 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
   const [loadingTimezones, setLoadingTimezones] = useState(true);
 
   const form = useForm({
-    initialValues: {
-      name: '',
-      is_active: true,
-      source_type: 'dummy',
-      custom_properties: {
-        title_pattern: '',
-        time_pattern: '',
-        date_pattern: '',
-        timezone: 'US/Eastern',
-        output_timezone: '',
-        program_duration: 180,
-        sample_title: '',
-        title_template: '',
-        subtitle_template: '',
-        description_template: '',
-        upcoming_title_template: '',
-        upcoming_description_template: '',
-        ended_title_template: '',
-        ended_description_template: '',
-        fallback_title_template: '',
-        fallback_description_template: '',
-        channel_logo_url: '',
-        program_poster_url: '',
-        name_source: 'channel',
-        stream_index: 1,
-        category: '',
-        include_date: true,
-        include_live: false,
-        include_new: false,
-      },
-    },
+    initialValues: getDummyEpgFormInitialValues(),
     validate: {
       name: (value) => (value?.trim() ? null : 'Name is required'),
       'custom_properties.title_pattern': (value) => {
-        if (!value?.trim()) return 'Title pattern is required';
-        try {
-          new RegExp(value);
-          return null;
-        } catch (e) {
-          return `Invalid regex: ${e.message}`;
-        }
+        return validateCustomTitlePattern(value);
       },
       'custom_properties.name_source': (value) => {
-        if (!value) return 'Name source is required';
-        return null;
+        return validateCustomNameSource(value);
       },
       'custom_properties.stream_index': (value, values) => {
-        if (values.custom_properties?.name_source === 'stream') {
-          if (!value || value < 1) {
-            return 'Stream index must be at least 1';
-          }
-        }
-        return null;
+        return validateCustomStreamIndex(values, value);
       },
     },
   });
 
-  // Real-time pattern validation with useMemo to prevent re-renders
   const patternValidation = useMemo(() => {
-    const result = {
-      titleMatch: false,
-      timeMatch: false,
-      dateMatch: false,
-      titleGroups: {},
-      timeGroups: {},
-      dateGroups: {},
-      calculatedPlaceholders: {},
-      formattedTitle: '',
-      formattedSubtitle: '',
-      formattedDescription: '',
-      formattedUpcomingTitle: '',
-      formattedUpcomingDescription: '',
-      formattedEndedTitle: '',
-      formattedEndedDescription: '',
-      formattedChannelLogoUrl: '',
-      formattedProgramPosterUrl: '',
-      error: null,
-    };
+    const title = matchPattern(titlePattern, sampleTitle, 'Title pattern error');
+    const time  = matchPattern(timePattern,  sampleTitle, 'Time pattern error');
+    const date  = matchPattern(datePattern,  sampleTitle, 'Date pattern error');
 
-    // Validate title pattern
-    if (titlePattern && sampleTitle) {
-      try {
-        const titleRegex = new RegExp(titlePattern);
-        const titleMatch = sampleTitle.match(titleRegex);
+    const errors = [title.error, time.error, date.error].filter(Boolean).join('; ');
 
-        if (titleMatch) {
-          result.titleMatch = true;
-          result.titleGroups = titleMatch.groups || {};
-        }
-      } catch (e) {
-        result.error = `Title pattern error: ${e.message}`;
-      }
-    }
+    const timePlaceholders = buildTimePlaceholders(
+      time.groups,
+      date.groups,
+      form.values.custom_properties?.timezone || 'UTC',
+      form.values.custom_properties?.output_timezone,
+      form.values.custom_properties?.program_duration
+    );
 
-    // Validate time pattern
-    if (timePattern && sampleTitle) {
-      try {
-        const timeRegex = new RegExp(timePattern);
-        const timeMatch = sampleTitle.match(timeRegex);
-
-        if (timeMatch) {
-          result.timeMatch = true;
-          result.timeGroups = timeMatch.groups || {};
-        }
-      } catch (e) {
-        result.error = result.error
-          ? `${result.error}; Time pattern error: ${e.message}`
-          : `Time pattern error: ${e.message}`;
-      }
-    }
-
-    // Validate date pattern
-    if (datePattern && sampleTitle) {
-      try {
-        const dateRegex = new RegExp(datePattern);
-        const dateMatch = sampleTitle.match(dateRegex);
-
-        if (dateMatch) {
-          result.dateMatch = true;
-          result.dateGroups = dateMatch.groups || {};
-        }
-      } catch (e) {
-        result.error = result.error
-          ? `${result.error}; Date pattern error: ${e.message}`
-          : `Date pattern error: ${e.message}`;
-      }
-    }
-
-    // Merge all groups for template formatting
-    const allGroups = {
-      ...result.titleGroups,
-      ...result.timeGroups,
-      ...result.dateGroups,
-    };
-
-    // Add normalized versions of all groups for cleaner URLs
-    // These remove all non-alphanumeric characters and convert to lowercase
-    Object.keys(allGroups).forEach((key) => {
-      const value = allGroups[key];
-      if (value) {
-        // Remove all non-alphanumeric characters (except spaces temporarily)
-        // then replace spaces with nothing, and convert to lowercase
-        const normalized = String(value)
-          .replace(/[^a-zA-Z0-9\s]/g, '')
-          .replace(/\s+/g, '')
-          .toLowerCase();
-        allGroups[`${key}_normalize`] = normalized;
-      }
+    const allGroups = addNormalizedGroups({
+      ...title.groups,
+      ...time.groups,
+      ...date.groups,
+      ...timePlaceholders,
     });
 
-    // Calculate formatted time strings if time was extracted
-    if (result.timeGroups.hour) {
-      try {
-        let hour24 = parseInt(result.timeGroups.hour);
-        const minute = result.timeGroups.minute
-          ? parseInt(result.timeGroups.minute)
-          : 0;
-        const ampm = result.timeGroups.ampm?.toLowerCase();
+    const hasMatch = title.matched || time.matched;
 
-        // Convert to 24-hour if AM/PM present
-        if (ampm === 'pm' && hour24 !== 12) {
-          hour24 += 12;
-        } else if (ampm === 'am' && hour24 === 12) {
-          hour24 = 0;
-        }
-
-        // Apply timezone conversion if output_timezone is set
-        const sourceTimezone = form.values.custom_properties?.timezone || 'UTC';
-        const outputTimezone = form.values.custom_properties?.output_timezone;
-
-        // Determine the base date to use
-        let baseDate = dayjs().tz(sourceTimezone);
-
-        // If date was extracted from pattern, use that instead of today
-        if (result.dateGroups.month && result.dateGroups.day) {
-          const monthValue = result.dateGroups.month;
-          let extractedMonth;
-
-          // Parse month - can be numeric (1-12) or text (Jan, January, Oct, October, etc.)
-          if (/^\d+$/.test(monthValue)) {
-            // Numeric month
-            extractedMonth = parseInt(monthValue);
-          } else {
-            // Text month - convert to number (1-12)
-            const monthLower = monthValue.toLowerCase();
-            const monthNames = [
-              'january',
-              'february',
-              'march',
-              'april',
-              'may',
-              'june',
-              'july',
-              'august',
-              'september',
-              'october',
-              'november',
-              'december',
-            ];
-            const monthAbbr = [
-              'jan',
-              'feb',
-              'mar',
-              'apr',
-              'may',
-              'jun',
-              'jul',
-              'aug',
-              'sep',
-              'oct',
-              'nov',
-              'dec',
-            ];
-
-            // Try full month names first
-            let monthIndex = monthNames.findIndex((m) => m === monthLower);
-            if (monthIndex === -1) {
-              // Try abbreviated month names
-              monthIndex = monthAbbr.findIndex((m) => m === monthLower);
-            }
-
-            if (monthIndex !== -1) {
-              extractedMonth = monthIndex + 1; // Convert 0-indexed to 1-12
-            } else {
-              // If we can't parse it, default to current month
-              extractedMonth = dayjs().month() + 1;
-            }
-          }
-
-          const extractedDay = parseInt(result.dateGroups.day);
-          const extractedYear = result.dateGroups.year
-            ? parseInt(result.dateGroups.year)
-            : dayjs().year(); // Default to current year if not provided
-
-          // Validate that we have valid numeric values
-          if (
-            !isNaN(extractedMonth) &&
-            !isNaN(extractedDay) &&
-            !isNaN(extractedYear) &&
-            extractedMonth >= 1 &&
-            extractedMonth <= 12 &&
-            extractedDay >= 1 &&
-            extractedDay <= 31
-          ) {
-            // Create a specific date string and parse it in the source timezone
-            // This ensures DST is calculated correctly for the target date
-            const dateString = `${extractedYear}-${extractedMonth.toString().padStart(2, '0')}-${extractedDay.toString().padStart(2, '0')}`;
-            baseDate = dayjs.tz(dateString, sourceTimezone);
-          }
-        }
-
-        if (outputTimezone && outputTimezone !== sourceTimezone) {
-          // Create a date in the source timezone with extracted or current date
-          // Set the time on the date, which will use the DST rules for that specific date
-          const sourceDate = baseDate
-            .set('hour', hour24)
-            .set('minute', minute)
-            .set('second', 0);
-
-          // Convert to output timezone
-          const outputDate = sourceDate.tz(outputTimezone);
-
-          // Update hour and minute to the converted values
-          hour24 = outputDate.hour();
-          const convertedMinute = outputDate.minute();
-
-          // Add date placeholders based on the OUTPUT timezone
-          // This ensures {date}, {month}, {day}, {year} reflect the converted timezone
-          allGroups.date = outputDate.format('YYYY-MM-DD');
-          allGroups.month = outputDate.month() + 1; // dayjs months are 0-indexed
-          allGroups.day = outputDate.date();
-          allGroups.year = outputDate.year();
-
-          // Format 24-hour start time string with converted time
-          if (convertedMinute > 0) {
-            allGroups.starttime24 = `${hour24.toString().padStart(2, '0')}:${convertedMinute.toString().padStart(2, '0')}`;
-          } else {
-            allGroups.starttime24 = `${hour24.toString().padStart(2, '0')}:00`;
-          }
-
-          // Convert to 12-hour format with converted time
-          const ampmDisplay = hour24 < 12 ? 'AM' : 'PM';
-          let hour12 = hour24;
-          if (hour24 === 0) {
-            hour12 = 12;
-          } else if (hour24 > 12) {
-            hour12 = hour24 - 12;
-          }
-
-          // Format 12-hour start time string with converted time
-          if (convertedMinute > 0) {
-            allGroups.starttime = `${hour12}:${convertedMinute.toString().padStart(2, '0')} ${ampmDisplay}`;
-          } else {
-            allGroups.starttime = `${hour12} ${ampmDisplay}`;
-          }
-
-          // Format long versions that always include minutes
-          allGroups.starttime_long = `${hour12}:${convertedMinute.toString().padStart(2, '0')} ${ampmDisplay}`;
-          allGroups.starttime24_long = `${hour24.toString().padStart(2, '0')}:${convertedMinute.toString().padStart(2, '0')}`;
-        } else {
-          // No timezone conversion - use original logic
-          // Add date placeholders based on the source timezone
-          const sourceDate = baseDate
-            .set('hour', hour24)
-            .set('minute', minute)
-            .set('second', 0);
-
-          allGroups.date = sourceDate.format('YYYY-MM-DD');
-          allGroups.month = sourceDate.month() + 1; // dayjs months are 0-indexed
-          allGroups.day = sourceDate.date();
-          allGroups.year = sourceDate.year();
-
-          // Format 24-hour start time string
-          if (minute > 0) {
-            allGroups.starttime24 = `${hour24.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}`;
-          } else {
-            allGroups.starttime24 = `${hour24.toString().padStart(2, '0')}:00`;
-          }
-
-          // Convert to 12-hour format
-          const ampmDisplay = hour24 < 12 ? 'AM' : 'PM';
-          let hour12 = hour24;
-          if (hour24 === 0) {
-            hour12 = 12;
-          } else if (hour24 > 12) {
-            hour12 = hour24 - 12;
-          }
-
-          // Format 12-hour start time string
-          if (minute > 0) {
-            allGroups.starttime = `${hour12}:${minute.toString().padStart(2, '0')} ${ampmDisplay}`;
-          } else {
-            allGroups.starttime = `${hour12} ${ampmDisplay}`;
-          }
-
-          // Format long version that always includes minutes
-          allGroups.starttime_long = `${hour12}:${minute.toString().padStart(2, '0')} ${ampmDisplay}`;
-        }
-
-        // Calculate end time based on program duration
-        const programDuration =
-          form.values.custom_properties?.program_duration || 180;
-
-        // Calculate end time by adding duration to start time
-        const startMinutes = hour24 * 60 + minute;
-        const endMinutes = startMinutes + programDuration;
-
-        let endHour24 = Math.floor(endMinutes / 60) % 24; // Wrap around 24 hours
-        const endMinute = endMinutes % 60;
-
-        // Format 24-hour end time string
-        if (endMinute > 0) {
-          allGroups.endtime24 = `${endHour24.toString().padStart(2, '0')}:${endMinute.toString().padStart(2, '0')}`;
-        } else {
-          allGroups.endtime24 = `${endHour24.toString().padStart(2, '0')}:00`;
-        }
-
-        // Convert to 12-hour format for endtime
-        const endAmpmDisplay = endHour24 < 12 ? 'AM' : 'PM';
-        let endHour12 = endHour24;
-        if (endHour24 === 0) {
-          endHour12 = 12;
-        } else if (endHour24 > 12) {
-          endHour12 = endHour24 - 12;
-        }
-
-        // Format 12-hour end time string
-        if (endMinute > 0) {
-          allGroups.endtime = `${endHour12}:${endMinute.toString().padStart(2, '0')} ${endAmpmDisplay}`;
-        } else {
-          allGroups.endtime = `${endHour12} ${endAmpmDisplay}`;
-        }
-
-        // Format long version that always includes minutes
-        allGroups.endtime_long = `${endHour12}:${endMinute.toString().padStart(2, '0')} ${endAmpmDisplay}`;
-
-        // Store calculated placeholders for display in preview
-        result.calculatedPlaceholders = {
-          starttime: allGroups.starttime,
-          starttime24: allGroups.starttime24,
-          starttime_long: allGroups.starttime_long,
-          endtime: allGroups.endtime,
-          endtime24: allGroups.endtime24,
-          endtime_long: allGroups.endtime_long,
-          date: allGroups.date,
-          month: allGroups.month,
-          day: allGroups.day,
-          year: allGroups.year,
-        };
-      } catch (e) {
-        // If parsing fails, leave starttime/endtime as placeholders
-        console.error('Error formatting time:', e);
-      }
-    }
-
-    // Format title template
-    if (titleTemplate && (result.titleMatch || result.timeMatch)) {
-      result.formattedTitle = titleTemplate.replace(
-        /\{(\w+)\}/g,
-        (match, key) => allGroups[key] || match
-      );
-    }
-
-    // Format subtitle template
-    if (subtitleTemplate && (result.titleMatch || result.timeMatch)) {
-      result.formattedSubtitle = subtitleTemplate.replace(
-        /\{(\w+)\}/g,
-        (match, key) => allGroups[key] || match
-      );
-    }
-
-    // Format description template
-    if (descriptionTemplate && (result.titleMatch || result.timeMatch)) {
-      result.formattedDescription = descriptionTemplate.replace(
-        /\{(\w+)\}/g,
-        (match, key) => allGroups[key] || match
-      );
-    }
-
-    // Format upcoming title template
-    if (upcomingTitleTemplate && (result.titleMatch || result.timeMatch)) {
-      result.formattedUpcomingTitle = upcomingTitleTemplate.replace(
-        /\{(\w+)\}/g,
-        (match, key) => allGroups[key] || match
-      );
-    }
-
-    // Format upcoming description template
-    if (
-      upcomingDescriptionTemplate &&
-      (result.titleMatch || result.timeMatch)
-    ) {
-      result.formattedUpcomingDescription = upcomingDescriptionTemplate.replace(
-        /\{(\w+)\}/g,
-        (match, key) => allGroups[key] || match
-      );
-    }
-
-    // Format ended title template
-    if (endedTitleTemplate && (result.titleMatch || result.timeMatch)) {
-      result.formattedEndedTitle = endedTitleTemplate.replace(
-        /\{(\w+)\}/g,
-        (match, key) => allGroups[key] || match
-      );
-    }
-
-    // Format ended description template
-    if (endedDescriptionTemplate && (result.titleMatch || result.timeMatch)) {
-      result.formattedEndedDescription = endedDescriptionTemplate.replace(
-        /\{(\w+)\}/g,
-        (match, key) => allGroups[key] || match
-      );
-    }
-
-    // Format channel logo URL
-    if (channelLogoUrl && (result.titleMatch || result.timeMatch)) {
-      result.formattedChannelLogoUrl = channelLogoUrl.replace(
-        /\{(\w+)\}/g,
-        (match, key) => {
-          const value = allGroups[key];
-          // URL encode the value to handle spaces and special characters
-          return value ? encodeURIComponent(String(value)) : match;
-        }
-      );
-    }
-
-    // Format program poster URL
-    if (programPosterUrl && (result.titleMatch || result.timeMatch)) {
-      result.formattedProgramPosterUrl = programPosterUrl.replace(
-        /\{(\w+)\}/g,
-        (match, key) => {
-          const value = allGroups[key];
-          // URL encode the value to handle spaces and special characters
-          return value ? encodeURIComponent(String(value)) : match;
-        }
-      );
-    }
-
-    return result;
+    return {
+      titleMatch:  title.matched,
+      timeMatch:   time.matched,
+      dateMatch:   date.matched,
+      titleGroups: title.groups,
+      timeGroups:  time.groups,
+      dateGroups:  date.groups,
+      calculatedPlaceholders: time.matched ? timePlaceholders : {},
+      error: errors || null,
+      ...applyTemplates(
+        { titleTemplate, subtitleTemplate, descriptionTemplate, upcomingTitleTemplate,
+          upcomingDescriptionTemplate, endedTitleTemplate, endedDescriptionTemplate,
+          channelLogoUrl, programPosterUrl },
+        allGroups,
+        hasMatch
+      ),
+    };
   }, [
-    titlePattern,
-    timePattern,
-    datePattern,
-    sampleTitle,
-    titleTemplate,
-    subtitleTemplate,
-    descriptionTemplate,
-    upcomingTitleTemplate,
-    upcomingDescriptionTemplate,
-    endedTitleTemplate,
-    endedDescriptionTemplate,
-    channelLogoUrl,
-    programPosterUrl,
-    form.values.custom_properties?.timezone,
-    form.values.custom_properties?.output_timezone,
-    form.values.custom_properties?.program_duration,
-  ]);
+      titlePattern,
+      timePattern,
+      datePattern,
+      sampleTitle,
+      titleTemplate,
+      subtitleTemplate,
+      descriptionTemplate,
+      upcomingTitleTemplate,
+      upcomingDescriptionTemplate,
+      endedTitleTemplate,
+      endedDescriptionTemplate,
+      channelLogoUrl,
+      programPosterUrl,
+      form.values.custom_properties?.timezone,
+      form.values.custom_properties?.output_timezone,
+      form.values.custom_properties?.program_duration,
+    ]);
 
   useEffect(() => {
     if (epg) {
       const custom = epg.custom_properties || {};
-
       form.setValues({
         name: epg.name || '',
         is_active: epg.is_active ?? true,
         source_type: 'dummy',
-        custom_properties: {
-          title_pattern: custom.title_pattern || '',
-          time_pattern: custom.time_pattern || '',
-          date_pattern: custom.date_pattern || '',
-          timezone:
-            custom.timezone ||
-            custom.timezone_offset?.toString() ||
-            'US/Eastern',
-          output_timezone: custom.output_timezone || '',
-          program_duration: custom.program_duration || 180,
-          sample_title: custom.sample_title || '',
-          title_template: custom.title_template || '',
-          subtitle_template: custom.subtitle_template || '',
-          description_template: custom.description_template || '',
-          upcoming_title_template: custom.upcoming_title_template || '',
-          upcoming_description_template:
-            custom.upcoming_description_template || '',
-          ended_title_template: custom.ended_title_template || '',
-          ended_description_template: custom.ended_description_template || '',
-          fallback_title_template: custom.fallback_title_template || '',
-          fallback_description_template:
-            custom.fallback_description_template || '',
-          channel_logo_url: custom.channel_logo_url || '',
-          program_poster_url: custom.program_poster_url || '',
-          name_source: custom.name_source || 'channel',
-          stream_index: custom.stream_index || 1,
-          category: custom.category || '',
-          include_date: custom.include_date ?? true,
-          include_live: custom.include_live ?? false,
-          include_new: custom.include_new ?? false,
-        },
+        custom_properties: buildCustomProperties(custom),
       });
-
-      // Set controlled state
-      setTitlePattern(custom.title_pattern || '');
-      setTimePattern(custom.time_pattern || '');
-      setDatePattern(custom.date_pattern || '');
-      setSampleTitle(custom.sample_title || '');
-      setTitleTemplate(custom.title_template || '');
-      setSubtitleTemplate(custom.subtitle_template || '');
-      setDescriptionTemplate(custom.description_template || '');
-      setUpcomingTitleTemplate(custom.upcoming_title_template || '');
-      setUpcomingDescriptionTemplate(
-        custom.upcoming_description_template || ''
-      );
-      setEndedTitleTemplate(custom.ended_title_template || '');
-      setEndedDescriptionTemplate(custom.ended_description_template || '');
-      setFallbackTitleTemplate(custom.fallback_title_template || '');
-      setFallbackDescriptionTemplate(
-        custom.fallback_description_template || ''
-      );
-      setChannelLogoUrl(custom.channel_logo_url || '');
-      setProgramPosterUrl(custom.program_poster_url || '');
+      applyCustomState(custom);
     } else {
       form.reset();
-      setTitlePattern('');
-      setTimePattern('');
-      setDatePattern('');
-      setSampleTitle('');
-      setTitleTemplate('');
-      setSubtitleTemplate('');
-      setDescriptionTemplate('');
-      setUpcomingTitleTemplate('');
-      setUpcomingDescriptionTemplate('');
-      setEndedTitleTemplate('');
-      setEndedDescriptionTemplate('');
-      setFallbackTitleTemplate('');
-      setFallbackDescriptionTemplate('');
-      setChannelLogoUrl('');
-      setProgramPosterUrl('');
+      applyCustomState(); // called with no args — all setters receive ''
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [epg]);
@@ -672,7 +195,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
     const fetchTimezones = async () => {
       try {
         setLoadingTimezones(true);
-        const response = await API.getTimezones();
+        const response = await getTimezones();
 
         // Convert timezone list to Select options format
         const options = response.timezones.map((tz) => ({
@@ -683,7 +206,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
         setTimezoneOptions(options);
       } catch (error) {
         console.error('Failed to load timezones:', error);
-        notifications.show({
+        showNotification({
           title: 'Warning',
           message: 'Failed to load timezone list. Using default options.',
           color: 'yellow',
@@ -703,50 +226,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
     fetchTimezones();
   }, []);
 
-  // Function to import settings from an existing dummy EPG
-  const handleImportFromTemplate = (templateId) => {
-    const template = dummyEpgs.find((e) => e.id === parseInt(templateId));
-    if (!template) return;
-
-    const custom = template.custom_properties || {};
-
-    // Update form values
-    form.setValues({
-      name: `${template.name} (Copy)`,
-      is_active: template.is_active ?? true,
-      source_type: 'dummy',
-      custom_properties: {
-        title_pattern: custom.title_pattern || '',
-        time_pattern: custom.time_pattern || '',
-        date_pattern: custom.date_pattern || '',
-        timezone:
-          custom.timezone || custom.timezone_offset?.toString() || 'US/Eastern',
-        output_timezone: custom.output_timezone || '',
-        program_duration: custom.program_duration || 180,
-        sample_title: custom.sample_title || '',
-        title_template: custom.title_template || '',
-        subtitle_template: custom.subtitle_template || '',
-        description_template: custom.description_template || '',
-        upcoming_title_template: custom.upcoming_title_template || '',
-        upcoming_description_template:
-          custom.upcoming_description_template || '',
-        ended_title_template: custom.ended_title_template || '',
-        ended_description_template: custom.ended_description_template || '',
-        fallback_title_template: custom.fallback_title_template || '',
-        fallback_description_template:
-          custom.fallback_description_template || '',
-        channel_logo_url: custom.channel_logo_url || '',
-        program_poster_url: custom.program_poster_url || '',
-        name_source: custom.name_source || 'channel',
-        stream_index: custom.stream_index || 1,
-        category: custom.category || '',
-        include_date: custom.include_date ?? true,
-        include_live: custom.include_live ?? false,
-        include_new: custom.include_new ?? false,
-      },
-    });
-
-    // Update all individual state variables to match
+  const applyCustomState = (custom = {}) => {
     setTitlePattern(custom.title_pattern || '');
     setTimePattern(custom.time_pattern || '');
     setDatePattern(custom.date_pattern || '');
@@ -762,8 +242,23 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
     setFallbackDescriptionTemplate(custom.fallback_description_template || '');
     setChannelLogoUrl(custom.channel_logo_url || '');
     setProgramPosterUrl(custom.program_poster_url || '');
+  };
 
-    notifications.show({
+  // Function to import settings from an existing dummy EPG
+  const handleImportFromTemplate = (templateId) => {
+    const template = dummyEpgs.find((e) => e.id === parseInt(templateId));
+    if (!template) return;
+
+    const custom = template.custom_properties || {};
+    form.setValues({
+      name: `${template.name} (Copy)`,
+      is_active: template.is_active ?? true,
+      source_type: 'dummy',
+      custom_properties: buildCustomProperties(custom),
+    });
+    applyCustomState(custom);
+
+    showNotification({
       title: 'Template Imported',
       message: `Settings imported from "${template.name}". Don't forget to change the name!`,
       color: 'blue',
@@ -775,7 +270,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
       if (epg?.id) {
         // Validate that we have a valid EPG object before updating
         if (!epg || typeof epg !== 'object' || !epg.id) {
-          notifications.show({
+          showNotification({
             title: 'Error',
             message: 'Invalid EPG data. Please close and reopen this form.',
             color: 'red',
@@ -783,15 +278,15 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
           return;
         }
 
-        await API.updateEPG({ ...values, id: epg.id });
-        notifications.show({
+        await updateEPG(values, epg);
+        showNotification({
           title: 'Success',
           message: 'Dummy EPG source updated successfully',
           color: 'green',
         });
       } else {
-        await API.addEPG(values);
-        notifications.show({
+        await addEPG(values);
+        showNotification({
           title: 'Success',
           message: 'Dummy EPG source created successfully',
           color: 'green',
@@ -799,7 +294,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
       }
       onClose();
     } catch (error) {
-      notifications.show({
+      showNotification({
         title: 'Error',
         message: error.message || 'Failed to save dummy EPG source',
         color: 'red',
@@ -852,9 +347,9 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
 
           {/* Accordion for organized sections */}
           <Accordion defaultValue="patterns" variant="separated">
-            <Accordion.Item value="patterns">
-              <Accordion.Control>Pattern Configuration</Accordion.Control>
-              <Accordion.Panel>
+            <AccordionItem value="patterns">
+              <AccordionControl>Pattern Configuration</AccordionControl>
+              <AccordionPanel>
                 <Stack spacing="md">
                   <Text size="sm" c="dimmed">
                     Define regex patterns to extract information from channel
@@ -961,12 +456,12 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
                     }}
                   />
                 </Stack>
-              </Accordion.Panel>
-            </Accordion.Item>
+              </AccordionPanel>
+            </AccordionItem>
 
-            <Accordion.Item value="templates">
-              <Accordion.Control>Output Templates</Accordion.Control>
-              <Accordion.Panel>
+            <AccordionItem value="templates">
+              <AccordionControl>Output Templates</AccordionControl>
+              <AccordionPanel>
                 <Stack spacing="md">
                   <Text size="sm" c="dimmed">
                     Use extracted groups from your patterns to format EPG titles
@@ -1039,12 +534,12 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
                     }}
                   />
                 </Stack>
-              </Accordion.Panel>
-            </Accordion.Item>
+              </AccordionPanel>
+            </AccordionItem>
 
-            <Accordion.Item value="upcoming-ended">
-              <Accordion.Control>Upcoming/Ended Templates</Accordion.Control>
-              <Accordion.Panel>
+            <AccordionItem value="upcoming-ended">
+              <AccordionControl>Upcoming/Ended Templates</AccordionControl>
+              <AccordionPanel>
                 <Stack spacing="md">
                   <Text size="sm" c="dimmed">
                     Customize how programs appear before and after the event. If
@@ -1138,12 +633,12 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
                     }}
                   />
                 </Stack>
-              </Accordion.Panel>
-            </Accordion.Item>
+              </AccordionPanel>
+            </AccordionItem>
 
-            <Accordion.Item value="fallback">
-              <Accordion.Control>Fallback Templates</Accordion.Control>
-              <Accordion.Panel>
+            <AccordionItem value="fallback">
+              <AccordionControl>Fallback Templates</AccordionControl>
+              <AccordionPanel>
                 <Stack spacing="md">
                   <Text size="sm" c="dimmed">
                     When patterns don't match the channel/stream name, use these
@@ -1195,12 +690,12 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
                     }}
                   />
                 </Stack>
-              </Accordion.Panel>
-            </Accordion.Item>
+              </AccordionPanel>
+            </AccordionItem>
 
-            <Accordion.Item value="settings">
-              <Accordion.Control>EPG Settings</Accordion.Control>
-              <Accordion.Panel>
+            <AccordionItem value="settings">
+              <AccordionControl>EPG Settings</AccordionControl>
+              <AccordionPanel>
                 <Stack spacing="md">
                   <Select
                     label={
@@ -1335,8 +830,8 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
                     })}
                   />
                 </Stack>
-              </Accordion.Panel>
-            </Accordion.Item>
+              </AccordionPanel>
+            </AccordionItem>
           </Accordion>
 
           {/* Testing & Preview */}
diff --git a/frontend/src/components/forms/EPG.jsx b/frontend/src/components/forms/EPG.jsx
index c26b289a..4641af6c 100644
--- a/frontend/src/components/forms/EPG.jsx
+++ b/frontend/src/components/forms/EPG.jsx
@@ -1,6 +1,5 @@
 // Modal.js
 import React, { useState, useEffect } from 'react';
-import API from '../../api';
 import {
   TextInput,
   Button,
@@ -15,8 +14,9 @@ import {
   Text,
 } from '@mantine/core';
 import { isNotEmpty, useForm } from '@mantine/form';
-import { notifications } from '@mantine/notifications';
 import ScheduleInput from './ScheduleInput';
+import { addEPG, updateEPG } from '../../utils/forms/DummyEpgUtils.js';
+import { showNotification } from '../../utils/notificationUtils.js';
 
 const EPG = ({ epg = null, isOpen, onClose }) => {
   const [sourceType, setSourceType] = useState('xmltv');
@@ -58,7 +58,7 @@ const EPG = ({ epg = null, isOpen, onClose }) => {
     if (epg?.id) {
       // Validate that we have a valid EPG object before updating
       if (!epg || typeof epg !== 'object' || !epg.id) {
-        notifications.show({
+        showNotification({
           title: 'Error',
           message: 'Invalid EPG data. Please close and reopen this form.',
           color: 'red',
@@ -66,9 +66,9 @@ const EPG = ({ epg = null, isOpen, onClose }) => {
         return;
       }
 
-      await API.updateEPG({ id: epg.id, ...values });
+      await updateEPG(values, epg);
     } else {
-      await API.addEPG(values);
+      await addEPG(values);
     }
 
     form.reset();

From 48734727ad01fb2afdb8b4536d87abbc837ffad2 Mon Sep 17 00:00:00 2001
From: Nick Sandstrom <32273437+nick4810@users.noreply.github.com>
Date: Wed, 8 Apr 2026 23:28:37 -0700
Subject: [PATCH 129/172] Syntax formatting

---
 .../src/components/forms/AccountInfoModal.jsx |  10 +-
 .../components/forms/AssignChannelNumbers.jsx |  18 +-
 frontend/src/components/forms/Channel.jsx     |   5 +-
 .../src/components/forms/ChannelGroup.jsx     |   4 +-
 frontend/src/components/forms/Connection.jsx  |  18 +-
 frontend/src/components/forms/CronBuilder.jsx |   4 +-
 frontend/src/components/forms/DummyEPG.jsx    |  72 +++--
 .../forms/__tests__/AccountInfoModal.test.jsx |  27 +-
 .../__tests__/AssignChannelNumbers.test.jsx   |  20 +-
 .../forms/__tests__/Channel.test.jsx          | 168 +++++++++---
 .../forms/__tests__/ChannelBatch.test.jsx     | 242 ++++++++++++-----
 .../forms/__tests__/ChannelGroup.test.jsx     |  14 +-
 .../forms/__tests__/Connection.test.jsx       | 247 +++++++++++++----
 .../forms/__tests__/CronBuilder.test.jsx      | 161 +++++++----
 .../forms/__tests__/DummyEPG.test.jsx         | 255 +++++++++++-------
 .../components/forms/__tests__/EPG.test.jsx   | 150 ++++++++---
 .../src/utils/__tests__/dateTimeUtils.test.js |  28 +-
 frontend/src/utils/forms/ChannelBatchUtils.js |   2 +-
 frontend/src/utils/forms/ChannelUtils.js      |   2 +-
 frontend/src/utils/forms/ConnectionUtils.js   |   2 +-
 frontend/src/utils/forms/DummyEpgUtils.js     |   2 +-
 .../__tests__/AccountInfoModalUtils.test.js   |  14 +-
 .../forms/__tests__/ChannelBatchUtils.test.js | 187 +++++++++----
 .../forms/__tests__/ChannelUtils.test.js      |  99 +++++--
 .../forms/__tests__/ConnectionUtils.test.js   | 125 +++++++--
 .../forms/__tests__/CronBuilderUtils.test.js  |  26 +-
 .../forms/__tests__/DummyEpgUtils.test.js     | 240 +++++++++++------
 27 files changed, 1546 insertions(+), 596 deletions(-)

diff --git a/frontend/src/components/forms/AccountInfoModal.jsx b/frontend/src/components/forms/AccountInfoModal.jsx
index a85ecc34..a9e46147 100644
--- a/frontend/src/components/forms/AccountInfoModal.jsx
+++ b/frontend/src/components/forms/AccountInfoModal.jsx
@@ -16,7 +16,15 @@ import {
   Text,
   Tooltip,
 } from '@mantine/core';
-import { AlertTriangle, CheckCircle, Clock, Info, RefreshCw, Users, XCircle, } from 'lucide-react';
+import {
+  AlertTriangle,
+  CheckCircle,
+  Clock,
+  Info,
+  RefreshCw,
+  Users,
+  XCircle,
+} from 'lucide-react';
 import usePlaylistsStore from '../../store/playlists';
 import { showNotification } from '../../utils/notificationUtils.js';
 import {
diff --git a/frontend/src/components/forms/AssignChannelNumbers.jsx b/frontend/src/components/forms/AssignChannelNumbers.jsx
index 22861986..7d1f52fe 100644
--- a/frontend/src/components/forms/AssignChannelNumbers.jsx
+++ b/frontend/src/components/forms/AssignChannelNumbers.jsx
@@ -1,27 +1,17 @@
 import React from 'react';
 import API from '../../api';
-import {
-  Button,
-  Modal,
-  Text,
-  Group,
-  Flex,
-  NumberInput,
-} from '@mantine/core';
+import { Button, Modal, Text, Group, Flex, NumberInput } from '@mantine/core';
 import { ListOrdered } from 'lucide-react';
 import { useForm } from '@mantine/form';
 import { showNotification } from '../../utils/notificationUtils.js';
 
 const assignChannelNumbers = (channelIds, starting_number) => {
-  return API.assignChannelNumbers(
-    channelIds,
-    starting_number
-  );
-}
+  return API.assignChannelNumbers(channelIds, starting_number);
+};
 
 const requeryChannels = () => {
   API.requeryChannels();
-}
+};
 
 const AssignChannelNumbers = ({ channelIds, isOpen, onClose }) => {
   const form = useForm({
diff --git a/frontend/src/components/forms/Channel.jsx b/frontend/src/components/forms/Channel.jsx
index 28826e7f..8ac62555 100644
--- a/frontend/src/components/forms/Channel.jsx
+++ b/frontend/src/components/forms/Channel.jsx
@@ -37,7 +37,10 @@ import { ListOrdered, SquarePlus, X, Zap } from 'lucide-react';
 import useEPGsStore from '../../store/epgs';
 import { FixedSizeList as List } from 'react-window';
 import { USER_LEVEL_LABELS, USER_LEVELS } from '../../constants';
-import { showNotification, updateNotification, } from '../../utils/notificationUtils.js';
+import {
+  showNotification,
+  updateNotification,
+} from '../../utils/notificationUtils.js';
 import {
   addChannel,
   createLogo,
diff --git a/frontend/src/components/forms/ChannelGroup.jsx b/frontend/src/components/forms/ChannelGroup.jsx
index ebb4d9ee..5e5ddfd3 100644
--- a/frontend/src/components/forms/ChannelGroup.jsx
+++ b/frontend/src/components/forms/ChannelGroup.jsx
@@ -11,10 +11,10 @@ const updateChannelGroup = (channelGroup, values) => {
     id: channelGroup.id,
     ...values,
   });
-}
+};
 const addChannelGroup = (values) => {
   return API.addChannelGroup(values);
-}
+};
 
 const ChannelGroup = ({ channelGroup = null, isOpen, onClose }) => {
   const canEditChannelGroup = useChannelsStore((s) => s.canEditChannelGroup);
diff --git a/frontend/src/components/forms/Connection.jsx b/frontend/src/components/forms/Connection.jsx
index 817789fd..ecbb0e0f 100644
--- a/frontend/src/components/forms/Connection.jsx
+++ b/frontend/src/components/forms/Connection.jsx
@@ -182,7 +182,7 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
     const next = [...headers];
     next[idx] = { ...next[idx], key: newValue };
     setHeaders(next);
-  }
+  };
 
   const onHeaderValueChange = (idx, newValue) => {
     const next = [...headers];
@@ -191,14 +191,12 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
       value: newValue,
     };
     setHeaders(next);
-  }
+  };
 
   const onHeaderRemove = (idx) => {
     const next = headers.filter((_, i) => i !== idx);
-    setHeaders(
-      next.length ? next : [{ key: '', value: '' }]
-    );
-  }
+    setHeaders(next.length ? next : [{ key: '', value: '' }]);
+  };
 
   return (
     <Modal opened={isOpen} size="lg" onClose={handleClose} title="Connection">
@@ -257,8 +255,12 @@ const ConnectionForm = ({ connection = null, isOpen, onClose }) => {
                       <HeaderRow
                         key={idx}
                         h={h}
-                        onKeyChange={(e) => onHeaderKeyChange(idx, e.target.value)}
-                        onValueChange={(e) => onHeaderValueChange(idx, e.target.value)}
+                        onKeyChange={(e) =>
+                          onHeaderKeyChange(idx, e.target.value)
+                        }
+                        onValueChange={(e) =>
+                          onHeaderValueChange(idx, e.target.value)
+                        }
                         onRemove={() => onHeaderRemove(idx)}
                       />
                     ))}
diff --git a/frontend/src/components/forms/CronBuilder.jsx b/frontend/src/components/forms/CronBuilder.jsx
index 4d92265a..9a704536 100644
--- a/frontend/src/components/forms/CronBuilder.jsx
+++ b/frontend/src/components/forms/CronBuilder.jsx
@@ -42,7 +42,9 @@ const CronPartInput = ({ field, cron, onChange }) => (
     label={field.label}
     placeholder={field.placeholder}
     value={cron.split(' ')[field.index] || '*'}
-    onChange={(e) => onChange(updateCronPart(cron, field.index, e.currentTarget.value))}
+    onChange={(e) =>
+      onChange(updateCronPart(cron, field.index, e.currentTarget.value))
+    }
   />
 );
 
diff --git a/frontend/src/components/forms/DummyEPG.jsx b/frontend/src/components/forms/DummyEPG.jsx
index 166e6ab5..5a533f10 100644
--- a/frontend/src/components/forms/DummyEPG.jsx
+++ b/frontend/src/components/forms/DummyEPG.jsx
@@ -114,11 +114,17 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
   });
 
   const patternValidation = useMemo(() => {
-    const title = matchPattern(titlePattern, sampleTitle, 'Title pattern error');
-    const time  = matchPattern(timePattern,  sampleTitle, 'Time pattern error');
-    const date  = matchPattern(datePattern,  sampleTitle, 'Date pattern error');
+    const title = matchPattern(
+      titlePattern,
+      sampleTitle,
+      'Title pattern error'
+    );
+    const time = matchPattern(timePattern, sampleTitle, 'Time pattern error');
+    const date = matchPattern(datePattern, sampleTitle, 'Date pattern error');
 
-    const errors = [title.error, time.error, date.error].filter(Boolean).join('; ');
+    const errors = [title.error, time.error, date.error]
+      .filter(Boolean)
+      .join('; ');
 
     const timePlaceholders = buildTimePlaceholders(
       time.groups,
@@ -138,40 +144,48 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
     const hasMatch = title.matched || time.matched;
 
     return {
-      titleMatch:  title.matched,
-      timeMatch:   time.matched,
-      dateMatch:   date.matched,
+      titleMatch: title.matched,
+      timeMatch: time.matched,
+      dateMatch: date.matched,
       titleGroups: title.groups,
-      timeGroups:  time.groups,
-      dateGroups:  date.groups,
+      timeGroups: time.groups,
+      dateGroups: date.groups,
       calculatedPlaceholders: time.matched ? timePlaceholders : {},
       error: errors || null,
       ...applyTemplates(
-        { titleTemplate, subtitleTemplate, descriptionTemplate, upcomingTitleTemplate,
-          upcomingDescriptionTemplate, endedTitleTemplate, endedDescriptionTemplate,
-          channelLogoUrl, programPosterUrl },
+        {
+          titleTemplate,
+          subtitleTemplate,
+          descriptionTemplate,
+          upcomingTitleTemplate,
+          upcomingDescriptionTemplate,
+          endedTitleTemplate,
+          endedDescriptionTemplate,
+          channelLogoUrl,
+          programPosterUrl,
+        },
         allGroups,
         hasMatch
       ),
     };
   }, [
-      titlePattern,
-      timePattern,
-      datePattern,
-      sampleTitle,
-      titleTemplate,
-      subtitleTemplate,
-      descriptionTemplate,
-      upcomingTitleTemplate,
-      upcomingDescriptionTemplate,
-      endedTitleTemplate,
-      endedDescriptionTemplate,
-      channelLogoUrl,
-      programPosterUrl,
-      form.values.custom_properties?.timezone,
-      form.values.custom_properties?.output_timezone,
-      form.values.custom_properties?.program_duration,
-    ]);
+    titlePattern,
+    timePattern,
+    datePattern,
+    sampleTitle,
+    titleTemplate,
+    subtitleTemplate,
+    descriptionTemplate,
+    upcomingTitleTemplate,
+    upcomingDescriptionTemplate,
+    endedTitleTemplate,
+    endedDescriptionTemplate,
+    channelLogoUrl,
+    programPosterUrl,
+    form.values.custom_properties?.timezone,
+    form.values.custom_properties?.output_timezone,
+    form.values.custom_properties?.program_duration,
+  ]);
 
   useEffect(() => {
     if (epg) {
diff --git a/frontend/src/components/forms/__tests__/AccountInfoModal.test.jsx b/frontend/src/components/forms/__tests__/AccountInfoModal.test.jsx
index 92117a3c..7fe40085 100644
--- a/frontend/src/components/forms/__tests__/AccountInfoModal.test.jsx
+++ b/frontend/src/components/forms/__tests__/AccountInfoModal.test.jsx
@@ -59,9 +59,7 @@ vi.mock('@mantine/core', () => ({
   TableTd: ({ children }) => <td>{children}</td>,
   TableTr: ({ children }) => <tr>{children}</tr>,
   Text: ({ children }) => <span>{children}</span>,
-  Tooltip: ({ children, label }) => (
-    <div data-tooltip={label}>{children}</div>
-  ),
+  Tooltip: ({ children, label }) => <div data-tooltip={label}>{children}</div>,
 }));
 
 // ── lucide-react ───────────────────────────────────────────────────────────────
@@ -109,13 +107,11 @@ const makeProfile = (overrides = {}) => ({
 });
 
 const setupMocks = ({
-                      profiles = {},
-                      timeRemaining = '10 days 5 hours',
-                      formattedTimestamp = 'Nov 14, 2023',
-                    } = {}) => {
-  vi.mocked(usePlaylistsStore).mockImplementation((sel) =>
-    sel({ profiles })
-  );
+  profiles = {},
+  timeRemaining = '10 days 5 hours',
+  formattedTimestamp = 'Nov 14, 2023',
+} = {}) => {
+  vi.mocked(usePlaylistsStore).mockImplementation((sel) => sel({ profiles }));
   vi.mocked(getTimeRemaining).mockReturnValue(timeRemaining);
   vi.mocked(formatTimestamp).mockReturnValue(formattedTimestamp);
   vi.mocked(refreshAccountInfo).mockResolvedValue({ success: true });
@@ -397,7 +393,10 @@ describe('AccountInfoModal', () => {
     it('disables the refresh button while refreshing', async () => {
       setupMocks();
       vi.mocked(refreshAccountInfo).mockImplementation(
-        () => new Promise((resolve) => setTimeout(() => resolve({ success: true }), 200))
+        () =>
+          new Promise((resolve) =>
+            setTimeout(() => resolve({ success: true }), 200)
+          )
       );
       render(<AccountInfoModal {...defaultProps()} />);
       fireEvent.click(screen.getByTestId('action-icon'));
@@ -409,7 +408,9 @@ describe('AccountInfoModal', () => {
 
     it('re-enables the refresh button after refresh fails', async () => {
       setupMocks();
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
       vi.mocked(refreshAccountInfo).mockRejectedValue(new Error('fail'));
       render(<AccountInfoModal {...defaultProps()} />);
       fireEvent.click(screen.getByTestId('action-icon'));
@@ -443,4 +444,4 @@ describe('AccountInfoModal', () => {
       expect(screen.getByTestId('modal')).toBeInTheDocument();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/__tests__/AssignChannelNumbers.test.jsx b/frontend/src/components/forms/__tests__/AssignChannelNumbers.test.jsx
index 2bec2d7b..c1f7cea7 100644
--- a/frontend/src/components/forms/__tests__/AssignChannelNumbers.test.jsx
+++ b/frontend/src/components/forms/__tests__/AssignChannelNumbers.test.jsx
@@ -26,7 +26,15 @@ vi.mock('@mantine/form', () => ({
 
 // ── Mantine core ───────────────────────────────────────────────────────────────
 vi.mock('@mantine/core', () => ({
-  Button: ({ children, onClick, disabled, loading, variant, color, leftSection }) => (
+  Button: ({
+    children,
+    onClick,
+    disabled,
+    loading,
+    variant,
+    color,
+    leftSection,
+  }) => (
     <button
       data-testid="button"
       onClick={onClick}
@@ -252,7 +260,9 @@ describe('AssignChannelNumbers', () => {
 
     it('shows error notification when assignChannelNumbers throws', async () => {
       setupMocks();
-      vi.mocked(API.assignChannelNumbers).mockRejectedValue(new Error('Server error'));
+      vi.mocked(API.assignChannelNumbers).mockRejectedValue(
+        new Error('Server error')
+      );
       render(<AssignChannelNumbers {...defaultProps()} />);
       fireEvent.click(screen.getByTestId('button'));
       await waitFor(() => {
@@ -314,7 +324,9 @@ describe('AssignChannelNumbers', () => {
   describe('channelIds prop', () => {
     it('passes a single channelId correctly', async () => {
       setupMocks();
-      render(<AssignChannelNumbers {...defaultProps({ channelIds: ['ch-99'] })} />);
+      render(
+        <AssignChannelNumbers {...defaultProps({ channelIds: ['ch-99'] })} />
+      );
       fireEvent.click(screen.getByTestId('button'));
       await waitFor(() => {
         expect(API.assignChannelNumbers).toHaveBeenCalledWith(['ch-99'], 1);
@@ -331,4 +343,4 @@ describe('AssignChannelNumbers', () => {
       });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/__tests__/Channel.test.jsx b/frontend/src/components/forms/__tests__/Channel.test.jsx
index 212821f6..02a12de2 100644
--- a/frontend/src/components/forms/__tests__/Channel.test.jsx
+++ b/frontend/src/components/forms/__tests__/Channel.test.jsx
@@ -65,7 +65,12 @@ vi.mock('../Logo', () => ({
 
 vi.mock('../../LazyLogo', () => ({
   default: ({ logoId, alt, style }) => (
-    <img data-testid="lazy-logo" data-logo-id={logoId} alt={alt} style={style} />
+    <img
+      data-testid="lazy-logo"
+      data-logo-id={logoId}
+      alt={alt}
+      style={style}
+    />
   ),
 }));
 
@@ -119,7 +124,17 @@ vi.mock('@mantine/core', async () => ({
     </button>
   ),
   Box: ({ children, style }) => <div style={style}>{children}</div>,
-  Button: ({ children, onClick, disabled, loading, type, variant, color, leftSection, title }) => (
+  Button: ({
+    children,
+    onClick,
+    disabled,
+    loading,
+    type,
+    variant,
+    color,
+    leftSection,
+    title,
+  }) => (
     <button
       onClick={onClick}
       disabled={disabled || loading}
@@ -138,7 +153,14 @@ vi.mock('@mantine/core', async () => ({
     <hr data-orientation={orientation} data-size={size} />
   ),
   Flex: ({ children, gap, justify, align, mih }) => (
-    <div style={{ gap, justifyContent: justify, alignItems: align, minHeight: mih }}>
+    <div
+      style={{
+        gap,
+        justifyContent: justify,
+        alignItems: align,
+        minHeight: mih,
+      }}
+    >
       {children}
     </div>
   ),
@@ -165,7 +187,9 @@ vi.mock('@mantine/core', async () => ({
         name={name}
         type="number"
         value={value ?? ''}
-        onChange={(e) => onChange(e.target.value === '' ? undefined : Number(e.target.value))}
+        onChange={(e) =>
+          onChange(e.target.value === '' ? undefined : Number(e.target.value))
+        }
         data-testid={`number-input-${name}`}
       />
       {error && <span data-testid={`error-${name}`}>{error}</span>}
@@ -181,7 +205,9 @@ vi.mock('@mantine/core', async () => ({
       {children}
     </div>
   ),
-  PopoverTarget: ({ children }) => <div data-testid="popover-target">{children}</div>,
+  PopoverTarget: ({ children }) => (
+    <div data-testid="popover-target">{children}</div>
+  ),
   ScrollArea: ({ children, style }) => <div style={style}>{children}</div>,
   Select: ({ label, value, onChange, data, id, name, error }) => (
     <div>
@@ -222,7 +248,20 @@ vi.mock('@mantine/core', async () => ({
       {children}
     </span>
   ),
-  TextInput: ({ id, name, label, readOnly, value, onClick, onChange, error, autoFocus, placeholder, rightSection, ...rest }) => (
+  TextInput: ({
+    id,
+    name,
+    label,
+    readOnly,
+    value,
+    onClick,
+    onChange,
+    error,
+    autoFocus,
+    placeholder,
+    rightSection,
+    ...rest
+  }) => (
     <div>
       <label htmlFor={id}>{label}</label>
       <input
@@ -242,9 +281,7 @@ vi.mock('@mantine/core', async () => ({
       {error && <span data-testid={`error-${name}`}>{error}</span>}
     </div>
   ),
-  Tooltip: ({ children, label }) => (
-    <div data-tooltip={label}>{children}</div>
-  ),
+  Tooltip: ({ children, label }) => <div data-tooltip={label}>{children}</div>,
   UnstyledButton: ({ children, onClick }) => (
     <button data-testid="unstyled-button" onClick={onClick}>
       {children}
@@ -264,7 +301,10 @@ import useLogosStore from '../../../store/logos';
 import { useChannelLogoSelection } from '../../../hooks/useSmartLogos';
 import { useForm } from 'react-hook-form';
 import * as ChannelUtils from '../../../utils/forms/ChannelUtils.js';
-import { showNotification, updateNotification } from '../../../utils/notificationUtils.js';
+import {
+  showNotification,
+  updateNotification,
+} from '../../../utils/notificationUtils.js';
 
 // ── Helpers ────────────────────────────────────────────────────────────────────
 
@@ -284,7 +324,10 @@ const makeFormMethods = (overrides = {}) => {
   };
 
   const register = vi.fn((name) => ({ name, ref: vi.fn() }));
-  const handleSubmit = vi.fn((fn) => (e) => { e?.preventDefault?.(); return fn(watchValues); });
+  const handleSubmit = vi.fn((fn) => (e) => {
+    e?.preventDefault?.();
+    return fn(watchValues);
+  });
   const setValue = vi.fn();
   const watch = vi.fn((key) => (key ? watchValues[key] : watchValues));
   const reset = vi.fn();
@@ -326,18 +369,52 @@ const makeEpgs = () => ({
 });
 
 const makeTvgs = () => [
-  { id: 'tvg-1', name: 'ESPN', tvg_id: 'espn.us', epg_source: 10, icon_url: 'http://example.com/espn.png' },
-  { id: 'tvg-2', name: 'CNN', tvg_id: 'cnn.us', epg_source: 11, icon_url: 'http://example.com/cnn.png' },
+  {
+    id: 'tvg-1',
+    name: 'ESPN',
+    tvg_id: 'espn.us',
+    epg_source: 10,
+    icon_url: 'http://example.com/espn.png',
+  },
+  {
+    id: 'tvg-2',
+    name: 'CNN',
+    tvg_id: 'cnn.us',
+    epg_source: 11,
+    icon_url: 'http://example.com/cnn.png',
+  },
 ];
 
 const makeTvgsById = () => ({
-  'tvg-1': { id: 'tvg-1', name: 'ESPN', tvg_id: 'espn.us', epg_source: 10, icon_url: 'http://example.com/espn.png' },
-  'tvg-2': { id: 'tvg-2', name: 'CNN', tvg_id: 'cnn.us', epg_source: 11, icon_url: 'http://example.com/cnn.png' },
+  'tvg-1': {
+    id: 'tvg-1',
+    name: 'ESPN',
+    tvg_id: 'espn.us',
+    epg_source: 10,
+    icon_url: 'http://example.com/espn.png',
+  },
+  'tvg-2': {
+    id: 'tvg-2',
+    name: 'CNN',
+    tvg_id: 'cnn.us',
+    epg_source: 11,
+    icon_url: 'http://example.com/cnn.png',
+  },
 });
 
 const makeLogos = () => ({
-  42: { id: 42, name: 'ESPN Logo', url: 'http://example.com/espn.png', cache_url: '/cache/espn.png' },
-  43: { id: 43, name: 'CNN Logo', url: 'http://example.com/cnn.png', cache_url: '/cache/cnn.png' },
+  42: {
+    id: 42,
+    name: 'ESPN Logo',
+    url: 'http://example.com/espn.png',
+    cache_url: '/cache/espn.png',
+  },
+  43: {
+    id: 43,
+    name: 'CNN Logo',
+    url: 'http://example.com/cnn.png',
+    cache_url: '/cache/cnn.png',
+  },
 });
 
 const makeChannelLogos = () => ({
@@ -384,9 +461,7 @@ const setupMocks = ({ formOverrides = {}, channel = null } = {}) => {
     sel({ epgs, tvgs, tvgsById })
   );
 
-  vi.mocked(useLogosStore).mockImplementation((sel) =>
-    sel({ logos })
-  );
+  vi.mocked(useLogosStore).mockImplementation((sel) => sel({ logos }));
 
   const mockEnsureLogosLoaded = vi.fn();
   vi.mocked(useChannelLogoSelection).mockReturnValue({
@@ -396,7 +471,9 @@ const setupMocks = ({ formOverrides = {}, channel = null } = {}) => {
   });
 
   // Same object reference every call — prevents useMemo from recalculating
-  vi.mocked(ChannelUtils.getChannelFormDefaultValues).mockReturnValue(stableDefaults);
+  vi.mocked(ChannelUtils.getChannelFormDefaultValues).mockReturnValue(
+    stableDefaults
+  );
   vi.mocked(ChannelUtils.getFormattedValues).mockImplementation((v) => v);
 
   return { formMethods, mockEnsureLogosLoaded };
@@ -460,7 +537,9 @@ describe('ChannelForm', () => {
     it('renders Channel Group text input', () => {
       setupMocks();
       render(<ChannelForm {...defaultProps()} />);
-      expect(screen.getByTestId('text-input-channel_group_id')).toBeInTheDocument();
+      expect(
+        screen.getByTestId('text-input-channel_group_id')
+      ).toBeInTheDocument();
     });
 
     it('renders stream profile select with options', () => {
@@ -493,7 +572,9 @@ describe('ChannelForm', () => {
     it('renders the channel number input', () => {
       setupMocks();
       render(<ChannelForm {...defaultProps()} />);
-      expect(screen.getByTestId('number-input-channel_number')).toBeInTheDocument();
+      expect(
+        screen.getByTestId('number-input-channel_number')
+      ).toBeInTheDocument();
     });
 
     it('renders TVG-ID text input', () => {
@@ -505,7 +586,9 @@ describe('ChannelForm', () => {
     it('renders Gracenote StationId text input', () => {
       setupMocks();
       render(<ChannelForm {...defaultProps()} />);
-      expect(screen.getByTestId('text-input-tvc_guide_stationid')).toBeInTheDocument();
+      expect(
+        screen.getByTestId('text-input-tvc_guide_stationid')
+      ).toBeInTheDocument();
     });
 
     it('renders EPG text input', () => {
@@ -622,7 +705,9 @@ describe('ChannelForm', () => {
 
     it('shows error notification when matchChannelEpg throws', async () => {
       const channel = makeChannel();
-      vi.mocked(ChannelUtils.matchChannelEpg).mockRejectedValue(new Error('Network'));
+      vi.mocked(ChannelUtils.matchChannelEpg).mockRejectedValue(
+        new Error('Network')
+      );
       setupMocks({ channel });
       render(<ChannelForm {...defaultProps({ channel })} />);
       fireEvent.click(screen.getByText('Auto Match'));
@@ -644,7 +729,10 @@ describe('ChannelForm', () => {
       render(<ChannelForm {...defaultProps({ channel })} />);
       fireEvent.click(screen.getByText('Auto Match'));
       await waitFor(() => {
-        expect(formMethods.setValue).toHaveBeenCalledWith('epg_data_id', 'tvg-1');
+        expect(formMethods.setValue).toHaveBeenCalledWith(
+          'epg_data_id',
+          'tvg-1'
+        );
       });
     });
   });
@@ -731,7 +819,6 @@ describe('ChannelForm', () => {
           expect.objectContaining({ color: 'green' })
         );
       });
-
     });
 
     it('creates a new logo when no matching logo exists', async () => {
@@ -745,8 +832,8 @@ describe('ChannelForm', () => {
         },
       });
       // tvg-2 has icon_url 'http://example.com/cnn.png' — but make allLogos not contain it
-      vi.mocked(useLogosStore).mockImplementation((sel) =>
-        sel({ logos: {} }) // empty logos so no match
+      vi.mocked(useLogosStore).mockImplementation(
+        (sel) => sel({ logos: {} }) // empty logos so no match
       );
       render(<ChannelForm {...defaultProps()} />);
       fireEvent.click(screen.getByText('Use EPG Logo'));
@@ -761,9 +848,7 @@ describe('ChannelForm', () => {
       setupMocks({
         formOverrides: { watchValues: { epg_data_id: 'tvg-2' } },
       });
-      vi.mocked(useLogosStore).mockImplementation((sel) =>
-        sel({ logos: {} })
-      );
+      vi.mocked(useLogosStore).mockImplementation((sel) => sel({ logos: {} }));
       render(<ChannelForm {...defaultProps()} />);
       fireEvent.click(screen.getByText('Use EPG Logo'));
       await waitFor(() => {
@@ -844,7 +929,9 @@ describe('ChannelForm', () => {
       fireEvent.click(screen.getByTestId('icon-square-plus').closest('button'));
       fireEvent.click(screen.getByTestId('channel-group-close'));
       await waitFor(() => {
-        expect(screen.queryByTestId('channel-group-form')).not.toBeInTheDocument();
+        expect(
+          screen.queryByTestId('channel-group-form')
+        ).not.toBeInTheDocument();
       });
     });
 
@@ -854,8 +941,13 @@ describe('ChannelForm', () => {
       fireEvent.click(screen.getByTestId('icon-square-plus').closest('button'));
       fireEvent.click(screen.getByTestId('channel-group-save'));
       await waitFor(() => {
-        expect(formMethods.setValue).toHaveBeenCalledWith('channel_group_id', '99');
-        expect(screen.queryByTestId('channel-group-form')).not.toBeInTheDocument();
+        expect(formMethods.setValue).toHaveBeenCalledWith(
+          'channel_group_id',
+          '99'
+        );
+        expect(
+          screen.queryByTestId('channel-group-form')
+        ).not.toBeInTheDocument();
       });
     });
   });
@@ -923,7 +1015,9 @@ describe('ChannelForm', () => {
     });
 
     it('still calls onClose when submission throws', async () => {
-      vi.mocked(ChannelUtils.addChannel).mockRejectedValue(new Error('Server error'));
+      vi.mocked(ChannelUtils.addChannel).mockRejectedValue(
+        new Error('Server error')
+      );
       setupMocks();
       const onClose = vi.fn();
       render(<ChannelForm {...defaultProps({ onClose })} />);
@@ -986,4 +1080,4 @@ describe('ChannelForm', () => {
       expect(epgInput).toHaveValue('EPG Source 1 - ESPN');
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/__tests__/ChannelBatch.test.jsx b/frontend/src/components/forms/__tests__/ChannelBatch.test.jsx
index b7228d90..b31b7d7c 100644
--- a/frontend/src/components/forms/__tests__/ChannelBatch.test.jsx
+++ b/frontend/src/components/forms/__tests__/ChannelBatch.test.jsx
@@ -57,12 +57,25 @@ vi.mock('../ChannelGroup', () => ({
 }));
 
 vi.mock('../../ConfirmationDialog', () => ({
-  default: ({ opened, onConfirm, onClose, title, confirmLabel, cancelLabel, loading, message }) =>
+  default: ({
+    opened,
+    onConfirm,
+    onClose,
+    title,
+    confirmLabel,
+    cancelLabel,
+    loading,
+    message,
+  }) =>
     opened ? (
       <div data-testid="confirmation-dialog">
         <div data-testid="dialog-title">{title}</div>
         <div data-testid="dialog-message">{message}</div>
-        <button data-testid="dialog-confirm" onClick={onConfirm} disabled={loading}>
+        <button
+          data-testid="dialog-confirm"
+          onClick={onConfirm}
+          disabled={loading}
+        >
           {confirmLabel}
         </button>
         <button data-testid="dialog-cancel" onClick={onClose}>
@@ -73,7 +86,9 @@ vi.mock('../../ConfirmationDialog', () => ({
 }));
 
 vi.mock('../../LazyLogo', () => ({
-  default: ({ src, alt }) => <img src={src} alt={alt} data-testid="lazy-logo" />,
+  default: ({ src, alt }) => (
+    <img src={src} alt={alt} data-testid="lazy-logo" />
+  ),
 }));
 
 vi.mock('../../../images/logo.png', () => ({ default: 'default-logo.png' }));
@@ -104,14 +119,20 @@ vi.mock('@mantine/core', async () => ({
     opened ? (
       <div data-testid="modal">
         <div data-testid="modal-title">{title}</div>
-        <button data-testid="modal-close" onClick={onClose}>×</button>
+        <button data-testid="modal-close" onClick={onClose}>
+          ×
+        </button>
         {children}
       </div>
     ) : null,
   Paper: ({ children, style }) => <div style={style}>{children}</div>,
   Popover: ({ children }) => <div data-testid="popover">{children}</div>,
-  PopoverDropdown: ({ children }) => <div data-testid="popover-dropdown">{children}</div>,
-  PopoverTarget: ({ children }) => <div data-testid="popover-target">{children}</div>,
+  PopoverDropdown: ({ children }) => (
+    <div data-testid="popover-dropdown">{children}</div>
+  ),
+  PopoverTarget: ({ children }) => (
+    <div data-testid="popover-target">{children}</div>
+  ),
   ScrollArea: ({ children, h }) => <div style={{ height: h }}>{children}</div>,
   Select: ({ label, data, value, onChange, disabled }) => (
     <select
@@ -124,13 +145,19 @@ vi.mock('@mantine/core', async () => ({
       {(data ?? []).map((opt) => {
         const val = typeof opt === 'string' ? opt : opt.value;
         const lbl = typeof opt === 'string' ? opt : opt.label;
-        return <option key={val} value={val}>{lbl}</option>;
+        return (
+          <option key={val} value={val}>
+            {lbl}
+          </option>
+        );
       })}
     </select>
   ),
   Stack: ({ children }) => <div>{children}</div>,
   Text: ({ children, size, c }) => (
-    <span data-size={size} data-color={c}>{children}</span>
+    <span data-size={size} data-color={c}>
+      {children}
+    </span>
   ),
   TextInput: ({ label, placeholder, value, onChange, disabled }) => (
     <input
@@ -144,7 +171,9 @@ vi.mock('@mantine/core', async () => ({
   ),
   Tooltip: ({ children, label }) => <div data-tooltip={label}>{children}</div>,
   UnstyledButton: ({ children, onClick, style }) => (
-    <button onClick={onClick} style={style}>{children}</button>
+    <button onClick={onClick} style={style}>
+      {children}
+    </button>
   ),
   useMantineTheme: () => ({ tailwind: { green: { 5: '#38a169' } } }),
 }));
@@ -246,7 +275,8 @@ const setupMocks = (overrides = {}) => {
 
   vi.mocked(useWarningsStore).mockImplementation((sel) =>
     sel({
-      isWarningSuppressed: overrides.isWarningSuppressed ?? vi.fn().mockReturnValue(false),
+      isWarningSuppressed:
+        overrides.isWarningSuppressed ?? vi.fn().mockReturnValue(false),
       suppressWarning: vi.fn(),
     })
   );
@@ -269,14 +299,24 @@ const setupMocks = (overrides = {}) => {
   });
 
   vi.mocked(ChannelBatchUtils.computeRegexPreview).mockReturnValue([]);
-  vi.mocked(ChannelBatchUtils.buildSubmitValues).mockReturnValue({ stream_profile_id: '1' });
+  vi.mocked(ChannelBatchUtils.buildSubmitValues).mockReturnValue({
+    stream_profile_id: '1',
+  });
   vi.mocked(ChannelBatchUtils.buildEpgAssociations).mockResolvedValue(null);
   vi.mocked(ChannelBatchUtils.updateChannels).mockResolvedValue(undefined);
-  vi.mocked(ChannelBatchUtils.bulkRegexRenameChannels).mockResolvedValue(undefined);
+  vi.mocked(ChannelBatchUtils.bulkRegexRenameChannels).mockResolvedValue(
+    undefined
+  );
   vi.mocked(ChannelBatchUtils.batchSetEPG).mockResolvedValue(undefined);
-  vi.mocked(ChannelBatchUtils.setChannelNamesFromEpg).mockResolvedValue(undefined);
-  vi.mocked(ChannelBatchUtils.setChannelLogosFromEpg).mockResolvedValue(undefined);
-  vi.mocked(ChannelBatchUtils.setChannelTvgIdsFromEpg).mockResolvedValue(undefined);
+  vi.mocked(ChannelBatchUtils.setChannelNamesFromEpg).mockResolvedValue(
+    undefined
+  );
+  vi.mocked(ChannelBatchUtils.setChannelLogosFromEpg).mockResolvedValue(
+    undefined
+  );
+  vi.mocked(ChannelBatchUtils.setChannelTvgIdsFromEpg).mockResolvedValue(
+    undefined
+  );
   vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(null);
   vi.mocked(ChannelBatchUtils.getLogoChange).mockReturnValue(null);
   vi.mocked(ChannelBatchUtils.getStreamProfileChange).mockReturnValue(null);
@@ -353,12 +393,16 @@ describe('ChannelBatchForm', () => {
       expect(showNotification).toHaveBeenCalledWith(
         expect.objectContaining({ color: 'orange' })
       );
-      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('confirmation-dialog')
+      ).not.toBeInTheDocument();
     });
 
     it('opens confirmation dialog when at least one change is present', () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Submit'));
@@ -371,11 +415,13 @@ describe('ChannelBatchForm', () => {
 
   describe('warning suppression', () => {
     it('skips confirmation dialog and calls onSubmit directly when batch-update warning is suppressed', async () => {
-      const isWarningSuppressed = vi.fn().mockImplementation((key) =>
-        key === 'batch-update-channels'
-      );
+      const isWarningSuppressed = vi
+        .fn()
+        .mockImplementation((key) => key === 'batch-update-channels');
       setupMocks({ isWarningSuppressed });
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
       const onClose = vi.fn();
 
       renderForm({ onClose });
@@ -384,7 +430,9 @@ describe('ChannelBatchForm', () => {
       await waitFor(() => {
         expect(onClose).toHaveBeenCalled();
       });
-      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('confirmation-dialog')
+      ).not.toBeInTheDocument();
     });
   });
 
@@ -393,27 +441,33 @@ describe('ChannelBatchForm', () => {
   describe('confirmation dialog', () => {
     it('closes confirmation dialog on cancel', () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Submit'));
       expect(screen.getByTestId('confirmation-dialog')).toBeInTheDocument();
 
       fireEvent.click(screen.getByTestId('dialog-cancel'));
-      expect(screen.queryByTestId('confirmation-dialog')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('confirmation-dialog')
+      ).not.toBeInTheDocument();
     });
 
     it('calls updateChannels on confirm', async () => {
       setupMocks({
         formValues: {
-          stream_profile_id: '1',   // survives: not '-1' or '0', so kept as-is after parseInt...
-          user_level: '-1',         // deleted
-          is_adult: '-1',           // deleted
-          channel_group: '',        // deleted (channel_group key is removed)
-          logo: '',                 // deleted
+          stream_profile_id: '1', // survives: not '-1' or '0', so kept as-is after parseInt...
+          user_level: '-1', // deleted
+          is_adult: '-1', // deleted
+          channel_group: '', // deleted (channel_group key is removed)
+          logo: '', // deleted
         },
       });
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Submit'));
@@ -429,7 +483,9 @@ describe('ChannelBatchForm', () => {
 
     it('calls requeryChannels after successful submit', async () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Submit'));
@@ -442,7 +498,9 @@ describe('ChannelBatchForm', () => {
 
     it('calls onClose after successful submit', async () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
       const onClose = vi.fn();
 
       renderForm({ onClose });
@@ -477,7 +535,7 @@ describe('ChannelBatchForm', () => {
         expect(ChannelBatchUtils.bulkRegexRenameChannels).toHaveBeenCalledWith(
           CHANNEL_IDS,
           'foo',
-          '',   // regexReplace default is ''
+          '', // regexReplace default is ''
           'g'
         );
       });
@@ -504,20 +562,24 @@ describe('ChannelBatchForm', () => {
 
       fireEvent.click(screen.getByText('Set Names from EPG'));
 
-      expect(screen.getByTestId('dialog-title')).toHaveTextContent('Confirm Set Names from EPG');
+      expect(screen.getByTestId('dialog-title')).toHaveTextContent(
+        'Confirm Set Names from EPG'
+      );
     });
 
     it('skips dialog and executes directly when warning is suppressed', async () => {
-      const isWarningSuppressed = vi.fn().mockImplementation((key) =>
-        key === 'batch-set-names-from-epg'
-      );
+      const isWarningSuppressed = vi
+        .fn()
+        .mockImplementation((key) => key === 'batch-set-names-from-epg');
       setupMocks({ isWarningSuppressed });
 
       renderForm();
       fireEvent.click(screen.getByText('Set Names from EPG'));
 
       await waitFor(() => {
-        expect(ChannelBatchUtils.setChannelNamesFromEpg).toHaveBeenCalledWith(CHANNEL_IDS);
+        expect(ChannelBatchUtils.setChannelNamesFromEpg).toHaveBeenCalledWith(
+          CHANNEL_IDS
+        );
       });
     });
 
@@ -529,7 +591,9 @@ describe('ChannelBatchForm', () => {
       fireEvent.click(screen.getByTestId('dialog-confirm'));
 
       await waitFor(() => {
-        expect(ChannelBatchUtils.setChannelNamesFromEpg).toHaveBeenCalledWith(CHANNEL_IDS);
+        expect(ChannelBatchUtils.setChannelNamesFromEpg).toHaveBeenCalledWith(
+          CHANNEL_IDS
+        );
       });
     });
 
@@ -549,7 +613,9 @@ describe('ChannelBatchForm', () => {
 
     it('shows error notification when setChannelNamesFromEpg rejects', async () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.setChannelNamesFromEpg).mockRejectedValue(new Error('fail'));
+      vi.mocked(ChannelBatchUtils.setChannelNamesFromEpg).mockRejectedValue(
+        new Error('fail')
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Set Names from EPG'));
@@ -583,7 +649,9 @@ describe('ChannelBatchForm', () => {
 
       fireEvent.click(screen.getByText('Set Logos from EPG'));
 
-      expect(screen.getByTestId('dialog-title')).toHaveTextContent('Confirm Set Logos from EPG');
+      expect(screen.getByTestId('dialog-title')).toHaveTextContent(
+        'Confirm Set Logos from EPG'
+      );
     });
 
     it('calls setChannelLogosFromEpg on confirm', async () => {
@@ -594,13 +662,17 @@ describe('ChannelBatchForm', () => {
       fireEvent.click(screen.getByTestId('dialog-confirm'));
 
       await waitFor(() => {
-        expect(ChannelBatchUtils.setChannelLogosFromEpg).toHaveBeenCalledWith(CHANNEL_IDS);
+        expect(ChannelBatchUtils.setChannelLogosFromEpg).toHaveBeenCalledWith(
+          CHANNEL_IDS
+        );
       });
     });
 
     it('shows error notification when setChannelLogosFromEpg rejects', async () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.setChannelLogosFromEpg).mockRejectedValue(new Error('fail'));
+      vi.mocked(ChannelBatchUtils.setChannelLogosFromEpg).mockRejectedValue(
+        new Error('fail')
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Set Logos from EPG'));
@@ -634,7 +706,9 @@ describe('ChannelBatchForm', () => {
 
       fireEvent.click(screen.getByText('Set TVG-IDs from EPG'));
 
-      expect(screen.getByTestId('dialog-title')).toHaveTextContent('Confirm Set TVG-IDs from EPG');
+      expect(screen.getByTestId('dialog-title')).toHaveTextContent(
+        'Confirm Set TVG-IDs from EPG'
+      );
     });
 
     it('calls setChannelTvgIdsFromEpg on confirm', async () => {
@@ -645,13 +719,17 @@ describe('ChannelBatchForm', () => {
       fireEvent.click(screen.getByTestId('dialog-confirm'));
 
       await waitFor(() => {
-        expect(ChannelBatchUtils.setChannelTvgIdsFromEpg).toHaveBeenCalledWith(CHANNEL_IDS);
+        expect(ChannelBatchUtils.setChannelTvgIdsFromEpg).toHaveBeenCalledWith(
+          CHANNEL_IDS
+        );
       });
     });
 
     it('shows error notification when setChannelTvgIdsFromEpg rejects', async () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.setChannelTvgIdsFromEpg).mockRejectedValue(new Error('fail'));
+      vi.mocked(ChannelBatchUtils.setChannelTvgIdsFromEpg).mockRejectedValue(
+        new Error('fail')
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Set TVG-IDs from EPG'));
@@ -672,7 +750,9 @@ describe('ChannelBatchForm', () => {
       setupMocks();
       renderForm();
 
-      fireEvent.click(screen.getAllByTestId('icon-square-plus')[0].closest('button'));
+      fireEvent.click(
+        screen.getAllByTestId('icon-square-plus')[0].closest('button')
+      );
 
       expect(screen.getByTestId('channel-group-form')).toBeInTheDocument();
     });
@@ -681,20 +761,28 @@ describe('ChannelBatchForm', () => {
       setupMocks();
       renderForm();
 
-      fireEvent.click(screen.getAllByTestId('icon-square-plus')[0].closest('button'));
+      fireEvent.click(
+        screen.getAllByTestId('icon-square-plus')[0].closest('button')
+      );
       fireEvent.click(screen.getByText('Save Group'));
 
-      expect(screen.queryByTestId('channel-group-form')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('channel-group-form')
+      ).not.toBeInTheDocument();
     });
 
     it('closes channel group modal without updating selection when cancelled', () => {
       setupMocks();
       renderForm();
 
-      fireEvent.click(screen.getAllByTestId('icon-square-plus')[0].closest('button'));
+      fireEvent.click(
+        screen.getAllByTestId('icon-square-plus')[0].closest('button')
+      );
       fireEvent.click(screen.getByText('Cancel Group'));
 
-      expect(screen.queryByTestId('channel-group-form')).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('channel-group-form')
+      ).not.toBeInTheDocument();
     });
   });
 
@@ -745,7 +833,9 @@ describe('ChannelBatchForm', () => {
   describe('error resilience', () => {
     it('does not throw when requeryChannels rejects after submit', async () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
       vi.mocked(requeryChannels).mockRejectedValue(new Error('network'));
 
       renderForm();
@@ -758,7 +848,9 @@ describe('ChannelBatchForm', () => {
 
     it('does not throw when setChannelNamesFromEpg rejects and no channels', async () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.setChannelNamesFromEpg).mockRejectedValue(new Error('fail'));
+      vi.mocked(ChannelBatchUtils.setChannelNamesFromEpg).mockRejectedValue(
+        new Error('fail')
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Set Names from EPG'));
@@ -769,12 +861,14 @@ describe('ChannelBatchForm', () => {
     });
   });
 
-// ── Batch update confirmation message ──────────────────────────────────────
+  // ── Batch update confirmation message ──────────────────────────────────────
 
   describe('batch update confirmation message', () => {
     it('displays the channel count in the confirmation message', () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Submit'));
@@ -784,19 +878,29 @@ describe('ChannelBatchForm', () => {
 
     it('displays a single change line in the confirmation message', () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getStreamProfileChange).mockReturnValue('• Stream Profile: HD Profile');
+      vi.mocked(ChannelBatchUtils.getStreamProfileChange).mockReturnValue(
+        '• Stream Profile: HD Profile'
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Submit'));
 
-      expect(screen.getByTestId('dialog-message')).toHaveTextContent('• Stream Profile: HD Profile');
+      expect(screen.getByTestId('dialog-message')).toHaveTextContent(
+        '• Stream Profile: HD Profile'
+      );
     });
 
     it('displays multiple change lines when several fields are changed', () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
-      vi.mocked(ChannelBatchUtils.getStreamProfileChange).mockReturnValue('• Stream Profile: HD Profile');
-      vi.mocked(ChannelBatchUtils.getUserLevelChange).mockReturnValue('• User Level: Admin');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
+      vi.mocked(ChannelBatchUtils.getStreamProfileChange).mockReturnValue(
+        '• Stream Profile: HD Profile'
+      );
+      vi.mocked(ChannelBatchUtils.getUserLevelChange).mockReturnValue(
+        '• User Level: Admin'
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Submit'));
@@ -825,22 +929,30 @@ describe('ChannelBatchForm', () => {
 
     it('uses "Apply Changes" as the confirm button label', () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Submit'));
 
-      expect(screen.getByTestId('dialog-confirm')).toHaveTextContent('Apply Changes');
+      expect(screen.getByTestId('dialog-confirm')).toHaveTextContent(
+        'Apply Changes'
+      );
     });
 
     it('shows "Confirm Batch Update" as the dialog title', () => {
       setupMocks();
-      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue('• Channel Group: Sports');
+      vi.mocked(ChannelBatchUtils.getChannelGroupChange).mockReturnValue(
+        '• Channel Group: Sports'
+      );
 
       renderForm();
       fireEvent.click(screen.getByText('Submit'));
 
-      expect(screen.getByTestId('dialog-title')).toHaveTextContent('Confirm Batch Update');
+      expect(screen.getByTestId('dialog-title')).toHaveTextContent(
+        'Confirm Batch Update'
+      );
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/__tests__/ChannelGroup.test.jsx b/frontend/src/components/forms/__tests__/ChannelGroup.test.jsx
index ba16d70e..b159a681 100644
--- a/frontend/src/components/forms/__tests__/ChannelGroup.test.jsx
+++ b/frontend/src/components/forms/__tests__/ChannelGroup.test.jsx
@@ -155,7 +155,9 @@ describe('ChannelGroup', () => {
 
       renderForm();
 
-      expect(screen.getByTestId('modal-title')).toHaveTextContent('Channel Group');
+      expect(screen.getByTestId('modal-title')).toHaveTextContent(
+        'Channel Group'
+      );
     });
   });
 
@@ -227,7 +229,10 @@ describe('ChannelGroup', () => {
 
     it('resets the form after successful add', async () => {
       setupMocks();
-      vi.mocked(API.addChannelGroup).mockResolvedValue({ id: 99, name: 'NewGroup' });
+      vi.mocked(API.addChannelGroup).mockResolvedValue({
+        id: 99,
+        name: 'NewGroup',
+      });
 
       const form = makeFormMock('NewGroup');
       vi.mocked(useForm).mockReturnValue(form);
@@ -317,7 +322,10 @@ describe('ChannelGroup', () => {
 
       renderForm({ channelGroup: makeGroup() });
 
-      expect(screen.getByTestId('alert')).toHaveAttribute('data-color', 'yellow');
+      expect(screen.getByTestId('alert')).toHaveAttribute(
+        'data-color',
+        'yellow'
+      );
     });
 
     it('disables the name input for non-editable group', () => {
diff --git a/frontend/src/components/forms/__tests__/Connection.test.jsx b/frontend/src/components/forms/__tests__/Connection.test.jsx
index cae1b60f..0850b101 100644
--- a/frontend/src/components/forms/__tests__/Connection.test.jsx
+++ b/frontend/src/components/forms/__tests__/Connection.test.jsx
@@ -75,7 +75,9 @@ vi.mock('@mantine/core', () => ({
     opened ? (
       <div data-testid="modal">
         <div data-testid="modal-title">{title}</div>
-        <button data-testid="modal-close" onClick={onClose}>×</button>
+        <button data-testid="modal-close" onClick={onClose}>
+          ×
+        </button>
         {children}
       </div>
     ) : null,
@@ -106,11 +108,7 @@ vi.mock('@mantine/core', () => ({
     <div data-testid={`tabs-panel-${value}`}>{children}</div>
   ),
   TabsTab: ({ children, value, onClick }) => (
-    <button
-      data-testid={`tab-${value}`}
-      onClick={onClick}
-      role="tab"
-    >
+    <button data-testid={`tab-${value}`} onClick={onClick} role="tab">
       {children}
     </button>
   ),
@@ -134,7 +132,13 @@ vi.mock('@mantine/core', () => ({
         placeholder={placeholder}
         data-testid={`input-${label?.toLowerCase().replace(/\s+/g, '-')}`}
       />
-      {error && <span data-testid={`error-${label?.toLowerCase().replace(/\s+/g, '-')}`}>{error}</span>}
+      {error && (
+        <span
+          data-testid={`error-${label?.toLowerCase().replace(/\s+/g, '-')}`}
+        >
+          {error}
+        </span>
+      )}
     </div>
   ),
 }));
@@ -152,7 +156,11 @@ const makeConnection = (overrides = {}) => ({
   },
   subscriptions: [
     { event: 'channel_added', enabled: true, payload_template: null },
-    { event: 'recording_started', enabled: true, payload_template: '{"id": "{{id}}"}' },
+    {
+      event: 'recording_started',
+      enabled: true,
+      payload_template: '{"id": "{{id}}"}',
+    },
   ],
   ...overrides,
 });
@@ -212,12 +220,23 @@ const renderForm = (props = {}) => {
 describe('ConnectionForm', () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.mocked(ConnectionUtils.createConnectIntegration).mockResolvedValue({ id: 99 });
-    vi.mocked(ConnectionUtils.updateConnectIntegration).mockResolvedValue(undefined);
-    vi.mocked(ConnectionUtils.setConnectSubscriptions).mockResolvedValue(undefined);
-    vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({ url: 'https://x.com' });
+    vi.mocked(ConnectionUtils.createConnectIntegration).mockResolvedValue({
+      id: 99,
+    });
+    vi.mocked(ConnectionUtils.updateConnectIntegration).mockResolvedValue(
+      undefined
+    );
+    vi.mocked(ConnectionUtils.setConnectSubscriptions).mockResolvedValue(
+      undefined
+    );
+    vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({
+      url: 'https://x.com',
+    });
     vi.mocked(ConnectionUtils.buildSubscriptions).mockReturnValue([]);
-    vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: '' });
+    vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({
+      fieldErrors: {},
+      apiError: '',
+    });
   });
 
   // ── Visibility ─────────────────────────────────────────────────────────────
@@ -253,7 +272,11 @@ describe('ConnectionForm', () => {
     });
 
     it('calls createConnectIntegration on submit', async () => {
-      const form = makeFormMock({ name: 'New Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'New Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
 
       renderForm({ connection: null });
@@ -269,7 +292,11 @@ describe('ConnectionForm', () => {
     });
 
     it('does not call updateConnectIntegration when creating', async () => {
-      const form = makeFormMock({ name: 'New Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'New Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
 
       renderForm({ connection: null });
@@ -284,9 +311,15 @@ describe('ConnectionForm', () => {
 
     it('calls setConnectSubscriptions with newly created connection', async () => {
       const created = { id: 99, name: 'New Hook' };
-      vi.mocked(ConnectionUtils.createConnectIntegration).mockResolvedValue(created);
+      vi.mocked(ConnectionUtils.createConnectIntegration).mockResolvedValue(
+        created
+      );
 
-      const form = makeFormMock({ name: 'New Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'New Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
 
       renderForm({ connection: null });
@@ -301,7 +334,11 @@ describe('ConnectionForm', () => {
     });
 
     it('calls onClose after successful create', async () => {
-      const form = makeFormMock({ name: 'New Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'New Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
 
       const onClose = vi.fn();
@@ -357,7 +394,11 @@ describe('ConnectionForm', () => {
 
     it('does not call createConnectIntegration when editing', async () => {
       const connection = makeConnection();
-      const form = makeFormMock({ name: 'My Webhook', type: 'webhook', url: 'https://example.com/hook' });
+      const form = makeFormMock({
+        name: 'My Webhook',
+        type: 'webhook',
+        url: 'https://example.com/hook',
+      });
       vi.mocked(useForm).mockReturnValue(form);
 
       renderForm({ connection });
@@ -371,7 +412,11 @@ describe('ConnectionForm', () => {
 
     it('calls setConnectSubscriptions with existing connection on update', async () => {
       const connection = makeConnection();
-      const form = makeFormMock({ name: 'My Webhook', type: 'webhook', url: 'https://example.com/hook' });
+      const form = makeFormMock({
+        name: 'My Webhook',
+        type: 'webhook',
+        url: 'https://example.com/hook',
+      });
       vi.mocked(useForm).mockReturnValue(form);
 
       renderForm({ connection });
@@ -387,7 +432,11 @@ describe('ConnectionForm', () => {
 
     it('calls onClose after successful update', async () => {
       const connection = makeConnection();
-      const form = makeFormMock({ name: 'My Webhook', type: 'webhook', url: 'https://example.com/hook' });
+      const form = makeFormMock({
+        name: 'My Webhook',
+        type: 'webhook',
+        url: 'https://example.com/hook',
+      });
       vi.mocked(useForm).mockReturnValue(form);
 
       const onClose = vi.fn();
@@ -446,7 +495,9 @@ describe('ConnectionForm', () => {
         script_path: '/usr/local/bin/notify.sh',
       });
       vi.mocked(useForm).mockReturnValue(form);
-      vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({ path: '/usr/local/bin/notify.sh' });
+      vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({
+        path: '/usr/local/bin/notify.sh',
+      });
 
       renderForm({ connection: null });
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
@@ -485,7 +536,9 @@ describe('ConnectionForm', () => {
         url: 'https://example.com/webhook',
       });
       vi.mocked(useForm).mockReturnValue(form);
-      vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({ url: 'https://example.com/webhook' });
+      vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({
+        url: 'https://example.com/webhook',
+      });
 
       renderForm({ connection: null });
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
@@ -507,7 +560,9 @@ describe('ConnectionForm', () => {
       });
       vi.mocked(useForm).mockReturnValue(form);
       vi.mocked(ConnectionUtils.buildConfig).mockReturnValue({
-        url: 'https://example.com/hook', headers: { 'X-Token': 'abc123' } });
+        url: 'https://example.com/hook',
+        headers: { 'X-Token': 'abc123' },
+      });
 
       renderForm({ connection });
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
@@ -522,7 +577,9 @@ describe('ConnectionForm', () => {
     });
 
     it('omits headers from webhook config when all header rows are empty', async () => {
-      const connection = makeConnection({ config: { url: 'https://example.com/hook', headers: {} } });
+      const connection = makeConnection({
+        config: { url: 'https://example.com/hook', headers: {} },
+      });
       const form = makeFormMock({
         name: 'My Webhook',
         type: 'webhook',
@@ -547,15 +604,22 @@ describe('ConnectionForm', () => {
 
   describe('subscriptions', () => {
     it('passes subscription list with enabled flags to setConnectSubscriptions', async () => {
-      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
       vi.mocked(ConnectionUtils.buildSubscriptions).mockReturnValue([
         { event: 'channel_added', enabled: true, payload_template: null },
         { event: 'channel_removed', enabled: false, payload_template: null },
-        { event: 'recording_started', enabled: true, payload_template: '{"id": "{{id}}"}' },
+        {
+          event: 'recording_started',
+          enabled: true,
+          payload_template: '{"id": "{{id}}"}',
+        },
       ]);
 
-
       renderForm({ connection: null });
 
       // Toggle channel_added on
@@ -567,8 +631,14 @@ describe('ConnectionForm', () => {
           expect.any(Object),
           expect.arrayContaining([
             expect.objectContaining({ event: 'channel_added', enabled: true }),
-            expect.objectContaining({ event: 'channel_removed', enabled: false }),
-            expect.objectContaining({ event: 'recording_started', enabled: true }),
+            expect.objectContaining({
+              event: 'channel_removed',
+              enabled: false,
+            }),
+            expect.objectContaining({
+              event: 'recording_started',
+              enabled: true,
+            }),
           ])
         );
       });
@@ -576,12 +646,20 @@ describe('ConnectionForm', () => {
 
     it('toggles event off when checkbox is clicked twice', async () => {
       const connection = makeConnection();
-      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
       vi.mocked(ConnectionUtils.buildSubscriptions).mockReturnValue([
         { event: 'channel_added', enabled: false, payload_template: null },
         { event: 'channel_removed', enabled: false, payload_template: null },
-        { event: 'recording_started', enabled: true, payload_template: '{"id": "{{id}}"}' },
+        {
+          event: 'recording_started',
+          enabled: true,
+          payload_template: '{"id": "{{id}}"}',
+        },
       ]);
 
       renderForm({ connection });
@@ -595,8 +673,14 @@ describe('ConnectionForm', () => {
           expect.any(Object),
           expect.arrayContaining([
             expect.objectContaining({ event: 'channel_added', enabled: false }),
-            expect.objectContaining({ event: 'channel_removed', enabled: false }),
-            expect.objectContaining({ event: 'recording_started', enabled: true }),
+            expect.objectContaining({
+              event: 'channel_removed',
+              enabled: false,
+            }),
+            expect.objectContaining({
+              event: 'recording_started',
+              enabled: true,
+            }),
           ])
         );
       });
@@ -604,17 +688,26 @@ describe('ConnectionForm', () => {
 
     it('includes payload_template in subscription when set', async () => {
       const connection = makeConnection();
-      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
       vi.mocked(ConnectionUtils.buildSubscriptions).mockReturnValue([
-        { event: 'recording_started', enabled: true, payload_template: '{"id": "{{id}}"}' },
+        {
+          event: 'recording_started',
+          enabled: true,
+          payload_template: '{"id": "{{id}}"}',
+        },
       ]);
 
       renderForm({ connection });
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
 
       await waitFor(() => {
-        const subs = vi.mocked(ConnectionUtils.setConnectSubscriptions).mock.calls[0][1];
+        const subs = vi.mocked(ConnectionUtils.setConnectSubscriptions).mock
+          .calls[0][1];
         const recordingSub = subs.find((s) => s.event === 'recording_started');
         expect(recordingSub).toBeDefined();
         expect(recordingSub.payload_template).toBe('{"id": "{{id}}"}');
@@ -622,14 +715,19 @@ describe('ConnectionForm', () => {
     });
 
     it('sends null payload_template when not set for an event', async () => {
-      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
 
       renderForm({ connection: null });
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
 
       await waitFor(() => {
-        const subs = vi.mocked(ConnectionUtils.setConnectSubscriptions).mock.calls[0][1];
+        const subs = vi.mocked(ConnectionUtils.setConnectSubscriptions).mock
+          .calls[0][1];
         subs.forEach((s) => expect(s.payload_template).toBeNull());
       });
     });
@@ -642,9 +740,16 @@ describe('ConnectionForm', () => {
       vi.mocked(ConnectionUtils.createConnectIntegration).mockRejectedValue(
         new Error('Server error')
       );
-      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
-      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'Server error' });
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({
+        fieldErrors: {},
+        apiError: 'Server error',
+      });
 
       renderForm({ connection: null });
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
@@ -659,9 +764,16 @@ describe('ConnectionForm', () => {
         new Error('Update failed')
       );
       const connection = makeConnection();
-      const form = makeFormMock({ name: 'My Webhook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'My Webhook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
-      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'Update failed' });
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({
+        fieldErrors: {},
+        apiError: 'Update failed',
+      });
 
       renderForm({ connection });
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
@@ -675,9 +787,16 @@ describe('ConnectionForm', () => {
       vi.mocked(ConnectionUtils.createConnectIntegration).mockRejectedValue(
         new Error('fail')
       );
-      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
-      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'fail' });
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({
+        fieldErrors: {},
+        apiError: 'fail',
+      });
 
       const onClose = vi.fn();
       renderForm({ connection: null, onClose });
@@ -694,19 +813,30 @@ describe('ConnectionForm', () => {
         .mockRejectedValueOnce(new Error('First error'))
         .mockResolvedValueOnce({ id: 99 });
 
-      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
-      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'First error' });
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({
+        fieldErrors: {},
+        apiError: 'First error',
+      });
 
       renderForm({ connection: null });
 
       // First submit — fails
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
-      await waitFor(() => expect(screen.queryByText('First error')).toBeInTheDocument());
+      await waitFor(() =>
+        expect(screen.queryByText('First error')).toBeInTheDocument()
+      );
 
       // Second submit — succeeds
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
-      await waitFor(() => expect(screen.queryByText('First error')).not.toBeInTheDocument());
+      await waitFor(() =>
+        expect(screen.queryByText('First error')).not.toBeInTheDocument()
+      );
     });
   });
 
@@ -727,18 +857,29 @@ describe('ConnectionForm', () => {
       vi.mocked(ConnectionUtils.createConnectIntegration).mockRejectedValue(
         new Error('fail')
       );
-      const form = makeFormMock({ name: 'Hook', type: 'webhook', url: 'https://x.com' });
+      const form = makeFormMock({
+        name: 'Hook',
+        type: 'webhook',
+        url: 'https://x.com',
+      });
       vi.mocked(useForm).mockReturnValue(form);
-      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({ fieldErrors: {}, apiError: 'fail' });
+      vi.mocked(ConnectionUtils.parseApiError).mockReturnValue({
+        fieldErrors: {},
+        apiError: 'fail',
+      });
 
       renderForm({ connection: null });
       fireEvent.submit(screen.getByTestId('modal').querySelector('form'));
 
-      await waitFor(() => expect(screen.queryByText('fail')).toBeInTheDocument());
+      await waitFor(() =>
+        expect(screen.queryByText('fail')).toBeInTheDocument()
+      );
 
       fireEvent.click(screen.getByTestId('modal-close'));
 
-      await waitFor(() => expect(screen.queryByText('fail')).not.toBeInTheDocument());
+      await waitFor(() =>
+        expect(screen.queryByText('fail')).not.toBeInTheDocument()
+      );
     });
   });
 
diff --git a/frontend/src/components/forms/__tests__/CronBuilder.test.jsx b/frontend/src/components/forms/__tests__/CronBuilder.test.jsx
index 26584384..66ec77ac 100644
--- a/frontend/src/components/forms/__tests__/CronBuilder.test.jsx
+++ b/frontend/src/components/forms/__tests__/CronBuilder.test.jsx
@@ -7,27 +7,35 @@ vi.mock('../../../utils/forms/CronBuilderUtils.js', () => ({
   buildCron: vi.fn(),
   parseCronPreset: vi.fn(),
   CRON_FIELDS: [
-    { index: 0, label: 'Minute (0-59)',              placeholder: '*, 0, */15' },
-    { index: 1, label: 'Hour (0-23)',                placeholder: '*, 0, 9-17' },
-    { index: 2, label: 'Day of Month (1-31)',        placeholder: '*, 1, 1-15' },
-    { index: 3, label: 'Month (1-12)',               placeholder: '*, 1, 1-6'  },
-    { index: 4, label: 'Day of Week (0-6, Sun-Sat)', placeholder: '*, 0, 1-5'  },
+    { index: 0, label: 'Minute (0-59)', placeholder: '*, 0, */15' },
+    { index: 1, label: 'Hour (0-23)', placeholder: '*, 0, 9-17' },
+    { index: 2, label: 'Day of Month (1-31)', placeholder: '*, 1, 1-15' },
+    { index: 3, label: 'Month (1-12)', placeholder: '*, 1, 1-6' },
+    { index: 4, label: 'Day of Week (0-6, Sun-Sat)', placeholder: '*, 0, 1-5' },
   ],
   DAYS_OF_WEEK: [
-    { value: '*',  label: 'Every day'  },
-    { value: '1',  label: 'Monday'     },
-    { value: '2',  label: 'Tuesday'    },
+    { value: '*', label: 'Every day' },
+    { value: '1', label: 'Monday' },
+    { value: '2', label: 'Tuesday' },
   ],
   FREQUENCY_OPTIONS: [
-    { value: 'hourly',  label: 'Hourly'  },
-    { value: 'daily',   label: 'Daily'   },
-    { value: 'weekly',  label: 'Weekly'  },
+    { value: 'hourly', label: 'Hourly' },
+    { value: 'daily', label: 'Daily' },
+    { value: 'weekly', label: 'Weekly' },
     { value: 'monthly', label: 'Monthly' },
   ],
   PRESETS: [
-    { label: 'Every Hour',    description: 'Runs every hour',          value: '0 * * * *'   },
-    { label: 'Every Day 3am', description: 'Runs every day at 3 AM',   value: '0 3 * * *'   },
-    { label: 'Every Sunday',  description: 'Runs every Sunday at 3AM', value: '0 3 * * 0'   },
+    { label: 'Every Hour', description: 'Runs every hour', value: '0 * * * *' },
+    {
+      label: 'Every Day 3am',
+      description: 'Runs every day at 3 AM',
+      value: '0 3 * * *',
+    },
+    {
+      label: 'Every Sunday',
+      description: 'Runs every Sunday at 3AM',
+      value: '0 3 * * 0',
+    },
   ],
   updateCronPart: vi.fn(),
 }));
@@ -35,7 +43,12 @@ vi.mock('../../../utils/forms/CronBuilderUtils.js', () => ({
 // ── Mantine core ───────────────────────────────────────────────────────────────
 vi.mock('@mantine/core', async () => ({
   Badge: ({ children, size, variant, color }) => (
-    <span data-testid="badge" data-size={size} data-variant={variant} data-color={color}>
+    <span
+      data-testid="badge"
+      data-size={size}
+      data-variant={variant}
+      data-color={color}
+    >
       {children}
     </span>
   ),
@@ -51,7 +64,9 @@ vi.mock('@mantine/core', async () => ({
     opened ? (
       <div data-testid="modal">
         <div data-testid="modal-title">{title}</div>
-        <button data-testid="modal-close" onClick={onClose}>×</button>
+        <button data-testid="modal-close" onClick={onClose}>
+          ×
+        </button>
         {children}
       </div>
     ) : null,
@@ -122,7 +137,7 @@ vi.mock('@mantine/core', async () => ({
 // ── lucide-react ───────────────────────────────────────────────────────────────
 vi.mock('lucide-react', () => ({
   Calendar: () => <svg data-testid="icon-calendar" />,
-  Clock:    () => <svg data-testid="icon-clock"    />,
+  Clock: () => <svg data-testid="icon-clock" />,
 }));
 
 // ── Imports after mocks ────────────────────────────────────────────────────────
@@ -241,7 +256,9 @@ describe('CronBuilder', () => {
     it('calls parseCronPreset with the preset value on click', () => {
       renderBuilder();
       fireEvent.click(screen.getByText('Every Hour'));
-      expect(CronBuilderUtils.parseCronPreset).toHaveBeenCalledWith('0 * * * *');
+      expect(CronBuilderUtils.parseCronPreset).toHaveBeenCalledWith(
+        '0 * * * *'
+      );
     });
 
     it('updates state from parseCronPreset result on preset click', () => {
@@ -256,7 +273,11 @@ describe('CronBuilder', () => {
       fireEvent.click(screen.getByText('Every Hour'));
       // buildCron should be called with the updated frequency
       expect(CronBuilderUtils.buildCron).toHaveBeenCalledWith(
-        'hourly', 0, 0, '*', 1
+        'hourly',
+        0,
+        0,
+        '*',
+        1
       );
     });
   });
@@ -268,56 +289,81 @@ describe('CronBuilder', () => {
 
     it('renders the Frequency select', () => {
       renderBuilder();
-      expect(within(getSimplePanel()).getByLabelText('Frequency')).toBeInTheDocument();
+      expect(
+        within(getSimplePanel()).getByLabelText('Frequency')
+      ).toBeInTheDocument();
     });
 
     it('renders the Minute input', () => {
       renderBuilder();
-      expect(within(getSimplePanel()).getByLabelText('Minute (0-59)')).toBeInTheDocument();
+      expect(
+        within(getSimplePanel()).getByLabelText('Minute (0-59)')
+      ).toBeInTheDocument();
     });
 
     it('renders the Hour input when frequency is not hourly', () => {
       renderBuilder();
-      expect(within(getSimplePanel()).getByLabelText('Hour (0-23)')).toBeInTheDocument();
+      expect(
+        within(getSimplePanel()).getByLabelText('Hour (0-23)')
+      ).toBeInTheDocument();
     });
 
     it('does not render Hour input when frequency is hourly', () => {
       renderBuilder();
       const freqSelect = within(getSimplePanel()).getByLabelText('Frequency');
       fireEvent.change(freqSelect, { target: { value: 'hourly' } });
-      expect(within(getSimplePanel()).queryByLabelText('Hour (0-23)')).not.toBeInTheDocument();
+      expect(
+        within(getSimplePanel()).queryByLabelText('Hour (0-23)')
+      ).not.toBeInTheDocument();
     });
 
     it('renders Day of Week select when frequency is weekly', () => {
       renderBuilder();
       const freqSelect = within(getSimplePanel()).getByLabelText('Frequency');
       fireEvent.change(freqSelect, { target: { value: 'weekly' } });
-      expect(within(getSimplePanel()).getByLabelText('Day of Week')).toBeInTheDocument();
+      expect(
+        within(getSimplePanel()).getByLabelText('Day of Week')
+      ).toBeInTheDocument();
     });
 
     it('does not render Day of Week for daily frequency', () => {
       renderBuilder();
-      expect(within(getSimplePanel()).queryByLabelText('Day of Week')).not.toBeInTheDocument();
+      expect(
+        within(getSimplePanel()).queryByLabelText('Day of Week')
+      ).not.toBeInTheDocument();
     });
 
     it('renders Day of Month input when frequency is monthly', () => {
       renderBuilder();
       const freqSelect = within(getSimplePanel()).getByLabelText('Frequency');
       fireEvent.change(freqSelect, { target: { value: 'monthly' } });
-      expect(within(getSimplePanel()).getByLabelText('Day of Month (1-31)')).toBeInTheDocument();
+      expect(
+        within(getSimplePanel()).getByLabelText('Day of Month (1-31)')
+      ).toBeInTheDocument();
     });
 
     it('does not render Day of Month for daily frequency', () => {
       renderBuilder();
-      expect(within(getSimplePanel()).queryByLabelText('Day of Month (1-31)')).not.toBeInTheDocument();
+      expect(
+        within(getSimplePanel()).queryByLabelText('Day of Month (1-31)')
+      ).not.toBeInTheDocument();
     });
 
     it('calls buildCron when minute changes', () => {
       renderBuilder();
-      fireEvent.change(within(getSimplePanel()).getByLabelText('Minute (0-59)'), {
-        target: { value: 30 },
-      });
-      expect(CronBuilderUtils.buildCron).toHaveBeenCalledWith('daily', 30, 3, '*', 1);
+      fireEvent.change(
+        within(getSimplePanel()).getByLabelText('Minute (0-59)'),
+        {
+          target: { value: 30 },
+        }
+      );
+      expect(CronBuilderUtils.buildCron).toHaveBeenCalledWith(
+        'daily',
+        30,
+        3,
+        '*',
+        1
+      );
     });
 
     it('calls buildCron when hour changes', () => {
@@ -325,7 +371,13 @@ describe('CronBuilder', () => {
       fireEvent.change(within(getSimplePanel()).getByLabelText('Hour (0-23)'), {
         target: { value: 8 },
       });
-      expect(CronBuilderUtils.buildCron).toHaveBeenCalledWith('daily', 0, 8, '*', 1);
+      expect(CronBuilderUtils.buildCron).toHaveBeenCalledWith(
+        'daily',
+        0,
+        8,
+        '*',
+        1
+      );
     });
   });
 
@@ -336,31 +388,47 @@ describe('CronBuilder', () => {
 
     it('renders all 5 cron field inputs', () => {
       renderBuilder();
-      expect(within(getAdvancedPanel()).getByLabelText('Minute (0-59)')).toBeInTheDocument();
-      expect(within(getAdvancedPanel()).getByLabelText('Hour (0-23)')).toBeInTheDocument();
-      expect(within(getAdvancedPanel()).getByLabelText('Day of Month (1-31)')).toBeInTheDocument();
-      expect(within(getAdvancedPanel()).getByLabelText('Month (1-12)')).toBeInTheDocument();
-      expect(within(getAdvancedPanel()).getByLabelText('Day of Week (0-6, Sun-Sat)')).toBeInTheDocument();
+      expect(
+        within(getAdvancedPanel()).getByLabelText('Minute (0-59)')
+      ).toBeInTheDocument();
+      expect(
+        within(getAdvancedPanel()).getByLabelText('Hour (0-23)')
+      ).toBeInTheDocument();
+      expect(
+        within(getAdvancedPanel()).getByLabelText('Day of Month (1-31)')
+      ).toBeInTheDocument();
+      expect(
+        within(getAdvancedPanel()).getByLabelText('Month (1-12)')
+      ).toBeInTheDocument();
+      expect(
+        within(getAdvancedPanel()).getByLabelText('Day of Week (0-6, Sun-Sat)')
+      ).toBeInTheDocument();
     });
 
     it('renders descriptive helper text', () => {
       renderBuilder();
-      expect(screen.getByText(/Build advanced cron expressions/)).toBeInTheDocument();
+      expect(
+        screen.getByText(/Build advanced cron expressions/)
+      ).toBeInTheDocument();
     });
 
     it('calls updateCronPart when an advanced field changes', () => {
       renderBuilder();
-      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      const minuteInput =
+        within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
       fireEvent.change(minuteInput, { target: { value: '30' } });
       expect(CronBuilderUtils.updateCronPart).toHaveBeenCalledWith(
-        '* * * * *', 0, '30'
+        '* * * * *',
+        0,
+        '30'
       );
     });
 
     it('initializes advanced fields from currentValue when opened', () => {
       renderBuilder({ currentValue: '5 4 * * 1' });
       // The minute field (index 0) should display '5'
-      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      const minuteInput =
+        within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
       expect(minuteInput).toHaveValue('5');
     });
   });
@@ -416,7 +484,8 @@ describe('CronBuilder', () => {
       // Switch to advanced mode by simulating tab onChange
       // The Tabs mock renders but doesn't fire onChange on tab clicks,
       // so we directly test that advanced panel input changes manualCron
-      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      const minuteInput =
+        within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
       // The advanced panel's minute input value should be '5'
       expect(minuteInput).toHaveValue('5');
     });
@@ -429,13 +498,15 @@ describe('CronBuilder', () => {
 
     it('sets manualCron to currentValue when opened', () => {
       renderBuilder({ currentValue: '*/15 * * * *' });
-      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      const minuteInput =
+        within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
       expect(minuteInput).toHaveValue('*/15');
     });
 
     it('keeps default manualCron when currentValue is empty', () => {
       renderBuilder({ currentValue: '' });
-      const minuteInput = within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
+      const minuteInput =
+        within(getAdvancedPanel()).getByLabelText('Minute (0-59)');
       expect(minuteInput).toHaveValue('*');
     });
 
@@ -444,4 +515,4 @@ describe('CronBuilder', () => {
       expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/__tests__/DummyEPG.test.jsx b/frontend/src/components/forms/__tests__/DummyEPG.test.jsx
index d7a55446..edd2ac1b 100644
--- a/frontend/src/components/forms/__tests__/DummyEPG.test.jsx
+++ b/frontend/src/components/forms/__tests__/DummyEPG.test.jsx
@@ -27,58 +27,58 @@ vi.mock('../../../utils/forms/DummyEpgUtils.js', () => ({
     const fill = (tpl) =>
       tpl
         ? Object.entries(allGroups).reduce(
-          (s, [k, v]) => s.replaceAll(`{${k}}`, v),
-          tpl
-        )
+            (s, [k, v]) => s.replaceAll(`{${k}}`, v),
+            tpl
+          )
         : '';
     return {
-      formattedTitle:                fill(templates.titleTemplate),
-      formattedSubtitle:             fill(templates.subtitleTemplate),
-      formattedDescription:          fill(templates.descriptionTemplate),
-      formattedUpcomingTitle:        fill(templates.upcomingTitleTemplate),
-      formattedUpcomingDescription:  fill(templates.upcomingDescriptionTemplate),
-      formattedEndedTitle:           fill(templates.endedTitleTemplate),
-      formattedEndedDescription:     fill(templates.endedDescriptionTemplate),
-      formattedChannelLogoUrl:       fill(templates.channelLogoUrl),
-      formattedProgramPosterUrl:     fill(templates.programPosterUrl),
+      formattedTitle: fill(templates.titleTemplate),
+      formattedSubtitle: fill(templates.subtitleTemplate),
+      formattedDescription: fill(templates.descriptionTemplate),
+      formattedUpcomingTitle: fill(templates.upcomingTitleTemplate),
+      formattedUpcomingDescription: fill(templates.upcomingDescriptionTemplate),
+      formattedEndedTitle: fill(templates.endedTitleTemplate),
+      formattedEndedDescription: fill(templates.endedDescriptionTemplate),
+      formattedChannelLogoUrl: fill(templates.channelLogoUrl),
+      formattedProgramPosterUrl: fill(templates.programPosterUrl),
     };
   }),
   buildCustomProperties: vi.fn((custom = {}) => ({
-    title_pattern:                custom.title_pattern                || '',
-    time_pattern:                 custom.time_pattern                 || '',
-    date_pattern:                 custom.date_pattern                 || '',
-    timezone:                     custom.timezone                     || 'US/Eastern',
-    output_timezone:              custom.output_timezone              || '',
-    program_duration:             custom.program_duration             || 180,
-    sample_title:                 custom.sample_title                 || '',
-    title_template:               custom.title_template               || '',
-    subtitle_template:            custom.subtitle_template            || '',
-    description_template:         custom.description_template         || '',
-    upcoming_title_template:      custom.upcoming_title_template      || '',
-    upcoming_description_template:custom.upcoming_description_template|| '',
-    ended_title_template:         custom.ended_title_template         || '',
-    ended_description_template:   custom.ended_description_template   || '',
-    fallback_title_template:      custom.fallback_title_template      || '',
-    fallback_description_template:custom.fallback_description_template|| '',
-    channel_logo_url:             custom.channel_logo_url             || '',
-    program_poster_url:           custom.program_poster_url           || '',
-    name_source:                  custom.name_source                  || 'channel',
-    stream_index:                 custom.stream_index                 || 1,
-    category:                     custom.category                     || '',
-    include_date:                 custom.include_date                 ?? true,
-    include_live:                 custom.include_live                 ?? false,
-    include_new:                  custom.include_new                  ?? false,
+    title_pattern: custom.title_pattern || '',
+    time_pattern: custom.time_pattern || '',
+    date_pattern: custom.date_pattern || '',
+    timezone: custom.timezone || 'US/Eastern',
+    output_timezone: custom.output_timezone || '',
+    program_duration: custom.program_duration || 180,
+    sample_title: custom.sample_title || '',
+    title_template: custom.title_template || '',
+    subtitle_template: custom.subtitle_template || '',
+    description_template: custom.description_template || '',
+    upcoming_title_template: custom.upcoming_title_template || '',
+    upcoming_description_template: custom.upcoming_description_template || '',
+    ended_title_template: custom.ended_title_template || '',
+    ended_description_template: custom.ended_description_template || '',
+    fallback_title_template: custom.fallback_title_template || '',
+    fallback_description_template: custom.fallback_description_template || '',
+    channel_logo_url: custom.channel_logo_url || '',
+    program_poster_url: custom.program_poster_url || '',
+    name_source: custom.name_source || 'channel',
+    stream_index: custom.stream_index || 1,
+    category: custom.category || '',
+    include_date: custom.include_date ?? true,
+    include_live: custom.include_live ?? false,
+    include_new: custom.include_new ?? false,
   })),
   buildTimePlaceholders: vi.fn((timeGroups) => {
     if (!timeGroups || !timeGroups.hour) return {};
-    const hour   = parseInt(timeGroups.hour,   10);
+    const hour = parseInt(timeGroups.hour, 10);
     const minute = String(timeGroups.minute ?? '00').padStart(2, '0');
-    const ampm   = timeGroups.ampm ? ` ${timeGroups.ampm}` : '';
+    const ampm = timeGroups.ampm ? ` ${timeGroups.ampm}` : '';
     return {
-      starttime:   `${hour}:${minute}${ampm}`,
+      starttime: `${hour}:${minute}${ampm}`,
       starttime24: `${String(hour).padStart(2, '0')}:${minute}`,
-      endtime:     `${(hour + 3) % 24}:${minute}${ampm}`,
-      endtime24:   `${String((hour + 3) % 24).padStart(2, '0')}:${minute}`,
+      endtime: `${(hour + 3) % 24}:${minute}${ampm}`,
+      endtime24: `${String((hour + 3) % 24).padStart(2, '0')}:${minute}`,
     };
   }),
   getDummyEpgFormInitialValues: vi.fn(() => ({
@@ -86,30 +86,30 @@ vi.mock('../../../utils/forms/DummyEpgUtils.js', () => ({
     is_active: true,
     source_type: 'dummy',
     custom_properties: {
-      title_pattern:                '',
-      time_pattern:                 '',
-      date_pattern:                 '',
-      timezone:                     'US/Eastern',
-      output_timezone:              '',
-      program_duration:             180,
-      sample_title:                 '',
-      title_template:               '',
-      subtitle_template:            '',
-      description_template:         '',
-      upcoming_title_template:      '',
-      upcoming_description_template:'',
-      ended_title_template:         '',
-      ended_description_template:   '',
-      fallback_title_template:      '',
-      fallback_description_template:'',
-      channel_logo_url:             '',
-      program_poster_url:           '',
-      name_source:                  'channel',
-      stream_index:                 1,
-      category:                     '',
-      include_date:                 true,
-      include_live:                 false,
-      include_new:                  false,
+      title_pattern: '',
+      time_pattern: '',
+      date_pattern: '',
+      timezone: 'US/Eastern',
+      output_timezone: '',
+      program_duration: 180,
+      sample_title: '',
+      title_template: '',
+      subtitle_template: '',
+      description_template: '',
+      upcoming_title_template: '',
+      upcoming_description_template: '',
+      ended_title_template: '',
+      ended_description_template: '',
+      fallback_title_template: '',
+      fallback_description_template: '',
+      channel_logo_url: '',
+      program_poster_url: '',
+      name_source: 'channel',
+      stream_index: 1,
+      category: '',
+      include_date: true,
+      include_live: false,
+      include_new: false,
     },
   })),
   getTimezones: vi.fn().mockResolvedValue({
@@ -118,19 +118,23 @@ vi.mock('../../../utils/forms/DummyEpgUtils.js', () => ({
   matchPattern: vi.fn((pattern, sample, errorLabel = 'Pattern error') => {
     if (!pattern) return { matched: false, groups: {}, error: null };
     try {
-      const regex  = new RegExp(pattern, 'u');
+      const regex = new RegExp(pattern, 'u');
       const result = regex.exec(sample ?? '');
       if (!result) return { matched: false, groups: {}, error: null };
       const groups = result.groups ?? {};
       return { matched: true, groups, error: null };
     } catch {
-      return { matched: false, groups: {}, error: `${errorLabel}: invalid regex` };
+      return {
+        matched: false,
+        groups: {},
+        error: `${errorLabel}: invalid regex`,
+      };
     }
   }),
   updateEPG: vi.fn(),
-  validateCustomNameSource:    vi.fn(() => null),
-  validateCustomStreamIndex:   vi.fn(() => null),
-  validateCustomTitlePattern:  vi.fn(() => null),
+  validateCustomNameSource: vi.fn(() => null),
+  validateCustomStreamIndex: vi.fn(() => null),
+  validateCustomTitlePattern: vi.fn(() => null),
 }));
 
 // ── Mantine notifications ──────────────────────────────────────────────────────
@@ -141,13 +145,25 @@ vi.mock('@mantine/notifications', () => ({
 // ── Mantine core ───────────────────────────────────────────────────────────────
 vi.mock('@mantine/core', async () => ({
   Accordion: ({ children }) => <div data-testid="accordion">{children}</div>,
-  AccordionControl: ({ children }) => <button data-testid="accordion-control">{children}</button>,
-  AccordionItem: ({ children, value }) => <div data-testid={`accordion-item-${value}`}>{children}</div>,
-  AccordionPanel: ({ children }) => <div data-testid="accordion-panel">{children}</div>,
-  ActionIcon: ({ children, onClick }) => (
-    <button data-testid="action-icon" onClick={onClick}>{children}</button>
+  AccordionControl: ({ children }) => (
+    <button data-testid="accordion-control">{children}</button>
+  ),
+  AccordionItem: ({ children, value }) => (
+    <div data-testid={`accordion-item-${value}`}>{children}</div>
+  ),
+  AccordionPanel: ({ children }) => (
+    <div data-testid="accordion-panel">{children}</div>
+  ),
+  ActionIcon: ({ children, onClick }) => (
+    <button data-testid="action-icon" onClick={onClick}>
+      {children}
+    </button>
+  ),
+  Box: ({ children, mt, style }) => (
+    <div style={style} data-mt={mt}>
+      {children}
+    </div>
   ),
-  Box: ({ children, mt, style }) => <div style={style} data-mt={mt}>{children}</div>,
   Button: ({ children, onClick, disabled, loading, type, color, variant }) => (
     <button
       onClick={onClick}
@@ -177,7 +193,9 @@ vi.mock('@mantine/core', async () => ({
     opened ? (
       <div data-testid="modal">
         <div data-testid="modal-title">{title}</div>
-        <button data-testid="modal-close" onClick={onClose}>×</button>
+        <button data-testid="modal-close" onClick={onClose}>
+          ×
+        </button>
         {children}
       </div>
     ) : null,
@@ -196,7 +214,9 @@ vi.mock('@mantine/core', async () => ({
   ),
   Paper: ({ children }) => <div data-testid="paper">{children}</div>,
   Popover: ({ children }) => <div>{children}</div>,
-  PopoverDropdown: ({ children }) => <div data-testid="popover-dropdown">{children}</div>,
+  PopoverDropdown: ({ children }) => (
+    <div data-testid="popover-dropdown">{children}</div>
+  ),
   PopoverTarget: ({ children }) => <div>{children}</div>,
   Select: ({ label, value, onChange, data, placeholder }) => (
     <label>
@@ -210,14 +230,20 @@ vi.mock('@mantine/core', async () => ({
         {(data || []).map((opt) => {
           const val = typeof opt === 'string' ? opt : opt.value;
           const lab = typeof opt === 'string' ? opt : opt.label;
-          return <option key={val} value={val}>{lab}</option>;
+          return (
+            <option key={val} value={val}>
+              {lab}
+            </option>
+          );
         })}
       </select>
     </label>
   ),
   Stack: ({ children }) => <div>{children}</div>,
   Text: ({ children, size, c, fw, style }) => (
-    <span data-size={size} data-color={c} data-fw={fw} style={style}>{children}</span>
+    <span data-size={size} data-color={c} data-fw={fw} style={style}>
+      {children}
+    </span>
   ),
   Textarea: ({ label, value, onChange, placeholder }) => (
     <label>
@@ -324,7 +350,10 @@ const defaultProps = (overrides = {}) => ({
 describe('DummyEPGForm', () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.mocked(DummyEpgUtils.addEPG).mockResolvedValue({ id: 2, name: 'New EPG' });
+    vi.mocked(DummyEpgUtils.addEPG).mockResolvedValue({
+      id: 2,
+      name: 'New EPG',
+    });
     vi.mocked(DummyEpgUtils.updateEPG).mockResolvedValue({});
     vi.mocked(DummyEpgUtils.getTimezones).mockResolvedValue({
       timezones: ['US/Eastern', 'US/Pacific', 'UTC'],
@@ -347,12 +376,16 @@ describe('DummyEPGForm', () => {
 
     it('shows "Add Dummy EPG" title when no epg prop', () => {
       render(<DummyEPGForm {...defaultProps()} />);
-      expect(screen.getByTestId('modal-title')).toHaveTextContent('Create Dummy EPG');
+      expect(screen.getByTestId('modal-title')).toHaveTextContent(
+        'Create Dummy EPG'
+      );
     });
 
     it('shows "Edit Dummy EPG" title when epg prop is provided', () => {
       render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
-      expect(screen.getByTestId('modal-title')).toHaveTextContent('Edit Dummy EPG');
+      expect(screen.getByTestId('modal-title')).toHaveTextContent(
+        'Edit Dummy EPG'
+      );
     });
 
     it('pre-fills form name when editing an existing EPG', () => {
@@ -395,12 +428,16 @@ describe('DummyEPGForm', () => {
     it('renders timezone options after loading', async () => {
       render(<DummyEPGForm {...defaultProps()} />);
       await waitFor(() => {
-        expect(screen.getAllByRole('option', { name: 'US/Eastern' }).length).toBeGreaterThan(0);
+        expect(
+          screen.getAllByRole('option', { name: 'US/Eastern' }).length
+        ).toBeGreaterThan(0);
       });
     });
 
     it('shows fallback timezones and warning notification when getTimezones rejects', async () => {
-      vi.mocked(DummyEpgUtils.getTimezones).mockRejectedValueOnce(new Error('Network error'));
+      vi.mocked(DummyEpgUtils.getTimezones).mockRejectedValueOnce(
+        new Error('Network error')
+      );
       render(<DummyEPGForm {...defaultProps()} />);
       await waitFor(() => {
         expect(showNotification).toHaveBeenCalledWith(
@@ -409,7 +446,9 @@ describe('DummyEPGForm', () => {
       });
       // Fallback options should still be rendered
       await waitFor(() => {
-        expect(screen.getAllByRole('option', { name: 'UTC' }).length).toBeGreaterThan(0);
+        expect(
+          screen.getAllByRole('option', { name: 'UTC' }).length
+        ).toBeGreaterThan(0);
       });
     });
   });
@@ -420,13 +459,17 @@ describe('DummyEPGForm', () => {
     it('shows the import select when dummyEpgs are available', () => {
       setupMocks({ dummyEpgs: [makeTemplate()] });
       render(<DummyEPGForm {...defaultProps()} />);
-      expect(screen.getByPlaceholderText(/Select a template/i)).toBeInTheDocument();
+      expect(
+        screen.getByPlaceholderText(/Select a template/i)
+      ).toBeInTheDocument();
     });
 
     it('does not show import select when dummyEpgs is empty', () => {
       setupMocks({ dummyEpgs: [] });
       render(<DummyEPGForm {...defaultProps()} />);
-      expect(screen.queryByPlaceholderText(/Select a template/i)).not.toBeInTheDocument();
+      expect(
+        screen.queryByPlaceholderText(/Select a template/i)
+      ).not.toBeInTheDocument();
     });
 
     it('calls buildCustomProperties and applyCustomState on template import', async () => {
@@ -465,7 +508,9 @@ describe('DummyEPGForm', () => {
       fireEvent.change(select, { target: { value: '99' } });
 
       await waitFor(() => {
-        expect(screen.getByDisplayValue('My Template (Copy)')).toBeInTheDocument();
+        expect(
+          screen.getByDisplayValue('My Template (Copy)')
+        ).toBeInTheDocument();
       });
     });
 
@@ -551,7 +596,9 @@ describe('DummyEPGForm', () => {
       });
       render(<DummyEPGForm {...defaultProps({ epg })} />);
       await waitFor(() => {
-        expect(screen.queryByText('(no template provided)')).not.toBeInTheDocument();
+        expect(
+          screen.queryByText('(no template provided)')
+        ).not.toBeInTheDocument();
       });
     });
 
@@ -559,8 +606,8 @@ describe('DummyEPGForm', () => {
       const epg = makeEPG({
         custom_properties: {
           title_pattern: '',
-          date_pattern:  '(?<month>\\w+)\\s+(?<day>\\d+)',
-          sample_title:  'Show Oct 17',
+          date_pattern: '(?<month>\\w+)\\s+(?<day>\\d+)',
+          sample_title: 'Show Oct 17',
         },
       });
       render(<DummyEPGForm {...defaultProps({ epg })} />);
@@ -573,14 +620,16 @@ describe('DummyEPGForm', () => {
       const epg = makeEPG({
         custom_properties: {
           title_pattern: '(Show.+)',
-          time_pattern:  '(?<hour>\\d+):(?<minute>\\d+)\\s*(?<ampm>AM|PM)',
-          sample_title:  'Show @ 9:00 PM',
-          timezone:      'US/Eastern',
+          time_pattern: '(?<hour>\\d+):(?<minute>\\d+)\\s*(?<ampm>AM|PM)',
+          sample_title: 'Show @ 9:00 PM',
+          timezone: 'US/Eastern',
         },
       });
       render(<DummyEPGForm {...defaultProps({ epg })} />);
       await waitFor(() => {
-        expect(screen.getByText(/available time placeholders/i)).toBeInTheDocument();
+        expect(
+          screen.getByText(/available time placeholders/i)
+        ).toBeInTheDocument();
       });
     });
   });
@@ -638,7 +687,9 @@ describe('DummyEPGForm', () => {
     });
 
     it('shows error notification when addEPG rejects', async () => {
-      vi.mocked(DummyEpgUtils.addEPG).mockRejectedValueOnce(new Error('Server error'));
+      vi.mocked(DummyEpgUtils.addEPG).mockRejectedValueOnce(
+        new Error('Server error')
+      );
       render(<DummyEPGForm {...defaultProps()} />);
 
       const nameInput = screen.getByPlaceholderText('My Sports EPG');
@@ -653,7 +704,9 @@ describe('DummyEPGForm', () => {
     });
 
     it('shows error notification when updateEPG rejects', async () => {
-      vi.mocked(DummyEpgUtils.updateEPG).mockRejectedValueOnce(new Error('Update failed'));
+      vi.mocked(DummyEpgUtils.updateEPG).mockRejectedValueOnce(
+        new Error('Update failed')
+      );
       render(<DummyEPGForm {...defaultProps({ epg: makeEPG() })} />);
       fireEvent.submit(document.querySelector('form'));
 
@@ -687,7 +740,9 @@ describe('DummyEPGForm', () => {
       fireEvent.submit(document.querySelector('form'));
 
       await waitFor(() => {
-        expect(showNotification).toHaveBeenCalledWith(expect.objectContaining({ color: 'red' }));
+        expect(showNotification).toHaveBeenCalledWith(
+          expect.objectContaining({ color: 'red' })
+        );
       });
       expect(onClose).not.toHaveBeenCalled();
     });
@@ -743,4 +798,4 @@ describe('DummyEPGForm', () => {
       expect(screen.getByDisplayValue('180')).toBeInTheDocument();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/forms/__tests__/EPG.test.jsx b/frontend/src/components/forms/__tests__/EPG.test.jsx
index 18448db8..31f5834d 100644
--- a/frontend/src/components/forms/__tests__/EPG.test.jsx
+++ b/frontend/src/components/forms/__tests__/EPG.test.jsx
@@ -30,7 +30,9 @@ vi.mock('@mantine/form', () => ({
       // Return the live object — no spread — so setFieldValue mutations are visible
       getValues: vi.fn(() => values),
       setValues: vi.fn((v) => Object.assign(values, v)),
-      setFieldValue: vi.fn((field, value) => { values[field] = value; }),
+      setFieldValue: vi.fn((field, value) => {
+        values[field] = value;
+      }),
       reset: vi.fn(),
       submitting: false,
       onSubmit: vi.fn((handler) => (e) => {
@@ -48,12 +50,23 @@ vi.mock('@mantine/form', () => ({
 
 // ── ScheduleInput mock ─────────────────────────────────────────────────────────
 vi.mock('../ScheduleInput', () => ({
-  default: ({ scheduleType, onScheduleTypeChange, onIntervalChange, onCronChange }) => (
+  default: ({
+    scheduleType,
+    onScheduleTypeChange,
+    onIntervalChange,
+    onCronChange,
+  }) => (
     <div data-testid="schedule-input">
-      <button data-testid="set-interval" onClick={() => onScheduleTypeChange('interval')}>
+      <button
+        data-testid="set-interval"
+        onClick={() => onScheduleTypeChange('interval')}
+      >
         Set Interval
       </button>
-      <button data-testid="set-cron" onClick={() => onScheduleTypeChange('cron')}>
+      <button
+        data-testid="set-cron"
+        onClick={() => onScheduleTypeChange('cron')}
+      >
         Set Cron
       </button>
       <input
@@ -117,7 +130,11 @@ vi.mock('@mantine/core', async () => ({
       {(data ?? []).map((opt) => {
         const val = typeof opt === 'string' ? opt : opt.value;
         const lbl = typeof opt === 'string' ? opt : opt.label;
-        return <option key={val} value={val}>{lbl}</option>;
+        return (
+          <option key={val} value={val}>
+            {lbl}
+          </option>
+        );
       })}
     </select>
   ),
@@ -139,7 +156,16 @@ vi.mock('@mantine/core', async () => ({
       {children}
     </span>
   ),
-  TextInput: ({ label, value, onChange, placeholder, error, id, name, required }) => (
+  TextInput: ({
+    label,
+    value,
+    onChange,
+    placeholder,
+    error,
+    id,
+    name,
+    required,
+  }) => (
     <div>
       <label htmlFor={id || name}>{label}</label>
       <input
@@ -149,7 +175,10 @@ vi.mock('@mantine/core', async () => ({
         placeholder={placeholder}
         required={required}
         onChange={(e) =>
-          onChange?.({ target: { value: e.target.value }, currentTarget: { value: e.target.value } })
+          onChange?.({
+            target: { value: e.target.value },
+            currentTarget: { value: e.target.value },
+          })
         }
       />
       {error && <span data-testid="input-error">{error}</span>}
@@ -243,7 +272,9 @@ describe('EPG', () => {
 
     it('renders a cancel/close button', () => {
       render(<EPG {...defaultProps()} />);
-      expect(screen.getByRole('button', { name: /cancel|close/i })).toBeInTheDocument();
+      expect(
+        screen.getByRole('button', { name: /cancel|close/i })
+      ).toBeInTheDocument();
     });
   });
 
@@ -257,11 +288,20 @@ describe('EPG', () => {
         key: vi.fn(),
         getValues: vi.fn(() => ({ ...epg, cron_expression: '' })),
         setValues: mockSetValues,
-        setFieldValue: vi.fn((field, value) => { epg[field] = value; }),
+        setFieldValue: vi.fn((field, value) => {
+          epg[field] = value;
+        }),
         reset: vi.fn(),
         submitting: false,
-        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({ ...epg }); }),
-        getInputProps: vi.fn((field) => ({ value: epg[field] ?? '', onChange: vi.fn(), error: null })),
+        onSubmit: vi.fn((h) => (e) => {
+          e?.preventDefault?.();
+          h({ ...epg });
+        }),
+        getInputProps: vi.fn((field) => ({
+          value: epg[field] ?? '',
+          onChange: vi.fn(),
+          error: null,
+        })),
       });
 
       render(<EPG {...defaultProps({ epg })} />);
@@ -279,8 +319,15 @@ describe('EPG', () => {
         setFieldValue: vi.fn(() => {}),
         reset: vi.fn(),
         submitting: false,
-        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({}); }),
-        getInputProps: vi.fn(() => ({ value: '', onChange: vi.fn(), error: null })),
+        onSubmit: vi.fn((h) => (e) => {
+          e?.preventDefault?.();
+          h({});
+        }),
+        getInputProps: vi.fn(() => ({
+          value: '',
+          onChange: vi.fn(),
+          error: null,
+        })),
       });
 
       render(<EPG {...defaultProps({ epg: null })} />);
@@ -288,15 +335,22 @@ describe('EPG', () => {
     });
 
     it('sets scheduleType to "cron" when epg has a cron_expression', () => {
-      const epg = makeEPG({ cron_expression: '0 */6 * * *', refresh_interval: 0 });
+      const epg = makeEPG({
+        cron_expression: '0 */6 * * *',
+        refresh_interval: 0,
+      });
       render(<EPG {...defaultProps({ epg })} />);
-      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('cron');
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent(
+        'cron'
+      );
     });
 
     it('sets scheduleType to "interval" when epg has no cron_expression', () => {
       const epg = makeEPG({ cron_expression: '', refresh_interval: 12 });
       render(<EPG {...defaultProps({ epg })} />);
-      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('interval');
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent(
+        'interval'
+      );
     });
   });
 
@@ -331,20 +385,26 @@ describe('EPG', () => {
   describe('schedule type toggling', () => {
     it('scheduleType starts as "interval" for new EPG', () => {
       render(<EPG {...defaultProps()} />);
-      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('interval');
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent(
+        'interval'
+      );
     });
 
     it('updates scheduleType to "cron" when ScheduleInput fires onScheduleTypeChange', () => {
       render(<EPG {...defaultProps()} />);
       fireEvent.click(screen.getByTestId('set-cron'));
-      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('cron');
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent(
+        'cron'
+      );
     });
 
     it('updates scheduleType back to "interval" from cron', () => {
       render(<EPG {...defaultProps()} />);
       fireEvent.click(screen.getByTestId('set-cron'));
       fireEvent.click(screen.getByTestId('set-interval'));
-      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent('interval');
+      expect(screen.getByTestId('schedule-type-value')).toHaveTextContent(
+        'interval'
+      );
     });
   });
 
@@ -415,16 +475,28 @@ describe('EPG', () => {
     });
 
     it('clears refresh_interval when schedule type is cron on submit', async () => {
-      const epg = makeEPG({ cron_expression: '0 * * * *', refresh_interval: 24 });
+      const epg = makeEPG({
+        cron_expression: '0 * * * *',
+        refresh_interval: 24,
+      });
       vi.mocked(useForm).mockReturnValue({
         key: vi.fn(),
         getValues: vi.fn(() => ({ ...epg })),
         setValues: vi.fn((v) => Object.assign(epg, v)),
-        setFieldValue: vi.fn((field, value) => { epg[field] = value; }),
+        setFieldValue: vi.fn((field, value) => {
+          epg[field] = value;
+        }),
         reset: vi.fn(),
         submitting: false,
-        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({ ...epg }); }),
-        getInputProps: vi.fn((field) => ({ value: epg[field] ?? '', onChange: vi.fn(), error: null })),
+        onSubmit: vi.fn((h) => (e) => {
+          e?.preventDefault?.();
+          h({ ...epg });
+        }),
+        getInputProps: vi.fn((field) => ({
+          value: epg[field] ?? '',
+          onChange: vi.fn(),
+          error: null,
+        })),
       });
       render(<EPG {...defaultProps({ epg })} />);
       fireEvent.click(screen.getByText('Update EPG Source'));
@@ -442,11 +514,20 @@ describe('EPG', () => {
         key: vi.fn(),
         getValues: vi.fn(() => ({ ...epg })),
         setValues: vi.fn((v) => Object.assign(epg, v)),
-        setFieldValue: vi.fn((field, value) => { epg[field] = value; }),
+        setFieldValue: vi.fn((field, value) => {
+          epg[field] = value;
+        }),
         reset: vi.fn(),
         submitting: false,
-        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({ ...epg }); }),
-        getInputProps: vi.fn((field) => ({ value: epg[field] ?? '', onChange: vi.fn(), error: null })),
+        onSubmit: vi.fn((h) => (e) => {
+          e?.preventDefault?.();
+          h({ ...epg });
+        }),
+        getInputProps: vi.fn((field) => ({
+          value: epg[field] ?? '',
+          onChange: vi.fn(),
+          error: null,
+        })),
       });
       render(<EPG {...defaultProps({ epg })} />);
       fireEvent.click(screen.getByText('Update EPG Source'));
@@ -497,8 +578,15 @@ describe('EPG', () => {
         setFieldValue: vi.fn(() => {}),
         reset: mockReset,
         submitting: false,
-        onSubmit: vi.fn((h) => (e) => { e?.preventDefault?.(); h({}); }),
-        getInputProps: vi.fn(() => ({ value: '', onChange: vi.fn(), error: null })),
+        onSubmit: vi.fn((h) => (e) => {
+          e?.preventDefault?.();
+          h({});
+        }),
+        getInputProps: vi.fn(() => ({
+          value: '',
+          onChange: vi.fn(),
+          error: null,
+        })),
       });
       render(<EPG {...defaultProps()} />);
       fireEvent.click(screen.getByText('Create EPG Source'));
@@ -513,7 +601,9 @@ describe('EPG', () => {
   describe('active checkbox', () => {
     it('renders the Active checkbox', () => {
       render(<EPG {...defaultProps()} />);
-      expect(screen.getByTestId('checkbox-enable-this-epg-source')).toBeInTheDocument();
+      expect(
+        screen.getByTestId('checkbox-enable-this-epg-source')
+      ).toBeInTheDocument();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/utils/__tests__/dateTimeUtils.test.js b/frontend/src/utils/__tests__/dateTimeUtils.test.js
index 040354f6..b2177af2 100644
--- a/frontend/src/utils/__tests__/dateTimeUtils.test.js
+++ b/frontend/src/utils/__tests__/dateTimeUtils.test.js
@@ -614,8 +614,18 @@ describe('dateTimeUtils', () => {
 
     it('should contain all lowercase month names', () => {
       expect(dateTimeUtils.MONTH_NAMES).toEqual([
-        'january', 'february', 'march', 'april', 'may', 'june',
-        'july', 'august', 'september', 'october', 'november', 'december',
+        'january',
+        'february',
+        'march',
+        'april',
+        'may',
+        'june',
+        'july',
+        'august',
+        'september',
+        'october',
+        'november',
+        'december',
       ]);
     });
   });
@@ -635,8 +645,18 @@ describe('dateTimeUtils', () => {
 
     it('should contain all lowercase abbreviated month names', () => {
       expect(dateTimeUtils.MONTH_ABBR).toEqual([
-        'jan', 'feb', 'mar', 'apr', 'may', 'jun',
-        'jul', 'aug', 'sep', 'oct', 'nov', 'dec',
+        'jan',
+        'feb',
+        'mar',
+        'apr',
+        'may',
+        'jun',
+        'jul',
+        'aug',
+        'sep',
+        'oct',
+        'nov',
+        'dec',
       ]);
     });
 
diff --git a/frontend/src/utils/forms/ChannelBatchUtils.js b/frontend/src/utils/forms/ChannelBatchUtils.js
index de44b938..04cd17a5 100644
--- a/frontend/src/utils/forms/ChannelBatchUtils.js
+++ b/frontend/src/utils/forms/ChannelBatchUtils.js
@@ -183,4 +183,4 @@ export const buildEpgAssociations = async (
 
   if (!epgData) return null;
   return channelIds.map((id) => ({ channel_id: id, epg_data_id: epgData.id }));
-};
\ No newline at end of file
+};
diff --git a/frontend/src/utils/forms/ChannelUtils.js b/frontend/src/utils/forms/ChannelUtils.js
index 433d6943..4a2a250f 100644
--- a/frontend/src/utils/forms/ChannelUtils.js
+++ b/frontend/src/utils/forms/ChannelUtils.js
@@ -94,4 +94,4 @@ export const handleEpgUpdate = async (
       streams: channelStreams.map((stream) => stream.id),
     });
   }
-};
\ No newline at end of file
+};
diff --git a/frontend/src/utils/forms/ConnectionUtils.js b/frontend/src/utils/forms/ConnectionUtils.js
index bc791ed2..95b4da06 100644
--- a/frontend/src/utils/forms/ConnectionUtils.js
+++ b/frontend/src/utils/forms/ConnectionUtils.js
@@ -72,4 +72,4 @@ export const parseApiError = (error) => {
     (Object.keys(fieldErrors).length === 0 ? JSON.stringify(body) : '');
 
   return { fieldErrors, apiError };
-};
\ No newline at end of file
+};
diff --git a/frontend/src/utils/forms/DummyEpgUtils.js b/frontend/src/utils/forms/DummyEpgUtils.js
index 76b3ee64..9e015164 100644
--- a/frontend/src/utils/forms/DummyEpgUtils.js
+++ b/frontend/src/utils/forms/DummyEpgUtils.js
@@ -263,4 +263,4 @@ export const applyTemplates = (templateValues, groups, hasMatch) => {
   });
 
   return result;
-};
\ No newline at end of file
+};
diff --git a/frontend/src/utils/forms/__tests__/AccountInfoModalUtils.test.js b/frontend/src/utils/forms/__tests__/AccountInfoModalUtils.test.js
index 770184cf..f1a80518 100644
--- a/frontend/src/utils/forms/__tests__/AccountInfoModalUtils.test.js
+++ b/frontend/src/utils/forms/__tests__/AccountInfoModalUtils.test.js
@@ -1,7 +1,9 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 
 // ── API mock ───────────────────────────────────────────────────────────────────
-vi.mock('../../../api.js', () => ({ default: { refreshAccountInfo: vi.fn() } }));
+vi.mock('../../../api.js', () => ({
+  default: { refreshAccountInfo: vi.fn() },
+}));
 
 // ──────────────────────────────────────────────────────────────────────────────
 // Imports after mocks
@@ -118,7 +120,9 @@ describe('AccountInfoModalUtils', () => {
       vi.useFakeTimers();
       vi.setSystemTime(new Date('2024-01-10T00:00:00Z'));
       // Jan 1, 2024 Unix timestamp
-      const past = String(Math.floor(new Date('2024-01-01T00:00:00Z').getTime() / 1000));
+      const past = String(
+        Math.floor(new Date('2024-01-01T00:00:00Z').getTime() / 1000)
+      );
       expect(getTimeRemaining(past)).toBe('Expired');
     });
 
@@ -211,7 +215,9 @@ describe('AccountInfoModalUtils', () => {
     it('propagates rejection from API.refreshAccountInfo', async () => {
       const error = new Error('network error');
       vi.mocked(API.refreshAccountInfo).mockRejectedValue(error);
-      await expect(refreshAccountInfo({ id: 'profile-123' })).rejects.toThrow('network error');
+      await expect(refreshAccountInfo({ id: 'profile-123' })).rejects.toThrow(
+        'network error'
+      );
     });
 
     it('calls API.refreshAccountInfo exactly once', async () => {
@@ -227,4 +233,4 @@ describe('AccountInfoModalUtils', () => {
       expect(API.refreshAccountInfo).toHaveBeenCalledWith(undefined);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/utils/forms/__tests__/ChannelBatchUtils.test.js b/frontend/src/utils/forms/__tests__/ChannelBatchUtils.test.js
index 96736358..f903e97b 100644
--- a/frontend/src/utils/forms/__tests__/ChannelBatchUtils.test.js
+++ b/frontend/src/utils/forms/__tests__/ChannelBatchUtils.test.js
@@ -39,7 +39,7 @@ describe('ChannelBatchUtils', () => {
     vi.clearAllMocks();
   });
 
-// ── getChannelGroupChange ──────────────────────────────────────────────────────
+  // ── getChannelGroupChange ──────────────────────────────────────────────────────
 
   describe('getChannelGroupChange', () => {
     const channelGroups = {
@@ -58,15 +58,19 @@ describe('ChannelBatchUtils', () => {
     });
 
     it('returns the group name when a valid group is selected', () => {
-      expect(getChannelGroupChange('1', channelGroups)).toBe('• Channel Group: Sports');
+      expect(getChannelGroupChange('1', channelGroups)).toBe(
+        '• Channel Group: Sports'
+      );
     });
 
     it('returns "Unknown" when group id is not found in channelGroups', () => {
-      expect(getChannelGroupChange('99', channelGroups)).toBe('• Channel Group: Unknown');
+      expect(getChannelGroupChange('99', channelGroups)).toBe(
+        '• Channel Group: Unknown'
+      );
     });
   });
 
-// ── getLogoChange ─────────────────────────────────────────────────────────────
+  // ── getLogoChange ─────────────────────────────────────────────────────────────
 
   describe('getLogoChange', () => {
     const channelLogos = {
@@ -97,7 +101,7 @@ describe('ChannelBatchUtils', () => {
     });
   });
 
-// ── getStreamProfileChange ────────────────────────────────────────────────────
+  // ── getStreamProfileChange ────────────────────────────────────────────────────
 
   describe('getStreamProfileChange', () => {
     const streamProfiles = [
@@ -116,23 +120,31 @@ describe('ChannelBatchUtils', () => {
     });
 
     it('returns "Use Default" message when streamProfileId is "0"', () => {
-      expect(getStreamProfileChange('0', streamProfiles)).toBe('• Stream Profile: Use Default');
+      expect(getStreamProfileChange('0', streamProfiles)).toBe(
+        '• Stream Profile: Use Default'
+      );
     });
 
     it('returns the profile name when a valid profile is selected', () => {
-      expect(getStreamProfileChange('1', streamProfiles)).toBe('• Stream Profile: HD Profile');
+      expect(getStreamProfileChange('1', streamProfiles)).toBe(
+        '• Stream Profile: HD Profile'
+      );
     });
 
     it('matches profile id using string coercion', () => {
-      expect(getStreamProfileChange(2, streamProfiles)).toBe('• Stream Profile: SD Profile');
+      expect(getStreamProfileChange(2, streamProfiles)).toBe(
+        '• Stream Profile: SD Profile'
+      );
     });
 
     it('returns "Selected Profile" fallback when profile is not found', () => {
-      expect(getStreamProfileChange('99', streamProfiles)).toBe('• Stream Profile: Selected Profile');
+      expect(getStreamProfileChange('99', streamProfiles)).toBe(
+        '• Stream Profile: Selected Profile'
+      );
     });
   });
 
-// ── getUserLevelChange ────────────────────────────────────────────────────────
+  // ── getUserLevelChange ────────────────────────────────────────────────────────
 
   describe('getUserLevelChange', () => {
     const userLevelLabels = {
@@ -151,15 +163,19 @@ describe('ChannelBatchUtils', () => {
     });
 
     it('returns the label when a valid user level is selected', () => {
-      expect(getUserLevelChange('1', userLevelLabels)).toBe('• User Level: Admin');
+      expect(getUserLevelChange('1', userLevelLabels)).toBe(
+        '• User Level: Admin'
+      );
     });
 
     it('returns the raw userLevel value when label is not found', () => {
-      expect(getUserLevelChange('99', userLevelLabels)).toBe('• User Level: 99');
+      expect(getUserLevelChange('99', userLevelLabels)).toBe(
+        '• User Level: 99'
+      );
     });
   });
 
-// ── getMatureContentChange ────────────────────────────────────────────────────
+  // ── getMatureContentChange ────────────────────────────────────────────────────
 
   describe('getMatureContentChange', () => {
     it('returns null when isAdult is falsy', () => {
@@ -181,7 +197,7 @@ describe('ChannelBatchUtils', () => {
     });
   });
 
-// ── getRegexNameChange ────────────────────────────────────────────────────────
+  // ── getRegexNameChange ────────────────────────────────────────────────────────
 
   describe('getRegexNameChange', () => {
     it('returns null when regexFind is falsy', () => {
@@ -210,7 +226,7 @@ describe('ChannelBatchUtils', () => {
     });
   });
 
-// ── getEpgChange ──────────────────────────────────────────────────────────────
+  // ── getEpgChange ──────────────────────────────────────────────────────────────
 
   describe('getEpgChange', () => {
     const epgs = {
@@ -225,7 +241,9 @@ describe('ChannelBatchUtils', () => {
     });
 
     it('returns clear assignment message when selectedDummyEpgId is "clear"', () => {
-      expect(getEpgChange('clear', epgs)).toBe('• EPG: Clear Assignment (use default dummy)');
+      expect(getEpgChange('clear', epgs)).toBe(
+        '• EPG: Clear Assignment (use default dummy)'
+      );
     });
 
     it('returns the EPG name when a valid EPG is selected', () => {
@@ -237,7 +255,7 @@ describe('ChannelBatchUtils', () => {
     });
   });
 
-// ── API wrappers ──────────────────────────────────────────────────────────────
+  // ── API wrappers ──────────────────────────────────────────────────────────────
 
   describe('updateChannels', () => {
     it('calls API.updateChannels with channelIds and values', () => {
@@ -257,17 +275,32 @@ describe('ChannelBatchUtils', () => {
   describe('bulkRegexRenameChannels', () => {
     it('calls API.bulkRegexRenameChannels with all arguments', () => {
       bulkRegexRenameChannels([1, 2], 'find', 'replace', 'g');
-      expect(API.bulkRegexRenameChannels).toHaveBeenCalledWith([1, 2], 'find', 'replace', 'g');
+      expect(API.bulkRegexRenameChannels).toHaveBeenCalledWith(
+        [1, 2],
+        'find',
+        'replace',
+        'g'
+      );
     });
 
     it('passes empty string when regexReplace is null', () => {
       bulkRegexRenameChannels([1], 'find', null, 'g');
-      expect(API.bulkRegexRenameChannels).toHaveBeenCalledWith([1], 'find', '', 'g');
+      expect(API.bulkRegexRenameChannels).toHaveBeenCalledWith(
+        [1],
+        'find',
+        '',
+        'g'
+      );
     });
 
     it('passes empty string when regexReplace is undefined', () => {
       bulkRegexRenameChannels([1], 'find', undefined, 'g');
-      expect(API.bulkRegexRenameChannels).toHaveBeenCalledWith([1], 'find', '', 'g');
+      expect(API.bulkRegexRenameChannels).toHaveBeenCalledWith(
+        [1],
+        'find',
+        '',
+        'g'
+      );
     });
   });
 
@@ -307,7 +340,7 @@ describe('ChannelBatchUtils', () => {
     });
   });
 
-// ── computeRegexPreview ───────────────────────────────────────────────────────
+  // ── computeRegexPreview ───────────────────────────────────────────────────────
 
   describe('computeRegexPreview', () => {
     const nameById = {
@@ -343,7 +376,12 @@ describe('ChannelBatchUtils', () => {
     });
 
     it('only includes ids that exist in nameById', () => {
-      const result = computeRegexPreview([1, 99, 2], nameById, 'HBO', 'Cinemax');
+      const result = computeRegexPreview(
+        [1, 99, 2],
+        nameById,
+        'HBO',
+        'Cinemax'
+      );
       expect(result).toHaveLength(2);
     });
 
@@ -352,7 +390,13 @@ describe('ChannelBatchUtils', () => {
         Array.from({ length: 30 }, (_, i) => [i + 1, `HBO ${i + 1}`])
       );
       const ids = Array.from({ length: 30 }, (_, i) => i + 1);
-      const result = computeRegexPreview(ids, largeNameById, 'HBO', 'Cinemax', 5);
+      const result = computeRegexPreview(
+        ids,
+        largeNameById,
+        'HBO',
+        'Cinemax',
+        5
+      );
       expect(result).toHaveLength(5);
     });
 
@@ -377,7 +421,7 @@ describe('ChannelBatchUtils', () => {
     });
   });
 
-// ── buildSubmitValues ─────────────────────────────────────────────────────────
+  // ── buildSubmitValues ─────────────────────────────────────────────────────────
 
   describe('buildSubmitValues', () => {
     const baseFormValues = {
@@ -395,47 +439,83 @@ describe('ChannelBatchUtils', () => {
     });
 
     it('removes stream_profile_id when it is "-1"', () => {
-      const result = buildSubmitValues({ ...baseFormValues, stream_profile_id: '-1' }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, stream_profile_id: '-1' },
+        null,
+        null
+      );
       expect(result).not.toHaveProperty('stream_profile_id');
     });
 
     it('removes stream_profile_id when it is falsy', () => {
-      const result = buildSubmitValues({ ...baseFormValues, stream_profile_id: '' }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, stream_profile_id: '' },
+        null,
+        null
+      );
       expect(result).not.toHaveProperty('stream_profile_id');
     });
 
     it('converts stream_profile_id "0" to null (use default)', () => {
-      const result = buildSubmitValues({ ...baseFormValues, stream_profile_id: '0' }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, stream_profile_id: '0' },
+        null,
+        null
+      );
       expect(result.stream_profile_id).toBeNull();
     });
 
     it('preserves a valid stream_profile_id string', () => {
-      const result = buildSubmitValues({ ...baseFormValues, stream_profile_id: '3' }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, stream_profile_id: '3' },
+        null,
+        null
+      );
       expect(result.stream_profile_id).toBe('3');
     });
 
     it('removes user_level when it is "-1"', () => {
-      const result = buildSubmitValues({ ...baseFormValues, user_level: '-1' }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, user_level: '-1' },
+        null,
+        null
+      );
       expect(result).not.toHaveProperty('user_level');
     });
 
     it('preserves a valid user_level', () => {
-      const result = buildSubmitValues({ ...baseFormValues, user_level: '2' }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, user_level: '2' },
+        null,
+        null
+      );
       expect(result.user_level).toBe('2');
     });
 
     it('removes is_adult when it is "-1"', () => {
-      const result = buildSubmitValues({ ...baseFormValues, is_adult: '-1' }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, is_adult: '-1' },
+        null,
+        null
+      );
       expect(result).not.toHaveProperty('is_adult');
     });
 
     it('converts is_adult "true" to boolean true', () => {
-      const result = buildSubmitValues({ ...baseFormValues, is_adult: 'true' }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, is_adult: 'true' },
+        null,
+        null
+      );
       expect(result.is_adult).toBe(true);
     });
 
     it('converts is_adult "false" to boolean false', () => {
-      const result = buildSubmitValues({ ...baseFormValues, is_adult: 'false' }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, is_adult: 'false' },
+        null,
+        null
+      );
       expect(result.is_adult).toBe(false);
     });
 
@@ -445,12 +525,20 @@ describe('ChannelBatchUtils', () => {
     });
 
     it('removes channel_group_id when selectedChannelGroup is null', () => {
-      const result = buildSubmitValues({ ...baseFormValues, channel_group_id: 99 }, null, null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, channel_group_id: 99 },
+        null,
+        null
+      );
       expect(result).not.toHaveProperty('channel_group_id');
     });
 
     it('removes channel_group_id when selectedChannelGroup is "-1"', () => {
-      const result = buildSubmitValues({ ...baseFormValues, channel_group_id: 99 }, '-1', null);
+      const result = buildSubmitValues(
+        { ...baseFormValues, channel_group_id: 99 },
+        '-1',
+        null
+      );
       expect(result).not.toHaveProperty('channel_group_id');
     });
 
@@ -481,7 +569,7 @@ describe('ChannelBatchUtils', () => {
     });
   });
 
-// ── buildEpgAssociations ──────────────────────────────────────────────────────
+  // ── buildEpgAssociations ──────────────────────────────────────────────────────
 
   describe('buildEpgAssociations', () => {
     const channelIds = [1, 2, 3];
@@ -491,18 +579,27 @@ describe('ChannelBatchUtils', () => {
       11: { name: 'Empty EPG', epg_data_count: 0 },
     };
 
-    const tvgs = [
-      { id: 42, epg_source: 10 },
-    ];
+    const tvgs = [{ id: 42, epg_source: 10 }];
 
     it('returns null when selectedDummyEpgId is falsy', async () => {
-      await expect(buildEpgAssociations(null, channelIds, epgs, tvgs)).resolves.toBeNull();
-      await expect(buildEpgAssociations('', channelIds, epgs, tvgs)).resolves.toBeNull();
-      await expect(buildEpgAssociations(undefined, channelIds, epgs, tvgs)).resolves.toBeNull();
+      await expect(
+        buildEpgAssociations(null, channelIds, epgs, tvgs)
+      ).resolves.toBeNull();
+      await expect(
+        buildEpgAssociations('', channelIds, epgs, tvgs)
+      ).resolves.toBeNull();
+      await expect(
+        buildEpgAssociations(undefined, channelIds, epgs, tvgs)
+      ).resolves.toBeNull();
     });
 
     it('returns clear associations when selectedDummyEpgId is "clear"', async () => {
-      const result = await buildEpgAssociations('clear', channelIds, epgs, tvgs);
+      const result = await buildEpgAssociations(
+        'clear',
+        channelIds,
+        epgs,
+        tvgs
+      );
       expect(result).toEqual([
         { channel_id: 1, epg_data_id: null },
         { channel_id: 2, epg_data_id: null },
@@ -531,9 +628,7 @@ describe('ChannelBatchUtils', () => {
     });
 
     it('calls getEpgData when tvgs does not contain a matching epg_source', async () => {
-      vi.mocked(API.getEPGData).mockResolvedValue([
-        { id: 55, epg_source: 10 },
-      ]);
+      vi.mocked(API.getEPGData).mockResolvedValue([{ id: 55, epg_source: 10 }]);
       const result = await buildEpgAssociations('10', channelIds, epgs, []);
       expect(API.getEPGData).toHaveBeenCalled();
       expect(result).toEqual([
diff --git a/frontend/src/utils/forms/__tests__/ChannelUtils.test.js b/frontend/src/utils/forms/__tests__/ChannelUtils.test.js
index e18970c1..390f26cd 100644
--- a/frontend/src/utils/forms/__tests__/ChannelUtils.test.js
+++ b/frontend/src/utils/forms/__tests__/ChannelUtils.test.js
@@ -238,48 +238,85 @@ describe('ChannelUtils', () => {
 
   describe('getFormattedValues', () => {
     it('converts "0" stream_profile_id to null', () => {
-      const result = getFormattedValues({ stream_profile_id: '0', tvg_id: 'x', tvc_guide_stationid: 'y' });
+      const result = getFormattedValues({
+        stream_profile_id: '0',
+        tvg_id: 'x',
+        tvc_guide_stationid: 'y',
+      });
       expect(result.stream_profile_id).toBeNull();
     });
 
     it('converts empty string stream_profile_id to null', () => {
-      const result = getFormattedValues({ stream_profile_id: '', tvg_id: 'x', tvc_guide_stationid: 'y' });
+      const result = getFormattedValues({
+        stream_profile_id: '',
+        tvg_id: 'x',
+        tvc_guide_stationid: 'y',
+      });
       expect(result.stream_profile_id).toBeNull();
     });
 
     it('preserves non-zero stream_profile_id', () => {
-      const result = getFormattedValues({ stream_profile_id: '5', tvg_id: 'x', tvc_guide_stationid: 'y' });
+      const result = getFormattedValues({
+        stream_profile_id: '5',
+        tvg_id: 'x',
+        tvc_guide_stationid: 'y',
+      });
       expect(result.stream_profile_id).toBe('5');
     });
 
     it('converts empty tvg_id to null', () => {
-      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: '', tvc_guide_stationid: 'y' });
+      const result = getFormattedValues({
+        stream_profile_id: '1',
+        tvg_id: '',
+        tvc_guide_stationid: 'y',
+      });
       expect(result.tvg_id).toBeNull();
     });
 
     it('preserves non-empty tvg_id', () => {
-      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: 'hbo.us', tvc_guide_stationid: 'y' });
+      const result = getFormattedValues({
+        stream_profile_id: '1',
+        tvg_id: 'hbo.us',
+        tvc_guide_stationid: 'y',
+      });
       expect(result.tvg_id).toBe('hbo.us');
     });
 
     it('converts empty tvc_guide_stationid to null', () => {
-      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: 'x', tvc_guide_stationid: '' });
+      const result = getFormattedValues({
+        stream_profile_id: '1',
+        tvg_id: 'x',
+        tvc_guide_stationid: '',
+      });
       expect(result.tvc_guide_stationid).toBeNull();
     });
 
     it('preserves non-empty tvc_guide_stationid', () => {
-      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: 'x', tvc_guide_stationid: 'hbo-station' });
+      const result = getFormattedValues({
+        stream_profile_id: '1',
+        tvg_id: 'x',
+        tvc_guide_stationid: 'hbo-station',
+      });
       expect(result.tvc_guide_stationid).toBe('hbo-station');
     });
 
     it('does not mutate the original values object', () => {
-      const values = { stream_profile_id: '0', tvg_id: '', tvc_guide_stationid: '' };
+      const values = {
+        stream_profile_id: '0',
+        tvg_id: '',
+        tvc_guide_stationid: '',
+      };
       getFormattedValues(values);
       expect(values.stream_profile_id).toBe('0');
     });
 
     it('passes through unrelated fields unchanged', () => {
-      const result = getFormattedValues({ stream_profile_id: '1', tvg_id: 'x', tvc_guide_stationid: 'y', name: 'HBO' });
+      const result = getFormattedValues({
+        stream_profile_id: '1',
+        tvg_id: 'x',
+        tvc_guide_stationid: 'y',
+        name: 'HBO',
+      });
       expect(result.name).toBe('HBO');
     });
   });
@@ -314,7 +351,12 @@ describe('ChannelUtils', () => {
       it('calls API.setChannelEPG with channel id and new epg_data_id', async () => {
         const channel = makeChannel({ epg_data_id: 'epg-old' });
         const values = makeValues({ epg_data_id: 'epg-new' });
-        await handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-new' }), makeChannelStreams());
+        await handleEpgUpdate(
+          channel,
+          values,
+          makeFormattedValues({ epg_data_id: 'epg-new' }),
+          makeChannelStreams()
+        );
         expect(API.setChannelEPG).toHaveBeenCalledWith('ch-1', 'epg-new');
       });
 
@@ -338,7 +380,12 @@ describe('ChannelUtils', () => {
         const channel = makeChannel({ epg_data_id: 'epg-old' });
         const values = makeValues({ epg_data_id: 'epg-new' });
         // Only epg_data_id in formatted — after stripping it, nothing remains
-        await handleEpgUpdate(channel, values, { epg_data_id: 'epg-new' }, makeChannelStreams());
+        await handleEpgUpdate(
+          channel,
+          values,
+          { epg_data_id: 'epg-new' },
+          makeChannelStreams()
+        );
         expect(API.updateChannel).not.toHaveBeenCalled();
       });
     });
@@ -347,7 +394,12 @@ describe('ChannelUtils', () => {
       it('does not call API.setChannelEPG', async () => {
         const channel = makeChannel({ epg_data_id: 'epg-1' });
         const values = makeValues({ epg_data_id: 'epg-1' });
-        await handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-1' }), makeChannelStreams());
+        await handleEpgUpdate(
+          channel,
+          values,
+          makeFormattedValues({ epg_data_id: 'epg-1' }),
+          makeChannelStreams()
+        );
         expect(API.setChannelEPG).not.toHaveBeenCalled();
       });
 
@@ -366,7 +418,12 @@ describe('ChannelUtils', () => {
       it('handles empty channel streams array', async () => {
         const channel = makeChannel({ epg_data_id: 'epg-1' });
         const values = makeValues({ epg_data_id: 'epg-1' });
-        await handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-1' }), []);
+        await handleEpgUpdate(
+          channel,
+          values,
+          makeFormattedValues({ epg_data_id: 'epg-1' }),
+          []
+        );
         expect(API.updateChannel).toHaveBeenCalledWith(
           expect.objectContaining({ streams: [] })
         );
@@ -378,7 +435,12 @@ describe('ChannelUtils', () => {
       const channel = makeChannel({ epg_data_id: 'epg-old' });
       const values = makeValues({ epg_data_id: 'epg-new' });
       await expect(
-        handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-new' }), makeChannelStreams())
+        handleEpgUpdate(
+          channel,
+          values,
+          makeFormattedValues({ epg_data_id: 'epg-new' }),
+          makeChannelStreams()
+        )
       ).rejects.toThrow('EPG error');
     });
 
@@ -387,8 +449,13 @@ describe('ChannelUtils', () => {
       const channel = makeChannel({ epg_data_id: 'epg-1' });
       const values = makeValues({ epg_data_id: 'epg-1' });
       await expect(
-        handleEpgUpdate(channel, values, makeFormattedValues({ epg_data_id: 'epg-1' }), makeChannelStreams())
+        handleEpgUpdate(
+          channel,
+          values,
+          makeFormattedValues({ epg_data_id: 'epg-1' }),
+          makeChannelStreams()
+        )
       ).rejects.toThrow('Update error');
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/utils/forms/__tests__/ConnectionUtils.test.js b/frontend/src/utils/forms/__tests__/ConnectionUtils.test.js
index 69417038..8727233c 100644
--- a/frontend/src/utils/forms/__tests__/ConnectionUtils.test.js
+++ b/frontend/src/utils/forms/__tests__/ConnectionUtils.test.js
@@ -73,7 +73,9 @@ describe('ConnectionUtils', () => {
     it('calls API.createConnectIntegration with the correct payload', async () => {
       const values = makeValues();
       const config = { url: 'https://example.com/hook' };
-      vi.mocked(API.createConnectIntegration).mockResolvedValue({ id: 'new-1' });
+      vi.mocked(API.createConnectIntegration).mockResolvedValue({
+        id: 'new-1',
+      });
 
       await createConnectIntegration(values, config);
 
@@ -86,14 +88,20 @@ describe('ConnectionUtils', () => {
     });
 
     it('returns the API response', async () => {
-      vi.mocked(API.createConnectIntegration).mockResolvedValue({ id: 'new-1' });
+      vi.mocked(API.createConnectIntegration).mockResolvedValue({
+        id: 'new-1',
+      });
       const result = await createConnectIntegration(makeValues(), {});
       expect(result).toEqual({ id: 'new-1' });
     });
 
     it('propagates API errors', async () => {
-      vi.mocked(API.createConnectIntegration).mockRejectedValue(new Error('Network error'));
-      await expect(createConnectIntegration(makeValues(), {})).rejects.toThrow('Network error');
+      vi.mocked(API.createConnectIntegration).mockRejectedValue(
+        new Error('Network error')
+      );
+      await expect(createConnectIntegration(makeValues(), {})).rejects.toThrow(
+        'Network error'
+      );
     });
   });
 
@@ -104,7 +112,9 @@ describe('ConnectionUtils', () => {
       const connection = makeConnection();
       const values = makeValues();
       const config = { url: 'https://example.com/hook' };
-      vi.mocked(API.updateConnectIntegration).mockResolvedValue({ id: 'conn-1' });
+      vi.mocked(API.updateConnectIntegration).mockResolvedValue({
+        id: 'conn-1',
+      });
 
       await updateConnectIntegration(connection, values, config);
 
@@ -117,13 +127,22 @@ describe('ConnectionUtils', () => {
     });
 
     it('returns the API response', async () => {
-      vi.mocked(API.updateConnectIntegration).mockResolvedValue({ id: 'conn-1', name: 'Updated' });
-      const result = await updateConnectIntegration(makeConnection(), makeValues(), {});
+      vi.mocked(API.updateConnectIntegration).mockResolvedValue({
+        id: 'conn-1',
+        name: 'Updated',
+      });
+      const result = await updateConnectIntegration(
+        makeConnection(),
+        makeValues(),
+        {}
+      );
       expect(result).toEqual({ id: 'conn-1', name: 'Updated' });
     });
 
     it('propagates API errors', async () => {
-      vi.mocked(API.updateConnectIntegration).mockRejectedValue(new Error('Server error'));
+      vi.mocked(API.updateConnectIntegration).mockRejectedValue(
+        new Error('Server error')
+      );
       await expect(
         updateConnectIntegration(makeConnection(), makeValues(), {})
       ).rejects.toThrow('Server error');
@@ -135,7 +154,9 @@ describe('ConnectionUtils', () => {
   describe('setConnectSubscriptions', () => {
     it('calls API.setConnectSubscriptions with connection.id and subs', async () => {
       const connection = makeConnection();
-      const subs = [{ event: 'channel_added', enabled: true, payload_template: null }];
+      const subs = [
+        { event: 'channel_added', enabled: true, payload_template: null },
+      ];
       vi.mocked(API.setConnectSubscriptions).mockResolvedValue(undefined);
 
       await setConnectSubscriptions(connection, subs);
@@ -144,8 +165,12 @@ describe('ConnectionUtils', () => {
     });
 
     it('propagates API errors', async () => {
-      vi.mocked(API.setConnectSubscriptions).mockRejectedValue(new Error('Failed'));
-      await expect(setConnectSubscriptions(makeConnection(), [])).rejects.toThrow('Failed');
+      vi.mocked(API.setConnectSubscriptions).mockRejectedValue(
+        new Error('Failed')
+      );
+      await expect(
+        setConnectSubscriptions(makeConnection(), [])
+      ).rejects.toThrow('Failed');
     });
   });
 
@@ -154,12 +179,20 @@ describe('ConnectionUtils', () => {
   describe('buildConfig', () => {
     describe('webhook type', () => {
       it('returns config with url only when no headers are provided', () => {
-        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
-        expect(buildConfig(values, [])).toEqual({ url: 'https://example.com/hook' });
+        const values = makeValues({
+          type: 'webhook',
+          url: 'https://example.com/hook',
+        });
+        expect(buildConfig(values, [])).toEqual({
+          url: 'https://example.com/hook',
+        });
       });
 
       it('includes headers when non-empty key/value pairs are present', () => {
-        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
+        const values = makeValues({
+          type: 'webhook',
+          url: 'https://example.com/hook',
+        });
         const headers = [{ key: 'Authorization', value: 'Bearer token' }];
         expect(buildConfig(values, headers)).toEqual({
           url: 'https://example.com/hook',
@@ -168,7 +201,10 @@ describe('ConnectionUtils', () => {
       });
 
       it('omits headers with blank keys', () => {
-        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
+        const values = makeValues({
+          type: 'webhook',
+          url: 'https://example.com/hook',
+        });
         const headers = [
           { key: '', value: 'should-be-ignored' },
           { key: '   ', value: 'also-ignored' },
@@ -181,14 +217,20 @@ describe('ConnectionUtils', () => {
       });
 
       it('omits headers property entirely when all keys are blank', () => {
-        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
+        const values = makeValues({
+          type: 'webhook',
+          url: 'https://example.com/hook',
+        });
         const headers = [{ key: '', value: 'ignored' }];
         const config = buildConfig(values, headers);
         expect(config).not.toHaveProperty('headers');
       });
 
       it('supports multiple headers', () => {
-        const values = makeValues({ type: 'webhook', url: 'https://example.com/hook' });
+        const values = makeValues({
+          type: 'webhook',
+          url: 'https://example.com/hook',
+        });
         const headers = [
           { key: 'X-One', value: '1' },
           { key: 'X-Two', value: '2' },
@@ -202,12 +244,20 @@ describe('ConnectionUtils', () => {
 
     describe('script type', () => {
       it('returns config with path from script_path', () => {
-        const values = makeValues({ type: 'script', script_path: '/usr/local/bin/notify.sh' });
-        expect(buildConfig(values, [])).toEqual({ path: '/usr/local/bin/notify.sh' });
+        const values = makeValues({
+          type: 'script',
+          script_path: '/usr/local/bin/notify.sh',
+        });
+        expect(buildConfig(values, [])).toEqual({
+          path: '/usr/local/bin/notify.sh',
+        });
       });
 
       it('ignores headers for script type', () => {
-        const values = makeValues({ type: 'script', script_path: '/usr/bin/run.sh' });
+        const values = makeValues({
+          type: 'script',
+          script_path: '/usr/bin/run.sh',
+        });
         const headers = [{ key: 'Authorization', value: 'Bearer token' }];
         const config = buildConfig(values, headers);
         expect(config).not.toHaveProperty('headers');
@@ -262,20 +312,31 @@ describe('ConnectionUtils', () => {
   describe('parseApiError', () => {
     it('returns message when error has no body', () => {
       const error = { message: 'Network failure' };
-      expect(parseApiError(error)).toEqual({ fieldErrors: {}, apiError: 'Network failure' });
+      expect(parseApiError(error)).toEqual({
+        fieldErrors: {},
+        apiError: 'Network failure',
+      });
     });
 
     it('returns "Unknown error" when error has no body and no message', () => {
-      expect(parseApiError({})).toEqual({ fieldErrors: {}, apiError: 'Unknown error' });
+      expect(parseApiError({})).toEqual({
+        fieldErrors: {},
+        apiError: 'Unknown error',
+      });
     });
 
     it('returns message when body is a string (not an object)', () => {
       const error = { body: 'Bad Request', message: 'HTTP 400' };
-      expect(parseApiError(error)).toEqual({ fieldErrors: {}, apiError: 'HTTP 400' });
+      expect(parseApiError(error)).toEqual({
+        fieldErrors: {},
+        apiError: 'HTTP 400',
+      });
     });
 
     it('extracts known field errors from body', () => {
-      const error = { body: { name: 'This field is required.', type: 'Invalid choice.' } };
+      const error = {
+        body: { name: 'This field is required.', type: 'Invalid choice.' },
+      };
       const { fieldErrors } = parseApiError(error);
       expect(fieldErrors).toEqual({
         name: 'This field is required.',
@@ -302,7 +363,9 @@ describe('ConnectionUtils', () => {
     });
 
     it('prefers non_field_errors over detail', () => {
-      const error = { body: { non_field_errors: 'NF error', detail: 'Detail error' } };
+      const error = {
+        body: { non_field_errors: 'NF error', detail: 'Detail error' },
+      };
       const { apiError } = parseApiError(error);
       expect(apiError).toBe('NF error');
     });
@@ -320,11 +383,17 @@ describe('ConnectionUtils', () => {
     });
 
     it('handles null error gracefully', () => {
-      expect(parseApiError(null)).toEqual({ fieldErrors: {}, apiError: 'Unknown error' });
+      expect(parseApiError(null)).toEqual({
+        fieldErrors: {},
+        apiError: 'Unknown error',
+      });
     });
 
     it('handles undefined error gracefully', () => {
-      expect(parseApiError(undefined)).toEqual({ fieldErrors: {}, apiError: 'Unknown error' });
+      expect(parseApiError(undefined)).toEqual({
+        fieldErrors: {},
+        apiError: 'Unknown error',
+      });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/frontend/src/utils/forms/__tests__/CronBuilderUtils.test.js b/frontend/src/utils/forms/__tests__/CronBuilderUtils.test.js
index 92ad83bb..fb736323 100644
--- a/frontend/src/utils/forms/__tests__/CronBuilderUtils.test.js
+++ b/frontend/src/utils/forms/__tests__/CronBuilderUtils.test.js
@@ -33,7 +33,7 @@ describe('CronBuilderUtils', () => {
     });
   });
 
-// ── DAYS_OF_WEEK ───────────────────────────────────────────────────────────────
+  // ── DAYS_OF_WEEK ───────────────────────────────────────────────────────────────
 
   describe('DAYS_OF_WEEK', () => {
     it('contains 8 entries (wildcard + 7 days)', () => {
@@ -53,11 +53,19 @@ describe('CronBuilderUtils', () => {
 
     it('numeric entries run 0-6', () => {
       const numeric = DAYS_OF_WEEK.filter((d) => d.value !== '*');
-      expect(numeric.map((d) => d.value)).toEqual(['0', '1', '2', '3', '4', '5', '6']);
+      expect(numeric.map((d) => d.value)).toEqual([
+        '0',
+        '1',
+        '2',
+        '3',
+        '4',
+        '5',
+        '6',
+      ]);
     });
   });
 
-// ── FREQUENCY_OPTIONS ──────────────────────────────────────────────────────────
+  // ── FREQUENCY_OPTIONS ──────────────────────────────────────────────────────────
 
   describe('FREQUENCY_OPTIONS', () => {
     it('contains exactly 4 options', () => {
@@ -77,7 +85,7 @@ describe('CronBuilderUtils', () => {
     });
   });
 
-// ── CRON_FIELDS ────────────────────────────────────────────────────────────────
+  // ── CRON_FIELDS ────────────────────────────────────────────────────────────────
 
   describe('CRON_FIELDS', () => {
     it('contains exactly 5 fields', () => {
@@ -97,7 +105,7 @@ describe('CronBuilderUtils', () => {
     });
   });
 
-// ── buildCron ──────────────────────────────────────────────────────────────────
+  // ── buildCron ──────────────────────────────────────────────────────────────────
 
   describe('buildCron', () => {
     describe('hourly', () => {
@@ -171,7 +179,7 @@ describe('CronBuilderUtils', () => {
     });
   });
 
-// ── parseCronPreset ────────────────────────────────────────────────────────────
+  // ── parseCronPreset ────────────────────────────────────────────────────────────
 
   describe('parseCronPreset', () => {
     describe('hourly detection', () => {
@@ -279,7 +287,7 @@ describe('CronBuilderUtils', () => {
     });
   });
 
-// ── updateCronPart ─────────────────────────────────────────────────────────────
+  // ── updateCronPart ─────────────────────────────────────────────────────────────
 
   describe('updateCronPart', () => {
     describe('valid 5-part cron', () => {
@@ -342,7 +350,9 @@ describe('CronBuilderUtils', () => {
       });
 
       it('accepts comma-separated values like 0,15,30,45', () => {
-        expect(updateCronPart('* * * * *', 0, '0,15,30,45')).toBe('0,15,30,45 * * * *');
+        expect(updateCronPart('* * * * *', 0, '0,15,30,45')).toBe(
+          '0,15,30,45 * * * *'
+        );
       });
     });
   });
diff --git a/frontend/src/utils/forms/__tests__/DummyEpgUtils.test.js b/frontend/src/utils/forms/__tests__/DummyEpgUtils.test.js
index c4d1a7c3..37c0dd3c 100644
--- a/frontend/src/utils/forms/__tests__/DummyEpgUtils.test.js
+++ b/frontend/src/utils/forms/__tests__/DummyEpgUtils.test.js
@@ -3,27 +3,52 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 // ── Module mocks (must be before imports) ─────────────────────────────────────
 vi.mock('../../../api.js', () => ({
   default: {
-    getTimezones:  vi.fn(),
-    addEPG:        vi.fn(),
-    updateEPG:     vi.fn(),
+    getTimezones: vi.fn(),
+    addEPG: vi.fn(),
+    updateEPG: vi.fn(),
   },
 }));
 
 vi.mock('../../dateTimeUtils.js', () => ({
-  format:      vi.fn(),
-  getDay:      vi.fn(),
-  getHour:     vi.fn(),
-  getMinute:   vi.fn(),
-  getMonth:    vi.fn(),
-  getNow:      vi.fn(),
-  getYear:     vi.fn(),
-  MONTH_ABBR:  ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'],
-  MONTH_NAMES: ['January','February','March','April','May','June',
-    'July','August','September','October','November','December'],
-  setHour:     vi.fn((dt) => dt),
-  setMinute:   vi.fn((dt) => dt),
-  setSecond:   vi.fn((dt) => dt),
-  setTz:       vi.fn(),
+  format: vi.fn(),
+  getDay: vi.fn(),
+  getHour: vi.fn(),
+  getMinute: vi.fn(),
+  getMonth: vi.fn(),
+  getNow: vi.fn(),
+  getYear: vi.fn(),
+  MONTH_ABBR: [
+    'Jan',
+    'Feb',
+    'Mar',
+    'Apr',
+    'May',
+    'Jun',
+    'Jul',
+    'Aug',
+    'Sep',
+    'Oct',
+    'Nov',
+    'Dec',
+  ],
+  MONTH_NAMES: [
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December',
+  ],
+  setHour: vi.fn((dt) => dt),
+  setMinute: vi.fn((dt) => dt),
+  setSecond: vi.fn((dt) => dt),
+  setTz: vi.fn(),
 }));
 
 // ── Imports after mocks ────────────────────────────────────────────────────────
@@ -55,30 +80,30 @@ const makeEPG = (overrides = {}) => ({
 });
 
 const makeCustom = (overrides = {}) => ({
-  title_pattern:                 '(?<title>.+)',
-  time_pattern:                  '(?<hour>\\d+):(?<minute>\\d+)',
-  date_pattern:                  '',
-  timezone:                      'US/Eastern',
-  output_timezone:               '',
-  program_duration:              180,
-  sample_title:                  'Test Show 9:00 PM',
-  title_template:                '{title}',
-  subtitle_template:             '',
-  description_template:          '',
-  upcoming_title_template:       '',
+  title_pattern: '(?<title>.+)',
+  time_pattern: '(?<hour>\\d+):(?<minute>\\d+)',
+  date_pattern: '',
+  timezone: 'US/Eastern',
+  output_timezone: '',
+  program_duration: 180,
+  sample_title: 'Test Show 9:00 PM',
+  title_template: '{title}',
+  subtitle_template: '',
+  description_template: '',
+  upcoming_title_template: '',
   upcoming_description_template: '',
-  ended_title_template:          '',
-  ended_description_template:    '',
-  fallback_title_template:       '',
+  ended_title_template: '',
+  ended_description_template: '',
+  fallback_title_template: '',
   fallback_description_template: '',
-  channel_logo_url:              '',
-  program_poster_url:            '',
-  name_source:                   'channel',
-  stream_index:                  1,
-  category:                      '',
-  include_date:                  true,
-  include_live:                  false,
-  include_new:                   false,
+  channel_logo_url: '',
+  program_poster_url: '',
+  name_source: 'channel',
+  stream_index: 1,
+  category: '',
+  include_date: true,
+  include_live: false,
+  include_new: false,
   ...overrides,
 });
 
@@ -86,7 +111,6 @@ const makeCustom = (overrides = {}) => ({
 // Tests
 // ──────────────────────────────────────────────────────────────────────────────
 describe('DummyEpgUtils', () => {
-
   beforeEach(() => {
     vi.clearAllMocks();
   });
@@ -94,7 +118,9 @@ describe('DummyEpgUtils', () => {
   // ── getTimezones ───────────────────────────────────────────────────────────
   describe('getTimezones', () => {
     it('calls API.getTimezones and returns its result', async () => {
-      vi.mocked(API.getTimezones).mockResolvedValue({ timezones: ['UTC', 'US/Eastern'] });
+      vi.mocked(API.getTimezones).mockResolvedValue({
+        timezones: ['UTC', 'US/Eastern'],
+      });
       const result = await getTimezones();
       expect(API.getTimezones).toHaveBeenCalledTimes(1);
       expect(result).toEqual({ timezones: ['UTC', 'US/Eastern'] });
@@ -125,13 +151,19 @@ describe('DummyEpgUtils', () => {
   // ── updateEPG ──────────────────────────────────────────────────────────────
   describe('updateEPG', () => {
     it('calls API.updateEPG with values merged with epg.id', async () => {
-      const epg    = makeEPG({ id: 42 });
+      const epg = makeEPG({ id: 42 });
       const values = { name: 'Updated EPG' };
-      vi.mocked(API.updateEPG).mockResolvedValue({ id: 42, name: 'Updated EPG' });
+      vi.mocked(API.updateEPG).mockResolvedValue({
+        id: 42,
+        name: 'Updated EPG',
+      });
 
       const result = await updateEPG(values, epg);
 
-      expect(API.updateEPG).toHaveBeenCalledWith({ name: 'Updated EPG', id: 42 });
+      expect(API.updateEPG).toHaveBeenCalledWith({
+        name: 'Updated EPG',
+        id: 42,
+      });
       expect(result).toMatchObject({ id: 42 });
     });
 
@@ -139,7 +171,9 @@ describe('DummyEpgUtils', () => {
       const epg = makeEPG({ id: 99 });
       vi.mocked(API.updateEPG).mockResolvedValue({});
       await updateEPG({ name: 'X' }, epg);
-      expect(API.updateEPG).toHaveBeenCalledWith(expect.objectContaining({ id: 99 }));
+      expect(API.updateEPG).toHaveBeenCalledWith(
+        expect.objectContaining({ id: 99 })
+      );
     });
 
     it('propagates rejection from API.updateEPG', async () => {
@@ -153,8 +187,8 @@ describe('DummyEpgUtils', () => {
     it('returns an object with name, is_active, source_type, and custom_properties', () => {
       const result = getDummyEpgFormInitialValues();
       expect(result).toMatchObject({
-        name:        expect.any(String),
-        is_active:   expect.any(Boolean),
+        name: expect.any(String),
+        is_active: expect.any(Boolean),
         source_type: 'dummy',
       });
       expect(result.custom_properties).toBeDefined();
@@ -165,7 +199,9 @@ describe('DummyEpgUtils', () => {
     });
 
     it('sets include_date to true by default', () => {
-      expect(getDummyEpgFormInitialValues().custom_properties.include_date).toBe(true);
+      expect(
+        getDummyEpgFormInitialValues().custom_properties.include_date
+      ).toBe(true);
     });
 
     it('sets include_live and include_new to false by default', () => {
@@ -175,15 +211,21 @@ describe('DummyEpgUtils', () => {
     });
 
     it('defaults name_source to "channel"', () => {
-      expect(getDummyEpgFormInitialValues().custom_properties.name_source).toBe('channel');
+      expect(getDummyEpgFormInitialValues().custom_properties.name_source).toBe(
+        'channel'
+      );
     });
 
     it('defaults program_duration to 180', () => {
-      expect(getDummyEpgFormInitialValues().custom_properties.program_duration).toBe(180);
+      expect(
+        getDummyEpgFormInitialValues().custom_properties.program_duration
+      ).toBe(180);
     });
 
     it('defaults stream_index to 1', () => {
-      expect(getDummyEpgFormInitialValues().custom_properties.stream_index).toBe(1);
+      expect(
+        getDummyEpgFormInitialValues().custom_properties.stream_index
+      ).toBe(1);
     });
   });
 
@@ -201,7 +243,10 @@ describe('DummyEpgUtils', () => {
     });
 
     it('preserves provided values over defaults', () => {
-      const custom = makeCustom({ timezone: 'US/Pacific', program_duration: 60 });
+      const custom = makeCustom({
+        timezone: 'US/Pacific',
+        program_duration: 60,
+      });
       const result = buildCustomProperties(custom);
       expect(result.timezone).toBe('US/Pacific');
       expect(result.program_duration).toBe(60);
@@ -224,17 +269,17 @@ describe('DummyEpgUtils', () => {
 
     it('maps all template fields', () => {
       const custom = makeCustom({
-        title_template:                'T:{title}',
-        subtitle_template:             'S:{title}',
-        description_template:          'D:{title}',
-        upcoming_title_template:       'U:{title}',
+        title_template: 'T:{title}',
+        subtitle_template: 'S:{title}',
+        description_template: 'D:{title}',
+        upcoming_title_template: 'U:{title}',
         upcoming_description_template: 'UD:{title}',
-        ended_title_template:          'E:{title}',
-        ended_description_template:    'ED:{title}',
-        fallback_title_template:       'FT:{title}',
+        ended_title_template: 'E:{title}',
+        ended_description_template: 'ED:{title}',
+        fallback_title_template: 'FT:{title}',
         fallback_description_template: 'FD:{title}',
-        channel_logo_url:              'http://logo',
-        program_poster_url:            'http://poster',
+        channel_logo_url: 'http://logo',
+        program_poster_url: 'http://poster',
       });
       const result = buildCustomProperties(custom);
       expect(result.title_template).toBe('T:{title}');
@@ -288,7 +333,9 @@ describe('DummyEpgUtils', () => {
     });
 
     it('returns null for a complex valid regex with named groups', () => {
-      expect(validateCustomTitlePattern('(?<title>[A-Z].+)\\s(?<time>\\d+:\\d+)')).toBeNull();
+      expect(
+        validateCustomTitlePattern('(?<title>[A-Z].+)\\s(?<time>\\d+:\\d+)')
+      ).toBeNull();
     });
   });
 
@@ -398,7 +445,11 @@ describe('DummyEpgUtils', () => {
         'Test Show 9:00'
       );
       expect(result.matched).toBe(true);
-      expect(result.groups).toMatchObject({ title: 'Test Show', hour: '9', minute: '00' });
+      expect(result.groups).toMatchObject({
+        title: 'Test Show',
+        hour: '9',
+        minute: '00',
+      });
     });
   });
 
@@ -425,7 +476,10 @@ describe('DummyEpgUtils', () => {
     });
 
     it('adds normalized keys for multiple groups', () => {
-      const result = addNormalizedGroups({ title: 'Show', subtitle: 'Épilogue' });
+      const result = addNormalizedGroups({
+        title: 'Show',
+        subtitle: 'Épilogue',
+      });
       expect(result.title_normalize).toBeDefined();
       expect(result.subtitle_normalize).toBeDefined();
     });
@@ -434,15 +488,15 @@ describe('DummyEpgUtils', () => {
   // ── applyTemplates ─────────────────────────────────────────────────────────
   describe('applyTemplates', () => {
     const templates = {
-      titleTemplate:               '{title}',
-      subtitleTemplate:            '{subtitle}',
-      descriptionTemplate:         '{title} - {subtitle}',
-      upcomingTitleTemplate:       'Upcoming: {title}',
+      titleTemplate: '{title}',
+      subtitleTemplate: '{subtitle}',
+      descriptionTemplate: '{title} - {subtitle}',
+      upcomingTitleTemplate: 'Upcoming: {title}',
       upcomingDescriptionTemplate: 'Details for {title}',
-      endedTitleTemplate:          'Ended: {title}',
-      endedDescriptionTemplate:    'Summary of {title}',
-      channelLogoUrl:              'http://logo/{title}',
-      programPosterUrl:            'http://poster/{title}',
+      endedTitleTemplate: 'Ended: {title}',
+      endedDescriptionTemplate: 'Summary of {title}',
+      channelLogoUrl: 'http://logo/{title}',
+      programPosterUrl: 'http://poster/{title}',
     };
 
     const groups = { title: 'Test Show', subtitle: 'Pilot' };
@@ -479,7 +533,9 @@ describe('DummyEpgUtils', () => {
 
     it('fills programPosterUrl', () => {
       const result = applyTemplates(templates, groups, true);
-      expect(result.formattedProgramPosterUrl).toBe('http://poster/Test%20Show');
+      expect(result.formattedProgramPosterUrl).toBe(
+        'http://poster/Test%20Show'
+      );
     });
 
     it('returns empty string for template that has no matching placeholder', () => {
@@ -510,10 +566,10 @@ describe('DummyEpgUtils', () => {
   describe('buildTimePlaceholders', () => {
     beforeEach(() => {
       // Provide realistic return values from dateTimeUtils
-      vi.mocked(dateTimeUtils.getHour).mockReturnValue(21);    // 9 PM
+      vi.mocked(dateTimeUtils.getHour).mockReturnValue(21); // 9 PM
       vi.mocked(dateTimeUtils.getMinute).mockReturnValue(0);
       vi.mocked(dateTimeUtils.getDay).mockReturnValue(15);
-      vi.mocked(dateTimeUtils.getMonth).mockReturnValue(5);    // June (0-indexed)
+      vi.mocked(dateTimeUtils.getMonth).mockReturnValue(5); // June (0-indexed)
       vi.mocked(dateTimeUtils.getYear).mockReturnValue(2024);
       vi.mocked(dateTimeUtils.format).mockImplementation((dt, fmt) => fmt);
       vi.mocked(dateTimeUtils.setHour).mockImplementation((dt) => dt);
@@ -525,20 +581,38 @@ describe('DummyEpgUtils', () => {
 
     it('returns an object when given valid time groups', () => {
       const timeGroups = { hour: '9', minute: '00', ampm: 'PM' };
-      const result = buildTimePlaceholders(timeGroups, {}, 'US/Eastern', '', 180);
+      const result = buildTimePlaceholders(
+        timeGroups,
+        {},
+        'US/Eastern',
+        '',
+        180
+      );
       expect(result).toBeDefined();
       expect(typeof result).toBe('object');
     });
 
     it('returns starttime key when time groups have hour and minute', () => {
       const timeGroups = { hour: '9', minute: '00', ampm: 'PM' };
-      const result = buildTimePlaceholders(timeGroups, {}, 'US/Eastern', '', 180);
+      const result = buildTimePlaceholders(
+        timeGroups,
+        {},
+        'US/Eastern',
+        '',
+        180
+      );
       expect(result).toHaveProperty('starttime');
     });
 
     it('returns endtime key calculated from duration', () => {
       const timeGroups = { hour: '9', minute: '00', ampm: 'PM' };
-      const result = buildTimePlaceholders(timeGroups, {}, 'US/Eastern', '', 180);
+      const result = buildTimePlaceholders(
+        timeGroups,
+        {},
+        'US/Eastern',
+        '',
+        180
+      );
       expect(result).toHaveProperty('endtime');
     });
 
@@ -555,8 +629,14 @@ describe('DummyEpgUtils', () => {
     it('incorporates date groups when provided', () => {
       const timeGroups = { hour: '9', minute: '00' };
       const dateGroups = { year: '2024', month: '06', day: '15' };
-      const result = buildTimePlaceholders(timeGroups, dateGroups, 'US/Eastern', '', 180);
+      const result = buildTimePlaceholders(
+        timeGroups,
+        dateGroups,
+        'US/Eastern',
+        '',
+        180
+      );
       expect(result).toBeDefined();
     });
   });
-});
\ No newline at end of file
+});

From 10582a3741596bb1076405be406dd49a4f7880ed Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 9 Apr 2026 11:16:04 -0500
Subject: [PATCH 130/172] Enhancement: Improved the EPG BOM fix from v0.22.1:
 replaced the `lstrip(b'\xef\xbb\xbf')` / `startswith` approach with
 `start.find(b'<?xml')`, which locates the XML declaration regardless of any
 leading bytes BOM, whitespace, or other encoding markers without needing to
 know what those bytes are.

---
 CHANGELOG.md      | 4 ++++
 apps/epg/tasks.py | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b84ed106..cbad3664 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Improved the EPG BOM fix from v0.22.1: replaced the `lstrip(b'\xef\xbb\xbf')` / `startswith` approach with `start.find(b'<?xml')`, which locates the XML declaration regardless of any leading bytes BOM, whitespace, or other encoding markers without needing to know what those bytes are.
+
 ## [0.22.1] - 2026-04-05
 
 ### Fixed
diff --git a/apps/epg/tasks.py b/apps/epg/tasks.py
index a0a5f42e..9c877f4b 100644
--- a/apps/epg/tasks.py
+++ b/apps/epg/tasks.py
@@ -114,9 +114,9 @@ def _open_xmltv_file(file_path: str):
         return f
 
     # Insert the DOCTYPE after the XML declaration if one is present.
-    stripped = start.lstrip(b'\xef\xbb\xbf').lstrip()
-    if stripped.startswith(b'<?xml'):
-        decl_end = start.find(b'?>')
+    xml_pos = start.find(b'<?xml')
+    if xml_pos >= 0:
+        decl_end = start.find(b'?>', xml_pos)
         if decl_end >= 0:
             xml_decl = start[:decl_end + 2]
             f.seek(decl_end + 2)

From 442e2bdc0e2096fccec8949cc503be80e1caf3b1 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 9 Apr 2026 17:50:59 -0500
Subject: [PATCH 131/172] Remove unused starttime24_long from
 buildTimePlaceholders, simplified formatTime24.

---
 frontend/src/utils/forms/DummyEpgUtils.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frontend/src/utils/forms/DummyEpgUtils.js b/frontend/src/utils/forms/DummyEpgUtils.js
index 9e015164..f5d558cf 100644
--- a/frontend/src/utils/forms/DummyEpgUtils.js
+++ b/frontend/src/utils/forms/DummyEpgUtils.js
@@ -130,9 +130,7 @@ const formatTime12Long = (h, m) => {
 };
 
 const formatTime24 = (h, m) =>
-  m > 0
-    ? `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`
-    : `${String(h).padStart(2, '0')}:00`;
+  `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`;
 
 export const buildTimePlaceholders = (
   timeGroups,
@@ -205,7 +203,6 @@ export const buildTimePlaceholders = (
       starttime: formatTime12(h24, min),
       starttime_long: formatTime12Long(h24, min),
       starttime24: formatTime24(h24, min),
-      starttime24_long: formatTime24(h24, min),
       endtime: formatTime12(endH24, endMin),
       endtime_long: formatTime12Long(endH24, endMin),
       endtime24: formatTime24(endH24, endMin),

From df6d82113574dd962d0889ca9d102279737dbb7e Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 9 Apr 2026 18:28:20 -0500
Subject: [PATCH 132/172] changelog: Update changelog for refactor PR.

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbad3664..929632da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Refactored frontend form components (`AccountInfoModal`, `AssignChannelNumbers`, `Channel`, `ChannelBatch`, `ChannelGroup`, `Connection`, `CronBuilder`, `DummyEPG`, and `EPG`) to extract business logic into dedicated utility modules under `src/utils/forms/`. Each extracted module is covered by unit tests. Mantine compound component references (`Table.Tbody`, `Popover.Target`, `Accordion.Item`, etc.) have been updated to use flat named imports. — Thanks [@nick4810](https://github.com/nick4810)
+
 - Improved the EPG BOM fix from v0.22.1: replaced the `lstrip(b'\xef\xbb\xbf')` / `startswith` approach with `start.find(b'<?xml')`, which locates the XML declaration regardless of any leading bytes BOM, whitespace, or other encoding markers without needing to know what those bytes are.
 
 ## [0.22.1] - 2026-04-05

From 7f6464200352c1120a7c852c18cc629422f310c9 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 9 Apr 2026 19:58:40 -0500
Subject: [PATCH 133/172] security: Hardened the HLS proxy `change_stream`
 endpoint by converting it from a plain Django view to a DRF `@api_view` with
 `@permission_classes([IsAdmin])`, ensuring the endpoint actually enforces
 admin-only access. The previous decorator arrangement (`@csrf_exempt` +
 `@permission_classes`) had no effect on a plain Django view.

---
 apps/proxy/hls_proxy/views.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/apps/proxy/hls_proxy/views.py b/apps/proxy/hls_proxy/views.py
index eaf0f1cd..835b431e 100644
--- a/apps/proxy/hls_proxy/views.py
+++ b/apps/proxy/hls_proxy/views.py
@@ -4,6 +4,8 @@ import logging
 from django.http import StreamingHttpResponse, JsonResponse, HttpResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
+from rest_framework.decorators import api_view, permission_classes
+from apps.accounts.permissions import IsAdmin
 from .server import ProxyServer, Config
 
 logger = logging.getLogger(__name__)
@@ -15,7 +17,7 @@ def stream_endpoint(request, channel_id):
     """Handle HLS manifest requests"""
     if channel_id not in proxy_server.stream_managers:
         return JsonResponse({'error': 'Channel not found'}, status=404)
-    
+
     response = proxy_server.stream_endpoint(channel_id)
     return StreamingHttpResponse(
         response[0],
@@ -30,10 +32,10 @@ def get_segment(request, segment_name):
     try:
         segment_num = int(segment_name.split('.')[0])
         buffer = proxy_server.stream_buffers.get(segment_num)
-        
+
         if not buffer:
             return JsonResponse({'error': 'Segment not found'}, status=404)
-            
+
         return StreamingHttpResponse(
             buffer,
             content_type='video/MP2T'
@@ -44,19 +46,19 @@ def get_segment(request, segment_name):
         logger.error(f"Error serving segment: {e}")
         return JsonResponse({'error': str(e)}, status=500)
 
-@csrf_exempt
-@require_http_methods(["POST"])
+@api_view(["POST"])
+@permission_classes([IsAdmin])
 def change_stream(request, channel_id):
     """Change stream URL for existing channel"""
     try:
         if channel_id not in proxy_server.stream_managers:
             return JsonResponse({'error': 'Channel not found'}, status=404)
-            
+
         data = json.loads(request.body)
         new_url = data.get('url')
         if not new_url:
             return JsonResponse({'error': 'No URL provided'}, status=400)
-            
+
         manager = proxy_server.stream_managers[channel_id]
         if manager.update_url(new_url):
             return JsonResponse({
@@ -64,7 +66,7 @@ def change_stream(request, channel_id):
                 'channel': channel_id,
                 'url': new_url
             })
-            
+
         return JsonResponse({
             'message': 'URL unchanged',
             'channel': channel_id,
@@ -85,7 +87,7 @@ def initialize_stream(request, channel_id):
         url = data.get('url')
         if not url:
             return JsonResponse({'error': 'No URL provided'}, status=400)
-            
+
         proxy_server.initialize_channel(url, channel_id)
         return JsonResponse({
             'message': 'Stream initialized',

From dcefc6541c082cf4278aa74bd89de44d073a6bad Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 9 Apr 2026 19:59:50 -0500
Subject: [PATCH 134/172] chore(cleanup): - Removed dead `VODConnectionManager`
 class (`apps/proxy/vod_proxy/connection_manager.py`) and its associated
 helpers, which had been superseded by `MultiWorkerVODConnectionManager`. All
 active code already used the multi-worker implementation. Removed the unused
 `VODConnectionManager` import from `vod_proxy/views.py`, the unscheduled
 `cleanup_vod_connections` task from `apps/proxy/tasks.py`, and the
 unscheduled `cleanup_vod_persistent_connections` task from `core/tasks.py`. -
 Removed dead VOD URL routes: `VODPlaylistView` (playlist generation),
 `VODPositionView` (position tracking), and the class-based `VODStatsView`
 (replaced by the existing function-based `vod_stats` view). - Removed dead
 `updateVODPosition()` API method from `frontend/src/api.js`, which called the
 now-removed position tracking endpoint.

---
 CHANGELOG.md                               |   11 +-
 apps/proxy/tasks.py                        |   17 +-
 apps/proxy/vod_proxy/connection_manager.py | 1504 --------------------
 apps/proxy/vod_proxy/urls.py               |    9 +-
 apps/proxy/vod_proxy/views.py              |  593 ++++----
 core/tasks.py                              |   16 +-
 frontend/src/api.js                        |   15 -
 7 files changed, 259 insertions(+), 1906 deletions(-)
 delete mode 100644 apps/proxy/vod_proxy/connection_manager.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 929632da..52246f84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Security
+
+- Hardened the HLS proxy `change_stream` endpoint by converting it from a plain Django view to a DRF `@api_view` with `@permission_classes([IsAdmin])`, ensuring the endpoint actually enforces admin-only access. The previous decorator arrangement (`@csrf_exempt` + `@permission_classes`) had no effect on a plain Django view.
+
+### Removed
+
+- Removed dead `VODConnectionManager` class (`apps/proxy/vod_proxy/connection_manager.py`) and its associated helpers, which had been superseded by `MultiWorkerVODConnectionManager`. All active code already used the multi-worker implementation. Removed the unused `VODConnectionManager` import from `vod_proxy/views.py`, the unscheduled `cleanup_vod_connections` task from `apps/proxy/tasks.py`, and the unscheduled `cleanup_vod_persistent_connections` task from `core/tasks.py`.
+- Removed dead VOD URL routes: `VODPlaylistView` (playlist generation), `VODPositionView` (position tracking), and the class-based `VODStatsView` (replaced by the existing function-based `vod_stats` view).
+- Removed dead `updateVODPosition()` API method from `frontend/src/api.js`, which called the now-removed position tracking endpoint.
+
 ### Changed
 
 - Refactored frontend form components (`AccountInfoModal`, `AssignChannelNumbers`, `Channel`, `ChannelBatch`, `ChannelGroup`, `Connection`, `CronBuilder`, `DummyEPG`, and `EPG`) to extract business logic into dedicated utility modules under `src/utils/forms/`. Each extracted module is covered by unit tests. Mantine compound component references (`Table.Tbody`, `Popover.Target`, `Accordion.Item`, etc.) have been updated to use flat named imports. — Thanks [@nick4810](https://github.com/nick4810)
-
 - Improved the EPG BOM fix from v0.22.1: replaced the `lstrip(b'\xef\xbb\xbf')` / `startswith` approach with `start.find(b'<?xml')`, which locates the XML declaration regardless of any leading bytes BOM, whitespace, or other encoding markers without needing to know what those bytes are.
 
 ## [0.22.1] - 2026-04-05
diff --git a/apps/proxy/tasks.py b/apps/proxy/tasks.py
index d42e4d9a..b376f99e 100644
--- a/apps/proxy/tasks.py
+++ b/apps/proxy/tasks.py
@@ -1,16 +1,11 @@
-# yourapp/tasks.py
 from celery import shared_task
-from channels.layers import get_channel_layer
-from asgiref.sync import async_to_sync
-import redis
 import json
 import logging
 import re
-import gc  # Add import for garbage collection
+import gc
 from core.utils import RedisClient
 from apps.proxy.ts_proxy.channel_status import ChannelStatus
 from core.utils import send_websocket_update
-from apps.proxy.vod_proxy.connection_manager import get_connection_manager
 
 logger = logging.getLogger(__name__)
 
@@ -61,12 +56,4 @@ def fetch_channel_stats():
     all_channels = None
     gc.collect()
 
-@shared_task
-def cleanup_vod_connections():
-    """Clean up stale VOD connections"""
-    try:
-        connection_manager = get_connection_manager()
-        connection_manager.cleanup_stale_connections(max_age_seconds=3600)  # 1 hour
-        logger.info("VOD connection cleanup completed")
-    except Exception as e:
-        logger.error(f"Error in VOD connection cleanup: {e}", exc_info=True)
+
diff --git a/apps/proxy/vod_proxy/connection_manager.py b/apps/proxy/vod_proxy/connection_manager.py
deleted file mode 100644
index 1692c315..00000000
--- a/apps/proxy/vod_proxy/connection_manager.py
+++ /dev/null
@@ -1,1504 +0,0 @@
-"""
-VOD Connection Manager - Redis-based connection tracking for VOD streams
-"""
-
-import time
-import json
-import logging
-import threading
-import random
-import re
-import requests
-from typing import Optional, Dict, Any
-from django.http import StreamingHttpResponse, HttpResponse
-from core.utils import RedisClient
-from apps.vod.models import Movie, Episode
-from apps.m3u.models import M3UAccountProfile
-
-logger = logging.getLogger("vod_proxy")
-
-
-class PersistentVODConnection:
-    """Handles a single persistent connection to a VOD provider for a session"""
-
-    def __init__(self, session_id: str, stream_url: str, headers: dict):
-        self.session_id = session_id
-        self.stream_url = stream_url
-        self.base_headers = headers
-        self.session = None
-        self.current_response = None
-        self.content_length = None
-        self.content_type = 'video/mp4'
-        self.final_url = None
-        self.lock = threading.Lock()
-        self.request_count = 0  # Track number of requests on this connection
-        self.last_activity = time.time()  # Track last activity for cleanup
-        self.cleanup_timer = None  # Timer for delayed cleanup
-        self.active_streams = 0  # Count of active stream generators
-
-    def _establish_connection(self, range_header=None):
-        """Establish or re-establish connection to provider"""
-        try:
-            if not self.session:
-                self.session = requests.Session()
-
-            headers = self.base_headers.copy()
-
-            # Validate range header against content length
-            if range_header and self.content_length:
-                logger.info(f"[{self.session_id}] Validating range {range_header} against content length {self.content_length}")
-                validated_range = self._validate_range_header(range_header, int(self.content_length))
-                if validated_range is None:
-                    # Range is not satisfiable, but don't raise error - return empty response
-                    logger.warning(f"[{self.session_id}] Range not satisfiable: {range_header} for content length {self.content_length}")
-                    return None
-                elif validated_range != range_header:
-                    range_header = validated_range
-                    logger.info(f"[{self.session_id}] Adjusted range header: {range_header}")
-                else:
-                    logger.info(f"[{self.session_id}] Range header validated successfully: {range_header}")
-            elif range_header:
-                logger.info(f"[{self.session_id}] Range header provided but no content length available yet: {range_header}")
-
-            if range_header:
-                headers['Range'] = range_header
-                logger.info(f"[{self.session_id}] Setting Range header: {range_header}")
-
-            # Track request count for better logging
-            self.request_count += 1
-            if self.request_count == 1:
-                logger.info(f"[{self.session_id}] Making initial request to provider")
-                target_url = self.stream_url
-                allow_redirects = True
-            else:
-                logger.info(f"[{self.session_id}] Making range request #{self.request_count} on SAME session (using final URL)")
-                # Use the final URL from first request to avoid redirect chain
-                target_url = self.final_url if self.final_url else self.stream_url
-                allow_redirects = False  # No need to follow redirects again
-                logger.info(f"[{self.session_id}] Using cached final URL: {target_url}")
-
-            response = self.session.get(
-                target_url,
-                headers=headers,
-                stream=True,
-                timeout=(10, 30),
-                allow_redirects=allow_redirects
-            )
-            response.raise_for_status()
-
-            # Log successful response
-            if self.request_count == 1:
-                logger.info(f"[{self.session_id}] Request #{self.request_count} successful: {response.status_code} (followed redirects)")
-            else:
-                logger.info(f"[{self.session_id}] Request #{self.request_count} successful: {response.status_code} (direct to final URL)")
-
-            # Capture headers from final URL
-            if not self.content_length:
-                # First check if we have a pre-stored content length from HEAD request
-                try:
-                    import redis
-                    from django.conf import settings
-                    redis_host = getattr(settings, 'REDIS_HOST', 'localhost')
-                    redis_port = int(getattr(settings, 'REDIS_PORT', 6379))
-                    redis_db = int(getattr(settings, 'REDIS_DB', 0))
-                    redis_password = getattr(settings, 'REDIS_PASSWORD', '')
-                    redis_user = getattr(settings, 'REDIS_USER', '')
-                    ssl_params = getattr(settings, 'REDIS_SSL_PARAMS', {})
-                    r = redis.StrictRedis(
-                        host=redis_host,
-                        port=redis_port,
-                        db=redis_db,
-                        password=redis_password if redis_password else None,
-                        username=redis_user if redis_user else None,
-                        decode_responses=True,
-                        **ssl_params
-                    )
-                    content_length_key = f"vod_content_length:{self.session_id}"
-                    stored_length = r.get(content_length_key)
-                    if stored_length:
-                        self.content_length = stored_length
-                        logger.info(f"[{self.session_id}] *** USING PRE-STORED CONTENT LENGTH: {self.content_length} ***")
-                    else:
-                        # Fallback to response headers
-                        self.content_length = response.headers.get('content-length')
-                        logger.info(f"[{self.session_id}] *** USING RESPONSE CONTENT LENGTH: {self.content_length} ***")
-                except Exception as e:
-                    logger.error(f"[{self.session_id}] Error checking Redis for content length: {e}")
-                    # Fallback to response headers
-                    self.content_length = response.headers.get('content-length')
-
-                self.content_type = response.headers.get('content-type', 'video/mp4')
-                self.final_url = response.url
-                logger.info(f"[{self.session_id}] *** PERSISTENT CONNECTION - Final URL: {self.final_url} ***")
-                logger.info(f"[{self.session_id}] *** PERSISTENT CONNECTION - Content-Length: {self.content_length} ***")
-
-            self.current_response = response
-            return response
-
-        except Exception as e:
-            logger.error(f"[{self.session_id}] Error establishing connection: {e}")
-            self.cleanup()
-            raise
-
-    def _validate_range_header(self, range_header, content_length):
-        """Validate and potentially adjust range header against content length"""
-        try:
-            if not range_header or not range_header.startswith('bytes='):
-                return range_header
-
-            range_part = range_header.replace('bytes=', '')
-            if '-' not in range_part:
-                return range_header
-
-            start_str, end_str = range_part.split('-', 1)
-
-            # Parse start byte
-            if start_str:
-                start_byte = int(start_str)
-                if start_byte >= content_length:
-                    # Start is beyond file end - not satisfiable
-                    logger.warning(f"[{self.session_id}] Range start {start_byte} >= content length {content_length} - not satisfiable")
-                    return None
-            else:
-                start_byte = 0
-
-            # Parse end byte
-            if end_str:
-                end_byte = int(end_str)
-                if end_byte >= content_length:
-                    # Adjust end to file end
-                    end_byte = content_length - 1
-                    logger.info(f"[{self.session_id}] Adjusted range end to {end_byte}")
-            else:
-                end_byte = content_length - 1
-
-            # Ensure start <= end
-            if start_byte > end_byte:
-                logger.warning(f"[{self.session_id}] Range start {start_byte} > end {end_byte} - not satisfiable")
-                return None
-
-            validated_range = f"bytes={start_byte}-{end_byte}"
-            return validated_range
-
-        except (ValueError, IndexError) as e:
-            logger.warning(f"[{self.session_id}] Could not validate range header {range_header}: {e}")
-            return range_header
-
-    def get_stream(self, range_header=None):
-        """Get stream with optional range header - reuses connection for range requests"""
-        with self.lock:
-            # Update activity timestamp
-            self.last_activity = time.time()
-
-            # Cancel any pending cleanup since connection is being reused
-            self.cancel_cleanup()
-
-            # For range requests, we don't need to close the connection
-            # We can make a new request on the same session
-            if range_header:
-                logger.info(f"[{self.session_id}] Range request on existing connection: {range_header}")
-                # Close only the response stream, keep the session alive
-                if self.current_response:
-                    logger.info(f"[{self.session_id}] Closing previous response stream (keeping connection alive)")
-                    self.current_response.close()
-                    self.current_response = None
-
-            # Make new request (reuses connection if session exists)
-            response = self._establish_connection(range_header)
-            if response is None:
-                # Range not satisfiable - return None to indicate this
-                return None
-
-            return self.current_response
-
-    def cancel_cleanup(self):
-        """Cancel any pending cleanup - called when connection is reused"""
-        if self.cleanup_timer:
-            self.cleanup_timer.cancel()
-            self.cleanup_timer = None
-            logger.info(f"[{self.session_id}] Cancelled pending cleanup - connection being reused for new request")
-
-    def increment_active_streams(self):
-        """Increment the count of active streams"""
-        with self.lock:
-            self.active_streams += 1
-            logger.debug(f"[{self.session_id}] Active streams incremented to {self.active_streams}")
-
-    def decrement_active_streams(self):
-        """Decrement the count of active streams"""
-        with self.lock:
-            if self.active_streams > 0:
-                self.active_streams -= 1
-                logger.debug(f"[{self.session_id}] Active streams decremented to {self.active_streams}")
-            else:
-                logger.warning(f"[{self.session_id}] Attempted to decrement active streams when already at 0")
-
-    def has_active_streams(self) -> bool:
-        """Check if connection has any active streams"""
-        with self.lock:
-            return self.active_streams > 0
-
-    def schedule_cleanup_if_not_streaming(self, delay_seconds: int = 10):
-        """Schedule cleanup only if no active streams"""
-        with self.lock:
-            if self.active_streams > 0:
-                logger.info(f"[{self.session_id}] Connection has {self.active_streams} active streams - NOT scheduling cleanup")
-                return False
-
-            # No active streams, proceed with delayed cleanup
-            if self.cleanup_timer:
-                self.cleanup_timer.cancel()
-
-            def delayed_cleanup():
-                logger.info(f"[{self.session_id}] Delayed cleanup triggered - checking if connection is still needed")
-                # Use the singleton VODConnectionManager instance
-                manager = VODConnectionManager.get_instance()
-                manager.cleanup_persistent_connection(self.session_id)
-
-            self.cleanup_timer = threading.Timer(delay_seconds, delayed_cleanup)
-            self.cleanup_timer.start()
-            logger.info(f"[{self.session_id}] Scheduled cleanup in {delay_seconds} seconds (connection not actively streaming)")
-            return True
-
-    def get_headers(self):
-        """Get headers for response"""
-        return {
-            'content_length': self.content_length,
-            'content_type': self.content_type,
-            'final_url': self.final_url
-        }
-
-    def cleanup(self):
-        """Clean up connection resources"""
-        with self.lock:
-            # Cancel any pending cleanup timer
-            if self.cleanup_timer:
-                self.cleanup_timer.cancel()
-                self.cleanup_timer = None
-                logger.debug(f"[{self.session_id}] Cancelled cleanup timer during manual cleanup")
-
-            # Clear active streams count
-            self.active_streams = 0
-
-            if self.current_response:
-                self.current_response.close()
-                self.current_response = None
-            if self.session:
-                self.session.close()
-                self.session = None
-        logger.info(f"[{self.session_id}] Persistent connection cleaned up")
-
-
-class VODConnectionManager:
-    """Manages VOD connections using Redis for tracking"""
-
-    _instance = None
-    _persistent_connections = {}  # session_id -> PersistentVODConnection
-
-    @classmethod
-    def get_instance(cls):
-        """Get the singleton instance of VODConnectionManager"""
-        if cls._instance is None:
-            cls._instance = cls()
-        return cls._instance
-
-    def __init__(self):
-        self.redis_client = RedisClient.get_client()
-        self.connection_ttl = 3600  # 1 hour TTL for connections
-        self.session_ttl = 1800  # 30 minutes TTL for sessions
-
-    def find_matching_idle_session(self, content_type: str, content_uuid: str,
-                                 client_ip: str, user_agent: str,
-                                 utc_start=None, utc_end=None, offset=None) -> Optional[str]:
-        """
-        Find an existing session that matches content and client criteria with no active streams
-
-        Args:
-            content_type: Type of content (movie, episode, series)
-            content_uuid: UUID of the content
-            client_ip: Client IP address
-            user_agent: Client user agent
-            utc_start: UTC start time for timeshift
-            utc_end: UTC end time for timeshift
-            offset: Offset in seconds
-
-        Returns:
-            Session ID if matching idle session found, None otherwise
-        """
-        if not self.redis_client:
-            return None
-
-        try:
-            # Search for sessions with matching content
-            pattern = "vod_session:*"
-            cursor = 0
-            matching_sessions = []
-
-            while True:
-                cursor, keys = self.redis_client.scan(cursor, match=pattern, count=100)
-
-                for key in keys:
-                    try:
-                        session_data = self.redis_client.hgetall(key)
-                        if not session_data:
-                            continue
-
-                        # Extract session info
-                        stored_content_type = session_data.get('content_type', '')
-                        stored_content_uuid = session_data.get('content_uuid', '')
-
-                        # Check if content matches
-                        if stored_content_type != content_type or stored_content_uuid != content_uuid:
-                            continue
-
-                        # Extract session ID from key
-                        session_id = key.replace('vod_session:', '')
-
-                        # Check if session has an active persistent connection
-                        persistent_conn = self._persistent_connections.get(session_id)
-                        if not persistent_conn:
-                            # No persistent connection exists, skip
-                            continue
-
-                        # Check if connection has no active streams
-                        if persistent_conn.has_active_streams():
-                            logger.debug(f"[{session_id}] Session has active streams - skipping")
-                            continue
-
-                        # Get stored client info for comparison
-                        stored_client_ip = session_data.get('client_ip', '')
-                        stored_user_agent = session_data.get('user_agent', '')
-
-                        # Check timeshift parameters match
-                        stored_utc_start = session_data.get('utc_start', '')
-                        stored_utc_end = session_data.get('utc_end', '')
-                        stored_offset = session_data.get('offset', '')
-
-                        current_utc_start = utc_start or ""
-                        current_utc_end = utc_end or ""
-                        current_offset = str(offset) if offset else ""
-
-                        # Calculate match score
-                        score = 0
-                        match_reasons = []
-
-                        # Content already matches (required)
-                        score += 10
-                        match_reasons.append("content")
-
-                        # IP match (high priority)
-                        if stored_client_ip and stored_client_ip == client_ip:
-                            score += 5
-                            match_reasons.append("ip")
-
-                        # User-Agent match (medium priority)
-                        if stored_user_agent and stored_user_agent == user_agent:
-                            score += 3
-                            match_reasons.append("user-agent")
-
-                        # Timeshift parameters match (high priority for seeking)
-                        if (stored_utc_start == current_utc_start and
-                            stored_utc_end == current_utc_end and
-                            stored_offset == current_offset):
-                            score += 7
-                            match_reasons.append("timeshift")
-
-                        # Consider it a good match if we have at least content + one other criteria
-                        if score >= 13:  # content(10) + ip(5) or content(10) + user-agent(3) + something else
-                            matching_sessions.append({
-                                'session_id': session_id,
-                                'score': score,
-                                'reasons': match_reasons,
-                                'last_activity': float(session_data.get('last_activity', '0'))
-                            })
-
-                    except Exception as e:
-                        logger.debug(f"Error processing session key {key}: {e}")
-                        continue
-
-                if cursor == 0:
-                    break
-
-            # Sort by score (highest first), then by last activity (most recent first)
-            matching_sessions.sort(key=lambda x: (x['score'], x['last_activity']), reverse=True)
-
-            if matching_sessions:
-                best_match = matching_sessions[0]
-                logger.info(f"Found matching idle session: {best_match['session_id']} "
-                          f"(score: {best_match['score']}, reasons: {', '.join(best_match['reasons'])})")
-                return best_match['session_id']
-            else:
-                logger.debug(f"No matching idle sessions found for {content_type} {content_uuid}")
-                return None
-
-        except Exception as e:
-            logger.error(f"Error finding matching idle session: {e}")
-            return None
-
-    def _get_connection_key(self, content_type: str, content_uuid: str, client_id: str) -> str:
-        """Get Redis key for a specific connection"""
-        return f"vod_proxy:connection:{content_type}:{content_uuid}:{client_id}"
-
-    def _get_profile_connections_key(self, profile_id: int) -> str:
-        """Get Redis key for tracking connections per profile - STANDARDIZED with TS proxy"""
-        return f"profile_connections:{profile_id}"
-
-    def _get_content_connections_key(self, content_type: str, content_uuid: str) -> str:
-        """Get Redis key for tracking connections per content"""
-        return f"vod_proxy:content:{content_type}:{content_uuid}:connections"
-
-    def create_connection(self, content_type: str, content_uuid: str, content_name: str,
-                         client_id: str, client_ip: str, user_agent: str,
-                         m3u_profile: M3UAccountProfile) -> bool:
-        """
-        Create a new VOD connection with profile limit checking
-
-        Returns:
-            bool: True if connection was created, False if profile limit exceeded
-        """
-        if not self.redis_client:
-            logger.error("Redis client not available for VOD connection tracking")
-            return False
-
-        try:
-            # Atomically check and reserve a profile connection slot (INCR-first)
-            if not self._check_and_reserve_profile_slot(m3u_profile):
-                logger.warning(f"Profile {m3u_profile.name} connection limit exceeded")
-                return False
-
-            connection_key = self._get_connection_key(content_type, content_uuid, client_id)
-            content_connections_key = self._get_content_connections_key(content_type, content_uuid)
-
-            # Check if connection already exists to prevent duplicate counting
-            if self.redis_client.exists(connection_key):
-                logger.info(f"Connection already exists for {client_id} - {content_type} {content_name}")
-                # Update activity but don't increment profile counter
-                self.redis_client.hset(connection_key, "last_activity", str(time.time()))
-                # Roll back the reservation — connection already counted
-                if m3u_profile.max_streams > 0:
-                    self.redis_client.decr(self._get_profile_connections_key(m3u_profile.id))
-                return True
-
-            # Connection data
-            connection_data = {
-                "content_type": content_type,
-                "content_uuid": content_uuid,
-                "content_name": content_name,
-                "client_id": client_id,
-                "client_ip": client_ip,
-                "user_agent": user_agent,
-                "m3u_profile_id": m3u_profile.id,
-                "m3u_profile_name": m3u_profile.name,
-                "connected_at": str(time.time()),
-                "last_activity": str(time.time()),
-                "bytes_sent": "0",
-                "position_seconds": "0",
-                "last_position_update": str(time.time())
-            }
-
-            # Use pipeline for atomic operations
-            pipe = self.redis_client.pipeline()
-
-            # Store connection data
-            pipe.hset(connection_key, mapping=connection_data)
-            pipe.expire(connection_key, self.connection_ttl)
-
-            # Profile counter already incremented atomically above — no pipe.incr needed
-
-            # Add to content connections set
-            pipe.sadd(content_connections_key, client_id)
-            pipe.expire(content_connections_key, self.connection_ttl)
-
-            # Execute all operations
-            pipe.execute()
-
-            logger.info(f"Created VOD connection: {client_id} for {content_type} {content_name}")
-            return True
-
-        except Exception as e:
-            # Roll back the profile reservation on failure
-            if m3u_profile.max_streams > 0:
-                self.redis_client.decr(self._get_profile_connections_key(m3u_profile.id))
-            logger.error(f"Error creating VOD connection: {e}")
-            return False
-
-    def _check_profile_limits(self, m3u_profile: M3UAccountProfile) -> bool:
-        """Check if profile has available connection slots"""
-        if m3u_profile.max_streams == 0:  # Unlimited
-            return True
-
-        try:
-            profile_connections_key = self._get_profile_connections_key(m3u_profile.id)
-            current_connections = int(self.redis_client.get(profile_connections_key) or 0)
-
-            return current_connections < m3u_profile.max_streams
-
-        except Exception as e:
-            logger.error(f"Error checking profile limits: {e}")
-            return False
-
-    def _check_and_reserve_profile_slot(self, m3u_profile: M3UAccountProfile) -> bool:
-        """
-        Atomically check and reserve a connection slot for the given profile.
-
-        Uses an INCR-first-then-check pattern to eliminate the TOCTOU race
-        condition where separate GET > check > INCR operations could allow
-        concurrent requests to both pass the capacity check.
-
-        For profiles with max_streams=0 (unlimited), no reservation is needed.
-
-        Returns:
-            bool: True if slot was reserved (or unlimited), False if at capacity
-        """
-        if m3u_profile.max_streams == 0:  # Unlimited
-            return True
-
-        try:
-            profile_connections_key = self._get_profile_connections_key(m3u_profile.id)
-
-            # Atomically increment first — single Redis command eliminates race window
-            new_count = self.redis_client.incr(profile_connections_key)
-
-            if new_count <= m3u_profile.max_streams:
-                logger.info(f"[PROFILE-RESERVE] Profile {m3u_profile.id} slot reserved: {new_count}/{m3u_profile.max_streams}")
-                return True
-
-            # Over capacity — roll back the increment
-            self.redis_client.decr(profile_connections_key)
-            logger.info(f"[PROFILE-RESERVE] Profile {m3u_profile.id} at capacity: {new_count - 1}/{m3u_profile.max_streams}")
-            return False
-
-        except Exception as e:
-            logger.error(f"Error reserving profile slot: {e}")
-            return False
-
-    def update_connection_activity(self, content_type: str, content_uuid: str,
-                                 client_id: str, bytes_sent: int = 0,
-                                 position_seconds: int = 0) -> bool:
-        """Update connection activity"""
-        if not self.redis_client:
-            return False
-
-        try:
-            connection_key = self._get_connection_key(content_type, content_uuid, client_id)
-
-            update_data = {
-                "last_activity": str(time.time())
-            }
-
-            if bytes_sent > 0:
-                # Get current bytes and add to it
-                current_bytes = self.redis_client.hget(connection_key, "bytes_sent")
-                if current_bytes:
-                    total_bytes = int(current_bytes) + bytes_sent
-                else:
-                    total_bytes = bytes_sent
-                update_data["bytes_sent"] = str(total_bytes)
-
-            if position_seconds > 0:
-                update_data["position_seconds"] = str(position_seconds)
-
-            # Update connection data
-            self.redis_client.hset(connection_key, mapping=update_data)
-            self.redis_client.expire(connection_key, self.connection_ttl)
-
-            return True
-
-        except Exception as e:
-            logger.error(f"Error updating connection activity: {e}")
-            return False
-
-    def remove_connection(self, content_type: str, content_uuid: str, client_id: str) -> bool:
-        """Remove a VOD connection"""
-        if not self.redis_client:
-            return False
-
-        try:
-            connection_key = self._get_connection_key(content_type, content_uuid, client_id)
-
-            # Get connection data before removing
-            connection_data = self.redis_client.hgetall(connection_key)
-            if not connection_data:
-                return True  # Already removed
-
-            # Get profile ID for cleanup
-            profile_id = None
-            if b"m3u_profile_id" in connection_data:
-                try:
-                    profile_id = int(connection_data["m3u_profile_id"])
-                except ValueError:
-                    pass
-
-            # Use pipeline for atomic cleanup
-            pipe = self.redis_client.pipeline()
-
-            # Remove connection data
-            pipe.delete(connection_key)
-
-            # Decrement profile connections using standardized key
-            if profile_id:
-                profile_connections_key = self._get_profile_connections_key(profile_id)
-                current_count = int(self.redis_client.get(profile_connections_key) or 0)
-                if current_count > 0:
-                    pipe.decr(profile_connections_key)
-
-            # Remove from content connections set
-            content_connections_key = self._get_content_connections_key(content_type, content_uuid)
-            pipe.srem(content_connections_key, client_id)
-
-            # Execute cleanup
-            pipe.execute()
-
-            logger.info(f"Removed VOD connection: {client_id}")
-            return True
-
-        except Exception as e:
-            logger.error(f"Error removing connection: {e}")
-            return False
-
-    def get_connection_info(self, content_type: str, content_uuid: str, client_id: str) -> Optional[Dict[str, Any]]:
-        """Get connection information"""
-        if not self.redis_client:
-            return None
-
-        try:
-            connection_key = self._get_connection_key(content_type, content_uuid, client_id)
-            connection_data = self.redis_client.hgetall(connection_key)
-
-            if not connection_data:
-                return None
-
-            # Convert bytes to strings and parse numbers
-            info = {}
-            for key, value in connection_data.items():
-
-                # Parse numeric fields
-                if key in ['connected_at', 'last_activity']:
-                    info[key] = float(value)
-                elif key in ['bytes_sent', 'position_seconds', 'm3u_profile_id']:
-                    info[key] = int(valuvaluee_str)
-                else:
-                    info[key] = value
-
-            return info
-
-        except Exception as e:
-            logger.error(f"Error getting connection info: {e}")
-            return None
-
-    def get_profile_connections(self, profile_id: int) -> int:
-        """Get current connection count for a profile using standardized key"""
-        if not self.redis_client:
-            return 0
-
-        try:
-            profile_connections_key = self._get_profile_connections_key(profile_id)
-            return int(self.redis_client.get(profile_connections_key) or 0)
-
-        except Exception as e:
-            logger.error(f"Error getting profile connections: {e}")
-            return 0
-
-    def get_content_connections(self, content_type: str, content_uuid: str) -> int:
-        """Get current connection count for content"""
-        if not self.redis_client:
-            return 0
-
-        try:
-            content_connections_key = self._get_content_connections_key(content_type, content_uuid)
-            return self.redis_client.scard(content_connections_key) or 0
-
-        except Exception as e:
-            logger.error(f"Error getting content connections: {e}")
-            return 0
-
-    def cleanup_stale_connections(self, max_age_seconds: int = 3600):
-        """Clean up stale connections that haven't been active recently"""
-        if not self.redis_client:
-            return
-
-        try:
-            pattern = "vod_proxy:connection:*"
-            cursor = 0
-            cleaned = 0
-            current_time = time.time()
-
-            while True:
-                cursor, keys = self.redis_client.scan(cursor, match=pattern, count=100)
-
-                for key in keys:
-                    try:
-                        last_activity = self.redis_client.hget(key, "last_activity")
-
-                        if last_activity:
-                            last_activity_time = float(last_activity)
-                            if current_time - last_activity_time > max_age_seconds:
-                                # Extract info for cleanup
-                                parts = key.split(':')
-                                if len(parts) >= 5:
-                                    content_type = parts[2]
-                                    content_uuid = parts[3]
-                                    client_id = parts[4]
-                                    self.remove_connection(content_type, content_uuid, client_id)
-                                    cleaned += 1
-                    except Exception as e:
-                        logger.error(f"Error processing key {key}: {e}")
-
-                if cursor == 0:
-                    break
-
-            if cleaned > 0:
-                logger.info(f"Cleaned up {cleaned} stale VOD connections")
-
-        except Exception as e:
-            logger.error(f"Error during connection cleanup: {e}")
-
-    def stream_content(self, content_obj, stream_url, m3u_profile, client_ip, user_agent, request,
-                      utc_start=None, utc_end=None, offset=None, range_header=None):
-        """
-        Stream VOD content with connection tracking and timeshift support
-
-        Args:
-            content_obj: Movie or Episode object
-            stream_url: Final stream URL to proxy
-            m3u_profile: M3UAccountProfile instance
-            client_ip: Client IP address
-            user_agent: Client user agent
-            request: Django request object
-            utc_start: UTC start time for timeshift (e.g., '2023-01-01T12:00:00')
-            utc_end: UTC end time for timeshift
-            offset: Offset in seconds for seeking
-            range_header: HTTP Range header for partial content requests
-
-        Returns:
-            StreamingHttpResponse or HttpResponse with error
-        """
-
-        try:
-            # Generate unique client ID
-            client_id = f"vod_{int(time.time() * 1000)}_{random.randint(1000, 9999)}"
-
-            # Determine content type and get content info
-            if hasattr(content_obj, 'episodes'):  # Series
-                content_type = 'series'
-            elif hasattr(content_obj, 'series'):  # Episode
-                content_type = 'episode'
-            else:  # Movie
-                content_type = 'movie'
-
-            content_uuid = str(content_obj.uuid)
-            content_name = getattr(content_obj, 'name', getattr(content_obj, 'title', 'Unknown'))
-
-            # Create connection tracking
-            connection_created = self.create_connection(
-                content_type=content_type,
-                content_uuid=content_uuid,
-                content_name=content_name,
-                client_id=client_id,
-                client_ip=client_ip,
-                user_agent=user_agent,
-                m3u_profile=m3u_profile
-            )
-
-            if not connection_created:
-                logger.error(f"Failed to create connection tracking for {content_type} {content_uuid}")
-                return HttpResponse("Connection limit exceeded", status=503)
-
-            # Modify stream URL for timeshift functionality
-            modified_stream_url = self._apply_timeshift_parameters(
-                stream_url, utc_start, utc_end, offset
-            )
-
-            logger.info(f"[{client_id}] Modified stream URL for timeshift: {modified_stream_url}")
-
-            # Create streaming generator with simplified header handling
-            upstream_response = None
-
-            def stream_generator():
-                nonlocal upstream_response
-                try:
-                    logger.info(f"[{client_id}] Starting VOD stream for {content_type} {content_name}")
-
-                    # Prepare request headers
-                    headers = {}
-                    if user_agent:
-                        headers['User-Agent'] = user_agent
-
-                    # Forward important headers
-                    important_headers = [
-                        'authorization', 'x-forwarded-for', 'x-real-ip',
-                        'referer', 'origin', 'accept'
-                    ]
-
-                    for header_name in important_headers:
-                        django_header = f'HTTP_{header_name.upper().replace("-", "_")}'
-                        if hasattr(request, 'META') and django_header in request.META:
-                            headers[header_name] = request.META[django_header]
-                            logger.debug(f"[{client_id}] Forwarded header {header_name}")
-
-                    # Add client IP
-                    if client_ip:
-                        headers['X-Forwarded-For'] = client_ip
-                        headers['X-Real-IP'] = client_ip
-
-                    # Add Range header if provided for seeking support
-                    if range_header:
-                        headers['Range'] = range_header
-                        logger.info(f"[{client_id}] Added Range header: {range_header}")
-
-                    # Make request to upstream server with automatic redirect following
-                    upstream_response = requests.get(modified_stream_url, headers=headers, stream=True, timeout=(10, 30), allow_redirects=True)
-                    upstream_response.raise_for_status()
-
-                    # Log upstream response info
-                    logger.info(f"[{client_id}] Upstream response status: {upstream_response.status_code}")
-                    logger.info(f"[{client_id}] Upstream content-type: {upstream_response.headers.get('content-type', 'unknown')}")
-                    if 'content-length' in upstream_response.headers:
-                        logger.info(f"[{client_id}] Upstream content-length: {upstream_response.headers['content-length']}")
-                    if 'content-range' in upstream_response.headers:
-                        logger.info(f"[{client_id}] Upstream content-range: {upstream_response.headers['content-range']}")
-
-                    bytes_sent = 0
-                    chunk_count = 0
-
-                    for chunk in upstream_response.iter_content(chunk_size=8192):
-                        if chunk:
-                            yield chunk
-                            bytes_sent += len(chunk)
-                            chunk_count += 1
-
-                            # Update connection activity every 100 chunks
-                            if chunk_count % 100 == 0:
-                                self.update_connection_activity(
-                                    content_type=content_type,
-                                    content_uuid=content_uuid,
-                                    client_id=client_id,
-                                    bytes_sent=len(chunk)
-                                )
-
-                    logger.info(f"[{client_id}] VOD stream completed: {bytes_sent} bytes sent")
-
-                except requests.RequestException as e:
-                    logger.error(f"[{client_id}] Error streaming from source: {e}")
-                    yield b"Error: Unable to stream content"
-                except Exception as e:
-                    logger.error(f"[{client_id}] Error in stream generator: {e}")
-                finally:
-                    # Clean up connection tracking
-                    self.remove_connection(content_type, content_uuid, client_id)
-                    if upstream_response:
-                        upstream_response.close()
-
-            def stream_generator():
-                nonlocal upstream_response
-                try:
-                    logger.info(f"[{client_id}] Starting VOD stream for {content_type} {content_name}")
-
-                    # Prepare request headers
-                    headers = {}
-                    if user_agent:
-                        headers['User-Agent'] = user_agent
-
-                    # Forward important headers
-                    important_headers = [
-                        'authorization', 'x-forwarded-for', 'x-real-ip',
-                        'referer', 'origin', 'accept'
-                    ]
-
-                    for header_name in important_headers:
-                        django_header = f'HTTP_{header_name.upper().replace("-", "_")}'
-                        if hasattr(request, 'META') and django_header in request.META:
-                            headers[header_name] = request.META[django_header]
-                            logger.debug(f"[{client_id}] Forwarded header {header_name}")
-
-                    # Add client IP
-                    if client_ip:
-                        headers['X-Forwarded-For'] = client_ip
-                        headers['X-Real-IP'] = client_ip
-
-                    # Add Range header if provided for seeking support
-                    if range_header:
-                        headers['Range'] = range_header
-                        logger.info(f"[{client_id}] Added Range header: {range_header}")
-
-                    # Make single request to upstream server with automatic redirect following
-                    upstream_response = requests.get(modified_stream_url, headers=headers, stream=True, timeout=(10, 30), allow_redirects=True)
-                    upstream_response.raise_for_status()
-
-                    # Log upstream response info
-                    logger.info(f"[{client_id}] Upstream response status: {upstream_response.status_code}")
-                    logger.info(f"[{client_id}] Final URL after redirects: {upstream_response.url}")
-                    logger.info(f"[{client_id}] Upstream content-type: {upstream_response.headers.get('content-type', 'unknown')}")
-                    if 'content-length' in upstream_response.headers:
-                        logger.info(f"[{client_id}] Upstream content-length: {upstream_response.headers['content-length']}")
-                    if 'content-range' in upstream_response.headers:
-                        logger.info(f"[{client_id}] Upstream content-range: {upstream_response.headers['content-range']}")
-
-                    bytes_sent = 0
-                    chunk_count = 0
-
-                    for chunk in upstream_response.iter_content(chunk_size=8192):
-                        if chunk:
-                            yield chunk
-                            bytes_sent += len(chunk)
-                            chunk_count += 1
-
-                            # Update connection activity every 100 chunks
-                            if chunk_count % 100 == 0:
-                                self.update_connection_activity(
-                                    content_type=content_type,
-                                    content_uuid=content_uuid,
-                                    client_id=client_id,
-                                    bytes_sent=len(chunk)
-                                )
-
-                    logger.info(f"[{client_id}] VOD stream completed: {bytes_sent} bytes sent")
-
-                except requests.RequestException as e:
-                    logger.error(f"[{client_id}] Error streaming from source: {e}")
-                    yield b"Error: Unable to stream content"
-                except Exception as e:
-                    logger.error(f"[{client_id}] Error in stream generator: {e}")
-                finally:
-                    # Clean up connection tracking
-                    self.remove_connection(content_type, content_uuid, client_id)
-                    if upstream_response:
-                        upstream_response.close()
-
-            # Create streaming response with sensible defaults
-            response = StreamingHttpResponse(
-                streaming_content=stream_generator(),
-                content_type='video/mp4'
-            )
-
-            # Set status code based on request type
-            if range_header:
-                response.status_code = 206
-                logger.info(f"[{client_id}] Set response status to 206 for range request")
-            else:
-                response.status_code = 200
-                logger.info(f"[{client_id}] Set response status to 200 for full request")
-
-            # Set headers that VLC and other players expect
-            response['Cache-Control'] = 'no-cache'
-            response['Pragma'] = 'no-cache'
-            response['X-Content-Type-Options'] = 'nosniff'
-            response['Connection'] = 'keep-alive'
-            response['Accept-Ranges'] = 'bytes'
-
-            # Log the critical headers we're sending to the client
-            logger.info(f"[{client_id}] Response headers to client - Status: {response.status_code}, Accept-Ranges: {response.get('Accept-Ranges', 'MISSING')}")
-            if 'Content-Length' in response:
-                logger.info(f"[{client_id}] Content-Length: {response['Content-Length']}")
-            if 'Content-Range' in response:
-                logger.info(f"[{client_id}] Content-Range: {response['Content-Range']}")
-            if 'Content-Type' in response:
-                logger.info(f"[{client_id}] Content-Type: {response['Content-Type']}")
-
-            # Critical: Log what VLC needs to see for seeking to work
-            if response.status_code == 200:
-                logger.info(f"[{client_id}] VLC SEEKING INFO: Full content response (200). VLC should see Accept-Ranges and Content-Length to enable seeking.")
-            elif response.status_code == 206:
-                logger.info(f"[{client_id}] VLC SEEKING INFO: Partial content response (206). This confirms seeking is working if VLC requested a range.")
-
-            return response
-
-        except Exception as e:
-            logger.error(f"Error in stream_content: {e}", exc_info=True)
-            return HttpResponse(f"Streaming error: {str(e)}", status=500)
-
-    def stream_content_with_session(self, session_id, content_obj, stream_url, m3u_profile, client_ip, user_agent, request,
-                                  utc_start=None, utc_end=None, offset=None, range_header=None, user=None):
-        """
-        Stream VOD content with persistent connection per session
-
-        Maintains 1 open connection to provider per session that handles all range requests
-        dynamically based on client Range headers for seeking functionality.
-        """
-
-        try:
-            # Use session_id as client_id for connection tracking
-            client_id = session_id
-
-            # Determine content type and get content info
-            if hasattr(content_obj, 'episodes'):  # Series
-                content_type = 'series'
-            elif hasattr(content_obj, 'series'):  # Episode
-                content_type = 'episode'
-            else:  # Movie
-                content_type = 'movie'
-
-            content_uuid = str(content_obj.uuid)
-            content_name = getattr(content_obj, 'name', getattr(content_obj, 'title', 'Unknown'))
-
-            # Check for existing connection or create new one
-            persistent_conn = self._persistent_connections.get(session_id)
-
-            # Cancel any pending cleanup timer for this session regardless of new/existing
-            if persistent_conn:
-                persistent_conn.cancel_cleanup()
-
-            # If no existing connection, try to find a matching idle session first
-            if not persistent_conn:
-                # Look for existing idle sessions that match content and client criteria
-                matching_session_id = self.find_matching_idle_session(
-                    content_type, content_uuid, client_ip, user_agent,
-                    utc_start, utc_end, offset
-                )
-
-                if matching_session_id:
-                    logger.info(f"[{client_id}] Found matching idle session {matching_session_id} - redirecting client")
-
-                    # Update the session activity and client info
-                    session_key = f"vod_session:{matching_session_id}"
-                    if self.redis_client:
-                        update_data = {
-                            "last_activity": str(time.time()),
-                            "client_ip": client_ip,  # Update in case IP changed
-                            "user_agent": user_agent  # Update in case user agent changed
-                        }
-                        self.redis_client.hset(session_key, mapping=update_data)
-                        self.redis_client.expire(session_key, self.session_ttl)
-
-                    # Get the existing persistent connection
-                    persistent_conn = self._persistent_connections.get(matching_session_id)
-                    if persistent_conn:
-                        # Update the session_id to use the matching one
-                        client_id = matching_session_id
-                        session_id = matching_session_id
-                        logger.info(f"[{client_id}] Successfully redirected to existing idle session")
-                    else:
-                        logger.warning(f"[{client_id}] Matching session found but no persistent connection - will create new")
-
-            if not persistent_conn:
-                logger.info(f"[{client_id}] Creating NEW persistent connection for {content_type} {content_name}")
-
-                # Create session in Redis for tracking
-                session_info = {
-                    "content_type": content_type,
-                    "content_uuid": content_uuid,
-                    "content_name": content_name,
-                    "created_at": str(time.time()),
-                    "last_activity": str(time.time()),
-                    "profile_id": str(m3u_profile.id),
-                    "connection_counted": "True",
-                    "client_ip": client_ip,
-                    "user_agent": user_agent,
-                    "utc_start": utc_start or "",
-                    "utc_end": utc_end or "",
-                    "offset": str(offset) if offset else ""
-                }
-
-                session_key = f"vod_session:{session_id}"
-                if self.redis_client:
-                    self.redis_client.hset(session_key, mapping=session_info)
-                    self.redis_client.expire(session_key, self.session_ttl)
-
-                logger.info(f"[{client_id}] Created new session: {session_info}")
-
-                # Apply timeshift parameters to URL
-                modified_stream_url = self._apply_timeshift_parameters(stream_url, utc_start, utc_end, offset)
-                logger.info(f"[{client_id}] Modified stream URL for timeshift: {modified_stream_url}")
-
-                # Prepare headers
-                headers = {
-                    'User-Agent': user_agent or 'VLC/3.0.21 LibVLC/3.0.21',
-                    'Accept': '*/*',
-                    'Connection': 'keep-alive'
-                }
-
-                # Add any authentication headers from profile
-                if hasattr(m3u_profile, 'auth_headers') and m3u_profile.auth_headers:
-                    headers.update(m3u_profile.auth_headers)
-
-                # Create persistent connection
-                persistent_conn = PersistentVODConnection(session_id, modified_stream_url, headers)
-                self._persistent_connections[session_id] = persistent_conn
-
-                # Track connection in profile
-                self.create_connection(content_type, content_uuid, content_name, client_id, client_ip, user_agent, m3u_profile)
-            else:
-                logger.info(f"[{client_id}] Using EXISTING persistent connection for {content_type} {content_name}")
-                # Update session activity
-                session_key = f"vod_session:{session_id}"
-                if self.redis_client:
-                    self.redis_client.hset(session_key, "last_activity", str(time.time()))
-                    self.redis_client.expire(session_key, self.session_ttl)
-
-                logger.info(f"[{client_id}] Reusing existing session - no new connection created")
-
-            # Log the incoming Range header for debugging
-            if range_header:
-                logger.info(f"[{client_id}] *** CLIENT RANGE REQUEST: {range_header} ***")
-
-                # Parse range for seeking detection
-                try:
-                    if 'bytes=' in range_header:
-                        range_part = range_header.replace('bytes=', '')
-                        if '-' in range_part:
-                            start_byte, end_byte = range_part.split('-', 1)
-                            if start_byte and int(start_byte) > 0:
-                                start_pos_mb = int(start_byte) / (1024 * 1024)
-                                logger.info(f"[{client_id}] *** VLC SEEKING TO: {start_pos_mb:.1f} MB ***")
-                            else:
-                                logger.info(f"[{client_id}] Range request from start")
-                except Exception as e:
-                    logger.warning(f"[{client_id}] Could not parse range header: {e}")
-            else:
-                logger.info(f"[{client_id}] Full content request (no Range header)")
-
-            # Get stream from persistent connection with current range
-            upstream_response = persistent_conn.get_stream(range_header)
-
-            # Handle range not satisfiable
-            if upstream_response is None:
-                logger.warning(f"[{client_id}] Range not satisfiable - returning 416 error")
-                return HttpResponse(
-                    "Requested Range Not Satisfiable",
-                    status=416,
-                    headers={
-                        'Content-Range': f'bytes */{persistent_conn.content_length}' if persistent_conn.content_length else 'bytes */*'
-                    }
-                )
-
-            connection_headers = persistent_conn.get_headers()
-
-            # Ensure any pending cleanup is cancelled before starting stream
-            persistent_conn.cancel_cleanup()
-
-            # Create streaming generator
-            def stream_generator():
-                decremented = False  # Track if we've already decremented the counter
-
-                try:
-                    logger.info(f"[{client_id}] Starting stream from persistent connection")
-
-                    # Increment active streams counter
-                    persistent_conn.increment_active_streams()
-
-                    bytes_sent = 0
-                    chunk_count = 0
-
-                    for chunk in upstream_response.iter_content(chunk_size=8192):
-                        if chunk:
-                            yield chunk
-                            bytes_sent += len(chunk)
-                            chunk_count += 1
-
-                            # Update connection activity every 100 chunks
-                            if chunk_count % 100 == 0:
-                                self.update_connection_activity(
-                                    content_type=content_type,
-                                    content_uuid=content_uuid,
-                                    client_id=client_id,
-                                    bytes_sent=len(chunk)
-                                )
-
-                    logger.info(f"[{client_id}] Persistent stream completed normally: {bytes_sent} bytes sent")
-                    # Stream completed normally - decrement counter
-                    persistent_conn.decrement_active_streams()
-                    decremented = True
-
-                except GeneratorExit:
-                    # Client disconnected - decrement counter and schedule cleanup only if no active streams
-                    logger.info(f"[{client_id}] Client disconnected - checking if cleanup should be scheduled")
-                    persistent_conn.decrement_active_streams()
-                    decremented = True
-                    scheduled = persistent_conn.schedule_cleanup_if_not_streaming(delay_seconds=10)
-                    if not scheduled:
-                        logger.info(f"[{client_id}] Cleanup not scheduled - connection still has active streams")
-
-                except Exception as e:
-                    logger.error(f"[{client_id}] Error in persistent stream: {e}")
-                    # On error, decrement counter and cleanup the connection as it may be corrupted
-                    persistent_conn.decrement_active_streams()
-                    decremented = True
-                    logger.info(f"[{client_id}] Cleaning up persistent connection due to error")
-                    self.cleanup_persistent_connection(session_id)
-                    yield b"Error: Stream interrupted"
-
-                finally:
-                    # Safety net: only decrement if we haven't already
-                    if not decremented:
-                        logger.warning(f"[{client_id}] Stream generator exited without decrement - applying safety net")
-                        persistent_conn.decrement_active_streams()
-                    # This runs regardless of how the generator exits
-                    logger.debug(f"[{client_id}] Stream generator finished")
-
-            # Create streaming response
-            response = StreamingHttpResponse(
-                streaming_content=stream_generator(),
-                content_type=connection_headers['content_type']
-            )
-
-            # Set status code based on range request
-            if range_header:
-                response.status_code = 206
-                logger.info(f"[{client_id}] Set response status to 206 for range request")
-            else:
-                response.status_code = 200
-                logger.info(f"[{client_id}] Set response status to 200 for full request")
-
-            # Set headers that VLC expects
-            response['Cache-Control'] = 'no-cache'
-            response['Pragma'] = 'no-cache'
-            response['X-Content-Type-Options'] = 'nosniff'
-            response['Connection'] = 'keep-alive'
-            response['Accept-Ranges'] = 'bytes'
-
-            # CRITICAL: Forward Content-Length from persistent connection
-            if connection_headers['content_length']:
-                response['Content-Length'] = connection_headers['content_length']
-                logger.info(f"[{client_id}] *** FORWARDED Content-Length: {connection_headers['content_length']} *** (VLC seeking enabled)")
-            else:
-                logger.warning(f"[{client_id}] *** NO Content-Length available *** (VLC seeking may not work)")
-
-            # Handle range requests - set Content-Range for partial responses
-            if range_header and connection_headers['content_length']:
-                try:
-                    if 'bytes=' in range_header:
-                        range_part = range_header.replace('bytes=', '')
-                        if '-' in range_part:
-                            start_byte, end_byte = range_part.split('-', 1)
-                            start = int(start_byte) if start_byte else 0
-                            end = int(end_byte) if end_byte else int(connection_headers['content_length']) - 1
-                            total_size = int(connection_headers['content_length'])
-
-                            content_range = f"bytes {start}-{end}/{total_size}"
-                            response['Content-Range'] = content_range
-                            logger.info(f"[{client_id}] Set Content-Range: {content_range}")
-                except Exception as e:
-                    logger.warning(f"[{client_id}] Could not set Content-Range: {e}")
-
-            # Log response headers
-            logger.info(f"[{client_id}] PERSISTENT Response - Status: {response.status_code}, Content-Length: {response.get('Content-Length', 'MISSING')}")
-            if 'Content-Range' in response:
-                logger.info(f"[{client_id}] PERSISTENT Content-Range: {response['Content-Range']}")
-
-            # Log VLC seeking status
-            if response.status_code == 200:
-                if connection_headers['content_length']:
-                    logger.info(f"[{client_id}] ✅ PERSISTENT VLC SEEKING: Full response with Content-Length - seeking should work!")
-                else:
-                    logger.info(f"[{client_id}] ❌ PERSISTENT VLC SEEKING: Full response but no Content-Length - seeking won't work!")
-            elif response.status_code == 206:
-                logger.info(f"[{client_id}] ✅ PERSISTENT VLC SEEKING: Partial response - seeking is working!")
-
-            return response
-
-        except Exception as e:
-            logger.error(f"Error in persistent stream_content_with_session: {e}", exc_info=True)
-            # Cleanup persistent connection on error
-            if session_id in self._persistent_connections:
-                self._persistent_connections[session_id].cleanup()
-                del self._persistent_connections[session_id]
-            return HttpResponse(f"Streaming error: {str(e)}", status=500)
-
-    def _apply_timeshift_parameters(self, original_url, utc_start=None, utc_end=None, offset=None):
-        """
-        Apply timeshift parameters to the stream URL
-
-        Args:
-            original_url: Original stream URL
-            utc_start: UTC start time (ISO format string)
-            utc_end: UTC end time (ISO format string)
-            offset: Offset in seconds
-
-        Returns:
-            Modified URL with timeshift parameters
-        """
-        try:
-            from urllib.parse import urlparse, parse_qs, urlencode, urlunparse
-
-            parsed_url = urlparse(original_url)
-            query_params = parse_qs(parsed_url.query)
-
-            logger.debug(f"Original URL: {original_url}")
-            logger.debug(f"Original query params: {query_params}")
-
-            # Add timeshift parameters if provided
-            if utc_start:
-                # Support both utc_start and start parameter names
-                query_params['utc_start'] = [utc_start]
-                query_params['start'] = [utc_start]  # Some providers use 'start'
-                logger.info(f"Added utc_start/start parameter: {utc_start}")
-
-            if utc_end:
-                # Support both utc_end and end parameter names
-                query_params['utc_end'] = [utc_end]
-                query_params['end'] = [utc_end]  # Some providers use 'end'
-                logger.info(f"Added utc_end/end parameter: {utc_end}")
-
-            if offset:
-                try:
-                    # Ensure offset is a valid number
-                    offset_seconds = int(offset)
-                    # Support multiple offset parameter names
-                    query_params['offset'] = [str(offset_seconds)]
-                    query_params['seek'] = [str(offset_seconds)]  # Some providers use 'seek'
-                    query_params['t'] = [str(offset_seconds)]     # Some providers use 't'
-                    logger.info(f"Added offset/seek/t parameter: {offset_seconds} seconds")
-                except (ValueError, TypeError):
-                    logger.warning(f"Invalid offset value: {offset}, skipping")
-
-            # Handle special URL patterns for VOD providers
-            # Some providers embed timeshift info in the path rather than query params
-            path = parsed_url.path
-
-            # Check if this looks like an IPTV catchup URL pattern
-            catchup_pattern = r'/(\d{4}-\d{2}-\d{2})/(\d{2}-\d{2}-\d{2})'
-            if utc_start and re.search(catchup_pattern, path):
-                # Convert ISO format to provider-specific format if needed
-                try:
-                    from datetime import datetime
-                    start_dt = datetime.fromisoformat(utc_start.replace('Z', '+00:00'))
-                    date_part = start_dt.strftime('%Y-%m-%d')
-                    time_part = start_dt.strftime('%H-%M-%S')
-
-                    # Replace existing date/time in path
-                    path = re.sub(catchup_pattern, f'/{date_part}/{time_part}', path)
-                    logger.info(f"Modified path for catchup: {path}")
-                except Exception as e:
-                    logger.warning(f"Could not parse timeshift date: {e}")
-
-            # Reconstruct URL with new parameters
-            new_query = urlencode(query_params, doseq=True)
-            modified_url = urlunparse((
-                parsed_url.scheme,
-                parsed_url.netloc,
-                path,  # Use potentially modified path
-                parsed_url.params,
-                new_query,
-                parsed_url.fragment
-            ))
-
-            logger.info(f"Modified URL: {modified_url}")
-            return modified_url
-
-        except Exception as e:
-            logger.error(f"Error applying timeshift parameters: {e}")
-            return original_url
-
-    def cleanup_persistent_connection(self, session_id: str):
-        """Clean up a specific persistent connection"""
-        if session_id in self._persistent_connections:
-            logger.info(f"[{session_id}] Cleaning up persistent connection")
-            self._persistent_connections[session_id].cleanup()
-            del self._persistent_connections[session_id]
-
-            # Clean up ALL Redis keys associated with this session
-            session_key = f"vod_session:{session_id}"
-            if self.redis_client:
-                try:
-                    session_data = self.redis_client.hgetall(session_key)
-                    if session_data:
-                        # Get session details for connection cleanup
-                        content_type = session_data.get('content_type', '')
-                        content_uuid = session_data.get('content_uuid', '')
-                        profile_id = session_data.get('profile_id')
-
-                        # Generate client_id from session_id (matches what's used during streaming)
-                        client_id = session_id
-
-                        # Remove individual connection tracking keys created during streaming
-                        # Check if connection key exists first - remove_connection()
-                        # handles the profile DECR when the key exists, but skips it
-                        # if the key already expired by TTL
-                        connection_key_exists = False
-                        if content_type and content_uuid:
-                            connection_key = self._get_connection_key(content_type, content_uuid, client_id)
-                            connection_key_exists = bool(self.redis_client.exists(connection_key))
-                            logger.info(f"[{session_id}] Cleaning up connection tracking keys")
-                            self.remove_connection(content_type, content_uuid, client_id)
-
-                        # Fallback DECR: only if the connection tracking key had already
-                        # expired (remove_connection skips DECR in that case)
-                        if not connection_key_exists:
-                            if session_data.get('connection_counted') == 'True' and profile_id:
-                                profile_key = self._get_profile_connections_key(int(profile_id))
-                                current_count = int(self.redis_client.get(profile_key) or 0)
-                                if current_count > 0:
-                                    self.redis_client.decr(profile_key)
-                                    logger.info(f"[{session_id}] Decremented profile {profile_id} connections (fallback)")
-
-                    # Remove session tracking key
-                    self.redis_client.delete(session_key)
-                    logger.info(f"[{session_id}] Removed session tracking")
-
-                    # Clean up any additional session-related keys (pattern cleanup)
-                    try:
-                        # Look for any other keys that might be related to this session
-                        pattern = f"*{session_id}*"
-                        cursor = 0
-                        session_related_keys = []
-                        while True:
-                            cursor, keys = self.redis_client.scan(cursor, match=pattern, count=100)
-                            session_related_keys.extend(keys)
-                            if cursor == 0:
-                                break
-
-                        if session_related_keys:
-                            # Filter out keys we already deleted
-                            remaining_keys = [k for k in session_related_keys if k != session_key]
-                            if remaining_keys:
-                                self.redis_client.delete(*remaining_keys)
-                                logger.info(f"[{session_id}] Cleaned up {len(remaining_keys)} additional session-related keys")
-                    except Exception as scan_error:
-                        logger.warning(f"[{session_id}] Error during pattern cleanup: {scan_error}")
-
-                except Exception as e:
-                    logger.error(f"[{session_id}] Error cleaning up session: {e}")
-
-    def cleanup_stale_persistent_connections(self, max_age_seconds: int = 1800):
-        """Clean up stale persistent connections that haven't been used recently"""
-        current_time = time.time()
-        stale_sessions = []
-
-        for session_id, conn in self._persistent_connections.items():
-            try:
-                # Check connection's last activity time first
-                if hasattr(conn, 'last_activity'):
-                    time_since_last_activity = current_time - conn.last_activity
-                    if time_since_last_activity > max_age_seconds:
-                        logger.info(f"[{session_id}] Connection inactive for {time_since_last_activity:.1f}s (max: {max_age_seconds}s)")
-                        stale_sessions.append(session_id)
-                        continue
-
-                # Fallback to Redis session data if connection doesn't have last_activity
-                session_key = f"vod_session:{session_id}"
-                if self.redis_client:
-                    session_data = self.redis_client.hgetall(session_key)
-                    if session_data:
-                        created_at = float(session_data.get('created_at', '0'))
-                        if current_time - created_at > max_age_seconds:
-                            logger.info(f"[{session_id}] Session older than {max_age_seconds}s")
-                            stale_sessions.append(session_id)
-                    else:
-                        # Session data missing, connection is stale
-                        logger.info(f"[{session_id}] Session data missing from Redis")
-                        stale_sessions.append(session_id)
-
-            except Exception as e:
-                logger.error(f"[{session_id}] Error checking session age: {e}")
-                stale_sessions.append(session_id)
-
-        # Clean up stale connections
-        for session_id in stale_sessions:
-            logger.info(f"[{session_id}] Cleaning up stale persistent connection")
-            self.cleanup_persistent_connection(session_id)
-
-        if stale_sessions:
-            logger.info(f"Cleaned up {len(stale_sessions)} stale persistent connections")
-        else:
-            logger.debug(f"No stale persistent connections found (checked {len(self._persistent_connections)} connections)")
-
-
-# Global instance
-_connection_manager = None
-
-def get_connection_manager() -> VODConnectionManager:
-    """Get the global VOD connection manager instance"""
-    global _connection_manager
-    if _connection_manager is None:
-        _connection_manager = VODConnectionManager()
-    return _connection_manager
diff --git a/apps/proxy/vod_proxy/urls.py b/apps/proxy/vod_proxy/urls.py
index f79e6b48..19f4ed4f 100644
--- a/apps/proxy/vod_proxy/urls.py
+++ b/apps/proxy/vod_proxy/urls.py
@@ -13,15 +13,8 @@ urlpatterns = [
     path('<str:content_type>/<uuid:content_id>', stream_vod, name='vod_stream'),
     path('<str:content_type>/<uuid:content_id>/<int:profile_id>/', stream_vod, name='vod_stream_with_profile'),
 
-    # VOD playlist generation
-    path('playlist/', views.VODPlaylistView.as_view(), name='vod_playlist'),
-    path('playlist/<int:profile_id>/', views.VODPlaylistView.as_view(), name='vod_playlist_with_profile'),
-
-    # Position tracking
-    path('position/<uuid:content_id>/', views.VODPositionView.as_view(), name='vod_position'),
-
     # VOD Stats
-    path('stats/', views.VODStatsView.as_view(), name='vod_stats'),
+    path('stats/', views.vod_stats, name='vod_stats'),
 
     # Stop VOD client connection
     path('stop_client/', views.stop_vod_client, name='stop_vod_client'),
diff --git a/apps/proxy/vod_proxy/views.py b/apps/proxy/vod_proxy/views.py
index e6b6e144..fdebdcea 100644
--- a/apps/proxy/vod_proxy/views.py
+++ b/apps/proxy/vod_proxy/views.py
@@ -7,18 +7,16 @@ import time
 import random
 import logging
 import requests
-from django.http import StreamingHttpResponse, JsonResponse, Http404, HttpResponse
+from django.http import  JsonResponse, Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.views.decorators.csrf import csrf_exempt
-from django.utils.decorators import method_decorator
-from django.views import View
 from apps.vod.models import Movie, Series, Episode
-from apps.m3u.models import M3UAccount, M3UAccountProfile
-from apps.proxy.vod_proxy.connection_manager import VODConnectionManager
+from apps.m3u.models import  M3UAccountProfile
 from apps.proxy.vod_proxy.multi_worker_connection_manager import MultiWorkerVODConnectionManager, infer_content_type_from_url, get_vod_client_stop_key
-from .utils import get_client_info, create_vod_response
-from rest_framework.decorators import api_view
+from .utils import get_client_info
+from rest_framework.decorators import api_view, permission_classes
 from apps.accounts.models import User
+from apps.accounts.permissions import IsAdmin
 from apps.proxy.utils import check_user_stream_limits
 
 logger = logging.getLogger(__name__)
@@ -676,368 +674,267 @@ def head_vod(request, content_type, content_id, session_id=None, profile_id=None
         logger.error(f"[VOD-HEAD] Error in HEAD request: {e}", exc_info=True)
         return HttpResponse(f"HEAD error: {str(e)}", status=500)
 
-@method_decorator(csrf_exempt, name='dispatch')
-class VODPlaylistView(View):
-    """Generate M3U playlists for VOD content"""
+@api_view(["GET"])
+@permission_classes([IsAdmin])
+def vod_stats(request):
+    """Get current VOD connection statistics"""
+    try:
+        connection_manager = MultiWorkerVODConnectionManager.get_instance()
+        redis_client = connection_manager.redis_client
 
-    def get(self, request, profile_id=None):
-        """Generate VOD playlist"""
-        try:
-            # Get profile if specified
-            m3u_profile = None
-            if profile_id:
+        if not redis_client:
+            return JsonResponse({'error': 'Redis not available'}, status=500)
+
+        # Get all VOD persistent connections (consolidated data)
+        pattern = "vod_persistent_connection:*"
+        cursor = 0
+        connections = []
+        current_time = time.time()
+
+        while True:
+            cursor, keys = redis_client.scan(cursor, match=pattern, count=100)
+
+            for key in keys:
                 try:
-                    m3u_profile = M3UAccountProfile.objects.get(
-                        id=profile_id,
-                        is_active=True
-                    )
-                except M3UAccountProfile.DoesNotExist:
-                    return HttpResponse("Profile not found", status=404)
+                    connection_data = redis_client.hgetall(key)
 
-            # Generate playlist content
-            playlist_content = self._generate_playlist(m3u_profile)
+                    if connection_data:
+                        # Extract session ID from key
+                        session_id = key.replace('vod_persistent_connection:', '')
 
-            response = HttpResponse(playlist_content, content_type='application/vnd.apple.mpegurl')
-            response['Content-Disposition'] = 'attachment; filename="vod_playlist.m3u8"'
-            return response
+                        # Decode Redis hash data
+                        combined_data = {}
+                        for k, v in connection_data.items():
+                            combined_data[k] = v
 
-        except Exception as e:
-            logger.error(f"Error generating VOD playlist: {e}")
-            return HttpResponse("Playlist generation error", status=500)
+                        # Get content info from the connection data (using correct field names)
+                        content_type = combined_data.get('content_obj_type', 'unknown')
+                        content_uuid = combined_data.get('content_uuid', 'unknown')
+                        client_id = session_id
 
-    def _generate_playlist(self, m3u_profile=None):
-        """Generate M3U playlist content for VOD"""
-        lines = ["#EXTM3U"]
+                        # Get content info with enhanced metadata
+                        content_name = "Unknown"
+                        content_metadata = {}
+                        try:
+                            if content_type == 'movie':
+                                content_obj = Movie.objects.select_related('logo').get(uuid=content_uuid)
+                                content_name = content_obj.name
 
-        # Add movies
-        movies = Movie.objects.filter(is_active=True)
-        if m3u_profile:
-            movies = movies.filter(m3u_account=m3u_profile.m3u_account)
+                                # Get duration from content object
+                                duration_secs = None
+                                if hasattr(content_obj, 'duration_secs') and content_obj.duration_secs:
+                                    duration_secs = content_obj.duration_secs
 
-        for movie in movies:
-            profile_param = f"?profile={m3u_profile.id}" if m3u_profile else ""
-            lines.append(f'#EXTINF:-1 tvg-id="{movie.tmdb_id}" group-title="Movies",{movie.title}')
-            lines.append(f'/proxy/vod/movie/{movie.uuid}/{profile_param}')
+                                # If we don't have duration_secs, try to calculate it from file size and position data
+                                if not duration_secs:
+                                    file_size_bytes = int(combined_data.get('total_content_size', 0))
+                                    last_seek_byte = int(combined_data.get('last_seek_byte', 0))
+                                    last_seek_percentage = float(combined_data.get('last_seek_percentage', 0.0))
 
-        # Add series
-        series_list = Series.objects.filter(is_active=True)
-        if m3u_profile:
-            series_list = series_list.filter(m3u_account=m3u_profile.m3u_account)
-
-        for series in series_list:
-            for episode in series.episodes.all():
-                profile_param = f"?profile={m3u_profile.id}" if m3u_profile else ""
-                episode_title = f"{series.title} - S{episode.season_number:02d}E{episode.episode_number:02d}"
-                lines.append(f'#EXTINF:-1 tvg-id="{series.tmdb_id}" group-title="Series",{episode_title}')
-                lines.append(f'/proxy/vod/episode/{episode.uuid}/{profile_param}')
-
-        return '\n'.join(lines)
-
-
-@method_decorator(csrf_exempt, name='dispatch')
-class VODPositionView(View):
-    """Handle VOD position updates"""
-
-    def post(self, request, content_id):
-        """Update playback position for VOD content"""
-        try:
-            import json
-            data = json.loads(request.body)
-            client_id = data.get('client_id')
-            position = data.get('position', 0)
-
-            # Find the content object
-            content_obj = None
-            try:
-                content_obj = Movie.objects.get(uuid=content_id)
-            except Movie.DoesNotExist:
-                try:
-                    content_obj = Episode.objects.get(uuid=content_id)
-                except Episode.DoesNotExist:
-                    return JsonResponse({'error': 'Content not found'}, status=404)
-
-            # Here you could store the position in a model or cache
-            # For now, just return success
-            logger.info(f"Position update for {content_obj.__class__.__name__} {content_id}: {position}s")
-
-            return JsonResponse({
-                'success': True,
-                'content_id': str(content_id),
-                'position': position
-            })
-
-        except Exception as e:
-            logger.error(f"Error updating VOD position: {e}")
-            return JsonResponse({'error': str(e)}, status=500)
-
-
-@method_decorator(csrf_exempt, name='dispatch')
-class VODStatsView(View):
-    """Get VOD connection statistics"""
-
-    def get(self, request):
-        """Get current VOD connection statistics"""
-        try:
-            connection_manager = MultiWorkerVODConnectionManager.get_instance()
-            redis_client = connection_manager.redis_client
-
-            if not redis_client:
-                return JsonResponse({'error': 'Redis not available'}, status=500)
-
-            # Get all VOD persistent connections (consolidated data)
-            pattern = "vod_persistent_connection:*"
-            cursor = 0
-            connections = []
-            current_time = time.time()
-
-            while True:
-                cursor, keys = redis_client.scan(cursor, match=pattern, count=100)
-
-                for key in keys:
-                    try:
-                        connection_data = redis_client.hgetall(key)
-
-                        if connection_data:
-                            # Extract session ID from key
-                            session_id = key.replace('vod_persistent_connection:', '')
-
-                            # Decode Redis hash data
-                            combined_data = {}
-                            for k, v in connection_data.items():
-                                combined_data[k] = v
-
-                            # Get content info from the connection data (using correct field names)
-                            content_type = combined_data.get('content_obj_type', 'unknown')
-                            content_uuid = combined_data.get('content_uuid', 'unknown')
-                            client_id = session_id
-
-                            # Get content info with enhanced metadata
-                            content_name = "Unknown"
-                            content_metadata = {}
-                            try:
-                                if content_type == 'movie':
-                                    content_obj = Movie.objects.select_related('logo').get(uuid=content_uuid)
-                                    content_name = content_obj.name
-
-                                    # Get duration from content object
-                                    duration_secs = None
-                                    if hasattr(content_obj, 'duration_secs') and content_obj.duration_secs:
-                                        duration_secs = content_obj.duration_secs
-
-                                    # If we don't have duration_secs, try to calculate it from file size and position data
-                                    if not duration_secs:
-                                        file_size_bytes = int(combined_data.get('total_content_size', 0))
-                                        last_seek_byte = int(combined_data.get('last_seek_byte', 0))
-                                        last_seek_percentage = float(combined_data.get('last_seek_percentage', 0.0))
-
-                                        # Calculate position if we have the required data
-                                        if file_size_bytes and file_size_bytes > 0 and last_seek_percentage > 0:
-                                            # If we know the seek percentage and current time position, we can estimate duration
-                                            # But we need to know the current time position in seconds first
-                                            # For now, let's use a rough estimate based on file size and typical bitrates
-                                            # This is a fallback - ideally duration should be in the database
-                                            estimated_duration = 6000  # 100 minutes as default for movies
-                                            duration_secs = estimated_duration
-
-                                    content_metadata = {
-                                        'year': content_obj.year,
-                                        'rating': content_obj.rating,
-                                        'genre': content_obj.genre,
-                                        'duration_secs': duration_secs,
-                                        'description': content_obj.description,
-                                        'logo_url': content_obj.logo.url if content_obj.logo else None,
-                                        'tmdb_id': content_obj.tmdb_id,
-                                        'imdb_id': content_obj.imdb_id
-                                    }
-                                elif content_type == 'episode':
-                                    content_obj = Episode.objects.select_related('series', 'series__logo').get(uuid=content_uuid)
-                                    content_name = f"{content_obj.series.name} - {content_obj.name}"
-
-                                    # Get duration from content object
-                                    duration_secs = None
-                                    if hasattr(content_obj, 'duration_secs') and content_obj.duration_secs:
-                                        duration_secs = content_obj.duration_secs
-
-                                    # If we don't have duration_secs, estimate for episodes
-                                    if not duration_secs:
-                                        estimated_duration = 2400  # 40 minutes as default for episodes
+                                    # Calculate position if we have the required data
+                                    if file_size_bytes and file_size_bytes > 0 and last_seek_percentage > 0:
+                                        # If we know the seek percentage and current time position, we can estimate duration
+                                        # But we need to know the current time position in seconds first
+                                        # For now, let's use a rough estimate based on file size and typical bitrates
+                                        # This is a fallback - ideally duration should be in the database
+                                        estimated_duration = 6000  # 100 minutes as default for movies
                                         duration_secs = estimated_duration
 
-                                    content_metadata = {
-                                        'series_name': content_obj.series.name,
-                                        'episode_name': content_obj.name,
-                                        'season_number': content_obj.season_number,
-                                        'episode_number': content_obj.episode_number,
-                                        'air_date': content_obj.air_date.isoformat() if content_obj.air_date else None,
-                                        'rating': content_obj.rating,
-                                        'duration_secs': duration_secs,
-                                        'description': content_obj.description,
-                                        'logo_url': content_obj.series.logo.url if content_obj.series.logo else None,
-                                        'series_year': content_obj.series.year,
-                                        'series_genre': content_obj.series.genre,
-                                        'tmdb_id': content_obj.tmdb_id,
-                                        'imdb_id': content_obj.imdb_id
-                                    }
+                                content_metadata = {
+                                    'year': content_obj.year,
+                                    'rating': content_obj.rating,
+                                    'genre': content_obj.genre,
+                                    'duration_secs': duration_secs,
+                                    'description': content_obj.description,
+                                    'logo_url': content_obj.logo.url if content_obj.logo else None,
+                                    'tmdb_id': content_obj.tmdb_id,
+                                    'imdb_id': content_obj.imdb_id
+                                }
+                            elif content_type == 'episode':
+                                content_obj = Episode.objects.select_related('series', 'series__logo').get(uuid=content_uuid)
+                                content_name = f"{content_obj.series.name} - {content_obj.name}"
+
+                                # Get duration from content object
+                                duration_secs = None
+                                if hasattr(content_obj, 'duration_secs') and content_obj.duration_secs:
+                                    duration_secs = content_obj.duration_secs
+
+                                # If we don't have duration_secs, estimate for episodes
+                                if not duration_secs:
+                                    estimated_duration = 2400  # 40 minutes as default for episodes
+                                    duration_secs = estimated_duration
+
+                                content_metadata = {
+                                    'series_name': content_obj.series.name,
+                                    'episode_name': content_obj.name,
+                                    'season_number': content_obj.season_number,
+                                    'episode_number': content_obj.episode_number,
+                                    'air_date': content_obj.air_date.isoformat() if content_obj.air_date else None,
+                                    'rating': content_obj.rating,
+                                    'duration_secs': duration_secs,
+                                    'description': content_obj.description,
+                                    'logo_url': content_obj.series.logo.url if content_obj.series.logo else None,
+                                    'series_year': content_obj.series.year,
+                                    'series_genre': content_obj.series.genre,
+                                    'tmdb_id': content_obj.tmdb_id,
+                                    'imdb_id': content_obj.imdb_id
+                                }
+                        except:
+                            pass
+
+                        # Get M3U profile information
+                        m3u_profile_info = {}
+                        m3u_profile_id = combined_data.get('m3u_profile_id')
+                        if m3u_profile_id:
+                            try:
+                                from apps.m3u.models import M3UAccountProfile
+                                profile = M3UAccountProfile.objects.select_related('m3u_account').get(id=m3u_profile_id)
+                                m3u_profile_info = {
+                                    'profile_name': profile.name,
+                                    'account_name': profile.m3u_account.name,
+                                    'account_id': profile.m3u_account.id,
+                                    'max_streams': profile.m3u_account.max_streams,
+                                    'm3u_profile_id': int(m3u_profile_id)
+                                }
+                            except Exception as e:
+                                logger.warning(f"Could not fetch M3U profile {m3u_profile_id}: {e}")
+
+                        # Also try to get profile info from stored data if database lookup fails
+                        if not m3u_profile_info and combined_data.get('m3u_profile_name'):
+                            m3u_profile_info = {
+                                'profile_name': combined_data.get('m3u_profile_name', 'Unknown Profile'),
+                                'm3u_profile_id': combined_data.get('m3u_profile_id'),
+                                'account_name': 'Unknown Account'  # We don't store account name directly
+                            }
+
+                        # Calculate estimated current position based on seek percentage or last known position
+                        last_known_position = int(combined_data.get('position_seconds', 0))
+                        last_position_update = combined_data.get('last_position_update')
+                        last_seek_percentage = float(combined_data.get('last_seek_percentage', 0.0))
+                        last_seek_timestamp = float(combined_data.get('last_seek_timestamp', 0.0))
+                        estimated_position = last_known_position
+
+                        # If we have seek percentage and content duration, calculate position from that
+                        if last_seek_percentage > 0 and content_metadata.get('duration_secs'):
+                            try:
+                                duration_secs = int(content_metadata['duration_secs'])
+                                # Calculate position from seek percentage
+                                seek_position = int((last_seek_percentage / 100) * duration_secs)
+
+                                # If we have a recent seek timestamp, add elapsed time since seek
+                                if last_seek_timestamp > 0:
+                                    elapsed_since_seek = current_time - last_seek_timestamp
+                                    # Add elapsed time but don't exceed content duration
+                                    estimated_position = min(
+                                        seek_position + int(elapsed_since_seek),
+                                        duration_secs
+                                    )
+                                else:
+                                    estimated_position = seek_position
+                            except (ValueError, TypeError):
+                                pass
+                        elif last_position_update and content_metadata.get('duration_secs'):
+                            # Fallback: use time-based estimation from position_seconds
+                            try:
+                                update_timestamp = float(last_position_update)
+                                elapsed_since_update = current_time - update_timestamp
+                                # Add elapsed time to last known position, but don't exceed content duration
+                                estimated_position = min(
+                                    last_known_position + int(elapsed_since_update),
+                                    int(content_metadata['duration_secs'])
+                                )
+                            except (ValueError, TypeError):
+                                # If timestamp parsing fails, fall back to last known position
+                                estimated_position = last_known_position
+
+                        connection_info = {
+                            'content_type': content_type,
+                            'content_uuid': content_uuid,
+                            'content_name': content_name,
+                            'content_metadata': content_metadata,
+                            'm3u_profile': m3u_profile_info,
+                            'client_id': client_id,
+                            'client_ip': combined_data.get('client_ip', 'Unknown'),
+                            'user_id': combined_data.get('user_id', '0'),
+                            'user_agent': combined_data.get('client_user_agent', 'Unknown'),
+                            'connected_at': combined_data.get('created_at'),
+                            'last_activity': combined_data.get('last_activity'),
+                            'm3u_profile_id': m3u_profile_id,
+                            'position_seconds': estimated_position,  # Use estimated position
+                            'last_known_position': last_known_position,  # Include raw position for debugging
+                            'last_position_update': last_position_update,  # Include timestamp for frontend use
+                            'bytes_sent': int(combined_data.get('bytes_sent', 0)),
+                            # Seek/range information for position calculation and frontend display
+                            'last_seek_byte': int(combined_data.get('last_seek_byte', 0)),
+                            'last_seek_percentage': float(combined_data.get('last_seek_percentage', 0.0)),
+                            'total_content_size': int(combined_data.get('total_content_size', 0)),
+                            'last_seek_timestamp': float(combined_data.get('last_seek_timestamp', 0.0))
+                        }
+
+                        # Calculate connection duration
+                        duration_calculated = False
+                        if connection_info['connected_at']:
+                            try:
+                                connected_time = float(connection_info['connected_at'])
+                                duration = current_time - connected_time
+                                connection_info['duration'] = int(duration)
+                                duration_calculated = True
                             except:
                                 pass
 
-                            # Get M3U profile information
-                            m3u_profile_info = {}
-                            m3u_profile_id = combined_data.get('m3u_profile_id')
-                            if m3u_profile_id:
-                                try:
-                                    from apps.m3u.models import M3UAccountProfile
-                                    profile = M3UAccountProfile.objects.select_related('m3u_account').get(id=m3u_profile_id)
-                                    m3u_profile_info = {
-                                        'profile_name': profile.name,
-                                        'account_name': profile.m3u_account.name,
-                                        'account_id': profile.m3u_account.id,
-                                        'max_streams': profile.m3u_account.max_streams,
-                                        'm3u_profile_id': int(m3u_profile_id)
-                                    }
-                                except Exception as e:
-                                    logger.warning(f"Could not fetch M3U profile {m3u_profile_id}: {e}")
+                        # Fallback: use last_activity if connected_at is not available
+                        if not duration_calculated and connection_info['last_activity']:
+                            try:
+                                last_activity_time = float(connection_info['last_activity'])
+                                # Estimate connection duration using client_id timestamp if available
+                                if connection_info['client_id'].startswith('vod_'):
+                                    # Extract timestamp from client_id (format: vod_timestamp_random)
+                                    parts = connection_info['client_id'].split('_')
+                                    if len(parts) >= 2:
+                                        client_start_time = float(parts[1]) / 1000.0  # Convert ms to seconds
+                                        duration = current_time - client_start_time
+                                        connection_info['duration'] = int(duration)
+                                        duration_calculated = True
+                            except:
+                                pass
 
-                            # Also try to get profile info from stored data if database lookup fails
-                            if not m3u_profile_info and combined_data.get('m3u_profile_name'):
-                                m3u_profile_info = {
-                                    'profile_name': combined_data.get('m3u_profile_name', 'Unknown Profile'),
-                                    'm3u_profile_id': combined_data.get('m3u_profile_id'),
-                                    'account_name': 'Unknown Account'  # We don't store account name directly
-                                }
+                        # Final fallback
+                        if not duration_calculated:
+                            connection_info['duration'] = 0
 
-                            # Calculate estimated current position based on seek percentage or last known position
-                            last_known_position = int(combined_data.get('position_seconds', 0))
-                            last_position_update = combined_data.get('last_position_update')
-                            last_seek_percentage = float(combined_data.get('last_seek_percentage', 0.0))
-                            last_seek_timestamp = float(combined_data.get('last_seek_timestamp', 0.0))
-                            estimated_position = last_known_position
+                        connections.append(connection_info)
 
-                            # If we have seek percentage and content duration, calculate position from that
-                            if last_seek_percentage > 0 and content_metadata.get('duration_secs'):
-                                try:
-                                    duration_secs = int(content_metadata['duration_secs'])
-                                    # Calculate position from seek percentage
-                                    seek_position = int((last_seek_percentage / 100) * duration_secs)
+                except Exception as e:
+                    logger.error(f"Error processing connection key {key}: {e}")
 
-                                    # If we have a recent seek timestamp, add elapsed time since seek
-                                    if last_seek_timestamp > 0:
-                                        elapsed_since_seek = current_time - last_seek_timestamp
-                                        # Add elapsed time but don't exceed content duration
-                                        estimated_position = min(
-                                            seek_position + int(elapsed_since_seek),
-                                            duration_secs
-                                        )
-                                    else:
-                                        estimated_position = seek_position
-                                except (ValueError, TypeError):
-                                    pass
-                            elif last_position_update and content_metadata.get('duration_secs'):
-                                # Fallback: use time-based estimation from position_seconds
-                                try:
-                                    update_timestamp = float(last_position_update)
-                                    elapsed_since_update = current_time - update_timestamp
-                                    # Add elapsed time to last known position, but don't exceed content duration
-                                    estimated_position = min(
-                                        last_known_position + int(elapsed_since_update),
-                                        int(content_metadata['duration_secs'])
-                                    )
-                                except (ValueError, TypeError):
-                                    # If timestamp parsing fails, fall back to last known position
-                                    estimated_position = last_known_position
+            if cursor == 0:
+                break
 
-                            connection_info = {
-                                'content_type': content_type,
-                                'content_uuid': content_uuid,
-                                'content_name': content_name,
-                                'content_metadata': content_metadata,
-                                'm3u_profile': m3u_profile_info,
-                                'client_id': client_id,
-                                'client_ip': combined_data.get('client_ip', 'Unknown'),
-                                'user_id': combined_data.get('user_id', '0'),
-                                'user_agent': combined_data.get('client_user_agent', 'Unknown'),
-                                'connected_at': combined_data.get('created_at'),
-                                'last_activity': combined_data.get('last_activity'),
-                                'm3u_profile_id': m3u_profile_id,
-                                'position_seconds': estimated_position,  # Use estimated position
-                                'last_known_position': last_known_position,  # Include raw position for debugging
-                                'last_position_update': last_position_update,  # Include timestamp for frontend use
-                                'bytes_sent': int(combined_data.get('bytes_sent', 0)),
-                                # Seek/range information for position calculation and frontend display
-                                'last_seek_byte': int(combined_data.get('last_seek_byte', 0)),
-                                'last_seek_percentage': float(combined_data.get('last_seek_percentage', 0.0)),
-                                'total_content_size': int(combined_data.get('total_content_size', 0)),
-                                'last_seek_timestamp': float(combined_data.get('last_seek_timestamp', 0.0))
-                            }
+        # Group connections by content
+        content_stats = {}
+        for conn in connections:
+            content_key = f"{conn['content_type']}:{conn['content_uuid']}"
+            if content_key not in content_stats:
+                content_stats[content_key] = {
+                    'content_type': conn['content_type'],
+                    'content_name': conn['content_name'],
+                    'content_uuid': conn['content_uuid'],
+                    'content_metadata': conn['content_metadata'],
+                    'connection_count': 0,
+                    'connections': []
+                }
+            content_stats[content_key]['connection_count'] += 1
+            content_stats[content_key]['connections'].append(conn)
 
-                            # Calculate connection duration
-                            duration_calculated = False
-                            if connection_info['connected_at']:
-                                try:
-                                    connected_time = float(connection_info['connected_at'])
-                                    duration = current_time - connected_time
-                                    connection_info['duration'] = int(duration)
-                                    duration_calculated = True
-                                except:
-                                    pass
+        return JsonResponse({
+            'vod_connections': list(content_stats.values()),
+            'total_connections': len(connections),
+            'timestamp': current_time
+        })
 
-                            # Fallback: use last_activity if connected_at is not available
-                            if not duration_calculated and connection_info['last_activity']:
-                                try:
-                                    last_activity_time = float(connection_info['last_activity'])
-                                    # Estimate connection duration using client_id timestamp if available
-                                    if connection_info['client_id'].startswith('vod_'):
-                                        # Extract timestamp from client_id (format: vod_timestamp_random)
-                                        parts = connection_info['client_id'].split('_')
-                                        if len(parts) >= 2:
-                                            client_start_time = float(parts[1]) / 1000.0  # Convert ms to seconds
-                                            duration = current_time - client_start_time
-                                            connection_info['duration'] = int(duration)
-                                            duration_calculated = True
-                                except:
-                                    pass
-
-                            # Final fallback
-                            if not duration_calculated:
-                                connection_info['duration'] = 0
-
-                            connections.append(connection_info)
-
-                    except Exception as e:
-                        logger.error(f"Error processing connection key {key}: {e}")
-
-                if cursor == 0:
-                    break
-
-            # Group connections by content
-            content_stats = {}
-            for conn in connections:
-                content_key = f"{conn['content_type']}:{conn['content_uuid']}"
-                if content_key not in content_stats:
-                    content_stats[content_key] = {
-                        'content_type': conn['content_type'],
-                        'content_name': conn['content_name'],
-                        'content_uuid': conn['content_uuid'],
-                        'content_metadata': conn['content_metadata'],
-                        'connection_count': 0,
-                        'connections': []
-                    }
-                content_stats[content_key]['connection_count'] += 1
-                content_stats[content_key]['connections'].append(conn)
-
-            return JsonResponse({
-                'vod_connections': list(content_stats.values()),
-                'total_connections': len(connections),
-                'timestamp': current_time
-            })
-
-        except Exception as e:
-            logger.error(f"Error getting VOD stats: {e}")
-            return JsonResponse({'error': str(e)}, status=500)
-
-
-from rest_framework.decorators import api_view, permission_classes
-from apps.accounts.permissions import IsAdmin
+    except Exception as e:
+        logger.error(f"Error getting VOD stats: {e}")
+        return JsonResponse({'error': str(e)}, status=500)
 
 
 @csrf_exempt
diff --git a/core/tasks.py b/core/tasks.py
index 13100d0b..042d63ea 100644
--- a/core/tasks.py
+++ b/core/tasks.py
@@ -13,7 +13,7 @@ from apps.epg.models import EPGSource
 from apps.m3u.tasks import refresh_single_m3u_account
 from apps.epg.tasks import refresh_epg_data
 from .models import CoreSettings
-from apps.channels.models import Stream, ChannelStream
+from apps.channels.models import ChannelStream
 from django.db import transaction
 
 logger = logging.getLogger(__name__)
@@ -753,20 +753,6 @@ def _determine_stream_to_keep(stream_a, stream_b):
     return (stream_b, stream_a)
 
 
-@shared_task
-def cleanup_vod_persistent_connections():
-    """Clean up stale VOD persistent connections"""
-    try:
-        from apps.proxy.vod_proxy.connection_manager import VODConnectionManager
-
-        # Clean up connections older than 30 minutes
-        VODConnectionManager.cleanup_stale_persistent_connections(max_age_seconds=1800)
-        logger.info("VOD persistent connection cleanup completed")
-
-    except Exception as e:
-        logger.error(f"Error during VOD persistent connection cleanup: {e}")
-
-
 @shared_task
 def check_for_version_update():
     """
diff --git a/frontend/src/api.js b/frontend/src/api.js
index 0f76c2a2..9bf3890a 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -3212,21 +3212,6 @@ export default class API {
     }
   }
 
-  static async updateVODPosition(vodUuid, clientId, position) {
-    try {
-      const response = await request(
-        `${host}/proxy/vod/stream/${vodUuid}/position/`,
-        {
-          method: 'POST',
-          body: { client_id: clientId, position },
-        }
-      );
-      return response;
-    } catch (e) {
-      errorNotification('Failed to update playback position', e);
-    }
-  }
-
   static async getSystemEvents(limit = 100, offset = 0, eventType = null) {
     try {
       const params = new URLSearchParams();

From 08545b8c9293ff33d68df931644f6754a1d1fc91 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 9 Apr 2026 21:31:38 -0500
Subject: [PATCH 135/172] security: Prevented users from setting `xc_password`
 (and other admin-managed keys) on their own account via the `PATCH
 /api/accounts/users/me/` endpoint.

---
 apps/accounts/api_views.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/accounts/api_views.py b/apps/accounts/api_views.py
index c698f07a..9fba92c0 100644
--- a/apps/accounts/api_views.py
+++ b/apps/accounts/api_views.py
@@ -291,6 +291,14 @@ class UserViewSet(viewsets.ModelViewSet):
             for key in disallowed:
                 request.data.pop(key, None)
 
+            # Strip admin-managed keys from custom_properties so users cannot
+            # set their own XC credentials via this endpoint.
+            ADMIN_ONLY_PROPS = {"xc_password"}
+            cp = request.data.get("custom_properties")
+            if isinstance(cp, dict):
+                for key in ADMIN_ONLY_PROPS:
+                    cp.pop(key, None)
+
             serializer = UserSerializer(user, data=request.data, partial=True)
             serializer.is_valid(raise_exception=True)
             serializer.save()

From 7083c512be6088ca58d028a6488b09841adc2064 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 9 Apr 2026 21:32:36 -0500
Subject: [PATCH 136/172] security: Fixed path traversal vulnerability in file
 uploads. The M3U account upload (`apps/m3u/api_views.py`), logo upload
 (`apps/channels/api_views.py`), and backup upload
 (`apps/backups/api_views.py`) all used the uploaded filename directly without
 sanitization. `os.path.join()` discards all preceding components when it
 encounters an absolute path segment, and `pathlib`'s `/` operator behaves
 identically; a relative `../` sequence also escapes via OS path resolution at
 `open()` time. All three upload paths now strip directory components via
 `Path(name).name` and validate the resolved path remains within the intended
 upload directory. Exploiting any of these required admin credentials.

---
 apps/backups/api_views.py  | 13 +++++++++++--
 apps/channels/api_views.py | 13 ++++++++-----
 apps/m3u/api_views.py      | 17 +++++++++++------
 core/utils.py              | 15 +++++++++++++++
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/apps/backups/api_views.py b/apps/backups/api_views.py
index a5af495e..36334d06 100644
--- a/apps/backups/api_views.py
+++ b/apps/backups/api_views.py
@@ -13,6 +13,7 @@ from rest_framework.permissions import AllowAny
 from apps.accounts.permissions import IsAdmin
 from rest_framework.parsers import MultiPartParser, FormParser
 from rest_framework.response import Response
+from core.utils import safe_upload_path
 
 from . import services
 from .tasks import create_backup_task, restore_backup_task
@@ -267,10 +268,18 @@ def upload_backup(request):
 
     try:
         backup_dir = services.get_backup_dir()
-        filename = uploaded.name or "uploaded-backup.zip"
+        # Sanitize filename: strip directory components to prevent path traversal
+        filename = Path(uploaded.name or "uploaded-backup.zip").name
+        if not filename:
+            filename = "uploaded-backup.zip"
+
+        try:
+            safe_upload_path(filename, str(backup_dir))
+        except ValueError:
+            return Response({"detail": "Invalid filename."}, status=status.HTTP_400_BAD_REQUEST)
 
         # Ensure unique filename
-        backup_file = backup_dir / filename
+        backup_file = (backup_dir / filename).resolve()
         counter = 1
         while backup_file.exists():
             name_parts = filename.rsplit(".", 1)
diff --git a/apps/channels/api_views.py b/apps/channels/api_views.py
index 268cc828..cde49dad 100644
--- a/apps/channels/api_views.py
+++ b/apps/channels/api_views.py
@@ -24,7 +24,7 @@ from apps.accounts.permissions import (
 )
 
 from core.models import UserAgent, CoreSettings
-from core.utils import RedisClient
+from core.utils import RedisClient, safe_upload_path
 
 from .models import (
     Stream,
@@ -1901,10 +1901,13 @@ class LogoViewSet(viewsets.ModelViewSet):
                 {"error": str(e)}, status=status.HTTP_400_BAD_REQUEST
             )
 
-        file_name = file.name
-        file_path = os.path.join("/data/logos", file_name)
+        # Sanitize filename: strip directory components to prevent path traversal
+        try:
+            file_path = safe_upload_path(file.name, "/data/logos")
+        except ValueError:
+            return Response({"error": "Invalid filename."}, status=status.HTTP_400_BAD_REQUEST)
 
-        os.makedirs(os.path.dirname(file_path), exist_ok=True)
+        os.makedirs("/data/logos", exist_ok=True)
         with open(file_path, "wb+") as destination:
             for chunk in file.chunks():
                 destination.write(chunk)
@@ -1924,7 +1927,7 @@ class LogoViewSet(viewsets.ModelViewSet):
 
         # Get custom name from request data, fallback to filename
         custom_name = request.data.get('name', '').strip()
-        logo_name = custom_name if custom_name else file_name
+        logo_name = custom_name if custom_name else os.path.basename(file_path)
 
         logo, _ = Logo.objects.get_or_create(
             url=file_path,
diff --git a/apps/m3u/api_views.py b/apps/m3u/api_views.py
index 3b856dc8..b8cb099a 100644
--- a/apps/m3u/api_views.py
+++ b/apps/m3u/api_views.py
@@ -20,6 +20,7 @@ import json
 
 from .models import M3UAccount, M3UFilter, ServerGroup, M3UAccountProfile
 from core.models import UserAgent
+from core.utils import safe_upload_path
 from apps.channels.models import ChannelGroupM3UAccount
 from core.serializers import UserAgentSerializer
 from apps.vod.models import M3UVODCategoryRelation
@@ -54,10 +55,12 @@ class M3UAccountViewSet(viewsets.ModelViewSet):
         file_path = None
         if "file" in request.FILES:
             file = request.FILES["file"]
-            file_name = file.name
-            file_path = os.path.join("/data/uploads/m3us", file_name)
+            try:
+                file_path = safe_upload_path(file.name, "/data/uploads/m3us")
+            except ValueError:
+                return Response({"detail": "Invalid filename."}, status=status.HTTP_400_BAD_REQUEST)
 
-            os.makedirs(os.path.dirname(file_path), exist_ok=True)
+            os.makedirs("/data/uploads/m3us", exist_ok=True)
             with open(file_path, "wb+") as destination:
                 for chunk in file.chunks():
                     destination.write(chunk)
@@ -117,10 +120,12 @@ class M3UAccountViewSet(viewsets.ModelViewSet):
         file_path = None
         if "file" in request.FILES:
             file = request.FILES["file"]
-            file_name = file.name
-            file_path = os.path.join("/data/uploads/m3us", file_name)
+            try:
+                file_path = safe_upload_path(file.name, "/data/uploads/m3us")
+            except ValueError:
+                return Response({"detail": "Invalid filename."}, status=status.HTTP_400_BAD_REQUEST)
 
-            os.makedirs(os.path.dirname(file_path), exist_ok=True)
+            os.makedirs("/data/uploads/m3us", exist_ok=True)
             with open(file_path, "wb+") as destination:
                 for chunk in file.chunks():
                     destination.write(chunk)
diff --git a/core/utils.py b/core/utils.py
index 583075c3..ba2458ec 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -3,6 +3,7 @@ import logging
 import time
 import os
 import threading
+from pathlib import Path
 import re
 from django.conf import settings
 from redis.exceptions import ConnectionError, TimeoutError
@@ -431,6 +432,20 @@ def cleanup_memory(log_usage=False, force_collection=True):
             pass
     logger.trace("Memory cleanup complete for django")
 
+def safe_upload_path(filename: str, base_dir) -> str:
+    """Return a safe absolute path for an uploaded file within base_dir.
+
+    Strips all directory components from *filename* and verifies the resolved
+    path stays inside *base_dir*.  Raises ValueError on path traversal attempts.
+    """
+    safe_name = Path(filename).name
+    base = Path(base_dir).resolve()
+    file_path = (base / safe_name).resolve()
+    if not file_path.is_relative_to(base):
+        raise ValueError("Invalid filename.")
+    return str(file_path)
+
+
 def is_protected_path(file_path):
     """
     Determine if a file path is in a protected directory that shouldn't be deleted.

From 47427d4b0f4063c0c8cca87e6767694c4d453715 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 9 Apr 2026 21:36:51 -0500
Subject: [PATCH 137/172] security: - Set `DEFAULT_PERMISSION_CLASSES` to
 `Authenticated` in the DRF configuration. - Explicitly marked the HDHomeRun
 discovery endpoints (`DiscoverAPIView`, `LineupAPIView`,
 `LineupStatusAPIView`, `HDHRDeviceXMLAPIView`) and the version endpoint with
 `permission_classes = [AllowAny]` to document their intentionally public
 access now that the global default is `Authenticated`.

---
 apps/hdhr/api_views.py  | 5 +++++
 core/api_views.py       | 4 ++--
 dispatcharr/settings.py | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/hdhr/api_views.py b/apps/hdhr/api_views.py
index 2227170e..539adffe 100644
--- a/apps/hdhr/api_views.py
+++ b/apps/hdhr/api_views.py
@@ -1,6 +1,7 @@
 from rest_framework import viewsets, status
 from rest_framework.response import Response
 from rest_framework.views import APIView
+from rest_framework.permissions import AllowAny
 from apps.accounts.permissions import Authenticated, permission_classes_by_action
 from django.http import JsonResponse, HttpResponseForbidden, HttpResponse
 import logging
@@ -46,6 +47,7 @@ class HDHRDeviceViewSet(viewsets.ModelViewSet):
 # 🔹 2) Discover API
 class DiscoverAPIView(APIView):
     """Returns device discovery information"""
+    permission_classes = [AllowAny]
 
     @extend_schema(
         description="Retrieve HDHomeRun device discovery information",
@@ -98,6 +100,7 @@ class DiscoverAPIView(APIView):
 # 🔹 3) Lineup API
 class LineupAPIView(APIView):
     """Returns available channel lineup"""
+    permission_classes = [AllowAny]
 
     @extend_schema(
         description="Retrieve the available channel lineup",
@@ -138,6 +141,7 @@ class LineupAPIView(APIView):
 # 🔹 4) Lineup Status API
 class LineupStatusAPIView(APIView):
     """Returns the current status of the HDHR lineup"""
+    permission_classes = [AllowAny]
 
     @extend_schema(
         description="Retrieve the HDHomeRun lineup status",
@@ -155,6 +159,7 @@ class LineupStatusAPIView(APIView):
 # 🔹 5) Device XML API
 class HDHRDeviceXMLAPIView(APIView):
     """Returns HDHomeRun device configuration in XML"""
+    permission_classes = [AllowAny]
 
     @extend_schema(
         description="Retrieve the HDHomeRun device XML configuration",
diff --git a/core/api_views.py b/core/api_views.py
index a81ddf54..d01d8619 100644
--- a/core/api_views.py
+++ b/core/api_views.py
@@ -9,7 +9,7 @@ from rest_framework import viewsets, status
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from django.shortcuts import get_object_or_404
-from rest_framework.permissions import IsAuthenticated
+from rest_framework.permissions import IsAuthenticated, AllowAny
 from rest_framework.decorators import api_view, permission_classes, action
 from drf_spectacular.utils import extend_schema, OpenApiParameter
 from drf_spectacular.types import OpenApiTypes
@@ -330,8 +330,8 @@ def environment(request):
 @extend_schema(
     description="Get application version information",
 )
-
 @api_view(["GET"])
+@permission_classes([AllowAny])
 def version(request):
     # Import version information
     from version import __version__, __timestamp__
diff --git a/dispatcharr/settings.py b/dispatcharr/settings.py
index ec61eb4d..6d131058 100644
--- a/dispatcharr/settings.py
+++ b/dispatcharr/settings.py
@@ -265,6 +265,9 @@ REST_FRAMEWORK = {
         "rest_framework_simplejwt.authentication.JWTAuthentication",
         "apps.accounts.authentication.ApiKeyAuthentication",
     ],
+    "DEFAULT_PERMISSION_CLASSES": [
+        "apps.accounts.permissions.Authenticated",
+    ],
     "DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend"],
 }
 

From b535f28ac5461279e2652a14150947ac8c48ce0c Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 9 Apr 2026 21:46:50 -0500
Subject: [PATCH 138/172] security: Added rate limiting to the login endpoint
 (`POST /api/accounts/token/`) using DRF's built-in throttling. A
 `LoginRateThrottle` (3 requests/minute per IP, sliding window) is applied to
 the `TokenObtainPairView`. Repeated failed attempts from the same IP receive
 `429 Too Many Requests`.

---
 apps/accounts/api_views.py | 8 +++++++-
 dispatcharr/settings.py    | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/accounts/api_views.py b/apps/accounts/api_views.py
index 9fba92c0..6a70fd53 100644
--- a/apps/accounts/api_views.py
+++ b/apps/accounts/api_views.py
@@ -6,6 +6,7 @@ from django.views.decorators.csrf import csrf_exempt
 from rest_framework.decorators import api_view, permission_classes, action
 from rest_framework.response import Response
 from rest_framework import viewsets, status, serializers
+from rest_framework.throttling import AnonRateThrottle
 from drf_spectacular.utils import extend_schema, OpenApiParameter, inline_serializer
 from drf_spectacular.types import OpenApiTypes
 import json
@@ -20,9 +21,14 @@ from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView
 logger = logging.getLogger(__name__)
 
 
+class LoginRateThrottle(AnonRateThrottle):
+    scope = "login"
+
+
 class TokenObtainPairView(TokenObtainPairView):
+    throttle_classes = [LoginRateThrottle]
+
     def post(self, request, *args, **kwargs):
-        # Custom logic here
         if not network_access_allowed(request, "UI"):
             # Log blocked login attempt due to network restrictions
             from core.utils import log_system_event
diff --git a/dispatcharr/settings.py b/dispatcharr/settings.py
index 6d131058..db9284ff 100644
--- a/dispatcharr/settings.py
+++ b/dispatcharr/settings.py
@@ -269,6 +269,10 @@ REST_FRAMEWORK = {
         "apps.accounts.permissions.Authenticated",
     ],
     "DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend"],
+    "DEFAULT_THROTTLE_CLASSES": [],
+    "DEFAULT_THROTTLE_RATES": {
+        "login": "3/minute",
+    },
 }
 
 SPECTACULAR_SETTINGS = {

From 04a684b359b675ba4e1107efa54f067c376426b2 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 08:34:13 -0500
Subject: [PATCH 139/172] =?UTF-8?q?security:=20Removed=20`CORS=5FALLOW=5FC?=
 =?UTF-8?q?REDENTIALS=20=3D=20True`=20from=20CORS=20configuration.=20Dispa?=
 =?UTF-8?q?tcharr=20authenticates=20via=20JWT=20`Authorization`=20headers?=
 =?UTF-8?q?=20and=20API=20keys=20=E2=80=94=20not=20cookies=20=E2=80=94=20s?=
 =?UTF-8?q?o=20credentials=20are=20never=20sent=20cross-origin=20by=20brow?=
 =?UTF-8?q?sers.=20The=20setting=20was=20also=20redundant:=20browsers=20re?=
 =?UTF-8?q?ject=20`Access-Control-Allow-Credentials:=20true`=20when=20`Acc?=
 =?UTF-8?q?ess-Control-Allow-Origin`=20is=20a=20wildcard=20(`*`),=20so=20i?=
 =?UTF-8?q?t=20had=20no=20effect=20in=20practice.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dispatcharr/settings.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dispatcharr/settings.py b/dispatcharr/settings.py
index db9284ff..e0eae919 100644
--- a/dispatcharr/settings.py
+++ b/dispatcharr/settings.py
@@ -420,7 +420,6 @@ BACKUP_DATA_DIRS = [
 SERVER_IP = "127.0.0.1"
 
 CORS_ALLOW_ALL_ORIGINS = True
-CORS_ALLOW_CREDENTIALS = True
 CSRF_TRUSTED_ORIGINS = ["http://*", "https://*"]
 APPEND_SLASH = True
 

From 289a8f48d018cb4282106ec01913825a322e3eaf Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 08:50:13 -0500
Subject: [PATCH 140/172] security: Update frontend packages to mitigate CVE's.

---
 frontend/package-lock.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 6880b99a..e5350fab 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -2518,9 +2518,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.11",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz",
-      "integrity": "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==",
+      "version": "0.8.12",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.12.tgz",
+      "integrity": "sha512-9k/gHF6n/pAi/9tqr3m3aqkuiNosYTurLLUtc7xQ9sxB/wm7WPygCv8GYa6mS0fLJEHhqMC1ATYhz++U/lRHqg==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -3986,9 +3986,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
       "license": "MIT"
     },
     "node_modules/lodash.clamp": {
@@ -5490,9 +5490,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
-      "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz",
+      "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 66ee67da30214993700d3906ad042fd46cd77d2f Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 10:46:16 -0500
Subject: [PATCH 141/172] security: Change from default of "Authenticated" to
 "IsAdmin"

---
 dispatcharr/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dispatcharr/settings.py b/dispatcharr/settings.py
index e0eae919..4bf4e8dc 100644
--- a/dispatcharr/settings.py
+++ b/dispatcharr/settings.py
@@ -266,7 +266,7 @@ REST_FRAMEWORK = {
         "apps.accounts.authentication.ApiKeyAuthentication",
     ],
     "DEFAULT_PERMISSION_CLASSES": [
-        "apps.accounts.permissions.Authenticated",
+        "apps.accounts.permissions.IsAdmin",
     ],
     "DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend"],
     "DEFAULT_THROTTLE_CLASSES": [],

From fa9a7868ff836d9d91cc8ffdb36200a82b987c94 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 10:47:50 -0500
Subject: [PATCH 142/172] security: proxy streaming endpoints (`stream_ts`,
 `stream_xc`, `stream_vod`, `head_vod`, `stream_xc_movie`,
 `stream_xc_episode`) use `@permission_classes([AllowAny])` (access is
 controlled by the per-stream-type network allow-list inside the view body);
 the `UserAgentViewSet`, `StreamProfileViewSet`, `CoreSettingsViewSet`, and
 `ProxySettingsViewSet` gained `get_permissions()` methods mapping read
 actions to `IsStandardUser` and write actions to `IsAdmin`; and
 `AuthViewSet.logout` was updated to return `[Authenticated()]`.

---
 apps/accounts/api_views.py    |  3 +--
 apps/proxy/ts_proxy/views.py  |  3 +++
 apps/proxy/vod_proxy/views.py |  5 +++++
 core/api_views.py             | 26 ++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/apps/accounts/api_views.py b/apps/accounts/api_views.py
index 6a70fd53..10e9272c 100644
--- a/apps/accounts/api_views.py
+++ b/apps/accounts/api_views.py
@@ -159,8 +159,7 @@ class AuthViewSet(viewsets.ViewSet):
         Login doesn't require auth, but logout does
         """
         if self.action == 'logout':
-            from rest_framework.permissions import IsAuthenticated
-            return [IsAuthenticated()]
+            return [Authenticated()]
         return []
 
     @extend_schema(
diff --git a/apps/proxy/ts_proxy/views.py b/apps/proxy/ts_proxy/views.py
index 5750616b..b3ea295a 100644
--- a/apps/proxy/ts_proxy/views.py
+++ b/apps/proxy/ts_proxy/views.py
@@ -19,6 +19,7 @@ from apps.m3u.models import M3UAccount, M3UAccountProfile
 from apps.accounts.models import User
 from core.models import UserAgent, CoreSettings, PROXY_PROFILE_NAME
 from rest_framework.decorators import api_view, permission_classes
+from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 from apps.accounts.permissions import (
     IsAdmin,
@@ -46,6 +47,7 @@ logger = get_logger()
 
 
 @api_view(["GET"])
+@permission_classes([AllowAny])
 def stream_ts(request, channel_id, user=None):
     if not network_access_allowed(request, "STREAMS"):
         return JsonResponse({"error": "Forbidden"}, status=403)
@@ -554,6 +556,7 @@ def stream_ts(request, channel_id, user=None):
 
 
 @api_view(["GET"])
+@permission_classes([AllowAny])
 def stream_xc(request, username, password, channel_id):
     user = get_object_or_404(User, username=username)
 
diff --git a/apps/proxy/vod_proxy/views.py b/apps/proxy/vod_proxy/views.py
index fdebdcea..e5d16e90 100644
--- a/apps/proxy/vod_proxy/views.py
+++ b/apps/proxy/vod_proxy/views.py
@@ -15,6 +15,7 @@ from apps.m3u.models import  M3UAccountProfile
 from apps.proxy.vod_proxy.multi_worker_connection_manager import MultiWorkerVODConnectionManager, infer_content_type_from_url, get_vod_client_stop_key
 from .utils import get_client_info
 from rest_framework.decorators import api_view, permission_classes
+from rest_framework.permissions import AllowAny
 from apps.accounts.models import User
 from apps.accounts.permissions import IsAdmin
 from apps.proxy.utils import check_user_stream_limits
@@ -291,6 +292,7 @@ def _transform_url(original_url, m3u_profile):
         return original_url
 
 @api_view(["GET"])
+@permission_classes([AllowAny])
 def stream_vod(request, content_type, content_id, session_id=None, profile_id=None, user=None):
     """
     Stream VOD content (movies or series episodes) with session-based connection reuse
@@ -500,6 +502,7 @@ def stream_vod(request, content_type, content_id, session_id=None, profile_id=No
         return HttpResponse(f"Streaming error: {str(e)}", status=500)
 
 @api_view(["HEAD"])
+@permission_classes([AllowAny])
 def head_vod(request, content_type, content_id, session_id=None, profile_id=None):
     """
     Handle HEAD requests for FUSE filesystem integration
@@ -987,6 +990,7 @@ def stop_vod_client(request):
         return JsonResponse({'error': str(e)}, status=500)
 
 @api_view(["GET"])
+@permission_classes([AllowAny])
 def stream_xc_movie(request, username, password, stream_id, extension):
     from apps.vod.models import M3UMovieRelation
 
@@ -1017,6 +1021,7 @@ def stream_xc_movie(request, username, password, stream_id, extension):
     return stream_vod(request._request, 'movie', movie_relation.movie.uuid, session_id, profile_id, user)
 
 @api_view(["GET"])
+@permission_classes([AllowAny])
 def stream_xc_episode(request, username, password, stream_id, extension):
     from apps.vod.models import M3UEpisodeRelation
 
diff --git a/core/api_views.py b/core/api_views.py
index d01d8619..596da877 100644
--- a/core/api_views.py
+++ b/core/api_views.py
@@ -35,6 +35,9 @@ import os
 from core.tasks import rehash_streams
 from apps.accounts.permissions import (
     Authenticated,
+    IsAdmin,
+    IsStandardUser,
+    permission_classes_by_action,
 )
 from dispatcharr.utils import get_client_ip
 
@@ -50,6 +53,12 @@ class UserAgentViewSet(viewsets.ModelViewSet):
     queryset = UserAgent.objects.all()
     serializer_class = UserAgentSerializer
 
+    def get_permissions(self):
+        try:
+            return [perm() for perm in permission_classes_by_action[self.action]]
+        except KeyError:
+            return [Authenticated()]
+
 
 class StreamProfileViewSet(viewsets.ModelViewSet):
     """
@@ -59,6 +68,12 @@ class StreamProfileViewSet(viewsets.ModelViewSet):
     queryset = StreamProfile.objects.all()
     serializer_class = StreamProfileSerializer
 
+    def get_permissions(self):
+        try:
+            return [perm() for perm in permission_classes_by_action[self.action]]
+        except KeyError:
+            return [Authenticated()]
+
 
 class CoreSettingsViewSet(viewsets.ModelViewSet):
     """
@@ -69,6 +84,12 @@ class CoreSettingsViewSet(viewsets.ModelViewSet):
     queryset = CoreSettings.objects.all()
     serializer_class = CoreSettingsSerializer
 
+    def get_permissions(self):
+        try:
+            return [perm() for perm in permission_classes_by_action[self.action]]
+        except KeyError:
+            return [Authenticated()]
+
     def update(self, request, *args, **kwargs):
         instance = self.get_object()
         old_value = instance.value
@@ -171,6 +192,11 @@ class ProxySettingsViewSet(viewsets.ViewSet):
     """
     serializer_class = ProxySettingsSerializer
 
+    def get_permissions(self):
+        if self.action in ('list', 'retrieve'):
+            return [IsStandardUser()]
+        return [IsAdmin()]
+
     def _get_or_create_settings(self):
         """Get or create the proxy settings CoreSettings entry"""
         try:

From c3fb9c0073ed0952f4fb6237743ca03d77967aa7 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 11:09:27 -0500
Subject: [PATCH 143/172] security: Fixed missing `network_access_allowed`
 checks in the VOD proxy. `stream_vod`, `head_vod`, `stream_xc_movie`, and
 `stream_xc_episode` were not checking the `STREAMS` network policy, unlike
 the equivalent TS proxy endpoints.

---
 CHANGELOG.md                  | 11 +++++++++++
 apps/proxy/vod_proxy/views.py | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52246f84..e97b52c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+- Set `DEFAULT_PERMISSION_CLASSES` to `IsAdmin` in the DRF configuration. All viewsets and function-based views that require non-admin or unauthenticated access were explicitly annotated: proxy streaming endpoints (`stream_ts`, `stream_xc`, `stream_vod`, `head_vod`, `stream_xc_movie`, `stream_xc_episode`) use `@permission_classes([AllowAny])` (access is controlled by the per-stream-type network allow-list inside the view body); the `UserAgentViewSet`, `StreamProfileViewSet`, `CoreSettingsViewSet`, and `ProxySettingsViewSet` gained `get_permissions()` methods mapping read actions to `IsStandardUser` and write actions to `IsAdmin`; and `AuthViewSet.logout` was updated to return `[Authenticated()]`.
+- Fixed missing `network_access_allowed` checks in the VOD proxy. `stream_vod`, `head_vod`, `stream_xc_movie`, and `stream_xc_episode` were not checking the `STREAMS` network policy, unlike the equivalent TS proxy endpoints.
+- Explicitly marked the HDHomeRun discovery endpoints (`DiscoverAPIView`, `LineupAPIView`, `LineupStatusAPIView`, `HDHRDeviceXMLAPIView`) and the version endpoint with `permission_classes = [AllowAny]` to document their intentionally public access now that the global default is `IsAdmin`.
+- Fixed path traversal vulnerability in file uploads. The M3U account upload (`apps/m3u/api_views.py`), logo upload (`apps/channels/api_views.py`), and backup upload (`apps/backups/api_views.py`) all used the uploaded filename directly without sanitization. `os.path.join()` discards all preceding components when it encounters an absolute path segment, and `pathlib`'s `/` operator behaves identically; a relative `../` sequence also escapes via OS path resolution at `open()` time. All three upload paths now strip directory components via `Path(name).name` and validate the resolved path remains within the intended upload directory. Exploiting any of these required admin credentials.
+- Prevented users from setting `xc_password` (and other admin-managed keys) on their own account via the `PATCH /api/accounts/users/me/` endpoint.
 - Hardened the HLS proxy `change_stream` endpoint by converting it from a plain Django view to a DRF `@api_view` with `@permission_classes([IsAdmin])`, ensuring the endpoint actually enforces admin-only access. The previous decorator arrangement (`@csrf_exempt` + `@permission_classes`) had no effect on a plain Django view.
+- Added rate limiting to the login endpoint (`POST /api/accounts/token/`) using DRF's built-in throttling. A `LoginRateThrottle` (3 requests/minute per IP, sliding window) is applied to the `TokenObtainPairView`. Repeated failed attempts from the same IP receive `429 Too Many Requests`.
+- Removed `CORS_ALLOW_CREDENTIALS = True` from CORS configuration. Dispatcharr authenticates via JWT `Authorization` headers and API keys — not cookies — so credentials are never sent cross-origin by browsers. The setting was also redundant: browsers reject `Access-Control-Allow-Credentials: true` when `Access-Control-Allow-Origin` is a wildcard (`*`), so it had no effect in practice.
+- Updated frontend npm dependencies to resolve 6 audit vulnerabilities (6 high):
+  - Updated `@xmldom/xmldom` 0.8.11 → 0.8.12, resolving **high** XML injection via unsafe CDATA serialization allowing attacker-controlled markup insertion ([GHSA-wh4c-j3r5-mjhp](https://github.com/advisories/GHSA-wh4c-j3r5-mjhp))
+  - Updated `lodash` 4.17.23 → 4.18.1, resolving **high** Code Injection via `_.template` imports key names ([GHSA-r5fr-rjxr-66jc](https://github.com/advisories/GHSA-r5fr-rjxr-66jc)) and **high** Prototype Pollution via array path bypass in `_.unset` and `_.omit` ([GHSA-f23m-r3pf-42rh](https://github.com/advisories/GHSA-f23m-r3pf-42rh))
+  - Updated `vite` 7.3.1 → 7.3.2, resolving **high** Path Traversal in optimized deps `.map` handling ([GHSA-4w7w-66w2-5vf9](https://github.com/advisories/GHSA-4w7w-66w2-5vf9)), **high** `server.fs.deny` bypass with queries ([GHSA-v2wj-q39q-566r](https://github.com/advisories/GHSA-v2wj-q39q-566r)), and **high** Arbitrary File Read via dev server WebSocket ([GHSA-p9ff-h696-f583](https://github.com/advisories/GHSA-p9ff-h696-f583))
 
 ### Removed
 
diff --git a/apps/proxy/vod_proxy/views.py b/apps/proxy/vod_proxy/views.py
index e5d16e90..a1dcf9a3 100644
--- a/apps/proxy/vod_proxy/views.py
+++ b/apps/proxy/vod_proxy/views.py
@@ -19,6 +19,7 @@ from rest_framework.permissions import AllowAny
 from apps.accounts.models import User
 from apps.accounts.permissions import IsAdmin
 from apps.proxy.utils import check_user_stream_limits
+from dispatcharr.utils import network_access_allowed
 
 logger = logging.getLogger(__name__)
 
@@ -303,6 +304,9 @@ def stream_vod(request, content_type, content_id, session_id=None, profile_id=No
         session_id: Optional session ID from URL path (for persistent connections)
         profile_id: Optional M3U profile ID for authentication
     """
+    if not network_access_allowed(request, "STREAMS"):
+        return JsonResponse({"error": "Forbidden"}, status=403)
+
     logger.info(f"[VOD-REQUEST] Starting VOD stream request: {content_type}/{content_id}, session: {session_id}, profile: {profile_id}")
     logger.info(f"[VOD-REQUEST] Full request path: {request.get_full_path()}")
     logger.info(f"[VOD-REQUEST] Request method: {request.method}")
@@ -509,6 +513,9 @@ def head_vod(request, content_type, content_id, session_id=None, profile_id=None
 
     Returns content length and session URL header for subsequent GET requests
     """
+    if not network_access_allowed(request, "STREAMS"):
+        return JsonResponse({"error": "Forbidden"}, status=403)
+
     logger.info(f"[VOD-HEAD] HEAD request: {content_type}/{content_id}, session: {session_id}, profile: {profile_id}")
 
     try:
@@ -992,6 +999,9 @@ def stop_vod_client(request):
 @api_view(["GET"])
 @permission_classes([AllowAny])
 def stream_xc_movie(request, username, password, stream_id, extension):
+    if not network_access_allowed(request, "STREAMS"):
+        return JsonResponse({"error": "Forbidden"}, status=403)
+
     from apps.vod.models import M3UMovieRelation
 
     session_id = request.GET.get('session_id')
@@ -1023,6 +1033,9 @@ def stream_xc_movie(request, username, password, stream_id, extension):
 @api_view(["GET"])
 @permission_classes([AllowAny])
 def stream_xc_episode(request, username, password, stream_id, extension):
+    if not network_access_allowed(request, "STREAMS"):
+        return JsonResponse({"error": "Forbidden"}, status=403)
+
     from apps.vod.models import M3UEpisodeRelation
 
     session_id = request.GET.get('session_id')

From ff600054428bd32ae016ae49c2c1ee64f44ca4e4 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 12:16:49 -0500
Subject: [PATCH 144/172] =?UTF-8?q?chore:=20Updated=20python=20packages.?=
 =?UTF-8?q?=20=20=20-=20`Django`=206.0.3=20=E2=86=92=206.0.4=20=20=20-=20`?=
 =?UTF-8?q?djangorestframework`=203.16.1=20=E2=86=92=203.17.1=20=20=20-=20?=
 =?UTF-8?q?`requests`=202.33.0=20=E2=86=92=202.33.1=20=20=20-=20`gevent`?=
 =?UTF-8?q?=2025.9.1=20=E2=86=92=2026.4.0=20=20=20-=20`rapidfuzz`=203.14.3?=
 =?UTF-8?q?=20=E2=86=92=203.14.5=20=20=20-=20`sentence-transformers`=205.3?=
 =?UTF-8?q?.0=20=E2=86=92=205.4.0=20=20=20-=20`lxml`=206.0.2=20=E2=86=92?=
 =?UTF-8?q?=206.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pyproject.toml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0f2d7afd..11212f58 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,34 +6,34 @@ license = "AGPL-3.0-only"
 requires-python = ">=3.13"
 dynamic = ["version"]
 dependencies = [
-    "Django==6.0.3",
+    "Django==6.0.4",
     "psycopg2-binary==2.9.11",
     "celery[redis]==5.6.3",
-    "djangorestframework==3.16.1",
-    "requests==2.33.0",
+    "djangorestframework==3.17.1",
+    "requests==2.33.1",
     "psutil==7.2.2",
     "pillow",
     "drf-spectacular>=0.29.0",
     "streamlink",
     "python-vlc",
     "yt-dlp",
-    "gevent==25.9.1",
+    "gevent==26.4.0",
     "daphne",
     "uwsgi",
     "django-cors-headers",
     "djangorestframework-simplejwt",
     "m3u8",
-    "rapidfuzz==3.14.3",
+    "rapidfuzz==3.14.5",
     "regex",
     "tzlocal",
     "pytz",
     "torch==2.11.0+cpu",
-    "sentence-transformers==5.3.0",
+    "sentence-transformers==5.4.0",
     "channels",
     "channels-redis==4.3.0",
     "django-filter",
     "django-celery-beat>=2.9.0",
-    "lxml==6.0.2",
+    "lxml==6.0.3",
     "packaging",
 ]
 

From 8eb22ce45a857953595672d71f57761f4640eaf5 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 12:24:19 -0500
Subject: [PATCH 145/172] Enhancement: Add python-gnupg to dependencies for
 plugin store.

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 11212f58..18ec42e3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,6 +35,7 @@ dependencies = [
     "django-celery-beat>=2.9.0",
     "lxml==6.0.3",
     "packaging",
+    "python-gnupg",
 ]
 
 [build-system]

From 192a134c04cb55b9b2ed5bc0c5f48b0597e89b10 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 12:30:58 -0500
Subject: [PATCH 146/172] changelog: Update changelog for python package
 updates/additions.

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e97b52c8..8ac847d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Updated `@xmldom/xmldom` 0.8.11 → 0.8.12, resolving **high** XML injection via unsafe CDATA serialization allowing attacker-controlled markup insertion ([GHSA-wh4c-j3r5-mjhp](https://github.com/advisories/GHSA-wh4c-j3r5-mjhp))
   - Updated `lodash` 4.17.23 → 4.18.1, resolving **high** Code Injection via `_.template` imports key names ([GHSA-r5fr-rjxr-66jc](https://github.com/advisories/GHSA-r5fr-rjxr-66jc)) and **high** Prototype Pollution via array path bypass in `_.unset` and `_.omit` ([GHSA-f23m-r3pf-42rh](https://github.com/advisories/GHSA-f23m-r3pf-42rh))
   - Updated `vite` 7.3.1 → 7.3.2, resolving **high** Path Traversal in optimized deps `.map` handling ([GHSA-4w7w-66w2-5vf9](https://github.com/advisories/GHSA-4w7w-66w2-5vf9)), **high** `server.fs.deny` bypass with queries ([GHSA-v2wj-q39q-566r](https://github.com/advisories/GHSA-v2wj-q39q-566r)), and **high** Arbitrary File Read via dev server WebSocket ([GHSA-p9ff-h696-f583](https://github.com/advisories/GHSA-p9ff-h696-f583))
+- Updated `Django` 6.0.3 → 6.0.4, resolving the following CVEs:
+  - **CVE-2026-33033**: Potential DoS via `MultiPartParser` through crafted multipart uploads.
+  - **CVE-2026-33034**: SGI requests with a missing or understated `Content-Length` header could bypass the `DATA_UPLOAD_MAX_MEMORY_SIZE` limit.
+  - **CVE-2026-4292**: Privilege abuse in `ModelAdmin.list_editable`.
+  - **CVE-2026-3902**: ASGI header spoofing via underscore/hyphen conflation.
+  - **CVE-2026-4277**: Privilege abuse in `GenericInlineModelAdmin`.
 
 ### Removed
 
@@ -32,6 +38,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Refactored frontend form components (`AccountInfoModal`, `AssignChannelNumbers`, `Channel`, `ChannelBatch`, `ChannelGroup`, `Connection`, `CronBuilder`, `DummyEPG`, and `EPG`) to extract business logic into dedicated utility modules under `src/utils/forms/`. Each extracted module is covered by unit tests. Mantine compound component references (`Table.Tbody`, `Popover.Target`, `Accordion.Item`, etc.) have been updated to use flat named imports. — Thanks [@nick4810](https://github.com/nick4810)
 - Improved the EPG BOM fix from v0.22.1: replaced the `lstrip(b'\xef\xbb\xbf')` / `startswith` approach with `start.find(b'<?xml')`, which locates the XML declaration regardless of any leading bytes BOM, whitespace, or other encoding markers without needing to know what those bytes are.
+- Dependency updates:
+  - `Django` 6.0.3 → 6.0.4 (security patch; see Security section)
+  - `djangorestframework` 3.16.1 → 3.17.1
+  - `requests` 2.33.0 → 2.33.1
+  - `gevent` 25.9.1 → 26.4.0
+  - `rapidfuzz` 3.14.3 → 3.14.5
+  - `sentence-transformers` 5.3.0 → 5.4.0
+  - `lxml` 6.0.2 → 6.0.3
+  - Added `python-gnupg` for GPG signature verification of official and third-party plugin repository manifests.
 
 ## [0.22.1] - 2026-04-05
 

From 1cda7b9439a8923e42b1cb6b1db33b0065e444cc Mon Sep 17 00:00:00 2001
From: Seth Van Niekerk <seth@swvn.io>
Date: Fri, 10 Apr 2026 13:53:45 -0400
Subject: [PATCH 147/172] feat: plugin hub

---
 Plugin_repo.md                                |  586 ++++++++
 apps/plugins/api_urls.py                      |   17 +
 apps/plugins/api_views.py                     | 1233 ++++++++++++++---
 apps/plugins/apps.py                          |   50 +
 apps/plugins/keys/dispatcharr-plugins.pub     |   11 +
 apps/plugins/loader.py                        |   52 +-
 apps/plugins/migrations/0002_pluginrepo.py    |   84 ++
 apps/plugins/models.py                        |   44 +
 apps/plugins/serializers.py                   |   38 +
 apps/plugins/tasks.py                         |   33 +
 frontend/src/App.jsx                          |    5 +
 frontend/src/api.js                           |  150 +-
 frontend/src/components/PluginDetailPanel.jsx |  430 ++++++
 .../src/components/__tests__/Sidebar.test.jsx |    2 +
 .../components/cards/AvailablePluginCard.jsx  |  779 +++++++++++
 frontend/src/components/cards/PluginCard.jsx  |  556 +++++---
 .../cards/__tests__/PluginCard.test.jsx       |   92 +-
 .../__tests__/StreamConnectionCard.test.jsx   |    3 +
 frontend/src/components/pluginUtils.js        |   25 +
 frontend/src/config/navigation.js             |    7 +-
 frontend/src/pages/PluginBrowse.jsx           |  729 ++++++++++
 frontend/src/pages/Plugins.jsx                |  298 ++--
 frontend/src/pages/__tests__/Plugins.test.jsx |   55 +-
 frontend/src/store/plugins.jsx                |   76 +
 frontend/src/utils/pages/PluginsUtils.js      |    4 +-
 .../pages/__tests__/PluginsUtils.test.js      |    6 +-
 26 files changed, 4891 insertions(+), 474 deletions(-)
 create mode 100644 Plugin_repo.md
 create mode 100644 apps/plugins/keys/dispatcharr-plugins.pub
 create mode 100644 apps/plugins/migrations/0002_pluginrepo.py
 create mode 100644 apps/plugins/tasks.py
 create mode 100644 frontend/src/components/PluginDetailPanel.jsx
 create mode 100644 frontend/src/components/cards/AvailablePluginCard.jsx
 create mode 100644 frontend/src/components/pluginUtils.js
 create mode 100644 frontend/src/pages/PluginBrowse.jsx

diff --git a/Plugin_repo.md b/Plugin_repo.md
new file mode 100644
index 00000000..d846526d
--- /dev/null
+++ b/Plugin_repo.md
@@ -0,0 +1,586 @@
+# Dispatcharr Plugin Repository Specification
+
+How to create and host a plugin repository that Dispatcharr can consume.
+
+For writing plugins themselves, see [Plugins.md](Plugins.md).
+
+---
+
+## Overview
+
+Dispatcharr discovers plugins from remote repositories using a two-level manifest system:
+
+1. **Repo manifest** - a JSON file listing all plugins in the repo with basic metadata.
+2. **Per-plugin manifest** (optional) - a JSON file per plugin with full version history, checksums, and compatibility info.
+
+Users add a repo by its manifest URL. Dispatcharr fetches and caches the repo manifest periodically (default: every 6 hours, configurable). The UI displays all plugins from enabled repos in a browsable store.
+
+---
+
+## Repo Manifest
+
+The repo manifest is the entry point. Dispatcharr fetches this URL and caches the response.
+
+### Minimal Example (no signing)
+
+```json
+{
+  "registry_name": "My Plugin Repo",
+  "plugins": [
+    {
+      "slug": "my_plugin",
+      "name": "My Plugin",
+      "description": "Does something useful",
+      "author": "Your Name",
+      "latest_version": "1.0.0",
+      "latest_url": "https://example.com/releases/my_plugin-1.0.0.zip"
+    }
+  ]
+}
+```
+
+This is the simplest valid repo manifest - one plugin with enough info to show in the store and install.
+
+### Full Example (with signing)
+
+```json
+{
+  "manifest": {
+    "registry_name": "My Plugin Repo",
+    "registry_url": "https://github.com/myorg/my-plugins",
+    "root_url": "https://raw.githubusercontent.com/myorg/my-plugins/releases",
+    "plugins": [
+      {
+        "slug": "weather_display",
+        "name": "Weather Display",
+        "description": "Shows weather info on the dashboard",
+        "author": "Acme Labs",
+        "license": "MIT",
+        "latest_version": "1.2.5",
+        "last_updated": "2025-01-20T15:30:00Z",
+        "manifest_url": "plugins/weather_display/manifest.json",
+        "latest_url": "plugins/weather_display/releases/weather_display-1.2.5.zip",
+        "latest_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+        "icon_url": "plugins/weather_display/logo.png",
+        "min_dispatcharr_version": "2.5.0",
+        "max_dispatcharr_version": null
+      }
+    ]
+  },
+  "signature": "-----BEGIN PGP SIGNATURE-----\n..."
+}
+```
+
+### Accepted Formats
+
+Dispatcharr accepts two top-level shapes:
+
+**Wrapped (supports signing):**
+```json
+{
+  "manifest": { "plugins": [...], ... },
+  "signature": "..."
+}
+```
+
+**Flat (no signing):**
+```json
+{
+  "plugins": [...],
+  "registry_name": "...",
+  "root_url": "..."
+}
+```
+
+The wrapped format is required for signing. If you don't need signing, the flat format works and is simpler.
+
+### Name Restrictions
+
+`registry_name` is required. Dispatcharr rejects repos that are missing it.
+
+Third-party repos must not use names that could be confused with an official Dispatcharr repo. The following words are blocked in `registry_name` (case-insensitive):
+
+- "official"
+- "dispatcharr plugins"
+- "dispatcharr repo"
+- "dispatcharr official"
+
+If the name contains any of these, the repo will be rejected on add and skipped during refresh.
+
+---
+
+## Repo Manifest Fields
+
+### Top-Level Metadata
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `registry_name` | **Yes** | Display name for the repo. Must not contain words like "official" or "dispatcharr" that could be mistaken for an official repo (see [Name Restrictions](#name-restrictions)). |
+| `registry_url` | No | URL to the repo's home page (e.g. GitHub). Used as a fallback for generating icon URLs. |
+| `root_url` | No | Base URL for resolving relative URLs in plugin entries. Trailing slashes are stripped. |
+| `plugins` | **Yes** | Array of plugin entry objects. |
+
+### Plugin Entry Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `slug` | **Yes** | Unique identifier. Alphanumeric, dashes, and underscores. Used as the install directory name (lowercased, dashes converted to underscores). |
+| `name` | **Yes** | Human-readable display name. |
+| `description` | No | Short description shown on the plugin card. |
+| `author` | No | Author or organization name. |
+| `license` | No | SPDX license identifier (e.g. `MIT`, `GPL-3.0`). Displayed as a link to the SPDX license page. |
+| `latest_version` | No | Current latest version string (semver: `1.2.3` or `v1.2.3`). Drives update detection. |
+| `last_updated` | No | ISO 8601 timestamp of the latest release. Shown as "Built" date in the detail view. |
+| `manifest_url` | No | URL (or relative path) to the per-plugin manifest with full version history. See [Per-Plugin Manifest](#per-plugin-manifest). |
+| `latest_url` | No | Direct download URL (or relative path) to the latest release zip. |
+| `latest_sha256` | No | SHA256 checksum of the latest release zip (lowercase hex, 64 chars). |
+| `latest_md5` | No | MD5 checksum of the latest release zip. Informational only - not validated by Dispatcharr. |
+| `icon_url` | No | URL (or relative path) to a logo image (PNG recommended). |
+| `min_dispatcharr_version` | No | Minimum Dispatcharr version required. Install is blocked if the running version is older. |
+| `max_dispatcharr_version` | No | Maximum Dispatcharr version supported. Install is blocked if the running version is newer. |
+
+Extra fields in a plugin entry are passed through to the frontend as-is, so you can include custom metadata (e.g. `homepage`, `tags`) without breaking anything.
+
+### URL Resolution
+
+If `root_url` is set and a URL field (`manifest_url`, `latest_url`, `icon_url`) does not start with `http://` or `https://`, it is treated as relative and resolved as:
+
+```
+{root_url}/{field_value}
+```
+
+This lets you keep plugin entries compact:
+```json
+{
+  "root_url": "https://raw.githubusercontent.com/myorg/my-plugins/releases",
+  "plugins": [
+    {
+      "slug": "my_plugin",
+      "latest_url": "plugins/my_plugin/my_plugin-1.0.0.zip",
+      "icon_url": "plugins/my_plugin/logo.png",
+      "manifest_url": "plugins/my_plugin/manifest.json"
+    }
+  ]
+}
+```
+
+**Icon fallback:** If `icon_url` is missing and `registry_url` is set, Dispatcharr generates a fallback URL by converting the GitHub URL to a raw content URL:
+```
+{registry_url => raw.githubusercontent.com}/refs/heads/main/plugins/{slug}/logo.png
+```
+
+---
+
+## Per-Plugin Manifest (Optional)
+
+The per-plugin manifest provides full version history. It is fetched on-demand when a user clicks "More Info" on a plugin card. It is **not required** - if `manifest_url` is absent, the UI builds a detail view from the repo-level fields instead.
+
+Include a per-plugin manifest if you want to:
+- Offer multiple downloadable versions
+- Show per-version compatibility ranges
+- Display build timestamps and commit links for each version
+- Provide detailed author/license info beyond what's in the repo manifest
+
+### Accepted Formats
+
+Same as the root manifest - both flat and wrapped formats are accepted:
+
+**Flat (no signing):**
+```json
+{
+  "slug": "...",
+  "versions": [...]
+}
+```
+
+**Wrapped (supports signing):**
+```json
+{
+  "manifest": {
+    "slug": "...",
+    "versions": [...]
+  },
+  "signature": "-----BEGIN PGP SIGNATURE-----\n..."
+}
+```
+
+Use the wrapped format if you want to GPG-sign the per-plugin manifest.
+
+### Example
+
+```json
+{
+  "slug": "weather_display",
+  "name": "Weather Display",
+  "description": "Shows weather information on the Dispatcharr dashboard",
+  "author": "Acme Labs",
+  "license": "MIT",
+  "latest_version": "1.2.5",
+  "versions": [
+    {
+      "version": "1.2.5",
+      "url": "releases/weather_display-1.2.5.zip",
+      "checksum_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+      "build_timestamp": "2025-01-20T15:30:00Z",
+      "commit_sha": "4e8f1b108c1e84f60520710d13e54eb2fb519648",
+      "commit_sha_short": "4e8f1b1",
+      "min_dispatcharr_version": "2.5.0",
+      "max_dispatcharr_version": null
+    },
+    {
+      "version": "1.2.5-rc.1",
+      "url": "releases/weather_display-1.2.5-rc.1.zip",
+      "checksum_sha256": "a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2",
+      "prerelease": true,
+      "build_timestamp": "2025-01-18T09:00:00Z",
+      "min_dispatcharr_version": "2.5.0"
+    },
+    {
+      "version": "1.2.4",
+      "url": "releases/weather_display-1.2.4.zip",
+      "checksum_sha256": "d4d967a67a4947e55183308cece206b30dda3e1b4fe00aae60f45a49c83b7ed6",
+      "build_timestamp": "2025-01-15T10:00:00Z",
+      "min_dispatcharr_version": "2.4.0"
+    }
+  ],
+  "latest": {
+    "version": "1.2.5",
+    "url": "releases/weather_display-1.2.5.zip",
+    "checksum_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+    "build_timestamp": "2025-01-20T15:30:00Z",
+    "min_dispatcharr_version": "2.5.0"
+  }
+}
+```
+
+### Per-Plugin Manifest Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `slug` | No | Plugin identifier (should match the repo entry). |
+| `name` | No | Display name. |
+| `description` | No | Full description shown in the detail modal. |
+| `author` | No | Author/org name shown in the detail modal. |
+| `license` | No | SPDX license identifier. |
+| `latest_version` | No | Latest version string. |
+| `versions` | No | Array of version objects (newest first recommended). |
+| `latest` | No | Object mirroring the latest version entry for quick access. |
+
+### Version Object Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `version` | **Yes** | Version string (`1.2.3` or `v1.2.3`). |
+| `url` | **Yes** | Download URL for the zip. Relative URLs are resolved against the repo's `root_url`. |
+| `checksum_sha256` | No | SHA256 hex checksum. **Strongly recommended.** Validated on install - mismatch blocks the install. |
+| `prerelease` | No | Boolean. When `true`, marks this version as a pre-release (alpha, beta, RC, etc.). If the installed version is a prerelease, Dispatcharr will not suggest updating to the latest stable version - the user must install a new version manually. The latest version in the root manifest is always assumed to be stable, so this field only needs to appear in the per-plugin manifest. Omit or set to `false` for stable releases. |
+| `build_timestamp` | No | ISO 8601 build timestamp. Shown as "Built" in the version detail. |
+| `commit_sha` | No | Full Git commit SHA. Used to build a commit link if `registry_url` is set. |
+| `commit_sha_short` | No | Abbreviated commit SHA. Displayed in the version detail table as a clickable link. |
+| `min_dispatcharr_version` | No | Minimum compatible Dispatcharr version. |
+| `max_dispatcharr_version` | No | Maximum compatible Dispatcharr version. |
+
+Relative `url` values in versions are resolved the same way as repo-level URLs: `{root_url}/{url}`.
+
+---
+
+## Without a Per-Plugin Manifest
+
+If you omit `manifest_url` from a plugin entry, the store still works. When a user clicks "More Info", the UI builds a detail view from the repo-level fields:
+
+- `description`, `author`, `license` from the plugin entry
+- A single version entry built from `latest_version`, `latest_url`, `latest_sha256`, `min_dispatcharr_version`, `max_dispatcharr_version`, and `last_updated`
+
+This is the simplest path for third-party repos that only publish one version at a time. You lose version history and per-version release dates, but install, update detection, and everything else works the same.
+
+---
+
+## Signing
+
+Signing your repo manifest lets Dispatcharr verify it hasn't been tampered with. Signing is **optional** - unsigned repos work fine but show an "unverified" badge in the UI.
+
+### How It Works
+
+1. You generate a GPG keypair.
+2. You sign the manifest JSON and include the detached signature in the response.
+3. When adding the repo in Dispatcharr, the user pastes your public key.
+4. Dispatcharr verifies the signature on every manifest fetch.
+
+### Key Format
+
+Standard PGP/GPG armored keys:
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBG...
+...
+-----END PGP PUBLIC KEY BLOCK-----
+```
+
+### Signing Convention
+
+The signature is computed over the **canonical JSON** representation of the `manifest` object (not the entire response), plus a trailing newline:
+
+```bash
+# Canonical format: compact JSON (no spaces) + trailing newline
+jq -c '.manifest' manifest.json | gpg --armor --detach-sign
+```
+
+In code terms:
+```python
+import json
+canonical = json.dumps(manifest_obj, separators=(",", ":")) + "\n"
+```
+
+> **Important:** The signing input must be `json.dumps(obj, separators=(",", ":")) + "\n"` - compact JSON with no whitespace, followed by exactly one newline. Any difference (pretty-printing, trailing spaces, key ordering changes) will cause verification to fail.
+
+### Manifest Structure for Signing
+
+Use the wrapped format so the signature sits alongside the manifest:
+
+```json
+{
+  "manifest": {
+    "registry_name": "...",
+    "plugins": [...]
+  },
+  "signature": "-----BEGIN PGP SIGNATURE-----\n...\n-----END PGP SIGNATURE-----"
+}
+```
+
+### Verification Results
+
+| Result | Meaning | UI Badge |
+|--------|---------|----------|
+| `true` | Valid signature | Green checkmark |
+| `false` | Invalid signature or verification error | Red X |
+| `null` | Not attempted (no signature, no key, or `python-gnupg` not installed) | Gray/neutral |
+
+### Signing Workflow Example
+
+```bash
+# Generate a keypair (one-time)
+gpg --gen-key
+
+# Export your public key (give this to repo users)
+gpg --armor --export "your@email.com" > my-repo.pub
+
+# Build your manifest
+cat > manifest.json << 'EOF'
+{
+  "manifest": {
+    "registry_name": "My Repo",
+    "root_url": "https://example.com/releases",
+    "plugins": [
+      {
+        "slug": "my_plugin",
+        "name": "My Plugin",
+        "latest_version": "1.0.0",
+        "latest_url": "plugins/my_plugin/my_plugin-1.0.0.zip"
+      }
+    ]
+  }
+}
+EOF
+
+# Sign the manifest object (canonical JSON + newline)
+jq -c '.manifest' manifest.json | gpg --armor --detach-sign > manifest.sig
+
+# Combine into final output
+jq --arg sig "$(cat manifest.sig)" '.signature = $sig' manifest.json > signed_manifest.json
+```
+
+### Third-Party Key Management
+
+When a user adds your repo URL, they can paste your public key. Dispatcharr stores the key per-repo and uses it for verification. Users can update the key at any time from the repo management UI.
+
+If you don't provide a key and the repo is not the official Dispatcharr repo, signature verification is skipped (result: `null`).
+
+---
+
+## Release Zip Format
+
+Each plugin release is a `.zip` archive.
+
+### Requirements
+
+- Must contain a `plugin.py` with a `Plugin` class, **or** a Python package with `__init__.py` exporting a `Plugin` class.
+- Files can be at the top level of the zip or inside a single subdirectory.
+- Optionally include `plugin.json` for metadata discovery without code execution.
+- Optionally include `logo.png` for the plugin icon.
+
+### Size Limits
+
+- Maximum 2000 files per archive.
+- Maximum total size: 200 MB (configurable via `MAX_PLUGIN_IMPORT_BYTES` setting).
+
+### Recommended Structure
+
+```
+my_plugin-1.0.0.zip
+  plugin.py
+  plugin.json
+  logo.png
+  (any other files your plugin needs)
+```
+
+Or with a subdirectory:
+```
+my_plugin-1.0.0.zip
+  my_plugin/
+    plugin.py
+    plugin.json
+    logo.png
+    utils.py
+```
+
+---
+
+## Install Flow
+
+When a user installs a plugin from the store:
+
+1. **Version compatibility check** - if `min_dispatcharr_version` or `max_dispatcharr_version` is set, the running Dispatcharr version is compared. Install is blocked if out of range.
+2. **Download** - the zip is streamed from `download_url` (max 200 MB).
+3. **SHA256 integrity check** - if `sha256` was provided, the download is hashed and compared. Mismatch blocks the install.
+4. **Extraction** - the zip is extracted to a temp directory, validated, then moved to `/data/plugins/{plugin_key}/`. If the plugin already exists, the old version is backed up and restored on failure (atomic rollback).
+5. **Registration** - a `PluginConfig` record is created or updated, linking the plugin to its source repo and slug.
+6. **Discovery reload** - the plugin loader re-scans all plugin directories.
+
+The plugin is installed **disabled** by default. The user can enable it from the post-install dialog or the My Plugins page.
+
+---
+
+## Update Detection
+
+Dispatcharr detects updates by comparing `installed_version` (stored in the database) against `latest_version` from the repo manifest. This uses repo-level fields only - per-plugin manifests are not needed for update detection.
+
+A plugin shows "Update Available" when:
+- It is managed (installed from a repo)
+- Its `installed_version` differs from `latest_version`
+- It was installed from the same repo
+
+---
+
+## Hosting Options
+
+A plugin repo manifest is just a JSON file served over HTTPS. Some options:
+
+### GitHub Pages / Raw Content
+Host your manifest and release zips in a GitHub repo. Use raw.githubusercontent.com URLs:
+```
+https://raw.githubusercontent.com/myorg/my-plugins/main/manifest.json
+```
+
+Use `root_url` pointing to your releases branch/path so version URLs stay relative.
+
+### Static File Server
+Any web server that serves JSON works. Dispatcharr fetches manifests server-side, so CORS is not needed.
+
+### GitHub Releases
+You can host release zips as GitHub Release assets and reference them with absolute URLs in your manifest. The manifest itself can live in the repo's default branch.
+
+---
+
+## Refresh Behavior
+
+- Manifests are refreshed automatically at a configurable interval (default: 6 hours, setting: `refresh_interval_hours`, 0 = disabled).
+- Users can force a refresh from the repo management UI.
+- A new repo is refreshed immediately when added.
+- On refresh, if a plugin's `slug` disappears from the manifest, its `PluginConfig` is unlinked from the repo (becomes "unmanaged") but the installed files are not deleted.
+
+---
+
+## Checklist: Publishing a Plugin Repo
+
+### Minimum Viable Repo
+
+- [ ] Host a JSON file at a stable, public URL
+- [ ] Set `registry_name` (required, must not sound official)
+- [ ] Include at least one plugin entry with `slug`, `name`, and `latest_version`
+- [ ] Host a downloadable `.zip` for each plugin and set `latest_url`
+- [ ] Share the manifest URL with users
+
+### Recommended
+
+- [ ] Set `root_url` so plugin URLs can be relative
+- [ ] Include `description`, `author`, and `icon_url` per plugin
+- [ ] Include `latest_sha256` for integrity verification
+- [ ] Include `license` (SPDX identifier)
+- [ ] Include `last_updated` timestamps
+- [ ] Add a per-plugin `manifest_url` with version history
+- [ ] Include `sha256` in every version object
+- [ ] Include `min_dispatcharr_version` where applicable
+- [ ] Include `plugin.json` in each release zip
+
+### Optional
+
+- [ ] Sign your manifest with GPG and publish your public key
+- [ ] Set `registry_url` to enable automatic icon fallback
+- [ ] Set `max_dispatcharr_version` if a plugin is incompatible with newer releases
+
+---
+
+## Quick Reference: Repo Manifest Schema
+
+```json
+{
+  "manifest": {
+    "registry_name": "string (required)",
+    "registry_url": "string (optional)",
+    "root_url": "string (optional)",
+    "plugins": [
+      {
+        "slug": "string (required)",
+        "name": "string (required)",
+        "description": "string",
+        "author": "string",
+        "license": "string (SPDX)",
+        "latest_version": "string (semver)",
+        "last_updated": "string (ISO 8601)",
+        "manifest_url": "string (URL or relative path)",
+        "latest_url": "string (URL or relative path)",
+        "latest_sha256": "string (64-char hex)",
+        "icon_url": "string (URL or relative path)",
+        "min_dispatcharr_version": "string (semver)",
+        "max_dispatcharr_version": "string (semver) or null"
+      }
+    ]
+  },
+  "signature": "string (armored PGP signature, optional)"
+}
+```
+
+## Quick Reference: Per-Plugin Manifest Schema
+
+```json
+{
+  "slug": "string",
+  "name": "string",
+  "description": "string",
+  "author": "string",
+  "license": "string (SPDX)",
+  "latest_version": "string (semver)",
+  "versions": [
+    {
+      "version": "string (required)",
+      "url": "string (required, URL or relative path)",
+      "checksum_sha256": "string (64-char hex)",
+      "build_timestamp": "string (ISO 8601)",
+      "commit_sha": "string",
+      "commit_sha_short": "string",
+      "min_dispatcharr_version": "string (semver)",
+      "max_dispatcharr_version": "string (semver) or null"
+    }
+  ],
+  "latest": {
+    "version": "string",
+    "url": "string",
+    "checksum_sha256": "string",
+    "build_timestamp": "string",
+    "min_dispatcharr_version": "string",
+    "max_dispatcharr_version": "string or null"
+  }
+}
+```
diff --git a/apps/plugins/api_urls.py b/apps/plugins/api_urls.py
index 5ba85be2..99355232 100644
--- a/apps/plugins/api_urls.py
+++ b/apps/plugins/api_urls.py
@@ -8,6 +8,14 @@ from .api_views import (
     PluginImportAPIView,
     PluginDeleteAPIView,
     PluginLogoAPIView,
+    PluginRepoListCreateAPIView,
+    PluginRepoPreviewAPIView,
+    PluginRepoDetailAPIView,
+    PluginRepoRefreshAPIView,
+    AvailablePluginsAPIView,
+    PluginDetailManifestAPIView,
+    PluginInstallFromRepoAPIView,
+    PluginRepoSettingsAPIView,
 )
 
 app_name = "plugins"
@@ -21,4 +29,13 @@ urlpatterns = [
     path("plugins/<str:key>/run/", PluginRunAPIView.as_view(), name="run"),
     path("plugins/<str:key>/enabled/", PluginEnabledAPIView.as_view(), name="enabled"),
     path("plugins/<str:key>/logo/", PluginLogoAPIView.as_view(), name="logo"),
+    # Plugin repos (hub / store) - static paths first, then parametric
+    path("repos/", PluginRepoListCreateAPIView.as_view(), name="repo-list"),
+    path("repos/available/", AvailablePluginsAPIView.as_view(), name="available-plugins"),
+    path("repos/plugin-detail/", PluginDetailManifestAPIView.as_view(), name="plugin-detail-manifest"),
+    path("repos/install/", PluginInstallFromRepoAPIView.as_view(), name="repo-install"),
+    path("repos/settings/", PluginRepoSettingsAPIView.as_view(), name="repo-settings"),
+    path("repos/preview/", PluginRepoPreviewAPIView.as_view(), name="repo-preview"),
+    path("repos/<int:pk>/", PluginRepoDetailAPIView.as_view(), name="repo-detail"),
+    path("repos/<int:pk>/refresh/", PluginRepoRefreshAPIView.as_view(), name="repo-refresh"),
 ]
diff --git a/apps/plugins/api_views.py b/apps/plugins/api_views.py
index 624dcc4d..425ac77e 100644
--- a/apps/plugins/api_views.py
+++ b/apps/plugins/api_views.py
@@ -1,15 +1,23 @@
+import hashlib
+import ipaddress
 import logging
+import io
+import json
 import re
+import socket
 from rest_framework.views import APIView
 from rest_framework.response import Response
-from rest_framework import status
+from rest_framework import status, serializers
+from drf_spectacular.utils import extend_schema, inline_serializer
 from django.conf import settings
 from django.core.files.uploadedfile import UploadedFile
 from django.http import FileResponse
+from django.utils import timezone
 import os
 import zipfile
 import shutil
 import tempfile
+import requests as http_requests
 from urllib.parse import urlparse
 from apps.accounts.permissions import (
     Authenticated,
@@ -18,11 +26,35 @@ from apps.accounts.permissions import (
 from dispatcharr.utils import network_access_allowed
 
 from .loader import PluginManager
-from .models import PluginConfig
+from .models import PluginConfig, PluginRepo
+from .serializers import PluginRepoSerializer
 
 logger = logging.getLogger(__name__)
 
 
+def _compare_versions(a, b):
+    """Compare two semver-like version strings.
+    Returns negative if a < b, 0 if equal, positive if a > b.
+
+    If either version is a prerelease (any dot-segment contains non-digit
+    characters), numeric ordering is meaningless. Falls back to exact string
+    equality: 0 if identical, 1 otherwise.
+    """
+    if not a or not b:
+        return 0
+    na = a.lstrip("v")
+    nb = b.lstrip("v")
+    if any(not p.isdigit() for p in na.split(".")) or any(not p.isdigit() for p in nb.split(".")):
+        return 0 if na == nb else 1
+    pa = [int(x) for x in na.split(".")]
+    pb = [int(x) for x in nb.split(".")]
+    for i in range(max(len(pa), len(pb))):
+        diff = (pa[i] if i < len(pa) else 0) - (pb[i] if i < len(pb) else 0)
+        if diff != 0:
+            return diff
+    return 0
+
+
 MAX_PLUGIN_IMPORT_FILES = getattr(settings, "DISPATCHARR_PLUGIN_IMPORT_MAX_FILES", 2000)
 MAX_PLUGIN_IMPORT_BYTES = getattr(settings, "DISPATCHARR_PLUGIN_IMPORT_MAX_BYTES", 200 * 1024 * 1024)
 MAX_PLUGIN_IMPORT_FILE_BYTES = getattr(settings, "DISPATCHARR_PLUGIN_IMPORT_MAX_FILE_BYTES", 200 * 1024 * 1024)
@@ -44,12 +76,43 @@ def _parse_bool(value):
 
 def _sanitize_plugin_key(value: str) -> str:
     base = os.path.basename(value or "")
-    base = base.replace(" ", "_").lower()
-    base = re.sub(r"[^a-z0-9_-]", "_", base)
-    base = base.strip("._-")
+    base = base.replace(" ", "_").replace("-", "_").lower()
+    base = re.sub(r"[^a-z0-9_]", "_", base)
+    base = base.strip("._ ")
     return base or "plugin"
 
 
+def _validate_fetch_url(url):
+    """Raise ValueError if the URL must not be fetched (SSRF prevention).
+
+    Only http and https schemes are allowed. Hostnames that resolve to
+    loopback, private, link-local, or otherwise non-routable addresses
+    are rejected.
+    """
+    parsed = urlparse(url)
+    if parsed.scheme not in ("http", "https"):
+        raise ValueError(
+            f"URL scheme '{parsed.scheme}' is not allowed; only http and https are permitted."
+        )
+    hostname = parsed.hostname
+    if not hostname:
+        raise ValueError("URL has no hostname.")
+    try:
+        infos = socket.getaddrinfo(hostname, None)
+    except socket.gaierror as exc:
+        raise ValueError(f"Could not resolve hostname '{hostname}': {exc}") from exc
+    for _family, _type, _proto, _canon, sockaddr in infos:
+        addr_str = sockaddr[0]
+        try:
+            ip = ipaddress.ip_address(addr_str)
+        except ValueError:
+            continue
+        if ip.is_loopback or ip.is_link_local or ip.is_private or ip.is_reserved or ip.is_unspecified:
+            raise ValueError(
+                f"URL resolves to a non-routable address ({addr_str}) and cannot be fetched."
+            )
+
+
 def _absolutize_logo_url(request, url: str | None) -> str | None:
     if not url or not request:
         return url
@@ -59,7 +122,10 @@ def _absolutize_logo_url(request, url: str | None) -> str | None:
     return request.build_absolute_uri(url)
 
 
-class PluginsListAPIView(APIView):
+class PluginAuthMixin:
+    """Mixin that routes permission resolution through permission_classes_by_method,
+    falling back to Authenticated() for any method not explicitly listed."""
+
     def get_permissions(self):
         try:
             return [
@@ -68,6 +134,8 @@ class PluginsListAPIView(APIView):
         except KeyError:
             return [Authenticated()]
 
+
+class PluginsListAPIView(PluginAuthMixin, APIView):
     def get(self, request):
         pm = PluginManager.get()
         # Prefer cached registry; reload explicitly via the reload endpoint
@@ -78,15 +146,7 @@ class PluginsListAPIView(APIView):
         return Response({"plugins": plugins})
 
 
-class PluginReloadAPIView(APIView):
-    def get_permissions(self):
-        try:
-            return [
-                perm() for perm in permission_classes_by_method[self.request.method]
-            ]
-        except KeyError:
-            return [Authenticated()]
-
+class PluginReloadAPIView(PluginAuthMixin, APIView):
     def post(self, request):
         pm = PluginManager.get()
         pm.stop_all_plugins(reason="reload")
@@ -94,143 +154,237 @@ class PluginReloadAPIView(APIView):
         return Response({"success": True, "count": len(pm._registry)})
 
 
-class PluginImportAPIView(APIView):
-    def get_permissions(self):
+def _install_plugin_from_zip(zip_file, plugins_dir, *, file_name="plugin.zip", allow_overwrite_key=None, allow_overwrite=False):
+    """Extract and install a plugin from a zip file-like object.
+
+    Args:
+        zip_file: File-like object containing the zip.
+        plugins_dir: Path to the plugins directory.
+        file_name: Name hint for deriving plugin key when the zip has flat contents.
+        allow_overwrite_key: If set, allow overwriting this specific plugin directory.
+        allow_overwrite: If True, allow overwriting any existing plugin with the same key.
+
+    Returns:
+        dict with "success" bool, and either "plugin_key" on success or "error" on failure.
+    """
+    try:
+        zf = zipfile.ZipFile(zip_file)
+    except zipfile.BadZipFile:
+        return {"success": False, "error": "Invalid zip file"}
+
+    tmp_root = tempfile.mkdtemp(prefix="plugin_import_")
+    try:
+        file_members = [m for m in zf.infolist() if not m.is_dir()]
+        if not file_members:
+            return {"success": False, "error": "Archive is empty"}
+        if len(file_members) > MAX_PLUGIN_IMPORT_FILES:
+            return {"success": False, "error": "Archive has too many files"}
+
+        total_size = 0
+        for member in file_members:
+            total_size += member.file_size
+            if member.file_size > MAX_PLUGIN_IMPORT_FILE_BYTES:
+                return {"success": False, "error": "Archive contains a file that is too large"}
+        if total_size > MAX_PLUGIN_IMPORT_BYTES:
+            return {"success": False, "error": "Archive is too large"}
+
+        for member in file_members:
+            name = member.filename
+            if not name or name.endswith("/"):
+                continue
+            norm = os.path.normpath(name)
+            if norm.startswith("..") or os.path.isabs(norm):
+                return {"success": False, "error": "Unsafe path in archive"}
+            dest_path = os.path.join(tmp_root, norm)
+            os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+            with zf.open(member, "r") as src, open(dest_path, "wb") as dst:
+                shutil.copyfileobj(src, dst)
+
+        # Find candidate directory containing plugin.py or __init__.py
+        candidates = []
+        for dirpath, dirnames, filenames in os.walk(tmp_root):
+            has_pluginpy = "plugin.py" in filenames
+            has_init = "__init__.py" in filenames
+            if has_pluginpy or has_init:
+                depth = len(os.path.relpath(dirpath, tmp_root).split(os.sep))
+                candidates.append((0 if has_pluginpy else 1, depth, dirpath))
+        if not candidates:
+            return {"success": False, "error": "Invalid plugin: missing plugin.py or package __init__.py"}
+
+        candidates.sort()
+        chosen = candidates[0][2]
+
+        # Determine plugin key
+        base_name = os.path.splitext(file_name)[0]
+        plugin_key = os.path.basename(chosen.rstrip(os.sep))
+        if chosen.rstrip(os.sep) == tmp_root.rstrip(os.sep):
+            plugin_key = base_name
+        plugin_key = _sanitize_plugin_key(plugin_key)
+        if len(plugin_key) > 128:
+            plugin_key = plugin_key[:128]
+
+        # Extract logo
+        logo_bytes = None
         try:
-            return [
-                perm() for perm in permission_classes_by_method[self.request.method]
-            ]
-        except KeyError:
-            return [Authenticated()]
-
-    def post(self, request):
-        file: UploadedFile = request.FILES.get("file")
-        if not file:
-            return Response({"success": False, "error": "Missing 'file' upload"}, status=status.HTTP_400_BAD_REQUEST)
-
-        pm = PluginManager.get()
-        plugins_dir = pm.plugins_dir
-
-        try:
-            zf = zipfile.ZipFile(file)
-        except zipfile.BadZipFile:
-            return Response({"success": False, "error": "Invalid zip file"}, status=status.HTTP_400_BAD_REQUEST)
-
-        # Extract to a temporary directory first to avoid server reload thrash
-        tmp_root = tempfile.mkdtemp(prefix="plugin_import_")
-        try:
-            file_members = [m for m in zf.infolist() if not m.is_dir()]
-            if not file_members:
-                shutil.rmtree(tmp_root, ignore_errors=True)
-                return Response({"success": False, "error": "Archive is empty"}, status=status.HTTP_400_BAD_REQUEST)
-            if len(file_members) > MAX_PLUGIN_IMPORT_FILES:
-                shutil.rmtree(tmp_root, ignore_errors=True)
-                return Response({"success": False, "error": "Archive has too many files"}, status=status.HTTP_400_BAD_REQUEST)
-
-            total_size = 0
-            for member in file_members:
-                total_size += member.file_size
-                if member.file_size > MAX_PLUGIN_IMPORT_FILE_BYTES:
-                    shutil.rmtree(tmp_root, ignore_errors=True)
-                    return Response({"success": False, "error": "Archive contains a file that is too large"}, status=status.HTTP_400_BAD_REQUEST)
-            if total_size > MAX_PLUGIN_IMPORT_BYTES:
-                shutil.rmtree(tmp_root, ignore_errors=True)
-                return Response({"success": False, "error": "Archive is too large"}, status=status.HTTP_400_BAD_REQUEST)
-
-            for member in file_members:
-                name = member.filename
-                if not name or name.endswith("/"):
-                    continue
-                # Normalize and prevent path traversal
-                norm = os.path.normpath(name)
-                if norm.startswith("..") or os.path.isabs(norm):
-                    shutil.rmtree(tmp_root, ignore_errors=True)
-                    return Response({"success": False, "error": "Unsafe path in archive"}, status=status.HTTP_400_BAD_REQUEST)
-                dest_path = os.path.join(tmp_root, norm)
-                os.makedirs(os.path.dirname(dest_path), exist_ok=True)
-                with zf.open(member, 'r') as src, open(dest_path, 'wb') as dst:
-                    shutil.copyfileobj(src, dst)
-
-            # Find candidate directory containing plugin.py or __init__.py
-            candidates = []
-            for dirpath, dirnames, filenames in os.walk(tmp_root):
-                has_pluginpy = "plugin.py" in filenames
-                has_init = "__init__.py" in filenames
-                if has_pluginpy or has_init:
+            chosen_abs = os.path.abspath(chosen)
+            logo_candidates = []
+            for dirpath, _, filenames in os.walk(tmp_root):
+                for filename in filenames:
+                    if filename.lower() != "logo.png":
+                        continue
+                    full_path = os.path.join(dirpath, filename)
+                    full_abs = os.path.abspath(full_path)
+                    try:
+                        in_chosen = os.path.commonpath([chosen_abs, full_abs]) == chosen_abs
+                    except Exception:
+                        in_chosen = False
                     depth = len(os.path.relpath(dirpath, tmp_root).split(os.sep))
-                    candidates.append((0 if has_pluginpy else 1, depth, dirpath))
-            if not candidates:
-                shutil.rmtree(tmp_root, ignore_errors=True)
-                return Response({"success": False, "error": "Invalid plugin: missing plugin.py or package __init__.py"}, status=status.HTTP_400_BAD_REQUEST)
-
-            candidates.sort()
-            chosen = candidates[0][2]
-            # Determine plugin key: prefer chosen folder name; if chosen is tmp_root, use zip base name
-            base_name = os.path.splitext(getattr(file, "name", "plugin"))[0]
-            plugin_key = os.path.basename(chosen.rstrip(os.sep))
-            if chosen.rstrip(os.sep) == tmp_root.rstrip(os.sep):
-                plugin_key = base_name
-            plugin_key = _sanitize_plugin_key(plugin_key)
-            if len(plugin_key) > 128:
-                plugin_key = plugin_key[:128]
+                    logo_candidates.append((0 if in_chosen else 1, depth, full_path))
+            if logo_candidates:
+                logo_candidates.sort()
+                with open(logo_candidates[0][2], "rb") as fh:
+                    logo_bytes = fh.read()
+        except Exception:
             logo_bytes = None
-            try:
-                logo_candidates = []
-                chosen_abs = os.path.abspath(chosen)
-                for dirpath, _, filenames in os.walk(tmp_root):
-                    for filename in filenames:
-                        if filename.lower() != "logo.png":
-                            continue
-                        full_path = os.path.join(dirpath, filename)
-                        full_abs = os.path.abspath(full_path)
-                        try:
-                            in_chosen = os.path.commonpath([chosen_abs, full_abs]) == chosen_abs
-                        except Exception:
-                            in_chosen = False
-                        depth = len(os.path.relpath(dirpath, tmp_root).split(os.sep))
-                        logo_candidates.append((0 if in_chosen else 1, depth, full_path))
-                if logo_candidates:
-                    logo_candidates.sort()
-                    with open(logo_candidates[0][2], "rb") as fh:
-                        logo_bytes = fh.read()
-            except Exception:
-                logo_bytes = None
 
-            final_dir = os.path.join(plugins_dir, plugin_key)
-            if os.path.exists(final_dir):
-                # If final dir exists but contains a valid plugin, refuse; otherwise clear it
-                if os.path.exists(os.path.join(final_dir, "plugin.py")) or os.path.exists(os.path.join(final_dir, "__init__.py")):
-                    shutil.rmtree(tmp_root, ignore_errors=True)
-                    return Response({"success": False, "error": f"Plugin '{plugin_key}' already exists"}, status=status.HTTP_400_BAD_REQUEST)
+        final_dir = os.path.join(plugins_dir, plugin_key)
+        should_overwrite = (allow_overwrite_key and plugin_key == allow_overwrite_key) or allow_overwrite
+        if os.path.exists(final_dir):
+            if should_overwrite:
+                # Atomic swap: rename old to backup, move new in, delete backup
+                backup_dir = final_dir + ".__backup__"
+                try:
+                    if os.path.exists(backup_dir):
+                        shutil.rmtree(backup_dir)
+                    os.rename(final_dir, backup_dir)
+                except Exception as e:
+                    return {"success": False, "error": f"Failed to back up existing plugin: {e}"}
+                try:
+                    if chosen.rstrip(os.sep) == tmp_root.rstrip(os.sep):
+                        os.makedirs(final_dir, exist_ok=True)
+                        for item in os.listdir(tmp_root):
+                            shutil.move(os.path.join(tmp_root, item), os.path.join(final_dir, item))
+                    else:
+                        shutil.move(chosen, final_dir)
+                    if logo_bytes:
+                        try:
+                            with open(os.path.join(final_dir, "logo.png"), "wb") as fh:
+                                fh.write(logo_bytes)
+                        except Exception:
+                            pass
+                    # Success - remove backup
+                    shutil.rmtree(backup_dir, ignore_errors=True)
+                    return {"success": True, "plugin_key": plugin_key}
+                except Exception as e:
+                    # Rollback: restore backup
+                    logger.exception("Failed to install updated plugin; rolling back")
+                    shutil.rmtree(final_dir, ignore_errors=True)
+                    try:
+                        os.rename(backup_dir, final_dir)
+                    except Exception:
+                        logger.exception("Failed to rollback plugin backup")
+                    return {"success": False, "error": f"Failed to install updated plugin: {e}"}
+            elif os.path.exists(os.path.join(final_dir, "plugin.py")) or os.path.exists(os.path.join(final_dir, "__init__.py")):
+                return {"success": False, "error": f"Plugin '{plugin_key}' already exists"}
+            else:
                 try:
                     shutil.rmtree(final_dir)
                 except Exception:
                     pass
 
-            # Move chosen directory into final location
-            if chosen.rstrip(os.sep) == tmp_root.rstrip(os.sep):
-                # Move all contents into final_dir
-                os.makedirs(final_dir, exist_ok=True)
-                for item in os.listdir(tmp_root):
-                    shutil.move(os.path.join(tmp_root, item), os.path.join(final_dir, item))
-            else:
-                shutil.move(chosen, final_dir)
-            if logo_bytes:
-                try:
-                    with open(os.path.join(final_dir, "logo.png"), "wb") as fh:
-                        fh.write(logo_bytes)
-                except Exception:
-                    pass
-            # Cleanup temp
-            shutil.rmtree(tmp_root, ignore_errors=True)
-            target_dir = final_dir
-        finally:
+        # Move plugin files into final location
+        if chosen.rstrip(os.sep) == tmp_root.rstrip(os.sep):
+            os.makedirs(final_dir, exist_ok=True)
+            for item in os.listdir(tmp_root):
+                shutil.move(os.path.join(tmp_root, item), os.path.join(final_dir, item))
+        else:
+            shutil.move(chosen, final_dir)
+
+        if logo_bytes:
             try:
-                shutil.rmtree(tmp_root, ignore_errors=True)
+                with open(os.path.join(final_dir, "logo.png"), "wb") as fh:
+                    fh.write(logo_bytes)
             except Exception:
                 pass
 
+        return {"success": True, "plugin_key": plugin_key}
+    finally:
+        shutil.rmtree(tmp_root, ignore_errors=True)
+
+
+def _save_fetched_manifest_to_repo(repo, data, verified):
+    """Validate and persist a freshly-fetched manifest onto a PluginRepo.
+
+    Validates that 'registry_name' is present and not official-sounding (for
+    non-official repos).  On success, updates repo fields and saves to DB.
+
+    Returns an error string if validation fails, or None on success.
+    Does *not* call _unmanage_dropped_slugs — caller does that when needed.
+    """
+    manifest_inner = data.get("manifest", data)
+    registry_name = (manifest_inner.get("registry_name") or "").strip()
+    if not registry_name:
+        return "Manifest is missing a 'registry_name'. The repo maintainer must set this field."
+    if not repo.is_official and _is_official_sounding(registry_name):
+        return f"The registry name '{registry_name}' is not allowed because it may be confused with an official repo."
+    repo.cached_manifest = data
+    repo.last_fetched = timezone.now()
+    repo.last_fetch_status = "200"
+    repo.name = registry_name
+    repo.signature_verified = verified
+    repo.save(update_fields=["name", "cached_manifest", "signature_verified", "last_fetched", "last_fetch_status", "updated_at"])
+    return None
+
+
+def _unmanage_dropped_slugs(repo, new_manifest_data):
+    """After a manifest refresh, clear source_repo on any installed plugins
+    whose slug is no longer listed in the repo's manifest.  Also syncs the
+    'deprecated' flag for all plugins that remain managed by this repo."""
+    manifest = new_manifest_data.get("manifest", new_manifest_data)
+    plugin_entries = {p["slug"]: p for p in manifest.get("plugins", []) if p.get("slug")}
+    current_slugs = set(plugin_entries.keys())
+
+    dropped = PluginConfig.objects.filter(source_repo=repo).exclude(slug__in=current_slugs)
+    count = dropped.update(source_repo=None, slug="", deprecated=False)
+    if count:
+        logger.info(
+            "Unmanaged %d plugin(s) removed from repo '%s' manifest",
+            count, repo.name,
+        )
+
+    # Sync deprecated flag for retained managed plugins
+    for cfg in PluginConfig.objects.filter(source_repo=repo, slug__in=current_slugs):
+        new_deprecated = bool(plugin_entries.get(cfg.slug, {}).get("deprecated", False))
+        if cfg.deprecated != new_deprecated:
+            cfg.deprecated = new_deprecated
+            cfg.save(update_fields=["deprecated", "updated_at"])
+
+
+class PluginImportAPIView(PluginAuthMixin, APIView):
+    def post(self, request):
+        file: UploadedFile = request.FILES.get("file")
+        if not file:
+            return Response({"success": False, "error": "Missing 'file' upload"}, status=status.HTTP_400_BAD_REQUEST)
+
+        # Manual imports default to non-overwrite; require explicit flag to replace existing plugins
+        overwrite_flag = bool(request.data.get("overwrite"))
+
+        pm = PluginManager.get()
+        result = _install_plugin_from_zip(
+            file, pm.plugins_dir,
+            file_name=getattr(file, "name", "plugin.zip"),
+            allow_overwrite=overwrite_flag,
+        )
+        if not result["success"]:
+            return Response(
+                {"success": False, "error": result["error"]},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        plugin_key = result["plugin_key"]
+
         # Ensure DB config exists (untrusted plugins are registered without loading)
+        was_managed = False
         try:
             cfg, _ = PluginConfig.objects.get_or_create(
                 key=plugin_key,
@@ -241,6 +395,13 @@ class PluginImportAPIView(APIView):
                     "settings": {},
                 },
             )
+            # Manual install always breaks the managed relationship
+            if cfg and cfg.source_repo_id:
+                was_managed = True
+                cfg.source_repo = None
+                cfg.slug = ""
+                cfg.save(update_fields=["source_repo", "slug", "updated_at"])
+                logger.info("Plugin '%s' manually replaced - cleared managed repo link", plugin_key)
         except Exception:
             cfg = None
 
@@ -253,9 +414,9 @@ class PluginImportAPIView(APIView):
             plugin_entry = None
 
         if not plugin_entry:
-            logo_path = os.path.join(plugins_dir, plugin_key, "logo.png")
+            logo_path = os.path.join(pm.plugins_dir, plugin_key, "logo.png")
             logo_url = f"/api/plugins/plugins/{plugin_key}/logo/" if os.path.isfile(logo_path) else None
-            legacy = not os.path.isfile(os.path.join(plugins_dir, plugin_key, "plugin.json"))
+            legacy = not os.path.isfile(os.path.join(pm.plugins_dir, plugin_key, "plugin.json"))
             plugin_entry = {
                 "key": plugin_key,
                 "name": cfg.name if cfg else plugin_key,
@@ -273,18 +434,10 @@ class PluginImportAPIView(APIView):
             }
 
         plugin_entry["logo_url"] = _absolutize_logo_url(request, plugin_entry.get("logo_url"))
-        return Response({"success": True, "plugin": plugin_entry})
+        return Response({"success": True, "plugin": plugin_entry, "was_managed": was_managed})
 
 
-class PluginSettingsAPIView(APIView):
-    def get_permissions(self):
-        try:
-            return [
-                perm() for perm in permission_classes_by_method[self.request.method]
-            ]
-        except KeyError:
-            return [Authenticated()]
-
+class PluginSettingsAPIView(PluginAuthMixin, APIView):
     def post(self, request, key):
         pm = PluginManager.get()
         data = request.data or {}
@@ -296,15 +449,7 @@ class PluginSettingsAPIView(APIView):
             return Response({"success": False, "error": str(e)}, status=status.HTTP_400_BAD_REQUEST)
 
 
-class PluginRunAPIView(APIView):
-    def get_permissions(self):
-        try:
-            return [
-                perm() for perm in permission_classes_by_method[self.request.method]
-            ]
-        except KeyError:
-            return [Authenticated()]
-
+class PluginRunAPIView(PluginAuthMixin, APIView):
     def post(self, request, key):
         pm = PluginManager.get()
         action = request.data.get("action")
@@ -330,15 +475,7 @@ class PluginRunAPIView(APIView):
             return Response({"success": False, "error": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
 
-class PluginEnabledAPIView(APIView):
-    def get_permissions(self):
-        try:
-            return [
-                perm() for perm in permission_classes_by_method[self.request.method]
-            ]
-        except KeyError:
-            return [Authenticated()]
-
+class PluginEnabledAPIView(PluginAuthMixin, APIView):
     def post(self, request, key):
         enabled_raw = request.data.get("enabled")
         if enabled_raw is None:
@@ -397,15 +534,7 @@ class PluginLogoAPIView(APIView):
         return FileResponse(open(logo_path, "rb"), content_type="image/png")
 
 
-class PluginDeleteAPIView(APIView):
-    def get_permissions(self):
-        try:
-            return [
-                perm() for perm in permission_classes_by_method[self.request.method]
-            ]
-        except KeyError:
-            return [Authenticated()]
-
+class PluginDeleteAPIView(PluginAuthMixin, APIView):
     def delete(self, request, key):
         pm = PluginManager.get()
         try:
@@ -436,3 +565,753 @@ class PluginDeleteAPIView(APIView):
         # Reload registry
         pm.discover_plugins(force_reload=True)
         return Response({"success": True})
+
+
+# ---------------------------------------------------------------------------
+# Plugin Repo (Hub / Store) views
+# ---------------------------------------------------------------------------
+
+MANIFEST_FETCH_TIMEOUT = 15
+
+OFFICIAL_KEY_PATH = os.path.join(
+    os.path.dirname(__file__), "keys", "dispatcharr-plugins.pub"
+)
+
+
+def _normalize_pgp_key(text):
+    """Ensure PGP public key text has armor header/footer."""
+    if not text or not text.strip():
+        return text
+    text = text.strip()
+    if "-----BEGIN PGP PUBLIC KEY BLOCK-----" not in text:
+        text = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n" + text
+    if "-----END PGP PUBLIC KEY BLOCK-----" not in text:
+        text = text + "\n-----END PGP PUBLIC KEY BLOCK-----"
+    return text
+
+
+def _verify_manifest_signature(manifest_obj, signature_armored, public_key_text=None):
+    """Verify a detached GPG signature over the canonical manifest JSON.
+
+    *signature_armored* is the PGP armored signature string from the manifest.
+    *public_key_text* is an armored PGP public-key string (for third-party
+    repos).  When *None* the bundled official key is used instead.
+
+    Returns True if valid, False if invalid/error, None if verification
+    could not be attempted (no signature, no key, gnupg missing, etc.).
+    """
+    if not signature_armored:
+        return None
+
+    # Determine which key material to use
+    key_text = None
+    if public_key_text:
+        key_text = _normalize_pgp_key(public_key_text)
+    elif os.path.isfile(OFFICIAL_KEY_PATH):
+        with open(OFFICIAL_KEY_PATH, "r") as fh:
+            key_text = fh.read()
+
+    if not key_text:
+        logger.debug("No GPG public key available; skipping verification")
+        return None
+
+    try:
+        import gnupg
+    except ImportError:
+        logger.debug("python-gnupg not installed; skipping signature verification")
+        return None
+
+    tmp_home = tempfile.mkdtemp(prefix="gpg_verify_")
+    try:
+        gpg = gnupg.GPG(gnupghome=tmp_home)
+        import_result = gpg.import_keys(key_text)
+        if not import_result.fingerprints:
+            logger.warning("Failed to import GPG public key")
+            return None
+
+        # Must match what the signing script produces: jq -c '.manifest'
+        # which uses compact separators, preserves key order, and appends \n.
+        manifest_bytes = (
+            json.dumps(manifest_obj, separators=(",", ":")) + "\n"
+        ).encode("utf-8")
+
+        # Write the PGP armored signature directly to file
+        sig_path = os.path.join(tmp_home, "manifest.sig")
+        with open(sig_path, "w") as sf:
+            sf.write(signature_armored)
+
+        verified = gpg.verify_data(sig_path, manifest_bytes)
+        return bool(verified)
+    except Exception:
+        logger.exception("GPG signature verification error")
+        return False
+    finally:
+        shutil.rmtree(tmp_home, ignore_errors=True)
+
+
+_OFFICIAL_NAME_PATTERNS = [
+    "official",
+    "official repo",
+    "dispatcharr plugins",
+    "dispatcharr repo",
+    "dispatcharr official",
+]
+
+
+def _is_official_sounding(name):
+    """Return True if the name could be mistaken for an official repo."""
+    lower = (name or "").lower().strip()
+    return any(pat in lower for pat in _OFFICIAL_NAME_PATTERNS)
+
+
+def _fetch_manifest(url, public_key_text=None):
+    """Fetch a remote manifest JSON, validate structure, return (data, verified)."""
+    _validate_fetch_url(url)
+    resp = http_requests.get(url, timeout=MANIFEST_FETCH_TIMEOUT)
+    resp.raise_for_status()
+    data = resp.json()
+    # Accept both top-level {manifest: {plugins: [...]}} and {plugins: [...]}
+    if "manifest" in data and "plugins" in data["manifest"]:
+        signature = data.get("signature")
+        verified = _verify_manifest_signature(
+            data["manifest"], signature, public_key_text
+        )
+        return data, verified
+    if "plugins" in data:
+        return {"manifest": data}, None
+    raise ValueError("Manifest JSON missing 'manifest.plugins' list")
+
+
+class PluginRepoListCreateAPIView(PluginAuthMixin, APIView):
+    @extend_schema(
+        description="List all plugin repositories.",
+        responses={200: PluginRepoSerializer(many=True)},
+    )
+    def get(self, request):
+        repos = PluginRepo.objects.all()
+        return Response(PluginRepoSerializer(repos, many=True).data)
+
+    @extend_schema(
+        description="Add a new plugin repository by manifest URL. Fetches and validates the manifest immediately.",
+        request=PluginRepoSerializer,
+        responses={201: PluginRepoSerializer, 400: inline_serializer(name="RepoAddError", fields={"error": serializers.CharField()})},
+    )
+    def post(self, request):
+        serializer = PluginRepoSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        repo = serializer.save(name="")
+        # Fetch manifest and validate + save
+        try:
+            key_text = repo.public_key if not repo.is_official else None
+            data, verified = _fetch_manifest(repo.url, public_key_text=key_text)
+        except Exception as e:
+            logger.warning("Initial manifest fetch failed for %s: %s", repo.url, e)
+            repo.delete()
+            return Response(
+                {"error": f"Failed to fetch manifest: {e}"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        err = _save_fetched_manifest_to_repo(repo, data, verified)
+        if err:
+            repo.delete()
+            return Response({"error": err}, status=status.HTTP_400_BAD_REQUEST)
+        return Response(
+            PluginRepoSerializer(repo).data, status=status.HTTP_201_CREATED
+        )
+
+
+class PluginRepoPreviewAPIView(PluginAuthMixin, APIView):
+    """Fetch and validate a manifest URL without saving anything."""
+
+    @extend_schema(
+        description="Preview a manifest URL: fetch and validate without saving. Returns validity, repo name, signature status, and plugin count.",
+        request=inline_serializer(name="RepoPreviewRequest", fields={
+            "url": serializers.URLField(),
+            "public_key": serializers.CharField(required=False, allow_blank=True),
+        }),
+        responses={200: inline_serializer(name="RepoPreviewResponse", fields={
+            "valid": serializers.BooleanField(),
+            "registry_name": serializers.CharField(),
+            "registry_url": serializers.CharField(),
+            "signature_verified": serializers.BooleanField(allow_null=True),
+            "plugin_count": serializers.IntegerField(),
+            "errors": serializers.ListField(child=serializers.CharField()),
+        })},
+    )
+    def post(self, request):
+        url = (request.data.get("url") or "").strip()
+        public_key = (request.data.get("public_key") or "").strip()
+        if not url:
+            return Response(
+                {"error": "url is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        try:
+            key_text = public_key or None
+            data, verified = _fetch_manifest(url, public_key_text=key_text)
+            manifest_inner = data.get("manifest", data)
+            registry_name = (manifest_inner.get("registry_name") or "").strip()
+            registry_url = (manifest_inner.get("registry_url") or "").strip()
+            plugin_count = len(manifest_inner.get("plugins", []))
+            errors = []
+            if not registry_name:
+                errors.append("Manifest is missing a 'registry_name'.")
+            elif _is_official_sounding(registry_name):
+                errors.append(f"The registry name '{registry_name}' is not allowed because it may be confused with an official repo.")
+            if PluginRepo.objects.filter(url=url).exists():
+                errors.append("This manifest URL has already been added.")
+            return Response({
+                "valid": len(errors) == 0,
+                "registry_name": registry_name,
+                "registry_url": registry_url,
+                "signature_verified": verified,
+                "plugin_count": plugin_count,
+                "errors": errors,
+            })
+        except http_requests.exceptions.Timeout:
+            return Response(
+                {"valid": False, "errors": ["The request timed out. Check the URL and try again."]},
+                status=status.HTTP_200_OK,
+            )
+        except http_requests.exceptions.ConnectionError:
+            return Response(
+                {"valid": False, "errors": ["Could not connect to the server. Check the URL and your network connection."]},
+                status=status.HTTP_200_OK,
+            )
+        except http_requests.exceptions.HTTPError as e:
+            code = e.response.status_code if e.response is not None else None
+            if code == 404:
+                msg = "Manifest not found (404). Check that the URL points to a valid manifest file."
+            elif code == 403:
+                msg = "Access denied (403). The server refused the request."
+            elif code is not None:
+                msg = f"The server returned an error ({code}). Check the URL and try again."
+            else:
+                msg = "The server returned an unexpected error. Check the URL and try again."
+            return Response(
+                {"valid": False, "errors": [msg]},
+                status=status.HTTP_200_OK,
+            )
+        except (json.JSONDecodeError, ValueError) as e:
+            msg = str(e)
+            # Pass through messages from _validate_fetch_url and _fetch_manifest
+            # as-is; only substitute the generic JSON message for actual parse errors.
+            if "missing" in msg.lower() and "plugins" in msg.lower():
+                friendly = msg
+            elif any(kw in msg.lower() for kw in ("non-routable", "scheme", "hostname", "resolve")):
+                friendly = msg
+            else:
+                friendly = "The URL did not return valid JSON. Make sure it points directly to a manifest .json file."
+            return Response(
+                {"valid": False, "errors": [friendly]},
+                status=status.HTTP_200_OK,
+            )
+        except Exception as e:
+            return Response(
+                {"valid": False, "errors": ["An unexpected error occurred. Check the URL and try again."]},
+                status=status.HTTP_200_OK,
+            )
+
+
+class PluginRepoDetailAPIView(PluginAuthMixin, APIView):
+    @extend_schema(
+        description="Update a plugin repository (e.g. public key).",
+        request=PluginRepoSerializer,
+        responses={200: PluginRepoSerializer, 404: inline_serializer(name="RepoNotFound", fields={"error": serializers.CharField()})},
+    )
+    def put(self, request, pk):
+        try:
+            repo = PluginRepo.objects.get(pk=pk)
+        except PluginRepo.DoesNotExist:
+            return Response(
+                {"error": "Repo not found"}, status=status.HTTP_404_NOT_FOUND
+            )
+        # Only public_key and enabled are mutable after creation.
+        # url, is_official, name, etc. must not be changed via the API.
+        ALLOWED_FIELDS = {"public_key", "enabled"}
+        update_data = {k: v for k, v in request.data.items() if k in ALLOWED_FIELDS}
+        serializer = PluginRepoSerializer(repo, data=update_data, partial=True)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        return Response(PluginRepoSerializer(repo).data)
+
+    @extend_schema(
+        description="Remove a plugin repository.",
+        responses={200: inline_serializer(name="RepoDeleteSuccess", fields={"success": serializers.BooleanField()}), 404: inline_serializer(name="RepoDeleteNotFound", fields={"error": serializers.CharField()})},
+    )
+    def delete(self, request, pk):
+        try:
+            repo = PluginRepo.objects.get(pk=pk)
+        except PluginRepo.DoesNotExist:
+            return Response(
+                {"error": "Repo not found"}, status=status.HTTP_404_NOT_FOUND
+            )
+        if repo.is_official:
+            return Response(
+                {"error": "Cannot delete the official repository"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        repo.delete()
+        return Response({"success": True})
+
+
+class PluginRepoRefreshAPIView(PluginAuthMixin, APIView):
+    @extend_schema(
+        description="Re-fetch and update the cached manifest for a plugin repository.",
+        request=None,
+        responses={200: PluginRepoSerializer, 404: inline_serializer(name="RepoRefreshNotFound", fields={"error": serializers.CharField()}), 502: inline_serializer(name="RepoRefreshError", fields={"error": serializers.CharField()})},
+    )
+    def post(self, request, pk):
+        try:
+            repo = PluginRepo.objects.get(pk=pk)
+        except PluginRepo.DoesNotExist:
+            return Response(
+                {"error": "Repo not found"}, status=status.HTTP_404_NOT_FOUND
+            )
+        try:
+            key_text = repo.public_key if not repo.is_official else None
+            data, verified = _fetch_manifest(repo.url, public_key_text=key_text)
+        except Exception as e:
+            logger.exception("Manifest fetch failed for %s", repo.url)
+            return Response(
+                {"error": f"Failed to fetch manifest: {e}"},
+                status=status.HTTP_502_BAD_GATEWAY,
+            )
+        err = _save_fetched_manifest_to_repo(repo, data, verified)
+        if err:
+            return Response({"error": err}, status=status.HTTP_400_BAD_REQUEST)
+        _unmanage_dropped_slugs(repo, data)
+        return Response(PluginRepoSerializer(repo).data)
+
+
+class AvailablePluginsAPIView(PluginAuthMixin, APIView):
+    """Aggregate plugins from all enabled repo manifests."""
+
+    @extend_schema(
+        description="Return the aggregated list of available plugins from all enabled repositories, annotated with installation status.",
+        responses={200: inline_serializer(name="AvailablePluginsResponse", fields={
+            "plugins": serializers.ListField(child=serializers.DictField()),
+        })},
+    )
+    def get(self, request):
+        repos = PluginRepo.objects.filter(enabled=True)
+
+        # Auto-fetch manifest for repos that have never been refreshed
+        for repo in repos:
+            if not repo.cached_manifest:
+                try:
+                    key_text = repo.public_key if not repo.is_official else None
+                    data, verified = _fetch_manifest(repo.url, public_key_text=key_text)
+                    err = _save_fetched_manifest_to_repo(repo, data, verified)
+                    if err:
+                        logger.warning("Skipping repo %s: %s", repo.url, err)
+                except Exception:
+                    pass
+
+        # Re-read in case we just updated
+        repos = PluginRepo.objects.filter(enabled=True)
+        configs = list(PluginConfig.objects.select_related("source_repo").all())
+        # Build lookup: slug -> (version, repo_id, repo_name) for managed plugins,
+        # plus key -> version for all plugins (legacy matching)
+        installed_by_slug = {}
+        installed_by_key = {}
+        # Secondary dict keyed by dash-to-underscore-normalized key, for backward compat
+        # with existing DB entries that were saved before normalization was enforced.
+        installed_by_key_norm = {}
+        for cfg in configs:
+            installed_by_key[cfg.key] = cfg.version
+            installed_by_key_norm[cfg.key.replace("-", "_")] = cfg.key
+            if cfg.slug:
+                installed_by_slug[cfg.slug] = {
+                    "version": cfg.version,
+                    "source_repo_id": cfg.source_repo_id,
+                    "source_repo_name": cfg.source_repo.name if cfg.source_repo else None,
+                    "is_prerelease": cfg.installed_version_is_prerelease,
+                }
+                # Also index by normalized slug so a dash-variant in the manifest still matches
+                norm_slug = cfg.slug.replace("-", "_")
+                if norm_slug not in installed_by_slug:
+                    installed_by_slug[norm_slug] = installed_by_slug[cfg.slug]
+
+        plugins = []
+        for repo in repos:
+            manifest_data = repo.cached_manifest or {}
+            manifest = manifest_data.get("manifest", manifest_data)
+            root_url = manifest.get("root_url", "").rstrip("/")
+            registry_url = manifest.get("registry_url", "").rstrip("/")
+            repo_plugins = manifest.get("plugins", [])
+            for p in repo_plugins:
+                slug = p.get("slug", "")
+                plugin_data = {**p}
+                # Resolve relative URLs against root_url; absolute URLs pass through
+                if root_url:
+                    for url_field in ("manifest_url", "latest_url", "icon_url"):
+                        val = plugin_data.get(url_field, "")
+                        if val and not val.startswith(("http://", "https://")):
+                            plugin_data[url_field] = f"{root_url}/{val}"
+                # Fallback icon_url from main branch when not provided
+                if not plugin_data.get("icon_url") and registry_url:
+                    # registry_url is e.g. https://github.com/Dispatcharr/Plugins
+                    # Convert to raw.githubusercontent.com URL for the main branch
+                    raw_base = registry_url.replace(
+                        "https://github.com/", "https://raw.githubusercontent.com/"
+                    )
+                    plugin_data["icon_url"] = f"{raw_base}/refs/heads/main/plugins/{slug}/logo.png"
+                # Determine install status
+                managed = installed_by_slug.get(slug) or installed_by_slug.get(slug.replace("-", "_"))
+                sanitized_slug = _sanitize_plugin_key(slug)
+                key_match = sanitized_slug in installed_by_key or sanitized_slug in installed_by_key_norm
+                if managed:
+                    is_installed = True
+                    installed_version = managed["version"]
+                    latest = plugin_data.get("latest_version")
+                    if managed["source_repo_id"] == repo.id:
+                        if installed_version and latest and installed_version != latest and not managed.get("is_prerelease"):
+                            install_status = "update_available"
+                        else:
+                            install_status = "installed"
+                    else:
+                        install_status = "different_repo"
+                elif key_match:
+                    is_installed = True
+                    installed_version = installed_by_key.get(sanitized_slug) or installed_by_key.get(
+                        installed_by_key_norm.get(sanitized_slug, sanitized_slug)
+                    )
+                    install_status = "unmanaged"
+                else:
+                    is_installed = False
+                    installed_version = None
+                    install_status = "not_installed"
+                entry = {
+                    **plugin_data,
+                    "repo_id": repo.id,
+                    "repo_name": repo.name,
+                    "is_official_repo": repo.is_official,
+                    "signature_verified": repo.signature_verified,
+                    "installed": is_installed,
+                    "installed_version": installed_version,
+                    "installed_version_is_prerelease": managed.get("is_prerelease", False) if managed else False,
+                    "install_status": install_status,
+                    "key": _sanitize_plugin_key(slug),
+                }
+                if install_status == "different_repo":
+                    entry["installed_source_repo_name"] = managed["source_repo_name"]
+                plugins.append(entry)
+        return Response({"plugins": plugins})
+
+
+class PluginDetailManifestAPIView(PluginAuthMixin, APIView):
+    """Fetch and verify a per-plugin manifest given repo_id and manifest_url."""
+
+    @extend_schema(
+        description="Fetch and GPG-verify a per-plugin manifest from a repo, resolving relative URLs against the repo root.",
+        request=inline_serializer(name="PluginDetailManifestRequest", fields={
+            "repo_id": serializers.IntegerField(),
+            "manifest_url": serializers.URLField(),
+        }),
+        responses={200: inline_serializer(name="PluginDetailManifestResponse", fields={
+            "manifest": serializers.DictField(),
+            "signature_verified": serializers.BooleanField(allow_null=True),
+        }), 502: inline_serializer(name="PluginDetailManifestError", fields={"error": serializers.CharField()})},
+    )
+    def post(self, request):
+        repo_id = request.data.get("repo_id")
+        manifest_url = request.data.get("manifest_url")
+        if not repo_id or not manifest_url:
+            return Response(
+                {"error": "repo_id and manifest_url are required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        try:
+            repo = PluginRepo.objects.get(pk=repo_id)
+        except PluginRepo.DoesNotExist:
+            return Response(
+                {"error": "Repo not found"}, status=status.HTTP_404_NOT_FOUND
+            )
+        try:
+            _validate_fetch_url(manifest_url)
+        except ValueError as e:
+            return Response({"error": str(e)}, status=status.HTTP_400_BAD_REQUEST)
+        try:
+            resp = http_requests.get(manifest_url, timeout=MANIFEST_FETCH_TIMEOUT)
+            resp.raise_for_status()
+            data = resp.json()
+
+            signature = data.get("signature")
+            manifest_obj = data.get("manifest", data)
+            verified = _verify_manifest_signature(
+                manifest_obj, signature,
+                repo.public_key if not repo.is_official else None
+            )
+
+            # Resolve relative URLs in versions
+            repo_manifest = repo.cached_manifest or {}
+            inner = repo_manifest.get("manifest", repo_manifest)
+            root_url = inner.get("root_url", "").rstrip("/")
+
+            if root_url and isinstance(manifest_obj.get("versions"), list):
+                for v in manifest_obj["versions"]:
+                    url_val = v.get("url", "")
+                    if url_val and not url_val.startswith(("http://", "https://")):
+                        v["url"] = f"{root_url}/{url_val}"
+            if root_url and isinstance(manifest_obj.get("latest"), dict):
+                for url_field in ("url", "latest_url"):
+                    url_val = manifest_obj["latest"].get(url_field, "")
+                    if url_val and not url_val.startswith(("http://", "https://")):
+                        manifest_obj["latest"][url_field] = f"{root_url}/{url_val}"
+
+            return Response({
+                "manifest": manifest_obj,
+                "signature_verified": verified,
+            })
+        except Exception as e:
+            logger.exception("Failed to fetch plugin manifest from %s", manifest_url)
+            return Response(
+                {"error": f"Failed to fetch plugin manifest: {e}"},
+                status=status.HTTP_502_BAD_GATEWAY,
+            )
+
+
+class PluginInstallFromRepoAPIView(PluginAuthMixin, APIView):
+    """Install a plugin from a managed repo by downloading its release zip."""
+
+    @extend_schema(
+        description="Download and install a plugin release zip from a managed repository. Verifies SHA256 if provided.",
+        request=inline_serializer(name="PluginInstallFromRepoRequest", fields={
+            "repo_id": serializers.IntegerField(),
+            "slug": serializers.CharField(),
+            "version": serializers.CharField(),
+            "download_url": serializers.URLField(),
+            "sha256": serializers.CharField(required=False, allow_blank=True),
+            "min_dispatcharr_version": serializers.CharField(required=False, allow_blank=True),
+            "max_dispatcharr_version": serializers.CharField(required=False, allow_blank=True),
+        }),
+        responses={
+            200: inline_serializer(name="PluginInstallFromRepoResponse", fields={"success": serializers.BooleanField(), "plugin": serializers.DictField()}),
+            201: inline_serializer(name="PluginInstallFromRepoCreated", fields={"success": serializers.BooleanField(), "plugin": serializers.DictField()}),
+            400: inline_serializer(name="PluginInstallFromRepoError", fields={"error": serializers.CharField()}),
+        },
+    )
+    def post(self, request):
+        repo_id = request.data.get("repo_id")
+        slug = request.data.get("slug")
+        version = request.data.get("version")
+        download_url = request.data.get("download_url")
+
+        if not all([repo_id, slug, version, download_url]):
+            return Response(
+                {"error": "repo_id, slug, version, and download_url are required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        try:
+            repo = PluginRepo.objects.get(pk=repo_id)
+        except PluginRepo.DoesNotExist:
+            return Response(
+                {"error": "Repo not found"}, status=status.HTTP_404_NOT_FOUND
+            )
+
+        # Resolve the plugin key and look up any existing install
+        plugin_key = _sanitize_plugin_key(slug)
+        if len(plugin_key) > 128:
+            plugin_key = plugin_key[:128]
+
+        existing_cfg = PluginConfig.objects.filter(key=plugin_key).first()
+        # Backward compat: if no match, also try with dashes (legacy entries saved before
+        # normalization was enforced) so overwrite is still allowed on update.
+        if not existing_cfg:
+            dash_key = plugin_key.replace("_", "-")
+            if dash_key != plugin_key:
+                existing_cfg = PluginConfig.objects.filter(key=dash_key).first()
+
+        # Version compatibility check against the running Dispatcharr version
+        min_version = request.data.get("min_dispatcharr_version")
+        max_version = request.data.get("max_dispatcharr_version")
+        if min_version or max_version:
+            from version import __version__ as app_version
+            try:
+                if min_version and _compare_versions(app_version, min_version) < 0:
+                    return Response(
+                        {"error": f"This plugin version requires Dispatcharr {min_version} or newer (you have {app_version})"},
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                if max_version and _compare_versions(app_version, max_version) > 0:
+                    return Response(
+                        {"error": f"This plugin version requires Dispatcharr {max_version} or older (you have {app_version})"},
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+            except (ValueError, TypeError):
+                logger.warning("Failed to parse version constraints: min=%s, max=%s", min_version, max_version)
+
+        # Download the zip
+        try:
+            _validate_fetch_url(download_url)
+        except ValueError as e:
+            return Response({"error": str(e)}, status=status.HTTP_400_BAD_REQUEST)
+        try:
+            resp = http_requests.get(download_url, timeout=60, stream=True)
+            resp.raise_for_status()
+        except Exception as e:
+            logger.exception("Failed to download plugin from %s", download_url)
+            return Response(
+                {"error": f"Failed to download plugin: {e}"},
+                status=status.HTTP_502_BAD_GATEWAY,
+            )
+
+        # SHA256 integrity check (streamed)
+        expected_sha256 = request.data.get("sha256", "").lower().strip()
+        hasher = hashlib.sha256() if expected_sha256 else None
+
+        # Stream the response to a temporary file to avoid buffering in memory
+        with tempfile.NamedTemporaryFile(suffix=".zip") as tmp_file:
+            total = 0
+            for chunk in resp.iter_content(chunk_size=8192):
+                if not chunk:
+                    continue
+                total += len(chunk)
+                if total > MAX_PLUGIN_IMPORT_BYTES:
+                    return Response(
+                        {"error": "Download is too large"},
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                if hasher is not None:
+                    hasher.update(chunk)
+                tmp_file.write(chunk)
+
+            if expected_sha256:
+                actual_sha256 = hasher.hexdigest()
+                if actual_sha256 != expected_sha256:
+                    logger.warning(
+                        "SHA256 mismatch for plugin '%s' from %s: expected %s, got %s",
+                        slug, download_url, expected_sha256, actual_sha256,
+                    )
+                    return Response(
+                        {
+                            "error": "SHA256 integrity check failed - download discarded. The file may be corrupted or tampered with."
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+
+            # Delegate to shared install logic (allow overwrite for managed updates)
+            tmp_file.flush()
+            tmp_file.seek(0)
+            pm = PluginManager.get()
+            result = _install_plugin_from_zip(
+                tmp_file,
+                pm.plugins_dir,
+                file_name=f"{slug}.zip",
+                allow_overwrite_key=plugin_key if existing_cfg else None,
+            )
+        if not result["success"]:
+            return Response(
+                {"success": False, "error": result["error"]},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        actual_key = result["plugin_key"]
+
+        # Create/update PluginConfig with managed fields
+        # Use defaults for creation only; explicitly update fields on existing records
+        # to preserve settings, enabled, and ever_enabled
+        is_prerelease = bool(request.data.get("prerelease", False))
+
+        # Determine deprecated status from the repo's cached manifest
+        is_deprecated = False
+        manifest_data = repo.cached_manifest or {}
+        manifest_inner = manifest_data.get("manifest", manifest_data)
+        for rp in manifest_inner.get("plugins", []):
+            if rp.get("slug") == slug:
+                is_deprecated = bool(rp.get("deprecated", False))
+                break
+
+        cfg, created = PluginConfig.objects.get_or_create(
+            key=actual_key,
+            defaults={
+                "name": slug,
+                "version": version,
+                "slug": slug,
+                "source_repo": repo,
+                "installed_version_is_prerelease": is_prerelease,
+                "deprecated": is_deprecated,
+            },
+        )
+        if not created:
+            cfg.version = version
+            cfg.slug = slug
+            cfg.source_repo = repo
+            cfg.installed_version_is_prerelease = is_prerelease
+            cfg.deprecated = is_deprecated
+            cfg.save(update_fields=["version", "slug", "source_repo", "installed_version_is_prerelease", "deprecated", "updated_at"])
+
+        # Reload discovery
+        pm.discover_plugins(force_reload=True)
+        plugin_entry = None
+        try:
+            plugin_entry = next(
+                (p for p in pm.list_plugins() if p.get("key") == actual_key),
+                None,
+            )
+        except Exception:
+            plugin_entry = None
+
+        return Response(
+            {
+                "success": True,
+                "plugin": plugin_entry or {"key": actual_key, "slug": slug, "version": version},
+            },
+            status=status.HTTP_201_CREATED if created else status.HTTP_200_OK,
+        )
+
+
+class PluginRepoSettingsAPIView(PluginAuthMixin, APIView):
+    """Get/update plugin repo refresh settings (interval in hours, 0=disabled)."""
+
+    @extend_schema(
+        description="Get the plugin repository refresh interval setting.",
+        responses={200: inline_serializer(name="PluginRepoSettingsResponse", fields={"refresh_interval_hours": serializers.IntegerField()})},
+    )
+    def get(self, request):
+        from core.models import CoreSettings
+        try:
+            obj = CoreSettings.objects.get(key="plugin_repo_settings")
+            return Response(obj.value)
+        except CoreSettings.DoesNotExist:
+            return Response({"refresh_interval_hours": 6})
+
+    @extend_schema(
+        description="Update the plugin repository refresh interval (hours). Set to 0 to disable automatic refresh.",
+        request=inline_serializer(name="PluginRepoSettingsRequest", fields={"refresh_interval_hours": serializers.IntegerField()}),
+        responses={200: inline_serializer(name="PluginRepoSettingsUpdated", fields={"refresh_interval_hours": serializers.IntegerField()})},
+    )
+    def put(self, request):
+        from core.models import CoreSettings
+        from core.scheduling import create_or_update_periodic_task, delete_periodic_task
+        from .tasks import PLUGIN_REPO_REFRESH_TASK_NAME
+
+        interval = request.data.get("refresh_interval_hours", 6)
+        try:
+            interval = int(interval)
+            if interval < 0:
+                interval = 0
+        except (TypeError, ValueError):
+            interval = 6
+
+        obj, _ = CoreSettings.objects.update_or_create(
+            key="plugin_repo_settings",
+            defaults={
+                "name": "Plugin Repo Settings",
+                "value": {"refresh_interval_hours": interval},
+            },
+        )
+
+        if interval == 0:
+            delete_periodic_task(PLUGIN_REPO_REFRESH_TASK_NAME)
+        else:
+            create_or_update_periodic_task(
+                task_name=PLUGIN_REPO_REFRESH_TASK_NAME,
+                celery_task_path="apps.plugins.tasks.refresh_plugin_repos",
+                interval_hours=interval,
+                enabled=True,
+            )
+
+        return Response(obj.value)
diff --git a/apps/plugins/apps.py b/apps/plugins/apps.py
index 3ab44cb1..c2c0bce6 100644
--- a/apps/plugins/apps.py
+++ b/apps/plugins/apps.py
@@ -52,3 +52,53 @@ class PluginsConfig(AppConfig):
             import logging
 
             logging.getLogger(__name__).exception("Plugin discovery wiring failed during app ready")
+
+        # Register periodic task for refreshing plugin repo manifests
+        self._setup_repo_refresh_schedule()
+
+        # Refresh repo manifests once at startup so the UI always has current data
+        self._enqueue_startup_refresh()
+
+    def _enqueue_startup_refresh(self):
+        from dispatcharr.app_initialization import should_skip_initialization
+        if should_skip_initialization():
+            return
+        try:
+            from .tasks import refresh_plugin_repos
+            refresh_plugin_repos.apply_async(countdown=10)
+        except Exception:
+            import logging
+            logging.getLogger(__name__).debug(
+                "Could not enqueue startup plugin repo refresh (Celery may not be ready yet)"
+            )
+
+    def _setup_repo_refresh_schedule(self):
+        from dispatcharr.app_initialization import should_skip_initialization
+        if should_skip_initialization():
+            return
+        try:
+            from core.scheduling import create_or_update_periodic_task, delete_periodic_task
+            from core.models import CoreSettings
+            from .tasks import PLUGIN_REPO_REFRESH_TASK_NAME
+
+            interval = 6
+            try:
+                obj = CoreSettings.objects.get(key="plugin_repo_settings")
+                interval = obj.value.get("refresh_interval_hours", 6)
+            except CoreSettings.DoesNotExist:
+                pass
+
+            if interval == 0:
+                delete_periodic_task(PLUGIN_REPO_REFRESH_TASK_NAME)
+            else:
+                create_or_update_periodic_task(
+                    task_name=PLUGIN_REPO_REFRESH_TASK_NAME,
+                    celery_task_path="apps.plugins.tasks.refresh_plugin_repos",
+                    interval_hours=interval,
+                    enabled=True,
+                )
+        except Exception:
+            import logging
+            logging.getLogger(__name__).debug(
+                "Could not set up plugin repo refresh schedule (migrations may not have run yet)"
+            )
diff --git a/apps/plugins/keys/dispatcharr-plugins.pub b/apps/plugins/keys/dispatcharr-plugins.pub
new file mode 100644
index 00000000..1f6ba60a
--- /dev/null
+++ b/apps/plugins/keys/dispatcharr-plugins.pub
@@ -0,0 +1,11 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEacgfABYJKwYBBAHaRw8BAQdAh1MuVNBxk+CExQPjOVDvAGvIk6BdGS2ce9/h
+zB7lYtW0TERpc3BhdGNoYXJyIFBsdWdpbiBSZXBvIChkaXNwYXRjaGFyci1hdXRv
+Z2VuZXJhdGVkKSA8cGx1Z2luc0BkaXNwYXRjaGFyci50dj6IrwQTFgoAVxYhBEap
+MFaOD7nKg0zX+H7AOmtMIjTOBQJpyB8AGxSAAAAAAAQADm1hbnUyLDIuNSsxLjEy
+LDAsMwIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRB+wDprTCI0zvNZ
+AP9r3TpMpiI8BCNo9B5M9lJ+QLRo9ihPWIcqBzJ9eFCoSQEAgguiZsNy6aJzKjIb
+yDvGuoZi3I2/GNM/f2qVzFtgPQk=
+=Zf/y
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/apps/plugins/loader.py b/apps/plugins/loader.py
index 4b53e08b..6084b28e 100644
--- a/apps/plugins/loader.py
+++ b/apps/plugins/loader.py
@@ -367,21 +367,35 @@ class PluginManager:
                     obj.save()
 
     def list_plugins(self) -> List[Dict[str, Any]]:
-        from .models import PluginConfig
+        from .models import PluginConfig, PluginRepo
 
         plugins: List[Dict[str, Any]] = []
         with self._lock:
             registry_snapshot = dict(self._registry)
         try:
-            configs = {c.key: c for c in PluginConfig.objects.all()}
+            configs = {c.key: c for c in PluginConfig.objects.select_related("source_repo").all()}
         except Exception as e:
             # Database might not be migrated yet; fall back to registry only
             logger.warning("PluginConfig table unavailable; listing registry only: %s", e)
             configs = {}
 
+        # Build repo latest-version lookup from cached manifests
+        repo_latest = {}  # slug -> latest_version
+        try:
+            for repo in PluginRepo.objects.filter(enabled=True):
+                manifest_data = repo.cached_manifest or {}
+                manifest = manifest_data.get("manifest", manifest_data)
+                for rp in manifest.get("plugins", []):
+                    s = rp.get("slug", "")
+                    if s:
+                        repo_latest[s] = rp.get("latest_version", "")
+        except Exception:
+            pass
+
         # First, include all discovered plugins
         for key, lp in registry_snapshot.items():
             conf = configs.get(key)
+            conf_slug = conf.slug if conf else ""
             trusted = bool(conf and (conf.ever_enabled or conf.enabled))
             logo_url = self._get_logo_url(key, path=lp.path)
             plugins.append(
@@ -393,7 +407,7 @@ class PluginManager:
                     "author": getattr(lp, "author", "") or "",
                     "help_url": getattr(lp, "help_url", "") or "",
                     "enabled": conf.enabled if conf else False,
-                    "ever_enabled": getattr(conf, "ever_enabled", False) if conf else False,
+                    "ever_enabled": conf.ever_enabled if conf else False,
                     "fields": lp.fields or [],
                     "settings": (conf.settings if conf else {}),
                     "actions": lp.actions or [],
@@ -402,6 +416,22 @@ class PluginManager:
                     "loaded": bool(lp.loaded),
                     "legacy": bool(getattr(lp, "legacy", False)),
                     "logo_url": logo_url,
+                    "source_repo": conf.source_repo_id if conf else None,
+                    "source_repo_name": conf.source_repo.name if conf and conf.source_repo else None,
+                    "is_official_repo": bool(conf and conf.source_repo and conf.source_repo.is_official),
+                    "slug": conf_slug,
+                    "is_managed": bool(conf and conf.source_repo_id),
+                    "installed_version_is_prerelease": bool(
+                        conf and conf.installed_version_is_prerelease
+                    ),
+                    "update_available": bool(
+                        conf_slug and conf and conf.source_repo_id
+                        and not (conf and conf.installed_version_is_prerelease)
+                        and repo_latest.get(conf_slug)
+                        and lp.version != repo_latest.get(conf_slug)
+                    ),
+                    "latest_version": repo_latest.get(conf_slug, ""),
+                    "deprecated": conf.deprecated if conf else False,
                 }
             )
 
@@ -428,6 +458,22 @@ class PluginManager:
                     "loaded": False,
                     "legacy": False,
                     "logo_url": self._get_logo_url(key),
+                    "source_repo": conf.source_repo_id,
+                    "source_repo_name": conf.source_repo.name if conf.source_repo else None,
+                    "is_official_repo": bool(conf.source_repo and conf.source_repo.is_official),
+                    "slug": conf.slug,
+                    "is_managed": bool(conf.source_repo_id),
+                    "installed_version_is_prerelease": bool(
+                        conf.installed_version_is_prerelease
+                    ),
+                    "update_available": bool(
+                        conf.slug and conf.source_repo_id
+                        and not conf.installed_version_is_prerelease
+                        and repo_latest.get(conf.slug)
+                        and conf.version != repo_latest.get(conf.slug)
+                    ),
+                    "latest_version": repo_latest.get(conf.slug or "", ""),
+                    "deprecated": conf.deprecated,
                 }
             )
 
diff --git a/apps/plugins/migrations/0002_pluginrepo.py b/apps/plugins/migrations/0002_pluginrepo.py
new file mode 100644
index 00000000..0b7a5196
--- /dev/null
+++ b/apps/plugins/migrations/0002_pluginrepo.py
@@ -0,0 +1,84 @@
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+def seed_official_repo(apps, schema_editor):
+    PluginRepo = apps.get_model("plugins", "PluginRepo")
+    PluginRepo.objects.get_or_create(
+        url="https://raw.githubusercontent.com/Dispatcharr/Plugins/releases/manifest.json",
+        defaults={
+            "name": "Dispatcharr Official",
+            "is_official": True,
+            "enabled": True,
+        },
+    )
+
+
+def unseed_official_repo(apps, schema_editor):
+    PluginRepo = apps.get_model("plugins", "PluginRepo")
+    PluginRepo.objects.filter(is_official=True).delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("plugins", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PluginRepo",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=255)),
+                ("url", models.URLField(unique=True)),
+                ("is_official", models.BooleanField(default=False)),
+                ("enabled", models.BooleanField(default=True)),
+                ("cached_manifest", models.JSONField(blank=True, default=dict)),
+                ("last_fetched", models.DateTimeField(blank=True, null=True)),
+                ("public_key", models.TextField(blank=True, default="")),
+                ("signature_verified", models.BooleanField(blank=True, default=None, null=True)),
+                ("last_fetch_status", models.CharField(blank=True, default="", max_length=255)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                "ordering": ["-is_official", "name"],
+            },
+        ),
+        migrations.RunPython(seed_official_repo, unseed_official_repo),
+        migrations.AddField(
+            model_name="pluginconfig",
+            name="source_repo",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="installed_plugins",
+                to="plugins.pluginrepo",
+            ),
+        ),
+        migrations.AddField(
+            model_name="pluginconfig",
+            name="slug",
+            field=models.CharField(blank=True, default="", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="pluginconfig",
+            name="installed_version_is_prerelease",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="pluginconfig",
+            name="deprecated",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/apps/plugins/models.py b/apps/plugins/models.py
index 8ae0b5be..f1960fd9 100644
--- a/apps/plugins/models.py
+++ b/apps/plugins/models.py
@@ -12,8 +12,52 @@ class PluginConfig(models.Model):
     # Tracks whether this plugin has ever been enabled at least once
     ever_enabled = models.BooleanField(default=False)
     settings = models.JSONField(default=dict, blank=True)
+
+    # Managed plugin fields (populated when installed from a repo)
+    source_repo = models.ForeignKey(
+        "PluginRepo",
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="installed_plugins",
+    )
+    slug = models.CharField(max_length=128, blank=True, default="")
+    installed_version_is_prerelease = models.BooleanField(default=False)
+    deprecated = models.BooleanField(default=False)
+
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
+    @property
+    def is_managed(self):
+        return bool(self.source_repo_id)
+
     def __str__(self) -> str:
         return f"{self.name} ({self.key})"
+
+
+OFFICIAL_REPO_URL = (
+    "https://raw.githubusercontent.com/Dispatcharr/Plugins/releases/manifest.json"
+)
+
+
+class PluginRepo(models.Model):
+    """A remote plugin repository manifest URL."""
+
+    name = models.CharField(max_length=255)
+    url = models.URLField(unique=True)
+    is_official = models.BooleanField(default=False)
+    enabled = models.BooleanField(default=True)
+    cached_manifest = models.JSONField(default=dict, blank=True)
+    public_key = models.TextField(blank=True, default="")
+    signature_verified = models.BooleanField(null=True, blank=True, default=None)
+    last_fetched = models.DateTimeField(null=True, blank=True)
+    last_fetch_status = models.CharField(max_length=255, blank=True, default="")
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        ordering = ["-is_official", "name"]
+
+    def __str__(self) -> str:
+        return self.name
diff --git a/apps/plugins/serializers.py b/apps/plugins/serializers.py
index 9f568054..ed2b57d7 100644
--- a/apps/plugins/serializers.py
+++ b/apps/plugins/serializers.py
@@ -1,4 +1,5 @@
 from rest_framework import serializers
+from .models import PluginRepo
 
 
 class PluginActionSerializer(serializers.Serializer):
@@ -46,3 +47,40 @@ class PluginSerializer(serializers.Serializer):
     fields = PluginFieldSerializer(many=True)
     settings = serializers.JSONField()
     actions = PluginActionSerializer(many=True)
+    source_repo = serializers.IntegerField(required=False, allow_null=True)
+    slug = serializers.CharField(required=False, allow_blank=True)
+    is_managed = serializers.BooleanField(required=False)
+    deprecated = serializers.BooleanField(required=False)
+
+
+class PluginRepoSerializer(serializers.ModelSerializer):
+    registry_url = serializers.SerializerMethodField()
+    plugin_count = serializers.SerializerMethodField()
+
+    class Meta:
+        model = PluginRepo
+        fields = [
+            "id",
+            "name",
+            "url",
+            "is_official",
+            "enabled",
+            "public_key",
+            "signature_verified",
+            "registry_url",
+            "plugin_count",
+            "last_fetched",
+            "last_fetch_status",
+            "created_at",
+            "updated_at",
+        ]
+        read_only_fields = ["id", "name", "is_official", "signature_verified", "registry_url", "plugin_count", "last_fetched", "last_fetch_status", "created_at", "updated_at"]
+
+    def get_registry_url(self, obj):
+        manifest = (obj.cached_manifest or {}).get("manifest", obj.cached_manifest or {})
+        return manifest.get("registry_url", "") or ""
+
+    def get_plugin_count(self, obj):
+        manifest = (obj.cached_manifest or {}).get("manifest", obj.cached_manifest or {})
+        plugins = manifest.get("plugins", [])
+        return len(plugins) if isinstance(plugins, list) else 0
diff --git a/apps/plugins/tasks.py b/apps/plugins/tasks.py
new file mode 100644
index 00000000..6bd1544c
--- /dev/null
+++ b/apps/plugins/tasks.py
@@ -0,0 +1,33 @@
+import logging
+from celery import shared_task
+
+logger = logging.getLogger(__name__)
+
+PLUGIN_REPO_REFRESH_TASK_NAME = "plugin-repo-refresh-task"
+
+
+@shared_task
+def refresh_plugin_repos():
+    """Refresh cached manifests for all enabled plugin repos."""
+    from .models import PluginRepo
+    from .api_views import _fetch_manifest, _save_fetched_manifest_to_repo, _unmanage_dropped_slugs
+    from django.utils import timezone
+
+    repos = PluginRepo.objects.filter(enabled=True)
+    for repo in repos:
+        try:
+            key_text = repo.public_key if not repo.is_official else None
+            data, verified = _fetch_manifest(repo.url, public_key_text=key_text)
+            err = _save_fetched_manifest_to_repo(repo, data, verified)
+            if err:
+                logger.warning("Skipping repo '%s': %s", repo.name, err)
+                continue
+            _unmanage_dropped_slugs(repo, data)
+            logger.info("Refreshed plugin repo '%s'", repo.name)
+        except Exception as e:
+            resp = getattr(e, 'response', None)
+            status_str = str(resp.status_code) if resp is not None and hasattr(resp, 'status_code') else type(e).__name__
+            repo.last_fetch_status = status_str[:255]
+            repo.last_fetched = timezone.now()
+            repo.save(update_fields=["last_fetch_status", "last_fetched", "updated_at"])
+            logger.warning("Failed to refresh plugin repo '%s': %s", repo.name, e)
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 7950e8ae..659d8070 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -14,6 +14,7 @@ import Stats from './pages/Stats';
 import DVR from './pages/DVR';
 import Settings from './pages/Settings';
 import PluginsPage from './pages/Plugins';
+import PluginBrowsePage from './pages/PluginBrowse';
 import ConnectPage from './pages/Connect';
 import ConnectLogsPage from './pages/ConnectLogs';
 import Users from './pages/Users';
@@ -153,6 +154,10 @@ const App = () => {
                         <Route path="/guide" element={<Guide />} />
                         <Route path="/dvr" element={<DVR />} />
                         <Route path="/stats" element={<Stats />} />
+                        <Route
+                          path="/plugins/browse"
+                          element={<PluginBrowsePage />}
+                        />
                         <Route path="/plugins" element={<PluginsPage />} />
                         <Route path="/connect" element={<ConnectPage />} />
                         <Route
diff --git a/frontend/src/api.js b/frontend/src/api.js
index 9bf3890a..0e1ae8f9 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -1908,26 +1908,28 @@ export default class API {
     }
   }
 
-  static async importPlugin(file) {
+  static async importPlugin(file, overwrite = false, silent = false) {
     try {
       const form = new FormData();
       form.append('file', file);
+      if (overwrite) form.append('overwrite', 'true');
       const response = await request(`${host}/api/plugins/plugins/import/`, {
         method: 'POST',
         body: form,
       });
       return response;
     } catch (e) {
-      // Show only the concise error message for plugin import
-      const msg =
-        (e?.body && (e.body.error || e.body.detail)) ||
-        e?.message ||
-        'Failed to import plugin';
-      notifications.show({
-        title: 'Import failed',
-        message: msg,
-        color: 'red',
-      });
+      if (!silent) {
+        const msg =
+          (e?.body && (e.body.error || e.body.detail)) ||
+          e?.message ||
+          'Failed to import plugin';
+        notifications.show({
+          title: 'Import failed',
+          message: msg,
+          color: 'red',
+        });
+      }
       throw e;
     }
   }
@@ -1992,6 +1994,132 @@ export default class API {
     }
   }
 
+  // Plugin Repos API
+  static async getPluginRepos() {
+    try {
+      return await request(`${host}/api/plugins/repos/`);
+    } catch (e) {
+      errorNotification('Failed to retrieve plugin repos', e);
+      return [];
+    }
+  }
+
+  static async addPluginRepo(data) {
+    try {
+      return await request(`${host}/api/plugins/repos/`, {
+        method: 'POST',
+        body: data,
+      });
+    } catch (e) {
+      errorNotification('Failed to add plugin repo', e);
+      throw e;
+    }
+  }
+
+  static async deletePluginRepo(id) {
+    try {
+      return await request(`${host}/api/plugins/repos/${id}/`, {
+        method: 'DELETE',
+      });
+    } catch (e) {
+      errorNotification('Failed to delete plugin repo', e);
+      throw e;
+    }
+  }
+
+  static async updatePluginRepo(id, data) {
+    try {
+      return await request(`${host}/api/plugins/repos/${id}/`, {
+        method: 'PUT',
+        body: data,
+      });
+    } catch (e) {
+      errorNotification('Failed to update plugin repo', e);
+    }
+  }
+
+  static async refreshPluginRepo(id) {
+    try {
+      return await request(`${host}/api/plugins/repos/${id}/refresh/`, {
+        method: 'POST',
+      });
+    } catch (e) {
+      errorNotification('Failed to refresh plugin repo', e);
+    }
+  }
+
+  static async getAvailablePlugins() {
+    try {
+      const response = await request(
+        `${host}/api/plugins/repos/available/`
+      );
+      return response.plugins || [];
+    } catch (e) {
+      errorNotification('Failed to retrieve available plugins', e);
+      return [];
+    }
+  }
+
+  static async getPluginDetailManifest(repoId, manifestUrl) {
+    try {
+      const response = await request(
+        `${host}/api/plugins/repos/plugin-detail/`,
+        {
+          method: 'POST',
+          body: { repo_id: repoId, manifest_url: manifestUrl },
+        }
+      );
+      return response;
+    } catch (e) {
+      errorNotification('Failed to retrieve plugin details', e);
+      return null;
+    }
+  }
+
+  static async getPluginRepoSettings() {
+    try {
+      return await request(`${host}/api/plugins/repos/settings/`);
+    } catch (e) {
+      errorNotification('Failed to retrieve repo settings', e);
+      return null;
+    }
+  }
+
+  static async updatePluginRepoSettings(data) {
+    try {
+      return await request(`${host}/api/plugins/repos/settings/`, {
+        method: 'PUT',
+        body: data,
+      });
+    } catch (e) {
+      errorNotification('Failed to update repo settings', e);
+      return null;
+    }
+  }
+
+  static async installPluginFromRepo(data) {
+    try {
+      return await request(`${host}/api/plugins/repos/install/`, {
+        method: 'POST',
+        body: data,
+      });
+    } catch (e) {
+      errorNotification('Failed to install plugin', e);
+      return null;
+    }
+  }
+
+  static async previewPluginRepo(url, publicKey) {
+    try {
+      return await request(`${host}/api/plugins/repos/preview/`, {
+        method: 'POST',
+        body: { url, public_key: publicKey || '' },
+      });
+    } catch {
+      return null;
+    }
+  }
+
   static async checkSetting(values) {
     const { id, ...payload } = values;
 
diff --git a/frontend/src/components/PluginDetailPanel.jsx b/frontend/src/components/PluginDetailPanel.jsx
new file mode 100644
index 00000000..8a7fc0c0
--- /dev/null
+++ b/frontend/src/components/PluginDetailPanel.jsx
@@ -0,0 +1,430 @@
+import React, { useState } from 'react';
+import {
+  ActionIcon,
+  Alert,
+  Badge,
+  Button,
+  Group,
+  Loader,
+  Select,
+  Stack,
+  Table,
+  Text,
+  Tooltip,
+} from '@mantine/core';
+import { AlertTriangle, Ban, Check, Download, RefreshCw, ShieldAlert, ShieldCheck, Trash2 } from 'lucide-react';
+import { compareVersions } from './pluginUtils.js';
+
+export const GitHubIcon = ({ size = 16 }) => (
+  <svg width={size} height={size} viewBox="0 0 24 24" fill="currentColor">
+    <path d="M12 0C5.37 0 0 5.37 0 12c0 5.31 3.435 9.795 8.205 11.385.6.105.825-.255.825-.57 0-.285-.015-1.23-.015-2.235-3.015.555-3.795-.735-4.035-1.41-.135-.345-.72-1.41-1.23-1.695-.42-.225-1.02-.78-.015-.795.945-.015 1.62.87 1.845 1.23 1.08 1.815 2.805 1.305 3.495.99.105-.78.42-1.305.765-1.605-2.67-.3-5.46-1.335-5.46-5.925 0-1.305.465-2.385 1.23-3.225-.12-.3-.54-1.53.12-3.18 0 0 1.005-.315 3.3 1.23.96-.27 1.98-.405 3-.405s2.04.135 3 .405c2.295-1.56 3.3-1.23 3.3-1.23.66 1.65.24 2.88.12 3.18.765.84 1.23 1.905 1.23 3.225 0 4.605-2.805 5.625-5.475 5.925.435.375.81 1.095.81 2.22 0 1.605-.015 2.895-.015 3.3 0 .315.225.69.825.57A12.02 12.02 0 0024 12c0-6.63-5.37-12-12-12z" />
+  </svg>
+);
+
+export const DiscordIcon = ({ size = 16 }) => (
+  <svg width={size} height={size} viewBox="0 0 24 24" fill="currentColor">
+    <path d="M20.317 4.37a19.791 19.791 0 00-4.885-1.515.074.074 0 00-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 00-5.487 0 12.64 12.64 0 00-.617-1.25.077.077 0 00-.079-.037A19.736 19.736 0 003.677 4.37a.07.07 0 00-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 00.031.057 19.9 19.9 0 005.993 3.03.078.078 0 00.084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 00-.041-.106 13.107 13.107 0 01-1.872-.892.077.077 0 01-.008-.128 10.2 10.2 0 00.372-.292.074.074 0 01.077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 01.078.01c.12.098.246.198.373.292a.077.077 0 01-.006.127 12.299 12.299 0 01-1.873.892.077.077 0 00-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 00.084.028 19.839 19.839 0 006.002-3.03.077.077 0 00.032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 00-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.947 2.418-2.157 2.418z" />
+  </svg>
+);
+
+/**
+ * Shared plugin detail panel used in both PluginCard and AvailablePluginCard modals.
+ *
+ * Props:
+ *  - detail          manifest detail object { manifest: { ... }, signature_verified }
+ *  - detailLoading   boolean
+ *  - selectedVersion string | null
+ *  - onVersionChange (version) => void
+ *  - installedVersion string | null   currently installed version
+ *  - appVersion      string           current app version for compat checks
+ *  - installing      boolean
+ *  - uninstalling    boolean
+ *  - onInstall       (params) => void  called with { version, url, sha256, min/max }
+ *  - onUninstall     () => void        called when uninstall button clicked
+ *  - installStatus   string | null     'unmanaged' | 'different_repo' | 'installed' | 'update_available' | 'not_installed'
+ *  - installedSourceRepoName  string   for different_repo tooltip
+ *  - installedVersionIsPrerelease  boolean
+ *  - repoId          number
+ *  - slug            string
+ */
+const PluginDetailPanel = ({
+  detail,
+  detailLoading,
+  selectedVersion,
+  onVersionChange,
+  installedVersion,
+  installedVersionIsPrerelease = false,
+  appVersion,
+  installing = false,
+  uninstalling = false,
+  onInstall,
+  onUninstall,
+  installStatus,
+  installedSourceRepoName,
+  repoId,
+  slug,
+}) => {
+  if (detailLoading) {
+    return (
+      <Stack align="center" py="xl">
+        <Loader size="sm" />
+        <Text size="sm" c="dimmed">Loading plugin details…</Text>
+      </Stack>
+    );
+  }
+
+  if (!detail?.manifest) {
+    return <Text size="sm" c="dimmed">Failed to load plugin details.</Text>;
+  }
+
+  const manifest = detail.manifest;
+  const selectedVersionData = manifest.versions?.find(
+    (v) => v.version === selectedVersion
+  );
+
+  const isSelSame = installedVersion && selectedVersion &&
+    compareVersions(selectedVersion, installedVersion) === 0;
+  const isSelDowngrade = installedVersion && selectedVersion &&
+    compareVersions(selectedVersion, installedVersion) < 0;
+  const isInstalled = !!installedVersion;
+
+  const selMeetsMin = !selectedVersionData?.min_dispatcharr_version ||
+    compareVersions(appVersion, selectedVersionData.min_dispatcharr_version) >= 0;
+  const selMeetsMax = !selectedVersionData?.max_dispatcharr_version ||
+    compareVersions(appVersion, selectedVersionData.max_dispatcharr_version) <= 0;
+  const selCompatible = selMeetsMin && selMeetsMax;
+
+  const isOverwrite = installStatus === 'unmanaged' || installStatus === 'different_repo';
+
+  const handleInstallClick = () => {
+    if (isSelSame && onUninstall) {
+      onUninstall();
+      return;
+    }
+    if (!selectedVersionData?.url || !onInstall) return;
+    const params = {
+      repo_id: repoId,
+      slug,
+      version: selectedVersion,
+      download_url: selectedVersionData.url,
+      sha256: selectedVersionData.checksum_sha256,
+      min_dispatcharr_version: selectedVersionData.min_dispatcharr_version,
+      max_dispatcharr_version: selectedVersionData.max_dispatcharr_version,
+      prerelease: selectedVersionData.prerelease === true,
+    };
+    onInstall(params);
+  };
+
+  const getButtonProps = () => {
+    if (isOverwrite) {
+      return {
+        label: installing ? 'Installing…' : 'Overwrite',
+        color: 'orange',
+        icon: installing ? <Loader size={14} /> : <Download size={14} />,
+        variant: 'filled',
+        tooltip: installStatus === 'unmanaged'
+          ? 'Installed manually – installing will take over management'
+          : `Managed by ${installedSourceRepoName || 'another repo'} – installing will transfer management to this repo`,
+      };
+    }
+    if (isSelSame) {
+      return {
+        label: uninstalling ? 'Uninstalling…' : 'Uninstall',
+        color: 'red',
+        icon: uninstalling ? <Loader size={14} /> : <Trash2 size={14} />,
+        variant: 'light',
+      };
+    }
+    if (!selCompatible) {
+      return {
+        label: 'Incompatible',
+        color: 'gray',
+        icon: <AlertTriangle size={14} />,
+        variant: 'filled',
+      };
+    }
+    if (isSelDowngrade) {
+      return {
+        label: installing ? 'Downgrading…' : 'Downgrade',
+        color: 'orange',
+        icon: installing ? <Loader size={14} /> : <AlertTriangle size={14} />,
+        variant: 'filled',
+      };
+    }
+    if (isInstalled && !installedVersionIsPrerelease) {
+      return {
+        label: installing ? 'Updating…' : 'Update',
+        color: 'yellow',
+        icon: installing ? <Loader size={14} /> : <RefreshCw size={14} />,
+        variant: 'filled',
+      };
+    }
+    return {
+      label: installing ? 'Installing…' : 'Install',
+      color: undefined,
+      icon: installing ? <Loader size={14} /> : <Download size={14} />,
+      variant: 'filled',
+    };
+  };
+
+  const btnProps = getButtonProps();
+  const btnDisabled = (isSelSame ? uninstalling : (!selCompatible || installing || !selectedVersionData?.url));
+
+  return (
+    <Stack gap="md">
+      {manifest.description && (
+        <Text size="sm">{manifest.description}</Text>
+      )}
+
+      <Group gap="xs" wrap="wrap">
+        {manifest.author && (
+          <Badge size="sm" variant="default">
+            <span style={{ opacity: 0.5, marginRight: 4 }}>AUTHOR</span>
+            {manifest.author}
+          </Badge>
+        )}
+        {manifest.license && (
+          <Badge
+            size="sm"
+            variant="default"
+            component="a"
+            href={`https://spdx.org/licenses/${encodeURIComponent(manifest.license)}.html`}
+            target="_blank"
+            rel="noopener noreferrer"
+            style={{ cursor: 'pointer' }}
+          >
+            <span style={{ opacity: 0.5, marginRight: 4 }}>LICENSE</span>
+            {manifest.license}
+          </Badge>
+        )}
+        {detail.signature_verified != null && (
+          detail.signature_verified ? (
+            <Badge
+              size="sm"
+              variant="default"
+              leftSection={<ShieldCheck size={10} />}
+            >
+              Verified Signature
+            </Badge>
+          ) : (
+            <Tooltip label="Invalid Signature">
+              <Badge
+                size="sm"
+                variant="filled"
+                color="red"
+                leftSection={<ShieldAlert size={10} />}
+              >
+                Unverified
+              </Badge>
+            </Tooltip>
+          )
+        )}
+        {manifest.repo_url && (
+          <Tooltip label="Source Repository">
+            <ActionIcon
+              variant="subtle"
+              color="gray"
+              size="sm"
+              component="a"
+              href={manifest.repo_url}
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <GitHubIcon size={16} />
+            </ActionIcon>
+          </Tooltip>
+        )}
+        {manifest.discord_thread && (() => {
+          const isDiscordChannel = /^https:\/\/discord\.com\/channels\//.test(manifest.discord_thread);
+          return (
+            <Tooltip label="Discord Discussion">
+              <ActionIcon
+                variant="subtle"
+                color="gray"
+                size="sm"
+                component="a"
+                href={isDiscordChannel
+                  ? manifest.discord_thread.replace('https://', 'discord://')
+                  : manifest.discord_thread}
+                {...(!isDiscordChannel && { target: '_blank', rel: 'noopener noreferrer' })}
+              >
+                <DiscordIcon size={16} />
+              </ActionIcon>
+            </Tooltip>
+          );
+        })()}
+      </Group>
+
+      {manifest.deprecated && (
+        <Alert
+          icon={<Ban size={16} />}
+          color="red"
+          variant="light"
+          title="Deprecated Plugin"
+        >
+          This plugin has been marked as deprecated by its maintainer. It may no longer receive
+          updates or fixes, and could stop working with future versions of Dispatcharr.
+          Consider looking for an alternative.
+        </Alert>
+      )}
+
+      {manifest.versions?.length > 0 && (() => {
+        const installedMissing = installedVersion &&
+          !manifest.versions.some((v) => compareVersions(v.version, installedVersion) === 0);
+        const buildLabel = (v) =>
+          `v${v.version}${v.prerelease ? ' (prerelease)' : ''}${v.version === manifest.latest?.version ? ' (latest)' : ''}${installedVersion && compareVersions(v.version, installedVersion) === 0 ? ' (installed)' : ''}`;
+
+        let versions = [...manifest.versions];
+        if (installedVersionIsPrerelease) {
+          const prereleases = versions.filter((v) => v.prerelease);
+          const stable = versions.filter((v) => !v.prerelease);
+          versions = [...prereleases, ...stable];
+        }
+
+        const versionItems = versions.map((v) => ({
+          value: v.version,
+          label: buildLabel(v),
+          disabled: false,
+        }));
+        if (installedMissing) {
+          const ghostItem = {
+            value: installedVersion,
+            label: `v${installedVersion} (installed)`,
+            disabled: true,
+          };
+          // Insert in sorted position (newest first, matching manifest order convention)
+          const idx = versionItems.findIndex(
+            (item) => compareVersions(installedVersion, item.value) > 0
+          );
+          if (idx === -1) {
+            versionItems.push(ghostItem);
+          } else {
+            versionItems.splice(idx, 0, ghostItem);
+          }
+        }
+        return (
+          <>
+            <Group gap="xs" align="flex-end">
+              <Select
+                label="Version"
+                size="xs"
+                allowDeselect={false}
+                value={selectedVersion}
+                onChange={onVersionChange}
+                data={versionItems}
+                style={{ maxWidth: 240 }}
+              />
+              <Group gap="xs" align="center">
+                {btnProps.tooltip ? (
+                  <Tooltip label={btnProps.tooltip}>
+                    <Button
+                      size="xs"
+                      variant={btnProps.variant}
+                      color={btnProps.color}
+                      leftSection={btnProps.icon}
+                      disabled={btnDisabled}
+                      onClick={handleInstallClick}
+                    >
+                      {btnProps.label}
+                    </Button>
+                  </Tooltip>
+                ) : (
+                  <Button
+                    size="xs"
+                    variant={btnProps.variant}
+                    color={btnProps.color}
+                    leftSection={btnProps.icon}
+                    disabled={btnDisabled}
+                    onClick={handleInstallClick}
+                  >
+                    {btnProps.label}
+                  </Button>
+                )}
+                {!selCompatible && selectedVersionData && !isSelSame && (() => {
+                  const parts = [];
+                  if (!selMeetsMin) parts.push(`${selectedVersionData.min_dispatcharr_version} or newer`);
+                  if (!selMeetsMax) parts.push(`${selectedVersionData.max_dispatcharr_version} or older`);
+                  const label = !selMeetsMin
+                    ? `Min ${selectedVersionData.min_dispatcharr_version}`
+                    : `Max ${selectedVersionData.max_dispatcharr_version}`;
+                  return (
+                    <Tooltip label={`Incompatible: requires Dispatcharr ${parts.join(' and ')} (you have v${appVersion})`}>
+                      <Group gap={4} align="center" wrap="nowrap">
+                        <AlertTriangle size={14} color="var(--mantine-color-yellow-6)" />
+                        <Text size="xs" c="yellow">{label}</Text>
+                      </Group>
+                    </Tooltip>
+                  );
+                })()}
+              </Group>
+            </Group>
+          {selectedVersionData && (
+            <Table fontSize="xs" striped highlightOnHover style={{ tableLayout: 'auto' }}>
+              <Table.Tbody>
+                {selectedVersionData.build_timestamp && (
+                  <Table.Tr>
+                    <Table.Td fw={500} style={{ whiteSpace: 'nowrap' }}>Built</Table.Td>
+                    <Table.Td>{new Date(selectedVersionData.build_timestamp).toLocaleString()}</Table.Td>
+                  </Table.Tr>
+                )}
+                {selectedVersionData.min_dispatcharr_version && (
+                  <Table.Tr>
+                    <Table.Td fw={500} style={{ whiteSpace: 'nowrap' }}>Min Version</Table.Td>
+                    <Table.Td>{selectedVersionData.min_dispatcharr_version}</Table.Td>
+                  </Table.Tr>
+                )}
+                {selectedVersionData.max_dispatcharr_version && (
+                  <Table.Tr>
+                    <Table.Td fw={500} style={{ whiteSpace: 'nowrap' }}>Max Version</Table.Td>
+                    <Table.Td>{selectedVersionData.max_dispatcharr_version}</Table.Td>
+                  </Table.Tr>
+                )}
+                {selectedVersionData.commit_sha_short && (
+                  <Table.Tr>
+                    <Table.Td fw={500} style={{ whiteSpace: 'nowrap' }}>Commit</Table.Td>
+                    <Table.Td>
+                      {manifest.registry_url ? (
+                        <Text
+                          size="xs"
+                          component="a"
+                          href={`${manifest.registry_url}/commit/${selectedVersionData.commit_sha}`}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          c="blue"
+                        >
+                          {selectedVersionData.commit_sha_short}
+                        </Text>
+                      ) : (
+                        selectedVersionData.commit_sha_short
+                      )}
+                    </Table.Td>
+                  </Table.Tr>
+                )}
+                {selectedVersionData.url && (
+                  <Table.Tr>
+                    <Table.Td fw={500} style={{ whiteSpace: 'nowrap' }}>Download</Table.Td>
+                    <Table.Td>
+                      <Text
+                        size="xs"
+                        component="a"
+                        href={selectedVersionData.url}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        c="blue"
+                      >
+                        {selectedVersionData.url.split('/').pop()}
+                      </Text>
+                    </Table.Td>
+                  </Table.Tr>
+                )}
+              </Table.Tbody>
+            </Table>
+          )}
+        </>
+        );
+      })()}
+    </Stack>
+  );
+};
+
+export default PluginDetailPanel;
diff --git a/frontend/src/components/__tests__/Sidebar.test.jsx b/frontend/src/components/__tests__/Sidebar.test.jsx
index e92b2f39..478078c7 100644
--- a/frontend/src/components/__tests__/Sidebar.test.jsx
+++ b/frontend/src/components/__tests__/Sidebar.test.jsx
@@ -57,6 +57,8 @@ vi.mock('lucide-react', () => ({
   MonitorCog: () => <div data-testid="monitor-cog-icon" />,
   Blocks: () => <div data-testid="blocks-icon" />,
   Heart: () => <div data-testid="heart-icon" />,
+  Package: () => <div data-testid="package-icon" />,
+  Download: () => <div data-testid="download-icon" />,
 }));
 
 // Mock UserForm component
diff --git a/frontend/src/components/cards/AvailablePluginCard.jsx b/frontend/src/components/cards/AvailablePluginCard.jsx
new file mode 100644
index 00000000..7362c6da
--- /dev/null
+++ b/frontend/src/components/cards/AvailablePluginCard.jsx
@@ -0,0 +1,779 @@
+import React, { useEffect, useRef, useState } from 'react';
+import {
+  ActionIcon,
+  Avatar,
+  Badge,
+  Box,
+  Button,
+  Card,
+  Group,
+  Loader,
+  Modal,
+  Stack,
+  Switch,
+  Text,
+  Tooltip,
+} from '@mantine/core';
+import { AlertTriangle, Ban, Check, Download, FlaskConical, Info, RefreshCw, RotateCcw, ShieldAlert, ShieldCheck, Trash2 } from 'lucide-react';
+import { useNavigate, useLocation } from 'react-router-dom';
+import API from '../../api';
+import { usePluginStore } from '../../store/plugins';
+import PluginDetailPanel from '../PluginDetailPanel.jsx';
+import { compareVersions } from '../pluginUtils.js';
+
+const RepoBadge = ({ isOfficial, repoName, signatureVerified }) => {
+  if (isOfficial) {
+    const badge = (
+      <Badge
+        size="xs"
+        variant="filled"
+        style={{ backgroundColor: signatureVerified === false ? 'var(--mantine-color-red-9)' : '#14917E' }}
+        leftSection={signatureVerified != null ? (signatureVerified ? <ShieldCheck size={10} /> : <ShieldAlert size={10} />) : undefined}
+      >
+        Official Repo
+      </Badge>
+    );
+    return signatureVerified != null ? (
+      <Tooltip label={signatureVerified ? 'Verified Signature' : 'Invalid Signature'}>{badge}</Tooltip>
+    ) : badge;
+  }
+  if (!repoName) return null;
+  const badge = (
+    <Badge
+      size="xs"
+      variant="filled"
+      color={signatureVerified === false ? 'red.9' : 'gray'}
+      leftSection={signatureVerified != null ? (signatureVerified ? <ShieldCheck size={10} /> : <ShieldAlert size={10} />) : undefined}
+    >
+      {repoName}
+    </Badge>
+  );
+  return signatureVerified != null ? (
+    <Tooltip label={signatureVerified ? 'Verified Signature' : 'Invalid Signature'}>{badge}</Tooltip>
+  ) : badge;
+};
+
+const StatusBadge = ({ status, deprecated, isPrerelease, isLatestDowngrade, installedSourceRepoName }) => {
+  if (status === 'installed') {
+    const baseLabel = isPrerelease ? 'Prerelease' : 'Installed';
+    if (!deprecated) {
+      return (
+        <Badge size="xs" variant="light" color={isPrerelease ? 'violet' : 'green'} leftSection={isPrerelease ? <FlaskConical size={8} /> : <Check size={8} />}>
+          {baseLabel}
+        </Badge>
+      );
+    }
+    return (
+      <Tooltip label={`${isPrerelease ? 'Prerelease installed' : 'Installed'}, but this plugin has been deprecated by its maintainer`}>
+        <Badge size="xs" variant="light" color={isPrerelease ? 'red' : 'orange'} leftSection={<Ban size={8} />}>
+          {baseLabel} · Deprecated
+        </Badge>
+      </Tooltip>
+    );
+  }
+  if (status === 'update_available') {
+    const baseLabel = isLatestDowngrade ? 'Newer Installed' : 'Update Available';
+    if (!deprecated) {
+      return (
+        <Badge size="xs" variant="light" color={isLatestDowngrade ? 'orange' : 'yellow'} leftSection={isLatestDowngrade ? <AlertTriangle size={8} /> : <RefreshCw size={8} />}>
+          {baseLabel}
+        </Badge>
+      );
+    }
+    return (
+      <Tooltip label="Update available, but this plugin has been deprecated by its maintainer">
+        <Badge size="xs" variant="light" color="red" leftSection={<Ban size={8} />}>
+          {baseLabel} · Deprecated
+        </Badge>
+      </Tooltip>
+    );
+  }
+  if (status === 'unmanaged' || status === 'different_repo') {
+    const tooltip = status === 'unmanaged'
+      ? (deprecated ? 'Installed manually (deprecated) - installing from this repo will take over management' : 'Installed manually - installing from this repo will take over management')
+      : `Managed by ${installedSourceRepoName || 'another repo'}${deprecated ? ' (deprecated)' : ''}`;
+    return (
+      <Tooltip label={tooltip}>
+        <Badge size="xs" variant="light" color={deprecated ? 'red' : 'orange'} leftSection={deprecated ? <Ban size={8} /> : <Check size={8} />}>
+          {deprecated ? 'Installed · Deprecated' : 'Installed'}
+        </Badge>
+      </Tooltip>
+    );
+  }
+  if (deprecated) {
+    return (
+      <Tooltip label="This plugin has been marked as deprecated by its maintainer">
+        <Badge size="xs" variant="light" color="red" leftSection={<Ban size={8} />}>
+          Deprecated
+        </Badge>
+      </Tooltip>
+    );
+  }
+  return null;
+};
+
+const AvailablePluginCard = ({ plugin, appVersion, multiRepo = false, autoOpenDetail = false, onDetailClose, onInstalled, onUninstalled, onBeforeInstall }) => {
+  const meetsMinVersion = !plugin.min_dispatcharr_version || compareVersions(appVersion, plugin.min_dispatcharr_version) >= 0;
+  const meetsMaxVersion = !plugin.max_dispatcharr_version || compareVersions(appVersion, plugin.max_dispatcharr_version) <= 0;
+  const meetsVersion = meetsMinVersion && meetsMaxVersion;
+  const [detailOpen, setDetailOpen] = useState(false);
+  const [detail, setDetail] = useState(null);
+  const [detailLoading, setDetailLoading] = useState(false);
+
+  const [selectedVersion, setSelectedVersion] = useState(null);
+  const [installing, setInstalling] = useState(false);
+  const [confirmOpen, setConfirmOpen] = useState(false);
+  const [restartPromptOpen, setRestartPromptOpen] = useState(false);
+  const [installAction, setInstallAction] = useState(null); // 'installed' | 'updated' | 'downgraded'
+  const [pendingInstall, setPendingInstall] = useState(null);
+  const [installedKey, setInstalledKey] = useState(null);
+  const [enableNow, setEnableNow] = useState(false);
+  const [enabling, setEnabling] = useState(false);
+  const [pluginIsDisabled, setPluginIsDisabled] = useState(false);
+  const [uninstallConfirmOpen, setUninstallConfirmOpen] = useState(false);
+  const [uninstalling, setUninstalling] = useState(false);
+  const [deprecationWarnOpen, setDeprecationWarnOpen] = useState(false);
+  const [pendingDeprecatedInstall, setPendingDeprecatedInstall] = useState(null);
+  const installPlugin = usePluginStore((s) => s.installPlugin);
+  const navigate = useNavigate();
+  const { pathname } = useLocation();
+  const onMyPlugins = pathname === '/plugins';
+
+  const isLatestDowngrade = plugin.install_status === 'update_available' &&
+    plugin.latest_version && plugin.installed_version &&
+    compareVersions(plugin.latest_version, plugin.installed_version) < 0;
+
+  const descContainerRef = useRef(null);
+  const [descLines, setDescLines] = useState(3);
+  useEffect(() => {
+    const el = descContainerRef.current;
+    if (!el) return;
+    const obs = new ResizeObserver(() => {
+      const lh = parseFloat(getComputedStyle(el).lineHeight) || 22;
+      setDescLines(Math.max(1, Math.min(3, Math.floor(el.clientHeight / lh))));
+    });
+    obs.observe(el);
+    return () => obs.disconnect();
+  }, []);
+
+  const doInstall = (params) => {
+    if (plugin.deprecated) {
+      setPendingDeprecatedInstall(params);
+      setDeprecationWarnOpen(true);
+      return;
+    }
+    setPendingInstall(params);
+    setConfirmOpen(true);
+  };
+
+  const confirmDeprecatedInstall = () => {
+    setDeprecationWarnOpen(false);
+    if (pendingDeprecatedInstall) {
+      setPendingInstall(pendingDeprecatedInstall);
+      setPendingDeprecatedInstall(null);
+      setConfirmOpen(true);
+    }
+  };
+
+  const confirmAndInstall = () => {
+    setConfirmOpen(false);
+    if (pendingInstall) executeInstall(pendingInstall);
+  };
+
+  const executeInstall = async (params) => {
+    const wasInstalled = plugin.installed;
+    const wasDowngrade = plugin.installed_version && params.version &&
+      compareVersions(params.version, plugin.installed_version) < 0;
+    onBeforeInstall?.(plugin.slug);
+    setInstalling(true);
+    const result = await installPlugin(params);
+    setInstalling(false);
+    setPendingInstall(null);
+    if (result?.success) {
+      setInstallAction(wasDowngrade ? 'downgraded' : wasInstalled ? 'updated' : 'installed');
+      setInstalledKey(result.plugin?.key || params.slug);
+      setPluginIsDisabled(result.plugin?.enabled === false);
+      setEnableNow(false);
+      setRestartPromptOpen(true);
+      onInstalled?.(plugin.slug);
+    }
+  };
+
+  const [uninstallDoneOpen, setUninstallDoneOpen] = useState(false);
+
+  const handleDismissRestart = async (andNavigate = false) => {
+    if (enableNow && installedKey) {
+      setEnabling(true);
+      try {
+        await API.setPluginEnabled(installedKey, true);
+      } finally {
+        setEnabling(false);
+      }
+    }
+    setRestartPromptOpen(false);
+    if (andNavigate) navigate('/plugins');
+  };
+
+  const handleUninstall = async () => {
+    const key = plugin.key || installedKey;
+    if (!key) return;
+    setUninstalling(true);
+    try {
+      const resp = await API.deletePlugin(key);
+      if (resp?.success) {
+        onUninstalled?.(plugin.slug);
+        usePluginStore.getState().invalidatePlugins();
+        usePluginStore.getState().fetchAvailablePlugins();
+        setUninstallConfirmOpen(false);
+        setUninstallDoneOpen(true);
+      }
+    } finally {
+      setUninstalling(false);
+    }
+  };
+
+  const handleMoreInfo = async () => {
+    setDetailOpen(true);
+    if (detailLoading) return;
+    if (!plugin.manifest_url) {
+      // No per-plugin manifest — synthesize from top-level repo entry (latest only)
+      setDetail({
+        manifest: {
+          description: plugin.description,
+          author: plugin.author,
+          license: plugin.license,
+          versions: plugin.latest_version ? [{
+            version: plugin.latest_version,
+            url: plugin.latest_url,
+            checksum_sha256: plugin.latest_sha256,
+            min_dispatcharr_version: plugin.min_dispatcharr_version,
+            max_dispatcharr_version: plugin.max_dispatcharr_version,
+            build_timestamp: plugin.last_updated,
+          }] : [],
+          latest: plugin.latest_version ? { version: plugin.latest_version } : null,
+        },
+        signature_verified: plugin.signature_verified ?? null,
+      });
+      if (plugin.latest_version) setSelectedVersion(plugin.latest_version);
+      return;
+    }
+    setDetailLoading(true);
+    const result = await API.getPluginDetailManifest(plugin.repo_id, plugin.manifest_url);
+    if (result) {
+      setDetail(result);
+      if (result.manifest?.versions?.length) {
+        setSelectedVersion(result.manifest.versions[0].version);
+      }
+    }
+    setDetailLoading(false);
+  };
+
+  React.useEffect(() => {
+    if (autoOpenDetail) handleMoreInfo();
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const latestInstallParams = {
+    repo_id: plugin.repo_id,
+    slug: plugin.slug,
+    version: plugin.latest_version,
+    download_url: plugin.latest_url,
+    sha256: plugin.latest_sha256,
+    min_dispatcharr_version: plugin.min_dispatcharr_version,
+    max_dispatcharr_version: plugin.max_dispatcharr_version,
+  };
+
+  return (
+    <Card
+      shadow="sm"
+      radius="md"
+      withBorder
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        height: 220,
+        ...(multiRepo && plugin.is_official_repo ? { borderColor: '#0e6459' } : {}),
+      }}
+    >
+      <Group justify="space-between" mb="xs" align="flex-start" wrap="nowrap">
+        <Group gap="sm" align="flex-start" wrap="nowrap" style={{ minWidth: 0, flex: 1 }}>
+          <Avatar
+            src={plugin.icon_url}
+            radius="sm"
+            size={48}
+            alt={`${plugin.name} logo`}
+          >
+            {plugin.name?.[0]?.toUpperCase()}
+          </Avatar>
+          <Box style={{ minWidth: 0, flex: 1 }}>
+            <Text fw={600} lineClamp={1}>
+              {plugin.name}
+            </Text>
+            <Group gap={6} align="center" wrap="nowrap">
+              {plugin.author && (
+                <Text size="xs" c="dimmed">by {plugin.author}</Text>
+              )}
+              <StatusBadge
+                status={plugin.install_status}
+                deprecated={plugin.deprecated}
+                isPrerelease={plugin.installed_version_is_prerelease}
+                isLatestDowngrade={isLatestDowngrade}
+                installedSourceRepoName={plugin.installed_source_repo_name}
+              />
+            </Group>
+          </Box>
+        </Group>
+        <Group gap={4} wrap="nowrap" style={{ flexShrink: 0 }}>
+          <RepoBadge
+            isOfficial={plugin.is_official_repo}
+            repoName={plugin.repo_name}
+            signatureVerified={plugin.signature_verified}
+          />
+        </Group>
+      </Group>
+
+      <Box style={{ flex: 1, minHeight: 0, overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
+        <div ref={descContainerRef} style={{ flex: 1, minHeight: 0, overflow: 'hidden' }}>
+          <Text size="sm" c="dimmed" lineClamp={descLines}>
+            {plugin.description}
+          </Text>
+        </div>
+
+        <Stack gap={4} style={{ flexShrink: 0 }}>
+          <Group gap="xs" wrap="wrap">
+            {plugin.latest_version && (
+              <Badge size="xs" variant="default">
+                <span style={{ opacity: 0.5, marginRight: 4 }}>LATEST</span>
+                v{plugin.latest_version}
+              </Badge>
+            )}
+            {plugin.license && (
+              <Badge
+                size="xs"
+                variant="default"
+                component="a"
+                href={`https://spdx.org/licenses/${encodeURIComponent(plugin.license)}.html`}
+                target="_blank"
+                rel="noopener noreferrer"
+                style={{ cursor: 'pointer' }}
+              >
+                <span style={{ opacity: 0.5, marginRight: 4 }}>LICENSE</span>
+                {plugin.license}
+              </Badge>
+            )}
+            {plugin.min_dispatcharr_version && (
+              <Badge size="xs" variant="default">
+                <span style={{ opacity: 0.5, marginRight: 4 }}>MIN</span>
+                {plugin.min_dispatcharr_version}
+              </Badge>
+            )}
+            {plugin.max_dispatcharr_version && (
+              <Badge size="xs" variant="default">
+                <span style={{ opacity: 0.5, marginRight: 4 }}>MAX</span>
+                {plugin.max_dispatcharr_version}
+              </Badge>
+            )}
+            {plugin.last_updated && (
+              <Badge size="xs" variant="default">
+                <span style={{ opacity: 0.5, marginRight: 4 }}>UPDATED</span>
+                {new Date(plugin.last_updated).toLocaleDateString()}
+              </Badge>
+            )}
+          </Group>
+        </Stack>
+      </Box>
+
+      <Group justify="space-between" mt="sm" align="center" wrap="nowrap">
+        {!meetsVersion && (() => {
+          const parts = [];
+          if (!meetsMinVersion) parts.push(`${plugin.min_dispatcharr_version} or newer`);
+          if (!meetsMaxVersion) parts.push(`${plugin.max_dispatcharr_version} or older`);
+          const label = !meetsMinVersion
+            ? `Min ${plugin.min_dispatcharr_version}`
+            : `Max ${plugin.max_dispatcharr_version}`;
+          return (
+            <Tooltip label={`Incompatible: requires Dispatcharr ${parts.join(' and ')} (you have v${appVersion})`}>
+              <Group gap={4} align="center" wrap="nowrap">
+                <AlertTriangle size={14} color="var(--mantine-color-yellow-6)" />
+                <Text size="xs" c="yellow">{label}</Text>
+              </Group>
+            </Tooltip>
+          );
+        })()}
+        {meetsVersion && <span />}
+        <Group gap="xs" wrap="nowrap">
+        <Button
+          size="xs"
+          variant="default"
+          leftSection={<Info size={14} />}
+          onClick={handleMoreInfo}
+        >
+          More Info
+        </Button>
+        {(plugin.install_status === 'unmanaged') && plugin.latest_version && plugin.latest_url && (
+          <Tooltip label="Installed manually - installing from this repo will take over management">
+            <Button
+              size="xs"
+              variant="filled"
+              color="orange"
+              leftSection={installing ? <Loader size={14} /> : <Download size={14} />}
+              disabled={!meetsVersion || installing}
+              onClick={() => doInstall(latestInstallParams)}
+            >
+              {installing ? 'Installing...' : 'Overwrite'}
+            </Button>
+          </Tooltip>
+        )}
+        {(plugin.install_status === 'different_repo') && plugin.latest_url && (
+          <Tooltip label={`Managed by ${plugin.installed_source_repo_name || 'another repo'} - installing will transfer management to this repo`}>
+            <Button
+              size="xs"
+              variant="filled"
+              color="orange"
+              leftSection={installing ? <Loader size={14} /> : <Download size={14} />}
+              disabled={!meetsVersion || installing}
+              onClick={() => doInstall(latestInstallParams)}
+            >
+              {installing ? 'Installing...' : 'Overwrite'}
+            </Button>
+          </Tooltip>
+        )}
+        {(plugin.install_status === 'installed') && (
+          <Button
+            size="xs"
+            variant="light"
+            color="red"
+            leftSection={<Trash2 size={14} />}
+            onClick={() => setUninstallConfirmOpen(true)}
+          >
+            Uninstall
+          </Button>
+        )}
+        {(plugin.install_status === 'update_available') && (
+          <Button
+            size="xs"
+            variant="filled"
+            color={isLatestDowngrade ? 'orange' : 'yellow'}
+            leftSection={installing ? <Loader size={14} /> : isLatestDowngrade ? <AlertTriangle size={14} /> : <RefreshCw size={14} />}
+            disabled={!meetsVersion || installing}
+            onClick={() => doInstall(latestInstallParams)}
+          >
+            {installing
+              ? (isLatestDowngrade ? 'Downgrading...' : 'Updating...')
+              : (isLatestDowngrade ? 'Downgrade' : 'Update')}
+          </Button>
+        )}
+        {(!plugin.install_status || plugin.install_status === 'not_installed') && plugin.latest_url && (
+          <Button
+            size="xs"
+            variant="filled"
+            leftSection={installing ? <Loader size={14} /> : <Download size={14} />}
+            disabled={!meetsVersion || installing}
+            onClick={() => doInstall(latestInstallParams)}
+          >
+            {installing ? 'Installing...' : 'Install'}
+          </Button>
+        )}
+        </Group>
+      </Group>
+
+      {/* Detail Modal */}
+      <Modal
+        opened={detailOpen}
+        onClose={() => { setDetailOpen(false); onDetailClose?.(); }}
+        title={
+          <Group gap="xs" align="center">
+            <Avatar
+              src={plugin.icon_url}
+              radius="sm"
+              size={28}
+              alt={`${plugin.name} logo`}
+            >
+              {plugin.name?.[0]?.toUpperCase()}
+            </Avatar>
+            <Text fw={600}>{plugin.name}</Text>
+            <RepoBadge
+              isOfficial={plugin.is_official_repo}
+              repoName={plugin.repo_name}
+              signatureVerified={detail?.signature_verified ?? plugin.signature_verified}
+            />
+          </Group>
+        }
+        size="lg"
+      >
+        <PluginDetailPanel
+          detail={detail}
+          detailLoading={detailLoading}
+          selectedVersion={selectedVersion}
+          onVersionChange={setSelectedVersion}
+          installedVersion={plugin.installed_version}
+          installedVersionIsPrerelease={!!plugin.installed_version_is_prerelease}
+          appVersion={appVersion}
+          installing={installing}
+          uninstalling={uninstalling}
+          onInstall={doInstall}
+          onUninstall={() => setUninstallConfirmOpen(true)}
+          installStatus={plugin.install_status}
+          installedSourceRepoName={plugin.installed_source_repo_name}
+          repoId={plugin.repo_id}
+          slug={plugin.slug}
+        />
+      </Modal>
+
+      {/* Deprecation warning modal */}
+      <Modal
+        opened={deprecationWarnOpen}
+        onClose={() => { setDeprecationWarnOpen(false); setPendingDeprecatedInstall(null); }}
+        zIndex={300}
+        title={
+          <Group gap="xs" align="center">
+            <Ban size={18} color="var(--mantine-color-red-6)" />
+            <Text fw={600}>Deprecated Plugin</Text>
+          </Group>
+        }
+        size="sm"
+      >
+        <Stack gap="md">
+          <Text size="sm">
+            <b>{plugin.name}</b> has been marked as <b>deprecated</b> by its maintainer.
+          </Text>
+          <Text size="sm" c="dimmed">
+            Deprecated plugins may no longer receive updates or fixes, and could stop working with future
+            versions of Dispatcharr. It is recommended to look for an alternative.
+          </Text>
+          <Text size="sm" fw={500}>Do you still want to proceed?</Text>
+          <Group justify="flex-end" gap="xs">
+            <Button
+              size="xs"
+              variant="default"
+              onClick={() => { setDeprecationWarnOpen(false); setPendingDeprecatedInstall(null); }}
+            >
+              Cancel
+            </Button>
+            <Button
+              size="xs"
+              color="red"
+              leftSection={<Ban size={14} />}
+              onClick={confirmDeprecatedInstall}
+            >
+              Install Anyway
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+
+      {/* Unified install confirmation modal */}
+      {(() => {
+        const isDowngrade = pendingInstall && plugin.installed_version &&
+          compareVersions(pendingInstall.version, plugin.installed_version) < 0;
+        const isUpdate = pendingInstall && plugin.installed_version &&
+          !isDowngrade &&
+          compareVersions(pendingInstall.version, plugin.installed_version) > 0;
+        const isBadSig = plugin.signature_verified === false;
+        const actionLabel = isDowngrade ? 'Downgrade' : isUpdate ? 'Update' : 'Install';
+        const btnColor = (isDowngrade && isBadSig) ? 'red' : isDowngrade ? 'orange' : isBadSig ? 'red' : undefined;
+        return (
+          <Modal
+            opened={confirmOpen}
+            onClose={() => { setConfirmOpen(false); setPendingInstall(null); }}
+            zIndex={300}
+            title={
+              <Group gap="xs" align="center">
+                {isBadSig
+                  ? <ShieldAlert size={18} color="var(--mantine-color-red-6)" />
+                  : isDowngrade
+                    ? <AlertTriangle size={18} color="var(--mantine-color-orange-6)" />
+                    : <Download size={18} />}
+                <Text fw={600}>Confirm {actionLabel}</Text>
+              </Group>
+            }
+            size="sm"
+          >
+            <Stack gap="md">
+              <Text size="sm">
+                You are about to {actionLabel.toLowerCase()} <b>{plugin.name}</b>{' '}
+                {isUpdate || isDowngrade
+                  ? <>from <b>v{plugin.installed_version}</b> to <b>v{pendingInstall?.version}</b></>
+                  : <><b>v{pendingInstall?.version}</b></>}
+                {plugin.repo_name ? <> from <b>{plugin.repo_name}</b></> : ''}.
+              </Text>
+              <Text size="sm" c="dimmed">
+                Plugins run server-side code with full access to your Dispatcharr instance and its
+                data. Only install plugins from developers you trust. Malicious plugins could read
+                or modify data, call internal APIs, or perform unwanted actions.
+              </Text>
+              {isDowngrade && (
+                <Text size="sm" c="orange">
+                  <b>Warning:</b> Downgrading may cause issues with saved settings or data.
+                </Text>
+              )}
+              {isBadSig && (
+                <Text size="sm" c="red">
+                  <b>Warning:</b> This repository has an invalid or unverified signature.
+                  Installing plugins from unverified sources may be risky.
+                </Text>
+              )}
+              {plugin.install_status === 'unmanaged' && (
+                <Text size="sm" c="orange">
+                  <b>Note:</b> This plugin was installed manually. Installing from this repo
+                  will bring it under repo management and enable future update checks.
+                </Text>
+              )}
+              {plugin.install_status === 'different_repo' && (
+                <Text size="sm" c="orange">
+                  <b>Note:</b> This plugin is currently managed
+                  by <b>{plugin.installed_source_repo_name || 'another repo'}</b>.
+                  Installing will transfer management to this repo.
+                </Text>
+              )}
+              <Text size="sm" fw={500}>Are you sure you want to proceed?</Text>
+              <Group justify="flex-end" gap="xs">
+                <Button
+                  size="xs"
+                  variant="default"
+                  onClick={() => { setConfirmOpen(false); setPendingInstall(null); }}
+                >
+                  Cancel
+                </Button>
+                <Button
+                  size="xs"
+                  color={btnColor}
+                  onClick={confirmAndInstall}
+                >
+                  {actionLabel}
+                </Button>
+              </Group>
+            </Stack>
+          </Modal>
+        );
+      })()}
+
+      {/* Uninstall confirmation modal */}
+      <Modal
+        opened={uninstallConfirmOpen}
+        onClose={() => setUninstallConfirmOpen(false)}
+        zIndex={300}
+        title={
+          <Group gap="xs" align="center">
+            <Trash2 size={18} color="var(--mantine-color-red-6)" />
+            <Text fw={600}>Uninstall Plugin</Text>
+          </Group>
+        }
+        size="sm"
+      >
+        <Stack gap="md">
+          <Text size="sm">
+            Are you sure you want to uninstall <b>{plugin.name}</b>? This will
+            remove the plugin files and all associated settings.
+          </Text>
+          <Group justify="flex-end" gap="xs">
+            <Button
+              size="xs"
+              variant="default"
+              onClick={() => setUninstallConfirmOpen(false)}
+            >
+              Cancel
+            </Button>
+            <Button
+              size="xs"
+              color="red"
+              loading={uninstalling}
+              onClick={handleUninstall}
+            >
+              Uninstall
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+
+      {/* Post-uninstall notice */}
+      <Modal
+        opened={uninstallDoneOpen}
+        onClose={() => setUninstallDoneOpen(false)}
+        zIndex={300}
+        title={
+          <Group gap="xs" align="center">
+            <Trash2 size={18} color="var(--mantine-color-green-6)" />
+            <Text fw={600}>Plugin Uninstalled</Text>
+          </Group>
+        }
+        size="sm"
+      >
+        <Stack gap="md">
+          <Text size="sm">
+            <b>{plugin.name}</b> has been uninstalled successfully.
+          </Text>
+          <Text size="sm">
+            A restart of Dispatcharr may be required to fully unload the plugin.
+          </Text>
+          <Group justify="flex-end">
+            <Button size="xs" variant="default" onClick={() => setUninstallDoneOpen(false)}>
+              Done
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+
+      {/* Post-install restart prompt */}
+      <Modal
+        opened={restartPromptOpen}
+        onClose={() => setRestartPromptOpen(false)}
+        zIndex={300}
+        title={
+          <Group gap="xs" align="center">
+            <RotateCcw size={18} color="var(--mantine-color-blue-6)" />
+            <Text fw={600}>
+              Plugin {installAction === 'installed' ? 'Installed' : installAction === 'downgraded' ? 'Downgraded' : 'Updated'}
+            </Text>
+          </Group>
+        }
+        size="sm"
+      >
+        <Stack gap="md">
+          <Text size="sm">
+            <b>{plugin.name}</b> has been {installAction || 'installed'} successfully.
+          </Text>
+          <Text size="sm">
+            A restart of Dispatcharr may be required for the plugin to be fully loaded.
+          </Text>
+          {pluginIsDisabled && (
+            <>
+              <Text size="xs" c="dimmed">
+                This plugin is currently disabled. You can enable it now or at any time from My Plugins.
+              </Text>
+              <Group justify="space-between" align="center">
+                <Text size="sm">Enable plugin</Text>
+                <Switch
+                  size="sm"
+                  checked={enableNow}
+                  onChange={(e) => setEnableNow(e.currentTarget.checked)}
+                />
+              </Group>
+            </>
+          )}
+          <Group justify="flex-end" gap="xs">
+            <Button
+              size="xs"
+              variant="default"
+              loading={enabling}
+              onClick={() => handleDismissRestart(false)}
+            >
+              Done
+            </Button>
+            {!onMyPlugins && (
+              <Button
+                size="xs"
+                loading={enabling}
+                onClick={() => handleDismissRestart(true)}
+              >
+                Go to My Plugins
+              </Button>
+            )}
+          </Group>
+        </Stack>
+      </Modal>
+    </Card>
+  );
+};
+
+export default AvailablePluginCard;
diff --git a/frontend/src/components/cards/PluginCard.jsx b/frontend/src/components/cards/PluginCard.jsx
index 81d1148b..c8e1c1cd 100644
--- a/frontend/src/components/cards/PluginCard.jsx
+++ b/frontend/src/components/cards/PluginCard.jsx
@@ -1,24 +1,30 @@
-import React, { useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { showNotification } from '../../utils/notificationUtils.js';
 import { Field } from '../Field.jsx';
 import {
-  ActionIcon,
   Anchor,
-  Box,
   Avatar,
+  Badge,
+  Box,
   Button,
   Card,
-  Divider,
   Group,
+  Loader,
+  Modal,
   Stack,
   Switch,
+  Tabs,
   Text,
-  UnstyledButton,
-  Badge,
+  Tooltip,
 } from '@mantine/core';
-import { ChevronDown, ChevronRight, Trash2 } from 'lucide-react';
+import { Ban, Check, FlaskConical, Info, RefreshCw, Settings, Trash2, Zap } from 'lucide-react';
 import { getConfirmationDetails } from '../../utils/cards/PluginCardUtils.js';
 import { SUBSCRIPTION_EVENTS } from '../../constants.js';
+import useSettingsStore from '../../store/settings.jsx';
+import { usePluginStore } from '../../store/plugins.jsx';
+import API from '../../api';
+import PluginDetailPanel from '../PluginDetailPanel.jsx';
+import { compareVersions } from '../pluginUtils.js';
 
 const PluginFieldList = ({ plugin, settings, updateField }) => {
   return plugin.fields.map((f) => (
@@ -42,19 +48,19 @@ const PluginActionList = ({
     return (
       <Group key={action.id} justify="space-between">
         <div>
-          <Text>{action.label}</Text>
+          <Text size="sm">{action.label}</Text>
           {action.description && (
-            <Text size="sm" c="dimmed">
+            <Text size="xs" c="dimmed">
               {action.description}
             </Text>
           )}
           {events.length > 0 && (
             <>
-              <Text size="xs" style={{ paddingTop: 10 }}>
+              <Text size="xs" style={{ paddingTop: 6 }}>
                 Event Triggers
               </Text>
               {events.map((event) => (
-                <Badge key={`${action.id}:${event}`} size="sm" variant="light" color="green">
+                <Badge key={`${action.id}:${event}`} size="xs" variant="light" color="green">
                   {SUBSCRIPTION_EVENTS[event] || event}
                 </Badge>
               ))}
@@ -82,17 +88,17 @@ const PluginActionStatus = ({ running, lastResult }) => {
   return (
     <>
       {running && (
-        <Text size="sm" c="dimmed">
+        <Text size="xs" c="dimmed">
           Running action… please wait
         </Text>
       )}
       {!running && lastResult?.file && (
-        <Text size="sm" c="dimmed">
+        <Text size="xs" c="dimmed">
           Output: {lastResult.file}
         </Text>
       )}
       {!running && lastResult?.error && (
-        <Text size="sm" c="red">
+        <Text size="xs" c="red">
           Error: {String(lastResult.error)}
         </Text>
       )}
@@ -109,27 +115,104 @@ const PluginCard = ({
   onRequestDelete,
   onRequestConfirm,
 }) => {
+  const appVersion = useSettingsStore((s) => s.version?.version || '');
   const [settings, setSettings] = useState(plugin.settings || {});
   const [saving, setSaving] = useState(false);
   const [runningActionId, setRunningActionId] = useState(null);
   const [enabled, setEnabled] = useState(!!plugin.enabled);
   const [lastResult, setLastResult] = useState(null);
-  const [expanded, setExpanded] = useState(!!plugin.enabled);
+  const [modalOpen, setModalOpen] = useState(false);
+  const [modalTab, setModalTab] = useState('settings');
+  const [detail, setDetail] = useState(null);
+  const [detailLoading, setDetailLoading] = useState(false);
+  const [selectedVersion, setSelectedVersion] = useState(null);
+  const [installing, setInstalling] = useState(false);
+  const [uninstalling] = useState(false);
 
-  // Keep local enabled state in sync with props (e.g., after import + enable)
+  const descContainerRef = useRef(null);
+  const [descLines, setDescLines] = useState(3);
+  useEffect(() => {
+    const el = descContainerRef.current;
+    if (!el) return;
+    const obs = new ResizeObserver(() => {
+      const lh = parseFloat(getComputedStyle(el).lineHeight) || 22;
+      setDescLines(Math.max(1, Math.min(3, Math.floor(el.clientHeight / lh))));
+    });
+    obs.observe(el);
+    return () => obs.disconnect();
+  }, []);
+  const installPlugin = usePluginStore((s) => s.installPlugin);
+
+  // Keep local enabled state in sync with props
   React.useEffect(() => {
     setEnabled(!!plugin.enabled);
   }, [plugin.enabled]);
-  React.useEffect(() => {
-    if (!plugin.enabled) {
-      setExpanded(false);
-    }
-  }, [plugin.enabled]);
+
   // Sync settings if plugin changes identity
   React.useEffect(() => {
     setSettings(plugin.settings || {});
   }, [plugin.key, plugin.settings]);
 
+  const hasActions = !plugin.missing && enabled && plugin.actions?.length > 0;
+  const isManaged = !!(plugin.slug && plugin.source_repo);
+
+  const fetchDetail = async () => {
+    if (detailLoading || !isManaged) return;
+    // Find the available plugin entry for manifest_url
+    let avail = usePluginStore.getState().availablePlugins.find(
+      (ap) => ap.slug === plugin.slug && ap.repo_id === plugin.source_repo
+    );
+    if (!avail) {
+      setDetailLoading(true);
+      try {
+        await usePluginStore.getState().fetchAvailablePlugins();
+        avail = usePluginStore.getState().availablePlugins.find(
+          (ap) => ap.slug === plugin.slug && ap.repo_id === plugin.source_repo
+        );
+      } catch { /* ignore */ }
+    }
+    if (!avail) { setDetailLoading(false); return; }
+    if (!avail.manifest_url) {
+      // Synthesize from top-level entry
+      setDetail({
+        manifest: {
+          description: avail.description,
+          author: avail.author,
+          license: avail.license,
+          repo_url: avail.repo_url,
+          discord_thread: avail.discord_thread,
+          registry_url: avail.registry_url,
+          versions: avail.latest_version ? [{
+            version: avail.latest_version,
+            url: avail.latest_url,
+            checksum_sha256: avail.latest_sha256,
+            min_dispatcharr_version: avail.min_dispatcharr_version,
+            max_dispatcharr_version: avail.max_dispatcharr_version,
+            build_timestamp: avail.last_updated,
+          }] : [],
+          latest: avail.latest_version ? { version: avail.latest_version } : null,
+        },
+        signature_verified: avail.signature_verified ?? null,
+        _avail: avail,
+      });
+      if (avail.latest_version) setSelectedVersion(avail.latest_version);
+      setDetailLoading(false);
+      return;
+    }
+    setDetailLoading(true);
+    try {
+      const result = await API.getPluginDetailManifest(avail.repo_id, avail.manifest_url);
+      if (result) {
+        setDetail({ ...result, _avail: avail });
+        if (result.manifest?.versions?.length) {
+          setSelectedVersion(result.manifest.versions[0].version);
+        }
+      }
+    } finally {
+      setDetailLoading(false);
+    }
+  };
+
   const updateField = (id, val) => {
     setSettings((prev) => ({ ...prev, [id]: val }));
   };
@@ -170,7 +253,6 @@ const PluginCard = ({
       if (next && !plugin.ever_enabled && onRequireTrust) {
         const ok = await onRequireTrust(plugin);
         if (!ok) {
-          // Revert
           setEnabled(false);
           return;
         }
@@ -183,7 +265,7 @@ const PluginCard = ({
           setEnabled(previous);
           return;
         }
-      } catch (e) {
+      } catch {
         setEnabled(previous);
       }
     };
@@ -191,17 +273,12 @@ const PluginCard = ({
 
   const handlePluginRun = async (a) => {
     try {
-      // Determine if confirmation is required from action metadata or fallback field
       const { requireConfirm, confirmTitle, confirmMessage } =
         getConfirmationDetails(a, plugin, settings);
 
       if (requireConfirm) {
         const confirmed = await onRequestConfirm(confirmTitle, confirmMessage);
-
-        if (!confirmed) {
-          // User canceled, abort the action
-          return;
-        }
+        if (!confirmed) return;
       }
 
       setRunningActionId(a.id);
@@ -210,7 +287,7 @@ const PluginCard = ({
       // Save settings before running to ensure backend uses latest values
       try {
         await onSaveSettings(plugin.key, settings);
-      } catch (e) {
+      } catch {
         /* ignore, run anyway */
       }
       const resp = await onRunAction(plugin.key, a.id);
@@ -236,149 +313,318 @@ const PluginCard = ({
     }
   };
 
-  const toggleExpanded = () => {
-    setExpanded((prev) => !prev);
+  const hasFields = !missing && enabled && plugin.fields?.length > 0;
+
+  const openModal = (tab) => {
+    setModalTab(tab);
+    setModalOpen(true);
+    if (tab === 'details') fetchDetail();
+  };
+
+  const handleDetailInstall = async (params) => {
+    const selVer = params.version;
+    const isDown = plugin.version && compareVersions(selVer, plugin.version) < 0;
+    const action = isDown ? 'downgrade' : 'update';
+    const confirmed = await onRequestConfirm(
+      `${isDown ? 'Downgrade' : 'Update'} ${plugin.name}?`,
+      `${isDown ? 'Downgrade' : 'Update'} from v${plugin.version} to v${selVer}?`
+    );
+    if (!confirmed) return;
+    setInstalling(true);
+    try {
+      const result = await installPlugin(params);
+      if (result?.success) {
+        showNotification({
+          title: plugin.name,
+          message: `Successfully ${action === 'downgrade' ? 'downgraded' : 'updated'} to v${selVer}`,
+          color: 'green',
+        });
+        usePluginStore.getState().invalidatePlugins();
+      }
+    } finally {
+      setInstalling(false);
+    }
+  };
+
+  const handleDetailUninstall = () => {
+    onRequestDelete && onRequestDelete(plugin);
   };
 
   return (
-    <Card
-      shadow="sm"
-      radius="md"
-      withBorder
-      style={{ opacity: !missing && enabled ? 1 : 0.6 }}
-    >
-      <Group justify="space-between" mb="xs" align="flex-start" wrap="nowrap">
-        <Group
-          gap="sm"
-          align="flex-start"
-          wrap="nowrap"
-          style={{ minWidth: 0, flex: 1 }}
-        >
-          <ActionIcon
-            variant="subtle"
-            size="sm"
-            onClick={toggleExpanded}
-            title={expanded ? 'Collapse settings' : 'Expand settings'}
-          >
-            {expanded ? <ChevronDown size={16} /> : <ChevronRight size={16} />}
-          </ActionIcon>
-          {plugin.logo_url && (
+    <div style={{ position: 'relative' }}>
+      <Card
+        shadow="sm"
+        radius="md"
+        withBorder
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          height: '100%',
+          minHeight: 220,
+          opacity: !missing && enabled ? 1 : 0.6,
+        }}
+      >
+        {/* Header: avatar, name/author, badges, toggle */}
+        <Group justify="space-between" mb="xs" align="flex-start" wrap="nowrap">
+          <Group gap="sm" align="flex-start" wrap="nowrap" style={{ minWidth: 0, flex: 1 }}>
             <Avatar
               src={plugin.logo_url}
               radius="sm"
-              size={44}
+              size={48}
               alt={`${plugin.name} logo`}
-            />
-          )}
-          <UnstyledButton
-            onClick={toggleExpanded}
-            style={{ minWidth: 0, flex: 1, textAlign: 'left' }}
-          >
+              onClick={isManaged ? () => openModal('details') : undefined}
+              style={isManaged ? { cursor: 'pointer' } : undefined}
+            >
+              {plugin.name?.[0]?.toUpperCase()}
+            </Avatar>
             <Box style={{ minWidth: 0, flex: 1 }}>
-              <Text fw={600}>{plugin.name}</Text>
-              <Text size="sm" c="dimmed">
-                {plugin.description}
+              <Text
+                fw={600}
+                lineClamp={1}
+                onClick={isManaged ? () => openModal('details') : undefined}
+                style={isManaged ? { cursor: 'pointer' } : undefined}
+              >
+                {plugin.name}
               </Text>
-              {(plugin.author || plugin.help_url) && (
-                <Group gap="xs" mt={2}>
-                  {plugin.author && (
-                    <Text size="xs" c="dimmed">
-                      By {plugin.author}
-                    </Text>
-                  )}
-                  {plugin.help_url && (
-                    <Anchor
-                      href={plugin.help_url}
-                      target="_blank"
-                      rel="noreferrer"
-                      size="xs"
-                      onClick={(e) => e.stopPropagation()}
-                    >
-                      Docs
-                    </Anchor>
-                  )}
-                </Group>
-              )}
+              <Group gap={6} align="center" wrap="nowrap">
+                {plugin.author && (
+                  <Text
+                    size="xs"
+                    c="dimmed"
+                    onClick={isManaged ? () => openModal('details') : undefined}
+                    style={isManaged ? { cursor: 'pointer' } : undefined}
+                  >
+                    by {plugin.author}
+                  </Text>
+                )}
+                {plugin.help_url && (
+                  <Anchor
+                    href={plugin.help_url}
+                    target="_blank"
+                    rel="noreferrer"
+                    size="xs"
+                  >
+                    Docs
+                  </Anchor>
+                )}
+              </Group>
             </Box>
-          </UnstyledButton>
+          </Group>
+          <Group gap={6} wrap="nowrap" align="center" style={{ flexShrink: 0 }}>
+            {plugin.is_managed && plugin.installed_version_is_prerelease ? (
+              <Tooltip label={plugin.deprecated ? 'Prerelease installed (deprecated), click for details' : 'Prerelease installed, click for details'}>
+                <Badge
+                  size="xs"
+                  variant="light"
+                  color={plugin.deprecated ? 'red' : 'violet'}
+                  leftSection={detailLoading ? <Loader size={8} /> : plugin.deprecated ? <Ban size={8} /> : <FlaskConical size={8} />}
+                  style={{ cursor: 'pointer' }}
+                  onClick={() => openModal('details')}
+                >
+                  {plugin.deprecated ? 'Prerelease · Deprecated' : 'Prerelease'}
+                </Badge>
+              </Tooltip>
+            ) : plugin.update_available ? (
+              <Tooltip label={plugin.deprecated ? `Update available: v${plugin.latest_version} (deprecated)` : `Update available: v${plugin.latest_version}`}>
+                <Badge
+                  size="xs"
+                  variant="light"
+                  color={plugin.deprecated ? 'red' : 'yellow'}
+                  leftSection={detailLoading ? <Loader size={8} /> : plugin.deprecated ? <Ban size={8} /> : <RefreshCw size={8} />}
+                  style={{ cursor: 'pointer' }}
+                  onClick={() => openModal('details')}
+                >
+                  {plugin.deprecated ? 'Update · Deprecated' : 'Update'}
+                </Badge>
+              </Tooltip>
+            ) : plugin.is_managed ? (
+              <Tooltip label={plugin.deprecated ? 'Installed (deprecated), click for details' : 'View plugin details'}>
+                <Badge
+                  size="xs"
+                  variant="light"
+                  color={plugin.deprecated ? 'orange' : 'green'}
+                  leftSection={detailLoading ? <Loader size={8} /> : plugin.deprecated ? <Ban size={8} /> : <Check size={8} />}
+                  style={{ cursor: 'pointer' }}
+                  onClick={() => openModal('details')}
+                >
+                  {plugin.deprecated ? 'Deprecated' : 'Up to Date'}
+                </Badge>
+              </Tooltip>
+            ) : (
+              <Badge size="xs" variant="light" color="gray">
+                Unmanaged
+              </Badge>
+            )}
+            <Switch
+              checked={!missing && enabled}
+              onChange={handleEnableChange()}
+              size="xs"
+              onLabel="On"
+              offLabel="Off"
+              disabled={missing}
+            />
+          </Group>
         </Group>
-        <Group gap="xs" align="center" wrap="nowrap" style={{ flexShrink: 0 }}>
-          <ActionIcon
-            variant="subtle"
+
+        {/* Description — flex: 1 pushes bottom content down */}
+        <div ref={descContainerRef} style={{ flex: 1, minHeight: 0, overflow: 'hidden' }}>
+          <Text size="sm" c="dimmed" lineClamp={descLines} mb="xs">
+            {plugin.description}
+          </Text>
+        </div>
+
+        {/* Status warnings */}
+        {(missing || plugin.legacy) && (
+          <Text size="xs" c={missing ? 'red' : 'yellow'} mt="xs">
+            {missing
+              ? 'Missing plugin files. Re-import or delete this entry.'
+              : 'Please update or ask the developer to add plugin.json.'}
+          </Text>
+        )}
+
+        {/* Bottom metadata pills */}
+        <Stack gap={4} style={{ flexShrink: 0 }}>
+          <Group gap="xs" wrap="wrap">
+            <Badge size="xs" variant="default">
+              <span style={{ opacity: 0.5, marginRight: 4 }}>VERSION</span>
+              v{plugin.version || '1.0.0'}
+            </Badge>
+            {plugin.is_managed && plugin.source_repo_name && (
+              <Badge size="xs" variant="default">
+                <span style={{ opacity: 0.5, marginRight: 4 }}>REPO</span>
+                {plugin.source_repo_name}
+              </Badge>
+            )}
+          </Group>
+        </Stack>
+
+        {/* Bottom button row */}
+        <Group justify="flex-end" mt="sm" gap="xs">
+          {hasFields && (
+            <Button
+              size="xs"
+              variant="default"
+              leftSection={<Settings size={14} />}
+              onClick={() => openModal('settings')}
+            >
+              Settings
+            </Button>
+          )}
+          {hasActions && (
+            <Button
+              size="xs"
+              variant="light"
+              color="blue"
+              leftSection={<Zap size={14} />}
+              onClick={() => openModal('actions')}
+            >
+              Actions
+            </Button>
+          )}
+          <Button
+            size="xs"
+            variant="light"
             color="red"
-            title="Delete plugin"
+            leftSection={<Trash2 size={14} />}
             onClick={() => onRequestDelete && onRequestDelete(plugin)}
           >
-            <Trash2 size={16} />
-          </ActionIcon>
-          <Text size="xs" c="dimmed">
-            v{plugin.version || '1.0.0'}
-          </Text>
-          <Switch
-            checked={!missing && enabled}
-            onChange={handleEnableChange()}
-            size="xs"
-            onLabel="On"
-            offLabel="Off"
-            disabled={missing}
-          />
+            Uninstall
+          </Button>
         </Group>
-      </Group>
+      </Card>
 
-      {(missing || plugin.legacy) && (
-        <Text size="sm" c={missing ? 'red' : 'yellow'}>
-          {missing
-            ? 'Missing plugin files. Re-import or delete this entry.'
-            : 'Please update or ask the developer to add plugin.json.'}
-        </Text>
-      )}
+      {/* Settings & Actions Modal */}
+      <Modal
+        opened={modalOpen}
+        onClose={() => setModalOpen(false)}
+        title={
+          <Group gap="xs" align="center">
+            <Avatar src={plugin.logo_url} radius="sm" size={28} alt={`${plugin.name} logo`}>
+              {plugin.name?.[0]?.toUpperCase()}
+            </Avatar>
+            <Text fw={600}>{plugin.name}</Text>
+          </Group>
+        }
+        size="lg"
+      >
+        <Tabs value={modalTab} onChange={(tab) => { setModalTab(tab); if (tab === 'details') fetchDetail(); }}>
+          <Tabs.List>
+            {isManaged && <Tabs.Tab value="details" leftSection={<Info size={14} />}>Details</Tabs.Tab>}
+            {hasFields && <Tabs.Tab value="settings" leftSection={<Settings size={14} />}>Settings</Tabs.Tab>}
+            {hasActions && <Tabs.Tab value="actions" leftSection={<Zap size={14} />}>Actions</Tabs.Tab>}
+          </Tabs.List>
 
-      {expanded &&
-        !missing &&
-        enabled &&
-        plugin.fields &&
-        plugin.fields.length > 0 && (
-          <Stack gap="xs" mt="sm">
-            <PluginFieldList
-              plugin={plugin}
-              settings={settings}
-              updateField={updateField}
-            />
-            <Group>
-              <Button
-                loading={saving}
-                onClick={save}
-                variant="default"
-                size="xs"
-              >
-                Save Settings
-              </Button>
-            </Group>
-          </Stack>
-        )}
-
-      {expanded &&
-        !missing &&
-        enabled &&
-        plugin.actions &&
-        plugin.actions.length > 0 && (
-          <>
-            <Divider my="sm" />
-            <Stack gap="xs">
-              <PluginActionList
-                plugin={plugin}
-                enabled={enabled}
-                runningActionId={runningActionId}
-                handlePluginRun={handlePluginRun}
+          {isManaged && (
+            <Tabs.Panel value="details" pt="md">
+              <PluginDetailPanel
+                detail={detail}
+                detailLoading={detailLoading}
+                selectedVersion={selectedVersion}
+                onVersionChange={setSelectedVersion}
+                installedVersion={plugin.version}
+                installedVersionIsPrerelease={!!plugin.installed_version_is_prerelease}
+                appVersion={appVersion}
+                installing={installing}
+                uninstalling={uninstalling}
+                onInstall={handleDetailInstall}
+                onUninstall={handleDetailUninstall}
+                installStatus="installed"
+                repoId={plugin.source_repo}
+                slug={plugin.slug}
               />
-              <PluginActionStatus
-                running={!!runningActionId}
-                lastResult={lastResult}
-              />
-            </Stack>
-          </>
-        )}
-    </Card>
+            </Tabs.Panel>
+          )}
+
+          {hasFields && (
+            <Tabs.Panel value="settings" pt="md">
+              <Stack gap="md">
+                <PluginFieldList
+                  plugin={plugin}
+                  settings={settings}
+                  updateField={updateField}
+                />
+                <Group justify="flex-end">
+                  <Button
+                    variant="default"
+                    size="xs"
+                    onClick={() => setModalOpen(false)}
+                  >
+                    Cancel
+                  </Button>
+                  <Button
+                    loading={saving}
+                    onClick={async () => {
+                      await save();
+                      setModalOpen(false);
+                    }}
+                    size="xs"
+                  >
+                    Save
+                  </Button>
+                </Group>
+              </Stack>
+            </Tabs.Panel>
+          )}
+
+          {hasActions && (
+            <Tabs.Panel value="actions" pt="md">
+              <Stack gap="sm">
+                <PluginActionList
+                  plugin={plugin}
+                  enabled={enabled}
+                  runningActionId={runningActionId}
+                  handlePluginRun={handlePluginRun}
+                />
+                <PluginActionStatus
+                  running={!!runningActionId}
+                  lastResult={lastResult}
+                />
+              </Stack>
+            </Tabs.Panel>
+          )}
+        </Tabs>
+      </Modal>
+    </div>
   );
 };
 
diff --git a/frontend/src/components/cards/__tests__/PluginCard.test.jsx b/frontend/src/components/cards/__tests__/PluginCard.test.jsx
index 22b29c88..89e4c1e5 100644
--- a/frontend/src/components/cards/__tests__/PluginCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/PluginCard.test.jsx
@@ -54,6 +54,32 @@ vi.mock('@mantine/core', async () => {
     Text: ({ children, ...props }) => <span {...props}>{children}</span>,
     UnstyledButton: ({ children, ...props }) => <button {...props}>{children}</button>,
     Badge: ({ children, ...props }) => <span {...props}>{children}</span>,
+    Loader: ({ size }) => <span data-testid="loader" data-size={size} />,
+    Modal: ({ opened, onClose, title, children }) =>
+      opened ? (
+        <div data-testid="modal">
+          <div data-testid="modal-title">{title}</div>
+          <button onClick={onClose}>Close Modal</button>
+          {children}
+        </div>
+      ) : null,
+    Tabs: Object.assign(
+      ({ children, value, onChange }) => (
+        <div data-testid="tabs" data-value={value}>{children}</div>
+      ),
+      {
+        List: ({ children }) => <div>{children}</div>,
+        Tab: ({ children, value, leftSection }) => (
+          <button data-value={value}>{leftSection}{children}</button>
+        ),
+        Panel: ({ children, value }) => (
+          <div data-testid={`tab-panel-${value}`}>{children}</div>
+        ),
+      }
+    ),
+    Tooltip: ({ children, label }) => (
+      <div title={label}>{children}</div>
+    ),
   };
 });
 
@@ -112,7 +138,7 @@ describe('PluginCard', () => {
       expect(screen.getByText('Test Plugin')).toBeInTheDocument();
       expect(screen.getByText('A test plugin')).toBeInTheDocument();
       expect(screen.getByText('v1.0.0')).toBeInTheDocument();
-      expect(screen.getByText('By Test Author')).toBeInTheDocument();
+      expect(screen.getByText('by Test Author')).toBeInTheDocument();
     });
 
     it('should render plugin logo when logo_url is provided', () => {
@@ -166,43 +192,28 @@ describe('PluginCard', () => {
     });
   });
 
-  describe('Expansion/Collapse', () => {
-    it('should toggle expanded state when clicking chevron button', async () => {
-      render(<PluginCard plugin={mockPlugin} />);
-
-      await waitFor(() => {
-        fireEvent.click(screen.getByTitle('Collapse settings'));
-        expect(screen.queryByText('Test Action')).not.toBeInTheDocument();
-      });
-
-      await waitFor(() => {
-        fireEvent.click(screen.getByTitle('Expand settings'));
-      });
-
-      expect(await screen.findByText('Test Action')).toBeInTheDocument();
-    });
-
-    it('should toggle expanded state when clicking plugin name', () => {
+  describe('Modal Behavior', () => {
+    it('should open settings modal when Settings button is clicked', () => {
       render(<PluginCard {...defaultProps} />);
 
-      expect(screen.getByText('Test Action')).toBeInTheDocument();
-
-      const nameButton = screen.getByText('Test Plugin');
-
-      fireEvent.click(nameButton);
-      expect(screen.queryByText('Test Action')).not.toBeInTheDocument();
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+      fireEvent.click(screen.getByText('Settings'));
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
     });
 
-    it('should collapse when plugin is disabled', () => {
-      const { rerender } = render(<PluginCard {...defaultProps} />);
+    it('should open actions modal when Actions button is clicked', () => {
+      render(<PluginCard {...defaultProps} />);
 
-      const expandButton = screen.getAllByRole('button')[0];
-      fireEvent.click(expandButton);
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument();
+      fireEvent.click(screen.getByText('Actions'));
+      expect(screen.getByTestId('modal')).toBeInTheDocument();
+    });
 
+    it('should not show Actions button when plugin is disabled', () => {
       const disabledPlugin = { ...mockPlugin, enabled: false };
-      rerender(<PluginCard {...defaultProps} plugin={disabledPlugin} />);
+      render(<PluginCard {...defaultProps} plugin={disabledPlugin} />);
 
-      expect(screen.queryByText('Test Action')).not.toBeInTheDocument();
+      expect(screen.queryByText('Actions')).not.toBeInTheDocument();
     });
   });
 
@@ -278,7 +289,8 @@ describe('PluginCard', () => {
       defaultProps.onSaveSettings.mockResolvedValue(true);
       render(<PluginCard {...defaultProps} />);
 
-      const saveButton = screen.getByText('Save Settings');
+      fireEvent.click(screen.getByText('Settings'));
+      const saveButton = screen.getByText('Save');
       fireEvent.click(saveButton);
 
       await waitFor(() => {
@@ -298,7 +310,8 @@ describe('PluginCard', () => {
       defaultProps.onSaveSettings.mockResolvedValue(false);
       render(<PluginCard {...defaultProps} />);
 
-      const saveButton = screen.getByText('Save Settings');
+      fireEvent.click(screen.getByText('Settings'));
+      const saveButton = screen.getByText('Save');
       fireEvent.click(saveButton);
 
       await waitFor(() => {
@@ -315,7 +328,8 @@ describe('PluginCard', () => {
       defaultProps.onSaveSettings.mockRejectedValue(error);
       render(<PluginCard {...defaultProps} />);
 
-      const saveButton = screen.getByText('Save Settings');
+      fireEvent.click(screen.getByText('Settings'));
+      const saveButton = screen.getByText('Save');
       fireEvent.click(saveButton);
 
       await waitFor(() => {
@@ -332,6 +346,7 @@ describe('PluginCard', () => {
     it('should render action buttons', () => {
       render(<PluginCard {...defaultProps} />);
 
+      fireEvent.click(screen.getByText('Actions'));
       expect(screen.getByText('Run Action')).toBeInTheDocument();
     });
 
@@ -344,6 +359,7 @@ describe('PluginCard', () => {
 
       render(<PluginCard {...defaultProps} />);
 
+      fireEvent.click(screen.getByText('Actions'));
       const actionButton = screen.getByText('Run Action');
       fireEvent.click(actionButton);
 
@@ -369,6 +385,7 @@ describe('PluginCard', () => {
 
       render(<PluginCard {...defaultProps} />);
 
+      fireEvent.click(screen.getByText('Actions'));
       const actionButton = screen.getByText('Run Action');
       fireEvent.click(actionButton);
 
@@ -391,6 +408,7 @@ describe('PluginCard', () => {
 
       render(<PluginCard {...defaultProps} />);
 
+      fireEvent.click(screen.getByText('Actions'));
       const actionButton = screen.getByText('Run Action');
       fireEvent.click(actionButton);
 
@@ -412,6 +430,7 @@ describe('PluginCard', () => {
 
       render(<PluginCard {...errorProps} />);
 
+      fireEvent.click(screen.getByText('Actions'));
       const actionButton = screen.getByText('Run Action');
       fireEvent.click(actionButton);
 
@@ -439,6 +458,7 @@ describe('PluginCard', () => {
 
       render(<PluginCard {...defaultProps} plugin={pluginWithEvents} />);
 
+      fireEvent.click(screen.getByText('Actions'));
       expect(screen.getByText('Event Triggers')).toBeInTheDocument();
     });
   });
@@ -447,7 +467,7 @@ describe('PluginCard', () => {
     it('should call onRequestDelete when delete button is clicked', () => {
       render(<PluginCard {...defaultProps} />);
 
-      const deleteButton = screen.getByTitle('Delete plugin');
+      const deleteButton = screen.getByText('Uninstall');
       fireEvent.click(deleteButton);
 
       expect(defaultProps.onRequestDelete).toHaveBeenCalledWith(mockPlugin);
@@ -476,8 +496,8 @@ describe('PluginCard', () => {
       };
       rerender(<PluginCard {...defaultProps} plugin={newPlugin} />);
 
-      // Settings should be updated internally
-      expect(screen.getByText('Save Settings')).toBeInTheDocument();
+      // Settings button should still be present after key change
+      expect(screen.getByText('Settings')).toBeInTheDocument();
     });
   });
 });
\ No newline at end of file
diff --git a/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx b/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx
index 2f006244..fd1b4164 100644
--- a/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx
@@ -168,6 +168,9 @@ vi.mock('lucide-react', () => ({
   SquareX: () => <svg data-testid="icon-square-x" />,
   Timer: () => <svg data-testid="icon-timer" />,
   Users: () => <svg data-testid="icon-users" />,
+  Video: () => <svg data-testid="icon-video" />,
+  Package: () => <svg data-testid="icon-package" />,
+  Download: () => <svg data-testid="icon-download" />,
 }));
 
 // ── Imports after mocks ───────────────────────────────────────────────────────
diff --git a/frontend/src/components/pluginUtils.js b/frontend/src/components/pluginUtils.js
new file mode 100644
index 00000000..3b867c01
--- /dev/null
+++ b/frontend/src/components/pluginUtils.js
@@ -0,0 +1,25 @@
+/**
+ * Compare two semver-like version strings.
+ * Returns negative if a < b, 0 if equal, positive if a > b.
+ *
+ * If either version is a prerelease (any dot-segment contains non-digit
+ * characters), numeric ordering is meaningless. Fall back to exact string
+ * equality: 0 if identical, non-zero otherwise.
+ */
+export function compareVersions(a, b) {
+  if (!a || !b) return 0;
+  const normalize = (v) => v.replace(/^v/, '');
+  const na = normalize(a);
+  const nb = normalize(b);
+  const isPrerelease = (v) => v.split('.').some((p) => !/^\d+$/.test(p));
+  if (isPrerelease(na) || isPrerelease(nb)) {
+    return na === nb ? 0 : 1;
+  }
+  const pa = na.split('.').map(Number);
+  const pb = nb.split('.').map(Number);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const diff = (pa[i] || 0) - (pb[i] || 0);
+    if (diff !== 0) return diff;
+  }
+  return 0;
+}
diff --git a/frontend/src/config/navigation.js b/frontend/src/config/navigation.js
index 093b1927..fd2b9a78 100644
--- a/frontend/src/config/navigation.js
+++ b/frontend/src/config/navigation.js
@@ -7,6 +7,8 @@ import {
   ChartLine,
   Video,
   PlugZap,
+  Package,
+  Download,
   User,
   FileImage,
   Webhook,
@@ -63,8 +65,11 @@ export const NAV_ITEMS = {
     id: 'plugins',
     label: 'Plugins',
     icon: PlugZap,
-    path: '/plugins',
     adminOnly: true,
+    paths: [
+      { label: 'My Plugins', icon: Package, path: '/plugins' },
+      { label: 'Find Plugins', icon: Download, path: '/plugins/browse' },
+    ],
   },
   integrations: {
     id: 'integrations',
diff --git a/frontend/src/pages/PluginBrowse.jsx b/frontend/src/pages/PluginBrowse.jsx
new file mode 100644
index 00000000..116c6075
--- /dev/null
+++ b/frontend/src/pages/PluginBrowse.jsx
@@ -0,0 +1,729 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import {
+  ActionIcon,
+  AppShellMain,
+  Badge,
+  Box,
+  Button,
+  Group,
+  Loader,
+  Modal,
+  NumberInput,
+  Pagination,
+  Select,
+  SimpleGrid,
+  Stack,
+  Text,
+  Textarea,
+  TextInput,
+} from '@mantine/core';
+import API from '../api.js';
+import { RefreshCcw, Trash2, Plus, Search, KeyRound, ShieldCheck, ShieldAlert } from 'lucide-react';
+import { usePluginStore } from '../store/plugins.jsx';
+import useSettingsStore from '../store/settings.jsx';
+import AvailablePluginCard from '../components/cards/AvailablePluginCard.jsx';
+import { showNotification } from '../utils/notificationUtils.js';
+import { reloadPlugins } from '../utils/pages/PluginsUtils.js';
+import { compareVersions } from '../components/pluginUtils.js';
+
+export default function PluginBrowsePage() {
+  const repos = usePluginStore((s) => s.repos);
+  const reposLoading = usePluginStore((s) => s.reposLoading);
+  const availablePlugins = usePluginStore((s) => s.availablePlugins);
+  const availableLoading = usePluginStore((s) => s.availableLoading);
+  const fetchRepos = usePluginStore((s) => s.fetchRepos);
+  const fetchAvailablePlugins = usePluginStore((s) => s.fetchAvailablePlugins);
+  const refreshRepo = usePluginStore((s) => s.refreshRepo);
+  const addRepo = usePluginStore((s) => s.addRepo);
+  const removeRepo = usePluginStore((s) => s.removeRepo);
+  const updateRepo = usePluginStore((s) => s.updateRepo);
+
+  const appVersion = useSettingsStore((s) => s.version?.version || '');
+
+  const [repoModalOpen, setRepoModalOpen] = useState(false);
+  const [newRepoUrl, setNewRepoUrl] = useState('');
+  const [newRepoPublicKey, setNewRepoPublicKey] = useState('');
+  const [addingRepo, setAddingRepo] = useState(false);
+  const [refreshingAll, setRefreshingAll] = useState(false);
+  const [editingKeyRepoId, setEditingKeyRepoId] = useState(null);
+  const [editKeyValue, setEditKeyValue] = useState('');
+  const [savingKey, setSavingKey] = useState(false);
+  const [showAddRepo, setShowAddRepo] = useState(false);
+  const [deleteConfirmId, setDeleteConfirmId] = useState(null);
+  const [gpgKeyFocused, setGpgKeyFocused] = useState(false);
+  const [repoPreview, setRepoPreview] = useState(null);
+  const [previewLoading, setPreviewLoading] = useState(false);
+  const previewTimer = useRef(null);
+  const [refreshInterval, setRefreshInterval] = useState(6);
+  const [savingInterval, setSavingInterval] = useState(false);
+
+  const recentlyInstalledSlugs = useRef(new Set());
+  const recentlyUninstalledSlugs = useRef(new Set());
+
+  const [searchQuery, setSearchQuery] = useState('');
+  const [sortBy, setSortBy] = useState('updated');
+  const [filterRepo, setFilterRepo] = useState('all');
+  const [filterStatus, setFilterStatus] = useState('all');
+  const [page, setPage] = useState(1);
+  const perPage = 9;
+
+  const hasFetched = useRef(false);
+
+  useEffect(() => {
+    if (!hasFetched.current) {
+      hasFetched.current = true;
+      fetchRepos();
+      fetchAvailablePlugins();
+    }
+  }, [fetchRepos, fetchAvailablePlugins]);
+
+  const handleRefreshAll = useCallback(async () => {
+    setRefreshingAll(true);
+    try {
+      for (const repo of usePluginStore.getState().repos) {
+        await refreshRepo(repo.id);
+      }
+      await fetchAvailablePlugins();
+      await reloadPlugins();
+      usePluginStore.getState().invalidatePlugins();
+      showNotification({
+        title: 'Refreshed',
+        message: 'All plugin repos refreshed',
+        color: 'green',
+      });
+    } catch {
+      showNotification({
+        title: 'Error',
+        message: 'Some repos failed to refresh',
+        color: 'red',
+      });
+    } finally {
+      setRefreshingAll(false);
+    }
+  }, [refreshRepo, fetchAvailablePlugins]);
+
+  const handleAddRepo = useCallback(async () => {
+    if (!newRepoUrl.trim()) return;
+    setAddingRepo(true);
+    try {
+      await addRepo({ url: newRepoUrl.trim(), public_key: newRepoPublicKey.trim() });
+      setNewRepoUrl('');
+      setNewRepoPublicKey('');
+      setRepoPreview(null);
+      setShowAddRepo(false);
+      await fetchAvailablePlugins();
+      showNotification({
+        title: 'Added',
+        message: 'Plugin repo added',
+        color: 'green',
+      });
+    } catch {
+      // Error notification handled by API layer
+    } finally {
+      setAddingRepo(false);
+    }
+  }, [newRepoUrl, newRepoPublicKey, addRepo, fetchAvailablePlugins]);
+
+  const handleDeleteRepo = useCallback(
+    async (id) => {
+      await removeRepo(id);
+      setDeleteConfirmId(null);
+      await fetchAvailablePlugins();
+      showNotification({
+        title: 'Removed',
+        message: 'Plugin repo removed',
+        color: 'green',
+      });
+    },
+    [removeRepo, fetchAvailablePlugins]
+  );
+
+  const handleEditKey = useCallback((repo) => {
+    setEditingKeyRepoId(repo.id);
+    setEditKeyValue(repo.public_key || '');
+  }, []);
+
+  const handleSaveKey = useCallback(async () => {
+    if (editingKeyRepoId == null) return;
+    setSavingKey(true);
+    try {
+      await updateRepo(editingKeyRepoId, { public_key: editKeyValue });
+      await refreshRepo(editingKeyRepoId);
+      await fetchAvailablePlugins();
+      showNotification({ title: 'Updated', message: 'Public key updated', color: 'green' });
+      setEditingKeyRepoId(null);
+      setEditKeyValue('');
+    } catch {
+      showNotification({ title: 'Error', message: 'Failed to update key', color: 'red' });
+    } finally {
+      setSavingKey(false);
+    }
+  }, [editingKeyRepoId, editKeyValue, updateRepo, refreshRepo, fetchAvailablePlugins]);
+
+  const loadRepoSettings = useCallback(async () => {
+    const data = await API.getPluginRepoSettings();
+    if (data) setRefreshInterval(data.refresh_interval_hours ?? 6);
+  }, []);
+
+  const handleSaveInterval = useCallback(async (val) => {
+    const hours = val ?? 0;
+    setRefreshInterval(hours);
+    setSavingInterval(true);
+    try {
+      await API.updatePluginRepoSettings({ refresh_interval_hours: hours });
+    } catch {
+      // Error notification handled by API layer
+    } finally {
+      setSavingInterval(false);
+    }
+  }, []);
+
+  // Debounced manifest preview
+  const fetchPreview = useCallback((url, publicKey) => {
+    if (previewTimer.current) clearTimeout(previewTimer.current);
+    if (!url.trim() || !url.match(/^https?:\/\/.+/i)) {
+      setRepoPreview(null);
+      setPreviewLoading(false);
+      return;
+    }
+    setPreviewLoading(true);
+    previewTimer.current = setTimeout(async () => {
+      const result = await API.previewPluginRepo(url.trim(), publicKey?.trim());
+      setRepoPreview(result);
+      setPreviewLoading(false);
+    }, 600);
+  }, []);
+
+  // Cleanup any pending preview timer on unmount
+  useEffect(() => {
+    return () => {
+      if (previewTimer.current) {
+        clearTimeout(previewTimer.current);
+      }
+    };
+  }, []);
+  // Load settings when modal opens
+  useEffect(() => {
+    if (repoModalOpen) loadRepoSettings();
+  }, [repoModalOpen, loadRepoSettings]);
+
+  const loading = availableLoading && availablePlugins.length === 0;
+
+  // Build repo filter options from available plugins
+  const repoOptions = React.useMemo(() => {
+    const seen = new Map();
+    availablePlugins.forEach((p) => {
+      if (!seen.has(p.repo_id)) {
+        seen.set(p.repo_id, p.repo_name || `Repo ${p.repo_id}`);
+      }
+    });
+    return [
+      { value: 'all', label: 'All Repos' },
+      ...Array.from(seen, ([id, name]) => ({ value: String(id), label: name })),
+    ];
+  }, [availablePlugins]);
+
+  // Filter and sort plugins
+  const filteredPlugins = React.useMemo(() => {
+    let list = [...availablePlugins];
+
+    // Text search
+    if (searchQuery.trim()) {
+      const q = searchQuery.toLowerCase().trim();
+      list = list.filter(
+        (p) =>
+          p.name?.toLowerCase().includes(q) ||
+          p.description?.toLowerCase().includes(q) ||
+          p.author?.toLowerCase().includes(q)
+      );
+    }
+
+    // Repo filter
+    if (filterRepo !== 'all') {
+      list = list.filter((p) => String(p.repo_id) === filterRepo);
+    }
+
+    // Status filter
+    if (filterStatus === 'installed') {
+      list = list.filter((p) => p.installed);
+    } else if (filterStatus === 'not-installed') {
+      list = list.filter((p) => !p.installed);
+    } else if (filterStatus === 'compatible') {
+      list = list.filter((p) => {
+        const meetsMin = !p.min_dispatcharr_version || compareVersions(appVersion, p.min_dispatcharr_version) >= 0;
+        const meetsMax = !p.max_dispatcharr_version || compareVersions(appVersion, p.max_dispatcharr_version) <= 0;
+        return meetsMin && meetsMax;
+      });
+    }
+
+    // Sort
+    list.sort((a, b) => {
+      // Pre-sort weights: deprecated → installed → incompatible sink to bottom (in that order)
+      // Recently installed plugins are exempt so they don't jump away after install
+      const weight = (p) => {
+        if (recentlyInstalledSlugs.current.has(p.slug)) return 0;
+        if (recentlyUninstalledSlugs.current.has(p.slug)) return 2;
+        const meetsMin = !p.min_dispatcharr_version || compareVersions(appVersion, p.min_dispatcharr_version) >= 0;
+        const meetsMax = !p.max_dispatcharr_version || compareVersions(appVersion, p.max_dispatcharr_version) <= 0;
+        if (p.deprecated) return 1;
+        if (p.installed) return 2;
+        if (!meetsMin || !meetsMax) return 3;
+        return 0;
+      };
+      const wa = weight(a);
+      const wb = weight(b);
+      if (wa !== wb) return wa - wb;
+
+      switch (sortBy) {
+        case 'name-asc':
+          return (a.name || '').localeCompare(b.name || '');
+        case 'name-desc':
+          return (b.name || '').localeCompare(a.name || '');
+        case 'author':
+          return (a.author || '').localeCompare(b.author || '');
+        case 'updated':
+          return (b.last_updated || '').localeCompare(a.last_updated || '');
+        default:
+          return 0;
+      }
+    });
+
+    return list;
+  }, [availablePlugins, searchQuery, filterRepo, filterStatus, sortBy, appVersion]);
+
+  // Reset to page 1 when filters/search change
+  React.useEffect(() => {
+    setPage(1);
+  }, [searchQuery, filterRepo, filterStatus, sortBy]);
+
+  const totalPages = Math.ceil(filteredPlugins.length / perPage);
+  const paginatedPlugins = filteredPlugins.slice((page - 1) * perPage, page * perPage);
+
+  return (
+    <AppShellMain p={16}>
+      <Group justify="space-between" mb="md">
+        <Group gap="xs" align="center">
+          <Text fw={700} size="lg">
+            Find Plugins
+          </Text>
+          {availablePlugins.length > 0 && (
+            <Badge variant="light" color="gray" size="sm">{availablePlugins.length} Plugins Available</Badge>
+          )}
+          {repos.length > 1 && (
+            <Badge variant="light" color="gray" size="sm">{repos.length} Repos</Badge>
+          )}
+        </Group>
+        <Group>
+          <Button
+            size="xs"
+            variant="light"
+            onClick={() => setRepoModalOpen(true)}
+          >
+            Manage Repos
+          </Button>
+          <ActionIcon
+            variant="light"
+            onClick={handleRefreshAll}
+            title="Refresh all repos"
+            loading={refreshingAll}
+          >
+            <RefreshCcw size={18} />
+          </ActionIcon>
+        </Group>
+      </Group>
+
+      {loading && <Loader />}
+
+      {!loading && (
+        <Group gap="sm" mb="md" wrap="wrap">
+          <TextInput
+            placeholder="Search plugins..."
+            leftSection={<Search size={14} />}
+            size="xs"
+            value={searchQuery}
+            onChange={(e) => setSearchQuery(e.currentTarget.value)}
+            style={{ flex: 1, minWidth: 180, maxWidth: 300 }}
+          />
+          <Select
+            size="xs"
+            allowDeselect={false}
+            value={sortBy}
+            onChange={setSortBy}
+            data={[
+              { value: 'name-asc', label: 'Name A-Z' },
+              { value: 'name-desc', label: 'Name Z-A' },
+              { value: 'author', label: 'Author' },
+              { value: 'updated', label: 'Recently Updated' },
+            ]}
+            style={{ width: 170 }}
+          />
+          {repoOptions.length > 2 && (
+            <Select
+              size="xs"
+              allowDeselect={false}
+              value={filterRepo}
+              onChange={setFilterRepo}
+              data={repoOptions}
+              style={{ width: 160 }}
+            />
+          )}
+          <Select
+            size="xs"
+            allowDeselect={false}
+            value={filterStatus}
+            onChange={setFilterStatus}
+            data={[
+              { value: 'all', label: 'All Plugins' },
+              { value: 'installed', label: 'Installed' },
+              { value: 'not-installed', label: 'Not Installed' },
+              { value: 'compatible', label: 'Compatible' },
+            ]}
+            style={{ width: 150 }}
+          />
+        </Group>
+      )}
+
+      {!loading && filteredPlugins.length === 0 && availablePlugins.length > 0 && (
+        <Box>
+          <Text c="dimmed">
+            No plugins match your filters. Try adjusting your search or filter criteria.
+          </Text>
+        </Box>
+      )}
+
+      {!loading && availablePlugins.length === 0 && (
+        <Box>
+          <Text c="dimmed">
+            No plugins available. Try refreshing repos or adding a new plugin
+            repository.
+          </Text>
+        </Box>
+      )}
+
+      {!loading && filteredPlugins.length > 0 && (
+        <>
+          <SimpleGrid
+            cols={{ base: 1, sm: 2, lg: 3 }}
+            spacing="md"
+          >
+            {paginatedPlugins.map((p) => (
+              <AvailablePluginCard
+                key={`${p.repo_id}-${p.slug}`}
+                plugin={p}
+                appVersion={appVersion}
+                multiRepo={repos.length > 1}
+                onBeforeInstall={(slug) => { if (slug) recentlyInstalledSlugs.current.add(slug); }}
+                onInstalled={(slug) => { if (slug) recentlyInstalledSlugs.current.add(slug); fetchAvailablePlugins(); }}
+                onUninstalled={(slug) => { if (slug) recentlyUninstalledSlugs.current.add(slug); }}
+              />
+            ))}
+          </SimpleGrid>
+          {totalPages > 1 && (
+            <Group justify="center" mt="lg">
+              <Pagination
+                value={page}
+                onChange={setPage}
+                total={totalPages}
+                size="sm"
+              />
+            </Group>
+          )}
+        </>
+      )}
+
+      {/* Manage Repos Modal */}
+      <Modal
+        opened={repoModalOpen}
+        onClose={() => setRepoModalOpen(false)}
+        title={
+          <Group justify="space-between" align="flex-start" w="100%">
+            <div style={{ flex: 1 }}>
+              <Text fw={600}>Plugin Repositories</Text>
+              <Text size="sm" c="dimmed" mt={4}>
+                Add third-party plugin repositories or manage existing ones.
+                Manifests are fetched automatically at the configured interval.
+              </Text>
+            </div>
+            <div style={{ textAlign: 'left', flexShrink: 0 }}>
+              <Text size="sm" fw={500} mb={2}>Refresh Interval</Text>
+              <NumberInput
+                value={refreshInterval}
+                onChange={handleSaveInterval}
+                min={0}
+                max={168}
+                size="xs"
+                disabled={savingInterval}
+                w={115}
+              />
+              <Text size="xs" c="dimmed" mt={2}>Hours, 0 to disable</Text>
+            </div>
+          </Group>
+        }
+        centered
+        size="lg"
+        styles={{ title: { width: '100%' }, header: { alignItems: 'flex-start' } }}
+      >
+        <Stack gap="md">
+          {reposLoading && repos.length === 0 && <Loader size="sm" />}
+
+          {repos.map((repo) => (
+            <React.Fragment key={repo.id}>
+            <Group
+              justify="space-between"
+              align="center"
+              wrap="nowrap"
+              style={{
+                padding: '8px 12px',
+                borderRadius: 8,
+                backgroundColor: 'var(--mantine-color-dark-6)',
+              }}
+            >
+              <Box style={{ minWidth: 0, flex: 1 }}>
+                <Group gap="xs" align="center">
+                  <Text fw={500} size="sm" lineClamp={1}>
+                    {repo.name}
+                  </Text>
+                  {repo.is_official && (
+                    <Badge size="xs" variant="filled" style={{ backgroundColor: '#14917E' }}>
+                      Official Repo
+                    </Badge>
+                  )}
+                  {repo.signature_verified === true && (
+                    <Badge size="xs" variant="light" color="green" leftSection={<ShieldCheck size={10} />}>
+                      Verified Signature
+                    </Badge>
+                  )}
+                  {repo.signature_verified === false && (
+                    <Badge size="xs" variant="light" color="red" leftSection={<ShieldAlert size={10} />}>
+                      Invalid Signature
+                    </Badge>
+                  )}
+
+                </Group>
+                {repo.registry_url ? (
+                  <Text size="xs" c="dimmed" lineClamp={1}>
+                    <a
+                      href={repo.registry_url}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      style={{ color: 'var(--mantine-color-blue-4)', textDecoration: 'none' }}
+                    >
+                      {repo.registry_url}
+                    </a>
+                  </Text>
+                ) : null}
+                <Text size="xs" c="dimmed" lineClamp={1}>
+                  {repo.url}
+                </Text>
+                {repo.last_fetched && (
+                  <Text size="xs" c={repo.last_fetch_status && repo.last_fetch_status !== '200' ? 'red' : 'dimmed'}>
+                    Last fetched:{' '}
+                    {new Date(repo.last_fetched).toLocaleString()}
+                    {repo.last_fetch_status && repo.last_fetch_status !== '200'
+                      ? ` · ${repo.last_fetch_status}`
+                      : repo.plugin_count != null
+                        ? ` · ${repo.plugin_count} plugin${repo.plugin_count !== 1 ? 's' : ''} available`
+                        : ''}
+                  </Text>
+                )}
+              </Box>
+              {!repo.is_official && (
+                <Stack gap={4} align="center">
+                  <ActionIcon
+                    variant="subtle"
+                    color="gray"
+                    title="Edit public key"
+                    onClick={() => handleEditKey(repo)}
+                  >
+                    <KeyRound size={16} />
+                  </ActionIcon>
+                  <ActionIcon
+                    variant="subtle"
+                    color="red"
+                    title="Remove repo"
+                    onClick={() => setDeleteConfirmId(repo.id)}
+                  >
+                    <Trash2 size={16} />
+                  </ActionIcon>
+                </Stack>
+              )}
+            </Group>
+            {editingKeyRepoId === repo.id && (
+              <Stack gap="xs" mt="xs">
+                <Textarea
+                  placeholder={"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nOptional: Paste public GPG key here\n\n-----END PGP PUBLIC KEY BLOCK-----"}
+                  value={editKeyValue}
+                  onChange={(e) => setEditKeyValue(e.currentTarget.value)}
+                  size="xs"
+                  minRows={3}
+                  autosize
+                />
+                <Group gap="xs">
+                  <Button size="xs" onClick={handleSaveKey} loading={savingKey}>
+                    Save Key
+                  </Button>
+                  <Button size="xs" variant="subtle" color="gray" onClick={() => setEditingKeyRepoId(null)}>
+                    Cancel
+                  </Button>
+                </Group>
+              </Stack>
+            )}
+            </React.Fragment>
+          ))}
+
+          {!showAddRepo ? (
+            <Button
+              variant="light"
+              leftSection={<Plus size={16} />}
+              size="sm"
+              onClick={() => setShowAddRepo(true)}
+            >
+              Add Repository
+            </Button>
+          ) : (
+            <>
+              <Text fw={500} size="sm" mt="sm">
+                Add Repository
+              </Text>
+              <Box
+                style={{
+                  padding: '8px 12px',
+                  borderRadius: 8,
+                  minHeight: 90,
+                  display: 'flex',
+                  alignItems: 'center',
+                  backgroundColor: 'var(--mantine-color-dark-6)',
+                  border: repoPreview && !previewLoading && !repoPreview.valid
+                    ? '1px solid var(--mantine-color-red-7)'
+                    : 'none',
+                }}
+              >
+                {previewLoading ? (
+                  <Group gap="xs" align="center">
+                    <Loader size={14} />
+                    <Text size="xs" c="dimmed">Checking manifest...</Text>
+                  </Group>
+                ) : repoPreview ? (
+                  repoPreview.valid ? (
+                    <Box>
+                      <Group gap="xs" align="center">
+                        <Text fw={500} size="sm">
+                          {repoPreview.registry_name}
+                        </Text>
+                        {repoPreview.signature_verified === true && (
+                          <Badge size="xs" variant="light" color="green" leftSection={<ShieldCheck size={10} />}>
+                            Verified Signature
+                          </Badge>
+                        )}
+                        {repoPreview.signature_verified === false && (
+                          <>
+                            <Badge size="xs" variant="light" color="gray" leftSection={<ShieldCheck size={10} />}>
+                              Signed Manifest
+                            </Badge>
+                            <Text size="xs" c="var(--mantine-color-yellow-6)" fs="italic">Public key required for verification</Text>
+                          </>
+                        )}
+                        {repoPreview.signature_verified == null && (
+                          <Badge size="xs" variant="light" color="gray">
+                            No Signature
+                          </Badge>
+                        )}
+                      </Group>
+                      {repoPreview.registry_url ? (
+                        <Text size="xs" c="dimmed">
+                          <a
+                            href={repoPreview.registry_url}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            style={{ color: 'var(--mantine-color-blue-4)', textDecoration: 'none' }}
+                          >
+                            {repoPreview.registry_url}
+                          </a>
+                        </Text>
+                      ) : null}
+                      <Text size="xs" c="dimmed" lineClamp={1}>
+                        {newRepoUrl.trim()}
+                      </Text>
+                      <Text size="xs" c="dimmed">
+                        {repoPreview.plugin_count} plugin{repoPreview.plugin_count !== 1 ? 's' : ''} available
+                      </Text>
+                    </Box>
+                  ) : (
+                    <Text size="xs" c="red">
+                      {repoPreview.errors?.join(' ') || 'Invalid manifest'}
+                    </Text>
+                  )
+                ) : (
+                  <Text size="xs" c="yellow">
+                    Third-party repositories are not reviewed by the Dispatcharr team.
+                    <br />Adding sources and installing plugins is done at your own risk.
+                  </Text>
+                )}
+              </Box>
+              <TextInput
+                placeholder="Repository Manifest URL (ending in .json)"
+                value={newRepoUrl}
+                onChange={(e) => {
+                  setNewRepoUrl(e.currentTarget.value);
+                  fetchPreview(e.currentTarget.value, newRepoPublicKey);
+                }}
+                size="sm"
+              />
+              <Textarea
+                placeholder={gpgKeyFocused ? "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nPaste public GPG key here\n\n-----END PGP PUBLIC KEY BLOCK-----" : "Optional: Paste public GPG key here"}
+                value={newRepoPublicKey}
+                onChange={(e) => {
+                  const value = e.currentTarget.value;
+                  setNewRepoPublicKey(value);
+                  fetchPreview(newRepoUrl, value);
+                }}
+                size="sm"
+                minRows={gpgKeyFocused || newRepoPublicKey ? 4 : 1}
+                maxRows={8}
+                autosize
+                onFocus={() => setGpgKeyFocused(true)}
+                onBlur={() => { if (!newRepoPublicKey) setGpgKeyFocused(false); }}
+                styles={repoPreview?.valid && repoPreview?.signature_verified === false && !newRepoPublicKey.trim() ? { input: { borderColor: 'var(--mantine-color-yellow-6)' } } : undefined}
+              />
+              <Group gap="xs">
+                <Button
+                  onClick={handleAddRepo}
+                  loading={addingRepo}
+                  disabled={!newRepoUrl.trim()}
+                  leftSection={<Plus size={16} />}
+                  size="sm"
+                >
+                  Add Repo
+                </Button>
+                <Button
+                  variant="subtle"
+                  color="gray"
+                  size="sm"
+                  onClick={() => { setShowAddRepo(false); setNewRepoUrl(''); setNewRepoPublicKey(''); setRepoPreview(null); }}
+                >
+                  Cancel
+                </Button>
+              </Group>
+            </>
+          )}
+        </Stack>
+      </Modal>
+
+      {/* Delete Confirmation Modal */}
+      <Modal
+        opened={deleteConfirmId != null}
+        onClose={() => setDeleteConfirmId(null)}
+        title="Remove Repository"
+        size="sm"
+        centered
+      >
+        <Text size="sm">Are you sure you want to remove this repository?</Text>
+        <Text size="xs" c="dimmed" mt="xs">Plugins installed from this repo will remain installed but become unmanaged.</Text>
+        <Group mt="md" justify="flex-end" gap="xs">
+          <Button variant="subtle" color="gray" onClick={() => setDeleteConfirmId(null)}>Cancel</Button>
+          <Button color="red" onClick={() => handleDeleteRepo(deleteConfirmId)}>Remove</Button>
+        </Group>
+      </Modal>
+    </AppShellMain>
+  );
+}
diff --git a/frontend/src/pages/Plugins.jsx b/frontend/src/pages/Plugins.jsx
index 210c7e4c..10d1afe2 100644
--- a/frontend/src/pages/Plugins.jsx
+++ b/frontend/src/pages/Plugins.jsx
@@ -2,6 +2,7 @@ import React, {
   Suspense,
   useCallback,
   useEffect,
+  useMemo,
   useRef,
   useState,
 } from 'react';
@@ -9,6 +10,7 @@ import {
   ActionIcon,
   Alert,
   AppShellMain,
+  Badge,
   Box,
   Button,
   Divider,
@@ -16,10 +18,12 @@ import {
   Group,
   Loader,
   Modal,
+  Select,
   SimpleGrid,
   Stack,
   Switch,
   Text,
+  TextInput,
 } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import {
@@ -35,16 +39,27 @@ import {
   setPluginEnabled,
   updatePluginSettings,
 } from '../utils/pages/PluginsUtils.js';
-import { RefreshCcw } from 'lucide-react';
+import { RefreshCcw, Search } from 'lucide-react';
 import ErrorBoundary from '../components/ErrorBoundary.jsx';
 const PluginCard = React.lazy(
   () => import('../components/cards/PluginCard.jsx')
 );
 
+const FILTER_OPTIONS = [
+  { value: 'all', label: 'All Plugins' },
+  { value: 'enabled', label: 'Enabled' },
+  { value: 'disabled', label: 'Disabled' },
+  { value: 'update', label: 'Update Available' },
+  { value: 'managed', label: 'Managed' },
+  { value: 'unmanaged', label: 'Unmanaged' },
+];
+
 const PluginsList = ({ onRequestDelete, onRequireTrust, onRequestConfirm }) => {
   const plugins = usePluginStore((state) => state.plugins);
   const loading = usePluginStore((state) => state.loading);
   const hasFetchedRef = useRef(false);
+  const [searchQuery, setSearchQuery] = useState('');
+  const [filterStatus, setFilterStatus] = useState('all');
 
   useEffect(() => {
     if (!hasFetchedRef.current) {
@@ -53,6 +68,42 @@ const PluginsList = ({ onRequestDelete, onRequireTrust, onRequestConfirm }) => {
     }
   }, []);
 
+  const filteredPlugins = useMemo(() => {
+    let result = plugins;
+    if (searchQuery.trim()) {
+      const q = searchQuery.toLowerCase();
+      result = result.filter(
+        (p) =>
+          p.name?.toLowerCase().includes(q) ||
+          p.description?.toLowerCase().includes(q) ||
+          p.author?.toLowerCase().includes(q)
+      );
+    }
+    switch (filterStatus) {
+      case 'enabled':
+        result = result.filter((p) => p.enabled);
+        break;
+      case 'disabled':
+        result = result.filter((p) => !p.enabled);
+        break;
+      case 'update':
+        result = result.filter((p) => p.update_available);
+        break;
+      case 'managed':
+        result = result.filter((p) => p.is_managed);
+        break;
+      case 'unmanaged':
+        result = result.filter((p) => !p.is_managed);
+        break;
+    }
+    result.sort((a, b) => {
+      if (a.update_available && !b.update_available) return -1;
+      if (!a.update_available && b.update_available) return 1;
+      return (a.name || '').localeCompare(b.name || '');
+    });
+    return result;
+  }, [plugins, searchQuery, filterStatus]);
+
   const handleTogglePluginEnabled = async (key, next) => {
     const resp = await setPluginEnabled(key, next);
 
@@ -72,15 +123,33 @@ const PluginsList = ({ onRequestDelete, onRequireTrust, onRequestConfirm }) => {
 
   return (
     <>
-      {plugins.length > 0 && (
+      <Group gap="sm" mb="md" wrap="wrap">
+        <TextInput
+          placeholder="Search plugins…"
+          leftSection={<Search size={14} />}
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.currentTarget.value)}
+          style={{ flex: 1, minWidth: 180, maxWidth: 300 }}
+          size="xs"
+        />
+        <Select
+          data={FILTER_OPTIONS}
+          value={filterStatus}
+          onChange={(v) => setFilterStatus(v || 'all')}
+          size="xs"
+          allowDeselect={false}
+          style={{ width: 170 }}
+        />
+      </Group>
+
+      {filteredPlugins.length > 0 && (
         <SimpleGrid
-          cols={2}
+          cols={{ base: 1, sm: 2, lg: 3 }}
           spacing="md"
-          breakpoints={[{ maxWidth: '48em', cols: 1 }]}
         >
           <ErrorBoundary>
             <Suspense fallback={<Loader />}>
-              {plugins.map((p) => (
+              {filteredPlugins.map((p) => (
                 <PluginCard
                   key={p.key}
                   plugin={p}
@@ -97,6 +166,12 @@ const PluginsList = ({ onRequestDelete, onRequireTrust, onRequestConfirm }) => {
         </SimpleGrid>
       )}
 
+      {filteredPlugins.length === 0 && plugins.length > 0 && (
+        <Box>
+          <Text c="dimmed">No plugins match your search or filter.</Text>
+        </Box>
+      )}
+
       {plugins.length === 0 && (
         <Box>
           <Text c="dimmed">
@@ -110,6 +185,7 @@ const PluginsList = ({ onRequestDelete, onRequireTrust, onRequestConfirm }) => {
 };
 
 export default function PluginsPage() {
+  const plugins = usePluginStore((state) => state.plugins);
   const [importOpen, setImportOpen] = useState(false);
   const [importFile, setImportFile] = useState(null);
   const [importing, setImporting] = useState(false);
@@ -120,6 +196,7 @@ export default function PluginsPage() {
   const [deleteOpen, setDeleteOpen] = useState(false);
   const [deleteTarget, setDeleteTarget] = useState(null);
   const [deleting, setDeleting] = useState(false);
+  const [reloading, setReloading] = useState(false);
   const [confirmOpen, setConfirmOpen] = useState(false);
   const [confirmConfig, setConfirmConfig] = useState({
     title: '',
@@ -128,8 +205,31 @@ export default function PluginsPage() {
   });
 
   const handleReload = async () => {
-    await reloadPlugins();
-    usePluginStore.getState().invalidatePlugins();
+    const { repos, refreshRepo, fetchAvailablePlugins, fetchPlugins } = usePluginStore.getState();
+    setReloading(true);
+    try {
+      for (const repo of repos) {
+        try { await refreshRepo(repo.id); } catch {
+          console.error(`Failed to refresh repo ${repo.name} (${repo.id})`);
+        }
+      }
+      await fetchAvailablePlugins();
+      await reloadPlugins();
+      await fetchPlugins();
+      showNotification({
+        title: 'Refreshed',
+        message: 'Plugin repos and registry reloaded',
+        color: 'green',
+      });
+    } catch {
+      showNotification({
+        title: 'Error',
+        message: 'Some repos failed to refresh',
+        color: 'red',
+      });
+    } finally {
+      setReloading(false);
+    }
   };
 
   const handleRequestDelete = useCallback((pl) => {
@@ -137,6 +237,7 @@ export default function PluginsPage() {
     setDeleteOpen(true);
   }, []);
 
+  // eslint-disable-next-line no-unused-vars
   const requireTrust = useCallback((plugin) => {
     return new Promise((resolve) => {
       setTrustResolve(() => resolve);
@@ -160,55 +261,73 @@ export default function PluginsPage() {
 
   const handleImportPlugin = () => {
     return async () => {
-      setImporting(true);
-      const id = showNotification({
-        title: 'Uploading plugin',
-        message: 'Backend may restart; please wait…',
-        loading: true,
-        autoClose: false,
-        withCloseButton: false,
-      });
-      try {
-        const resp = await importPlugin(importFile);
-        if (resp?.success && resp.plugin) {
-          setImported(resp.plugin);
-          usePluginStore.getState().invalidatePlugins();
-
-          updateNotification({
-            id,
-            loading: false,
-            color: 'green',
-            title: 'Imported',
-            message:
-              'Plugin imported. If the app briefly disconnected, it should be back now.',
-            autoClose: 3000,
-          });
-        } else {
-          updateNotification({
-            id,
-            loading: false,
-            color: 'red',
-            title: 'Import failed',
-            message: resp?.error || 'Unknown error',
-            autoClose: 5000,
-          });
-        }
-      } catch (e) {
-        // API.importPlugin already showed a concise error; just update the loading notice
-        updateNotification({
-          id,
-          loading: false,
-          color: 'red',
-          title: 'Import failed',
-          message:
-            (e?.body && (e.body.error || e.body.detail)) ||
-            e?.message ||
-            'Failed',
-          autoClose: 5000,
+      const run = async (overwrite) => {
+        setImporting(true);
+        const notifId = showNotification({
+          title: 'Uploading plugin',
+          message: 'Backend may restart; please wait…',
+          loading: true,
+          autoClose: false,
+          withCloseButton: false,
         });
-      } finally {
-        setImporting(false);
-      }
+        try {
+          const resp = await importPlugin(importFile, overwrite, /* silent */ true);
+          if (resp?.success && resp.plugin) {
+            setImported({ ...resp.plugin, was_managed: resp.was_managed, was_overwrite: overwrite });
+            usePluginStore.getState().invalidatePlugins();
+            updateNotification({
+              id: notifId,
+              loading: false,
+              color: 'green',
+              title: 'Imported',
+              message:
+                'Plugin imported. If the app briefly disconnected, it should be back now.',
+              autoClose: 3000,
+            });
+          } else {
+            updateNotification({
+              id: notifId,
+              loading: false,
+              color: 'red',
+              title: 'Import failed',
+              message: resp?.error || 'Unknown error',
+              autoClose: 5000,
+            });
+          }
+        } catch (e) {
+          const msg =
+            (e?.body && (e.body.error || e.body.detail)) || e?.message || '';
+          if (!overwrite && /already exists/i.test(msg)) {
+            // Dismiss the loading toast before showing the confirm dialog
+            updateNotification({
+              id: notifId,
+              loading: false,
+              autoClose: 100,
+              withCloseButton: false,
+            });
+            const pluginName = msg.match(/'([^']+)'/)?.[1] || 'this plugin';
+            const confirmed = await requestConfirm(
+              'Plugin already exists',
+              `'${pluginName}' is already installed. Do you want to replace it?`
+            );
+            if (confirmed) {
+              await run(true);
+            }
+          } else {
+            updateNotification({
+              id: notifId,
+              loading: false,
+              color: 'red',
+              title: 'Import failed',
+              message: msg || 'Failed',
+              autoClose: 5000,
+            });
+          }
+        } finally {
+          setImporting(false);
+        }
+      };
+      await run(false);
     };
   };
 
@@ -272,14 +391,19 @@ export default function PluginsPage() {
   return (
     <AppShellMain p={16}>
       <Group justify="space-between" mb="md">
-        <Text fw={700} size="lg">
-          Plugins
-        </Text>
+        <Group gap="xs" align="center">
+          <Text fw={700} size="lg">
+            My Plugins
+          </Text>
+          {plugins.length > 0 && (
+            <Badge variant="light" color="gray" size="sm">{plugins.length} Plugins Installed</Badge>
+          )}
+        </Group>
         <Group>
           <Button size="xs" variant="light" onClick={showImportForm}>
             Import Plugin
           </Button>
-          <ActionIcon variant="light" onClick={handleReload} title="Reload">
+          <ActionIcon variant="light" onClick={handleReload} title="Reload" loading={reloading} disabled={reloading}>
             <RefreshCcw size={18} />
           </ActionIcon>
         </Group>
@@ -349,20 +473,30 @@ export default function PluginsPage() {
           {imported && (
             <Box>
               <Divider my="sm" />
-              <Text fw={600}>{imported.name}</Text>
-              <Text size="sm" c="dimmed">
-                {imported.description}
-              </Text>
-              <Group justify="space-between" mt="sm" align="center">
-                <Text size="sm">Enable now</Text>
-                <Switch
-                  size="sm"
-                  checked={enableAfterImport}
-                  onChange={(e) =>
-                    setEnableAfterImport(e.currentTarget.checked)
-                  }
-                />
-              </Group>
+              <Alert color="blue" variant="light" mb="xs">
+                {imported.was_overwrite
+                  ? `'${imported.name}' was successfully overwritten.`
+                  : `'${imported.name}' was successfully installed.`}
+              </Alert>
+              {imported.was_managed && (
+                <Alert color="orange" variant="light" mt="xs">
+                  This plugin was previously managed by a repo. Manual
+                  installation removes it from repo management, so it will no
+                  longer receive update checks or version tracking.
+                </Alert>
+              )}
+              {imported.enabled === false && (
+                <Group justify="space-between" mt="sm" align="center">
+                  <Text size="sm">Enable now</Text>
+                  <Switch
+                    size="sm"
+                    checked={enableAfterImport}
+                    onChange={(e) =>
+                      setEnableAfterImport(e.currentTarget.checked)
+                    }
+                  />
+                </Group>
+              )}
               <Group justify="flex-end" mt="md">
                 <Button
                   variant="default"
@@ -376,13 +510,14 @@ export default function PluginsPage() {
                 >
                   Done
                 </Button>
-                <Button
-                  size="xs"
-                  disabled={!enableAfterImport}
-                  onClick={handleEnablePlugin()}
-                >
-                  Enable
-                </Button>
+                {imported.enabled === false && enableAfterImport && (
+                  <Button
+                    size="xs"
+                    onClick={handleEnablePlugin()}
+                  >
+                    Enable
+                  </Button>
+                )}
               </Group>
             </Box>
           )}
@@ -398,6 +533,7 @@ export default function PluginsPage() {
         }}
         title="Enable third-party plugins?"
         centered
+        zIndex={300}
       >
         <Stack>
           <Text size="sm">
@@ -444,6 +580,7 @@ export default function PluginsPage() {
         }}
         title={deleteTarget ? `Delete ${deleteTarget.name}?` : 'Delete Plugin'}
         centered
+        zIndex={300}
       >
         <Stack>
           <Text size="sm">
@@ -479,6 +616,7 @@ export default function PluginsPage() {
         onClose={() => handleConfirm(false)}
         title={confirmConfig.title}
         centered
+        zIndex={300}
       >
         <Stack>
           <Text size="sm">{confirmConfig.message}</Text>
diff --git a/frontend/src/pages/__tests__/Plugins.test.jsx b/frontend/src/pages/__tests__/Plugins.test.jsx
index dd1f6771..20d78d38 100644
--- a/frontend/src/pages/__tests__/Plugins.test.jsx
+++ b/frontend/src/pages/__tests__/Plugins.test.jsx
@@ -94,6 +94,41 @@ vi.mock('@mantine/core', async () => {
         {children}
       </button>
     ),
+    Badge: ({ children, color, variant, size, leftSection, style, onClick }) => (
+      <span data-color={color} data-variant={variant} data-size={size} style={style} onClick={onClick}>
+        {leftSection}{children}
+      </span>
+    ),
+    Select: ({ value, onChange, data, label, placeholder, disabled }) => (
+      <div>
+        {label && <label>{label}</label>}
+        <select
+          value={value || ''}
+          onChange={(e) => onChange?.(e.target.value)}
+          disabled={disabled}
+          aria-label={label}
+        >
+          {(data || []).map((item) => (
+            <option key={item.value ?? item} value={item.value ?? item}>
+              {item.label ?? item}
+            </option>
+          ))}
+        </select>
+      </div>
+    ),
+    TextInput: ({ value, onChange, label, placeholder, disabled }) => (
+      <div>
+        {label && <label>{label}</label>}
+        <input
+          type="text"
+          value={value || ''}
+          onChange={(e) => onChange?.(e)}
+          placeholder={placeholder}
+          disabled={disabled}
+          aria-label={label}
+        />
+      </div>
+    ),
     SimpleGrid: ({ children, cols }) => <div data-cols={cols}>{children}</div>,
     Modal: ({ opened, onClose, title, children, size, centered }) =>
       opened ? (
@@ -166,10 +201,13 @@ describe('PluginsPage', () => {
   const mockPluginStoreState = {
     plugins: mockPlugins,
     loading: false,
+    repos: [],
     fetchPlugins: vi.fn(),
     updatePlugin: vi.fn(),
     removePlugin: vi.fn(),
     invalidatePlugins: vi.fn(),
+    refreshRepo: vi.fn(),
+    fetchAvailablePlugins: vi.fn(),
   };
 
   beforeEach(() => {
@@ -185,7 +223,7 @@ describe('PluginsPage', () => {
       render(<PluginsPage />);
 
       await waitFor(() => {
-        expect(screen.getByText('Plugins')).toBeInTheDocument();
+        expect(screen.getByText('My Plugins')).toBeInTheDocument();
         expect(screen.getByText('Test Plugin 1')).toBeInTheDocument();
         expect(screen.getByText('Test Plugin 2')).toBeInTheDocument();
       });
@@ -319,7 +357,7 @@ describe('PluginsPage', () => {
       fireEvent.click(uploadButton);
 
       await waitFor(() => {
-        expect(importPlugin).toHaveBeenCalledWith(file);
+        expect(importPlugin).toHaveBeenCalledWith(file, false, true);
         expect(showNotification).toHaveBeenCalled();
         expect(updateNotification).toHaveBeenCalled();
       });
@@ -362,6 +400,7 @@ describe('PluginsPage', () => {
         name: 'New Plugin',
         description: 'New Description',
         ever_enabled: false,
+        enabled: false,
       };
       importPlugin.mockResolvedValue({
         success: true,
@@ -384,7 +423,7 @@ describe('PluginsPage', () => {
       fireEvent.click(uploadButton);
 
       await waitFor(() => {
-        expect(screen.getByText('New Plugin')).toBeInTheDocument();
+        expect(screen.getByText(/'New Plugin'/)).toBeInTheDocument();
         expect(screen.getByText('Enable now')).toBeInTheDocument();
       });
     });
@@ -395,6 +434,7 @@ describe('PluginsPage', () => {
         name: 'New Plugin',
         description: 'New Description',
         ever_enabled: true,
+        enabled: false,
       };
       importPlugin.mockResolvedValue({
         success: true,
@@ -442,6 +482,7 @@ describe('PluginsPage', () => {
         name: 'New Plugin',
         description: 'New Description',
         ever_enabled: false,
+        enabled: false,
       };
       importPlugin.mockResolvedValue({
         success: true,
@@ -489,6 +530,7 @@ describe('PluginsPage', () => {
         name: 'New Plugin',
         description: 'New Description',
         ever_enabled: false,
+        enabled: false,
       };
       importPlugin.mockResolvedValue({
         success: true,
@@ -540,6 +582,7 @@ describe('PluginsPage', () => {
         name: 'New Plugin',
         description: 'New Description',
         ever_enabled: false,
+        enabled: false,
       };
       importPlugin.mockResolvedValue({
         success: true,
@@ -589,10 +632,10 @@ describe('PluginsPage', () => {
 
   describe('Reload', () => {
     it('reloads plugins when reload button is clicked', async () => {
-      const invalidatePlugins = vi.fn();
+      const fetchPlugins = vi.fn().mockResolvedValue(undefined);
       usePluginStore.getState = vi.fn(() => ({
         ...mockPluginStoreState,
-        invalidatePlugins,
+        fetchPlugins,
       }));
 
       render(<PluginsPage />);
@@ -602,7 +645,7 @@ describe('PluginsPage', () => {
 
       await waitFor(() => {
         expect(reloadPlugins).toHaveBeenCalled();
-        expect(invalidatePlugins).toHaveBeenCalled();
+        expect(fetchPlugins).toHaveBeenCalled();
       });
     });
   });
diff --git a/frontend/src/store/plugins.jsx b/frontend/src/store/plugins.jsx
index 9fb61a47..f4cac1cf 100644
--- a/frontend/src/store/plugins.jsx
+++ b/frontend/src/store/plugins.jsx
@@ -6,6 +6,12 @@ export const usePluginStore = create((set, get) => ({
   loading: false,
   error: null,
 
+  // Plugin repos (hub)
+  repos: [],
+  availablePlugins: [],
+  reposLoading: false,
+  availableLoading: false,
+
   fetchPlugins: async () => {
     set({ loading: true, error: null });
     try {
@@ -38,4 +44,74 @@ export const usePluginStore = create((set, get) => ({
     set({ plugins: [] });
     get().fetchPlugins();
   },
+
+  // Repo management
+  fetchRepos: async () => {
+    set({ reposLoading: true });
+    try {
+      const repos = await API.getPluginRepos();
+      set({ repos: repos || [], reposLoading: false });
+    } catch {
+      set({ reposLoading: false });
+    }
+  },
+
+  addRepo: async (data) => {
+    const repo = await API.addPluginRepo(data);
+    set((state) => ({ repos: [...state.repos, repo] }));
+    return repo;
+  },
+
+  removeRepo: async (id) => {
+    await API.deletePluginRepo(id);
+    set((state) => ({ repos: state.repos.filter((r) => r.id !== id) }));
+  },
+
+  updateRepo: async (id, data) => {
+    const updated = await API.updatePluginRepo(id, data);
+    if (updated) {
+      set((state) => ({
+        repos: state.repos.map((r) => (r.id === id ? updated : r)),
+      }));
+    }
+    return updated;
+  },
+
+  refreshRepo: async (id) => {
+    const updated = await API.refreshPluginRepo(id);
+    if (updated) {
+      set((state) => ({
+        repos: state.repos.map((r) => (r.id === id ? updated : r)),
+      }));
+    }
+    return updated;
+  },
+
+  fetchAvailablePlugins: async () => {
+    set({ availableLoading: true });
+    try {
+      const plugins = await API.getAvailablePlugins();
+      set({ availablePlugins: plugins || [], availableLoading: false });
+    } catch {
+      set({ availableLoading: false });
+    }
+  },
+
+  installPlugin: async ({ repo_id, slug, version, download_url, sha256, min_dispatcharr_version, max_dispatcharr_version, prerelease }) => {
+    const result = await API.installPluginFromRepo({
+      repo_id,
+      slug,
+      version,
+      download_url,
+      sha256,
+      min_dispatcharr_version,
+      max_dispatcharr_version,
+      prerelease: prerelease === true,
+    });
+    if (result?.success) {
+      await get().fetchAvailablePlugins();
+      await get().fetchPlugins();
+    }
+    return result;
+  },
 }));
diff --git a/frontend/src/utils/pages/PluginsUtils.js b/frontend/src/utils/pages/PluginsUtils.js
index 0f92b5b7..1226fbd6 100644
--- a/frontend/src/utils/pages/PluginsUtils.js
+++ b/frontend/src/utils/pages/PluginsUtils.js
@@ -9,8 +9,8 @@ export const runPluginAction = async (key, actionId) => {
 export const setPluginEnabled = async (key, next) => {
   return await API.setPluginEnabled(key, next);
 };
-export const importPlugin = async (importFile) => {
-  return await API.importPlugin(importFile);
+export const importPlugin = async (importFile, overwrite = false, silent = false) => {
+  return await API.importPlugin(importFile, overwrite, silent);
 };
 export const reloadPlugins = async () => {
   return await API.reloadPlugins();
diff --git a/frontend/src/utils/pages/__tests__/PluginsUtils.test.js b/frontend/src/utils/pages/__tests__/PluginsUtils.test.js
index a7539eeb..e43bceb4 100644
--- a/frontend/src/utils/pages/__tests__/PluginsUtils.test.js
+++ b/frontend/src/utils/pages/__tests__/PluginsUtils.test.js
@@ -205,7 +205,7 @@ describe('PluginsUtils', () => {
 
       await PluginsUtils.importPlugin(importFile);
 
-      expect(API.importPlugin).toHaveBeenCalledWith(importFile);
+      expect(API.importPlugin).toHaveBeenCalledWith(importFile, false, false);
       expect(API.importPlugin).toHaveBeenCalledTimes(1);
     });
 
@@ -227,7 +227,7 @@ describe('PluginsUtils', () => {
 
       await PluginsUtils.importPlugin(importFile);
 
-      expect(API.importPlugin).toHaveBeenCalledWith(importFile);
+      expect(API.importPlugin).toHaveBeenCalledWith(importFile, false, false);
     });
 
     it('should handle FormData', async () => {
@@ -236,7 +236,7 @@ describe('PluginsUtils', () => {
 
       await PluginsUtils.importPlugin(formData);
 
-      expect(API.importPlugin).toHaveBeenCalledWith(formData);
+      expect(API.importPlugin).toHaveBeenCalledWith(formData, false, false);
     });
 
     it('should propagate API errors', async () => {

From 2573928e2a40adc3d531f8457e99c8085799d166 Mon Sep 17 00:00:00 2001
From: Seth Van Niekerk <seth@swvn.io>
Date: Fri, 10 Apr 2026 14:44:07 -0400
Subject: [PATCH 148/172] enhance plugin installation and manifest fetching
 error handling with code review suggestions

---
 apps/plugins/api_views.py | 57 +++++++++++++++------------------------
 1 file changed, 21 insertions(+), 36 deletions(-)

diff --git a/apps/plugins/api_views.py b/apps/plugins/api_views.py
index 425ac77e..8f7a2c71 100644
--- a/apps/plugins/api_views.py
+++ b/apps/plugins/api_views.py
@@ -200,14 +200,18 @@ def _install_plugin_from_zip(zip_file, plugins_dir, *, file_name="plugin.zip", a
             with zf.open(member, "r") as src, open(dest_path, "wb") as dst:
                 shutil.copyfileobj(src, dst)
 
-        # Find candidate directory containing plugin.py or __init__.py
+        # Single walk: find candidate plugin dirs AND logo.png simultaneously
         candidates = []
+        logo_candidates_raw = []
         for dirpath, dirnames, filenames in os.walk(tmp_root):
+            depth = len(os.path.relpath(dirpath, tmp_root).split(os.sep))
             has_pluginpy = "plugin.py" in filenames
             has_init = "__init__.py" in filenames
             if has_pluginpy or has_init:
-                depth = len(os.path.relpath(dirpath, tmp_root).split(os.sep))
                 candidates.append((0 if has_pluginpy else 1, depth, dirpath))
+            for filename in filenames:
+                if filename.lower() == "logo.png":
+                    logo_candidates_raw.append((depth, os.path.join(dirpath, filename)))
         if not candidates:
             return {"success": False, "error": "Invalid plugin: missing plugin.py or package __init__.py"}
 
@@ -223,23 +227,18 @@ def _install_plugin_from_zip(zip_file, plugins_dir, *, file_name="plugin.zip", a
         if len(plugin_key) > 128:
             plugin_key = plugin_key[:128]
 
-        # Extract logo
+        # Extract logo (prefer one inside the chosen plugin dir, then shallowest)
         logo_bytes = None
         try:
             chosen_abs = os.path.abspath(chosen)
             logo_candidates = []
-            for dirpath, _, filenames in os.walk(tmp_root):
-                for filename in filenames:
-                    if filename.lower() != "logo.png":
-                        continue
-                    full_path = os.path.join(dirpath, filename)
-                    full_abs = os.path.abspath(full_path)
-                    try:
-                        in_chosen = os.path.commonpath([chosen_abs, full_abs]) == chosen_abs
-                    except Exception:
-                        in_chosen = False
-                    depth = len(os.path.relpath(dirpath, tmp_root).split(os.sep))
-                    logo_candidates.append((0 if in_chosen else 1, depth, full_path))
+            for depth, full_path in logo_candidates_raw:
+                full_abs = os.path.abspath(full_path)
+                try:
+                    in_chosen = os.path.commonpath([chosen_abs, full_abs]) == chosen_abs
+                except Exception:
+                    in_chosen = False
+                logo_candidates.append((0 if in_chosen else 1, depth, full_path))
             if logo_candidates:
                 logo_candidates.sort()
                 with open(logo_candidates[0][2], "rb") as fh:
@@ -667,9 +666,10 @@ def _is_official_sounding(name):
 def _fetch_manifest(url, public_key_text=None):
     """Fetch a remote manifest JSON, validate structure, return (data, verified)."""
     _validate_fetch_url(url)
-    resp = http_requests.get(url, timeout=MANIFEST_FETCH_TIMEOUT)
-    resp.raise_for_status()
-    data = resp.json()
+    with http_requests.get(url, timeout=MANIFEST_FETCH_TIMEOUT, stream=True) as resp:
+        resp.raise_for_status()
+        body = b"".join(resp.iter_content(8192))
+    data = json.loads(body)
     # Accept both top-level {manifest: {plugins: [...]}} and {plugins: [...]}
     if "manifest" in data and "plugins" in data["manifest"]:
         signature = data.get("signature")
@@ -708,7 +708,7 @@ class PluginRepoListCreateAPIView(PluginAuthMixin, APIView):
             logger.warning("Initial manifest fetch failed for %s: %s", repo.url, e)
             repo.delete()
             return Response(
-                {"error": f"Failed to fetch manifest: {e}"},
+                {"error": "Failed to fetch manifest. Check the URL and try again."},
                 status=status.HTTP_400_BAD_REQUEST,
             )
         err = _save_fetched_manifest_to_repo(repo, data, verified)
@@ -874,7 +874,7 @@ class PluginRepoRefreshAPIView(PluginAuthMixin, APIView):
         except Exception as e:
             logger.exception("Manifest fetch failed for %s", repo.url)
             return Response(
-                {"error": f"Failed to fetch manifest: {e}"},
+                {"error": "Failed to fetch manifest. Check the URL and try again."},
                 status=status.HTTP_502_BAD_GATEWAY,
             )
         err = _save_fetched_manifest_to_repo(repo, data, verified)
@@ -895,21 +895,6 @@ class AvailablePluginsAPIView(PluginAuthMixin, APIView):
     )
     def get(self, request):
         repos = PluginRepo.objects.filter(enabled=True)
-
-        # Auto-fetch manifest for repos that have never been refreshed
-        for repo in repos:
-            if not repo.cached_manifest:
-                try:
-                    key_text = repo.public_key if not repo.is_official else None
-                    data, verified = _fetch_manifest(repo.url, public_key_text=key_text)
-                    err = _save_fetched_manifest_to_repo(repo, data, verified)
-                    if err:
-                        logger.warning("Skipping repo %s: %s", repo.url, err)
-                except Exception:
-                    pass
-
-        # Re-read in case we just updated
-        repos = PluginRepo.objects.filter(enabled=True)
         configs = list(PluginConfig.objects.select_related("source_repo").all())
         # Build lookup: slug -> (version, repo_id, repo_name) for managed plugins,
         # plus key -> version for all plugins (legacy matching)
@@ -1154,7 +1139,7 @@ class PluginInstallFromRepoAPIView(PluginAuthMixin, APIView):
         except Exception as e:
             logger.exception("Failed to download plugin from %s", download_url)
             return Response(
-                {"error": f"Failed to download plugin: {e}"},
+                {"error": "Failed to download plugin. Check the URL and try again."},
                 status=status.HTTP_502_BAD_GATEWAY,
             )
 

From e8e1560106f24733d43acde4e40eeaec79bb2d1f Mon Sep 17 00:00:00 2001
From: Seth Van Niekerk <seth@swvn.io>
Date: Fri, 10 Apr 2026 15:17:01 -0400
Subject: [PATCH 149/172] simplify component structure and improve layout
 responsiveness

---
 .../components/cards/AvailablePluginCard.jsx  | 29 ++++++-------------
 frontend/src/components/cards/PluginCard.jsx  | 27 +++++------------
 frontend/src/pages/PluginBrowse.jsx           |  2 +-
 frontend/src/pages/Plugins.jsx                |  2 +-
 4 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/frontend/src/components/cards/AvailablePluginCard.jsx b/frontend/src/components/cards/AvailablePluginCard.jsx
index 7362c6da..78e81a48 100644
--- a/frontend/src/components/cards/AvailablePluginCard.jsx
+++ b/frontend/src/components/cards/AvailablePluginCard.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useState } from 'react';
 import {
   ActionIcon,
   Avatar,
@@ -143,19 +143,6 @@ const AvailablePluginCard = ({ plugin, appVersion, multiRepo = false, autoOpenDe
     plugin.latest_version && plugin.installed_version &&
     compareVersions(plugin.latest_version, plugin.installed_version) < 0;
 
-  const descContainerRef = useRef(null);
-  const [descLines, setDescLines] = useState(3);
-  useEffect(() => {
-    const el = descContainerRef.current;
-    if (!el) return;
-    const obs = new ResizeObserver(() => {
-      const lh = parseFloat(getComputedStyle(el).lineHeight) || 22;
-      setDescLines(Math.max(1, Math.min(3, Math.floor(el.clientHeight / lh))));
-    });
-    obs.observe(el);
-    return () => obs.disconnect();
-  }, []);
-
   const doInstall = (params) => {
     if (plugin.deprecated) {
       setPendingDeprecatedInstall(params);
@@ -291,7 +278,7 @@ const AvailablePluginCard = ({ plugin, appVersion, multiRepo = false, autoOpenDe
       style={{
         display: 'flex',
         flexDirection: 'column',
-        height: 220,
+        minHeight: 220,
         ...(multiRepo && plugin.is_official_repo ? { borderColor: '#0e6459' } : {}),
       }}
     >
@@ -311,7 +298,9 @@ const AvailablePluginCard = ({ plugin, appVersion, multiRepo = false, autoOpenDe
             </Text>
             <Group gap={6} align="center" wrap="nowrap">
               {plugin.author && (
-                <Text size="xs" c="dimmed">by {plugin.author}</Text>
+                <Text size="xs" c="dimmed" truncate style={{ minWidth: 0, maxWidth: '100%' }}>
+                  {plugin.author}
+                </Text>
               )}
               <StatusBadge
                 status={plugin.install_status}
@@ -333,14 +322,14 @@ const AvailablePluginCard = ({ plugin, appVersion, multiRepo = false, autoOpenDe
       </Group>
 
       <Box style={{ flex: 1, minHeight: 0, overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
-        <div ref={descContainerRef} style={{ flex: 1, minHeight: 0, overflow: 'hidden' }}>
-          <Text size="sm" c="dimmed" lineClamp={descLines}>
+        <div style={{ overflow: 'hidden' }}>
+          <Text size="sm" c="dimmed" lineClamp={3} mb={0}>
             {plugin.description}
           </Text>
         </div>
 
-        <Stack gap={4} style={{ flexShrink: 0 }}>
-          <Group gap="xs" wrap="wrap">
+        <Stack gap={2} mt="auto" pt={4} style={{ flexShrink: 0 }}>
+        <Group gap="xs" wrap="wrap">
             {plugin.latest_version && (
               <Badge size="xs" variant="default">
                 <span style={{ opacity: 0.5, marginRight: 4 }}>LATEST</span>
diff --git a/frontend/src/components/cards/PluginCard.jsx b/frontend/src/components/cards/PluginCard.jsx
index c8e1c1cd..d37ce6d1 100644
--- a/frontend/src/components/cards/PluginCard.jsx
+++ b/frontend/src/components/cards/PluginCard.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useState } from 'react';
 import { showNotification } from '../../utils/notificationUtils.js';
 import { Field } from '../Field.jsx';
 import {
@@ -129,18 +129,6 @@ const PluginCard = ({
   const [installing, setInstalling] = useState(false);
   const [uninstalling] = useState(false);
 
-  const descContainerRef = useRef(null);
-  const [descLines, setDescLines] = useState(3);
-  useEffect(() => {
-    const el = descContainerRef.current;
-    if (!el) return;
-    const obs = new ResizeObserver(() => {
-      const lh = parseFloat(getComputedStyle(el).lineHeight) || 22;
-      setDescLines(Math.max(1, Math.min(3, Math.floor(el.clientHeight / lh))));
-    });
-    obs.observe(el);
-    return () => obs.disconnect();
-  }, []);
   const installPlugin = usePluginStore((s) => s.installPlugin);
 
   // Keep local enabled state in sync with props
@@ -391,10 +379,11 @@ const PluginCard = ({
                   <Text
                     size="xs"
                     c="dimmed"
+                    truncate
                     onClick={isManaged ? () => openModal('details') : undefined}
-                    style={isManaged ? { cursor: 'pointer' } : undefined}
+                    style={{ minWidth: 0, maxWidth: '100%', ...(isManaged ? { cursor: 'pointer' } : {}) }}
                   >
-                    by {plugin.author}
+                    {plugin.author}
                   </Text>
                 )}
                 {plugin.help_url && (
@@ -466,9 +455,9 @@ const PluginCard = ({
           </Group>
         </Group>
 
-        {/* Description — flex: 1 pushes bottom content down */}
-        <div ref={descContainerRef} style={{ flex: 1, minHeight: 0, overflow: 'hidden' }}>
-          <Text size="sm" c="dimmed" lineClamp={descLines} mb="xs">
+        {/* Description */}
+        <div style={{ overflow: 'hidden' }}>
+          <Text size="sm" c="dimmed" lineClamp={3} mb={0}>
             {plugin.description}
           </Text>
         </div>
@@ -483,7 +472,7 @@ const PluginCard = ({
         )}
 
         {/* Bottom metadata pills */}
-        <Stack gap={4} style={{ flexShrink: 0 }}>
+        <Stack gap={2} mt="auto" pt={4} style={{ flexShrink: 0 }}>
           <Group gap="xs" wrap="wrap">
             <Badge size="xs" variant="default">
               <span style={{ opacity: 0.5, marginRight: 4 }}>VERSION</span>
diff --git a/frontend/src/pages/PluginBrowse.jsx b/frontend/src/pages/PluginBrowse.jsx
index 116c6075..d8853e6a 100644
--- a/frontend/src/pages/PluginBrowse.jsx
+++ b/frontend/src/pages/PluginBrowse.jsx
@@ -403,7 +403,7 @@ export default function PluginBrowsePage() {
       {!loading && filteredPlugins.length > 0 && (
         <>
           <SimpleGrid
-            cols={{ base: 1, sm: 2, lg: 3 }}
+            cols={{ base: 1, md: 2, xl: 3 }}
             spacing="md"
           >
             {paginatedPlugins.map((p) => (
diff --git a/frontend/src/pages/Plugins.jsx b/frontend/src/pages/Plugins.jsx
index 10d1afe2..36002776 100644
--- a/frontend/src/pages/Plugins.jsx
+++ b/frontend/src/pages/Plugins.jsx
@@ -144,7 +144,7 @@ const PluginsList = ({ onRequestDelete, onRequireTrust, onRequestConfirm }) => {
 
       {filteredPlugins.length > 0 && (
         <SimpleGrid
-          cols={{ base: 1, sm: 2, lg: 3 }}
+          cols={{ base: 1, md: 2, xl: 3 }}
           spacing="md"
         >
           <ErrorBoundary>

From 9734bca23994106b61cec6c540719aa4edf9fd5d Mon Sep 17 00:00:00 2001
From: Seth Van Niekerk <seth@swvn.io>
Date: Fri, 10 Apr 2026 15:22:08 -0400
Subject: [PATCH 150/172] fix: update author display in PluginCard test

---
 frontend/src/components/cards/__tests__/PluginCard.test.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/cards/__tests__/PluginCard.test.jsx b/frontend/src/components/cards/__tests__/PluginCard.test.jsx
index 89e4c1e5..7cfb8675 100644
--- a/frontend/src/components/cards/__tests__/PluginCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/PluginCard.test.jsx
@@ -138,7 +138,7 @@ describe('PluginCard', () => {
       expect(screen.getByText('Test Plugin')).toBeInTheDocument();
       expect(screen.getByText('A test plugin')).toBeInTheDocument();
       expect(screen.getByText('v1.0.0')).toBeInTheDocument();
-      expect(screen.getByText('by Test Author')).toBeInTheDocument();
+      expect(screen.getByText('Test Author')).toBeInTheDocument();
     });
 
     it('should render plugin logo when logo_url is provided', () => {

From 03b50420f51f3d3c6c4c89260f853ed6a7f9e19f Mon Sep 17 00:00:00 2001
From: Seth Van Niekerk <seth@swvn.io>
Date: Fri, 10 Apr 2026 15:40:34 -0400
Subject: [PATCH 151/172] update background color for AvailablePluginCard and
 PluginCard components; adjust button group alignment in PluginBrowsePage

---
 .../components/cards/AvailablePluginCard.jsx   |  1 +
 frontend/src/components/cards/PluginCard.jsx   |  1 +
 frontend/src/pages/PluginBrowse.jsx            | 18 +++++++++---------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/cards/AvailablePluginCard.jsx b/frontend/src/components/cards/AvailablePluginCard.jsx
index 78e81a48..af6657d7 100644
--- a/frontend/src/components/cards/AvailablePluginCard.jsx
+++ b/frontend/src/components/cards/AvailablePluginCard.jsx
@@ -279,6 +279,7 @@ const AvailablePluginCard = ({ plugin, appVersion, multiRepo = false, autoOpenDe
         display: 'flex',
         flexDirection: 'column',
         minHeight: 220,
+        backgroundColor: '#27272A',
         ...(multiRepo && plugin.is_official_repo ? { borderColor: '#0e6459' } : {}),
       }}
     >
diff --git a/frontend/src/components/cards/PluginCard.jsx b/frontend/src/components/cards/PluginCard.jsx
index d37ce6d1..59dd9250 100644
--- a/frontend/src/components/cards/PluginCard.jsx
+++ b/frontend/src/components/cards/PluginCard.jsx
@@ -349,6 +349,7 @@ const PluginCard = ({
           flexDirection: 'column',
           height: '100%',
           minHeight: 220,
+          backgroundColor: '#27272A',
           opacity: !missing && enabled ? 1 : 0.6,
         }}
       >
diff --git a/frontend/src/pages/PluginBrowse.jsx b/frontend/src/pages/PluginBrowse.jsx
index d8853e6a..b32b7934 100644
--- a/frontend/src/pages/PluginBrowse.jsx
+++ b/frontend/src/pages/PluginBrowse.jsx
@@ -685,7 +685,15 @@ export default function PluginBrowsePage() {
                 onBlur={() => { if (!newRepoPublicKey) setGpgKeyFocused(false); }}
                 styles={repoPreview?.valid && repoPreview?.signature_verified === false && !newRepoPublicKey.trim() ? { input: { borderColor: 'var(--mantine-color-yellow-6)' } } : undefined}
               />
-              <Group gap="xs">
+              <Group gap="xs" justify="flex-end">
+                <Button
+                  variant="subtle"
+                  color="gray"
+                  size="sm"
+                  onClick={() => { setShowAddRepo(false); setNewRepoUrl(''); setNewRepoPublicKey(''); setRepoPreview(null); }}
+                >
+                  Cancel
+                </Button>
                 <Button
                   onClick={handleAddRepo}
                   loading={addingRepo}
@@ -695,14 +703,6 @@ export default function PluginBrowsePage() {
                 >
                   Add Repo
                 </Button>
-                <Button
-                  variant="subtle"
-                  color="gray"
-                  size="sm"
-                  onClick={() => { setShowAddRepo(false); setNewRepoUrl(''); setNewRepoPublicKey(''); setRepoPreview(null); }}
-                >
-                  Cancel
-                </Button>
               </Group>
             </>
           )}

From f83523cfa282733dc932071ed6a0d50a2c0285d1 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 17:50:02 -0500
Subject: [PATCH 152/172] changelog: Update changelog for plugin hub.

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ac847d1..7f96b283 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - **CVE-2026-3902**: ASGI header spoofing via underscore/hyphen conflation.
   - **CVE-2026-4277**: Privilege abuse in `GenericInlineModelAdmin`.
 
+### Added
+
+- **Plugin Hub**: administrators can now browse, install, and update plugins directly from remote repositories via a new Plugin Hub page in Settings. (Closes #393) — Thanks [@sethwv](https://github.com/sethwv)
+  - Install plugins directly from the hub: the release zip is downloaded, SHA256 integrity is verified, and the plugin is installed atomically.
+  - Update managed plugins when a newer version is available from their source repo. Version compatibility constraints (`min_dispatcharr_version` / `max_dispatcharr_version`) are enforced at install time.
+  - Browse available plugins from all enabled repos with name, description, version, author, and icon.
+  - Plugins installed from a repo are tracked as "managed": source repo, slug, installed version, prerelease flag, and deprecated status are all persisted and surfaced in the UI.
+  - Add plugin repositories by manifest URL. The official Dispatcharr Plugins repository is pre-configured; third-party repos are supported by supplying an optional GPG public key.
+  - Manifest signatures are verified via GPG; the official repo uses a bundled public key. Signature status is displayed per-repo.
+  - Preview a repository URL before adding it - validates the manifest and reports plugin count and signature status without saving anything.
+  - Configurable automatic manifest refresh interval (in hours; 0 to disable) runs as a Celery background task.
+
 ### Removed
 
 - Removed dead `VODConnectionManager` class (`apps/proxy/vod_proxy/connection_manager.py`) and its associated helpers, which had been superseded by `MultiWorkerVODConnectionManager`. All active code already used the multi-worker implementation. Removed the unused `VODConnectionManager` import from `vod_proxy/views.py`, the unscheduled `cleanup_vod_connections` task from `apps/proxy/tasks.py`, and the unscheduled `cleanup_vod_persistent_connections` task from `core/tasks.py`.

From e861fca0926baebc1fc088757f43e53ee4d39c41 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 18:29:13 -0500
Subject: [PATCH 153/172] Enhancement: Enhanced Swagger UI authorization
 dialog: registered a custom `OpenApiAuthenticationExtension` for
 `ApiKeyAuthentication` so drf-spectacular now generates an `ApiKeyAuth
 (apiKey)` entry alongside `jwtAuth`. Both entries include descriptive text
 linking to the relevant endpoints (`/api/accounts/token/`,
 `/api/accounts/api-keys/generate/`, `/api/accounts/api-keys/revoke/`).

---
 CHANGELOG.md                    |  1 +
 apps/accounts/authentication.py | 37 +++++++++++++++++++++++++++++++++
 dispatcharr/settings.py         | 11 ----------
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f96b283..470fc135 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Enhanced Swagger UI authorization dialog: registered a custom `OpenApiAuthenticationExtension` for `ApiKeyAuthentication` so drf-spectacular now generates an `ApiKeyAuth (apiKey)` entry alongside `jwtAuth`. Both entries include descriptive text linking to the relevant endpoints (`/api/accounts/token/`, `/api/accounts/api-keys/generate/`, `/api/accounts/api-keys/revoke/`).
 - Refactored frontend form components (`AccountInfoModal`, `AssignChannelNumbers`, `Channel`, `ChannelBatch`, `ChannelGroup`, `Connection`, `CronBuilder`, `DummyEPG`, and `EPG`) to extract business logic into dedicated utility modules under `src/utils/forms/`. Each extracted module is covered by unit tests. Mantine compound component references (`Table.Tbody`, `Popover.Target`, `Accordion.Item`, etc.) have been updated to use flat named imports. — Thanks [@nick4810](https://github.com/nick4810)
 - Improved the EPG BOM fix from v0.22.1: replaced the `lstrip(b'\xef\xbb\xbf')` / `startswith` approach with `start.find(b'<?xml')`, which locates the XML declaration regardless of any leading bytes BOM, whitespace, or other encoding markers without needing to know what those bytes are.
 - Dependency updates:
diff --git a/apps/accounts/authentication.py b/apps/accounts/authentication.py
index 5380af49..f5169e7f 100644
--- a/apps/accounts/authentication.py
+++ b/apps/accounts/authentication.py
@@ -1,9 +1,46 @@
 from rest_framework import authentication
 from rest_framework import exceptions
 from django.conf import settings
+from drf_spectacular.extensions import OpenApiAuthenticationExtension
 from .models import User
 
 
+class JWTAuthenticationScheme(OpenApiAuthenticationExtension):
+    target_class = "rest_framework_simplejwt.authentication.JWTAuthentication"
+    name = "jwtAuth"
+
+    def get_security_definition(self, auto_schema):
+        return {
+            "type": "http",
+            "scheme": "bearer",
+            "bearerFormat": "JWT",
+            "description": (
+                "JWT Bearer authentication.\n\n"
+                "Obtain a token pair via `POST /api/accounts/token/` using your username and password, "
+                "then paste the **access token** here — Swagger adds the `Bearer ` prefix automatically.\n\n"
+                "Access tokens expire after 30 minutes. Refresh using `POST /api/accounts/token/refresh/`."
+            ),
+        }
+
+
+class ApiKeyAuthenticationScheme(OpenApiAuthenticationExtension):
+    target_class = "apps.accounts.authentication.ApiKeyAuthentication"
+    name = "ApiKeyAuth"
+
+    def get_security_definition(self, auto_schema):
+        return {
+            "type": "apiKey",
+            "in": "header",
+            "name": "X-API-Key",
+            "description": (
+                "API key authentication.\n\n"
+                "Pass your personal API key in the `X-API-Key` request header. "
+                "Keys can be generated via `POST /api/accounts/api-keys/generate/` "
+                "and revoked via `POST /api/accounts/api-keys/revoke/`."
+            ),
+        }
+
+
 class ApiKeyAuthentication(authentication.BaseAuthentication):
     """
     Accepts header `Authorization: ApiKey <key>` or `X-API-Key: <key>`.
diff --git a/dispatcharr/settings.py b/dispatcharr/settings.py
index 4bf4e8dc..b2b1909f 100644
--- a/dispatcharr/settings.py
+++ b/dispatcharr/settings.py
@@ -280,17 +280,6 @@ SPECTACULAR_SETTINGS = {
     "DESCRIPTION": "API documentation for Dispatcharr",
     "VERSION": "1.0.0",
     "SERVE_INCLUDE_SCHEMA": False,
-    "SECURITY": [{"BearerAuth": []}],
-    "COMPONENTS": {
-        "securitySchemes": {
-            "BearerAuth": {
-                "type": "http",
-                "scheme": "bearer",
-                "bearerFormat": "JWT",
-                "description": "Enter your JWT access token. The 'Bearer ' prefix is added automatically.",
-            }
-        }
-    },
 }
 
 LANGUAGE_CODE = "en-us"

From 8afaa0118417460b14a53e1fedff7ef724d3a1a5 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Fri, 10 Apr 2026 19:54:10 -0500
Subject: [PATCH 154/172] security: Extended rate limiting to the session-auth
 login alias (`POST /api/accounts/auth/login/`). It now delegates entirely to
 `TokenObtainPairView`, inheriting its throttle, network access check, and
 audit logging, and returns JWT tokens instead of a session cookie (the
 session-based response was unusable since `SessionAuthentication` is not in
 `DEFAULT_AUTHENTICATION_CLASSES`). Both endpoints share the same `"login"`
 throttle scope, so attempts across either path count against the same per-IP
 limit.

---
 CHANGELOG.md               |  1 +
 apps/accounts/api_views.py | 55 ++++----------------------------------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 470fc135..ff9802f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Prevented users from setting `xc_password` (and other admin-managed keys) on their own account via the `PATCH /api/accounts/users/me/` endpoint.
 - Hardened the HLS proxy `change_stream` endpoint by converting it from a plain Django view to a DRF `@api_view` with `@permission_classes([IsAdmin])`, ensuring the endpoint actually enforces admin-only access. The previous decorator arrangement (`@csrf_exempt` + `@permission_classes`) had no effect on a plain Django view.
 - Added rate limiting to the login endpoint (`POST /api/accounts/token/`) using DRF's built-in throttling. A `LoginRateThrottle` (3 requests/minute per IP, sliding window) is applied to the `TokenObtainPairView`. Repeated failed attempts from the same IP receive `429 Too Many Requests`.
+- Extended rate limiting to the session-auth login alias (`POST /api/accounts/auth/login/`). It now delegates entirely to `TokenObtainPairView`, inheriting its throttle, network access check, and audit logging, and returns JWT tokens instead of a session cookie (the session-based response was unusable since `SessionAuthentication` is not in `DEFAULT_AUTHENTICATION_CLASSES`). Both endpoints share the same `"login"` throttle scope, so attempts across either path count against the same per-IP limit.
 - Removed `CORS_ALLOW_CREDENTIALS = True` from CORS configuration. Dispatcharr authenticates via JWT `Authorization` headers and API keys — not cookies — so credentials are never sent cross-origin by browsers. The setting was also redundant: browsers reject `Access-Control-Allow-Credentials: true` when `Access-Control-Allow-Origin` is a wildcard (`*`), so it had no effect in practice.
 - Updated frontend npm dependencies to resolve 6 audit vulnerabilities (6 high):
   - Updated `@xmldom/xmldom` 0.8.11 → 0.8.12, resolving **high** XML injection via unsafe CDATA serialization allowing attacker-controlled markup insertion ([GHSA-wh4c-j3r5-mjhp](https://github.com/advisories/GHSA-wh4c-j3r5-mjhp))
diff --git a/apps/accounts/api_views.py b/apps/accounts/api_views.py
index 10e9272c..2ac410f2 100644
--- a/apps/accounts/api_views.py
+++ b/apps/accounts/api_views.py
@@ -163,7 +163,7 @@ class AuthViewSet(viewsets.ViewSet):
         return []
 
     @extend_schema(
-        description="Authenticate and log in a user",
+        description="Alias for POST /api/accounts/token/ — returns JWT access and refresh tokens.",
         request=inline_serializer(
             name="LoginRequest",
             fields={
@@ -173,55 +173,10 @@ class AuthViewSet(viewsets.ViewSet):
         ),
     )
     def login(self, request):
-        """Logs in a user and returns user details"""
-        username = request.data.get("username")
-        password = request.data.get("password")
-        user = authenticate(request, username=username, password=password)
-
-        # Get client info for logging
-        from core.utils import log_system_event
-        client_ip = request.META.get('REMOTE_ADDR', 'unknown')
-        user_agent = request.META.get('HTTP_USER_AGENT', 'unknown')
-        logger.debug(f"Login attempt via session: user={username} ip={client_ip}")
-
-        if user:
-            login(request, user)
-            # Update last_login timestamp
-            from django.utils import timezone
-            user.last_login = timezone.now()
-            user.save(update_fields=['last_login'])
-
-            # Log successful login
-            log_system_event(
-                event_type='login_success',
-                user=username,
-                client_ip=client_ip,
-                user_agent=user_agent,
-            )
-            logger.info(f"Login success via session: user={username} ip={client_ip}")
-
-            return Response(
-                {
-                    "message": "Login successful",
-                    "user": {
-                        "id": user.id,
-                        "username": user.username,
-                        "email": user.email,
-                        "groups": list(user.groups.values_list("name", flat=True)),
-                    },
-                }
-            )
-
-        # Log failed login attempt
-        log_system_event(
-            event_type='login_failed',
-            user=username or 'unknown',
-            client_ip=client_ip,
-            user_agent=user_agent,
-            reason='Invalid credentials',
-        )
-        logger.info(f"Login failed via session: user={username} ip={client_ip}")
-        return Response({"error": "Invalid credentials"}, status=400)
+        """Delegates to TokenObtainPairView (JWT login). Throttling, logging, and
+        network access checks are handled there."""
+        view = TokenObtainPairView.as_view()
+        return view(request._request)
 
     @extend_schema(
         description="Log out the current user",

From 4a6724c94b4533f3b439d82771123d04bccd08cb Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 11 Apr 2026 09:34:38 -0500
Subject: [PATCH 155/172] Enhancement: FloatingVideo player: the native video
 controls (timeline, play/pause, volume) are now hidden by default when a live
 stream starts and only appear when the user hovers over the player.

---
 CHANGELOG.md                              |  1 +
 frontend/src/components/FloatingVideo.jsx | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff9802f4..4e417897 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- FloatingVideo player: the native video controls (timeline, play/pause, volume) are now hidden by default when a live stream starts and only appear when the user hovers over the player.
 - Enhanced Swagger UI authorization dialog: registered a custom `OpenApiAuthenticationExtension` for `ApiKeyAuthentication` so drf-spectacular now generates an `ApiKeyAuth (apiKey)` entry alongside `jwtAuth`. Both entries include descriptive text linking to the relevant endpoints (`/api/accounts/token/`, `/api/accounts/api-keys/generate/`, `/api/accounts/api-keys/revoke/`).
 - Refactored frontend form components (`AccountInfoModal`, `AssignChannelNumbers`, `Channel`, `ChannelBatch`, `ChannelGroup`, `Connection`, `CronBuilder`, `DummyEPG`, and `EPG`) to extract business logic into dedicated utility modules under `src/utils/forms/`. Each extracted module is covered by unit tests. Mantine compound component references (`Table.Tbody`, `Popover.Target`, `Accordion.Item`, etc.) have been updated to use flat named imports. — Thanks [@nick4810](https://github.com/nick4810)
 - Improved the EPG BOM fix from v0.22.1: replaced the `lstrip(b'\xef\xbb\xbf')` / `startswith` approach with `start.find(b'<?xml')`, which locates the XML declaration regardless of any leading bytes BOM, whitespace, or other encoding markers without needing to know what those bytes are.
diff --git a/frontend/src/components/FloatingVideo.jsx b/frontend/src/components/FloatingVideo.jsx
index f5bdc303..380f7153 100644
--- a/frontend/src/components/FloatingVideo.jsx
+++ b/frontend/src/components/FloatingVideo.jsx
@@ -135,7 +135,8 @@ export default function FloatingVideo() {
 
   const [isLoading, setIsLoading] = useState(false);
   const [loadError, setLoadError] = useState(null);
-  const [showOverlay, setShowOverlay] = useState(true);
+  const [showOverlay, setShowOverlay] = useState(false);
+  const [showControls, setShowControls] = useState(false);
   const [videoSize, setVideoSize] = useState(() => {
     const prefs = getPlayerPrefs();
     const saved = prefs.size;
@@ -225,7 +226,8 @@ export default function FloatingVideo() {
 
     setIsLoading(true);
     setLoadError(null);
-    setShowOverlay(true); // Show overlay initially
+    setShowOverlay(false);
+    setShowControls(false);
 
     console.log('Initializing VOD player for:', streamUrl);
 
@@ -248,7 +250,8 @@ export default function FloatingVideo() {
         console.log('Auto-play prevented:', e);
         setLoadError('Auto-play was prevented. Click play to start.');
       });
-      // Start overlay timer when video is ready
+      // Show overlay briefly when video is ready, then auto-hide
+      setShowOverlay(true);
       startOverlayTimer();
     };
     const handleError = (e) => {
@@ -300,10 +303,8 @@ export default function FloatingVideo() {
 
     setIsLoading(true);
     setLoadError(null);
+    setShowControls(false);
 
-    console.log('Initializing live stream player for:', streamUrl);
-    console.log('Access token present:', !!accessToken);
-    console.log('Current access token from auth store:', accessToken);
     try {
       if (!mpegts.getFeatureList().mseLivePlayback) {
         setIsLoading(false);
@@ -851,6 +852,7 @@ export default function FloatingVideo() {
         <Box
           style={{ position: 'relative' }}
           onMouseEnter={() => {
+            setShowControls(true);
             if (contentType === 'vod' && !isLoading) {
               setShowOverlay(true);
               if (overlayTimeoutRef.current) {
@@ -867,7 +869,7 @@ export default function FloatingVideo() {
           {/* Enhanced video element with better controls for VOD */}
           <video
             ref={videoRef}
-            controls
+            controls={showControls}
             className="floating-video-no-drag"
             style={{
               width: '100%',

From fd7ac0029d73a4ca1f550b84371b6a5c717ac7d3 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 11 Apr 2026 12:46:36 -0500
Subject: [PATCH 156/172] Enhancement: M3U stream name parsing now uses the
 comma text (the canonical display title per the base `#EXTINF` spec) as the
 primary stream name, falling back to `tvc-guide-title`, then `tvg-name`,
 rather than preferring `tvg-name` first. Providers that use `tvg-name` as an
 EPG key and put the human-readable title after the comma will now display the
 correct name. Providers that duplicate the same value in both fields are
 unaffected. (Fixes #1081)

---
 CHANGELOG.md      |  1 +
 apps/m3u/tasks.py | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e417897..e7f0d28f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- M3U stream name parsing now uses the comma text (the canonical display title per the base `#EXTINF` spec) as the primary stream name, falling back to `tvc-guide-title`, then `tvg-name`, rather than preferring `tvg-name` first. Providers that use `tvg-name` as an EPG key and put the human-readable title after the comma will now display the correct name. Providers that duplicate the same value in both fields are unaffected. (Fixes #1081)
 - FloatingVideo player: the native video controls (timeline, play/pause, volume) are now hidden by default when a live stream starts and only appear when the user hovers over the player.
 - Enhanced Swagger UI authorization dialog: registered a custom `OpenApiAuthenticationExtension` for `ApiKeyAuthentication` so drf-spectacular now generates an `ApiKeyAuth (apiKey)` entry alongside `jwtAuth`. Both entries include descriptive text linking to the relevant endpoints (`/api/accounts/token/`, `/api/accounts/api-keys/generate/`, `/api/accounts/api-keys/revoke/`).
 - Refactored frontend form components (`AccountInfoModal`, `AssignChannelNumbers`, `Channel`, `ChannelBatch`, `ChannelGroup`, `Connection`, `CronBuilder`, `DummyEPG`, and `EPG`) to extract business logic into dedicated utility modules under `src/utils/forms/`. Each extracted module is covered by unit tests. Mantine compound component references (`Table.Tbody`, `Popover.Target`, `Accordion.Item`, etc.) have been updated to use flat named imports. — Thanks [@nick4810](https://github.com/nick4810)
diff --git a/apps/m3u/tasks.py b/apps/m3u/tasks.py
index 354a2ef4..a2b21ee0 100644
--- a/apps/m3u/tasks.py
+++ b/apps/m3u/tasks.py
@@ -514,12 +514,10 @@ def parse_extinf_line(line: str) -> dict:
         else:
             display_name = content.strip()
 
-    # Use tvg-name attribute if available; otherwise try tvc-guide-title, then fall back to display name.
-    name = get_case_insensitive_attr(attrs, "tvg-name", None)
-    if not name:
-        name = get_case_insensitive_attr(attrs, "tvc-guide-title", None)
-    if not name:
-        name = display_name
+    # Per the base #EXTINF spec, the comma text is the canonical human-readable title.
+    # Fall back to tvc-guide-title, then tvg-name (which some providers use as an EPG key,
+    # not a display label), and finally the raw content if everything else is empty.
+    name = display_name or get_case_insensitive_attr(attrs, "tvc-guide-title", None) or get_case_insensitive_attr(attrs, "tvg-name", None) or content.strip()
     return {"attributes": attrs, "display_name": display_name, "name": name}
 
 

From bfec229ca9103e2abe847e1d8b5b1d1037a127be Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 11 Apr 2026 14:57:52 -0500
Subject: [PATCH 157/172] =?UTF-8?q?Enhancements:=20-=20Rewrote=20the=20M3U?=
 =?UTF-8?q?=20line=20parser=20as=20an=20`iter=5Fm3u=5Fentries`=20generator?=
 =?UTF-8?q?=20that=20owns=20the=20full=20per-entry=20state=20machine.=20In?=
 =?UTF-8?q?termediate=20directive=20lines=20between=20`#EXTINF`=20and=20th?=
 =?UTF-8?q?e=20stream=20URL=20are=20now=20handled=20correctly=20rather=20t?=
 =?UTF-8?q?han=20corrupting=20the=20pending=20entry=20or=20being=20silentl?=
 =?UTF-8?q?y=20misassigned.=20A=20`#EXTINF`=20with=20no=20following=20URL?=
 =?UTF-8?q?=20is=20discarded=20with=20a=20warning=20instead=20of=20carryin?=
 =?UTF-8?q?g=20over=20a=20`url`-less=20entry=20into=20batch=20processing.?=
 =?UTF-8?q?=20Attribute=20keys=20are=20normalised=20to=20lowercase=20durin?=
 =?UTF-8?q?g=20parsing=20(provider=20attribute=20names=20remain=20case-ins?=
 =?UTF-8?q?ensitive=20end-to-end).=20The=20`#EXTINF`=20attribute=20regex?=
 =?UTF-8?q?=20is=20pre-compiled=20at=20module=20load,=20and=20attribute=20?=
 =?UTF-8?q?lookups=20use=20O(1)=20`dict.get()`=20instead=20of=20linear=20s?=
 =?UTF-8?q?cans=20=E2=80=94=20approximately=2010%=20faster=20parsing=20on?=
 =?UTF-8?q?=20large=20M3U=20files.=20-=20Added=20support=20for=20the=20`#E?=
 =?UTF-8?q?XTGRP`=20directive=20in=20M3U=20files.=20When=20a=20`group-titl?=
 =?UTF-8?q?e`=20attribute=20is=20absent=20from=20the=20`#EXTINF`=20line,?=
 =?UTF-8?q?=20the=20value=20from=20a=20following=20`#EXTGRP:`=20line=20is?=
 =?UTF-8?q?=20used=20as=20the=20group.=20An=20explicit=20`group-title`=20a?=
 =?UTF-8?q?ttribute=20always=20takes=20priority.=20(Closes=20#1088)=20-=20?=
 =?UTF-8?q?Added=20accumulation=20of=20`#EXTVLCOPT`=20directives=20per=20e?=
 =?UTF-8?q?ntry.=20Options=20are=20stored=20as=20a=20list=20under=20`vlc?=
 =?UTF-8?q?=5Fopts`=20inside=20the=20stream's=20`custom=5Fproperties`,=20a?=
 =?UTF-8?q?vailable=20for=20downstream=20use=20(e.g.=20passing=20VLC-speci?=
 =?UTF-8?q?fic=20options=20to=20the=20player).=20This=20is=20for=20a=20pla?=
 =?UTF-8?q?nned=20future=20enhancement=20and=20can=20also=20be=20utlized?=
 =?UTF-8?q?=20with=20the=20API.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md      |   3 +
 apps/m3u/tasks.py | 158 +++++++++++++++++++++++++---------------------
 2 files changed, 88 insertions(+), 73 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7f0d28f..09c7d675 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Rewrote the M3U line parser as an `iter_m3u_entries` generator that owns the full per-entry state machine. Intermediate directive lines between `#EXTINF` and the stream URL are now handled correctly rather than corrupting the pending entry or being silently misassigned. A `#EXTINF` with no following URL is discarded with a warning instead of carrying over a `url`-less entry into batch processing. Attribute keys are normalised to lowercase during parsing (provider attribute names remain case-insensitive end-to-end). The `#EXTINF` attribute regex is pre-compiled at module load, and attribute lookups use O(1) `dict.get()` instead of linear scans — approximately 10% faster parsing on large M3U files.
+- Added support for the `#EXTGRP` directive in M3U files. When a `group-title` attribute is absent from the `#EXTINF` line, the value from a following `#EXTGRP:` line is used as the group. An explicit `group-title` attribute always takes priority. (Closes #1088)
+- Added accumulation of `#EXTVLCOPT` directives per entry. Options are stored as a list under `vlc_opts` inside the stream's `custom_properties`, available for downstream use (e.g. passing VLC-specific options to the player). This is for a planned future enhancement and can also be utlized with the API.
 - M3U stream name parsing now uses the comma text (the canonical display title per the base `#EXTINF` spec) as the primary stream name, falling back to `tvc-guide-title`, then `tvg-name`, rather than preferring `tvg-name` first. Providers that use `tvg-name` as an EPG key and put the human-readable title after the comma will now display the correct name. Providers that duplicate the same value in both fields are unaffected. (Fixes #1081)
 - FloatingVideo player: the native video controls (timeline, play/pause, volume) are now hidden by default when a live stream starts and only appear when the user hovers over the player.
 - Enhanced Swagger UI authorization dialog: registered a custom `OpenApiAuthenticationExtension` for `ApiKeyAuthentication` so drf-spectacular now generates an `ApiKeyAuth (apiKey)` entry alongside `jwtAuth`. Both entries include descriptive text linking to the relevant endpoints (`/api/accounts/token/`, `/api/accounts/api-keys/generate/`, `/api/accounts/api-keys/revoke/`).
diff --git a/apps/m3u/tasks.py b/apps/m3u/tasks.py
index a2b21ee0..8f446b6e 100644
--- a/apps/m3u/tasks.py
+++ b/apps/m3u/tasks.py
@@ -39,6 +39,8 @@ logger = logging.getLogger(__name__)
 BATCH_SIZE = 1500  # Optimized batch size for threading
 m3u_dir = os.path.join(settings.MEDIA_ROOT, "cached_m3u")
 
+_EXTINF_ATTR_RE = re.compile(r'([^\s=]+)\s*=\s*(["\'])(.*?)\2')
+
 
 def fetch_m3u_lines(account, use_cache=False):
     os.makedirs(m3u_dir, exist_ok=True)
@@ -485,18 +487,13 @@ def parse_extinf_line(line: str) -> dict:
         return None
     content = line[len("#EXTINF:") :].strip()
 
-    # Single pass: extract all attributes AND track the last attribute position
-    # This regex matches both key="value" and key='value' patterns
+    # Single pass: extract all attributes AND track the last attribute position.
+    # Keys are normalised to lowercase so downstream code can use plain dict.get()
     attrs = {}
     last_attr_end = 0
 
-    # Use a single regex that handles both quote types.
-    # Keys must stop at '=' so values like base64-padded URLs ending with '=='
-    # don't get folded into the preceding attribute name.
-    for match in re.finditer(r'([^\s=]+)\s*=\s*(["\'])(.*?)\2', content):
-        key = match.group(1)
-        value = match.group(3)
-        attrs[key] = value
+    for match in _EXTINF_ATTR_RE.finditer(content):
+        attrs[match.group(1).lower()] = match.group(3)
         last_attr_end = match.end()
 
     # Everything after the last attribute (skipping leading comma and whitespace) is the display name
@@ -517,10 +514,77 @@ def parse_extinf_line(line: str) -> dict:
     # Per the base #EXTINF spec, the comma text is the canonical human-readable title.
     # Fall back to tvc-guide-title, then tvg-name (which some providers use as an EPG key,
     # not a display label), and finally the raw content if everything else is empty.
-    name = display_name or get_case_insensitive_attr(attrs, "tvc-guide-title", None) or get_case_insensitive_attr(attrs, "tvg-name", None) or content.strip()
+    name = display_name or attrs.get("tvc-guide-title") or attrs.get("tvg-name") or content.strip()
     return {"attributes": attrs, "display_name": display_name, "name": name}
 
 
+def iter_m3u_entries(lines):
+    """
+    Generator that yields fully-assembled M3U stream entries from raw lines.
+
+    Each yielded dict is guaranteed to contain a ``url`` key in addition to the
+    fields produced by :func:`parse_extinf_line` (``attributes``, ``display_name``,
+    ``name``).  Recognised extended-tag lines that appear *between* an ``#EXTINF``
+    and its URL are accumulated into the pending entry so they are available for
+    downstream processing:
+
+    - ``#EXTGRP`` — sets ``attributes["group-title"]`` when no ``group-title``
+      attribute was present on the ``#EXTINF`` line (explicit attribute wins).
+    - ``#EXTVLCOPT`` — stored as a list under the ``vlc_opts`` key.
+
+    Unknown directives (``#KODIPROP``, etc.) and blank lines are
+    silently skipped while keeping the pending entry intact.  A second ``#EXTINF``
+    before a URL discards the first entry with a warning.  A trailing ``#EXTINF``
+    at end-of-file with no URL is also discarded.
+
+    Adding support for a new directive requires only a new ``elif`` branch here;
+    no other code needs to change.
+    """
+    pending = None
+    pending_line_num = None
+    for line_num, raw_line in enumerate(lines, 1):
+        line = raw_line.strip()
+        if not line:
+            continue
+
+        if line.startswith("#EXTINF"):
+            if pending is not None:
+                logger.warning(
+                    f"Line {pending_line_num}: #EXTINF had no URL (next #EXTINF at line {line_num}); "
+                    f"discarding entry: {list(pending['attributes'].items())[:3]}"
+                )
+            parsed = parse_extinf_line(line)
+            if parsed is None:
+                logger.warning(f"Line {line_num}: Failed to parse #EXTINF: {line[:200]}")
+            pending = parsed  # None if malformed; URL branch guards on `pending is not None`
+            pending_line_num = line_num
+
+        elif line.startswith("#EXTGRP:"):
+            # Only apply when group-title is absent — explicit attribute wins.
+            if pending is not None and "group-title" not in pending["attributes"]:
+                pending["attributes"]["group-title"] = line[len("#EXTGRP:"):].strip()
+            # else: #EXTGRP outside an entry, or group-title already set — silently skip
+
+        elif line.startswith("#EXTVLCOPT:"):
+            if pending is not None:
+                pending.setdefault("vlc_opts", []).append(line[len("#EXTVLCOPT:"):])
+            # else: #EXTVLCOPT outside an entry — silently skip
+
+        elif pending is not None and line.startswith(("http", "rtsp", "rtp", "udp")):
+            pending["url"] = normalize_stream_url(line) if line.startswith("udp") else line
+            yield pending
+            pending = None
+            pending_line_num = None
+
+        # else: unknown directive or bare content — skip, keeping pending intact
+
+    if pending is not None:
+        logger.warning(
+            f"Line {pending_line_num}: #EXTINF at end of file had no URL; "
+            f"discarding entry: {list(pending['attributes'].items())[:3]}"
+        )
+
+
 @shared_task
 def refresh_m3u_accounts():
     """Queue background parse for all active M3UAccounts."""
@@ -1113,7 +1177,7 @@ def process_m3u_batch_direct(account_id, batch, groups, hash_keys):
                 "m3u_account": account,
                 "channel_group_id": int(groups.get(group_title)),
                 "stream_hash": stream_hash,
-                "custom_properties": stream_info["attributes"],
+                "custom_properties": {**stream_info["attributes"], "vlc_opts": stream_info["vlc_opts"]} if "vlc_opts" in stream_info else stream_info["attributes"],
                 "is_adult": parse_is_adult(stream_info["attributes"].get("is_adult", 0)),
                 "is_stale": False,
                 "stream_id": provider_stream_id,
@@ -1481,7 +1545,6 @@ def refresh_m3u_groups(account_id, use_cache=False, full_refresh=False, scan_sta
             release_task_lock("refresh_m3u_account_groups", account_id)
             return error_msg, None
     else:
-        # Here's the key change - use the success flag from fetch_m3u_lines
         lines, success = fetch_m3u_lines(account, use_cache)
         if not success:
             # If fetch failed, don't continue processing
@@ -1492,71 +1555,20 @@ def refresh_m3u_groups(account_id, use_cache=False, full_refresh=False, scan_sta
         # Log basic file structure for debugging
         logger.debug(f"Processing {len(lines)} lines from M3U file")
 
-        line_count = 0
-        extinf_count = 0
-        url_count = 0
         valid_stream_count = 0
-        problematic_lines = []
 
-        for line_index, line in enumerate(lines):
-            line_count += 1
-            line = line.strip()
+        for entry in iter_m3u_entries(lines):
+            valid_stream_count += 1
+            group_title_attr = get_case_insensitive_attr(entry["attributes"], "group-title", "")
+            if group_title_attr and group_title_attr not in groups:
+                logger.debug(f"Found new group for M3U account {account_id}: '{group_title_attr}'")
+                groups[group_title_attr] = {}
+            extinf_data.append(entry)
 
-            if line.startswith("#EXTINF"):
-                extinf_count += 1
-                parsed = parse_extinf_line(line)
-                if parsed:
-                    group_title_attr = get_case_insensitive_attr(
-                        parsed["attributes"], "group-title", ""
-                    )
-                    if group_title_attr:
-                        group_name = group_title_attr
-                        # Log new groups as they're discovered
-                        if group_name not in groups:
-                            logger.debug(
-                                f"Found new group for M3U account {account_id}: '{group_name}'"
-                            )
-                        groups[group_name] = {}
+            if valid_stream_count % 1000 == 0:
+                logger.debug(f"Processed {valid_stream_count} valid streams so far for M3U account: {account_id}")
 
-                    extinf_data.append(parsed)
-                else:
-                    # Log problematic EXTINF lines
-                    logger.warning(
-                        f"Failed to parse EXTINF at line {line_index+1}: {line[:200]}"
-                    )
-                    problematic_lines.append((line_index + 1, line[:200]))
-
-            elif extinf_data and (line.startswith("http") or line.startswith("rtsp") or line.startswith("rtp") or line.startswith("udp")):
-                url_count += 1
-                # Normalize UDP URLs only (e.g., remove VLC-specific @ prefix)
-                normalized_url = normalize_stream_url(line) if line.startswith("udp") else line
-                # Associate URL with the last EXTINF line
-                extinf_data[-1]["url"] = normalized_url
-                valid_stream_count += 1
-
-                # Periodically log progress for large files
-                if valid_stream_count % 1000 == 0:
-                    logger.debug(
-                        f"Processed {valid_stream_count} valid streams so far for M3U account: {account_id}"
-                    )
-
-        # Log summary statistics
-        logger.info(
-            f"M3U parsing complete - Lines: {line_count}, EXTINF: {extinf_count}, URLs: {url_count}, Valid streams: {valid_stream_count}"
-        )
-
-        if problematic_lines:
-            logger.warning(
-                f"Found {len(problematic_lines)} problematic lines during parsing"
-            )
-            for i, (line_num, content) in enumerate(
-                problematic_lines[:10]
-            ):  # Log max 10 examples
-                logger.warning(f"Problematic line #{i+1} at line {line_num}: {content}")
-            if len(problematic_lines) > 10:
-                logger.warning(
-                    f"... and {len(problematic_lines) - 10} more problematic lines"
-                )
+        logger.info(f"M3U parsing complete - Valid streams: {valid_stream_count}")
 
         # Log group statistics
         logger.info(

From 1adbc70f533c168e8e648614c91d69afa870c293 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 11 Apr 2026 16:11:45 -0500
Subject: [PATCH 158/172] Bug Fix: Fix bulk channel edit API when including
 streams array. (Fixes #883)

---
 CHANGELOG.md               |  4 ++
 apps/channels/api_views.py | 83 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09c7d675..7141826c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed dead VOD URL routes: `VODPlaylistView` (playlist generation), `VODPositionView` (position tracking), and the class-based `VODStatsView` (replaced by the existing function-based `vod_stats` view).
 - Removed dead `updateVODPosition()` API method from `frontend/src/api.js`, which called the now-removed position tracking endpoint.
 
+### Fixed
+
+- Fixed `PATCH /api/channels/channels/edit/bulk/` returning a 500 error when the request body included a `streams` list. The bulk edit handler was iterating `validated_data` directly and calling `setattr(channel, "streams", value)`, which Django prohibits on ManyToMany fields. Also added an `@extend_schema` decorator so the Swagger UI correctly documents the endpoint as accepting a JSON array and shows the `streams` field. (Fixes #883)
+
 ### Changed
 
 - Rewrote the M3U line parser as an `iter_m3u_entries` generator that owns the full per-entry state machine. Intermediate directive lines between `#EXTINF` and the stream URL are now handled correctly rather than corrupting the pending entry or being silently misassigned. A `#EXTINF` with no following URL is discarded with a warning instead of carrying over a `url`-less entry into batch processing. Attribute keys are normalised to lowercase during parsing (provider attribute names remain case-insensitive end-to-end). The `#EXTINF` attribute regex is pre-compiled at module load, and attribute lookups use O(1) `dict.get()` instead of linear scans — approximately 10% faster parsing on large M3U files.
diff --git a/apps/channels/api_views.py b/apps/channels/api_views.py
index cde49dad..b2ada2ba 100644
--- a/apps/channels/api_views.py
+++ b/apps/channels/api_views.py
@@ -30,6 +30,7 @@ from .models import (
     Stream,
     Channel,
     ChannelGroup,
+    ChannelStream,
     Logo,
     ChannelProfile,
     ChannelProfileMembership,
@@ -630,6 +631,53 @@ class ChannelViewSet(viewsets.ModelViewSet):
         context["include_streams"] = include_streams
         return context
 
+    @extend_schema(
+        methods=["PATCH"],
+        description=(
+            "Bulk edit multiple channels in a single request. "
+            "Accepts a JSON array of channel update objects. Each object must include `id` (the channel's primary key). "
+            "All other fields are optional and support partial updates. "
+            "The `streams` field accepts a list of stream IDs and will replace the channel's current stream assignments. "
+            "All updates are validated before any changes are applied and executed in a single database transaction."
+        ),
+        request=inline_serializer(
+            name="ChannelBulkEditRequest",
+            fields={
+                "id": serializers.IntegerField(help_text="ID of the channel to update (required)."),
+                "name": serializers.CharField(required=False),
+                "channel_number": serializers.FloatField(required=False),
+                "channel_group_id": serializers.IntegerField(required=False, allow_null=True),
+                "streams": serializers.ListField(
+                    child=serializers.IntegerField(),
+                    required=False,
+                    help_text="List of stream IDs to assign to this channel (replaces existing assignments).",
+                ),
+                "stream_profile_id": serializers.IntegerField(required=False, allow_null=True),
+                "logo_id": serializers.IntegerField(required=False, allow_null=True),
+                "tvg_id": serializers.CharField(required=False, allow_blank=True),
+                "tvc_guide_stationid": serializers.CharField(required=False, allow_blank=True),
+                "epg_data_id": serializers.IntegerField(required=False, allow_null=True),
+                "user_level": serializers.IntegerField(required=False),
+                "is_adult": serializers.BooleanField(required=False),
+            },
+            many=True,
+        ),
+        responses={
+            200: inline_serializer(
+                name="ChannelBulkEditResponse",
+                fields={
+                    "message": serializers.CharField(),
+                    "channels": ChannelSerializer(many=True),
+                },
+            ),
+            400: inline_serializer(
+                name="ChannelBulkEditErrorResponse",
+                fields={
+                    "errors": serializers.ListField(child=serializers.DictField()),
+                },
+            ),
+        },
+    )
     @action(detail=False, methods=["patch"], url_path="edit/bulk")
     def edit_bulk(self, request):
         """
@@ -709,19 +757,24 @@ class ChannelViewSet(viewsets.ModelViewSet):
 
         # Apply all updates in a transaction
         with transaction.atomic():
+            streams_updates = []
             for channel, validated_data in validated_updates:
+                # Pop streams before setattr loop — M2M fields can't be set via setattr
+                streams = validated_data.pop("streams", None)
+                if streams is not None:
+                    streams_updates.append((channel, streams))
                 for key, value in validated_data.items():
                     setattr(channel, key, value)
 
             # Single bulk_update query instead of individual saves
             channels_to_update = [channel for channel, _ in validated_updates]
             if channels_to_update:
-                # Collect all unique field names from all updates
+                # Collect all unique field names from all updates (streams already popped)
                 all_fields = set()
                 for _, validated_data in validated_updates:
                     all_fields.update(validated_data.keys())
 
-                # Only call bulk_update if there are fields to update
+                # Only call bulk_update if there are non-M2M fields to update
                 if all_fields:
                     Channel.objects.bulk_update(
                         channels_to_update,
@@ -729,6 +782,32 @@ class ChannelViewSet(viewsets.ModelViewSet):
                         batch_size=100
                     )
 
+            # Handle streams M2M updates separately
+            for channel, streams in streams_updates:
+                normalized_ids = [
+                    stream.id if hasattr(stream, "id") else stream for stream in streams
+                ]
+                current_links = {
+                    cs.stream_id: cs for cs in channel.channelstream_set.all()
+                }
+                existing_ids = set(current_links.keys())
+                new_ids = set(normalized_ids)
+
+                to_remove = existing_ids - new_ids
+                if to_remove:
+                    channel.channelstream_set.filter(stream_id__in=to_remove).delete()
+
+                for order, stream_id in enumerate(normalized_ids):
+                    if stream_id in current_links:
+                        cs = current_links[stream_id]
+                        if cs.order != order:
+                            cs.order = order
+                            cs.save(update_fields=["order"])
+                    else:
+                        ChannelStream.objects.create(
+                            channel=channel, stream_id=stream_id, order=order
+                        )
+
         # Return the updated objects (already in memory)
         serialized_channels = ChannelSerializer(
             [channel for channel, _ in validated_updates],

From f1a82e8843f96d25b213d20fa977b882511dafd2 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sat, 11 Apr 2026 17:02:07 -0500
Subject: [PATCH 159/172] Bug Fix: Fixed several incorrect or incomplete
 OpenAPI (`@extend_schema`) schemas across the API

---
 CHANGELOG.md               |  5 +++++
 apps/channels/api_views.py | 13 +++++++++++--
 apps/connect/api_views.py  | 30 +++++++++++++++++++++++++++++-
 apps/epg/api_views.py      | 10 ++++++++--
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7141826c..658fbfee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed `PATCH /api/channels/channels/edit/bulk/` returning a 500 error when the request body included a `streams` list. The bulk edit handler was iterating `validated_data` directly and calling `setattr(channel, "streams", value)`, which Django prohibits on ManyToMany fields. Also added an `@extend_schema` decorator so the Swagger UI correctly documents the endpoint as accepting a JSON array and shows the `streams` field. (Fixes #883)
+- Fixed several incorrect or incomplete OpenAPI (`@extend_schema`) schemas across the API:
+  - `POST /api/epg/import/` — request body was undocumented; now correctly shows the `id` field. Description updated from "import" to "refresh" to match frontend and backend terminology.
+  - `DELETE /api/channels/logos/bulk-delete/` — `delete_files` boolean was missing from the documented request body.
+  - `POST /api/channels/channels/batch-set-epg/` — `epg_data_id` inside each association object was not marked `allow_null`/`required=False`, even though passing `null` is the correct way to remove an EPG link.
+  - `PUT /api/connect/integrations/{id}/subscriptions/set/` — endpoint had no `@extend_schema` at all; now documents that the request body is a JSON array of subscription objects.
 
 ### Changed
 
diff --git a/apps/channels/api_views.py b/apps/channels/api_views.py
index b2ada2ba..dc82d482 100644
--- a/apps/channels/api_views.py
+++ b/apps/channels/api_views.py
@@ -1565,7 +1565,11 @@ class ChannelViewSet(viewsets.ModelViewSet):
                         name="EpgAssociation",
                         fields={
                             "channel_id": serializers.IntegerField(),
-                            "epg_data_id": serializers.IntegerField(),
+                            "epg_data_id": serializers.IntegerField(
+                                required=False,
+                                allow_null=True,
+                                help_text="EPG data ID to link. Pass null to remove EPG linkage.",
+                            ),
                         },
                     ),
                 )
@@ -1741,7 +1745,12 @@ class BulkDeleteLogosAPIView(APIView):
                 "logo_ids": serializers.ListField(
                     child=serializers.IntegerField(),
                     help_text="Logo IDs to delete",
-                )
+                ),
+                "delete_files": serializers.BooleanField(
+                    required=False,
+                    default=False,
+                    help_text="Whether to also delete local logo files from disk.",
+                ),
             },
         ),
     )
diff --git a/apps/connect/api_views.py b/apps/connect/api_views.py
index 739e8e32..fdb5d43a 100644
--- a/apps/connect/api_views.py
+++ b/apps/connect/api_views.py
@@ -1,9 +1,10 @@
-from rest_framework import viewsets, status
+from rest_framework import viewsets, status, serializers
 from rest_framework.pagination import PageNumberPagination
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.response import Response
 from rest_framework.decorators import action
 from django.utils import timezone
+from drf_spectacular.utils import extend_schema, inline_serializer
 from .models import Integration, EventSubscription, DeliveryLog
 from .serializers import (
     IntegrationSerializer,
@@ -37,6 +38,33 @@ class IntegrationViewSet(viewsets.ModelViewSet):
         serializer = EventSubscriptionSerializer(qs, many=True)
         return Response(serializer.data)
 
+    @extend_schema(
+        methods=["PUT"],
+        description=(
+            "Replace the integration's event subscriptions with the provided list. "
+            "Accepts a JSON array of subscription objects. "
+            "Existing subscriptions not in the list will be deleted. "
+            "The 'payload_template' field is only relevant for webhook integrations."
+        ),
+        request=inline_serializer(
+            name="SetSubscriptionsRequest",
+            fields={
+                "event": serializers.CharField(help_text="Event name (e.g. 'channel_start')."),
+                "enabled": serializers.BooleanField(required=False, default=True),
+                "payload_template": serializers.CharField(required=False, allow_blank=True, allow_null=True, help_text="Custom payload template (webhook integrations only)."),
+            },
+            many=True,
+        ),
+        responses={200: inline_serializer(
+            name="SetSubscriptionsResponse",
+            fields={
+                "event": serializers.CharField(),
+                "enabled": serializers.BooleanField(),
+                "payload_template": serializers.CharField(allow_null=True),
+            },
+            many=True,
+        )},
+    )
     @action(detail=True, methods=["put"], url_path=r"subscriptions/set")
     def set_subscriptions(self, request, pk=None):
         """
diff --git a/apps/epg/api_views.py b/apps/epg/api_views.py
index 9832b5c1..1a53f5ae 100644
--- a/apps/epg/api_views.py
+++ b/apps/epg/api_views.py
@@ -427,7 +427,13 @@ class EPGImportAPIView(APIView):
             return [Authenticated()]
 
     @extend_schema(
-        description="Triggers an EPG data import",
+        description="Triggers an EPG data refresh for the given source.",
+        request=inline_serializer(
+            name="EPGImportRequest",
+            fields={
+                "id": serializers.IntegerField(help_text="ID of the EPG source to refresh."),
+            },
+        ),
     )
     def post(self, request, format=None):
         logger.info("EPGImportAPIView: Received request to import EPG data.")
@@ -449,7 +455,7 @@ class EPGImportAPIView(APIView):
         refresh_epg_data.delay(epg_id)  # Trigger Celery task
         logger.info("EPGImportAPIView: Task dispatched to refresh EPG data.")
         return Response(
-            {"success": True, "message": "EPG data import initiated."},
+            {"success": True, "message": "EPG data refresh initiated."},
             status=status.HTTP_202_ACCEPTED,
         )
 

From ad46a10ce6700381163d9bc693fc7a5215358dd0 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 09:04:49 -0500
Subject: [PATCH 160/172] Bug Fix: Uploading a local M3U file with no
 expiration date set sending the string `"null"` as the `exp_date` field in
 the `FormData` request, causing a 400 validation error from the API.
 Null/undefined values are now skipped when building the `FormData` body,
 matching the behaviour already present in the update path.

---
 CHANGELOG.md        | 1 +
 frontend/src/api.js | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 658fbfee..d91965c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed uploading a local M3U file with no expiration date set sending the string `"null"` as the `exp_date` field in the `FormData` request, causing a 400 validation error from the API. Null/undefined values are now skipped when building the `FormData` body, matching the behaviour already present in the update path.
 - Fixed `PATCH /api/channels/channels/edit/bulk/` returning a 500 error when the request body included a `streams` list. The bulk edit handler was iterating `validated_data` directly and calling `setattr(channel, "streams", value)`, which Django prohibits on ManyToMany fields. Also added an `@extend_schema` decorator so the Swagger UI correctly documents the endpoint as accepting a JSON array and shows the `streams` field. (Fixes #883)
 - Fixed several incorrect or incomplete OpenAPI (`@extend_schema`) schemas across the API:
   - `POST /api/epg/import/` — request body was undocumented; now correctly shows the `id` field. Description updated from "import" to "refresh" to match frontend and backend terminology.
diff --git a/frontend/src/api.js b/frontend/src/api.js
index 0e1ae8f9..79d6c435 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -1193,6 +1193,7 @@ export default class API {
       if (values.file) {
         body = new FormData();
         for (const prop in values) {
+          if (values[prop] === null || values[prop] === undefined) continue;
           body.append(prop, values[prop]);
         }
       } else {
@@ -2050,9 +2051,7 @@ export default class API {
 
   static async getAvailablePlugins() {
     try {
-      const response = await request(
-        `${host}/api/plugins/repos/available/`
-      );
+      const response = await request(`${host}/api/plugins/repos/available/`);
       return response.plugins || [];
     } catch (e) {
       errorNotification('Failed to retrieve available plugins', e);

From ef030b3da0439cb0c061914f1b98b017b8722963 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 10:03:46 -0500
Subject: [PATCH 161/172] Bug Fix: Manual stream selection from the Stats page
 not enforcing M3U profile connection limits in multi-worker deployments

---
 CHANGELOG.md                  | 1 +
 apps/proxy/ts_proxy/server.py | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d91965c0..237b1e58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed manual stream selection from the Stats page not enforcing M3U profile connection limits in multi-worker deployments. When a non-owning worker handled the `change_stream` request it correctly packaged `stream_id` and `m3u_profile_id` into the Redis pubsub message, but the owning worker's pubsub handler only consumed `url` and `user_agent` silently dropping both IDs before calling `stream_manager.update_url()`. Because `update_url` only calls `update_stream_profile()` when a `stream_id` is provided, the `profile_connections` counter was never updated after the switch, causing subsequent capacity checks to see incorrect counts and bypass the full-profile guard. The handler now extracts `stream_id` and `m3u_profile_id` from the event and forwards them to `update_url()`.
 - Fixed uploading a local M3U file with no expiration date set sending the string `"null"` as the `exp_date` field in the `FormData` request, causing a 400 validation error from the API. Null/undefined values are now skipped when building the `FormData` body, matching the behaviour already present in the update path.
 - Fixed `PATCH /api/channels/channels/edit/bulk/` returning a 500 error when the request body included a `streams` list. The bulk edit handler was iterating `validated_data` directly and calling `setattr(channel, "streams", value)`, which Django prohibits on ManyToMany fields. Also added an `@extend_schema` decorator so the Swagger UI correctly documents the endpoint as accepting a JSON array and shows the `streams` field. (Fixes #883)
 - Fixed several incorrect or incomplete OpenAPI (`@extend_schema`) schemas across the API:
diff --git a/apps/proxy/ts_proxy/server.py b/apps/proxy/ts_proxy/server.py
index 5316ec58..1e87ea62 100644
--- a/apps/proxy/ts_proxy/server.py
+++ b/apps/proxy/ts_proxy/server.py
@@ -227,6 +227,8 @@ class ProxyServer:
                                         # Handle stream switch request
                                         new_url = data.get("url")
                                         user_agent = data.get("user_agent")
+                                        event_stream_id = data.get("stream_id")
+                                        event_m3u_profile_id = data.get("m3u_profile_id")
 
                                         if new_url and channel_id in self.stream_managers:
                                             # Update metadata in Redis
@@ -240,9 +242,9 @@ class ProxyServer:
                                                 status_key = RedisKeys.switch_status(channel_id)
                                                 self.redis_client.set(status_key, "switching")
 
-                                            # Perform the stream switch
+                                            # Perform the stream switch, forwarding stream_id and m3u_profile_id
                                             stream_manager = self.stream_managers[channel_id]
-                                            success = stream_manager.update_url(new_url)
+                                            success = stream_manager.update_url(new_url, event_stream_id, event_m3u_profile_id)
 
                                             if success:
                                                 logger.info(f"Stream switch initiated for channel {channel_id}")

From 65d14644b4084bfcd164d32772a0d0edf3904605 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 11:36:08 -0500
Subject: [PATCH 162/172] Bug Fix: Fixed the `next_stream` rotation endpoint
 applying the same class of bug

---
 apps/proxy/ts_proxy/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/proxy/ts_proxy/views.py b/apps/proxy/ts_proxy/views.py
index b3ea295a..da1c29f1 100644
--- a/apps/proxy/ts_proxy/views.py
+++ b/apps/proxy/ts_proxy/views.py
@@ -929,7 +929,8 @@ def next_stream(request, channel_id):
             channel_id,
             stream_info["url"],
             stream_info["user_agent"],
-            next_stream_id,  # Pass the stream_id to be stored in Redis
+            next_stream_id,
+            stream_info.get("m3u_profile_id"),
         )
 
         if result.get("status") == "error":

From b629836b3d2ce6546ab9eba49b08c5357944555d Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 12:02:20 -0500
Subject: [PATCH 163/172] Bug Fix: Fixed stream switch metadata (`url`,
 `user_agent`, `stream_id`, `m3u_profile`) being written to Redis before the
 switch was confirmed to succeed

---
 CHANGELOG.md                                  |  4 ++-
 apps/proxy/ts_proxy/server.py                 | 23 +++++++++----
 .../ts_proxy/services/channel_service.py      | 32 ++++++++++++-------
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 237b1e58..974523da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,7 +49,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fixed manual stream selection from the Stats page not enforcing M3U profile connection limits in multi-worker deployments. When a non-owning worker handled the `change_stream` request it correctly packaged `stream_id` and `m3u_profile_id` into the Redis pubsub message, but the owning worker's pubsub handler only consumed `url` and `user_agent` silently dropping both IDs before calling `stream_manager.update_url()`. Because `update_url` only calls `update_stream_profile()` when a `stream_id` is provided, the `profile_connections` counter was never updated after the switch, causing subsequent capacity checks to see incorrect counts and bypass the full-profile guard. The handler now extracts `stream_id` and `m3u_profile_id` from the event and forwards them to `update_url()`.
+- Fixed manual stream selection from the Stats page not enforcing M3U profile connection limits in multi-worker deployments. When a non-owning worker handled the `change_stream` request it correctly packaged `stream_id` and `m3u_profile_id` into the Redis pubsub message, but the owning worker's pubsub handler only consumed `url` and `user_agent` silently dropping both IDs before calling `stream_manager.update_url()`. Because `update_url` only calls `update_stream_profile()` when a `stream_id` is provided, the `profile_connections` counter was never updated after the switch, causing subsequent capacity checks to see incorrect counts and bypass the full-profile guard. The handler now extracts `stream_id` and `m3u_profile_id` from the event and forwards them to `update_url()`. The bug did not affect single-worker / dev-mode deployments because the owning worker handles those requests directly without pubsub.
+- Fixed the `next_stream` rotation endpoint applying the same class of bug: `get_stream_info_for_switch()` was called and returned `m3u_profile_id`, but the result was dropped when forwarding to `ChannelService.change_stream_url()`, so `update_stream_profile()` was never called and `profile_connections` counters were not updated after an automatic stream rotation.
+- Fixed stream switch metadata (`url`, `user_agent`, `stream_id`, `m3u_profile`) being written to Redis before the switch was confirmed to succeed. If the switch failed, URL unchanged or exception during teardown, Redis described a URL not actually in use. Metadata is now written only after `update_url()` returns `True`; on failure the owner writes `stream_manager.url` back as the ground truth. The non-owner no longer pre-writes metadata at all, all needed info is carried in the pubsub payload and written by the owner after confirmation.
 - Fixed uploading a local M3U file with no expiration date set sending the string `"null"` as the `exp_date` field in the `FormData` request, causing a 400 validation error from the API. Null/undefined values are now skipped when building the `FormData` body, matching the behaviour already present in the update path.
 - Fixed `PATCH /api/channels/channels/edit/bulk/` returning a 500 error when the request body included a `streams` list. The bulk edit handler was iterating `validated_data` directly and calling `setattr(channel, "streams", value)`, which Django prohibits on ManyToMany fields. Also added an `@extend_schema` decorator so the Swagger UI correctly documents the endpoint as accepting a JSON array and shows the `streams` field. (Fixes #883)
 - Fixed several incorrect or incomplete OpenAPI (`@extend_schema`) schemas across the API:
diff --git a/apps/proxy/ts_proxy/server.py b/apps/proxy/ts_proxy/server.py
index 1e87ea62..b5820ca7 100644
--- a/apps/proxy/ts_proxy/server.py
+++ b/apps/proxy/ts_proxy/server.py
@@ -231,14 +231,8 @@ class ProxyServer:
                                         event_m3u_profile_id = data.get("m3u_profile_id")
 
                                         if new_url and channel_id in self.stream_managers:
-                                            # Update metadata in Redis
+                                            # Mark the switch as in-progress in Redis so other workers know to wait
                                             if self.redis_client:
-                                                metadata_key = RedisKeys.channel_metadata(channel_id)
-                                                self.redis_client.hset(metadata_key, "url", new_url)
-                                                if user_agent:
-                                                    self.redis_client.hset(metadata_key, "user_agent", user_agent)
-
-                                                # Set switch status
                                                 status_key = RedisKeys.switch_status(channel_id)
                                                 self.redis_client.set(status_key, "switching")
 
@@ -249,6 +243,13 @@ class ProxyServer:
                                             if success:
                                                 logger.info(f"Stream switch initiated for channel {channel_id}")
 
+                                                # Confirm the URL in metadata now that the switch happened
+                                                if self.redis_client:
+                                                    metadata_key = RedisKeys.channel_metadata(channel_id)
+                                                    self.redis_client.hset(metadata_key, "url", new_url)
+                                                    if user_agent:
+                                                        self.redis_client.hset(metadata_key, "user_agent", user_agent)
+
                                                 # Publish confirmation
                                                 switch_result = {
                                                     "event": EventType.STREAM_SWITCHED,  # Use constant instead of string
@@ -268,6 +269,14 @@ class ProxyServer:
                                             else:
                                                 logger.error(f"Failed to switch stream for channel {channel_id}")
 
+                                                # Roll back the URL in metadata to what the manager will
+                                                # actually reconnect to. The non-owner may have pre-written
+                                                # the desired URL; use stream_manager.url (the ground truth)
+                                                # so Redis is consistent with the live stream.
+                                                if self.redis_client:
+                                                    metadata_key = RedisKeys.channel_metadata(channel_id)
+                                                    self.redis_client.hset(metadata_key, "url", stream_manager.url)
+
                                                 # Publish failure
                                                 switch_result = {
                                                     "event": EventType.STREAM_SWITCHED,
diff --git a/apps/proxy/ts_proxy/services/channel_service.py b/apps/proxy/ts_proxy/services/channel_service.py
index d0478e8f..ff6eb416 100644
--- a/apps/proxy/ts_proxy/services/channel_service.py
+++ b/apps/proxy/ts_proxy/services/channel_service.py
@@ -168,15 +168,6 @@ class ChannelService:
         else:
             result = {'status': 'success'}
 
-        # Update metadata in Redis regardless of ownership
-        if proxy_server.redis_client:
-            try:
-                ChannelService._update_channel_metadata(channel_id, new_url, user_agent, stream_id, m3u_profile_id)
-                result['metadata_updated'] = True
-            except Exception as e:
-                logger.error(f"Error updating Redis metadata: {e}", exc_info=True)
-                result['metadata_updated'] = False
-
         # If we're the owner, update directly
         if proxy_server.am_i_owner(channel_id) and channel_id in proxy_server.stream_managers:
             logger.info(f"This worker is the owner, changing stream URL for channel {channel_id}")
@@ -187,14 +178,33 @@ class ChannelService:
             success = manager.update_url(new_url, stream_id, m3u_profile_id)
             logger.info(f"Stream URL changed from {old_url} to {new_url}, result: {success}")
 
+            # Update Redis metadata based on the actual outcome.
+            # On success, write the new values. On failure, restore whatever URL
+            # the manager will actually reconnect to (may be old_url if the
+            # exception happened before self.url was reassigned, or new_url if it
+            # happened after) so Redis never describes a URL that isn't in use.
+            if proxy_server.redis_client:
+                try:
+                    if success:
+                        ChannelService._update_channel_metadata(channel_id, new_url, user_agent, stream_id, m3u_profile_id)
+                    else:
+                        ChannelService._update_channel_metadata(channel_id, manager.url, user_agent)
+                    result['metadata_updated'] = True
+                except Exception as e:
+                    logger.error(f"Error updating Redis metadata: {e}", exc_info=True)
+                    result['metadata_updated'] = False
+
             result.update({
                 'direct_update': True,
                 'success': success,
                 'worker_id': proxy_server.worker_id
             })
         else:
-            # If we're not the owner, publish an event for the owner to pick up
-            logger.info(f"Not the owner, requesting URL change via Redis PubSub")
+            # Not the owner: publish the switch event. The owner will update metadata
+            # after the actual switch attempt succeeds (or roll back on failure).
+            # All needed info (url, user_agent, stream_id, m3u_profile_id) is carried
+            # in the pubsub message, so there is no reason to pre-write metadata here.
+            logger.debug(f"This worker is not the owner, publishing stream switch event for channel {channel_id}")
             if proxy_server.redis_client:
                 ChannelService._publish_stream_switch_event(channel_id, new_url, user_agent, stream_id, m3u_profile_id)
                 result.update({

From e69a8f34493a910035bc0cc7fd94c31ffc08e5d5 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 12:28:39 -0500
Subject: [PATCH 164/172] Bug Fix: Stats page "Active Stream" dropdown not
 updating when a stream switch occurs

---
 CHANGELOG.md                                     |  1 +
 .../components/cards/StreamConnectionCard.jsx    | 16 +++++-----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 974523da..c948a2a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed manual stream selection from the Stats page not enforcing M3U profile connection limits in multi-worker deployments. When a non-owning worker handled the `change_stream` request it correctly packaged `stream_id` and `m3u_profile_id` into the Redis pubsub message, but the owning worker's pubsub handler only consumed `url` and `user_agent` silently dropping both IDs before calling `stream_manager.update_url()`. Because `update_url` only calls `update_stream_profile()` when a `stream_id` is provided, the `profile_connections` counter was never updated after the switch, causing subsequent capacity checks to see incorrect counts and bypass the full-profile guard. The handler now extracts `stream_id` and `m3u_profile_id` from the event and forwards them to `update_url()`. The bug did not affect single-worker / dev-mode deployments because the owning worker handles those requests directly without pubsub.
 - Fixed the `next_stream` rotation endpoint applying the same class of bug: `get_stream_info_for_switch()` was called and returned `m3u_profile_id`, but the result was dropped when forwarding to `ChannelService.change_stream_url()`, so `update_stream_profile()` was never called and `profile_connections` counters were not updated after an automatic stream rotation.
 - Fixed stream switch metadata (`url`, `user_agent`, `stream_id`, `m3u_profile`) being written to Redis before the switch was confirmed to succeed. If the switch failed, URL unchanged or exception during teardown, Redis described a URL not actually in use. Metadata is now written only after `update_url()` returns `True`; on failure the owner writes `stream_manager.url` back as the ground truth. The non-owner no longer pre-writes metadata at all, all needed info is carried in the pubsub payload and written by the owner after confirmation.
+- Fixed the Stats page "Active Stream" dropdown not updating when a stream switch occurs. The card was matching the active stream by comparing the URL stored in Redis against stream URLs from the database, which failed silently when the stored URL was a transformed/rewritten value that didn't substring-match the original. The dropdown now matches by `stream_id` (the authoritative value already present in the stats payload) and re-runs only when `stream_id` changes, so the normal polling interval drives updates with no extra renders.
 - Fixed uploading a local M3U file with no expiration date set sending the string `"null"` as the `exp_date` field in the `FormData` request, causing a 400 validation error from the API. Null/undefined values are now skipped when building the `FormData` body, matching the behaviour already present in the update path.
 - Fixed `PATCH /api/channels/channels/edit/bulk/` returning a 500 error when the request body included a `streams` list. The bulk edit handler was iterating `validated_data` directly and calling `setattr(channel, "streams", value)`, which Django prohibits on ManyToMany fields. Also added an `@extend_schema` decorator so the Swagger UI correctly documents the endpoint as accepting a JSON array and shows the `streams` field. (Fixes #883)
 - Fixed several incorrect or incomplete OpenAPI (`@extend_schema`) schemas across the API:
diff --git a/frontend/src/components/cards/StreamConnectionCard.jsx b/frontend/src/components/cards/StreamConnectionCard.jsx
index 86dbc240..eb655702 100644
--- a/frontend/src/components/cards/StreamConnectionCard.jsx
+++ b/frontend/src/components/cards/StreamConnectionCard.jsx
@@ -46,7 +46,6 @@ import {
   getChannelStreams,
   getLogoUrl,
   getM3uAccountsMap,
-  getMatchingStreamByUrl,
   getSelectedStream,
   getStartDate,
   getStreamOptions,
@@ -176,18 +175,13 @@ const StreamConnectionCard = ({
           // Use streams in the order returned by the API without sorting
           setAvailableStreams(streamData);
 
-          // If we have a channel URL, try to find the matching stream
-          if (channel.url && streamData.length > 0) {
-            // Try to find matching stream based on URL
-            const matchingStream = getMatchingStreamByUrl(
-              streamData,
-              channel.url
+          // Match by server-reported stream_id.
+          if (channel.stream_id && streamData.length > 0) {
+            const matchingStream = streamData.find(
+              (s) => s.id.toString() === channel.stream_id.toString()
             );
-
             if (matchingStream) {
               setActiveStreamId(matchingStream.id.toString());
-
-              // If the stream has M3U profile info, save it
               if (matchingStream.m3u_profile) {
                 setCurrentM3UProfile(matchingStream.m3u_profile);
               }
@@ -202,7 +196,7 @@ const StreamConnectionCard = ({
     };
 
     fetchStreams();
-  }, [channel.channel_id, channel.url, channelsByUUID]);
+  }, [channel.channel_id, channel.stream_id, channelsByUUID]);
 
   useEffect(() => {
     setData(

From 298ca3260eb407477ce12c4e322696ddad6000f4 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 12:37:02 -0500
Subject: [PATCH 165/172] tests: Update frontend tests for recent frontend
 changes (Floating Video Player and Stream Connection Card)

---
 .../src/components/__tests__/FloatingVideo.test.jsx |  3 ++-
 .../cards/__tests__/StreamConnectionCard.test.jsx   | 13 +++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/__tests__/FloatingVideo.test.jsx b/frontend/src/components/__tests__/FloatingVideo.test.jsx
index b511b60b..f99a3dcc 100644
--- a/frontend/src/components/__tests__/FloatingVideo.test.jsx
+++ b/frontend/src/components/__tests__/FloatingVideo.test.jsx
@@ -243,8 +243,9 @@ describe('FloatingVideo', () => {
       const { container } = render(<FloatingVideo />);
       const video = container.querySelector('video');
 
-      // Simulate video loaded event to clear loading state
+      // Simulate video loaded and canplay events to clear loading state and show overlay
       fireEvent.loadedData(video);
+      fireEvent.canPlay(video);
 
       expect(screen.getAllByText('Test Movie').length).toBeGreaterThanOrEqual(
         1
diff --git a/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx b/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx
index fd1b4164..1a62cc2c 100644
--- a/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx
+++ b/frontend/src/components/cards/__tests__/StreamConnectionCard.test.jsx
@@ -42,7 +42,6 @@ vi.mock('../../../utils/cards/StreamConnectionCardUtils.js', () => ({
   getChannelStreams: vi.fn(() => Promise.resolve([])),
   getLogoUrl: vi.fn(() => null),
   getM3uAccountsMap: vi.fn(() => ({})),
-  getMatchingStreamByUrl: vi.fn(() => null),
   getSelectedStream: vi.fn(() => null),
   getStartDate: vi.fn(() => 'Jan 1 2024 10:00 AM'),
   getStreamOptions: vi.fn(() => []),
@@ -181,7 +180,6 @@ import useVideoStore from '../../../store/useVideoStore';
 import { showNotification } from '../../../utils/notificationUtils.js';
 import {
   getChannelStreams,
-  getMatchingStreamByUrl,
   getSelectedStream,
   getStreamsByIds,
   switchStream,
@@ -628,7 +626,7 @@ describe('StreamConnectionCard', () => {
       });
     });
 
-    it('sets activeStreamId when a matching stream is found by URL', async () => {
+    it('sets activeStreamId when a matching stream is found by stream_id', async () => {
       vi.mocked(getChannelStreams).mockResolvedValue([
         {
           id: 42,
@@ -637,15 +635,10 @@ describe('StreamConnectionCard', () => {
           m3u_profile: null,
         },
       ]);
-      vi.mocked(getMatchingStreamByUrl).mockReturnValue({
-        id: 42,
-        name: 'Stream A',
-        url: 'http://stream.example.com/ch1',
-        m3u_profile: null,
-      });
       render(<StreamConnectionCard {...defaultProps()} />);
       await waitFor(() => {
-        expect(getMatchingStreamByUrl).toHaveBeenCalled();
+        // defaultProps channel has stream_id: 42, which matches the stream id above
+        expect(getChannelStreams).toHaveBeenCalled();
       });
     });
 

From a83b9fdf624a718896d32e5af026e81f53d94826 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 15:37:28 -0500
Subject: [PATCH 166/172] Enhancement: EPG channel scanning now automatically
 removes stale `EPGData` entries.

---
 CHANGELOG.md      |  1 +
 apps/epg/tasks.py | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c948a2a7..aad0afec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- EPG channel scanning now automatically removes stale `EPGData` entries. tvg-ids that were present in a previous scan but are no longer found in the upstream source, provided they are not mapped to any channel. This prevents unbounded database bloat over time. Entries mapped to at least one channel are always preserved.
 - Rewrote the M3U line parser as an `iter_m3u_entries` generator that owns the full per-entry state machine. Intermediate directive lines between `#EXTINF` and the stream URL are now handled correctly rather than corrupting the pending entry or being silently misassigned. A `#EXTINF` with no following URL is discarded with a warning instead of carrying over a `url`-less entry into batch processing. Attribute keys are normalised to lowercase during parsing (provider attribute names remain case-insensitive end-to-end). The `#EXTINF` attribute regex is pre-compiled at module load, and attribute lookups use O(1) `dict.get()` instead of linear scans — approximately 10% faster parsing on large M3U files.
 - Added support for the `#EXTGRP` directive in M3U files. When a `group-title` attribute is absent from the `#EXTINF` line, the value from a following `#EXTGRP:` line is used as the group. An explicit `group-title` attribute always takes priority. (Closes #1088)
 - Added accumulation of `#EXTVLCOPT` directives per entry. Options are stored as a list under `vlc_opts` inside the stream's `custom_properties`, available for downstream use (e.g. passing VLC-specific options to the player). This is for a planned future enhancement and can also be utlized with the API.
diff --git a/apps/epg/tasks.py b/apps/epg/tasks.py
index 9c877f4b..7700ad1b 100644
--- a/apps/epg/tasks.py
+++ b/apps/epg/tasks.py
@@ -938,7 +938,8 @@ def parse_channels_only(source):
 
         # Replace full dictionary load with more efficient lookup set
         existing_tvg_ids = set()
-        existing_epgs = {}  # Initialize the dictionary that will lazily load objects
+        existing_epgs = {}
+        scanned_tvg_ids = set()  # Track tvg_ids seen in the current scan for stale cleanup
         last_id = 0
         chunk_size = 5000
 
@@ -1006,6 +1007,7 @@ def parse_channels_only(source):
                     channel_count += 1
                     tvg_id = elem.get('id', '').strip()
                     if tvg_id:
+                        scanned_tvg_ids.add(tvg_id)
                         display_name = None
                         icon_url = None
                         for child in elem:
@@ -1153,6 +1155,16 @@ def parse_channels_only(source):
         if epgs_to_update:
             EPGData.objects.bulk_update(epgs_to_update, ["name", "icon_url"])
             logger.debug(f"[parse_channels_only] Updated final batch of {len(epgs_to_update)} EPG entries")
+
+        # Clean up stale EPGData: entries that existed before the scan but weren't seen, and aren't mapped to any channel.
+        # Use existing_tvg_ids - scanned_tvg_ids to avoid a full-table scan with a large EXCLUDE list.
+        potentially_stale = existing_tvg_ids - scanned_tvg_ids
+        if potentially_stale:
+            stale_qs = EPGData.objects.filter(epg_source=source, tvg_id__in=potentially_stale, channels__isnull=True)
+            deleted_count, _ = stale_qs.delete()
+            if deleted_count:
+                logger.info(f"[parse_channels_only] Cleaned up {deleted_count} stale EPG entries not in current scan and unmapped to any channel")
+
         if process:
             logger.debug(f"[parse_channels_only] Memory after final batch creation: {process.memory_info().rss / 1024 / 1024:.2f} MB")
 
@@ -1219,6 +1231,9 @@ def parse_channels_only(source):
             existing_epgs = None
             epgs_to_create = None
             epgs_to_update = None
+            if 'scanned_tvg_ids' in locals() and scanned_tvg_ids is not None:
+                scanned_tvg_ids.clear()
+                scanned_tvg_ids = None
             cleanup_memory(log_usage=should_log_memory, force_collection=True)
         except Exception as e:
             logger.warning(f"Cleanup error: {e}")

From ba967f47d94135e6ffbb680fb94715d8df1354b3 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 16:34:15 -0500
Subject: [PATCH 167/172] Enhancement: **EPG historical data window**: the EPG
 XML output and XC EPG API now support a `prev_days` URL parameter (e.g.
 `&prev_days=3`) to include past programs in the EPG response. This allows
 third-party players that request historical program schedules to receive the
 data they need. The EPG URL builder in the Channels page exposes "Days
 forward" and "Days back" controls. Per-user defaults for both values
 (`epg_days` / `epg_prev_days`) can be configured in the User settings modal
 and are applied automatically when no URL parameter is present. (Closes
 #1154)

---
 CHANGELOG.md                                  |  1 +
 apps/output/views.py                          | 40 ++++++++++++++-----
 frontend/src/components/forms/User.jsx        | 28 +++++++++++++
 .../src/components/tables/ChannelsTable.jsx   | 18 ++++++++-
 4 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aad0afec..1b2b8333 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- **EPG historical data window**: the EPG XML output and XC EPG API now support a `prev_days` URL parameter (e.g. `&prev_days=3`) to include past programs in the EPG response. This allows third-party players that request historical program schedules to receive the data they need. The EPG URL builder in the Channels page exposes "Days forward" and "Days back" controls. Per-user defaults for both values (`epg_days` / `epg_prev_days`) can be configured in the User settings modal and are applied automatically when no URL parameter is present. (Closes #1154)
 - **Plugin Hub**: administrators can now browse, install, and update plugins directly from remote repositories via a new Plugin Hub page in Settings. (Closes #393) — Thanks [@sethwv](https://github.com/sethwv)
   - Install plugins directly from the hub: the release zip is downloaded, SHA256 integrity is verified, and the plugin is installed atomically.
   - Update managed plugins when a newer version is available from their source repo. Version compatibility constraints (`min_dispatcharr_version` / `max_dispatcharr_version`) are enforced at install time.
diff --git a/apps/output/views.py b/apps/output/views.py
index 84c5f29e..063ca71b 100644
--- a/apps/output/views.py
+++ b/apps/output/views.py
@@ -194,7 +194,7 @@ def generate_m3u(request, profile_name=None, user=None):
         epg_base_url = build_absolute_uri_with_port(request, reverse('output:epg_endpoint', args=[profile_name]) if profile_name else reverse('output:epg_endpoint'))
 
         # Optionally preserve certain query parameters
-        preserved_params = ['tvg_id_source', 'cachedlogos', 'days']
+        preserved_params = ['tvg_id_source', 'cachedlogos', 'days', 'prev_days']
         query_params = {k: v for k, v in request.GET.items() if k in preserved_params}
         if query_params:
             from urllib.parse import urlencode
@@ -1339,21 +1339,35 @@ def generate_epg(request, profile_name=None, user=None):
         tvg_id_source = request.GET.get('tvg_id_source', 'channel_number').lower()
 
         # Get the number of days for EPG data
+        # The user account default (custom_properties['epg_days']) is used when the
+        # URL parameter is absent, so XC clients that cannot pass query params still benefit.
+        user_custom = (user.custom_properties or {}) if user else {}
         try:
-            # Default to 0 days (everything) for real EPG if not specified
-            days_param = request.GET.get('days', '0')
+            default_days = int(user_custom.get('epg_days', 0))
+            days_param = request.GET.get('days', str(default_days))
             num_days = int(days_param)
             # Set reasonable limits
             num_days = max(0, min(num_days, 365))  # Between 0 and 365 days
         except ValueError:
             num_days = 0  # Default to all data if invalid value
 
+        # Get number of previous/historical days to include (for catch-up/timeshift support).
+        # The user account default (custom_properties['epg_prev_days']) is used when the
+        # URL parameter is absent, so XC clients that cannot pass query params still benefit.
+        try:
+            default_prev_days = int(user_custom.get('epg_prev_days', 0))
+            prev_days = int(request.GET.get('prev_days', default_prev_days))
+            prev_days = max(0, min(prev_days, 30))  # Hard cap at 30 days lookback
+        except (ValueError, TypeError):
+            prev_days = 0
+
         # For dummy EPG, use either the specified value or default to 3 days
         dummy_days = num_days if num_days > 0 else 3
 
-        # Calculate cutoff date for EPG data filtering (only if days > 0)
+        # Calculate cutoff dates for EPG data filtering
         now = django_timezone.now()
         cutoff_date = now + timedelta(days=num_days) if num_days > 0 else None
+        lookback_cutoff = now - timedelta(days=prev_days)
 
         # Build collision-free channel number mapping for XC clients (if user is authenticated)
         # XC clients require integer channel numbers, so we need to ensure no conflicts
@@ -1643,13 +1657,14 @@ def generate_epg(request, profile_name=None, user=None):
                 # For real EPG data - filter only if days parameter was specified
                 if num_days > 0:
                     programs_qs = channel.epg_data.programs.filter(
-                        end_time__gte=now,
+                        end_time__gte=lookback_cutoff,
                         start_time__lt=cutoff_date
                     ).order_by('id')  # Explicit ordering for consistent chunking
                 else:
-                    # Return all non-expired programs if days=0 or not specified
+                    # Return programs from lookback_cutoff onward (includes recent past
+                    # for catch-up when prev_days > 0, otherwise current/future only)
                     programs_qs = channel.epg_data.programs.filter(
-                        end_time__gte=now
+                        end_time__gte=lookback_cutoff
                     ).order_by('id')
 
                 # Process programs in chunks to avoid cursor timeout issues
@@ -2332,6 +2347,9 @@ def xc_get_epg(request, user, short=False):
     channel_num_int = channel_num_map.get(channel.id, int(channel.channel_number))
 
     limit = int(request.GET.get('limit', 4))
+    user_custom = user.custom_properties or {}
+    prev_days = max(0, min(int(user_custom.get('epg_prev_days', 0)), 30))
+    lookback_cutoff = django_timezone.now() - timedelta(days=prev_days)
     if channel.epg_data:
         # Check if this is a dummy EPG that generates on-demand
         if channel.epg_data.epg_source and channel.epg_data.epg_source.source_type == 'dummy':
@@ -2346,21 +2364,21 @@ def xc_get_epg(request, user, short=False):
                 # Has stored programs, use them
                 if short == False:
                     programs = channel.epg_data.programs.filter(
-                        end_time__gt=django_timezone.now()
+                        end_time__gt=lookback_cutoff
                     ).order_by('start_time')
                 else:
                     programs = channel.epg_data.programs.filter(
-                        end_time__gt=django_timezone.now()
+                        end_time__gt=lookback_cutoff
                     ).order_by('start_time')[:limit]
         else:
             # Regular EPG with stored programs
             if short == False:
                 programs = channel.epg_data.programs.filter(
-                    end_time__gt=django_timezone.now()
+                    end_time__gt=lookback_cutoff
                 ).order_by('start_time')
             else:
                 programs = channel.epg_data.programs.filter(
-                        end_time__gt=django_timezone.now()
+                        end_time__gt=lookback_cutoff
                     ).order_by('start_time')[:limit]
     else:
         # No EPG data assigned, generate default dummy
diff --git a/frontend/src/components/forms/User.jsx b/frontend/src/components/forms/User.jsx
index f62975ff..dd015511 100644
--- a/frontend/src/components/forms/User.jsx
+++ b/frontend/src/components/forms/User.jsx
@@ -54,6 +54,8 @@ const User = ({ user = null, isOpen, onClose }) => {
       xc_password: '',
       channel_profiles: [],
       hide_adult_content: false,
+      epg_days: 0,
+      epg_prev_days: 0,
     },
 
     validate: (values) => ({
@@ -100,6 +102,12 @@ const User = ({ user = null, isOpen, onClose }) => {
     customProps.hide_adult_content = values.hide_adult_content || false;
     delete values.hide_adult_content;
 
+    // Save EPG defaults in custom_properties
+    customProps.epg_days = values.epg_days || 0;
+    delete values.epg_days;
+    customProps.epg_prev_days = values.epg_prev_days || 0;
+    delete values.epg_prev_days;
+
     values.custom_properties = customProps;
 
     // If 'All' is included, clear this and we assume access to all channels
@@ -152,6 +160,8 @@ const User = ({ user = null, isOpen, onClose }) => {
             : ['0'],
         xc_password: customProps.xc_password || '',
         hide_adult_content: customProps.hide_adult_content || false,
+        epg_days: customProps.epg_days || 0,
+        epg_prev_days: customProps.epg_prev_days || 0,
       });
 
       if (customProps.xc_password) {
@@ -353,6 +363,24 @@ const User = ({ user = null, isOpen, onClose }) => {
               </Box>
             )}
 
+            <NumberInput
+              label="EPG: Default days forward (0 = all)"
+              description="How many future days of EPG data to include by default"
+              min={0}
+              max={365}
+              {...form.getInputProps('epg_days')}
+              key={form.key('epg_days')}
+            />
+
+            <NumberInput
+              label="EPG: Default days back (0 = none)"
+              description="How many past days of EPG data to include by default (max 30)"
+              min={0}
+              max={30}
+              {...form.getInputProps('epg_prev_days')}
+              key={form.key('epg_prev_days')}
+            />
+
             {canGenerateKey && (
               <Stack>
                 {userAPIKey && (
diff --git a/frontend/src/components/tables/ChannelsTable.jsx b/frontend/src/components/tables/ChannelsTable.jsx
index dde9fda0..b931a551 100644
--- a/frontend/src/components/tables/ChannelsTable.jsx
+++ b/frontend/src/components/tables/ChannelsTable.jsx
@@ -388,6 +388,7 @@ const ChannelsTable = ({ onReady }) => {
     cachedlogos: true,
     tvg_id_source: 'channel_number',
     days: 0,
+    prev_days: 0,
   });
 
   /**
@@ -758,6 +759,8 @@ const ChannelsTable = ({ onReady }) => {
     if (epgParams.tvg_id_source !== 'channel_number')
       params.append('tvg_id_source', epgParams.tvg_id_source);
     if (epgParams.days > 0) params.append('days', epgParams.days.toString());
+    if (epgParams.prev_days > 0)
+      params.append('prev_days', epgParams.prev_days.toString());
 
     const baseUrl = epgUrl;
     return params.toString() ? `${baseUrl}?${params.toString()}` : baseUrl;
@@ -1442,7 +1445,7 @@ const ChannelsTable = ({ onReady }) => {
                       ]}
                     />
                     <NumberInput
-                      label="Days (0 = all data)"
+                      label="Days forward (0 = all)"
                       size="xs"
                       min={0}
                       max={365}
@@ -1454,6 +1457,19 @@ const ChannelsTable = ({ onReady }) => {
                         }))
                       }
                     />
+                    <NumberInput
+                      label="Days back (0 = none)"
+                      size="xs"
+                      min={0}
+                      max={30}
+                      value={epgParams.prev_days}
+                      onChange={(value) =>
+                        setEpgParams((prev) => ({
+                          ...prev,
+                          prev_days: value || 0,
+                        }))
+                      }
+                    />
                   </Stack>
                 </Popover.Dropdown>
               </Popover>

From 123509eb9d05e69bdffb70ad8934b9db4540150d Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 16:39:35 -0500
Subject: [PATCH 168/172] Enhancement: Redesigned the User settings modal with
 a tabbed layout

---
 CHANGELOG.md                           |   1 +
 frontend/src/components/forms/User.jsx | 357 ++++++++++++-------------
 2 files changed, 177 insertions(+), 181 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b2b8333..c2279057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Redesigned the User settings modal with a tabbed layout: **Account** (username, email, name, password), **Permissions** (user level, stream limit, channel profiles, mature content filter - admin only), **EPG Defaults** (days forward/back), and **API & XC** (XC password, API key management). Fields are now logically grouped rather than split across two ad-hoc columns.
 - EPG channel scanning now automatically removes stale `EPGData` entries. tvg-ids that were present in a previous scan but are no longer found in the upstream source, provided they are not mapped to any channel. This prevents unbounded database bloat over time. Entries mapped to at least one channel are always preserved.
 - Rewrote the M3U line parser as an `iter_m3u_entries` generator that owns the full per-entry state machine. Intermediate directive lines between `#EXTINF` and the stream URL are now handled correctly rather than corrupting the pending entry or being silently misassigned. A `#EXTINF` with no following URL is discarded with a warning instead of carrying over a `url`-less entry into batch processing. Attribute keys are normalised to lowercase during parsing (provider attribute names remain case-insensitive end-to-end). The `#EXTINF` attribute regex is pre-compiled at module load, and attribute lookups use O(1) `dict.get()` instead of linear scans — approximately 10% faster parsing on large M3U files.
 - Added support for the `#EXTGRP` directive in M3U files. When a `group-title` attribute is absent from the `#EXTINF` line, the value from a following `#EXTGRP:` line is used as the group. An explicit `group-title` attribute always takes priority. (Closes #1088)
diff --git a/frontend/src/components/forms/User.jsx b/frontend/src/components/forms/User.jsx
index dd015511..910664fa 100644
--- a/frontend/src/components/forms/User.jsx
+++ b/frontend/src/components/forms/User.jsx
@@ -1,11 +1,9 @@
-// Modal.js
 import React, { useState, useEffect } from 'react';
 import API from '../../api';
 import {
   TextInput,
   Button,
   Modal,
-  Flex,
   Select,
   PasswordInput,
   Group,
@@ -13,14 +11,12 @@ import {
   MultiSelect,
   ActionIcon,
   Switch,
-  Box,
-  Tooltip,
-  Grid,
-  SimpleGrid,
   NumberInput,
+  Tabs,
+  Text,
   useMantineTheme,
 } from '@mantine/core';
-import { RotateCcwKey, RotateCw, X } from 'lucide-react';
+import { RotateCcwKey, X } from 'lucide-react';
 import { Copy, Key } from 'lucide-react';
 import { useForm } from '@mantine/form';
 import useChannelsStore from '../../store/channels';
@@ -247,198 +243,197 @@ const User = ({ user = null, isOpen, onClose }) => {
   return (
     <Modal opened={isOpen} onClose={onClose} title="User" size="xl">
       <form onSubmit={form.onSubmit(onSubmit)}>
-        <Group justify="space-between" align="top">
-          <Stack gap="xs" style={{ flex: 1 }}>
-            <TextInput
-              id="username"
-              name="username"
-              label="Username"
-              disabled={!isAdmin}
-              {...form.getInputProps('username')}
-              key={form.key('username')}
-            />
-
-            <TextInput
-              id="first_name"
-              name="first_name"
-              label="First Name"
-              {...form.getInputProps('first_name')}
-              key={form.key('first_name')}
-            />
-
-            <PasswordInput
-              label="Password"
-              description="Used for UI authentication"
-              {...form.getInputProps('password')}
-              key={form.key('password')}
-              disabled={form.getValues().user_level == USER_LEVELS.STREAMER}
-            />
-
+        <Tabs defaultValue="account">
+          <Tabs.List mb="md">
+            <Tabs.Tab value="account">Account</Tabs.Tab>
             {showPermissions && (
-              <>
-                <Select
-                  label="User Level"
-                  data={Object.entries(USER_LEVELS).map(([, value]) => {
-                    return {
+              <Tabs.Tab value="permissions">Permissions</Tabs.Tab>
+            )}
+            <Tabs.Tab value="epg">EPG Defaults</Tabs.Tab>
+            <Tabs.Tab value="api">API &amp; XC</Tabs.Tab>
+          </Tabs.List>
+
+          <Tabs.Panel value="account">
+            <Stack gap="sm">
+              <Group grow align="flex-start">
+                <TextInput
+                  label="Username"
+                  disabled={!isAdmin}
+                  {...form.getInputProps('username')}
+                  key={form.key('username')}
+                />
+                <TextInput
+                  label="E-Mail"
+                  {...form.getInputProps('email')}
+                  key={form.key('email')}
+                />
+              </Group>
+              <Group grow align="flex-start">
+                <TextInput
+                  label="First Name"
+                  {...form.getInputProps('first_name')}
+                  key={form.key('first_name')}
+                />
+                <TextInput
+                  label="Last Name"
+                  {...form.getInputProps('last_name')}
+                  key={form.key('last_name')}
+                />
+              </Group>
+              <PasswordInput
+                label="Password"
+                description="Used for UI authentication"
+                {...form.getInputProps('password')}
+                key={form.key('password')}
+                disabled={form.getValues().user_level == USER_LEVELS.STREAMER}
+              />
+            </Stack>
+          </Tabs.Panel>
+
+          {showPermissions && (
+            <Tabs.Panel value="permissions">
+              <Stack gap="sm">
+                <Group grow align="flex-start">
+                  <Select
+                    label="User Level"
+                    data={Object.entries(USER_LEVELS).map(([, value]) => ({
                       label: USER_LEVEL_LABELS[value],
                       value: `${value}`,
-                    };
+                    }))}
+                    {...form.getInputProps('user_level')}
+                    key={form.key('user_level')}
+                  />
+                  <NumberInput
+                    label="Stream Limit (0 = unlimited)"
+                    {...form.getInputProps('stream_limit')}
+                    key={form.key('stream_limit')}
+                  />
+                </Group>
+                <MultiSelect
+                  label="Channel Profiles"
+                  {...form.getInputProps('channel_profiles')}
+                  key={form.key('channel_profiles')}
+                  onChange={onChannelProfilesChange}
+                  data={Object.values(profiles).map((profile) => ({
+                    label: profile.name,
+                    value: `${profile.id}`,
+                  }))}
+                />
+                <Switch
+                  label="Hide Mature Content"
+                  description="Hide channels marked as mature content (admin users not affected)"
+                  {...form.getInputProps('hide_adult_content', {
+                    type: 'checkbox',
                   })}
-                  {...form.getInputProps('user_level')}
-                  key={form.key('user_level')}
+                  key={form.key('hide_adult_content')}
                 />
+              </Stack>
+            </Tabs.Panel>
+          )}
 
+          <Tabs.Panel value="epg">
+            <Stack gap="sm">
+              <Text size="sm" c="dimmed">
+                These defaults apply when no URL parameters are specified —
+                useful for XC clients that cannot pass custom query parameters.
+              </Text>
+              <Group grow align="flex-start">
                 <NumberInput
-                  label="Stream Limit (0 = unlimited)"
-                  {...form.getInputProps('stream_limit')}
-                  key={form.key('stream_limit')}
+                  label="Days forward (0 = all)"
+                  description="How many future days of EPG data to include"
+                  min={0}
+                  max={365}
+                  {...form.getInputProps('epg_days')}
+                  key={form.key('epg_days')}
                 />
-              </>
-            )}
-          </Stack>
+                <NumberInput
+                  label="Days back (0 = none)"
+                  description="How many past days of EPG data to include (max 30)"
+                  min={0}
+                  max={30}
+                  {...form.getInputProps('epg_prev_days')}
+                  key={form.key('epg_prev_days')}
+                />
+              </Group>
+            </Stack>
+          </Tabs.Panel>
 
-          <Stack gap="xs" style={{ flex: 1 }}>
-            <TextInput
-              id="email"
-              name="email"
-              label="E-Mail"
-              {...form.getInputProps('email')}
-              key={form.key('email')}
-            />
-
-            <TextInput
-              id="last_name"
-              name="last_name"
-              label="Last Name"
-              {...form.getInputProps('last_name')}
-              key={form.key('last_name')}
-            />
-
-            <TextInput
-              label="XC Password"
-              description="Clear to disable XC API"
-              {...form.getInputProps('xc_password')}
-              key={form.key('xc_password')}
-              rightSectionWidth={30}
-              rightSection={
-                <ActionIcon
-                  variant="transparent"
-                  size="sm"
-                  color="white"
-                  onClick={generateXCPassword}
-                >
-                  <RotateCcwKey />
-                </ActionIcon>
-              }
-            />
-
-            {showPermissions && (
-              <MultiSelect
-                label="Channel Profiles"
-                {...form.getInputProps('channel_profiles')}
-                key={form.key('channel_profiles')}
-                onChange={onChannelProfilesChange}
-                data={Object.values(profiles).map((profile) => ({
-                  label: profile.name,
-                  value: `${profile.id}`,
-                }))}
-              />
-            )}
-
-            {showPermissions && (
-              <Box>
-                <Tooltip
-                  label="Hide channels marked as mature content (admin users not affected)"
-                  position="top"
-                  withArrow
-                >
-                  <Switch
-                    label="Hide Mature Content"
-                    {...form.getInputProps('hide_adult_content', {
-                      type: 'checkbox',
-                    })}
-                    key={form.key('hide_adult_content')}
-                  />
-                </Tooltip>
-              </Box>
-            )}
-
-            <NumberInput
-              label="EPG: Default days forward (0 = all)"
-              description="How many future days of EPG data to include by default"
-              min={0}
-              max={365}
-              {...form.getInputProps('epg_days')}
-              key={form.key('epg_days')}
-            />
-
-            <NumberInput
-              label="EPG: Default days back (0 = none)"
-              description="How many past days of EPG data to include by default (max 30)"
-              min={0}
-              max={30}
-              {...form.getInputProps('epg_prev_days')}
-              key={form.key('epg_prev_days')}
-            />
-
-            {canGenerateKey && (
-              <Stack>
-                {userAPIKey && (
-                  <TextInput
-                    label="API Key"
-                    disabled={true}
-                    value={userAPIKey}
-                    rightSection={
-                      <ActionIcon
-                        variant="transparent"
-                        size="sm"
-                        color="white"
-                        onClick={() =>
-                          copyToClipboard(userAPIKey, {
-                            successTitle: 'API Key Copied!',
-                            successMessage:
-                              'The API Key has been copied to your clipboard.',
-                          })
-                        }
-                      >
-                        <Copy />
-                      </ActionIcon>
-                    }
-                  />
-                )}
-
-                <Group gap="xs" grow>
-                  <Button
-                    leftSection={<Key size={14} />}
-                    size="xs"
-                    onClick={onGenerateKey}
-                    loading={generating}
-                    variant="light"
-                    fullWidth
+          <Tabs.Panel value="api">
+            <Stack gap="sm">
+              <TextInput
+                label="XC Password"
+                description="Clear to disable XC API"
+                {...form.getInputProps('xc_password')}
+                key={form.key('xc_password')}
+                rightSectionWidth={30}
+                rightSection={
+                  <ActionIcon
+                    variant="transparent"
+                    size="sm"
+                    color="white"
+                    onClick={generateXCPassword}
                   >
-                    {userAPIKey ? 'Regenerate API Key' : 'Generate API Key'}
-                  </Button>
-
+                    <RotateCcwKey />
+                  </ActionIcon>
+                }
+              />
+              {canGenerateKey && (
+                <Stack gap="xs">
                   {userAPIKey && (
+                    <TextInput
+                      label="API Key"
+                      disabled={true}
+                      value={userAPIKey}
+                      rightSection={
+                        <ActionIcon
+                          variant="transparent"
+                          size="sm"
+                          color="white"
+                          onClick={() =>
+                            copyToClipboard(userAPIKey, {
+                              successTitle: 'API Key Copied!',
+                              successMessage:
+                                'The API Key has been copied to your clipboard.',
+                            })
+                          }
+                        >
+                          <Copy />
+                        </ActionIcon>
+                      }
+                    />
+                  )}
+                  <Group gap="xs" grow>
                     <Button
-                      leftSection={<X size={14} />}
+                      leftSection={<Key size={14} />}
                       size="xs"
-                      onClick={onRevokeKey}
+                      onClick={onGenerateKey}
                       loading={generating}
-                      color={theme.colors.red[5]}
                       variant="light"
                       fullWidth
                     >
-                      Revoke API Key
+                      {userAPIKey ? 'Regenerate API Key' : 'Generate API Key'}
                     </Button>
-                  )}
-                </Group>
-              </Stack>
-            )}
-          </Stack>
-        </Group>
+                    {userAPIKey && (
+                      <Button
+                        leftSection={<X size={14} />}
+                        size="xs"
+                        onClick={onRevokeKey}
+                        loading={generating}
+                        color={theme.colors.red[5]}
+                        variant="light"
+                        fullWidth
+                      >
+                        Revoke API Key
+                      </Button>
+                    )}
+                  </Group>
+                </Stack>
+              )}
+            </Stack>
+          </Tabs.Panel>
+        </Tabs>
 
-        <Flex mih={50} gap="xs" justify="flex-end" align="flex-end">
+        <Group justify="flex-end" mt="md">
           <Button
             type="submit"
             variant="contained"
@@ -447,7 +442,7 @@ const User = ({ user = null, isOpen, onClose }) => {
           >
             Save
           </Button>
-        </Flex>
+        </Group>
       </form>
     </Modal>
   );

From 95fba1cb84902ecb377d364cfa2ce08ff0430b4a Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 16:45:58 -0500
Subject: [PATCH 169/172] Bug Fix: Fixed the XC Password field in the User
 modal being editable by standard users

---
 CHANGELOG.md                           |  1 +
 frontend/src/components/forms/User.jsx | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2279057..696fa330 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed the `next_stream` rotation endpoint applying the same class of bug: `get_stream_info_for_switch()` was called and returned `m3u_profile_id`, but the result was dropped when forwarding to `ChannelService.change_stream_url()`, so `update_stream_profile()` was never called and `profile_connections` counters were not updated after an automatic stream rotation.
 - Fixed stream switch metadata (`url`, `user_agent`, `stream_id`, `m3u_profile`) being written to Redis before the switch was confirmed to succeed. If the switch failed, URL unchanged or exception during teardown, Redis described a URL not actually in use. Metadata is now written only after `update_url()` returns `True`; on failure the owner writes `stream_manager.url` back as the ground truth. The non-owner no longer pre-writes metadata at all, all needed info is carried in the pubsub payload and written by the owner after confirmation.
 - Fixed the Stats page "Active Stream" dropdown not updating when a stream switch occurs. The card was matching the active stream by comparing the URL stored in Redis against stream URLs from the database, which failed silently when the stored URL was a transformed/rewritten value that didn't substring-match the original. The dropdown now matches by `stream_id` (the authoritative value already present in the stats payload) and re-runs only when `stream_id` changes, so the normal polling interval drives updates with no extra renders.
+- Fixed the XC Password field in the User modal being editable by standard users despite the backend (`PATCH /api/accounts/users/me/`) stripping `xc_password` from `custom_properties` for non-admin users, causing the change to silently revert on save. The field and its generate button are now disabled with an explanatory description when the current user is not an administrator.
 - Fixed uploading a local M3U file with no expiration date set sending the string `"null"` as the `exp_date` field in the `FormData` request, causing a 400 validation error from the API. Null/undefined values are now skipped when building the `FormData` body, matching the behaviour already present in the update path.
 - Fixed `PATCH /api/channels/channels/edit/bulk/` returning a 500 error when the request body included a `streams` list. The bulk edit handler was iterating `validated_data` directly and calling `setattr(channel, "streams", value)`, which Django prohibits on ManyToMany fields. Also added an `@extend_schema` decorator so the Swagger UI correctly documents the endpoint as accepting a JSON array and shows the `streams` field. (Fixes #883)
 - Fixed several incorrect or incomplete OpenAPI (`@extend_schema`) schemas across the API:
diff --git a/frontend/src/components/forms/User.jsx b/frontend/src/components/forms/User.jsx
index 910664fa..92ad3c0f 100644
--- a/frontend/src/components/forms/User.jsx
+++ b/frontend/src/components/forms/User.jsx
@@ -334,8 +334,9 @@ const User = ({ user = null, isOpen, onClose }) => {
           <Tabs.Panel value="epg">
             <Stack gap="sm">
               <Text size="sm" c="dimmed">
-                These defaults apply when no URL parameters are specified —
-                useful for XC clients that cannot pass custom query parameters.
+                These defaults apply when no URL parameters are specified and
+                can be useful for XC clients that cannot pass custom query
+                parameters.
               </Text>
               <Group grow align="flex-start">
                 <NumberInput
@@ -362,7 +363,12 @@ const User = ({ user = null, isOpen, onClose }) => {
             <Stack gap="sm">
               <TextInput
                 label="XC Password"
-                description="Clear to disable XC API"
+                description={
+                  isAdmin
+                    ? 'Clear to disable XC API'
+                    : 'XC password can only be changed by an administrator'
+                }
+                disabled={!isAdmin}
                 {...form.getInputProps('xc_password')}
                 key={form.key('xc_password')}
                 rightSectionWidth={30}
@@ -372,6 +378,7 @@ const User = ({ user = null, isOpen, onClose }) => {
                     size="sm"
                     color="white"
                     onClick={generateXCPassword}
+                    disabled={!isAdmin}
                   >
                     <RotateCcwKey />
                   </ActionIcon>

From 62848c0ea02c06ea6be3aa705e3ff2fd126d51f1 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 17:24:17 -0500
Subject: [PATCH 170/172] Enhancement: Improved the HDHR, M3U, and EPG URL
 builder popovers in the Channels table

---
 CHANGELOG.md                                  |   1 +
 .../src/components/tables/ChannelsTable.jsx   | 132 ++++++++++--------
 2 files changed, 78 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 696fa330..5190db86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the HDHR, M3U, and EPG URL builder popovers in the Channels table: each popover now opens with a brief intro sentence describing its purpose. Toggle switches were refactored to use Mantine's native `label` and `description` props (replacing the previous manual `Group`/`Stack`/`Text` layout), giving each switch a properly styled description line beneath its label. Switch alignment was also corrected. Toggles now appear on the left with the label and description stacked to the right, consistent with standard Mantine form layout.
 - Redesigned the User settings modal with a tabbed layout: **Account** (username, email, name, password), **Permissions** (user level, stream limit, channel profiles, mature content filter - admin only), **EPG Defaults** (days forward/back), and **API & XC** (XC password, API key management). Fields are now logically grouped rather than split across two ad-hoc columns.
 - EPG channel scanning now automatically removes stale `EPGData` entries. tvg-ids that were present in a previous scan but are no longer found in the upstream source, provided they are not mapped to any channel. This prevents unbounded database bloat over time. Entries mapped to at least one channel are always preserved.
 - Rewrote the M3U line parser as an `iter_m3u_entries` generator that owns the full per-entry state machine. Intermediate directive lines between `#EXTINF` and the stream URL are now handled correctly rather than corrupting the pending entry or being silently misassigned. A `#EXTINF` with no following URL is discarded with a warning instead of carrying over a `url`-less entry into batch processing. Attribute keys are normalised to lowercase during parsing (provider attribute names remain case-insensitive end-to-end). The `#EXTINF` attribute regex is pre-compiled at module load, and attribute lookups use O(1) `dict.get()` instead of linear scans — approximately 10% faster parsing on large M3U files.
diff --git a/frontend/src/components/tables/ChannelsTable.jsx b/frontend/src/components/tables/ChannelsTable.jsx
index b931a551..c3a3e363 100644
--- a/frontend/src/components/tables/ChannelsTable.jsx
+++ b/frontend/src/components/tables/ChannelsTable.jsx
@@ -1251,7 +1251,7 @@ const ChannelsTable = ({ onReady }) => {
                   </Button>
                 </Popover.Target>
                 <Popover.Dropdown>
-                  <Group
+                  <Stack
                     gap="sm"
                     style={{
                       minWidth: 250,
@@ -1259,16 +1259,27 @@ const ChannelsTable = ({ onReady }) => {
                       width: 'max-content',
                     }}
                   >
-                    <TextInput value={hdhrUrl} size="small" readOnly />
-                    <ActionIcon
-                      onClick={copyHDHRUrl}
+                    <Text size="sm" c="dimmed">
+                      Use this URL in HDHomeRun-compatible apps and IPTV
+                      clients.
+                    </Text>
+                    <TextInput
+                      value={hdhrUrl}
                       size="sm"
-                      variant="transparent"
-                      color="gray.5"
-                    >
-                      <Copy size="18" fontSize="small" />
-                    </ActionIcon>
-                  </Group>
+                      readOnly
+                      style={{ width: '100%' }}
+                      rightSection={
+                        <ActionIcon
+                          onClick={copyHDHRUrl}
+                          size="sm"
+                          variant="transparent"
+                          color="gray.5"
+                        >
+                          <Copy size="16" />
+                        </ActionIcon>
+                      }
+                    />
+                  </Stack>
                 </Popover.Dropdown>
               </Popover>
               <Popover
@@ -1303,9 +1314,13 @@ const ChannelsTable = ({ onReady }) => {
                     onClick={stopPropagation}
                     onMouseDown={stopPropagation}
                   >
+                    <Text size="sm" c="dimmed">
+                      Use this URL in your media player or IPTV app to load your
+                      channel list.
+                    </Text>
                     <TextInput
                       value={buildM3UUrl()}
-                      size="xs"
+                      size="sm"
                       readOnly
                       label="Generated URL"
                       rightSection={
@@ -1319,35 +1334,34 @@ const ChannelsTable = ({ onReady }) => {
                         </ActionIcon>
                       }
                     />
-                    <Group justify="space-between">
-                      <Text size="sm">Use cached logos</Text>
-                      <Switch
-                        size="sm"
-                        checked={m3uParams.cachedlogos}
-                        onChange={(event) =>
-                          setM3uParams((prev) => ({
-                            ...prev,
-                            cachedlogos: event.target.checked,
-                          }))
-                        }
-                      />
-                    </Group>
-                    <Group justify="space-between">
-                      <Text size="sm">Direct stream URLs</Text>
-                      <Switch
-                        size="sm"
-                        checked={m3uParams.direct}
-                        onChange={(event) =>
-                          setM3uParams((prev) => ({
-                            ...prev,
-                            direct: event.target.checked,
-                          }))
-                        }
-                      />
-                    </Group>{' '}
+                    <Switch
+                      label="Use cached logos"
+                      description="Proxy channel logos through Dispatcharr"
+                      size="sm"
+                      checked={m3uParams.cachedlogos}
+                      onChange={(event) =>
+                        setM3uParams((prev) => ({
+                          ...prev,
+                          cachedlogos: event.target.checked,
+                        }))
+                      }
+                    />
+                    <Switch
+                      label="Direct stream URLs"
+                      description="Bypass the Dispatcharr proxy; client connects directly to the source"
+                      size="sm"
+                      checked={m3uParams.direct}
+                      onChange={(event) =>
+                        setM3uParams((prev) => ({
+                          ...prev,
+                          direct: event.target.checked,
+                        }))
+                      }
+                    />
                     <Select
                       label="TVG-ID Source"
-                      size="xs"
+                      description="Value used as the tvg-id attribute in the M3U"
+                      size="sm"
                       value={m3uParams.tvg_id_source}
                       onChange={(value) =>
                         setM3uParams((prev) => ({
@@ -1398,9 +1412,15 @@ const ChannelsTable = ({ onReady }) => {
                     onClick={stopPropagation}
                     onMouseDown={stopPropagation}
                   >
+                    <Text size="sm" c="dimmed">
+                      Use this URL in your IPTV app for program guide data.
+                      Per-user defaults for days forward/back can be set in
+                      account settings, which apply automatically for XC
+                      clients.
+                    </Text>
                     <TextInput
                       value={buildEPGUrl()}
-                      size="xs"
+                      size="sm"
                       readOnly
                       label="Generated URL"
                       rightSection={
@@ -1414,22 +1434,22 @@ const ChannelsTable = ({ onReady }) => {
                         </ActionIcon>
                       }
                     />
-                    <Group justify="space-between">
-                      <Text size="sm">Use cached logos</Text>
-                      <Switch
-                        size="sm"
-                        checked={epgParams.cachedlogos}
-                        onChange={(event) =>
-                          setEpgParams((prev) => ({
-                            ...prev,
-                            cachedlogos: event.target.checked,
-                          }))
-                        }
-                      />
-                    </Group>
+                    <Switch
+                      label="Use cached logos"
+                      description="Proxy channel logos through Dispatcharr"
+                      size="sm"
+                      checked={epgParams.cachedlogos}
+                      onChange={(event) =>
+                        setEpgParams((prev) => ({
+                          ...prev,
+                          cachedlogos: event.target.checked,
+                        }))
+                      }
+                    />
                     <Select
                       label="TVG-ID Source"
-                      size="xs"
+                      description="Value used to match EPG channels to M3U streams"
+                      size="sm"
                       value={epgParams.tvg_id_source}
                       onChange={(value) =>
                         setEpgParams((prev) => ({
@@ -1446,7 +1466,8 @@ const ChannelsTable = ({ onReady }) => {
                     />
                     <NumberInput
                       label="Days forward (0 = all)"
-                      size="xs"
+                      description="Limit EPG to this many future days; 0 returns all available data"
+                      size="sm"
                       min={0}
                       max={365}
                       value={epgParams.days}
@@ -1459,7 +1480,8 @@ const ChannelsTable = ({ onReady }) => {
                     />
                     <NumberInput
                       label="Days back (0 = none)"
-                      size="xs"
+                      description="Include this many past days of EPG data (max 30)"
+                      size="sm"
                       min={0}
                       max={30}
                       value={epgParams.prev_days}

From 9f3d4ff7ffbe550b16d3f6be1d723a70365f7c9c Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 18:19:19 -0500
Subject: [PATCH 171/172] Enhancement: Improved the EPG response cache key

---
 CHANGELOG.md         |  1 +
 apps/output/views.py | 52 +++++++++++++++++++-------------------------
 2 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5190db86..72f0a925 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the EPG response cache key. Previously it was based on the raw query string and username, meaning a user default of `epg_days=7` and an explicit `&days=7` URL parameter produced different cache entries for identical output. The key is now built from all resolved effective parameter values (`days`, `prev_days`, `cachedlogos`, `tvg_id_source`) so semantically equivalent requests always share the same cache entry.
 - Improved the HDHR, M3U, and EPG URL builder popovers in the Channels table: each popover now opens with a brief intro sentence describing its purpose. Toggle switches were refactored to use Mantine's native `label` and `description` props (replacing the previous manual `Group`/`Stack`/`Text` layout), giving each switch a properly styled description line beneath its label. Switch alignment was also corrected. Toggles now appear on the left with the label and description stacked to the right, consistent with standard Mantine form layout.
 - Redesigned the User settings modal with a tabbed layout: **Account** (username, email, name, password), **Permissions** (user level, stream limit, channel profiles, mature content filter - admin only), **EPG Defaults** (days forward/back), and **API & XC** (XC password, API key management). Fields are now logically grouped rather than split across two ad-hoc columns.
 - EPG channel scanning now automatically removes stale `EPGData` entries. tvg-ids that were present in a previous scan but are no longer found in the upstream source, provided they are not mapped to any channel. This prevents unbounded database bloat over time. Entries mapped to at least one channel are always preserved.
diff --git a/apps/output/views.py b/apps/output/views.py
index 063ca71b..2531af6d 100644
--- a/apps/output/views.py
+++ b/apps/output/views.py
@@ -1268,7 +1268,28 @@ def generate_epg(request, profile_name=None, user=None):
     """
     # Check cache for recent identical request (helps with double-GET from browsers)
     from django.core.cache import cache
-    cache_params = f"{profile_name or 'all'}:{user.username if user else 'anonymous'}:{request.GET.urlencode()}"
+    # Resolve all effective parameter values once here so they are reused for both
+    # the cache key and inside epg_generator() via closure.
+    # The cache key is built from resolved values only — not from the raw query string —
+    # so equivalent requests (e.g. days=7 via URL param vs. user default of 7) share
+    # the same cache entry regardless of how the value was supplied.
+    user_custom = (user.custom_properties or {}) if user else {}
+    try:
+        num_days = int(request.GET.get('days', user_custom.get('epg_days', 0)))
+        num_days = max(0, min(num_days, 365))
+    except (ValueError, TypeError):
+        num_days = 0
+    try:
+        prev_days = int(request.GET.get('prev_days', user_custom.get('epg_prev_days', 0)))
+        prev_days = max(0, min(prev_days, 30))
+    except (ValueError, TypeError):
+        prev_days = 0
+    use_cached_logos = request.GET.get('cachedlogos', 'true').lower() != 'false'
+    tvg_id_source = request.GET.get('tvg_id_source', 'channel_number').lower()
+    cache_params = (
+        f"{profile_name or 'all'}:{user.username if user else 'anonymous'}"
+        f":d={num_days}:p={prev_days}:logos={use_cached_logos}:tvgid={tvg_id_source}"
+    )
     content_cache_key = f"epg_content:{cache_params}"
 
     cached_content = cache.get(content_cache_key)
@@ -1331,35 +1352,6 @@ def generate_epg(request, profile_name=None, user=None):
             else:
                 channels = Channel.objects.all().order_by("channel_number")
 
-        # Check if the request wants to use direct logo URLs instead of cache
-        use_cached_logos = request.GET.get('cachedlogos', 'true').lower() != 'false'
-
-        # Get the source to use for tvg-id value
-        # Options: 'channel_number' (default), 'tvg_id', 'gracenote'
-        tvg_id_source = request.GET.get('tvg_id_source', 'channel_number').lower()
-
-        # Get the number of days for EPG data
-        # The user account default (custom_properties['epg_days']) is used when the
-        # URL parameter is absent, so XC clients that cannot pass query params still benefit.
-        user_custom = (user.custom_properties or {}) if user else {}
-        try:
-            default_days = int(user_custom.get('epg_days', 0))
-            days_param = request.GET.get('days', str(default_days))
-            num_days = int(days_param)
-            # Set reasonable limits
-            num_days = max(0, min(num_days, 365))  # Between 0 and 365 days
-        except ValueError:
-            num_days = 0  # Default to all data if invalid value
-
-        # Get number of previous/historical days to include (for catch-up/timeshift support).
-        # The user account default (custom_properties['epg_prev_days']) is used when the
-        # URL parameter is absent, so XC clients that cannot pass query params still benefit.
-        try:
-            default_prev_days = int(user_custom.get('epg_prev_days', 0))
-            prev_days = int(request.GET.get('prev_days', default_prev_days))
-            prev_days = max(0, min(prev_days, 30))  # Hard cap at 30 days lookback
-        except (ValueError, TypeError):
-            prev_days = 0
 
         # For dummy EPG, use either the specified value or default to 3 days
         dummy_days = num_days if num_days > 0 else 3

From f8407610c884ddd240a196f19a2addfda11c01bc Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Sun, 12 Apr 2026 18:51:40 -0500
Subject: [PATCH 172/172] Bug Fix/Enhancement: Improve logic for get xc epg
 endpoint for short epgs. Also support epg_days from xc user for xc epg
 endpoint.

---
 apps/output/views.py | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/apps/output/views.py b/apps/output/views.py
index 2531af6d..ba223a9f 100644
--- a/apps/output/views.py
+++ b/apps/output/views.py
@@ -2340,8 +2340,19 @@ def xc_get_epg(request, user, short=False):
 
     limit = int(request.GET.get('limit', 4))
     user_custom = user.custom_properties or {}
-    prev_days = max(0, min(int(user_custom.get('epg_prev_days', 0)), 30))
-    lookback_cutoff = django_timezone.now() - timedelta(days=prev_days)
+    try:
+        num_days = int(request.GET.get('days', user_custom.get('epg_days', 0)))
+        num_days = max(0, min(num_days, 365))
+    except (ValueError, TypeError):
+        num_days = 0
+    try:
+        prev_days = int(request.GET.get('prev_days', user_custom.get('epg_prev_days', 0)))
+        prev_days = max(0, min(prev_days, 30))
+    except (ValueError, TypeError):
+        prev_days = 0
+    now = django_timezone.now()
+    lookback_cutoff = now - timedelta(days=prev_days)
+    forward_cutoff = now + timedelta(days=num_days) if num_days > 0 else None
     if channel.epg_data:
         # Check if this is a dummy EPG that generates on-demand
         if channel.epg_data.epg_source and channel.epg_data.epg_source.source_type == 'dummy':
@@ -2354,24 +2365,28 @@ def xc_get_epg(request, user, short=False):
                 )
             else:
                 # Has stored programs, use them
-                if short == False:
+                if short:
+                    # Short EPG: current and upcoming only (never historical), limited count
                     programs = channel.epg_data.programs.filter(
-                        end_time__gt=lookback_cutoff
-                    ).order_by('start_time')
-                else:
-                    programs = channel.epg_data.programs.filter(
-                        end_time__gt=lookback_cutoff
+                        end_time__gt=now
                     ).order_by('start_time')[:limit]
+                else:
+                    qs = channel.epg_data.programs.filter(end_time__gt=lookback_cutoff)
+                    if forward_cutoff:
+                        qs = qs.filter(start_time__lt=forward_cutoff)
+                    programs = qs.order_by('start_time')
         else:
             # Regular EPG with stored programs
-            if short == False:
+            if short:
+                # Short EPG: current and upcoming only (never historical), limited count
                 programs = channel.epg_data.programs.filter(
-                    end_time__gt=lookback_cutoff
-                ).order_by('start_time')
+                    end_time__gt=now
+                ).order_by('start_time')[:limit]
             else:
-                programs = channel.epg_data.programs.filter(
-                        end_time__gt=lookback_cutoff
-                    ).order_by('start_time')[:limit]
+                qs = channel.epg_data.programs.filter(end_time__gt=lookback_cutoff)
+                if forward_cutoff:
+                    qs = qs.filter(start_time__lt=forward_cutoff)
+                programs = qs.order_by('start_time')
     else:
         # No EPG data assigned, generate default dummy
         programs = generate_dummy_programs(channel_id=channel_id, channel_name=channel.name, epg_source=None)