Merge pull request #8 from PiratesIRC/claude/refactor-fuzzy-matcher-patterns-011CUxkNHWBdVdAHJqGaYfNH
Refactor fuzzy_matcher pattern categorization and normalization
This commit is contained in:
Pirates IRC
@@ -11,24 +11,20 @@ import logging
|
||||
from glob import glob
|
||||
|
||||
# Version: YY.DDD.HHMM (Julian date format: Year.DayOfYear.Time)
|
||||
__version__ = "25.310.1806"
|
||||
__version__ = "25.313.1157"
|
||||
|
||||
# Setup logging
|
||||
LOGGER = logging.getLogger("plugins.fuzzy_matcher")
|
||||
|
||||
# Hardcoded regex patterns to ignore during fuzzy matching
|
||||
# Categorized regex patterns for granular control during fuzzy matching
|
||||
# Note: All patterns are applied with re.IGNORECASE flag in normalize_name()
|
||||
HARDCODED_IGNORE_PATTERNS = [
|
||||
|
||||
# Quality-related patterns: [4K], HD, (SD), etc.
|
||||
QUALITY_PATTERNS = [
|
||||
# Bracketed quality tags: [4K], [UHD], [FHD], [HD], [SD], [Unknown], [Unk], [Slow], [Dead]
|
||||
r'\[(4K|UHD|FHD|HD|SD|Unknown|Unk|Slow|Dead)\]',
|
||||
r'\[(?:4k|uhd|fhd|hd|sd|unknown|unk|slow|dead)\]',
|
||||
|
||||
# Single letter tags in parentheses: (A), (B), (C), etc.
|
||||
r'\([A-Z]\)',
|
||||
|
||||
# Regional: " East" or " east"
|
||||
r'\s[Ee][Aa][Ss][Tt]',
|
||||
|
||||
# Unbracketed quality tags in middle: " 4K ", " UHD ", " FHD ", " HD ", " SD ", etc.
|
||||
r'\s(?:4K|UHD|FHD|HD|SD|Unknown|Unk|Slow|Dead|FD)\s',
|
||||
|
||||
@@ -38,15 +34,30 @@ HARDCODED_IGNORE_PATTERNS = [
|
||||
# Word boundary quality tags with optional colon: "4K:", "UHD:", "FHD:", "HD:", etc.
|
||||
r'\b(?:4K|UHD|FHD|HD|SD|Unknown|Unk|Slow|Dead|FD):?\s',
|
||||
|
||||
# Special tags
|
||||
r'\s\(CX\)', # Cinemax tag
|
||||
|
||||
# Parenthesized quality tags: (4K), (UHD), (FHD), (HD), (SD), (Unknown), (Unk), (Slow), (Dead), (Backup)
|
||||
r'\s\((4K|UHD|FHD|HD|SD|Unknown|Unk|Slow|Dead|FD|Backup)\)',
|
||||
]
|
||||
|
||||
# Regional indicator patterns: East, West, etc.
|
||||
REGIONAL_PATTERNS = [
|
||||
# Regional: " East" or " east"
|
||||
r'\s[Ee][Aa][Ss][Tt]',
|
||||
]
|
||||
|
||||
# Geographic prefix patterns: US:, USA:, etc.
|
||||
GEOGRAPHIC_PATTERNS = [
|
||||
# Geographic prefixes
|
||||
r'\bUSA?:\s', # "US:" or "USA:"
|
||||
r'\bUS\s', # "US " at word boundary
|
||||
]
|
||||
|
||||
# Miscellaneous patterns: (CX), (Backup), single-letter tags, etc.
|
||||
MISC_PATTERNS = [
|
||||
# Single letter tags in parentheses: (A), (B), (C), etc.
|
||||
r'\([A-Z]\)',
|
||||
|
||||
# Special tags
|
||||
r'\s\(CX\)', # Cinemax tag
|
||||
|
||||
# Backup tags
|
||||
r'\([bB]ackup\)',
|
||||
@@ -181,14 +192,18 @@ class FuzzyMatcher:
|
||||
callsign = re.sub(r'-(?:TV|CD|LP|DT|LD)$', '', callsign)
|
||||
return callsign
|
||||
|
||||
def normalize_name(self, name, user_ignored_tags=None, remove_quality_tags=True, remove_cinemax=False):
|
||||
def normalize_name(self, name, user_ignored_tags=None, ignore_quality=True, ignore_regional=True,
|
||||
ignore_geographic=True, ignore_misc=True, remove_cinemax=False):
|
||||
"""
|
||||
Normalize channel or stream name for matching by removing tags, prefixes, and other noise.
|
||||
|
||||
Args:
|
||||
name: Name to normalize
|
||||
user_ignored_tags: Additional user-configured tags to ignore (list of strings)
|
||||
remove_quality_tags: If True, remove hardcoded quality patterns (for matching only, not display)
|
||||
ignore_quality: If True, remove quality-related patterns (e.g., [4K], HD, (SD))
|
||||
ignore_regional: If True, remove regional indicator patterns (e.g., East)
|
||||
ignore_geographic: If True, remove geographic prefix patterns (e.g., US:, USA)
|
||||
ignore_misc: If True, remove miscellaneous patterns (e.g., (CX), (Backup), single-letter tags)
|
||||
remove_cinemax: If True, remove "Cinemax" prefix (useful when channel name contains "max")
|
||||
|
||||
Returns:
|
||||
@@ -204,15 +219,37 @@ class FuzzyMatcher:
|
||||
if remove_cinemax:
|
||||
name = re.sub(r'\bCinemax\b\s*', '', name, flags=re.IGNORECASE)
|
||||
|
||||
# Apply hardcoded ignore patterns only if remove_quality_tags is True
|
||||
if remove_quality_tags:
|
||||
for pattern in HARDCODED_IGNORE_PATTERNS:
|
||||
name = re.sub(pattern, '', name, flags=re.IGNORECASE)
|
||||
# Build list of patterns to apply based on category flags
|
||||
patterns_to_apply = []
|
||||
|
||||
# Apply user-configured ignored tags
|
||||
if ignore_quality:
|
||||
patterns_to_apply.extend(QUALITY_PATTERNS)
|
||||
|
||||
if ignore_regional:
|
||||
patterns_to_apply.extend(REGIONAL_PATTERNS)
|
||||
|
||||
if ignore_geographic:
|
||||
patterns_to_apply.extend(GEOGRAPHIC_PATTERNS)
|
||||
|
||||
if ignore_misc:
|
||||
patterns_to_apply.extend(MISC_PATTERNS)
|
||||
|
||||
# Apply selected hardcoded patterns
|
||||
for pattern in patterns_to_apply:
|
||||
name = re.sub(pattern, '', name, flags=re.IGNORECASE)
|
||||
|
||||
# Apply user-configured ignored tags with improved handling
|
||||
for tag in user_ignored_tags:
|
||||
escaped_tag = re.escape(tag)
|
||||
name = re.sub(escaped_tag, '', name, flags=re.IGNORECASE)
|
||||
# Check if tag contains brackets or parentheses - if so, match literally
|
||||
if '[' in tag or ']' in tag or '(' in tag or ')' in tag:
|
||||
# Literal match for bracketed/parenthesized tags
|
||||
escaped_tag = re.escape(tag)
|
||||
name = re.sub(escaped_tag, '', name, flags=re.IGNORECASE)
|
||||
else:
|
||||
# Word boundary match for simple word tags to avoid partial matches
|
||||
# e.g., "East" won't match the "east" in "Feast"
|
||||
escaped_tag = re.escape(tag)
|
||||
name = re.sub(r'\b' + escaped_tag + r'\b', '', name, flags=re.IGNORECASE)
|
||||
|
||||
# Remove callsigns in parentheses
|
||||
name = re.sub(r'\([KW][A-Z]{3}(?:-(?:TV|CD|LP|DT|LD))?\)', '', name, flags=re.IGNORECASE)
|
||||
|
||||
@@ -31,7 +31,7 @@ class Plugin:
|
||||
"""Dispatcharr Stream-Mapparr Plugin"""
|
||||
|
||||
name = "Stream-Mapparr"
|
||||
version = "0.5.0b"
|
||||
version = "0.5.0d"
|
||||
description = "🎯 Automatically add matching streams to channels based on name similarity and quality precedence with enhanced fuzzy matching"
|
||||
|
||||
# Settings rendered by UI
|
||||
@@ -95,6 +95,34 @@ class Plugin:
|
||||
"placeholder": "4K, [4K], [Dead]",
|
||||
"help_text": "Tags to ignore when matching streams. Space-separated in channel names unless they contain brackets/parentheses.",
|
||||
},
|
||||
{
|
||||
"id": "ignore_quality_tags",
|
||||
"label": "🎬 Ignore Quality Tags",
|
||||
"type": "boolean",
|
||||
"default": True,
|
||||
"help_text": "If enabled, hardcoded quality tags like [4K], [HD], (UHD), etc., will be ignored during matching.",
|
||||
},
|
||||
{
|
||||
"id": "ignore_regional_tags",
|
||||
"label": "🌍 Ignore Regional Tags",
|
||||
"type": "boolean",
|
||||
"default": True,
|
||||
"help_text": "If enabled, hardcoded regional tags like 'East' will be ignored during matching.",
|
||||
},
|
||||
{
|
||||
"id": "ignore_geographic_tags",
|
||||
"label": "🗺️ Ignore Geographic Tags",
|
||||
"type": "boolean",
|
||||
"default": True,
|
||||
"help_text": "If enabled, hardcoded geographic prefixes like 'US:', 'USA:' will be ignored during matching.",
|
||||
},
|
||||
{
|
||||
"id": "ignore_misc_tags",
|
||||
"label": "🏷️ Ignore Miscellaneous Tags",
|
||||
"type": "boolean",
|
||||
"default": True,
|
||||
"help_text": "If enabled, miscellaneous tags like (CX), (Backup), and single-letter tags will be ignored during matching.",
|
||||
},
|
||||
{
|
||||
"id": "visible_channel_limit",
|
||||
"label": "👁️ Visible Channel Limit",
|
||||
@@ -353,7 +381,8 @@ class Plugin:
|
||||
logger.warning(f"[Stream-Mapparr] Could not trigger frontend refresh: {e}")
|
||||
return False
|
||||
|
||||
def _clean_channel_name(self, name, ignore_tags=None, remove_cinemax=False):
|
||||
def _clean_channel_name(self, name, ignore_tags=None, ignore_quality=True, ignore_regional=True,
|
||||
ignore_geographic=True, ignore_misc=True, remove_cinemax=False):
|
||||
"""
|
||||
Remove brackets and their contents from channel name for matching, and remove ignore tags.
|
||||
Uses fuzzy matcher's normalization if available, otherwise falls back to basic cleaning.
|
||||
@@ -361,11 +390,22 @@ class Plugin:
|
||||
Args:
|
||||
name: Channel or stream name to clean
|
||||
ignore_tags: List of tags to ignore
|
||||
ignore_quality: If True, remove quality-related patterns (e.g., [4K], HD, (SD))
|
||||
ignore_regional: If True, remove regional indicator patterns (e.g., East)
|
||||
ignore_geographic: If True, remove geographic prefix patterns (e.g., US:, USA)
|
||||
ignore_misc: If True, remove miscellaneous patterns (e.g., (CX), (Backup), single-letter tags)
|
||||
remove_cinemax: If True, remove "Cinemax" prefix (for streams when channel contains "max")
|
||||
"""
|
||||
if self.fuzzy_matcher:
|
||||
# Use fuzzy matcher's normalization
|
||||
return self.fuzzy_matcher.normalize_name(name, ignore_tags, remove_quality_tags=True, remove_cinemax=remove_cinemax)
|
||||
return self.fuzzy_matcher.normalize_name(
|
||||
name, ignore_tags,
|
||||
ignore_quality=ignore_quality,
|
||||
ignore_regional=ignore_regional,
|
||||
ignore_geographic=ignore_geographic,
|
||||
ignore_misc=ignore_misc,
|
||||
remove_cinemax=remove_cinemax
|
||||
)
|
||||
|
||||
# Fallback to basic cleaning
|
||||
if ignore_tags is None:
|
||||
@@ -489,7 +529,9 @@ class Plugin:
|
||||
|
||||
return callsign.upper()
|
||||
|
||||
def _match_streams_to_channel(self, channel, all_streams, logger, ignore_tags=None, channels_data=None):
|
||||
def _match_streams_to_channel(self, channel, all_streams, logger, ignore_tags=None,
|
||||
ignore_quality=True, ignore_regional=True, ignore_geographic=True,
|
||||
ignore_misc=True, channels_data=None):
|
||||
"""Find matching streams for a channel using fuzzy matching when available."""
|
||||
if ignore_tags is None:
|
||||
ignore_tags = []
|
||||
@@ -504,7 +546,10 @@ class Plugin:
|
||||
# Check if channel name contains "max" (case insensitive) - used for Cinemax handling
|
||||
channel_has_max = 'max' in channel_name.lower()
|
||||
|
||||
cleaned_channel_name = self._clean_channel_name(channel_name, ignore_tags)
|
||||
cleaned_channel_name = self._clean_channel_name(
|
||||
channel_name, ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc
|
||||
)
|
||||
|
||||
if "24/7" in channel_name.lower():
|
||||
logger.info(f"[Stream-Mapparr] Cleaned channel name for matching: {cleaned_channel_name}")
|
||||
@@ -531,7 +576,10 @@ class Plugin:
|
||||
sorted_streams = self._sort_streams_by_quality(matching_streams)
|
||||
logger.info(f"[Stream-Mapparr] Sorted {len(sorted_streams)} streams by quality (callsign matching)")
|
||||
|
||||
cleaned_stream_names = [self._clean_channel_name(s['name'], ignore_tags, remove_cinemax=channel_has_max) for s in sorted_streams]
|
||||
cleaned_stream_names = [self._clean_channel_name(
|
||||
s['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc, remove_cinemax=channel_has_max
|
||||
) for s in sorted_streams]
|
||||
match_reason = "Callsign match"
|
||||
|
||||
return sorted_streams, cleaned_channel_name, cleaned_stream_names, match_reason
|
||||
@@ -558,10 +606,16 @@ class Plugin:
|
||||
if matched_stream_name:
|
||||
# Find all streams that match this name (different qualities)
|
||||
matching_streams = []
|
||||
cleaned_matched = self._clean_channel_name(matched_stream_name, ignore_tags, remove_cinemax=channel_has_max)
|
||||
cleaned_matched = self._clean_channel_name(
|
||||
matched_stream_name, ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc, remove_cinemax=channel_has_max
|
||||
)
|
||||
|
||||
for stream in all_streams:
|
||||
cleaned_stream = self._clean_channel_name(stream['name'], ignore_tags, remove_cinemax=channel_has_max)
|
||||
cleaned_stream = self._clean_channel_name(
|
||||
stream['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc, remove_cinemax=channel_has_max
|
||||
)
|
||||
|
||||
if cleaned_stream.lower() == cleaned_matched.lower():
|
||||
matching_streams.append(stream)
|
||||
@@ -570,7 +624,10 @@ class Plugin:
|
||||
sorted_streams = self._sort_streams_by_quality(matching_streams)
|
||||
logger.info(f"[Stream-Mapparr] Found {len(sorted_streams)} streams via fuzzy match (score: {score}, type: {match_type})")
|
||||
|
||||
cleaned_stream_names = [self._clean_channel_name(s['name'], ignore_tags, remove_cinemax=channel_has_max) for s in sorted_streams]
|
||||
cleaned_stream_names = [self._clean_channel_name(
|
||||
s['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc, remove_cinemax=channel_has_max
|
||||
) for s in sorted_streams]
|
||||
match_reason = f"Fuzzy match ({match_type}, score: {score})"
|
||||
|
||||
return sorted_streams, cleaned_channel_name, cleaned_stream_names, match_reason
|
||||
@@ -594,7 +651,10 @@ class Plugin:
|
||||
|
||||
# Look for streams that match this channel name exactly
|
||||
for stream in all_streams:
|
||||
cleaned_stream_name = self._clean_channel_name(stream['name'], ignore_tags, remove_cinemax=channel_has_max)
|
||||
cleaned_stream_name = self._clean_channel_name(
|
||||
stream['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc, remove_cinemax=channel_has_max
|
||||
)
|
||||
|
||||
if cleaned_stream_name.lower() == cleaned_channel_name.lower():
|
||||
matching_streams.append(stream)
|
||||
@@ -603,14 +663,20 @@ class Plugin:
|
||||
sorted_streams = self._sort_streams_by_quality(matching_streams)
|
||||
logger.info(f"[Stream-Mapparr] Found {len(sorted_streams)} streams matching exact channel name")
|
||||
|
||||
cleaned_stream_names = [self._clean_channel_name(s['name'], ignore_tags, remove_cinemax=channel_has_max) for s in sorted_streams]
|
||||
cleaned_stream_names = [self._clean_channel_name(
|
||||
s['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc, remove_cinemax=channel_has_max
|
||||
) for s in sorted_streams]
|
||||
match_reason = "Exact match (channels.json)"
|
||||
|
||||
return sorted_streams, cleaned_channel_name, cleaned_stream_names, match_reason
|
||||
|
||||
# Fallback to basic substring matching
|
||||
for stream in all_streams:
|
||||
cleaned_stream_name = self._clean_channel_name(stream['name'], ignore_tags, remove_cinemax=channel_has_max)
|
||||
cleaned_stream_name = self._clean_channel_name(
|
||||
stream['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc, remove_cinemax=channel_has_max
|
||||
)
|
||||
|
||||
# Simple case-insensitive substring matching
|
||||
if cleaned_channel_name.lower() in cleaned_stream_name.lower() or cleaned_stream_name.lower() in cleaned_channel_name.lower():
|
||||
@@ -620,7 +686,10 @@ class Plugin:
|
||||
sorted_streams = self._sort_streams_by_quality(matching_streams)
|
||||
logger.info(f"[Stream-Mapparr] Found {len(sorted_streams)} streams matching via basic substring match")
|
||||
|
||||
cleaned_stream_names = [self._clean_channel_name(s['name'], ignore_tags, remove_cinemax=channel_has_max) for s in sorted_streams]
|
||||
cleaned_stream_names = [self._clean_channel_name(
|
||||
s['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc, remove_cinemax=channel_has_max
|
||||
) for s in sorted_streams]
|
||||
match_reason = "Basic substring match"
|
||||
|
||||
return sorted_streams, cleaned_channel_name, cleaned_stream_names, match_reason
|
||||
@@ -683,10 +752,16 @@ class Plugin:
|
||||
LOGGER.error(traceback.format_exc())
|
||||
return {"status": "error", "message": str(e)}
|
||||
|
||||
def validate_settings_action(self, settings, logger):
|
||||
"""Validate all plugin settings including profiles, groups, and API connection."""
|
||||
def _validate_plugin_settings(self, settings, logger):
|
||||
"""
|
||||
Helper method to validate plugin settings.
|
||||
|
||||
Returns:
|
||||
Tuple of (has_errors: bool, validation_results: list, token: str or None)
|
||||
"""
|
||||
validation_results = []
|
||||
has_errors = False
|
||||
token = None
|
||||
|
||||
try:
|
||||
# 1. Validate API Connection
|
||||
@@ -696,10 +771,7 @@ class Plugin:
|
||||
validation_results.append(f"❌ API Connection: FAILED - {error}")
|
||||
has_errors = True
|
||||
# Cannot continue without API access
|
||||
return {
|
||||
"status": "error",
|
||||
"message": "Validation failed:\n\n" + "\n".join(validation_results)
|
||||
}
|
||||
return has_errors, validation_results, token
|
||||
else:
|
||||
validation_results.append("✅ API Connection: SUCCESS")
|
||||
|
||||
@@ -837,31 +909,42 @@ class Plugin:
|
||||
else:
|
||||
validation_results.append("ℹ️ Ignore Tags: None configured")
|
||||
|
||||
# Build summary message
|
||||
if has_errors:
|
||||
message = "Validation completed with errors:\n\n" + "\n".join(validation_results)
|
||||
message += "\n\nPlease fix the errors above before proceeding."
|
||||
return {"status": "error", "message": message}
|
||||
else:
|
||||
message = "All settings validated successfully!\n\n" + "\n".join(validation_results)
|
||||
message += "\n\nYou can now proceed with 'Load/Process Channels'."
|
||||
return {"status": "success", "message": message}
|
||||
# Return validation results
|
||||
return has_errors, validation_results, token
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"[Stream-Mapparr] Error validating settings: {str(e)}")
|
||||
validation_results.append(f"❌ Unexpected error during validation: {str(e)}")
|
||||
return {
|
||||
"status": "error",
|
||||
"message": "Validation failed:\n\n" + "\n".join(validation_results)
|
||||
}
|
||||
has_errors = True
|
||||
return has_errors, validation_results, token
|
||||
|
||||
def validate_settings_action(self, settings, logger):
|
||||
"""Validate all plugin settings including profiles, groups, and API connection."""
|
||||
has_errors, validation_results, token = self._validate_plugin_settings(settings, logger)
|
||||
|
||||
# Build summary message
|
||||
if has_errors:
|
||||
message = "Validation completed with errors:\n\n" + "\n".join(validation_results)
|
||||
message += "\n\nPlease fix the errors above before proceeding."
|
||||
return {"status": "error", "message": message}
|
||||
else:
|
||||
message = "All settings validated successfully!\n\n" + "\n".join(validation_results)
|
||||
message += "\n\nYou can now proceed with 'Load/Process Channels'."
|
||||
return {"status": "success", "message": message}
|
||||
|
||||
def load_process_channels_action(self, settings, logger):
|
||||
"""Load and process channels from specified profile and groups."""
|
||||
try:
|
||||
# Get API token
|
||||
token, error = self._get_api_token(settings, logger)
|
||||
if error:
|
||||
return {"status": "error", "message": error}
|
||||
# Validate settings before proceeding
|
||||
logger.info("[Stream-Mapparr] Validating settings before loading channels...")
|
||||
has_errors, validation_results, token = self._validate_plugin_settings(settings, logger)
|
||||
|
||||
if has_errors:
|
||||
message = "Cannot load channels - validation failed:\n\n" + "\n".join(validation_results)
|
||||
message += "\n\nPlease fix the errors above before proceeding."
|
||||
return {"status": "error", "message": message}
|
||||
|
||||
logger.info("[Stream-Mapparr] Settings validated successfully, proceeding with channel load...")
|
||||
|
||||
profile_names_str = settings.get("profile_name", "").strip()
|
||||
selected_groups_str = settings.get("selected_groups", "").strip()
|
||||
@@ -869,6 +952,22 @@ class Plugin:
|
||||
visible_channel_limit_str = settings.get("visible_channel_limit", "1")
|
||||
visible_channel_limit = int(visible_channel_limit_str) if visible_channel_limit_str else 1
|
||||
|
||||
# Get category ignore settings
|
||||
ignore_quality = settings.get("ignore_quality_tags", True)
|
||||
ignore_regional = settings.get("ignore_regional_tags", True)
|
||||
ignore_geographic = settings.get("ignore_geographic_tags", True)
|
||||
ignore_misc = settings.get("ignore_misc_tags", True)
|
||||
|
||||
# Convert string values to boolean if needed
|
||||
if isinstance(ignore_quality, str):
|
||||
ignore_quality = ignore_quality.lower() in ('true', 'yes', '1')
|
||||
if isinstance(ignore_regional, str):
|
||||
ignore_regional = ignore_regional.lower() in ('true', 'yes', '1')
|
||||
if isinstance(ignore_geographic, str):
|
||||
ignore_geographic = ignore_geographic.lower() in ('true', 'yes', '1')
|
||||
if isinstance(ignore_misc, str):
|
||||
ignore_misc = ignore_misc.lower() in ('true', 'yes', '1')
|
||||
|
||||
if not profile_names_str:
|
||||
return {"status": "error", "message": "Profile Name must be configured in the plugin settings."}
|
||||
|
||||
@@ -885,6 +984,9 @@ class Plugin:
|
||||
ignore_tags = [tag.strip() for tag in ignore_tags_str.split(',') if tag.strip()]
|
||||
logger.info(f"[Stream-Mapparr] Ignore tags configured: {ignore_tags}")
|
||||
|
||||
# Log category settings
|
||||
logger.info(f"[Stream-Mapparr] Pattern categories - Quality: {ignore_quality}, Regional: {ignore_regional}, Geographic: {ignore_geographic}, Misc: {ignore_misc}")
|
||||
|
||||
# Get all profiles to find the specified ones
|
||||
logger.info("[Stream-Mapparr] Fetching channel profiles...")
|
||||
profiles = self._get_api_data("/api/channels/profiles/", token, settings, logger)
|
||||
@@ -1049,6 +1151,10 @@ class Plugin:
|
||||
"selected_groups": selected_groups,
|
||||
"ignore_tags": ignore_tags,
|
||||
"visible_channel_limit": visible_channel_limit,
|
||||
"ignore_quality": ignore_quality,
|
||||
"ignore_regional": ignore_regional,
|
||||
"ignore_geographic": ignore_geographic,
|
||||
"ignore_misc": ignore_misc,
|
||||
"channels": channels_to_process,
|
||||
"streams": all_streams_data
|
||||
}
|
||||
@@ -1132,6 +1238,17 @@ class Plugin:
|
||||
}
|
||||
|
||||
try:
|
||||
# Validate settings before previewing
|
||||
logger.info("[Stream-Mapparr] Validating settings before previewing changes...")
|
||||
has_errors, validation_results, token = self._validate_plugin_settings(settings, logger)
|
||||
|
||||
if has_errors:
|
||||
message = "Cannot preview changes - validation failed:\n\n" + "\n".join(validation_results)
|
||||
message += "\n\nPlease fix the errors above before proceeding."
|
||||
return {"status": "error", "message": message}
|
||||
|
||||
logger.info("[Stream-Mapparr] Settings validated successfully, proceeding with preview...")
|
||||
|
||||
# Load channel data from channels.json
|
||||
channels_data = self._load_channels_data(logger)
|
||||
|
||||
@@ -1152,6 +1269,10 @@ class Plugin:
|
||||
# Group channels by their cleaned name for matching
|
||||
channel_groups = {}
|
||||
ignore_tags = processed_data.get('ignore_tags', [])
|
||||
ignore_quality = processed_data.get('ignore_quality', True)
|
||||
ignore_regional = processed_data.get('ignore_regional', True)
|
||||
ignore_geographic = processed_data.get('ignore_geographic', True)
|
||||
ignore_misc = processed_data.get('ignore_misc', True)
|
||||
|
||||
for channel in channels:
|
||||
# Get channel info from JSON to determine if it has a callsign
|
||||
@@ -1160,9 +1281,15 @@ class Plugin:
|
||||
if self._is_ota_channel(channel_info):
|
||||
# For OTA channels, group by callsign
|
||||
callsign = channel_info.get('callsign', '')
|
||||
group_key = f"OTA_{callsign}" if callsign else self._clean_channel_name(channel['name'], ignore_tags)
|
||||
group_key = f"OTA_{callsign}" if callsign else self._clean_channel_name(
|
||||
channel['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc
|
||||
)
|
||||
else:
|
||||
group_key = self._clean_channel_name(channel['name'], ignore_tags)
|
||||
group_key = self._clean_channel_name(
|
||||
channel['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc
|
||||
)
|
||||
|
||||
if group_key not in channel_groups:
|
||||
channel_groups[group_key] = []
|
||||
@@ -1188,7 +1315,9 @@ class Plugin:
|
||||
|
||||
# Match streams for this channel group (using first channel as representative)
|
||||
matched_streams, cleaned_channel_name, cleaned_stream_names, match_reason = self._match_streams_to_channel(
|
||||
sorted_channels[0], streams, logger, ignore_tags, channels_data
|
||||
sorted_channels[0], streams, logger, ignore_tags,
|
||||
ignore_quality, ignore_regional, ignore_geographic, ignore_misc,
|
||||
channels_data
|
||||
)
|
||||
|
||||
# Determine which channels will be updated based on limit
|
||||
@@ -1343,6 +1472,10 @@ class Plugin:
|
||||
streams = processed_data.get('streams', [])
|
||||
ignore_tags = processed_data.get('ignore_tags', [])
|
||||
visible_channel_limit = processed_data.get('visible_channel_limit', 1)
|
||||
ignore_quality = processed_data.get('ignore_quality', True)
|
||||
ignore_regional = processed_data.get('ignore_regional', True)
|
||||
ignore_geographic = processed_data.get('ignore_geographic', True)
|
||||
ignore_misc = processed_data.get('ignore_misc', True)
|
||||
|
||||
# Get overwrite_streams setting
|
||||
overwrite_streams = settings.get('overwrite_streams', True)
|
||||
@@ -1365,9 +1498,15 @@ class Plugin:
|
||||
if self._is_ota_channel(channel_info):
|
||||
# For OTA channels, group by callsign
|
||||
callsign = channel_info.get('callsign', '')
|
||||
group_key = f"OTA_{callsign}" if callsign else self._clean_channel_name(channel['name'], ignore_tags)
|
||||
group_key = f"OTA_{callsign}" if callsign else self._clean_channel_name(
|
||||
channel['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc
|
||||
)
|
||||
else:
|
||||
group_key = self._clean_channel_name(channel['name'], ignore_tags)
|
||||
group_key = self._clean_channel_name(
|
||||
channel['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc
|
||||
)
|
||||
|
||||
if group_key not in channel_groups:
|
||||
channel_groups[group_key] = []
|
||||
@@ -1395,7 +1534,9 @@ class Plugin:
|
||||
|
||||
# Match streams for this channel group
|
||||
matched_streams, cleaned_channel_name, cleaned_stream_names, match_reason = self._match_streams_to_channel(
|
||||
sorted_channels[0], streams, logger, ignore_tags, channels_data
|
||||
sorted_channels[0], streams, logger, ignore_tags,
|
||||
ignore_quality, ignore_regional, ignore_geographic, ignore_misc,
|
||||
channels_data
|
||||
)
|
||||
|
||||
# Determine which channels to update based on limit
|
||||
@@ -1572,6 +1713,10 @@ class Plugin:
|
||||
channels = processed_data.get('channels', [])
|
||||
ignore_tags = processed_data.get('ignore_tags', [])
|
||||
visible_channel_limit = processed_data.get('visible_channel_limit', 1)
|
||||
ignore_quality = processed_data.get('ignore_quality', True)
|
||||
ignore_regional = processed_data.get('ignore_regional', True)
|
||||
ignore_geographic = processed_data.get('ignore_geographic', True)
|
||||
ignore_misc = processed_data.get('ignore_misc', True)
|
||||
|
||||
if not channels:
|
||||
return {"status": "error", "message": "No channels found in processed data."}
|
||||
@@ -1649,9 +1794,15 @@ class Plugin:
|
||||
if ota_info:
|
||||
group_key = f"OTA_{ota_info['callsign']}"
|
||||
else:
|
||||
group_key = self._clean_channel_name(channel['name'], ignore_tags)
|
||||
group_key = self._clean_channel_name(
|
||||
channel['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc
|
||||
)
|
||||
else:
|
||||
group_key = self._clean_channel_name(channel['name'], ignore_tags)
|
||||
group_key = self._clean_channel_name(
|
||||
channel['name'], ignore_tags, ignore_quality, ignore_regional,
|
||||
ignore_geographic, ignore_misc
|
||||
)
|
||||
|
||||
if group_key not in channel_groups:
|
||||
channel_groups[group_key] = []
|
||||
|
||||
Reference in New Issue
Block a user