diff --git a/sickbeard/notifiers/emailnotify.py b/sickbeard/notifiers/emailnotify.py index 74d292be..d8ffb379 100644 --- a/sickbeard/notifiers/emailnotify.py +++ b/sickbeard/notifiers/emailnotify.py @@ -68,7 +68,10 @@ class EmailNotifier: 1) + "

\n\n", 'html')) except: - msg = MIMEText(ep_name) + try: + msg = MIMEText(ep_name) + except: + msg = MIMEText("Episode Snatched") msg['Subject'] = 'Snatched: ' + ep_name msg['From'] = sickbeard.EMAIL_FROM @@ -103,7 +106,10 @@ class EmailNotifier: 1) + "

\n\n", 'html')) except: - msg = MIMEText(ep_name) + try: + msg = MIMEText(ep_name) + except: + mag = 'Episode Downloaded' msg['Subject'] = 'Downloaded: ' + ep_name msg['From'] = sickbeard.EMAIL_FROM @@ -138,7 +144,10 @@ class EmailNotifier: 1) + "

\n

Language: " + lang + "

\n\n", 'html')) except: - msg = MIMEText(ep_name + ": " + lang) + try: + msg = MIMEText(ep_name + ": " + lang) + except: + msg = "Episode Subtitle Downloaded" msg['Subject'] = lang + ' Subtitle Downloaded: ' + ep_name msg['From'] = sickbeard.EMAIL_FROM diff --git a/sickbeard/tv.py b/sickbeard/tv.py index a149b99a..bc9e4465 100644 --- a/sickbeard/tv.py +++ b/sickbeard/tv.py @@ -2498,9 +2498,18 @@ class TVEpisode(object): import time airdatetime = airdatetime.timetuple() - if helpers.touchFile(self.location, time.mktime(airdatetime)): - logger.log(str(self.show.indexerid) + u": Changed modify date of " + os.path.basename(self.location) - + " to show air date " + time.strftime("%b %d,%Y (%H:%M)", airdatetime)) + logger.log(str(self.show.indexerid) + u": About to modify date of '" + self.location + + "' to show air date " + time.strftime("%b %d,%Y (%H:%M)", airdatetime), logger.DEBUG) + try: + if helpers.touchFile(self.location, time.mktime(airdatetime)): + logger.log(str(self.show.indexerid) + u": Changed modify date of " + os.path.basename(self.location) + + " to show air date " + time.strftime("%b %d,%Y (%H:%M)", airdatetime)) + else: + logger.log(str(self.show.indexerid) + u": Unable to modify date of " + os.path.basename(self.location) + + " to show air date " + time.strftime("%b %d,%Y (%H:%M)", airdatetime), logger.ERROR) + except: + logger.log(str(self.show.indexerid) + u": Failed to modify date of '" + os.path.basename(self.location) + + "' to show air date " + time.strftime("%b %d,%Y (%H:%M)", airdatetime), logger.ERROR) def __getstate__(self): d = dict(self.__dict__)