Skip to content

attempt to support webhook #2

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.

Sign up for GitHub

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

Open
TomSirgedas wants to merge 1 commit into
base: fake_search
Choose a base branch
from
Open

attempt to support webhook #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions pogom/fakeSearcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import random
import imp
import calendar

from datetime import datetime
from base64 import b64encode
Expand All @@ -8,7 +9,8 @@
from .models import (Pokemon)


def add_fake_pokemon(db_updates_queue, fake_pokemon_objects):
def add_fake_pokemon(args, db_updates_queue, wh_update_queue,
fake_pokemon_objects):
if not type(fake_pokemon_objects) is list:
print 'Fake Script: add_fake_pokemon() expects a list'
print 'instead, got ' + str(fake_pokemon_objects)
Expand Down Expand Up @@ -55,6 +57,7 @@ def add_fake_pokemon(db_updates_queue, fake_pokemon_objects):
'weight': None,
'gender': None,
'form': None,
'cp_multiplier': None,
}

for key, value in obj.items():
Expand All @@ -63,7 +66,32 @@ def add_fake_pokemon(db_updates_queue, fake_pokemon_objects):
else:
print('got unknown fake-pokemon attribute: ' + key)

pokemons[fakeid] = pokemon
pokemons[pokemon['encounter_id']] = pokemon

if args.webhooks:
pokemon_id = pokemon['pokemon_id']
disappear_time = pokemon['disappear_time']
if (pokemon_id in args.webhook_whitelist or
(not args.webhook_whitelist and pokemon_id
not in args.webhook_blacklist)):
wh_poke = pokemons[pokemon['encounter_id']].copy()
wh_poke.update({
'disappear_time': calendar.timegm(
disappear_time.timetuple()),
'last_modified_time': None, # todo
'time_until_hidden_ms': time_left_in_seconds*1000,
'verified': True, # todo?
'seconds_until_despawn': time_left_in_seconds,
'spawn_start': 777, # todo
'spawn_end': 888, # todo
'player_level': 17 # todo
})
if wh_poke['cp_multiplier'] is not None:
wh_poke.update({
'pokemon_level': calc_pokemon_level(
wh_poke['cp_multiplier'])
})
wh_update_queue.put(('pokemon', wh_poke))

if pokemons:
db_updates_queue.put((Pokemon, pokemons))
Expand All @@ -73,9 +101,10 @@ class FakeSearchScriptArgs:
pass


def fake_search_thread(args, position, db_updates_queue):
def fake_search_thread(args, position, db_updates_queue, wh_update_queue):
# pass control to fake_search_script
add_pokemon_func = (lambda objs: add_fake_pokemon(db_updates_queue, objs))
add_pokemon_func = (lambda objs: add_fake_pokemon(args, db_updates_queue,
wh_update_queue, objs))
script = imp.load_source('', args.fake_search_script)
fake_search_script_args = FakeSearchScriptArgs()
fake_search_script_args.args = args
Expand Down
3 changes: 2 additions & 1 deletion runserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,8 @@ def main():
log.info('** Starting a fake search **')
search_thread = Thread(target=fake_search_thread,
name='search-overseer',
args=(args, position, db_updates_queue,))
args=(args, position, db_updates_queue,
wh_updates_queue))
else:
argset = (args, new_location_queue, pause_bit,
heartbeat, db_updates_queue, wh_updates_queue)
Expand Down