From 7f0ff2b5d571846236ef447860586cf7a924aec7 Mon Sep 17 00:00:00 2001 From: FrostTheFox Date: Wed, 9 Nov 2016 20:25:14 -0500 Subject: [PATCH] Updated for new libs, added submodule and updated docs (#1522) --- .gitmodules | 3 +++ docs/advanced-install/bluemix.md | 2 +- docs/advanced-install/digital-ocean.md | 2 +- docs/basic-install/index.rst | 2 +- docs/basic-install/linux.rst | 2 +- pogom/search.py | 2 +- pogom/utils.py | 6 +++--- pokecrypt-pgoapi | 1 + 8 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 .gitmodules create mode 160000 pokecrypt-pgoapi diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..65bae66809 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "pokecrypt-pgoapi"] + path = pokecrypt-pgoapi + url = https://github.com/pokecrypt/pokecrypt-pgoapi.git diff --git a/docs/advanced-install/bluemix.md b/docs/advanced-install/bluemix.md index d7fe84b8d9..ccf05e5a6f 100644 --- a/docs/advanced-install/bluemix.md +++ b/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). diff --git a/docs/advanced-install/digital-ocean.md b/docs/advanced-install/digital-ocean.md index f33bc9ccdb..6929020da7 100644 --- a/docs/advanced-install/digital-ocean.md +++ b/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 diff --git a/docs/basic-install/index.rst b/docs/basic-install/index.rst index 8fec37932f..ae65e322b5 100644 --- a/docs/basic-install/index.rst +++ b/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 ****************** diff --git a/docs/basic-install/linux.rst b/docs/basic-install/linux.rst index 80129feae6..72d368351b 100644 --- a/docs/basic-install/linux.rst +++ b/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 diff --git a/pogom/search.py b/pogom/search.py index 9f64e25372..2394d203a9 100644 --- a/pogom/search.py +++ b/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: diff --git a/pogom/utils.py b/pogom/utils.py index 9109441fc6..77fbae219f 100755 --- a/pogom/utils.py +++ b/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) diff --git a/pokecrypt-pgoapi b/pokecrypt-pgoapi new file mode 160000 index 0000000000..48cb37f3f5 --- /dev/null +++ b/pokecrypt-pgoapi @@ -0,0 +1 @@ +Subproject commit 48cb37f3f584545d37a3192ef3bc8f4827d5a89f