diff --git a/sickrage/show/ComingEpisodes.py b/sickrage/show/ComingEpisodes.py index 68d9b083a97b6174fff24ba7869397b459b86357..55a5f6292445ed168c3598c3ae165a2d0b96c4ec 100644 --- a/sickrage/show/ComingEpisodes.py +++ b/sickrage/show/ComingEpisodes.py @@ -60,64 +60,61 @@ class ComingEpisodes: today = date.today().toordinal() next_week = (date.today() + timedelta(days=7)).toordinal() recently = (date.today() - timedelta(days=sickbeard.COMING_EPS_MISSED_RANGE)).toordinal() - qualities_list = Quality.DOWNLOADED + Quality.SNATCHED + Quality.SNATCHED_BEST + Quality.SNATCHED_PROPER + Quality.ARCHIVED + [ - IGNORED] + qualities_list = Quality.DOWNLOADED + Quality.SNATCHED + Quality.SNATCHED_BEST + Quality.SNATCHED_PROPER + 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'] + ['airdate', 'airs', 'description', 'episode', 'imdb_id', 'e.indexer', 'indexer_id', 'name', 'network', + 'paused', 'quality', 'runtime', 'season', 'show_name', 'showid', 's.status'] ) results = db.select( - 'SELECT %s ' % fields_to_select + - 'FROM tv_episodes e, tv_shows s ' - 'WHERE season != 0 ' - 'AND airdate >= ? ' - 'AND airdate < ? ' - 'AND s.indexer_id = e.showid ' - 'AND e.status NOT IN (' + ','.join(['?'] * len(qualities_list)) + ')', - [today, next_week] + qualities_list + 'SELECT %s ' % fields_to_select + + 'FROM tv_episodes e, tv_shows s ' + 'WHERE season != 0 ' + 'AND airdate >= ? ' + 'AND airdate < ? ' + 'AND s.indexer_id = e.showid ' + 'AND e.status NOT IN (' + ','.join(['?'] * len(qualities_list)) + ')', + [today, next_week] + qualities_list ) done_shows_list = [int(result['showid']) for result in results] placeholder = ','.join(['?'] * len(done_shows_list)) - placeholder2 = ','.join( - ['?'] * len(Quality.DOWNLOADED + Quality.SNATCHED + Quality.SNATCHED_BEST + Quality.SNATCHED_PROPER)) + placeholder2 = ','.join(['?'] * len(Quality.DOWNLOADED + Quality.SNATCHED + Quality.SNATCHED_BEST + Quality.SNATCHED_PROPER)) results += db.select( - 'SELECT %s ' % fields_to_select + - 'FROM tv_episodes e, tv_shows s ' - 'WHERE season != 0 ' - 'AND showid NOT IN (' + placeholder + ') ' - 'AND s.indexer_id = e.showid ' - 'AND airdate = (SELECT airdate ' - 'FROM tv_episodes inner_e ' - 'WHERE inner_e.season != 0 ' - 'AND inner_e.showid = e.showid ' - 'AND inner_e.airdate >= ? ' - 'ORDER BY inner_e.airdate ASC LIMIT 1) ' - 'AND e.status NOT IN (' + placeholder2 + ')', - done_shows_list + [ - next_week] + Quality.DOWNLOADED + Quality.SNATCHED + Quality.SNATCHED_BEST + Quality.SNATCHED_PROPER + 'SELECT %s ' % fields_to_select + + 'FROM tv_episodes e, tv_shows s ' + 'WHERE season != 0 ' + 'AND showid NOT IN (' + placeholder + ') ' + 'AND s.indexer_id = e.showid ' + 'AND airdate = (SELECT airdate ' + 'FROM tv_episodes inner_e ' + 'WHERE inner_e.season != 0 ' + 'AND inner_e.showid = e.showid ' + 'AND inner_e.airdate >= ? ' + 'ORDER BY inner_e.airdate ASC LIMIT 1) ' + 'AND e.status NOT IN (' + placeholder2 + ')', + done_shows_list + [next_week] + Quality.DOWNLOADED + Quality.SNATCHED + Quality.SNATCHED_BEST + Quality.SNATCHED_PROPER ) results += db.select( - 'SELECT %s ' % fields_to_select + - 'FROM tv_episodes e, tv_shows s ' - 'WHERE season != 0 ' - 'AND s.indexer_id = e.showid ' - 'AND airdate < ? ' - 'AND airdate >= ? ' - 'AND e.status IN (?,?) ' - 'AND e.status NOT IN (' + ','.join(['?'] * len(qualities_list)) + ')', - [today, recently, WANTED, UNAIRED] + qualities_list + 'SELECT %s ' % fields_to_select + + 'FROM tv_episodes e, tv_shows s ' + 'WHERE season != 0 ' + 'AND s.indexer_id = e.showid ' + 'AND airdate < ? ' + 'AND airdate >= ? ' + 'AND e.status IN (?,?) ' + 'AND e.status NOT IN (' + ','.join(['?'] * len(qualities_list)) + ')', + [today, recently, WANTED, UNAIRED] + 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'])) + parse_date_time(item['airdate'], item['airs'], item['network'])) results.sort(ComingEpisodes.sorts[sort]) diff --git a/sickrage/show/History.py b/sickrage/show/History.py index 021070deb0d7fadfc19001029e26e5b9ac2c22a1..c015da8a8d420fe4f134205b52b3a30a5a037b0f 100644 --- a/sickrage/show/History.py +++ b/sickrage/show/History.py @@ -33,9 +33,9 @@ class History: Clear all the history """ self.db.action( - 'DELETE ' - 'FROM history ' - 'WHERE 1 = 1' + 'DELETE ' + 'FROM history ' + 'WHERE 1 = 1' ) def get(self, limit=100, action=None): @@ -88,10 +88,10 @@ class History: """ self.db.action( - 'DELETE ' - 'FROM history ' - 'WHERE date < ?', - [(datetime.today() - timedelta(days=30)).strftime(History.date_format)] + 'DELETE ' + 'FROM history ' + 'WHERE date < ?', + [(datetime.today() - timedelta(days=30)).strftime(History.date_format)] ) @staticmethod diff --git a/sickrage/show/Show.py b/sickrage/show/Show.py index ac5507742dbe2819b2e0a18700bdc4fd5d7d90de..a6824fc05054be5fdad8517d8cc0a644465bf02b 100644 --- a/sickrage/show/Show.py +++ b/sickrage/show/Show.py @@ -64,11 +64,11 @@ class Show: total_status = [SKIPPED, WANTED] results = db.select( - 'SELECT airdate, status ' - 'FROM tv_episodes ' - 'WHERE season > 0 ' - 'AND episode > 0 ' - 'AND airdate > 1' + 'SELECT airdate, status ' + 'FROM tv_episodes ' + 'WHERE season > 0 ' + 'AND episode > 0 ' + 'AND airdate > 1' ) stats = {