Joren/Stream-Mapparr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Improve logging levels and add channel group statistics

Browse Source 
Changes to logging levels:
- Changed fuzzy_matcher channel database loading logs to DEBUG level
- Changed plugin validation and API authentication logs to DEBUG level
- Changed notification sending log to DEBUG level
- Changed per-file channel loading log to DEBUG level

Enhanced INFO logs:
- Updated total channels loaded log to include database names
- Added channel group statistics logging showing:
  * Total number of groups processed
  * For each group: name, channel count, and matched stream count
  * Shows first 10 groups with summary for remaining groups

Benefits:
- Cleaner INFO logs show only essential information
- Detailed debugging information available at DEBUG level
- Better visibility into channel group processing and stream matching
- Easier troubleshooting with group-level statistics
This commit is contained in:
Claude
2025-11-28 17:49:15 +00:00
parent ef1f4f60db
commit 1a2f176587
2 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Stream-Mapparr/fuzzy_matcher.py
View File

@@ -115,7 +115,7 @@ class FuzzyMatcher:
self.logger.warning(f"No *_channels.json files found in {self.plugin_dir}") self.logger.warning(f"No *_channels.json files found in {self.plugin_dir}")
return False return False
self.logger.info(f"Found {len(channel_files)} channel database file(s): {[os.path.basename(f) for f in channel_files]}") self.logger.debug(f"Found {len(channel_files)} channel database file(s): {[os.path.basename(f) for f in channel_files]}")
total_broadcast = 0 total_broadcast = 0
total_premium = 0 total_premium = 0
@@ -158,12 +158,12 @@ class FuzzyMatcher:
total_broadcast += file_broadcast total_broadcast += file_broadcast
total_premium += file_premium total_premium += file_premium
self.logger.info(f"Loaded from {os.path.basename(channel_file)}: {file_broadcast} broadcast, {file_premium} premium channels") self.logger.debug(f"Loaded from {os.path.basename(channel_file)}: {file_broadcast} broadcast, {file_premium} premium channels")
except Exception as e: except Exception as e:
self.logger.error(f"Error loading {channel_file}: {e}") self.logger.error(f"Error loading {channel_file}: {e}")
self.logger.info(f"Total channels loaded: {total_broadcast} broadcast, {total_premium} premium") self.logger.debug(f"Total channels loaded: {total_broadcast} broadcast, {total_premium} premium")
return True return True
def reload_databases(self, country_codes=None): def reload_databases(self, country_codes=None):
@@ -248,12 +248,12 @@ class FuzzyMatcher:
total_broadcast += file_broadcast total_broadcast += file_broadcast
total_premium += file_premium total_premium += file_premium
self.logger.info(f"Loaded from {os.path.basename(channel_file)}: {file_broadcast} broadcast, {file_premium} premium channels") self.logger.debug(f"Loaded from {os.path.basename(channel_file)}: {file_broadcast} broadcast, {file_premium} premium channels")
except Exception as e: except Exception as e:
self.logger.error(f"Error loading {channel_file}: {e}") self.logger.error(f"Error loading {channel_file}: {e}")
self.logger.info(f"Total channels loaded: {total_broadcast} broadcast, {total_premium} premium") self.logger.debug(f"Total channels loaded: {total_broadcast} broadcast, {total_premium} premium")
return True return True
def extract_callsign(self, channel_name): def extract_callsign(self, channel_name):

59
Stream-Mapparr/plugin.py
View File

@@ -730,7 +730,7 @@ class Plugin:
match_threshold=match_threshold, match_threshold=match_threshold,
logger=LOGGER logger=LOGGER
) )
LOGGER.info(f"[Stream-Mapparr] Initialized FuzzyMatcher with threshold: {match_threshold}") LOGGER.debug(f"[Stream-Mapparr] Initialized FuzzyMatcher with threshold: {match_threshold}")
except Exception as e: except Exception as e:
LOGGER.warning(f"[Stream-Mapparr] Failed to initialize FuzzyMatcher: {e}") LOGGER.warning(f"[Stream-Mapparr] Failed to initialize FuzzyMatcher: {e}")
self.fuzzy_matcher = None self.fuzzy_matcher = None
@@ -741,12 +741,12 @@ class Plugin:
logger.info("[Stream-Mapparr] Using cached API token.") logger.info("[Stream-Mapparr] Using cached API token.")
return self.api_token, None return self.api_token, None
logger.info("[Stream-Mapparr] API token is expired or not found, getting a new one.") logger.debug("[Stream-Mapparr] API token is expired or not found, getting a new one.")
token, error = self._get_api_token(settings, logger) token, error = self._get_api_token(settings, logger)
if token: if token:
self.api_token = token self.api_token = token
self.token_expiration = datetime.now() + timedelta(minutes=30) self.token_expiration = datetime.now() + timedelta(minutes=30)
logger.info("[Stream-Mapparr] API token cached for 30 minutes.") logger.debug("[Stream-Mapparr] API token cached for 30 minutes.")
return token, error return token, error
@@ -764,7 +764,7 @@ class Plugin:
url = f"{dispatcharr_url}/api/accounts/token/" url = f"{dispatcharr_url}/api/accounts/token/"
payload = {"username": username, "password": password} payload = {"username": username, "password": password}
logger.info(f"[Stream-Mapparr] Attempting to authenticate with Dispatcharr at: {url}") logger.debug(f"[Stream-Mapparr] Attempting to authenticate with Dispatcharr at: {url}")
response = requests.post(url, json=payload, timeout=15) response = requests.post(url, json=payload, timeout=15)
if response.status_code == 401: if response.status_code == 401:
@@ -785,7 +785,7 @@ class Plugin:
logger.error("[Stream-Mapparr] No access token returned from API") logger.error("[Stream-Mapparr] No access token returned from API")
return None, "Login successful, but no access token was returned by the API." return None, "Login successful, but no access token was returned by the API."
logger.info("[Stream-Mapparr] Successfully obtained API access token") logger.debug("[Stream-Mapparr] Successfully obtained API access token")
return access_token, None return access_token, None
except requests.exceptions.ConnectionError as e: except requests.exceptions.ConnectionError as e:
@@ -1160,12 +1160,13 @@ class Plugin:
continue continue
channels_data.extend(channels_list) channels_data.extend(channels_list)
logger.info(f"[Stream-Mapparr] Loaded {len(channels_list)} channels from {db_label}") logger.debug(f"[Stream-Mapparr] Loaded {len(channels_list)} channels from {db_label}")
except Exception as e: except Exception as e:
logger.error(f"[Stream-Mapparr] Error loading {channel_file}: {e}") logger.error(f"[Stream-Mapparr] Error loading {channel_file}: {e}")
logger.info(f"[Stream-Mapparr] Loaded total of {len(channels_data)} channels from {len(enabled_databases)} enabled database(s)") db_names = [db_info['label'] for db_info in enabled_databases]
logger.info(f"[Stream-Mapparr] Loaded total of {len(channels_data)} channels from {len(enabled_databases)} enabled database(s): {', '.join(db_names)}")
except Exception as e: except Exception as e:
logger.error(f"[Stream-Mapparr] Error loading channel data files: {e}") logger.error(f"[Stream-Mapparr] Error loading channel data files: {e}")
@@ -1496,7 +1497,7 @@ class Plugin:
if not is_success: if not is_success:
notification_data['error'] = message notification_data['error'] = message
LOGGER.info(f"[Stream-Mapparr] Sending notification: {action_id} ({'success' if is_success else 'error'}) - {message}") LOGGER.debug(f"[Stream-Mapparr] Sending notification: {action_id} ({'success' if is_success else 'error'}) - {message}")
send_websocket_update('updates', 'update', notification_data) send_websocket_update('updates', 'update', notification_data)
except Exception as e: except Exception as e:
@@ -1639,7 +1640,7 @@ class Plugin:
try: try:
# 1. Validate API connection and obtain token # 1. Validate API connection and obtain token
logger.info("[Stream-Mapparr] Validating API connection...") logger.debug("[Stream-Mapparr] Validating API connection...")
token, error = self.get_or_refresh_api_token(settings, logger) token, error = self.get_or_refresh_api_token(settings, logger)
if error: if error:
validation_results.append(f"❌ API Connection: {error}") validation_results.append(f"❌ API Connection: {error}")
@@ -1649,7 +1650,7 @@ class Plugin:
validation_results.append("✅ API Connection") validation_results.append("✅ API Connection")
# 2. Validate profile name exists # 2. Validate profile name exists
logger.info("[Stream-Mapparr] Validating profile names...") logger.debug("[Stream-Mapparr] Validating profile names...")
profile_names_str = settings.get("profile_name") or "" profile_names_str = settings.get("profile_name") or ""
profile_names_str = profile_names_str.strip() if profile_names_str else "" profile_names_str = profile_names_str.strip() if profile_names_str else ""
if not profile_names_str: if not profile_names_str:
@@ -1679,7 +1680,7 @@ class Plugin:
validation_results.append(f"✅ Profile Name ({len(found_profiles)})") validation_results.append(f"✅ Profile Name ({len(found_profiles)})")
# 3. Validate channel groups (if specified) # 3. Validate channel groups (if specified)
logger.info("[Stream-Mapparr] Validating channel groups...") logger.debug("[Stream-Mapparr] Validating channel groups...")
selected_groups_str = settings.get("selected_groups") or "" selected_groups_str = settings.get("selected_groups") or ""
selected_groups_str = selected_groups_str.strip() if selected_groups_str else "" selected_groups_str = selected_groups_str.strip() if selected_groups_str else ""
@@ -1740,7 +1741,7 @@ class Plugin:
validation_results.append("✅ Channel Groups (all)") validation_results.append("✅ Channel Groups (all)")
# 4. Validate timezone is not empty # 4. Validate timezone is not empty
logger.info("[Stream-Mapparr] Validating timezone...") logger.debug("[Stream-Mapparr] Validating timezone...")
timezone_str = settings.get("timezone") or "US/Central" timezone_str = settings.get("timezone") or "US/Central"
timezone_str = timezone_str.strip() if timezone_str else "US/Central" timezone_str = timezone_str.strip() if timezone_str else "US/Central"
if not timezone_str: if not timezone_str:
@@ -1757,7 +1758,7 @@ class Plugin:
has_errors = True has_errors = True
# 5. Validate at least one channel database is checked # 5. Validate at least one channel database is checked
logger.info("[Stream-Mapparr] Validating channel databases...") logger.debug("[Stream-Mapparr] Validating channel databases...")
databases = self._get_channel_databases() databases = self._get_channel_databases()
if not databases: if not databases:
@@ -1961,7 +1962,7 @@ class Plugin:
limiter = SmartRateLimiter(settings.get("rate_limiting", "medium"), logger) limiter = SmartRateLimiter(settings.get("rate_limiting", "medium"), logger)
self._send_progress_update("load_process_channels", 'running', 5, 'Validating settings...', context) self._send_progress_update("load_process_channels", 'running', 5, 'Validating settings...', context)
logger.info("[Stream-Mapparr] Validating settings before loading channels...") logger.debug("[Stream-Mapparr] Validating settings before loading channels...")
has_errors, validation_results, token = self._validate_plugin_settings(settings, logger) has_errors, validation_results, token = self._validate_plugin_settings(settings, logger)
if has_errors: if has_errors:
@@ -2177,7 +2178,7 @@ class Plugin:
def _generate_csv_header_comment(self, settings, processed_data, total_visible_channels=0, total_matched_streams=0, low_match_channels=None, threshold_data=None): def _generate_csv_header_comment(self, settings, processed_data, total_visible_channels=0, total_matched_streams=0, low_match_channels=None, threshold_data=None):
"""Generate CSV comment header with plugin version and settings info.""" """Generate CSV comment header with plugin version and settings info."""
# Debug: Log all settings keys to see what's available # Debug: Log all settings keys to see what's available
LOGGER.info(f"[Stream-Mapparr] CSV generation - All settings keys: {list(settings.keys())}") LOGGER.debug(f"[Stream-Mapparr] CSV generation - All settings keys: {list(settings.keys())}")
profile_name = processed_data.get('profile_name', 'N/A') profile_name = processed_data.get('profile_name', 'N/A')
selected_groups = processed_data.get('selected_groups', []) selected_groups = processed_data.get('selected_groups', [])
@@ -2476,6 +2477,7 @@ class Plugin:
processed_groups = 0 processed_groups = 0
total_groups = len(channel_groups) total_groups = len(channel_groups)
group_stats = {} # Track stats for each group
for group_key, group_channels in channel_groups.items(): for group_key, group_channels in channel_groups.items():
limiter.wait() limiter.wait()
@@ -2494,6 +2496,12 @@ class Plugin:
sorted_channels[0], streams, logger, ignore_tags, ignore_quality, ignore_regional, ignore_geographic, ignore_misc, channels_data sorted_channels[0], streams, logger, ignore_tags, ignore_quality, ignore_regional, ignore_geographic, ignore_misc, channels_data
) )
# Track group stats
group_stats[group_key] = {
'channel_count': len(group_channels),
'stream_count': len(matched_streams)
}
channels_to_update = sorted_channels[:visible_channel_limit] channels_to_update = sorted_channels[:visible_channel_limit]
channels_not_updated = sorted_channels[visible_channel_limit:] channels_not_updated = sorted_channels[visible_channel_limit:]
@@ -2561,6 +2569,13 @@ class Plugin:
"is_current": True "is_current": True
}) })
# Log channel group statistics
logger.info(f"[Stream-Mapparr] Processed {len(channel_groups)} channel groups with {len(channels)} total channels")
for group_key, stats in list(group_stats.items())[:10]: # Log first 10 groups
logger.info(f"[Stream-Mapparr] - Group '{group_key}': {stats['channel_count']} channel(s), {stats['stream_count']} matched stream(s)")
if len(channel_groups) > 10:
logger.info(f"[Stream-Mapparr] ... and {len(channel_groups) - 10} more groups")
self._send_progress_update("preview_changes", 'running', 85, 'Generating CSV report...', context) self._send_progress_update("preview_changes", 'running', 85, 'Generating CSV report...', context)
timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
filename = f"stream_mapparr_preview_{timestamp}.csv" filename = f"stream_mapparr_preview_{timestamp}.csv"
@@ -2647,6 +2662,7 @@ class Plugin:
processed_groups = 0 processed_groups = 0
total_groups = len(channel_groups) total_groups = len(channel_groups)
group_stats = {} # Track stats for each group
for group_key, group_channels in channel_groups.items(): for group_key, group_channels in channel_groups.items():
limiter.wait() # Rate limit processing limiter.wait() # Rate limit processing
@@ -2655,6 +2671,12 @@ class Plugin:
sorted_channels[0], streams, logger, ignore_tags, ignore_quality, ignore_regional, ignore_geographic, ignore_misc, channels_data sorted_channels[0], streams, logger, ignore_tags, ignore_quality, ignore_regional, ignore_geographic, ignore_misc, channels_data
) )
# Track group stats
group_stats[group_key] = {
'channel_count': len(group_channels),
'stream_count': len(matched_streams)
}
channels_to_update = sorted_channels[:visible_channel_limit] channels_to_update = sorted_channels[:visible_channel_limit]
for channel in channels_to_update: for channel in channels_to_update:
@@ -2693,6 +2715,13 @@ class Plugin:
self._send_progress_update("add_streams_to_channels", 'running', progress, self._send_progress_update("add_streams_to_channels", 'running', progress,
f'Updated {channels_updated} channels so far...', context) f'Updated {channels_updated} channels so far...', context)
# Log channel group statistics
logger.info(f"[Stream-Mapparr] Processed {len(channel_groups)} channel groups with {len(channels)} total channels")
for group_key, stats in list(group_stats.items())[:10]: # Log first 10 groups
logger.info(f"[Stream-Mapparr] - Group '{group_key}': {stats['channel_count']} channel(s), {stats['stream_count']} matched stream(s)")
if len(channel_groups) > 10:
logger.info(f"[Stream-Mapparr] ... and {len(channel_groups) - 10} more groups")
# CSV Export - create if setting is enabled # CSV Export - create if setting is enabled
# Default to True if setting doesn't exist (matches field default) # Default to True if setting doesn't exist (matches field default)
create_csv = settings.get('enable_scheduled_csv_export', True) create_csv = settings.get('enable_scheduled_csv_export', True)