Merge pull request #46 from MasterOfKay/main

Merging dash-naming feature - adds optional dash separator format for filenames
This commit is contained in:
Sp5rky
2026-01-22 13:58:24 -07:00
committed by GitHub
3 changed files with 28 additions and 7 deletions

View File

@@ -94,6 +94,7 @@ class Config:
self.update_checks: bool = kwargs.get("update_checks", True) self.update_checks: bool = kwargs.get("update_checks", True)
self.update_check_interval: int = kwargs.get("update_check_interval", 24) self.update_check_interval: int = kwargs.get("update_check_interval", 24)
self.scene_naming: bool = kwargs.get("scene_naming", True) self.scene_naming: bool = kwargs.get("scene_naming", True)
self.dash_naming: bool = kwargs.get("dash_naming", False)
self.series_year: bool = kwargs.get("series_year", True) self.series_year: bool = kwargs.get("series_year", True)
self.unicode_filenames: bool = kwargs.get("unicode_filenames", False) self.unicode_filenames: bool = kwargs.get("unicode_filenames", False)

View File

@@ -109,6 +109,24 @@ class Episode(Title):
name += f" {self.year}" name += f" {self.year}"
name += f" S{self.season:02}" name += f" S{self.season:02}"
else: else:
if config.dash_naming:
# Format: Title - SXXEXX - Episode Name
name = self.title.replace("$", "S") # e.g., Arli$$
# Add year if configured
if self.year and config.series_year:
name += f" {self.year}"
# Add season and episode
name += f" - S{self.season:02}E{self.number:02}"
# Add episode name with dash separator
if self.name:
name += f" - {self.name}"
name = name.strip()
else:
# Standard format without extra dashes
name = "{title}{year} S{season:02}E{number:02} {name}".format( name = "{title}{year} S{season:02}E{number:02} {name}".format(
title=self.title.replace("$", "S"), # e.g., Arli$$ title=self.title.replace("$", "S"), # e.g., Arli$$
year=f" {self.year}" if self.year and config.series_year else "", year=f" {self.year}" if self.year and config.series_year else "",

View File

@@ -47,6 +47,8 @@ class Movie(Title):
def __str__(self) -> str: def __str__(self) -> str:
if self.year: if self.year:
if config.dash_naming:
return f"{self.name} - {self.year}"
return f"{self.name} ({self.year})" return f"{self.name} ({self.year})"
return self.name return self.name