diff --git a/gui/slick/js/new/home.js b/gui/slick/js/new/home.js index 6a2a00ea34530d9bdd9bfc53cb4907fa0cb55e20..85f0842be47dc4b86a2a2c96f05408111ef90902 100644 --- a/gui/slick/js/new/home.js +++ b/gui/slick/js/new/home.js @@ -7,7 +7,7 @@ $.tablesorter.addParser({ if (s.indexOf('Loading...') == 0) return s.replace('Loading...','000'); else - return ($('meta[data-var="sickbeard.SORT_ARTICLE"]').data('content') == 'False' ? (s || '') : (s || '').replace(/^(The|A|An)\s/i,'')); + return ($('meta[data-var="sickbeard.SORT_ARTICLE"]').data('content') == 'True' ? (s || '') : (s || '').replace(/^(The|A|An)\s/i,'')); }, type: 'text' }); @@ -331,7 +331,7 @@ $(document).ready(function(){ getSortData: { name: function( itemElem ) { var name = $( itemElem ).attr('data-name'); - return ($('meta[data-var="sickbeard.SORT_ARTICLE"]').data('content') == 'False' ? (name || '') : (name || '').replace(/^(The|A|An)\s/i,'')); + return ($('meta[data-var="sickbeard.SORT_ARTICLE"]').data('content') == 'True' ? (name || '') : (name || '').replace(/^(The|A|An)\s/i,'')); }, network: '[data-network]', date: function( itemElem ) { diff --git a/gui/slick/views/home.mako b/gui/slick/views/home.mako index a70a6dcd4d855c3f24d866c4eac858d4e6ddc8e5..38c2b76c763d669bd5c48f22c161e4b1282d28bf 100644 --- a/gui/slick/views/home.mako +++ b/gui/slick/views/home.mako @@ -66,7 +66,7 @@ <div id="HomeLayout" class="pull-right hidden-print" style="margin-top: -40px;"> % if layout != 'poster': - <button id="popover" type="button" class="btn btn-inline">Select Column</button> + <button id="popover" type="button" class="btn btn-inline">Select Column <b class="caret"></b></button> % endif <span> Layout: <select name="layout" class="form-control form-control-inline input-sm" onchange="location = this.options[this.selectedIndex].value;"> diff --git a/sickbeard/providers/nextgen.py b/sickbeard/providers/nextgen.py index ed4420d58a035b47f7a433fd02737cd447d4b982..8c59ee1e7823be78c2cbcc81c725bbc948c66b38 100644 --- a/sickbeard/providers/nextgen.py +++ b/sickbeard/providers/nextgen.py @@ -50,12 +50,12 @@ class NextGenProvider(generic.TorrentProvider): self.cache = NextGenCache(self) - self.urls = {'base_url': 'https://nxtgn.org/', - 'search': 'https://nxtgn.org/browse.php?search=%s&cat=0&incldead=0&modes=%s', - 'login_page': 'https://nxtgn.org/login.php', - 'detail': 'https://nxtgn.org/details.php?id=%s', - 'download': 'https://nxtgn.org/download.php?id=%s', - 'takelogin': 'https://nxtgn.org/takelogin.php?csrf=', + self.urls = {'base_url': 'https://nxgn.org/', + 'search': 'https://nxgn.org/browse.php?search=%s&cat=0&incldead=0&modes=%s', + 'login_page': 'https://nxgn.org/login.php', + 'detail': 'https://nxgn.org/details.php?id=%s', + 'download': 'https://nxgn.org/download.php?id=%s', + 'takelogin': 'https://nxgn.org/takelogin.php?csrf=', } self.url = self.urls['base_url'] diff --git a/sickrage/show/ComingEpisodes.py b/sickrage/show/ComingEpisodes.py index 2077fe564eeb9cd4ad1cf1d2eaa7f6be94b58bcb..cb80c604fc10bc90b704231367f4c7b374a2f73d 100644 --- a/sickrage/show/ComingEpisodes.py +++ b/sickrage/show/ComingEpisodes.py @@ -65,11 +65,11 @@ class ComingEpisodes: recently = (date.today() - timedelta(days=sickbeard.COMING_EPS_MISSED_RANGE)).toordinal() qualities_list = Quality.DOWNLOADED + Quality.SNATCHED + Quality.ARCHIVED + [IGNORED] + db = DBConnection() fields_to_select = ', '.join( ['airdate', 'airs', 'description', 'episode', 'imdb_id', 'e.indexer', 'indexer_id', 'name', 'network', 'paused', 'quality', 'runtime', 'season', 'show_name', 'showid', 's.status'] ) - db = DBConnection(row_type='dict') results = db.select( 'SELECT %s ' % fields_to_select + 'FROM tv_episodes e, tv_shows s ' @@ -113,6 +113,8 @@ class ComingEpisodes: [today, recently, WANTED] + qualities_list ) + results = [dict(result) for result in results] + for index, item in enumerate(results): results[index]['localtime'] = sbdatetime.convert_to_setting( parse_date_time(item['airdate'], item['airs'], item['network'])) diff --git a/sickrage/show/Show.py b/sickrage/show/Show.py index fadd77ee24d0eace6255fa74689d24365773331f..4784fa0a60095add8159ba8608b5ad5ed1c4e5e1 100644 --- a/sickrage/show/Show.py +++ b/sickrage/show/Show.py @@ -18,7 +18,6 @@ import sickbeard -from sickbeard import showQueueScheduler from sickbeard.exceptions import CantRefreshException, CantRemoveException, ex, MultipleShowObjectsException from sickbeard.helpers import findCertainShow @@ -44,7 +43,7 @@ class Show: return error, show try: - showQueueScheduler.action.removeShow(show, bool(remove_files)) + sickbeard.showQueueScheduler.action.removeShow(show, bool(remove_files)) except CantRemoveException as exception: return ex(exception), show @@ -91,7 +90,7 @@ class Show: return error, show try: - showQueueScheduler.action.refreshShow(show) + sickbeard.showQueueScheduler.action.refreshShow(show) except CantRefreshException as exception: return ex(exception), show