Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to how Plex token is grabbed and libraries are updated... #969

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Update to how Plex token is grabbed and libraries are updated... #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1568b6f
updates to how Plex token is grabbed and libraries are updated
skingry Feb 3, 2016
419fbf2
adding pid file to the gitignore
skingry Feb 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ sickbeard.db*
autoProcessTV/autoProcessTV.cfg
server.crt
server.key
sickbeard.pid*

# SB Test Related #
######################
Expand Down Expand Up @@ -40,4 +41,4 @@ desktop.ini
ehthumbs.db
Thumbs.db
.directory
*~
*~
32 changes: 16 additions & 16 deletions sickbeard/notifiers/plex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with Sick Beard. If not, see <http://www.gnu.org/licenses/>.

import base64
import urllib
import urllib2
import sickbeard
Expand Down Expand Up @@ -169,35 +170,34 @@ def update_library(self, ep_obj=None, host=None, username=None, password=None):
if username and password:

logger.log(u"PLEX: fetching credentials for Plex user: " + username, logger.DEBUG)
url = "https://plex.tv/users/sign_in.xml"
req = urllib2.Request(url, data="")
pw_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
pw_mgr.add_password(None, url, username, password)
req = urllib2.Request("https://plex.tv/users/sign_in.xml", data="")
authheader = "Basic %s" % base64.encodestring('%s:%s' % (username, password))[:-1]
req.add_header("Authorization", authheader)
req.add_header("X-Plex-Product", "Sick Beard Notifier")
req.add_header("X-Plex-Client-Identifier", "5f48c063eaf379a565ff56c9bb2b401e")
req.add_header("X-Plex-Version", "1.0")


try:
response = urllib2.urlopen(req)
except urllib2.URLError, e:
logger.log(u"PLEX: Error fetching credentials from from plex.tv for user %s: %s" % (username, ex(e)), logger.ERROR)

try:
response = sickbeard.helpers.getURL(req, throw_exc=True)
auth_tree = etree.fromstring(response)
auth_tree = etree.parse(response)
token = auth_tree.findall(".//authentication-token")[0].text
token_arg = "?X-Plex-Token=" + token

except urllib2.URLError as e:
logger.log(u"PLEX: Error fetching credentials from from plex.tv for user %s: %s" % (username, ex(e)), logger.MESSAGE)

except (ValueError, IndexError) as e:
logger.log(u"PLEX: Error parsing plex.tv response: " + ex(e), logger.MESSAGE)
logger.log(u"PLEX: Error parsing token from plex.tv response: " + ex(e), logger.ERROR)

url = "http://%s/library/sections%s" % (sickbeard.PLEX_SERVER_HOST, token_arg)
try:
xml_tree = etree.fromstring(sickbeard.helpers.getURL(url))
media_container = xml_tree.getroot()
data = sickbeard.helpers.getURL(url)
xml_tree = etree.fromstring(data)
except IOError, e:
logger.log(u"PLEX: Error while trying to contact Plex Media Server: " + ex(e), logger.ERROR)
return False

sections = media_container.findall('.//Directory')
sections = xml_tree.findall('Directory')
if not sections:
logger.log(u"PLEX: Plex Media Server not running on: " + sickbeard.PLEX_SERVER_HOST, logger.MESSAGE)
return False
Expand All @@ -206,7 +206,7 @@ def update_library(self, ep_obj=None, host=None, username=None, password=None):
if section.attrib['type'] == "show":
url = "http://%s/library/sections/%s/refresh%s" % (sickbeard.PLEX_SERVER_HOST, section.attrib['key'], token_arg)
if sickbeard.helpers.getURLFileLike(url) is None:
logger.log(u"PLEX: Error updating library section for Plex Media Server", logger.ERROR)
logger.log(u"PLEX: Error updating library section for Plex Media Server", logger.ERROR)
return False
return True

Expand Down