mirror of
https://github.com/SickGear/SickGear.git
synced 2024-12-01 08:53:37 +00:00
Merge remote-tracking branch 'origin/dev'
This commit is contained in:
echel0n
commit
1e012b5d12
2 changed files with 30 additions and 29 deletions
|
|
@ -37,9 +37,8 @@
|
|||
<p>For shows that you haven't downloaded yet, this option recommends shows to add based on your Trakt.tv watch list, creates a directory for its episodes, and adds it to SickRage. *** Trakt.tv must be enabled ***</p>
|
||||
</div>
|
||||
</a>
|
||||
#end if
|
||||
|
||||
<br/><br/>
|
||||
#end if
|
||||
|
||||
<a href="$sbRoot/home/addShows/existingShows/" id="btnExistingShow" class="btn btn-large">
|
||||
<div class="button"><img src="$sbRoot/images/add-existing32.png" height="32" width="32" alt="Add Existing Shows"/></div>
|
||||
|
|
|
|||
|
|
@ -146,8 +146,7 @@ def redirect(url, permanent=False, status=None):
|
|||
class MainHandler(RequestHandler):
|
||||
def __init__(self, application, request, **kwargs):
|
||||
super(MainHandler, self).__init__(application, request, **kwargs)
|
||||
sickbeard.REMOTE_IP = self.request.headers.get('X-Forwarded-For',
|
||||
self.request.headers.get('X-Real-Ip', self.request.remote_ip))
|
||||
sickbeard.REMOTE_IP = self.request.headers.get('X-Forwarded-For', self.request.headers.get('X-Real-Ip', self.request.remote_ip))
|
||||
|
||||
def http_error_401_handler(self):
|
||||
""" Custom handler for 401 error """
|
||||
|
|
@ -165,7 +164,7 @@ class MainHandler(RequestHandler):
|
|||
|
||||
def write_error(self, status_code, **kwargs):
|
||||
if status_code == 401:
|
||||
self.write(self.http_error_401_handler())
|
||||
self.finish(self.http_error_401_handler())
|
||||
elif status_code == 404:
|
||||
self.redirect('/home/')
|
||||
else:
|
||||
|
|
@ -217,13 +216,13 @@ class MainHandler(RequestHandler):
|
|||
|
||||
def get(self, *args, **kwargs):
|
||||
try:
|
||||
self.write(self._dispatch())
|
||||
self.finish(self._dispatch())
|
||||
except HTTPRedirect,inst:
|
||||
self.redirect(inst.url, inst.permanent, inst.status)
|
||||
|
||||
def post(self, *args, **kwargs):
|
||||
try:
|
||||
self.write(self._dispatch())
|
||||
self.finish(self._dispatch())
|
||||
except HTTPRedirect, inst:
|
||||
self.redirect(inst.url, inst.permanent, inst.status)
|
||||
|
||||
|
|
@ -3049,6 +3048,7 @@ 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')
|
||||
|
|
@ -3083,6 +3083,7 @@ class Home(MainHandler):
|
|||
postprocess = HomePostProcess
|
||||
|
||||
def testSABnzbd(self, host=None, username=None, password=None, apikey=None):
|
||||
self.set_header('Cache-Control', 'max-age=0,no-cache,no-store')
|
||||
|
||||
host = config.clean_url(host)
|
||||
|
||||
|
|
@ -3098,6 +3099,7 @@ class Home(MainHandler):
|
|||
|
||||
|
||||
def testTorrent(self, torrent_method=None, host=None, username=None, password=None):
|
||||
self.set_header('Cache-Control', 'max-age=0,no-cache,no-store')
|
||||
|
||||
host = config.clean_url(host)
|
||||
|
||||
|
|
@ -3109,7 +3111,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)
|
||||
|
||||
|
|
@ -3126,7 +3128,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:
|
||||
|
|
@ -3136,7 +3138,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:
|
||||
|
|
@ -3146,7 +3148,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:
|
||||
|
|
@ -3156,7 +3158,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:
|
||||
|
|
@ -3166,13 +3168,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))
|
||||
|
|
@ -3183,7 +3185,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:
|
||||
|
|
@ -3193,7 +3195,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 = ''
|
||||
|
|
@ -3209,7 +3211,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(",")]:
|
||||
|
|
@ -3224,7 +3226,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"
|
||||
|
|
@ -3233,7 +3235,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)
|
||||
|
|
@ -3244,7 +3246,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))
|
||||
|
|
@ -3256,7 +3258,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))
|
||||
|
|
@ -3267,7 +3269,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)
|
||||
|
|
@ -3280,7 +3282,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:
|
||||
|
|
@ -3290,7 +3292,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")
|
||||
|
|
@ -3305,7 +3307,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):
|
||||
|
|
@ -3315,7 +3317,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:
|
||||
|
|
@ -3325,7 +3327,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:
|
||||
|
|
@ -3335,7 +3337,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:
|
||||
|
|
@ -3345,7 +3347,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:
|
||||
|
|
|
|||
Loading…
Reference in a new issue