diff --git a/sickbeard/logger.py b/sickbeard/logger.py index b85d7382233562fe025eb53c8fd87a65cb8dd2b2..7dd0ababe5df36ce0b6c3db0d9ed5b54efc70ebe 100644 --- a/sickbeard/logger.py +++ b/sickbeard/logger.py @@ -269,19 +269,30 @@ class Logger(object): reports = gh.get_organization(gh_org).get_repo(gh_repo).get_issues(state="all") def is_mako_error(title): - return re.search(r'Loaded module.*not found in sys\.modules', title) is not None + #[APP SUBMITTED]: Loaded module _home_pi_SickRage_gui_slick_views_home_mako not found in sys.modules + #[APP SUBMITTED]: Loaded module _opt_sickbeard_gui_slick_views_home_mako not found in sys.modules + #[APP SUBMITTED]: Loaded module D__TV_SickRage_gui_slick_views_home_mako not found in sys.modules + return re.search(r".* Loaded module .* not found in sys\.modules", title) is not None def is_ascii_error(title): - return re.search(r"'.*' codec can't encode character .* in position .*:", title) is not None + #[APP SUBMITTED]: 'ascii' codec can't encode characters in position 00-00: ordinal not in range(128) + #[APP SUBMITTED]: 'charmap' codec can't decode byte 0x00 in position 00: character maps to <undefined> + return re.search(r".* codec can't .*code .* in position .*:", title) is not None + + def is_malformed_error(title): + #[APP SUBMITTED]: not well-formed (invalid token): line 0, column 0 + re.search(r".* not well-formed \(invalid token\): line .* column .*", title) is not None mako_error = is_mako_error(title_Error) ascii_error = is_ascii_error(title_Error) + malformed_error = is_malformed_error(title_Error) issue_found = False for report in reports: if title_Error.rsplit(' :: ')[-1] in report.title or \ (mako_error and is_mako_error(report.title)) or \ - (ascii_error and is_ascii_error(report.title)): + (malformed_error and is_malformed_error(report.title)) or \ + (ascii_error and is_ascii_error(report.title)): issue_id = report.number if not report.raw_data['locked']: