Merge branch 'main' into dev

This commit is contained in:
JackDandy 2023-03-06 23:46:21 +00:00
commit c076c495ee
2 changed files with 13 additions and 2 deletions

View file

@ -6,6 +6,11 @@
* Change codebase cleanups * Change codebase cleanups
### 3.27.11 (2023-03-06 23:40:00 UTC)
* Fix "Change File Date" not using timestamp of episode if available
### 3.27.10 (2023-03-05 00:20:00 UTC) ### 3.27.10 (2023-03-05 00:20:00 UTC)
* Add UHD Bluray * Add UHD Bluray

View file

@ -5276,14 +5276,20 @@ class TVEpisode(TVEpisodeBase):
Note: Also called from postProcessor Note: Also called from postProcessor
""" """
has_timestamp = isinstance(self._timestamp, int) and 1 < self._timestamp has_timestamp = isinstance(self._timestamp, int) and 0 != self._timestamp
if not has_timestamp and (not isinstance(self._airdate, datetime.date) or 1 == self._airdate.year): if not has_timestamp and (not isinstance(self._airdate, datetime.date) or 1 == self._airdate.year):
logger.log('%s: Did not change modify date of %s because episode date is never aired or invalid' logger.log('%s: Did not change modify date of %s because episode date is never aired or invalid'
% (self._show_obj.tvid_prodid, os.path.basename(self.location)), logger.DEBUG) % (self._show_obj.tvid_prodid, os.path.basename(self.location)), logger.DEBUG)
return return
aired_dt = None aired_dt = None
if not has_timestamp: if has_timestamp:
try:
aired_dt = SGDatetime.from_timestamp(self._timestamp)
except (BaseException, Exception):
aired_dt = None
if not aired_dt:
if isinstance(self._airtime, datetime.time): if isinstance(self._airtime, datetime.time):
airtime = self._airtime airtime = self._airtime
else: else: