mirror of
https://github.com/unshackle-dl/unshackle.git
synced 2026-03-10 08:29:00 +00:00
Merge pull request #46 from MasterOfKay/main
Merging dash-naming feature - adds optional dash separator format for filenames
This commit is contained in:
@@ -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)
|
||||||
|
|
||||||
|
|||||||
@@ -109,13 +109,31 @@ 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:
|
||||||
name = "{title}{year} S{season:02}E{number:02} {name}".format(
|
if config.dash_naming:
|
||||||
title=self.title.replace("$", "S"), # e.g., Arli$$
|
# Format: Title - SXXEXX - Episode Name
|
||||||
year=f" {self.year}" if self.year and config.series_year else "",
|
name = self.title.replace("$", "S") # e.g., Arli$$
|
||||||
season=self.season,
|
|
||||||
number=self.number,
|
# Add year if configured
|
||||||
name=self.name or "",
|
if self.year and config.series_year:
|
||||||
).strip()
|
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(
|
||||||
|
title=self.title.replace("$", "S"), # e.g., Arli$$
|
||||||
|
year=f" {self.year}" if self.year and config.series_year else "",
|
||||||
|
season=self.season,
|
||||||
|
number=self.number,
|
||||||
|
name=self.name or "",
|
||||||
|
).strip()
|
||||||
|
|
||||||
if config.scene_naming:
|
if config.scene_naming:
|
||||||
# Resolution
|
# Resolution
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user