Phase 4a: Remove ErsatzTV/StreamTV naming from core backend docstrings

[Copilot]

• Identified PR feat(frontend): rewrite UI from Tailwind to MUI with sidebar layout #4 dirty state: copilot/compare-tunarr-and-exstreamtv had unrelated histories with main (shallow clone), causing 29 add/add conflicts
• Merged origin/main (104f3b8) into copilot/resolve-merge-conflicts-docstring-cleanup (this branch), resolving all 29 conflicts:
  • All non-Phase-4a files: used main's version (takes all latest streaming fixes, design patterns, etc.)
  • 6 Phase 4a files: used main's base + applied docstring/comment cleanups
• Verified: git diff 9a650ad origin/main shows only the 6 Phase 4a files changed
• PR Phase 4a: Remove ErsatzTV/StreamTV naming from core backend docstrings #7 (this PR) is the fix vehicle: merging this into copilot/compare-tunarr-and-exstreamtv will make PR feat(frontend): rewrite UI from Tailwind to MUI with sidebar layout #4 clean and show only the 6 docstring cleanup files

Original prompt

Context

PR #4 (copilot/compare-tunarr-and-exstreamtv → main) has merge conflicts and is in a dirty mergeable state. The PR's purpose is to remove ErsatzTV/StreamTV naming references from the codebase (Phase 4a) and rewrite the frontend UI from Tailwind to MUI.

The PR modifies 6 files with comment/docstring cleanup. The main branch has since diverged causing conflicts.

Task

Resolve merge conflicts by applying the same changes from the PR branch onto the current main branch contents. The PR changes are purely docstring/comment cleanups — replacing ErsatzTV references with generic descriptions:

Files and their intended changes (from the PR diff):

1. .gitignore — Add node_modules/ and .vite/ entries under a # Node.js / Frontend section, placed between the # IDE section (after .DS_Store) and the # Swift Package Manager section. NOTE: main already has node_modules/ at the bottom of .gitignore. The resolution should:

   • Add a # Node.js / Frontend comment section after line 129 (.DS_Store)
   • Include node_modules/ and .vite/ under that section
   • Remove the duplicate standalone node_modules/ entry that exists at the bottom of the file on main (line 185-186)

2. exstreamtv/database/models/template.py:

   • Line 5: Change ErsatzTV feature: reusable schedule patterns. → Reusable schedule patterns for programming automation.
   • Line 45: Change ErsatzTV feature: define a day's programming once, apply to multiple days. → Define a day's programming once, then apply to multiple days.

3. exstreamtv/main.py:

   • Line 4: Change FastAPI application entry point combining StreamTV and ErsatzTV features. → FastAPI application entry point — unified IPTV streaming platform.

4. exstreamtv/playout/scheduler.py:

   • Line 4: Change Ported from ErsatzTV PlayoutModeScheduler*.cs files. → Supports four scheduling modes: ONE, MULTIPLE, DURATION, and FLOOD.
   • Lines 24-25: Change Ported from ErsatzTV PlayoutMode. → ONE: play one item then advance. MULTIPLE: play N items. DURATION: play\n for a time span. FLOOD: play until a fixed end time.
   • Lines 38-39: Remove \n Ported from ErsatzTV ProgramScheduleItem. (remove the blank line and the "Ported from" line)
   • Lines 87-88: Change Ported from ErsatzTV PlayoutModeScheduler* classes. → Processes schedule items in sequence, delegating to mode-specific logic\n (ONE, MULTIPLE, DURATION, FLOOD) to fill a playout timeline.

5. exstreamtv/streaming/channel_manager.py:

   • Line 1 docstring: Change Channel Manager for continuous background streaming (ErsatzTV-style). → Channel Manager for continuous background streaming.
   • Line 3: Change Ported from StreamTV with playout timeline tracking and resume capability. → Provides playout timeline tracking and resume capability.
   • Line 5: Change Enhanced with Tunarr/dizqueTV integrations: → Enhanced with integrations:
   • Class ChannelStream docstring: Change Manages a continuous stream for a single channel (ErsatzTV-style). → Manages a continuous stream for a single channel.
   • Comment: Change # Playout timeline tracking (ErsatzTV-style) → # Playout timeline tracking
   • Docstring: Change ErsatzTV-style approach: Use an anchor time to calculate the current → Uses an anchor time to calculate the current
   • Docstring: Change Joins existing continuous stream at current position (ErsatzTV-style). → Joins existing continuous stream at current position.
   • Comment: Change # Get seek offset from playout item (ErsatzTV-style) → # Get seek offset from playout item

6. mcp_server/server.py:

   • Line 97: Change description = "Unified IPTV streaming platform (StreamTV + ErsatzTV)." → description = "Unified IPTV streaming platform."

Important

• Apply these changes to the current state of each file on main (commit 456710c).
• These are all docstring/comment changes — no logic changes.
• Commit directly to the copilot/compare-tunarr-and-exstreamtv branch to resolve the conflicts in PR feat(frontend): rewrite UI from Tailwind to MUI with sidebar layout #4.

The following is the prior conversation context from the user's chat exploration (may be truncated):

User: Resolve the conflicts

Assistant:

Let me first look at the pull request details and understand the conflicts.

Assistant: Now let me check what's on the main branch for the conflicting files to understand the actual conflicts:

Assistant: Now let me look at the current state of the conflicting files on main to understand what's different:

Assistant: Now let me get the full channel_manager.py and main.py from main to see the current state properly:

Assistant: Let me get the full content of the files that are truncated, since they contain conflict areas.

Assistant: Now I have a clear picture of the conflicts. The PR branch (copilot/compare-tunarr-and-exstreamtv) modifies 6 files to remove ErsatzTV/StreamTV naming from the codebase, but main has diverged...

This pull request was created from Copilot chat.