From 3f603f69f18a80037428c0e1b8d12c9315039276 Mon Sep 17 00:00:00 2001
From: Dustyn Gibson <miigotu@gmail.com>
Date: Fri, 27 Nov 2015 23:17:33 -0800
Subject: [PATCH] Fix assertion error when editting a show's location the
returned location set the show.location to non-unicode
---
sickbeard/metadata/kodi_12plus.py | 26 +++++++++++++-------------
sickbeard/webserve.py | 1 +
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/sickbeard/metadata/kodi_12plus.py b/sickbeard/metadata/kodi_12plus.py
index 4ba5ceb76..2b1eda150 100644
--- a/sickbeard/metadata/kodi_12plus.py
+++ b/sickbeard/metadata/kodi_12plus.py
@@ -76,22 +76,22 @@ class KODI_12PlusMetadata(generic.GenericMetadata):
season_all_poster,
season_all_banner)
- self.name = 'KODI 12+'
+ self.name = u'KODI 12+'
- self.poster_name = "poster.jpg"
- self.season_all_poster_name = "season-all-poster.jpg"
+ self.poster_name = u"poster.jpg"
+ self.season_all_poster_name = u"season-all-poster.jpg"
# web-ui metadata template
- self.eg_show_metadata = "tvshow.nfo"
- self.eg_episode_metadata = "Season##\\<i>filename</i>.nfo"
- self.eg_fanart = "fanart.jpg"
- self.eg_poster = "poster.jpg"
- self.eg_banner = "banner.jpg"
- self.eg_episode_thumbnails = "Season##\\<i>filename</i>-thumb.jpg"
- self.eg_season_posters = "season##-poster.jpg"
- self.eg_season_banners = "season##-banner.jpg"
- self.eg_season_all_poster = "season-all-poster.jpg"
- self.eg_season_all_banner = "season-all-banner.jpg"
+ self.eg_show_metadata = u"tvshow.nfo"
+ self.eg_episode_metadata = u"Season##\\<i>filename</i>.nfo"
+ self.eg_fanart = u"fanart.jpg"
+ self.eg_poster = u"poster.jpg"
+ self.eg_banner = u"banner.jpg"
+ self.eg_episode_thumbnails = u"Season##\\<i>filename</i>-thumb.jpg"
+ self.eg_season_posters = u"season##-poster.jpg"
+ self.eg_season_banners = u"season##-banner.jpg"
+ self.eg_season_all_poster = u"season-all-poster.jpg"
+ self.eg_season_all_banner = u"season-all-banner.jpg"
@staticmethod
def _split_info(info_string):
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 4ef06012f..82c55155e 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -1489,6 +1489,7 @@ class Home(WebRoot):
showObj.rls_ignore_words = rls_ignore_words.strip()
showObj.rls_require_words = rls_require_words.strip()
+ location = unicode(location, 'UTF-8')
# if we change location clear the db of episodes, change it, write to db, and rescan
if os.path.normpath(showObj._location) != os.path.normpath(location):
logger.log(os.path.normpath(showObj._location) + " != " + os.path.normpath(location), logger.DEBUG)
--
GitLab