Catch renamer.after event errors. fix #1032

This commit is contained in:
Ruud
2012-11-10 10:10:05 +01:00
parent f3fd0afb42
commit 655e847aeb
2 changed files with 20 additions and 9 deletions

View File

@@ -3,6 +3,7 @@ from couchpotato.core.logger import CPLog
from couchpotato.core.notifications.base import Notification
from flask.helpers import json
import base64
import traceback
log = CPLog(__name__)
@@ -22,9 +23,12 @@ class XBMC(Notification):
('VideoLibrary.Scan', {}),
])
for result in response:
if result['result'] == "OK":
successful += 1
try:
for result in response:
if result['result'] == "OK":
successful += 1
except:
log.error('Failed parsing results: %s', traceback.format_exc())
return successful == len(hosts) * 2
@@ -50,10 +54,14 @@ class XBMC(Notification):
base64string = base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password'))).replace('\n', '')
headers['Authorization'] = 'Basic %s' % base64string
log.debug('Sending request to %s: %s', (host, data))
rdata = self.urlopen(server, headers = headers, params = data, multipart = True)
response = json.loads(rdata)
log.debug('Returned from request %s: %s', (host, response))
try:
log.debug('Sending request to %s: %s', (host, data))
rdata = self.urlopen(server, headers = headers, params = data, multipart = True)
response = json.loads(rdata)
log.debug('Returned from request %s: %s', (host, response))
return response
return response
except:
log.error('Failed sending request to XBMC: %s', traceback.format_exc())
return []

View File

@@ -383,7 +383,10 @@ class Renamer(Plugin):
# Notify on download, search for trailers etc
download_message = 'Downloaded %s (%s)' % (movie_title, replacements['quality'])
fireEvent('renamer.after', message = download_message, group = group, in_order = True)
try:
fireEvent('renamer.after', message = download_message, group = group, in_order = True)
except:
log.error('Failed firing (some) of the renamer.after events: %s', traceback.format_exc())
# Break if CP wants to shut down
if self.shuttingDown():