diff --git a/gui/slick/interfaces/default/comingEpisodes.tmpl b/gui/slick/interfaces/default/comingEpisodes.tmpl
index e278593b..6d8ef27d 100644
--- a/gui/slick/interfaces/default/comingEpisodes.tmpl
+++ b/gui/slick/interfaces/default/comingEpisodes.tmpl
@@ -167,7 +167,7 @@
Airdate |
Show |
- Next Ep |
+ Next Ep |
Next Ep Name |
Network |
Quality |
@@ -206,17 +206,17 @@
## forced to use a div to wrap airdate, the column sort went crazy with a span
-
+ |
$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING) $time.mktime($cur_result['localtime'].timetuple())
|
- $cur_result['show_name']
+ | $cur_result['show_name']
#if int($cur_result['paused']):
[paused]
#end if
|
-
+ |
<%= 'S%02iE%02i' % (int(cur_result['season']), int(cur_result['episode'])) %>
|
diff --git a/sickbeard/search.py b/sickbeard/search.py
index 9fd25039..decdf50a 100644
--- a/sickbeard/search.py
+++ b/sickbeard/search.py
@@ -167,7 +167,7 @@ def snatchEpisode(result, endStatus=SNATCHED):
sql_l.append(curEpObj.get_sql())
if curEpObj.status not in Quality.DOWNLOADED:
- notifiers.notify_snatch(curEpObj._format_pattern('%SN - %Sx%0E - %EN - %QN'))
+ notifiers.notify_snatch(curEpObj._format_pattern('%SN - %Sx%0E - %EN - %QN') + " from " + result.provider.name)
if len(sql_l) > 0:
myDB = db.DBConnection()
diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py
index 71f8683c..6428f245 100644
--- a/sickbeard/webapi.py
+++ b/sickbeard/webapi.py
@@ -163,7 +163,7 @@ class Api(webserve.MainHandler):
def _out_as_json(self, dict):
self.set_header("Content-Type", "application/json")
try:
- out = json.dumps(dict, indent=self.intent, sort_keys=True)
+ out = json.dumps(dict, indent=self.intent,ensure_ascii=False,sort_keys=True)
if 'jsonp' in self.request.query_arguments:
out = self.request.arguments['jsonp'] + '(' + out + ');' # wrap with JSONP call if requested
@@ -2313,7 +2313,7 @@ class CMD_ShowSeasons(ApiCall):
myDB = db.DBConnection(row_type="dict")
if self.season == None:
- sqlResults = myDB.select("SELECT name, episode, airdate, status, season FROM tv_episodes WHERE showid = ?",
+ sqlResults = myDB.select("SELECT name, episode, airdate, status, release_name, season, location, file_size, subtitles FROM tv_episodes WHERE showid = ?",
[self.indexerid])
seasons = {}
for row in sqlResults:
@@ -2332,7 +2332,7 @@ class CMD_ShowSeasons(ApiCall):
else:
sqlResults = myDB.select(
- "SELECT name, episode, airdate, status FROM tv_episodes WHERE showid = ? AND season = ?",
+ "SELECT name, episode, airdate, status, location, file_size, release_name, subtitles FROM tv_episodes WHERE showid = ? AND season = ?",
[self.indexerid, self.season])
if len(sqlResults) is 0:
return _responds(RESULT_FAILURE, msg="Season not found")