From 955cf4641dcf8ba38e475bca1102a5e8689eb015 Mon Sep 17 00:00:00 2001
From: Vince Valenti <vince@blue-box.net>
Date: Tue, 24 Nov 2015 18:31:15 -0800
Subject: [PATCH] Enable FILTER_ROW all the time and remove option

---
 gui/slick/js/core.js                | 171 ++++++++++++----------------
 gui/slick/js/core.min.js            | Bin 58677 -> 58312 bytes
 gui/slick/views/apiBuilder.mako     |   1 -
 gui/slick/views/config_general.mako |  12 --
 gui/slick/views/layouts/main.mako   |   1 -
 sickbeard/__init__.py               |   5 +-
 sickbeard/webserve.py               |   3 +-
 7 files changed, 73 insertions(+), 120 deletions(-)

diff --git a/gui/slick/js/core.js b/gui/slick/js/core.js
index 14c44f81e..5d2ff52f9 100644
--- a/gui/slick/js/core.js
+++ b/gui/slick/js/core.js
@@ -1786,95 +1786,75 @@ var SICKRAGE = {
                     6: function(node) { return $(node).find("img").attr("alt"); }
                 },
                 widgets: ['saveSort', 'zebra', 'stickyHeaders', 'filter', 'columnSelector'],
-                headers: (function(){
-                    if(metaToBool('sickbeard.FILTER_ROW')){
-                        return {
-                            0: { sorter: 'realISODate' },
-                            1: { sorter: 'realISODate' },
-                            2: { sorter: 'loadingNames' },
-                            4: { sorter: 'quality' },
-                            5: { sorter: 'eps' },
-                            6: { filter : 'parsed' }
-                        };
-                    } else {
-                        return {
-                            0: { sorter: 'realISODate' },
-                            1: { sorter: 'realISODate' },
-                            2: { sorter: 'loadingNames' },
-                            4: { sorter: 'quality' },
-                            5: { sorter: 'eps' }
-                        };
-                    }
-                }()),
-                widgetOptions: (function(){
-                    if(metaToBool('sickbeard.FILTER_ROW')){
-                        return {
-                            filter_columnFilters: true, // jshint ignore:line
-                            filter_hideFilters : true, // jshint ignore:line
-                            filter_saveFilters : true, // jshint ignore:line
-                            filter_functions : { // jshint ignore:line
-                                5:function(e, n, f) {
-                                    var test = false;
-                                    var pct = Math.floor((n % 1) * 1000);
-                                    if (f === '') {
-                                        test = true;
-                                    } else {
-                                        var result = f.match(/(<|<=|>=|>)\s(\d+)/i);
-                                        if (result) {
-                                            if (result[1] === "<") {
-                                                if (pct < parseInt(result[2])) {
-                                                    test = true;
-                                                }
-                                            } else if (result[1] === "<=") {
-                                                if (pct <= parseInt(result[2])) {
-                                                    test = true;
-                                                }
-                                            } else if (result[1] === ">=") {
-                                                if (pct >= parseInt(result[2])) {
-                                                    test = true;
-                                                }
-                                            } else if (result[1] === ">") {
-                                                if (pct > parseInt(result[2])) {
-                                                    test = true;
-                                                }
-                                            }
+                headers: {
+                    0: { sorter: 'realISODate' },
+                    1: { sorter: 'realISODate' },
+                    2: { sorter: 'loadingNames' },
+                    4: { sorter: 'quality' },
+                    5: { sorter: 'eps' },
+                    6: { filter: 'parsed' }
+                },
+                widgetOptions: {
+                    filter_columnFilters: true, // jshint ignore:line
+                    filter_hideFilters: true, // jshint ignore:line
+                    filter_saveFilters: true, // jshint ignore:line
+                    filter_functions: { // jshint ignore:line
+                        5: function(e, n, f) {
+                            var test = false;
+                            var pct = Math.floor((n % 1) * 1000);
+                            if (f === '') {
+                                test = true;
+                            } else {
+                                var result = f.match(/(<|<=|>=|>)\s(\d+)/i);
+                                if (result) {
+                                    if (result[1] === "<") {
+                                        if (pct < parseInt(result[2])) {
+                                            test = true;
                                         }
-
-                                        result = f.match(/(\d+)\s(-|to)\s(\d+)/i);
-                                        if (result) {
-                                            if ((result[2] === "-") || (result[2] === "to")) {
-                                                if ((pct >= parseInt(result[1])) && (pct <= parseInt(result[3]))) {
-                                                    test = true;
-                                                }
-                                            }
+                                    } else if (result[1] === "<=") {
+                                        if (pct <= parseInt(result[2])) {
+                                            test = true;
+                                        }
+                                    } else if (result[1] === ">=") {
+                                        if (pct >= parseInt(result[2])) {
+                                            test = true;
+                                        }
+                                    } else if (result[1] === ">") {
+                                        if (pct > parseInt(result[2])) {
+                                            test = true;
                                         }
+                                    }
+                                }
 
-                                        result = f.match(/(=)?\s?(\d+)\s?(=)?/i);
-                                        if (result) {
-                                            if ((result[1] === "=") || (result[3] === "=")) {
-                                                if (parseInt(result[2]) === pct) {
-                                                    test = true;
-                                                }
-                                            }
+                                result = f.match(/(\d+)\s(-|to)\s(\d+)/i);
+                                if (result) {
+                                    if ((result[2] === "-") || (result[2] === "to")) {
+                                        if ((pct >= parseInt(result[1])) && (pct <= parseInt(result[3]))) {
+                                            test = true;
                                         }
+                                    }
+                                }
 
-                                        if (!isNaN(parseFloat(f)) && isFinite(f)) {
-                                            if (parseInt(f) === pct) {
-                                                test = true;
-                                            }
+                                result = f.match(/(=)?\s?(\d+)\s?(=)?/i);
+                                if (result) {
+                                    if ((result[1] === "=") || (result[3] === "=")) {
+                                        if (parseInt(result[2]) === pct) {
+                                            test = true;
                                         }
                                     }
-                                    return test;
                                 }
-                            },
-                            'columnSelector_mediaquery': false
-                        };
-                    } else {
-                        return {
-                            'filter_columnFilters': false
-                        };
-                    }
-                }()),
+
+                                if (!isNaN(parseFloat(f)) && isFinite(f)) {
+                                    if (parseInt(f) === pct) {
+                                        test = true;
+                                    }
+                                }
+                            }
+                            return test;
+                        }
+                    },
+                    'columnSelector_mediaquery': false
+                },
                 sortStable: true,
                 sortAppend: [[2,0]]
             });
@@ -2102,7 +2082,7 @@ var SICKRAGE = {
                     'sceneSeason': sceneSeason,
                     'sceneEpisode': sceneEpisode
                 }, function(data) {
-                    //	Set the values we get back
+                    // Set the values we get back
                     if (data.sceneSeason === null || data.sceneEpisode === null) {
                         $('#sceneSeasonXEpisode_' + showId + '_' + forSeason + '_' + forEpisode).val('');
                     } else {
@@ -2132,7 +2112,7 @@ var SICKRAGE = {
                     'sceneAbsolute': sceneAbsolute
                 },
                 function(data) {
-                    //	Set the values we get back
+                    // Set the values we get back
                     if (data.sceneAbsolute === null) {
                         $('#sceneAbsolute_' + showId + '_' + forAbsolute).val('');
                     } else {
@@ -2149,7 +2129,7 @@ var SICKRAGE = {
             }
 
             $('.sceneSeasonXEpisode').on('change', function() {
-                //	Strip non-numeric characters
+                // Strip non-numeric characters
                 $(this).val($(this).val().replace(/[^0-9xX]*/g, ''));
                 var forSeason = $(this).attr('data-for-season');
                 var forEpisode = $(this).attr('data-for-episode');
@@ -2163,7 +2143,7 @@ var SICKRAGE = {
             });
 
             $('.sceneAbsolute').on('change', function() {
-                //	Strip non-numeric characters
+                // Strip non-numeric characters
                 $(this).val($(this).val().replace(/[^0-9xX]*/g, ''));
                 var forAbsolute = $(this).attr('data-for-absolute');
 
@@ -2586,21 +2566,12 @@ var SICKRAGE = {
                         8: { sorter: false },
                         9: { sorter: false }
                     },
-                    widgetOptions: (function() {
-                        if (metaToBool('sickbeard.FILTER_ROW')) {
-                            return {
-                                'filter_columnFilters': true,
-                                'filter_hideFilters': true,
-                                'filter_saveFilters': true,
-                                'columnSelector_mediaquery': false
-                            };
-                        } else {
-                            return {
-                                'filter_columnFilters': false,
-                                'columnSelector_mediaquery': false
-                            };
-                        }
-                    }())
+                    widgetOptions: {
+                        'filter_columnFilters': true,
+                        'filter_hideFilters': true,
+                        'filter_saveFilters': true,
+                        'columnSelector_mediaquery': false
+                    }
                 });
 
                 $('#srRoot').ajaxEpSearch();
diff --git a/gui/slick/js/core.min.js b/gui/slick/js/core.min.js
index f94c4882cf85b4fc8d0e8c1f6b1e145298317339..a5daff128c9329d2a48a4561d927926515b33c41 100644
GIT binary patch
delta 71
zcmdmbiuuHG<_*?MC*L~3J-K>m4WCYVW=eW$iGM*!W`17rWZj1nn@=t)VA>qE(!qSP
d-b3-pCzt6>7I-MjT&t-wId+rO=9Y&WnE|G>AR7Px

delta 253
zcmX?coO$ah<_*?MCm+8dq@0^tk{FWjl%JoYp;VlioSl@KSd^mY=IImS8WbPoAFiZn
zKl$Umh{<|4IVaCqsy6w<y+|lq(4)3iLsO?bGbKH>#J`{<Ge57`Dy=jx8N|}itS(9|
zDJ{xVAi{#p7nim(O}?;Hg4GaY<mQMK4(6t0nKb$0QrF3M@5_P=V>Fz6=e|6vhGwm%
P&gA%wQk%seY-9!iQlev*

diff --git a/gui/slick/views/apiBuilder.mako b/gui/slick/views/apiBuilder.mako
index c174c1b58..a1aa2b7ae 100644
--- a/gui/slick/views/apiBuilder.mako
+++ b/gui/slick/views/apiBuilder.mako
@@ -34,7 +34,6 @@
     <meta data-var="sickbeard.COMING_EPS_LAYOUT" data-content="${sickbeard.COMING_EPS_LAYOUT}">
     <meta data-var="sickbeard.COMING_EPS_SORT" data-content="${sickbeard.COMING_EPS_SORT}">
     <meta data-var="sickbeard.DATE_PRESET" data-content="${sickbeard.DATE_PRESET}">
-    <meta data-var="sickbeard.FILTER_ROW" data-content="${sickbeard.FILTER_ROW}">
     <meta data-var="sickbeard.FUZZY_DATING" data-content="${sickbeard.FUZZY_DATING}">
     <meta data-var="sickbeard.HISTORY_LAYOUT" data-content="${sickbeard.HISTORY_LAYOUT}">
     <meta data-var="sickbeard.HOME_LAYOUT" data-content="${sickbeard.HOME_LAYOUT}">
diff --git a/gui/slick/views/config_general.mako b/gui/slick/views/config_general.mako
index 0d74ea107..d0f4f429b 100644
--- a/gui/slick/views/config_general.mako
+++ b/gui/slick/views/config_general.mako
@@ -271,18 +271,6 @@
                                 </span>
                             </label>
                         </div>
-                        <div class="field-pair">
-                            <label for="filter_row">
-                                <span class="component-title">Filter Row</span>
-                                <span class="component-desc">
-                                    <input type="checkbox" name="filter_row" id="filter_row" ${('', 'checked="checked"')[bool(sickbeard.FILTER_ROW)]}/>
-                                    <p>Add a filter row to the show display on the home page</p>
-                                    <p>Supports =, >, >=, <=, <, xx to yy , xx - yy</p>
-                                    <p><b>Note:</b> =, >, >=, <=, < should be first, followed by a space, then the value.</p>
-                                    <p>Examples: '> 90', '= 100', '0 to 99'</p>
-                                </span>
-                            </label>
-                        </div>
                         <div class="field-pair">
                             <label for="coming_eps_missed_range">
                                 <span class="component-title">Missed episodes range</span>
diff --git a/gui/slick/views/layouts/main.mako b/gui/slick/views/layouts/main.mako
index d1bcc84bf..10e5c24fd 100644
--- a/gui/slick/views/layouts/main.mako
+++ b/gui/slick/views/layouts/main.mako
@@ -49,7 +49,6 @@
         <meta data-var="sickbeard.COMING_EPS_LAYOUT" data-content="${sickbeard.COMING_EPS_LAYOUT}">
         <meta data-var="sickbeard.COMING_EPS_SORT" data-content="${sickbeard.COMING_EPS_SORT}">
         <meta data-var="sickbeard.DATE_PRESET" data-content="${sickbeard.DATE_PRESET}">
-        <meta data-var="sickbeard.FILTER_ROW" data-content="${sickbeard.FILTER_ROW}">
         <meta data-var="sickbeard.FUZZY_DATING" data-content="${sickbeard.FUZZY_DATING}">
         <meta data-var="sickbeard.HISTORY_LAYOUT" data-content="${sickbeard.HISTORY_LAYOUT}">
         <meta data-var="sickbeard.HOME_LAYOUT" data-content="${sickbeard.HOME_LAYOUT}">
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 632545bdd..abd3fa330 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -509,7 +509,6 @@ TIMEZONE_DISPLAY = None
 THEME_NAME = None
 POSTER_SORTBY = None
 POSTER_SORTDIR = None
-FILTER_ROW = True
 
 USE_SUBTITLES = False
 SUBTITLES_LANGUAGES = []
@@ -606,7 +605,7 @@ def initialize(consoleLogging=True):
             USE_EMAIL, EMAIL_HOST, EMAIL_PORT, EMAIL_TLS, EMAIL_USER, EMAIL_PASSWORD, EMAIL_FROM, EMAIL_NOTIFY_ONSNATCH, EMAIL_NOTIFY_ONDOWNLOAD, EMAIL_NOTIFY_ONSUBTITLEDOWNLOAD, EMAIL_LIST, \
             USE_LISTVIEW, METADATA_KODI, METADATA_KODI_12PLUS, METADATA_MEDIABROWSER, METADATA_PS3, metadata_provider_dict, \
             NEWZBIN, NEWZBIN_USERNAME, NEWZBIN_PASSWORD, GIT_PATH, MOVE_ASSOCIATED_FILES, SYNC_FILES, POSTPONE_IF_SYNC_FILES, POSTPONE_IF_NO_SUBS, dailySearchScheduler, NFO_RENAME, \
-            GUI_NAME, HOME_LAYOUT, HISTORY_LAYOUT, DISPLAY_SHOW_SPECIALS, COMING_EPS_LAYOUT, COMING_EPS_SORT, COMING_EPS_DISPLAY_PAUSED, COMING_EPS_MISSED_RANGE, FUZZY_DATING, TRIM_ZERO, DATE_PRESET, TIME_PRESET, TIME_PRESET_W_SECONDS, THEME_NAME, FILTER_ROW, \
+            GUI_NAME, HOME_LAYOUT, HISTORY_LAYOUT, DISPLAY_SHOW_SPECIALS, COMING_EPS_LAYOUT, COMING_EPS_SORT, COMING_EPS_DISPLAY_PAUSED, COMING_EPS_MISSED_RANGE, FUZZY_DATING, TRIM_ZERO, DATE_PRESET, TIME_PRESET, TIME_PRESET_W_SECONDS, THEME_NAME, \
             POSTER_SORTBY, POSTER_SORTDIR, HISTORY_LIMIT, CREATE_MISSING_SHOW_DIRS, ADD_SHOWS_WO_DIR, \
             METADATA_WDTV, METADATA_TIVO, METADATA_MEDE8ER, IGNORE_WORDS, TRACKERS_LIST, IGNORED_SUBS_LIST, REQUIRE_WORDS, CALENDAR_UNPROTECTED, CALENDAR_ICONS, NO_RESTART, \
             USE_SUBTITLES, SUBTITLES_LANGUAGES, SUBTITLES_DIR, SUBTITLES_SERVICES_LIST, SUBTITLES_SERVICES_ENABLED, SUBTITLES_HISTORY, SUBTITLES_FINDER_FREQUENCY, SUBTITLES_MULTI, EMBEDDED_SUBTITLES_ALL, SUBTITLES_EXTRA_SCRIPTS, subtitlesFinderScheduler, \
@@ -1211,7 +1210,6 @@ def initialize(consoleLogging=True):
         TIMEZONE_DISPLAY = check_setting_str(CFG, 'GUI', 'timezone_display', 'local')
         POSTER_SORTBY = check_setting_str(CFG, 'GUI', 'poster_sortby', 'name')
         POSTER_SORTDIR = check_setting_int(CFG, 'GUI', 'poster_sortdir', 1)
-        FILTER_ROW = bool(check_setting_int(CFG, 'GUI', 'filter_row', 1))
         DISPLAY_ALL_SEASONS = bool(check_setting_int(CFG, 'General', 'display_all_seasons', 1))
 
         # initialize NZB and TORRENT providers
@@ -2134,7 +2132,6 @@ def save_config():
     new_config['GUI']['timezone_display'] = TIMEZONE_DISPLAY
     new_config['GUI']['poster_sortby'] = POSTER_SORTBY
     new_config['GUI']['poster_sortdir'] = POSTER_SORTDIR
-    new_config['GUI']['filter_row'] = int(FILTER_ROW)
 
     new_config['Subtitles'] = {}
     new_config['Subtitles']['use_subtitles'] = int(USE_SUBTITLES)
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 8c45c2215..76d824ba0 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -3707,7 +3707,7 @@ class ConfigGeneral(Config):
                     handle_reverse_proxy=None, sort_article=None, auto_update=None, notify_on_update=None,
                     proxy_setting=None, proxy_indexers=None, anon_redirect=None, git_path=None, git_remote=None,
                     calendar_unprotected=None, calendar_icons=None, debug=None, ssl_verify=None, no_restart=None, coming_eps_missed_range=None,
-                    filter_row=None, fuzzy_dating=None, trim_zero=None, date_preset=None, date_preset_na=None, time_preset=None,
+                    fuzzy_dating=None, trim_zero=None, date_preset=None, date_preset_na=None, time_preset=None,
                     indexer_timeout=None, download_url=None, rootDir=None, theme_name=None, default_page=None,
                     git_reset=None, git_username=None, git_password=None, git_autoissues=None, display_all_seasons=None):
 
@@ -3763,7 +3763,6 @@ class ConfigGeneral(Config):
         sickbeard.WEB_USERNAME = web_username
         sickbeard.WEB_PASSWORD = web_password
 
-        sickbeard.FILTER_ROW = config.checkbox_to_value(filter_row)
         sickbeard.FUZZY_DATING = config.checkbox_to_value(fuzzy_dating)
         sickbeard.TRIM_ZERO = config.checkbox_to_value(trim_zero)
 
-- 
GitLab