- Fix decoding signature in some cases

kolsys · Nov 21, 2015 · 683f50d · 683f50d
1 parent e4fd902
commit 683f50d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Contents/Info.plist b/Contents/Info.plist
@@ -14,7 +14,7 @@
 	<key>CFBundleSignature</key>
 	<string>hook</string>
 	<key>CFBundleVersion</key>
-	<string>3.8</string>
+	<string>3.9</string>
 
 	<key>PlexPluginVersionUrl</key>
 	<string>http://bit.ly/1FuE3dz</string>

diff --git a/Contents/Services/Shared Code/jsinterp.pys b/Contents/Services/Shared Code/jsinterp.pys
@@ -257,7 +257,7 @@ class JSInterpreter(object):
     def extract_function(self, funcname):
         func_m = re.search(
             r'''(?x)
-                (?:function\s+%s|[{;]%s\s*=\s*function)\s*
+                (?:function\s+%s|[{;\s]%s\s*=\s*function)\s*
                 \((?P<args>[^)]*)\)\s*
                 \{(?P<code>[^}]+)\}''' % (
                 re.escape(funcname), re.escape(funcname)),

diff --git a/Contents/Services/Shared Code/video.pys b/Contents/Services/Shared Code/video.pys
@@ -204,8 +204,8 @@ def DecryptSignature(s, player_url):
             DecryptSignature.cache[player_id] = parse_sig_js(code)
 
         return DecryptSignature.cache[player_id](s)
-    except Exception:
-        Log.Error('Cannot decrypt signature')
+    except Exception as e:
+        Log.Error('Cannot decrypt signature: %s' % e)
         return ''