Private GIT

Skip to content
Snippets Groups Projects
Commit 683093bc authored by echel0n's avatar echel0n
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents f713567d c4c6312e
Branches
Tags
No related merge requests found
...@@ -190,18 +190,21 @@ def main(): ...@@ -190,18 +190,21 @@ def main():
host = 'localhost' host = 'localhost'
url = protocol + host + ":" + port + web_root + "/home/postprocess/processEpisode" url = protocol + host + ":" + port + web_root + "/home/postprocess/processEpisode"
login_url = protocol + host + ":" + port + web_root + "/login"
scriptlogger.debug("Opening URL: " + url + ' with params=' + str(params)) scriptlogger.debug("Opening URL: " + url + ' with params=' + str(params))
print "Opening URL: " + url + ' with params=' + str(params) print "Opening URL: " + url + ' with params=' + str(params)
try: try:
response = requests.get(url, auth=(username, password), params=params, verify=False) sess = requests.Session()
sess.post(login_url, data={'username': username, 'password': password}, stream=True, verify=False)
response = sess.get(url, auth=(username, password), params=params, verify=False, allow_redirects=False)
except Exception, e: except Exception, e:
scriptlogger.error(u': Unknown exception raised when opening url: ' + str(e)) scriptlogger.error(u': Unknown exception raised when opening url: ' + str(e))
time.sleep(3) time.sleep(3)
sys.exit() sys.exit()
if response.status_code == 401: if response.status_code == 302:
scriptlogger.error(u'Invalid Sickbeard Username or Password, check your config') scriptlogger.error(u'Invalid Sickbeard Username or Password, check your config')
print 'Invalid Sickbeard Username or Password, check your config' print 'Invalid Sickbeard Username or Password, check your config'
time.sleep(3) time.sleep(3)
......
...@@ -20,6 +20,9 @@ Video File Manager for TV Shows, It watches for new episodes of your favorite sh ...@@ -20,6 +20,9 @@ Video File Manager for TV Shows, It watches for new episodes of your favorite sh
- Importing of existing video files now allows you to choose which indexer you wish to have SickBeard search its show info from. - Importing of existing video files now allows you to choose which indexer you wish to have SickBeard search its show info from.
- Your tvshow.nfo files are now tagged with a indexer key so that SickBeard can easily tell if the shows info comes from TheTVDB or TVRage. - Your tvshow.nfo files are now tagged with a indexer key so that SickBeard can easily tell if the shows info comes from TheTVDB or TVRage.
- Sports shows are now able to be searched for.. - Sports shows are now able to be searched for..
## Screenshots
-[Desktop (Full-HD)](http://imgur.com/a/4fpBk)<br>
-[Mobile](http://imgur.com/a/WPyG6)
## Dependencies ## Dependencies
To run SickRage from source you will need Python 2.6+ and Cheetah 2.1.0+. To run SickRage from source you will need Python 2.6+ and Cheetah 2.1.0+.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment