feat: Merge dev branch with TV episode title extraction and movie webhook fixes
Major Features and Fixes: - Comprehensive TV episode title extraction from filenames when metadata missing - Fixed movie webhook processing errors and batch validation - Improved NFO field organization with NFOGuard comment at bottom - Enhanced IMDb detection using directory, filename, and NFO content - Fixed WebhookBatcher missing nfo_manager attribute - Version updated to 1.8.3 TV Episode Improvements: - Added filename-based title extraction for episodes missing titles - Enhanced existing NFO files with missing titles - Fixed long-named NFO file migration and standardization - Improved episode processing with comprehensive debugging Movie Webhook Fixes: - Fixed 'name path is not defined' error in batch processing - Replaced simple string search with comprehensive IMDb detection - Consistent validation between webhook reception and batch processing - Better error handling and logging for debugging NFO Organization: - Moved NFOGuard comment from top to bottom with other fields - All NFOGuard additions now grouped consistently - Improved XML structure and file writing 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
+132
-13
@@ -163,7 +163,7 @@ class NFOManager:
|
||||
|
||||
def extract_nfoguard_dates_from_episode_nfo(self, season_path: Path, season_num: int, episode_num: int) -> Optional[Dict[str, str]]:
|
||||
"""Extract NFOGuard-managed dates from existing episode NFO file"""
|
||||
nfo_filename = f"s{season_num:02d}e{episode_num:02d}.nfo"
|
||||
nfo_filename = f"S{season_num:02d}E{episode_num:02d}.nfo"
|
||||
nfo_path = season_path / nfo_filename
|
||||
|
||||
if not nfo_path.exists():
|
||||
@@ -190,7 +190,11 @@ class NFOManager:
|
||||
if aired_elem is not None and aired_elem.text:
|
||||
result["aired"] = aired_elem.text.strip()
|
||||
|
||||
print(f"✅ Found NFOGuard data in episode NFO S{season_num:02d}E{episode_num:02d}: dateadded={result['dateadded']}, aired={result.get('aired', 'None')}")
|
||||
# Check if title is missing
|
||||
title_elem = root.find('.//title')
|
||||
result["has_title"] = title_elem is not None and title_elem.text and title_elem.text.strip()
|
||||
|
||||
print(f"✅ Found NFOGuard data in episode NFO S{season_num:02d}E{episode_num:02d}: dateadded={result['dateadded']}, aired={result.get('aired', 'None')}, has_title={result['has_title']}")
|
||||
return result
|
||||
|
||||
except (ET.ParseError, Exception) as e:
|
||||
@@ -199,6 +203,104 @@ class NFOManager:
|
||||
|
||||
return None
|
||||
|
||||
def enhance_existing_episode_nfo_with_title(self, season_path: Path, season_num: int, episode_num: int, title: str) -> bool:
|
||||
"""Add title to existing episode NFO file that's missing one"""
|
||||
nfo_filename = f"S{season_num:02d}E{episode_num:02d}.nfo"
|
||||
nfo_path = season_path / nfo_filename
|
||||
|
||||
if not nfo_path.exists():
|
||||
return False
|
||||
|
||||
try:
|
||||
tree = ET.parse(nfo_path)
|
||||
root = tree.getroot()
|
||||
|
||||
# Check if title already exists
|
||||
existing_title = root.find('.//title')
|
||||
if existing_title is not None and existing_title.text and existing_title.text.strip():
|
||||
return False # Title already exists
|
||||
|
||||
# Add title element (insert near the top, after any existing plot element)
|
||||
title_elem = ET.Element("title")
|
||||
title_elem.text = title
|
||||
|
||||
# Find the best position to insert title (after plot if it exists, otherwise at the beginning)
|
||||
plot_elem = root.find('.//plot')
|
||||
if plot_elem is not None:
|
||||
# Insert after plot
|
||||
plot_index = list(root).index(plot_elem)
|
||||
root.insert(plot_index + 1, title_elem)
|
||||
else:
|
||||
# Insert at the beginning (after any existing title that might be empty)
|
||||
if existing_title is not None:
|
||||
title_index = list(root).index(existing_title)
|
||||
root.remove(existing_title)
|
||||
root.insert(title_index, title_elem)
|
||||
else:
|
||||
root.insert(0, title_elem)
|
||||
|
||||
# Write the updated NFO
|
||||
tree.write(nfo_path, encoding='utf-8', xml_declaration=True)
|
||||
print(f"📝 Enhanced existing NFO with title: S{season_num:02d}E{episode_num:02d} - '{title}'")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
print(f"⚠️ Error enhancing NFO with title: {e}")
|
||||
return False
|
||||
|
||||
def _extract_title_from_filename(self, season_dir: Path, season_num: int, episode_num: int) -> Optional[str]:
|
||||
"""Extract episode title from video filename as fallback when metadata doesn't provide it"""
|
||||
try:
|
||||
import re
|
||||
# Look for video files matching this episode
|
||||
season_pattern = f"S{season_num:02d}E{episode_num:02d}"
|
||||
print(f"🔍 Searching for title in files for {season_pattern} in directory: {season_dir}")
|
||||
|
||||
for video_file in season_dir.glob("*.mkv"):
|
||||
filename = video_file.name
|
||||
print(f"🔍 Checking file: {filename}")
|
||||
if season_pattern in filename:
|
||||
print(f"✅ Found matching file: {filename}")
|
||||
# Pattern: SeriesName-S01E01-Episode Title[WEBDL-1080p][AAC2.0][h264].mkv
|
||||
# Extract the part between season/episode and the first bracket
|
||||
pattern = rf'{season_pattern}-(.*?)\['
|
||||
print(f"🔍 Using regex pattern: {pattern}")
|
||||
match = re.search(pattern, filename)
|
||||
if match:
|
||||
title = match.group(1).strip()
|
||||
print(f"🔍 Raw extracted title: '{title}'")
|
||||
# Clean up common encoding artifacts and separators
|
||||
title = title.replace('-', ' ').strip()
|
||||
if title:
|
||||
print(f"✅ Extracted title from filename: '{title}' for {season_pattern}")
|
||||
return title
|
||||
else:
|
||||
print(f"⚠️ Title was empty after cleanup")
|
||||
else:
|
||||
print(f"⚠️ Regex pattern didn't match filename")
|
||||
|
||||
# Also check .mp4 files
|
||||
for video_file in season_dir.glob("*.mp4"):
|
||||
filename = video_file.name
|
||||
print(f"🔍 Checking .mp4 file: {filename}")
|
||||
if season_pattern in filename:
|
||||
print(f"✅ Found matching .mp4 file: {filename}")
|
||||
pattern = rf'{season_pattern}-(.*?)\['
|
||||
match = re.search(pattern, filename)
|
||||
if match:
|
||||
title = match.group(1).strip()
|
||||
print(f"🔍 Raw extracted title from .mp4: '{title}'")
|
||||
title = title.replace('-', ' ').strip()
|
||||
if title:
|
||||
print(f"✅ Extracted title from .mp4 filename: '{title}' for {season_pattern}")
|
||||
return title
|
||||
|
||||
except Exception as e:
|
||||
print(f"⚠️ Error extracting title from filename for S{season_num:02d}E{episode_num:02d}: {e}")
|
||||
|
||||
print(f"⚠️ No title found in filenames for {season_pattern}")
|
||||
return None
|
||||
|
||||
def _parse_nfo_with_tolerance(self, nfo_path: Path):
|
||||
"""Parse NFO file with tolerance for URLs appended after XML"""
|
||||
try:
|
||||
@@ -594,6 +696,29 @@ class NFOManager:
|
||||
runtime_elem = ET.SubElement(episode, "runtime")
|
||||
runtime_elem.text = str(enhanced_metadata["runtime"])
|
||||
|
||||
# Fallback: Extract title from filename if no valid title present
|
||||
title_elem = episode.find("title")
|
||||
has_valid_title = title_elem is not None and title_elem.text and title_elem.text.strip()
|
||||
|
||||
print(f"🔍 Title check for S{season_num:02d}E{episode_num:02d}: has_element={title_elem is not None}, has_text={title_elem.text if title_elem is not None else 'N/A'}, has_valid_title={has_valid_title}")
|
||||
|
||||
if not has_valid_title:
|
||||
print(f"🔍 No valid title found in NFO for S{season_num:02d}E{episode_num:02d}, attempting filename extraction")
|
||||
filename_title = self._extract_title_from_filename(season_dir, season_num, episode_num)
|
||||
if filename_title:
|
||||
# Remove existing empty/invalid title element if present
|
||||
if title_elem is not None:
|
||||
episode.remove(title_elem)
|
||||
|
||||
# Add new title element
|
||||
title_elem = ET.SubElement(episode, "title")
|
||||
title_elem.text = filename_title
|
||||
print(f"✅ Added filename-extracted title to NFO: S{season_num:02d}E{episode_num:02d} - '{filename_title}'")
|
||||
else:
|
||||
print(f"⚠️ Could not extract title from filename for S{season_num:02d}E{episode_num:02d}")
|
||||
else:
|
||||
print(f"✅ Valid title already exists in NFO for S{season_num:02d}E{episode_num:02d}: '{title_elem.text.strip()}')")
|
||||
|
||||
# Add NFOGuard fields at the bottom
|
||||
|
||||
# Basic episode info at the end
|
||||
@@ -617,22 +742,16 @@ class NFOManager:
|
||||
lockdata = ET.SubElement(episode, "lockdata")
|
||||
lockdata.text = "true"
|
||||
|
||||
# Add NFOGuard comment at the beginning
|
||||
comment_text = f" Created by {self.manager_brand} - Source: {source} "
|
||||
# Add NFOGuard comment at the bottom with other NFOGuard fields
|
||||
nfoguard_comment = ET.Comment(f" Created by {self.manager_brand} - Source: {source} ")
|
||||
episode.append(nfoguard_comment)
|
||||
|
||||
# Write file with proper formatting
|
||||
tree = ET.ElementTree(episode)
|
||||
ET.indent(tree, space=" ", level=0)
|
||||
|
||||
# Write to string first to add comment
|
||||
xml_str = ET.tostring(episode, encoding='unicode')
|
||||
|
||||
# Add XML declaration and comment
|
||||
full_xml = f'<?xml version="1.0" encoding="utf-8"?>\n<!--{comment_text}-->\n{xml_str}'
|
||||
|
||||
# Write to file
|
||||
with open(nfo_path, 'w', encoding='utf-8') as f:
|
||||
f.write(full_xml)
|
||||
# Write to file normally (ET will handle the comment properly)
|
||||
tree.write(nfo_path, encoding='utf-8', xml_declaration=True)
|
||||
|
||||
print(f"✅ Successfully created/updated episode NFO: {nfo_path}")
|
||||
print(f" S{season_num:02d}E{episode_num:02d}, Aired: {aired}, Date Added: {dateadded}")
|
||||
|
||||
Reference in New Issue
Block a user