Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Nov 10, 2016
Merged

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

merged 1 commit into from Nov 10, 2016

Conversation

FrostTheFox
Copy link
Member

@FrostTheFox FrostTheFox commented Nov 10, 2016

Added new pokecrypt repo as submodule, and setup for encrypt lib detection.

Description

Added https://github.com/pokecrypt/pokecrypt-pgoapi as a submodule, enabled activate_signature in search.py, updated lib location in utils.py and updated encrypt dll names in utils.py.

Motivation and Context

Allows for better compatibility with latest pgoapi changes.

Also fixes nonetype and encrypt errors. (due to libs being removed from pgoapi.)

How Has This Been Tested?

Tested on local Windows 10 machine, have not tested on anything other than windows, 0 visible reason as to why it wouldn't work as before.

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

I believe I got most of the git clone references in the docs and updated them for recursive, if I missed any please let me know.

@FrostTheFox FrostTheFox self-assigned this Nov 10, 2016
@FrostTheFox FrostTheFox added this to the 4.0.0 milestone Nov 10, 2016
@FrostTheFox
Copy link
Member Author

Merging, please report any doc/other errors to me on Discord. https://l.vulpix.us/pgmdiscord

@FrostTheFox FrostTheFox reopened this Nov 10, 2016
@FrostTheFox FrostTheFox merged commit 037ac6c into RocketMap:develop Nov 10, 2016
@Beri51
Copy link

Beri51 commented Nov 10, 2016

For those running it on a Raspberry Pi, this will break your manual fix if you followed my comment here.
You need to download the libencrypt-linux-arm-32.so from this PR and manually copy it to ~/PokemonGo-Map/pokecrypt-pgoapi/ (or where you cloned the Map).

When merged, this PR will fix this issue for ARM architectures (like the Pi).

@Bart274
Copy link
Contributor

Bart274 commented Nov 10, 2016

@FrostTheFox when using the latest version I get this error:

C:\PGMkjell>runserver.py --db-max_connections 200 --db-threads 5 -j -enc -gi
2016-11-10 16:18:55,599 [      MainThread][         utils][   ERROR] Could not find win32 encryption library C:\PGMkjell\pogom\../pokecrypt-pgoapi\encrypt32.dll
2016-11-10 16:18:55,601 [      MainThread][     runserver][   ERROR] Uncaught exception
Traceback (most recent call last):
  File "C:\PGMkjell\runserver.py", line 293, in <module>
    main()
  File "C:\PGMkjell\runserver.py", line 112, in main
    encryption_lib_path = get_encryption_lib_path(args)
  File "C:\PGMkjell\pogom\utils.py", line 478, in get_encryption_lib_path
    raise Exception(err)
Exception: Could not find win32 encryption library C:\PGMkjell\pogom\../pokecrypt-pgoapi\encrypt32.dll

JapuDCret added a commit to JapuDCret/RocketMap-Do that referenced this pull request Nov 10, 2016
Updated for new libs, added submodule and updated docs (RocketMap#1522)
@MyAdler
Copy link

MyAdler commented Nov 11, 2016

@Bart274 You need to run "git submodule init" then "git submodule update". Or for a new installation you need to run a recursive pull.

@Bart274
Copy link
Contributor

Bart274 commented Nov 11, 2016 via email

@irus99
Copy link

irus99 commented Nov 11, 2016

Does anyone know how to resolve this? I have tried the steps above but no luck

2016-11-11 01:11:14,462 [ MainThread][ utils][ ERROR] Could not find linux2 encryption library /usr/src/1111update/pokemongo-map/pogom/../pokecrypt-pgoapi/libencrypt-centos-x86-64.so
2016-11-11 01:11:14,462 [ MainThread][ runserver][ ERROR] Uncaught exception
Traceback (most recent call last):
File "runserver.py", line 293, in
main()
File "runserver.py", line 112, in main
encryption_lib_path = get_encryption_lib_path(args)
File "/usr/src/1111update/pokemongo-map/pogom/utils.py", line 478, in get_encryption_lib_path
raise Exception(err)
Exception: Could not find linux2 encryption library /usr/src/1111update/pokemongo-map/pogom/../pokecrypt-pgoapi/libencrypt-centos-x86-64.so

@Beri51
Copy link

Beri51 commented Nov 11, 2016

@irus99 you miss the libraries in the folder.
The libraries for Centos are not available (afaik). Maybe you should try to compile yourself following this ?

@centos6user
Copy link

@irus99 @Beri51 I've created Centos libraries: See PR

kieronqtran added a commit to kieronqtran/PokemonGo-Map that referenced this pull request Nov 20, 2016
* Update pokemon.json (RocketMap#1305)

* Matches Polyfill (RocketMap#1100)

* Update index.rst (RocketMap#1322)

updated windows link for nodejs, was 4.4.7 move to 4.5.0

* Move commandline page from wiki to docs (RocketMap#1326)

Reorganizing to keep docs in docs

* fixes (RocketMap#1327)

There! More example.py

* Added Title to command line page and misc fix (RocketMap#1335)

* webworker (RocketMap#1287)

* Output better error when csv file has > 3 fields (RocketMap#1336)

* Correct multi-acc doc

* Prevent header from cutting off bottom (RocketMap#1343)

Same issue/fix as RocketMap#873, this time affecting the stats side bar instead of the menu bar

* Close info window upon second click (RocketMap#1238)

Currently the info window for Pokémon, Gyms, etc. can only be closed with the little x. This adds a stateful click handler that closes the info window with a second click.
Implements RocketMap#1237

* Decrease Number of Upserted Rows (RocketMap#1091)

* Decrease step size

* Check the type of DB

* setup.bat now won't set paths if already set, now also installs npm (RocketMap#770)

* Various fixes

Updated to install npm and now includes more user output. Now also won't set paths if already set, which was a problem if you ran the setup more than once.

* Update setup.bat

* Updated to not use temp files

As requested by Balthamel, it now no longer uses a temp file but rathers stores it in a variable.

* Update the "Easy setup" script (RocketMap#1217)

* Fully Implement On Demand Mode(Conflicts resolved) (RocketMap#1271)

* On demand mode

* On demand mode

* On demand mode

* On demand mode

* Pause before checking time in service

* Fix alphabetical order (RocketMap#1110)

* Suppress virtual keyboard - update - mobile OS detection (RocketMap#1289)

* [Fix] issue RocketMap#622, statistics 2x Uncaught TypeError

* Fix lint errors

* Prevent OSK on Touch

* Select Boxes prevent Virtual Keyboard Appearing on Touch Devices

* remove unnecessary loop

* basic mobile os detection

* fixed order in which some things must be installed

* Fix for some cases of 0,0,0 returns (RocketMap#1097)

Some users reporting 0,0,0 returns on subsequent auth token refreshes
after the first.

* Update pull request template (RocketMap#399)

* Update pull request template

* Changed checklist into a comment

* Stupid markdown comments

* Auth Update for nginx.md (RocketMap#221)

* Auth Update for nginx.md

Adding large block for httpd nginx authentication with reverse proxy

* Update nginx.md

* Removed references to third party docker container (RocketMap#1359)

* Removed references to third party container

* Changed references to container we control

* SpawnPoint Scanning Confusion - changed --spawnpoints-only to --skip-empty (RocketMap#1372)

* Change --spawnpoints-only to --skip-empty 

Change --spawnpoints-only to --skip-empty with better description in order to stop the confusion between TBTerra's Spawnpoint Scanning and this.

* Update commandline.md to include --skip-empty

* Few doc updates (RocketMap#1373)

* Added little Linux thing

* Some doc updates

* little thing

* changed 2nd gen link

* added loc gen

* Enhance Statistics Panel (RocketMap#1241)

* Test Commit

* Revert "Test Commit"
aa
This reverts commit e87c9d5.

* Add sortable Pokemon stats table

* Put back accidentally deleted PokeGyms stats code

* add link to Pokedex

* Styling fixes for statistics panel

* Fix listing errors

* fix some PokéSpelling errors

* Only count visible pokemon/gyms/pokestops

Correct issue (that has apparently existed for a while?) where items
not currently on screen were included in the stats.

* fix linting errors

* add option to specify config file on command line or via env variable RocketMap#1341 - Rebased (RocketMap#1376)

* add option to specify config file on command line or via env variable

original PR 1341

* Add new config file documentation

Original PR 1341

* Update commandline.md with new config file flags

Original PR 1341

* fix for those not using a config file at all (RocketMap#1377)

* Fixed purge_data query not executing (RocketMap#1247)

* Escaping ampersand in html (RocketMap#1380)

It's groundbreaking. My valid html OCD is kicking in again :D

* Add gym levels to markers (alternative to RocketMap#351) and misc gym marker upgrades (RocketMap#782)

* Added gym levels to marker icons

Relocated code for determining gym levels to a new function getGymLevel()

* Gym Level Markers

* Compressed changed files (4.9kb ->1.4kb)

* Fixed ternary operator order

You guys are right. I didn't even think of it

* Made the gymPrestige array a global variable

Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as RocketMap#666)

* Add gym style option

* Choose between gym marker styles

* lint fix

* Reorganized forts for multiple gym styles

* Reload icons on demand

Used to wait until a mapUpdate(), but that could take up to 5 seconds

* Fixed lint error

* Lossless and optimized large versions

Original large version had heavy artifacts and were not compressed.

Harmony: 35.7KB -> 20.2KB
Instinct: 17.6KB -> 10.1KB
Mystic: 27.4KB -> 11.6KB
Valor: 29.0KB -> 13.9KB
Uncontested: 43.2KB -> 14.6KB

* High-res gym markers for mobile

When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images

* High-res gym markers for mobile

Same thing as the ingame markers

* Load and scale back a higher res version

Mobile users will be able to load the markers without them being blurry

* Whoops, didn't realize stats used these too

* Changed default gym marker to in-game

* Resize icons based on higher res icons

* Revert default gym markers back to shield

* Forgot these

Somehow I forgot to upload these when I added the css for #arenaList :/

* we use sass, we can do crazy programatic stuff like this (RocketMap#1390)

* [FAQ.md] Updated formula

Thanks OurFlagIsMined :3

* Enable pulling each pokemons IVs and Moves by starting their encounter. (RocketMap#1272)

* Scan for IVs and moves

Clean implementation, bug free?

* Don't ignore moves.json

* whoopsie tabsies

* im on a roll here

* whitespace is really hard guys

* whitespace is really hard guys

* I'm sorry travis senpai

* Don't pass the whole dictonary to pokemonLabel on top of everything else

* Notifications based off % perfection

From owraight's branch

* praise travis

* Fix 0/0/0 results from atypical spawnpoints?

Some spawnpoints spawn the same encounter multiple times an hour. This
should prevent those points from being skipped over in the parsing
process.

* minor text fixes

* Fix get_encountered_pokemon

oops. Thanks sLoPPydrive.

* Default to a whitelist, support a black one

* Stop erroneous empty results when rescanning pokemon

Keep track of of pokemon that get skipped over druing the parsing phase
so we don't think we're getting 0 results from the server.

* Minor text fixes

* Minorer text fixes

* No more white/black flip

--encounter-blacklist (-eblk) is back, and --encounter-whitelist (-ewht)
is here now.

* Fix up the white/blacklists

Now they're in a mutually exclusive group, and it properly encounter
everything if neither list is set.

* sorry travis

* derp

* leave me alone travis

* Improve moves.json handling

Use RocketMap#1316 more useful moves.json and support move names being translated

* Reduce db requests to one per cell

Instead of one per pokemon. Thanks jchristi and DiscoTim

* text minor fixes

* Handle failed encounters

* Minor fixes to the config.ini.example

* Doc fixes (RocketMap#1410)

* Update commandline.md with IV commands

* Added information for updating

* Add scan here function (RocketMap#1398)

* Add scan here function

* fix tab for spaces

* fix trailing space

* adding a switch to show the scan button with a warning message the first time the switch is enabled

* travis correction (replacing doublequotes by singlequotes)

* deleted unwanted files

* deleted unwanted files

* Removed deprecated debug flag (RocketMap#1427)

* Removed Debug flag

* Removed debug to verbose condition

* Removed a missed reference to debug flag.

* Clarify `encounter-delay` unit (RocketMap#1423)

It’s measured in seconds.

* fix default config usage (RocketMap#1428)

* Only send updated and newly visible Stops/Gyms/Pokémon and not-'hidden' Pokémon in the JSON from server to client. (RocketMap#1303)

* Only send 'not-hidden' pokemon

* Forgot to take out console.log

* More space fixes

* Bye redundant pokestop requests. Hi, travis?

* <3 Travis

* one more commit, should really test before push

* When moving screen only send new pokestops + modified

* Yes, spaces indentations and empty lines..

* And again..

* And another..

* Dont query each ID but remove ID's we dont send afterwards.

* Check if Stops/Gyms go from off to on, use same old/previous coords for both Gyms/Stops and use optional parameters in get_stops/get_gyms instead of new function

* Spaces indents and you know whats.

* Only send updated and newly visible Stops/Gyms and not-'hidden' Pokemon.

* Query datetime instead of time

* Clean exclude query.

* over-indented

* Only send modified pokemon and uncovered.

* Fix list + list, instead of .update

* Default value for last_modified

* Optimize SQL queries

* Code cleanup

* Code from PR RocketMap#1272, Pokémon already in database don't need to be parsed again.

* Code fixes and optimising ScannedLocations

* Fix if clause so pokemen get properly skipped.

* A bridge too far, ScannedLocations dont update properly when only sending new locations (Reverting Scannedlocations changes)

* Code fixes

* Check for Gym last scanned instead of modified to update front-end Last Scanned value.

* Code cleanup/optimization for app.py

* refactor map.js to not require full data set for scanned locations and spawn points

* Fix switch flip in between json updates

* Optimize scannedlocations and spawnpoints

* Random capitals and code fixes

* Optimize map.js thanks @DiscoTim

* Fix class so it works like it used to

* Code clean up, prevstamp was not used

* When zooming in we are not uncovering new terrain, so no need to look further then last_modified

* # Comments to clarify

* It needs some overlap

* Determine last_modified on insert

* Move timestanp generation up

* Reduced the need for backtrack on timestamp

Reduced the default response, no need for the previous status on switch if its false.

Dont send the new fields in the response

Collect all pokemon/forts from cells before running queries.

Dont upsert pokestops that haven't changed since last scan.

Show in log how many pokemon/pokestop we didnt upsert (skipped).

Set scannedlocation last_modified on upsert instead of in code.

Add extra column on pokestops to keep track of when its been updated so we can send it to the map.

* update map.js to not require full set of pokestops

* Minor text fixes

* Frontend/Backend fixes

Only send lured stops if lured-only is selected

Resend unhidden Pokes

* Minor map fix

* Minor text fixes.

* Send all pokemon details to frontend

* Small woopsie

oh baby, oh baby, prepare for disappointment ;P -Thunderfox

* Update last modified on already existing scanlocations and fixes 1448 (RocketMap#1444)

* Update last modified on already existing scanlocations

* references before filled

* Handle default config file in configargparse correctly (RocketMap#1463)

* fix default config usage

* fix issue w/ configargparse not reading default value

* update debian instillation (RocketMap#1432)

* update debian instillation 

updated for easier instillation for noobs like me :)

* update debian instillation 

added cd~/

* Update linux.rst

* Update linux.rst (RocketMap#1483)

Fedora fix for: error: command 'gcc' failed with exit status 1 and on Fedora needs only: dnf install python

* Update example.py

* Update example.py

* Updated readme

* Fixed travis errors, map still not working

* Fix map V.2 (RocketMap#1511)

* Fixed the null pointer error again

* Use official API

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

* remove IRC from readme

* Enable automated recaptcha solving with 2captcha (RocketMap#1526)

* Enable automatic captcha solving via 2captcha

* Revert "Enable automatic captcha solving via 2captcha"

This reverts commit 39dd8e4.

* Enable automated captcha solving with 2captcha

-cs flag to enable
-ck flag to specify 2captcha API key
-cds flag to specify the data-sitekey for PoGo captchas

* Revert "Enable automated captcha solving with 2captcha"

This reverts commit 13c10cf.

* Enable automated captcha solving with 2captcha

-cs flag to enable
-ck flag to specify 2captcha API key
-cds flag to specify the data-sitekey for PoGo captchas

* Revert "Enable automated captcha solving with 2captcha"

This reverts commit c1286a6.

* Enable automated captcha solving with 2captcha

-cs flag to enable
-ck flag to specify 2captcha API key
-cds flag to specify the data-sitekey for PoGo captchas

* Uncommented 'api.activate_signature(encryption_lib_path)'

* Travis fixes

* Update for .45 API (RocketMap#1536)

* Remove unneeded encrypt lib references and remove unneeded submodule

* removed recursive instructions

* cmon travis, I wanna go to sleep.

* Travis, let me sleep. It's 3:44am.

* Whoops, forgot to remove this

* Remove direct node download links

Not needed, another thing to needlessly update. Points to main nodejs download now.

* Somebody managed to get none-CI passing code into develop? (RocketMap#1563)

* Change searchbox into Autocomplete object. (RocketMap#1270)

* Change searchbox into Autocomplete object.

Autocomplete fields are more flexible than Searchbox: http://goo.gl/pxqxK7

This will enable Autocomplete results to be limited to countries, coordinate bounds, etc. Requested in RocketMap#1129

* Check if `place` contains `geometry`.

When user doesn't choose a place from the dropdown, there's a console error due to missing `geomerty` property.

* *grumble, grumble* (I actually love Travis).
dev042 pushed a commit to dev042/RocketMap that referenced this pull request Feb 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants