From ed0e7e47168aa297458ead10b9f98d7e893f0aca Mon Sep 17 00:00:00 2001 From: luxmoggy Date: Mon, 15 Dec 2014 12:26:10 +0100 Subject: [PATCH 1/3] Catch error when setting file date --- sickbeard/tv.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sickbeard/tv.py b/sickbeard/tv.py index 0efde9bb..8265690e 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__) From 27daf8b46cb79f6eb4546722e163b7b79abe42de Mon Sep 17 00:00:00 2001 From: luxmoggy Date: Mon, 15 Dec 2014 12:38:02 +0100 Subject: [PATCH 2/3] Catch error when speical charactor crashes email send --- sickbeard/notifiers/emailnotify.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/sickbeard/notifiers/emailnotify.py b/sickbeard/notifiers/emailnotify.py index 74d292be..566ae866 100644 --- a/sickbeard/notifiers/emailnotify.py +++ b/sickbeard/notifiers/emailnotify.py @@ -29,7 +29,7 @@ import sickbeard from sickbeard import logger, common from sickbeard import db -from sickbeard import encodingKludge as ek +from sickbeard.encodingKludge import toUnicode from sickbeard.exceptions import ex @@ -51,7 +51,7 @@ class EmailNotifier: ep_name: The name of the episode that was snatched title: The title of the notification (optional) """ - ep_name = ek.ss(ep_name) + ep_name = toUnicode(ep_name) if sickbeard.EMAIL_NOTIFY_ONSNATCH: show = self._parseEp(ep_name) @@ -68,7 +68,10 @@ class EmailNotifier: 1) + "

\n\n
Powered by SickRage.
", '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 @@ -86,7 +89,7 @@ class EmailNotifier: ep_name: The name of the episode that was downloaded title: The title of the notification (optional) """ - ep_name = ek.ss(ep_name) + ep_name = toUnicode(ep_name) if sickbeard.EMAIL_NOTIFY_ONDOWNLOAD: show = self._parseEp(ep_name) @@ -103,7 +106,10 @@ class EmailNotifier: 1) + "

\n\n
Powered by SickRage.
", '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 @@ -121,7 +127,7 @@ class EmailNotifier: ep_name: The name of the episode that was downloaded lang: Subtitle language wanted """ - ep_name = ek.ss(ep_name) + ep_name = toUnicode(ep_name) if sickbeard.EMAIL_NOTIFY_ONSUBTITLEDOWNLOAD: show = self._parseEp(ep_name) @@ -138,7 +144,10 @@ class EmailNotifier: 1) + "

\n

Language: " + lang + "

\n\n
Powered by SickRage.
", '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 @@ -198,7 +207,7 @@ class EmailNotifier: return False def _parseEp(self, ep_name): - ep_name = ek.ss(ep_name) + ep_name = toUnicode(ep_name) sep = " - " titles = ep_name.split(sep) From 0030c87d044d45dfd36ca7e04249c64429388629 Mon Sep 17 00:00:00 2001 From: luxmoggy Date: Mon, 15 Dec 2014 12:49:09 +0100 Subject: [PATCH 3/3] Catch error when speical charactor crashes email send --- sickbeard/notifiers/emailnotify.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sickbeard/notifiers/emailnotify.py b/sickbeard/notifiers/emailnotify.py index 566ae866..d8ffb379 100644 --- a/sickbeard/notifiers/emailnotify.py +++ b/sickbeard/notifiers/emailnotify.py @@ -29,7 +29,7 @@ import sickbeard from sickbeard import logger, common from sickbeard import db -from sickbeard.encodingKludge import toUnicode +from sickbeard import encodingKludge as ek from sickbeard.exceptions import ex @@ -51,7 +51,7 @@ class EmailNotifier: ep_name: The name of the episode that was snatched title: The title of the notification (optional) """ - ep_name = toUnicode(ep_name) + ep_name = ek.ss(ep_name) if sickbeard.EMAIL_NOTIFY_ONSNATCH: show = self._parseEp(ep_name) @@ -89,7 +89,7 @@ class EmailNotifier: ep_name: The name of the episode that was downloaded title: The title of the notification (optional) """ - ep_name = toUnicode(ep_name) + ep_name = ek.ss(ep_name) if sickbeard.EMAIL_NOTIFY_ONDOWNLOAD: show = self._parseEp(ep_name) @@ -127,7 +127,7 @@ class EmailNotifier: ep_name: The name of the episode that was downloaded lang: Subtitle language wanted """ - ep_name = toUnicode(ep_name) + ep_name = ek.ss(ep_name) if sickbeard.EMAIL_NOTIFY_ONSUBTITLEDOWNLOAD: show = self._parseEp(ep_name) @@ -207,7 +207,7 @@ class EmailNotifier: return False def _parseEp(self, ep_name): - ep_name = toUnicode(ep_name) + ep_name = ek.ss(ep_name) sep = " - " titles = ep_name.split(sep)