mirror of
https://github.com/SickGear/SickGear.git
synced 2025-01-05 17:43:37 +00:00
Change Add from Trakt/"Shows:" with Most Played.
This commit is contained in:
JackDandy
parent
4de0d9a3c2
commit
14bdd50e5b
7 changed files with 131 additions and 60 deletions
|
|
@ -74,7 +74,7 @@
|
|||
* Change improve existing show page and the handling when an attempt to add a show to an existing location
|
||||
* Change consolidate Trakt Trending and Recommended views into an "Add From Trakt" view which defaults to trending
|
||||
* Change Add from Trakt/"Shows:" with Anticipated, New Seasons, New Shows, Popular, Recommendations, and Trending views
|
||||
* Change Add from Trakt/"Shows:" with Most Watched, Collected during the last month on Trakt
|
||||
* Change Add from Trakt/"Shows:" with Most Watched, Played, and Collected during the last month and year on Trakt
|
||||
* Change add season info to "Show: Trakt New Seasons" view on the Add from Trakt page
|
||||
* Change increase number of displayed Trakt shows to 100
|
||||
* Add genres and rating to all Trakt shows
|
||||
|
|
|
|||
|
|
@ -1179,12 +1179,14 @@ input sizing (for config pages)
|
|||
========================================================================== */
|
||||
|
||||
#pickShow optgroup,
|
||||
#showfilter optgroup,
|
||||
#editAProvider optgroup{
|
||||
color:#eee;
|
||||
background-color:rgb(51, 51, 51)
|
||||
}
|
||||
|
||||
#pickShow optgroup option,
|
||||
#showfilter optgroup option,
|
||||
#editAProvider optgroup option{
|
||||
color:#222;
|
||||
background-color:#fff
|
||||
|
|
|
|||
|
|
@ -1143,12 +1143,14 @@ input sizing (for config pages)
|
|||
========================================================================== */
|
||||
|
||||
#pickShow optgroup,
|
||||
#showfilter optgroup,
|
||||
#editAProvider optgroup{
|
||||
color:#eee;
|
||||
background-color:#888
|
||||
}
|
||||
|
||||
#pickShow optgroup option,
|
||||
#showfilter optgroup option,
|
||||
#editAProvider optgroup option{
|
||||
color:#222;
|
||||
background-color:#fff
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</div>
|
||||
</a>
|
||||
|
||||
<a class="btn btn-large" href="$sbRoot/home/addShows/traktTrending/">
|
||||
<a class="btn btn-large" href="$sbRoot/home/addShows/trakt_default/">
|
||||
<div class="button"><div class="icon-addrecommendedshow"></div></div>
|
||||
<div class="buttontext">
|
||||
<h3>Add From Trakt</h3>
|
||||
|
|
|
|||
|
|
@ -128,18 +128,35 @@
|
|||
#if 'Trakt' == $browse_type
|
||||
#set $mode = $kwargs and $kwargs.get('mode', None)
|
||||
#set $selected = ' class="selected"'
|
||||
<option value="traktAnticipated"#echo ('', selected)['anticipated' == $mode]#>Trakt Anticipating</option>
|
||||
<option value="traktNewSeasons"#echo ('', selected)['newseasons' == $mode]#>Trakt New Seasons</option>
|
||||
<option value="traktNewShows"#echo ('', selected)['newshows' == $mode]#>Trakt New Shows</option>
|
||||
<option value="traktPopular"#echo ('', selected)['popular' == $mode]#>Trakt Popular</option>
|
||||
<option value="traktTrending"#echo ('', selected)['trending' == $mode]#>Trakt Trending</option>
|
||||
<option value="traktWatched"#echo ('', selected)['watched' == $mode]#>Trakt Most Watched (Last Month)</option>
|
||||
<option value="traktCollected"#echo ('', selected)['collected' == $mode]#>Trakt Most Collected (Last Month)</option>
|
||||
#for $account in $sickbeard.TRAKT_ACCOUNTS
|
||||
#if $sickbeard.TRAKT_ACCOUNTS[$account].active and $sickbeard.TRAKT_ACCOUNTS[$account].name
|
||||
<option value="traktRecommended?account=$account"#echo ('', selected)['recommended-%s' % $account == $mode]#>Trakt Recommended for $sickbeard.TRAKT_ACCOUNTS[$account].name</option>
|
||||
#end if
|
||||
#end for
|
||||
<optgroup label="Trakt">
|
||||
<option value="trakt_anticipated"#echo ('', selected)['anticipated' == $mode]#>Anticipating</option>
|
||||
<option value="trakt_newseasons"#echo ('', selected)['newseasons' == $mode]#>New Seasons</option>
|
||||
<option value="trakt_newshows"#echo ('', selected)['newshows' == $mode]#>New Shows</option>
|
||||
<option value="trakt_popular"#echo ('', selected)['popular' == $mode]#>Popular</option>
|
||||
<option value="trakt_trending"#echo ('', selected)['trending' == $mode]#>Trending</option>
|
||||
</optgroup>
|
||||
<optgroup label="Trakt last month">
|
||||
<option value="trakt_watched"#echo ('', selected)['watched' == $mode]#>Most Watched</option>
|
||||
<option value="trakt_played"#echo ('', selected)['played' == $mode]#>Most Played</option>
|
||||
<option value="trakt_collected"#echo ('', selected)['collected' == $mode]#>Most Collected</option>
|
||||
</optgroup>
|
||||
<optgroup label="Trakt last 12 months">
|
||||
<option value="trakt_watched?period=year"#echo ('', selected)['watched-year' == $mode]#>Most Watched</option>
|
||||
<option value="trakt_played?period=year"#echo ('', selected)['played-year' == $mode]#>Most Played</option>
|
||||
<option value="trakt_collected?period=year"#echo ('', selected)['collected-year' == $mode]#>Most Collected</option>
|
||||
</optgroup>
|
||||
#if any($sickbeard.TRAKT_ACCOUNTS)
|
||||
<optgroup label="Trakt recommended">
|
||||
#for $account in $sickbeard.TRAKT_ACCOUNTS
|
||||
#if $sickbeard.TRAKT_ACCOUNTS[$account].active and $sickbeard.TRAKT_ACCOUNTS[$account].name
|
||||
<option value="trakt_recommended?account=$account"#echo ('', selected)['recommended-%s' % $account == $mode]#>for $sickbeard.TRAKT_ACCOUNTS[$account].name</option>
|
||||
#end if
|
||||
#end for
|
||||
#else
|
||||
<optgroup label="To get recommended">
|
||||
<option value="trakt_recommended?action=add">Enable Trakt here</option>
|
||||
#end if
|
||||
</optgroup>
|
||||
#end if
|
||||
</select>
|
||||
|
||||
|
|
|
|||
|
|
@ -452,6 +452,7 @@ TRAKT_TIMEOUT = 60
|
|||
TRAKT_VERIFY = True
|
||||
TRAKT_CONNECTED_ACCOUNT = None
|
||||
TRAKT_ACCOUNTS = {}
|
||||
TRAKT_MRU = ''
|
||||
|
||||
if TRAKT_STAGING:
|
||||
# staging trakt values:
|
||||
|
|
@ -487,7 +488,7 @@ def initialize(consoleLogging=True):
|
|||
USE_XBMC, XBMC_ALWAYS_ON, XBMC_NOTIFY_ONSNATCH, XBMC_NOTIFY_ONDOWNLOAD, XBMC_NOTIFY_ONSUBTITLEDOWNLOAD, XBMC_UPDATE_FULL, XBMC_UPDATE_ONLYFIRST, \
|
||||
XBMC_UPDATE_LIBRARY, XBMC_HOST, XBMC_USERNAME, XBMC_PASSWORD, BACKLOG_FREQUENCY, \
|
||||
USE_KODI, KODI_ALWAYS_ON, KODI_NOTIFY_ONSNATCH, KODI_NOTIFY_ONDOWNLOAD, KODI_NOTIFY_ONSUBTITLEDOWNLOAD, KODI_UPDATE_FULL, KODI_UPDATE_ONLYFIRST, KODI_UPDATE_LIBRARY, KODI_HOST, KODI_USERNAME, KODI_PASSWORD, \
|
||||
USE_TRAKT, TRAKT_CONNECTED_ACCOUNT, TRAKT_ACCOUNTS, TRAKT_VERIFY, TRAKT_REMOVE_WATCHLIST, TRAKT_TIMEOUT, TRAKT_USE_WATCHLIST, TRAKT_METHOD_ADD, TRAKT_START_PAUSED, traktCheckerScheduler, TRAKT_SYNC, TRAKT_DEFAULT_INDEXER, TRAKT_REMOVE_SERIESLIST, TRAKT_UPDATE_COLLECTION, \
|
||||
USE_TRAKT, TRAKT_CONNECTED_ACCOUNT, TRAKT_ACCOUNTS, TRAKT_MRU, TRAKT_VERIFY, TRAKT_REMOVE_WATCHLIST, TRAKT_TIMEOUT, TRAKT_USE_WATCHLIST, TRAKT_METHOD_ADD, TRAKT_START_PAUSED, traktCheckerScheduler, TRAKT_SYNC, TRAKT_DEFAULT_INDEXER, TRAKT_REMOVE_SERIESLIST, TRAKT_UPDATE_COLLECTION, \
|
||||
USE_PLEX, PLEX_NOTIFY_ONSNATCH, PLEX_NOTIFY_ONDOWNLOAD, PLEX_NOTIFY_ONSUBTITLEDOWNLOAD, PLEX_UPDATE_LIBRARY, \
|
||||
PLEX_SERVER_HOST, PLEX_HOST, PLEX_USERNAME, PLEX_PASSWORD, DEFAULT_BACKLOG_FREQUENCY, MIN_BACKLOG_FREQUENCY, MAX_BACKLOG_FREQUENCY, BACKLOG_STARTUP, SKIP_REMOVED_FILES, \
|
||||
showUpdateScheduler, __INITIALIZED__, LAUNCH_BROWSER, TRASH_REMOVE_SHOW, TRASH_ROTATE_LOGS, HOME_SEARCH_FOCUS, SORT_ARTICLE, showList, loadingShowList, UPDATE_SHOWS_ON_START, SHOW_UPDATE_HOUR, ALLOW_INCOMPLETE_SHOWDATA, \
|
||||
|
|
@ -886,6 +887,7 @@ def initialize(consoleLogging=True):
|
|||
TRAKT_DEFAULT_INDEXER = check_setting_int(CFG, 'Trakt', 'trakt_default_indexer', 1)
|
||||
TRAKT_UPDATE_COLLECTION = trakt_helpers.read_config_string(check_setting_str(CFG, 'Trakt', 'trakt_update_collection', ''))
|
||||
TRAKT_ACCOUNTS = TraktAPI.read_config_string(check_setting_str(CFG, 'Trakt', 'trakt_accounts', ''))
|
||||
TRAKT_MRU = check_setting_str(CFG, 'Trakt', 'trakt_mru', '')
|
||||
|
||||
CheckSection(CFG, 'pyTivo')
|
||||
USE_PYTIVO = bool(check_setting_int(CFG, 'pyTivo', 'use_pytivo', 0))
|
||||
|
|
@ -1701,6 +1703,7 @@ def save_config():
|
|||
new_config['Trakt']['trakt_default_indexer'] = int(TRAKT_DEFAULT_INDEXER)
|
||||
new_config['Trakt']['trakt_update_collection'] = trakt_helpers.build_config_string(TRAKT_UPDATE_COLLECTION)
|
||||
new_config['Trakt']['trakt_accounts'] = TraktAPI.build_config_string(TRAKT_ACCOUNTS)
|
||||
new_config['Trakt']['trakt_mru'] = TRAKT_MRU
|
||||
|
||||
new_config['pyTivo'] = {}
|
||||
new_config['pyTivo']['use_pytivo'] = int(USE_PYTIVO)
|
||||
|
|
|
|||
|
|
@ -2130,7 +2130,8 @@ class NewHomeAddShows(Home):
|
|||
search_id = ''
|
||||
try:
|
||||
search_id = re.search(r'(?m)((?:tt\d{4,})|^\d{4,}$)', search_term).group(1)
|
||||
resp = self.getTrakt('/search?id_type=%s&id=%s' % (('tvdb', 'imdb')['tt' in search_id], search_id))[0]
|
||||
resp = [r for r in self.getTrakt('/search?id_type=%s&id=%s' % (('tvdb', 'imdb')['tt' in search_id],
|
||||
search_id)) if 'show' == r['type']][0]
|
||||
search_term = resp['show']['title']
|
||||
indexer_id = resp['show']['ids']['tvdb']
|
||||
except:
|
||||
|
|
@ -2427,7 +2428,7 @@ class NewHomeAddShows(Home):
|
|||
ids=ids,
|
||||
premiered=dt_ordinal,
|
||||
premiered_str=dt_string,
|
||||
when_past=dt_ordinal < datetime.datetime.now().toordinal(), # air time not yet available 16.11.2015
|
||||
when_past=dt_ordinal < datetime.datetime.now().toordinal(), # air time not poss. 16.11.2015
|
||||
title=title.strip(),
|
||||
images=images,
|
||||
url_src_db='http://anidb.net/perl-bin/animedb.pl?show=anime&aid=%s' % ids['anidb'],
|
||||
|
|
@ -2512,11 +2513,13 @@ class NewHomeAddShows(Home):
|
|||
filtered.append(dict(
|
||||
premiered=dt_ordinal,
|
||||
premiered_str=year or 'No year',
|
||||
when_past=dt_ordinal < datetime.datetime.now().toordinal(), # air time not yet available 16.11.2015
|
||||
genres='No genre yet' if not len(genres) else genres[0].get_text().lower().replace(' |', ','),
|
||||
when_past=dt_ordinal < datetime.datetime.now().toordinal(), # air time not poss. 16.11.2015
|
||||
genres=('No genre yet' if not len(genres) else
|
||||
genres[0].get_text().lower().replace(' |', ',')),
|
||||
ids=ids,
|
||||
images=images,
|
||||
overview='No overview yet' if not len(overview) else re.sub(r'[\"\']+', r'', overview[0].get_text()[:250:].strip()),
|
||||
overview=('No overview yet' if not len(overview) else
|
||||
self.encode_html(overview[0].get_text()[:250:].strip())),
|
||||
rating=0 if not len(rating) else int(float(rating[0].get_text()) * 10),
|
||||
title=tr.select('td.title a')[0].get_text().strip(),
|
||||
url_src_db='http://www.imdb.com/%s/' % url_path,
|
||||
|
|
@ -2542,51 +2545,71 @@ class NewHomeAddShows(Home):
|
|||
return self.newShow('|'.join(['', '', '', re.search('(?i)tt\d+$', indexer_id) and indexer_id or showName]),
|
||||
use_show_name=True)
|
||||
|
||||
def traktTrending(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt('shows/trending?limit=%s&' % 100, 'Trending at Trakt', mode='trending')
|
||||
|
||||
def traktPopular(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt('shows/popular?limit=%s&' % 100, 'Popular at Trakt', mode='popular')
|
||||
|
||||
def traktWatched(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt('shows/watched/monthly?limit=%s&' % 100, 'Most watched at Trakt during the last month', mode='watched')
|
||||
|
||||
def traktCollected(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt('shows/collected/monthly?limit=%s&' % 100, 'Most collected at Trakt during the last month', mode='collected')
|
||||
|
||||
def traktAnticipated(self, *args, **kwargs):
|
||||
def trakt_anticipated(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt('shows/anticipated?limit=%s&' % 100, 'Anticipated at Trakt', mode='anticipated')
|
||||
|
||||
def traktRecommended(self, *args, **kwargs):
|
||||
def trakt_newseasons(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt(
|
||||
'/calendars/all/shows/premieres/%s/%s?' % (sbdatetime.sbdatetime.sbfdate(
|
||||
dt=datetime.datetime.now() + datetime.timedelta(days=-16), d_preset='%Y-%m-%d'), 32),
|
||||
'Season premieres at Trakt',
|
||||
mode='newseasons', footnote='Note; Expect default placeholder images in this list')
|
||||
|
||||
def trakt_newshows(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt(
|
||||
'/calendars/all/shows/new/%s/%s?' % (sbdatetime.sbdatetime.sbfdate(
|
||||
dt=datetime.datetime.now() + datetime.timedelta(days=-16), d_preset='%Y-%m-%d'), 32),
|
||||
'Brand-new shows at Trakt',
|
||||
mode='newshows', footnote='Note; Expect default placeholder images in this list')
|
||||
|
||||
def trakt_popular(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt('shows/popular?limit=%s&' % 100, 'Popular at Trakt', mode='popular')
|
||||
|
||||
def trakt_trending(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt('shows/trending?limit=%s&' % 100, 'Trending at Trakt', mode='trending',
|
||||
footnote='Tip: For more Trakt, use "Show" near the top of this view')
|
||||
|
||||
def trakt_watched(self, *args, **kwargs):
|
||||
|
||||
return self.trakt_action('watch', args, **kwargs)
|
||||
|
||||
def trakt_played(self, *args, **kwargs):
|
||||
|
||||
return self.trakt_action('play', args, **kwargs)
|
||||
|
||||
def trakt_collected(self, *args, **kwargs):
|
||||
|
||||
return self.trakt_action('collect', args, **kwargs)
|
||||
|
||||
def trakt_action(self, action, *args, **kwargs):
|
||||
|
||||
cycle, desc, ext = (('month', 'month', ''), ('year', '12 months', '-year'))['year' == kwargs.get('period', '')]
|
||||
return self.browse_trakt('shows/%sed/%sly?limit=%s&' % (action, cycle, 100),
|
||||
'Most %sed at Trakt during the last %s' % (action, desc),
|
||||
mode='%sed%s' % (action, ext))
|
||||
|
||||
def trakt_recommended(self, *args, **kwargs):
|
||||
|
||||
if 'add' == kwargs.get('action'):
|
||||
return self.redirect('/config/notifications/#tabs-3')
|
||||
|
||||
account = sickbeard.helpers.tryInt(kwargs.get('account'), None)
|
||||
try:
|
||||
name = sickbeard.TRAKT_ACCOUNTS[account].name
|
||||
except KeyError:
|
||||
return self.traktDefault()
|
||||
return self.browse_trakt('recommendations/shows?limit=%s&' % 100,
|
||||
'Recommended for <b class="grey-text">%s</b> by Trakt' % name, mode='recommended-%s' % account, send_oauth=account)
|
||||
return self.trakt_default()
|
||||
return self.browse_trakt(
|
||||
'recommendations/shows?limit=%s&' % 100, 'Recommended for <b class="grey-text">%s</b> by Trakt' % name,
|
||||
mode='recommended-%s' % account, send_oauth=account)
|
||||
|
||||
def traktNewShows(self, *args, **kwargs):
|
||||
def trakt_default(self):
|
||||
|
||||
return self.browse_trakt('/calendars/all/shows/new/%s/%s?' % (sbdatetime.sbdatetime.sbfdate(
|
||||
dt=datetime.datetime.now() + datetime.timedelta(days=-16), d_preset='%Y-%m-%d'), 32), 'Brand-new shows at Trakt',
|
||||
mode='newshows', footnote='Note; Expect default placeholder images in this list')
|
||||
|
||||
def traktNewSeasons(self, *args, **kwargs):
|
||||
|
||||
return self.browse_trakt('/calendars/all/shows/premieres/%s/%s?' % (sbdatetime.sbdatetime.sbfdate(
|
||||
dt=datetime.datetime.now() + datetime.timedelta(days=-16), d_preset='%Y-%m-%d'), 32), 'Season premieres at Trakt',
|
||||
mode='newseasons', footnote='Note; Expect default placeholder images in this list')
|
||||
|
||||
def traktDefault(self):
|
||||
|
||||
return self.redirect('/home/addShows/traktTrending/')
|
||||
return self.redirect('/home/addShows/%s' % ('trakt_trending', sickbeard.TRAKT_MRU)[any(sickbeard.TRAKT_MRU)])
|
||||
|
||||
def browse_trakt(self, url_path, browse_title, *args, **kwargs):
|
||||
|
||||
|
|
@ -2627,6 +2650,11 @@ class NewHomeAddShows(Home):
|
|||
oldest = None
|
||||
newest = None
|
||||
for item in normalised:
|
||||
ignore = '''
|
||||
((bbc|channel\s*?5.*?|itv)\s*?(drama|documentaries))|bbc\s*?(comedy|music)|music\s*?specials|tedtalks
|
||||
'''
|
||||
if re.search(ignore, item['show']['title'].strip(), re.I | re.X):
|
||||
continue
|
||||
try:
|
||||
dt = dateutil.parser.parse(item['show']['first_aired'])
|
||||
dt_ordinal = dt.toordinal()
|
||||
|
|
@ -2642,14 +2670,17 @@ class NewHomeAddShows(Home):
|
|||
premiered_str=dt_string,
|
||||
when_past=dt_ordinal < datetime.datetime.now().toordinal(), # air time not yet available 16.11.2015
|
||||
episode_number='' if 'episode' not in item else item['episode']['number'] or 1,
|
||||
episode_overview='' if 'episode' not in item else item['episode']['overview'] or '',
|
||||
episode_overview=('' if 'episode' not in item else
|
||||
self.encode_html(item['episode']['overview'][:250:].strip()) or ''),
|
||||
episode_season='' if 'episode' not in item else item['episode']['season'] or 1,
|
||||
genres='' if 'genres' not in item['show'] else ', '.join(['%s' % v for v in item['show']['genres']]),
|
||||
genres=('' if 'genres' not in item['show'] else
|
||||
', '.join(['%s' % v for v in item['show']['genres']])),
|
||||
ids=item['show']['ids'],
|
||||
images='' if 'images' not in item['show'] else item['show']['images'],
|
||||
overview='' if 'overview' not in item['show'] or None is item['show']['overview'] else re.sub(
|
||||
r'[\"\']+', '', item['show']['overview'][:250:].strip()),
|
||||
rating='0' if 'rating' not in item['show'] else '%.2f' % (item['show']['rating'] * 10),
|
||||
overview=('' if 'overview' not in item['show'] or None is item['show']['overview'] else
|
||||
self.encode_html(item['show']['overview'][:250:].strip())),
|
||||
rating=0 < item['show'].get('rating', 0) and
|
||||
('%.2f' % (item['show'].get('rating') * 10)).replace('.00', '') or 0,
|
||||
title=item['show']['title'].strip(),
|
||||
url_src_db='https://trakt.tv/shows/%s' % item['show']['ids']['slug'],
|
||||
url_tvdb=('', '%s%s' % (sickbeard.indexerApi(INDEXER_TVDB).config['show_url'],
|
||||
|
|
@ -2660,8 +2691,24 @@ class NewHomeAddShows(Home):
|
|||
pass
|
||||
|
||||
kwargs.update(dict(oldest=oldest, newest=newest, error_msg=error_msg))
|
||||
|
||||
if 'recommended' not in kwargs.get('mode', ''):
|
||||
mode = kwargs.get('mode', '').split('-')
|
||||
if mode:
|
||||
func = 'trakt_%s' % mode[0]
|
||||
if callable(getattr(self, func, None)):
|
||||
param = '' if 1 == len(mode) or mode[1] not in ['year', 'month', 'week', 'all'] else \
|
||||
'?period=' + mode[1]
|
||||
sickbeard.TRAKT_MRU = '%s%s' % (func, param)
|
||||
sickbeard.save_config()
|
||||
return self.browse_shows(browse_type, browse_title, filtered, **kwargs)
|
||||
|
||||
@staticmethod
|
||||
def encode_html(text):
|
||||
|
||||
return re.sub(r'\r?\n', '<br />', text.replace('"', '"').replace("'", ''').replace('&', '&')
|
||||
.replace('<', '<').replace('>', '>'))
|
||||
|
||||
def addTraktShow(self, indexer_id, showName):
|
||||
|
||||
if not helpers.findCertainShow(sickbeard.showList, config.to_int(indexer_id, '')):
|
||||
|
|
|
|||
Loading…
Reference in a new issue