Properly fix Premium+ Detection (#19)

* Properly fix Premium+ Detection

Move the Premium+ check to outside the Premium check (regex is looking
for exact match).

* Expand login fail check

Add status code 200 as a possible success response code.  200 is really
only applicible to Guest logins so we also check that too.  Logging in
normally still responds with 302 so we don't want to change that at all.

crunchy-xml-decoder/login.py

@@ -22,10 +22,9 @@ def getuserstatus(session=''):
     if re.search(re.escape('      ga(\'set\', \'dimension5\', \'registered\');'), site):
         status = 'Free Member'
     elif re.search(re.escape('      ga(\'set\', \'dimension6\', \'premium\');'), site):
-        if re.search(re.escape('      ga(\'set\', \'dimension6\', \'premiumplus\');'), site):
-            status = 'Premium+ Member'
-        else:
-            status = 'Premium Member'
+        status = 'Premium Member'
+    elif re.search(re.escape('      ga(\'set\', \'dimension6\', \'premiumplus\');'), site):
+        status = 'Premium+ Member'
     if status != 'Guest':
         user1 = re.findall('<a href=\"/user/(.+)\" ', site).pop()
     return [status,user1]
@@ -48,7 +47,7 @@ def login(username, password):
                'login_form[_token]': token}
 
     res_post = session.post('https://www.crunchyroll.com/login', data=payload, headers=headers, allow_redirects = False)
-    if res_post.status_code != 302:
+    if not (res_post.status_code == 302 or (res_post.status_code == 200 and username == '')):
       print 'Login failed'
       sys.exit()