Updated for new libs, added submodule and updated docs (RocketMap#1522)

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "pokecrypt-pgoapi"]
+	path = pokecrypt-pgoapi
+	url = https://github.com/pokecrypt/pokecrypt-pgoapi.git

docs/advanced-install/bluemix.md

@@ -6,7 +6,7 @@ to have 24 up time! Oh boy!
 
 ## Prerequisites
 
-  1. Clone the git repo via `https://github.com/PokemonGoMap/PokemonGo-Map.git`
+  1. Clone the git repo recursively via `https://github.com/PokemonGoMap/PokemonGo-Map.git`
   1. Create a [Bluemix](http://bluemix.net) account
   1. Install the [Cloud Foundry CLI](https://console.ng.bluemix.net/docs/cli/reference/cfcommands/index.html) - [Download here](https://github.com/cloudfoundry/cli/releases).
 

docs/advanced-install/digital-ocean.md

@@ -19,7 +19,7 @@ Check the "User Data" box lower on the page and enter the following:
 
 apt-get -y update
 apt-get -y install python python-pip git
-git clone https://github.com/PokemonGoMap/PokemonGo-Map.git /root/PoGoMap
+git clone --recursive https://github.com/PokemonGoMap/PokemonGo-Map.git /root/PoGoMap
 cd /root/PoGoMap
 pip install -r requirements.txt
 python runserver.py -u [USERNAME] -p [PASSWORD] -st 10 -k [Google Maps API key] -l "[LOCATION]" -H 0.0.0.0 -P 80

docs/basic-install/index.rst

@@ -35,7 +35,7 @@ If you're going to run a copy from the latest ``develop`` branch in ``git`` you
 
 .. code-block:: bash
 
-  git clone https://github.com/PokemonGoMap/PokemonGo-Map.git
+  git clone --recursive https://github.com/PokemonGoMap/PokemonGo-Map.git
 
 Installing Modules
 ******************

docs/basic-install/linux.rst

@@ -55,7 +55,7 @@ If your output looks as above, you can proceed with installation:
         
 	cd ~/
 	sudo apt-get install git
-	git clone https://github.com/PokemonGoMap/PokemonGo-Map.git
+	git clone --recursive https://github.com/PokemonGoMap/PokemonGo-Map.git
 	cd PokemonGo-Map
 	sudo -H pip install -r requirements.txt
 	npm install

pogom/search.py

@@ -425,7 +425,7 @@ def search_worker_thread(args, account_queue, account_failures, search_items_que
                 log.debug("Using proxy %s", status['proxy_url'])
                 api.set_proxy({'http': status['proxy_url'], 'https': status['proxy_url']})
 
-            # api.activate_signature(encryption_lib_path)
+            api.activate_signature(encryption_lib_path)
 
             # The forever loop for the searches
             while True:

pogom/utils.py

@@ -437,9 +437,9 @@ def get_encryption_lib_path(args):
         # win32 doesn't mean necessarily 32 bits
         if sys.platform == "win32" or sys.platform == "cygwin":
             if platform.architecture()[0] == '64bit':
-                lib_name = "encrypt64bit.dll"
+                lib_name = "encrypt64.dll"
             else:
-                lib_name = "encrypt32bit.dll"
+                lib_name = "encrypt32.dll"
 
         elif sys.platform == "darwin":
             lib_name = "libencrypt-osx-64.so"
@@ -470,7 +470,7 @@ def get_encryption_lib_path(args):
             log.error(err)
             raise Exception(err)
 
-        lib_path = os.path.join(os.path.dirname(__file__), "libencrypt", lib_name)
+        lib_path = os.path.join(os.path.dirname(__file__), "../pokecrypt-pgoapi", lib_name)
 
         if not os.path.isfile(lib_path):
             err = "Could not find {} encryption library {}".format(sys.platform, lib_path)