monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-04 10:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add multi dimension sorting and clarify some variable naming.

Browse source
This commit is contained in:
JackDandy 2014-11-25 22:12:00 +00:00
parent fb70e80461
commit 2808e8edf4
2 changed files with 60 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
sickbeard/webapi.py
View file

@ -725,14 +725,14 @@ class CMD_ComingEpisodes(ApiCall):
def run(self): def run(self):
""" display the coming episodes """ """ display the coming episodes """
today1 = datetime.date.today() today_dt = datetime.date.today()
today = today1.toordinal() today = today_dt.toordinal()
yesterday1 = today1 - datetime.timedelta(days=1) yesterday_dt = today_dt - datetime.timedelta(days=1)
yesterday = yesterday1.toordinal() yesterday = yesterday_dt.toordinal()
tomorrow = (datetime.date.today() + datetime.timedelta(days=1)).toordinal() tomorrow = (datetime.date.today() + datetime.timedelta(days=1)).toordinal()
next_week1 = (datetime.date.today() + datetime.timedelta(days=7)) next_week_dt = (datetime.date.today() + datetime.timedelta(days=7))
next_week = (next_week1 + datetime.timedelta(days=1)).toordinal() next_week = (next_week_dt + datetime.timedelta(days=1)).toordinal()
recently = (yesterday1 - datetime.timedelta(days=sickbeard.COMING_EPS_MISSED_RANGE)).toordinal() recently = (yesterday_dt - datetime.timedelta(days=sickbeard.COMING_EPS_MISSED_RANGE)).toordinal()
done_show_list = [] done_show_list = []
qualList = Quality.DOWNLOADED + Quality.SNATCHED + [ARCHIVED, IGNORED] qualList = Quality.DOWNLOADED + Quality.SNATCHED + [ARCHIVED, IGNORED]
@ -762,14 +762,30 @@ class CMD_ComingEpisodes(ApiCall):
# make a dict out of the sql results # make a dict out of the sql results
sql_results = [dict(row) for row in sql_results] sql_results = [dict(row) for row in sql_results]
# sort by air date # multi dimension sort
sorts = { sorts = {
'date': (lambda x, y: cmp(x["parsed_datetime"], y["parsed_datetime"])), 'date': (lambda a, b: cmp(
'show': (lambda a, b: cmp((a["show_name"], a["parsed_datetime"]), (b["show_name"], b["parsed_datetime"]))), (a['parsed_datetime'],
'network': (lambda a, b: cmp((a["network"], a["parsed_datetime"]), (b["network"], b["parsed_datetime"]))), (a['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', a['show_name']))[not sickbeard.SORT_ARTICLE],
a['season'], a['episode']),
(b['parsed_datetime'],
(b['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', b['show_name']))[not sickbeard.SORT_ARTICLE],
b['season'], b['episode']))),
'show': (lambda a, b: cmp(
((a['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', a['show_name']))[not sickbeard.SORT_ARTICLE],
a['parsed_datetime'], a['season'], a['episode']),
((b['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', b['show_name']))[not sickbeard.SORT_ARTICLE],
b['parsed_datetime'], b['season'], b['episode']))),
'network': (lambda a, b: cmp(
(a['network'], a['parsed_datetime'],
(a['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', a['show_name']))[not sickbeard.SORT_ARTICLE],
a['season'], a['episode']),
(b['network'], b['parsed_datetime'],
(b['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', b['show_name']))[not sickbeard.SORT_ARTICLE],
b['season'], b['episode'])))
} }
# add localtime to the dict # add parsed_datetime to the dict
for index, item in enumerate(sql_results): for index, item in enumerate(sql_results):
sql_results[index]['parsed_datetime'] = network_timezones.parse_date_time(item['airdate'], item['airs'], item['network']) sql_results[index]['parsed_datetime'] = network_timezones.parse_date_time(item['airdate'], item['airs'], item['network'])

46
sickbeard/webserve.py
View file

@ -350,16 +350,18 @@ class MainHandler(RequestHandler):
redirect("/comingEpisodes/") redirect("/comingEpisodes/")
def comingEpisodes(self, layout="None"): def comingEpisodes(self, layout="None"):
""" display the coming episodes """
today1 = datetime.date.today() - datetime.timedelta(days=1) today_dt = datetime.date.today()
today = today1.toordinal() #today = today_dt.toordinal()
yesterday_dt = today_dt - datetime.timedelta(days=1)
yesterday = yesterday_dt.toordinal()
tomorrow = (datetime.date.today() + datetime.timedelta(days=1)).toordinal() tomorrow = (datetime.date.today() + datetime.timedelta(days=1)).toordinal()
next_week1 = (datetime.date.today() + datetime.timedelta(days=7)) next_week_dt = (datetime.date.today() + datetime.timedelta(days=7))
next_week = (next_week1 + datetime.timedelta(days=1)).toordinal() next_week = (next_week_dt + datetime.timedelta(days=1)).toordinal()
if not (layout and layout in ('calendar')) and not (sickbeard.COMING_EPS_LAYOUT and sickbeard.COMING_EPS_LAYOUT in ('calendar')): if not (layout and layout in ('calendar')) and not (sickbeard.COMING_EPS_LAYOUT and sickbeard.COMING_EPS_LAYOUT in ('calendar')):
recently = (today1 - datetime.timedelta(days=sickbeard.COMING_EPS_MISSED_RANGE)).toordinal() recently = (yesterday_dt - datetime.timedelta(days=sickbeard.COMING_EPS_MISSED_RANGE)).toordinal()
else: else:
recently = today recently = yesterday
done_show_list = [] done_show_list = []
qualList = Quality.DOWNLOADED + Quality.SNATCHED + [ARCHIVED, IGNORED] qualList = Quality.DOWNLOADED + Quality.SNATCHED + [ARCHIVED, IGNORED]
@ -367,7 +369,7 @@ class MainHandler(RequestHandler):
myDB = db.DBConnection() myDB = db.DBConnection()
sql_results = myDB.select( sql_results = myDB.select(
"SELECT *, tv_shows.status as show_status FROM tv_episodes, tv_shows WHERE season != 0 AND airdate >= ? AND airdate <= ? AND tv_shows.indexer_id = tv_episodes.showid AND tv_episodes.status NOT IN (" + ','.join( "SELECT *, tv_shows.status as show_status FROM tv_episodes, tv_shows WHERE season != 0 AND airdate >= ? AND airdate <= ? AND tv_shows.indexer_id = tv_episodes.showid AND tv_episodes.status NOT IN (" + ','.join(
['?'] * len(qualList)) + ")", [today, next_week] + qualList) ['?'] * len(qualList)) + ")", [yesterday, next_week] + qualList)
for cur_result in sql_results: for cur_result in sql_results:
done_show_list.append(int(cur_result["showid"])) done_show_list.append(int(cur_result["showid"]))
@ -388,11 +390,27 @@ class MainHandler(RequestHandler):
sql_results = list(set(sql_results)) sql_results = list(set(sql_results))
# sort by localtime # multi dimension sort
sorts = { sorts = {
'date': (lambda x, y: cmp(x["localtime"], y["localtime"])), 'date': (lambda a, b: cmp(
'show': (lambda a, b: cmp((a["show_name"], a["localtime"]), (b["show_name"], b["localtime"]))), (a['localtime'],
'network': (lambda a, b: cmp((a["network"], a["localtime"]), (b["network"], b["localtime"]))), (a['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', a['show_name']))[not sickbeard.SORT_ARTICLE],
a['season'], a['episode']),
(b['localtime'],
(b['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', b['show_name']))[not sickbeard.SORT_ARTICLE],
b['season'], b['episode']))),
'show': (lambda a, b: cmp(
((a['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', a['show_name']))[not sickbeard.SORT_ARTICLE],
a['localtime'], a['season'], a['episode']),
((b['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', b['show_name']))[not sickbeard.SORT_ARTICLE],
b['localtime'], b['season'], b['episode']))),
'network': (lambda a, b: cmp(
(a['network'], a['localtime'],
(a['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', a['show_name']))[not sickbeard.SORT_ARTICLE],
a['season'], a['episode']),
(b['network'], b['localtime'],
(b['show_name'], re.sub(r'(?i)^(The|A|An)\s', '', b['show_name']))[not sickbeard.SORT_ARTICLE],
b['season'], b['episode'])))
} }
# make a dict out of the sql results # make a dict out of the sql results
@ -425,8 +443,8 @@ class MainHandler(RequestHandler):
paused_item, paused_item,
] ]
t.next_week = datetime.datetime.combine(next_week1, datetime.time(tzinfo=network_timezones.sb_timezone)) t.next_week = datetime.datetime.combine(next_week_dt, datetime.time(tzinfo=network_timezones.sb_timezone))
t.today = datetime.datetime.now().replace(tzinfo=network_timezones.sb_timezone) t.today = datetime.datetime.now(network_timezones.sb_timezone)
t.sql_results = sql_results t.sql_results = sql_results
# Allow local overriding of layout parameter # Allow local overriding of layout parameter