From 724b8d0c003e65243250728780d2fcfc70f69f98 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Fri, 11 Mar 2016 01:21:46 -0500 Subject: [PATCH 1/2] Fix characters getting assigned vcode as api id --- celerytask/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index f62a2641..bc2a2825 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -529,7 +529,7 @@ def refresh_api(api_key_pair): logger.debug("API key %s has a new character on the account: %s" % (api_key_pair.api_id, characters.result[char]['name'])) if new_character: logger.debug("Creating new character %s from api key %s" % (characters.result[char]['name'], api_key_pair.api_id)) - EveManager.create_characters_from_list(characters, user, api_key_pair.api_key) + EveManager.create_characters_from_list(characters, user, api_key_pair.api_id) else: logger.debug("API key %s is no longer valid; it and its characters will be deleted." % api_key_pair.api_id) EveManager.delete_characters_by_api_id(api_key_pair.api_id, user.id) From 3aa3eb10c148f4255a18e7bb3979cb4f4577f084 Mon Sep 17 00:00:00 2001 From: Ydmir Date: Fri, 11 Mar 2016 09:09:14 +0100 Subject: [PATCH 2/2] EveWho-manager can now read more than 200 members. --- services/managers/evewho_manager.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/services/managers/evewho_manager.py b/services/managers/evewho_manager.py index 05bba41d..8cdaab8d 100644 --- a/services/managers/evewho_manager.py +++ b/services/managers/evewho_manager.py @@ -15,6 +15,15 @@ class EveWhoManager(): def get_corporation_members(corpid): url = "http://evewho.com/api.php?type=corplist&id=%s" % corpid jsondata = requests.get(url).content - data=json.loads(jsondata.decode()) + data = json.loads(jsondata.decode()) - return {row["character_id"]:{"name":row["name"], "id":row["character_id"]} for row in data["characters"]} + members = {} + page_count=0 + while len(data["characters"]): + for row in data["characters"]: + members[row["character_id"]] = {"name":row["name"], "id":row["character_id"]} + page_count=page_count+1 + jsondata = requests.get(url + "&page=%i" % page_count).content + data = json.loads(jsondata.decode()) + + return members