Merge pull request #160 from Noctem/pcrypt-libs

Automatically find the pcrypt libs

pgoapi/pgoapi.py

@@ -34,7 +34,7 @@
 from pgoapi.rpc_api import RpcApi
 from pgoapi.auth_ptc import AuthPtc
 from pgoapi.auth_google import AuthGoogle
-from pgoapi.utilities import parse_api_endpoint, get_hash_lib_path
+from pgoapi.utilities import parse_api_endpoint, get_lib_paths
 from pgoapi.exceptions import AuthException, NotLoggedInException, ServerBusyOrOfflineException, NoPlayerPositionSetException, EmptySubrequestChainException, AuthTokenExpiredException, ServerApiEndpointRedirectException, UnexpectedResponseException
 
 from . import protos
@@ -240,8 +240,12 @@ def call(self):
 
         signature_lib_path = self.__parent__.get_signature_lib()
         hash_lib_path = self.__parent__.get_hash_lib()
-        if not hash_lib_path:
-            hash_lib_path = get_hash_lib_path()
+        if not signature_lib_path or not hash_lib_path:
+            default_libraries = get_lib_paths()
+            if not signature_lib_path:
+                signature_lib_path = default_libraries[0]
+            if not hash_lib_path:
+                hash_lib_path = default_libraries[1]
         request.activate_signature(signature_lib_path, hash_lib_path)
 
         self.log.info('Execution of RPC')

pgoapi/utilities.py

@@ -169,47 +169,62 @@ def long_to_bytes(val, endianness='big'):
 
     return s
 
-def get_hash_lib_path():
+def get_lib_paths():
     # win32 doesn't mean necessarily 32 bits
     hash_lib = None
     arch = platform.architecture()[0]
     if sys.platform == "win32" or sys.platform == "cygwin":
         if arch == '64bit':
-            hash_lib = "libniantichash-windows-x86-64.dll"
+            encrypt_lib = "libpcrypt-windows-x86-64.dll"
+            hash_lib = "libniahash-windows-x86-64.dll"
         else:
-            hash_lib = "libniantichash-windows-i686.dll"
+            encrypt_lib = "libpcrypt-windows-i686.dll"
+            hash_lib = "libniahash-windows-i686.dll"
     elif sys.platform == "darwin":
         if arch == '64bit':
-            hash_lib = "libniantichash-macos-x86-64.dylib"
+            encrypt_lib = "libpcrypt-macos-x86-64.dylib"
+            hash_lib = "libniahash-macos-x86-64.dylib"
         else:
-            hash_lib = "libniantichash-macos-i386.dylib"
+            encrypt_lib = "libpcrypt-macos-i386.dylib"
+            hash_lib = "libniahash-macos-i386.dylib"
     elif os.uname()[4].startswith("arm") and arch == '32bit':
-        hash_lib = "libniantichash-linux-arm32.so"
+        encrypt_lib = "libpcrypt-linux-arm32.so"
+        hash_lib = "libniahash-linux-arm32.so"
     elif os.uname()[4].startswith("aarch64") and arch == '64bit':
-        hash_lib = "libniantichash-linux-arm64.so"
+        encrypt_lib = "libpcrypt-linux-arm64.so"
+        hash_lib = "libniahash-linux-arm64.so"
     elif sys.platform.startswith('linux'):
         if arch == '64bit':
-            hash_lib = "libniantichash-linux-x86-64.so"
+            encrypt_lib = "libpcrypt-linux-x86-64.so"
+            hash_lib = "libniahash-linux-x86-64.so"
         else:
-            hash_lib = "libniantichash-linux-i386.so"
+            encrypt_lib = "libpcrypt-linux-i386.so"
+            hash_lib = "libniahash-linux-i386.so"
     elif sys.platform.startswith('freebsd'):
         if arch == '64bit':
-            hash_lib = "libniantichash-freebsd-x86-64.so"
+            encrypt_lib = "libpcrypt-freebsd-x86-64.so"
+            hash_lib = "libniahash-freebsd-x86-64.so"
         else:
-            hash_lib = "libniantichash-freebsd-i386.so"
+            encrypt_lib = "libpcrypt-freebsd-i386.so"
+            hash_lib = "libniahash-freebsd-i386.so"
     else:
         err = "Unexpected/unsupported platform '{}'".format(sys.platform)
         log.error(err)
         raise Exception(err)
 
+    encrypt_lib_path = os.path.join(os.path.dirname(__file__), "lib", encrypt_lib)
     hash_lib_path = os.path.join(os.path.dirname(__file__), "lib", hash_lib)
 
+    if not os.path.isfile(encrypt_lib_path):
+        err = "Could not find {} encryption library {}".format(sys.platform, encrypt_lib_path)
+        log.error(err)
+        raise Exception(err)
     if not os.path.isfile(hash_lib_path):
         err = "Could not find {} hashing library {}".format(sys.platform, hash_lib_path)
         log.error(err)
         raise Exception(err)
 
-    return hash_lib_path
+    return encrypt_lib_path, hash_lib_path
 
 
 class HashGenerator: