From 77a659c17f943ab6afa6a4a54d8f23e5fc8d4c9d Mon Sep 17 00:00:00 2001 From: echel0n Date: Sat, 28 Jun 2014 18:11:35 -0700 Subject: [PATCH] Test #2 for blank pages, turned cache on and removed all cache disabling entries. --- sickbeard/webserve.py | 52 +++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 80948e00..99c3ea46 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -213,14 +213,10 @@ class MainHandler(RequestHandler): return super(MainHandler, self).redirect(sickbeard.WEB_ROOT + url, permanent, status) def get(self, *args, **kwargs): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") - response = self._dispatch() self.finish(response) def post(self, *args, **kwargs): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") - response = self._dispatch() self.finish(response) @@ -1485,7 +1481,6 @@ class ConfigBackupRestore(MainHandler): return _munge(t) def backup(self, backupDir=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") finalResult = '' @@ -1506,7 +1501,7 @@ class ConfigBackupRestore(MainHandler): def restore(self, backupFile=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + finalResult = '' @@ -3057,7 +3052,6 @@ class Home(MainHandler): else: return "Error: Unsupported Request. Send jsonp request with 'callback' variable in the query string." - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") self.set_header('Content-Type', 'text/javascript') self.set_header('Access-Control-Allow-Origin', '*') self.set_header('Access-Control-Allow-Headers', 'x-requested-with') @@ -3118,7 +3112,7 @@ class Home(MainHandler): def testGrowl(self, host=None, password=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + host = config.clean_host(host, default_port=23053) @@ -3135,7 +3129,7 @@ class Home(MainHandler): def testProwl(self, prowl_api=None, prowl_priority=0): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.prowl_notifier.test_notify(prowl_api, prowl_priority) if result: @@ -3145,7 +3139,7 @@ class Home(MainHandler): def testBoxcar(self, username=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.boxcar_notifier.test_notify(username) if result: @@ -3155,7 +3149,7 @@ class Home(MainHandler): def testBoxcar2(self, accesstoken=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.boxcar2_notifier.test_notify(accesstoken) if result: @@ -3165,7 +3159,7 @@ class Home(MainHandler): def testPushover(self, userKey=None, apiKey=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.pushover_notifier.test_notify(userKey, apiKey) if result: @@ -3175,13 +3169,13 @@ class Home(MainHandler): def twitterStep1(self, *args, **kwargs): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + return notifiers.twitter_notifier._get_authorization() def twitterStep2(self, key): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.twitter_notifier._get_credentials(key) logger.log(u"result: " + str(result)) @@ -3192,7 +3186,7 @@ class Home(MainHandler): def testTwitter(self, *args, **kwargs): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.twitter_notifier.test_notify() if result: @@ -3202,7 +3196,7 @@ class Home(MainHandler): def testXBMC(self, host=None, username=None, password=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + host = config.clean_hosts(host) finalResult = '' @@ -3218,7 +3212,7 @@ class Home(MainHandler): def testPLEX(self, host=None, username=None, password=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + finalResult = '' for curHost in [x.strip() for x in host.split(",")]: @@ -3233,7 +3227,7 @@ class Home(MainHandler): def testLibnotify(self, *args, **kwargs): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + if notifiers.libnotify_notifier.test_notify(): return "Tried sending desktop notification via libnotify" @@ -3242,7 +3236,7 @@ class Home(MainHandler): def testNMJ(self, host=None, database=None, mount=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + host = config.clean_host(host) result = notifiers.nmj_notifier.test_notify(urllib.unquote_plus(host), database, mount) @@ -3253,7 +3247,7 @@ class Home(MainHandler): def settingsNMJ(self, host=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + host = config.clean_host(host) result = notifiers.nmj_notifier.notify_settings(urllib.unquote_plus(host)) @@ -3265,7 +3259,7 @@ class Home(MainHandler): def testNMJv2(self, host=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + host = config.clean_host(host) result = notifiers.nmjv2_notifier.test_notify(urllib.unquote_plus(host)) @@ -3276,7 +3270,7 @@ class Home(MainHandler): def settingsNMJv2(self, host=None, dbloc=None, instance=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + host = config.clean_host(host) result = notifiers.nmjv2_notifier.notify_settings(urllib.unquote_plus(host), dbloc, instance) @@ -3289,7 +3283,7 @@ class Home(MainHandler): def testTrakt(self, api=None, username=None, password=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.trakt_notifier.test_notify(api, username, password) if result: @@ -3299,7 +3293,7 @@ class Home(MainHandler): def loadShowNotifyLists(self, *args, **kwargs): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + myDB = db.DBConnection() rows = myDB.select("SELECT show_id, show_name, notify_list FROM tv_shows ORDER BY show_name ASC") @@ -3314,7 +3308,7 @@ class Home(MainHandler): def testEmail(self, host=None, port=None, smtp_from=None, use_tls=None, user=None, pwd=None, to=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + host = config.clean_host(host) if notifiers.email_notifier.test_notify(host, port, smtp_from, use_tls, user, pwd, to): @@ -3324,7 +3318,7 @@ class Home(MainHandler): def testNMA(self, nma_api=None, nma_priority=0): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.nma_notifier.test_notify(nma_api, nma_priority) if result: @@ -3334,7 +3328,7 @@ class Home(MainHandler): def testPushalot(self, authorizationToken=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.pushalot_notifier.test_notify(authorizationToken) if result: @@ -3344,7 +3338,7 @@ class Home(MainHandler): def testPushbullet(self, api=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.pushbullet_notifier.test_notify(api) if result: @@ -3354,7 +3348,7 @@ class Home(MainHandler): def getPushbulletDevices(self, api=None): - self.set_header('Cache-Control', "max-age=0,no-cache,no-store") + result = notifiers.pushbullet_notifier.get_devices(api) if result: