mirror of
https://github.com/moparisthebest/SickRage
synced 2024-12-13 03:22:22 -05:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
8deb7485ab
@ -167,7 +167,7 @@
|
||||
<tr>
|
||||
<th>Airdate</th>
|
||||
<th>Show</th>
|
||||
<th class="nowrap">Next Ep</th>
|
||||
<th nowrap="nowrap">Next Ep</th>
|
||||
<th>Next Ep Name</th>
|
||||
<th>Network</th>
|
||||
<th>Quality</th>
|
||||
@ -206,17 +206,17 @@
|
||||
<!-- start $cur_result['show_name'] //-->
|
||||
<tr class="$show_div">
|
||||
## forced to use a div to wrap airdate, the column sort went crazy with a span
|
||||
<td align="center" class="nowrap">
|
||||
<td align="center" nowrap="nowrap">
|
||||
<div class="${fuzzydate}">$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)</div><span class="sort_data">$time.mktime($cur_result['localtime'].timetuple())</span>
|
||||
</td>
|
||||
|
||||
<td class="tvShow"><a href="$sbRoot/home/displayShow?show=${cur_result['showid']}">$cur_result['show_name']</a>
|
||||
<td class="tvShow" nowrap="nowrap"><a href="$sbRoot/home/displayShow?show=${cur_result['showid']}">$cur_result['show_name']</a>
|
||||
#if int($cur_result['paused']):
|
||||
<span class="pause">[paused]</span>
|
||||
#end if
|
||||
</td>
|
||||
|
||||
<td class="nowrap" align="center">
|
||||
<td nowrap="nowrap" align="center">
|
||||
<%= 'S%02iE%02i' % (int(cur_result['season']), int(cur_result['episode'])) %>
|
||||
</td>
|
||||
|
||||
|
@ -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()
|
||||
|
@ -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")
|
||||
|
Loading…
Reference in New Issue
Block a user