Change breeds data structure to dictionary in preparation for implementing sub-breeds

This commit is contained in:
Adam Piontek 2018-08-25 16:11:55 -04:00
parent f18bf63266
commit 5b866c4a2a

View file

@ -1,9 +1,7 @@
import logging import logging
import json
from errbot import botcmd, BotPlugin
import requests import requests
import json
from errbot import botcmd, BotPlugin
class Doggo(BotPlugin): class Doggo(BotPlugin):
@ -11,7 +9,7 @@ class Doggo(BotPlugin):
BASE_URL = 'https://dog.ceo/api' BASE_URL = 'https://dog.ceo/api'
breeds = [] breeds = {}
@botcmd(split_args_with=' ') @botcmd(split_args_with=' ')
def doggo(self, msg, args): def doggo(self, msg, args):
@ -24,7 +22,7 @@ class Doggo(BotPlugin):
breed = args[0] breed = args[0]
if not self.breeds: if not self.breeds:
self.reloadbreeds(msg, args) self.reloadbreeds(msg, args)
if breed in self.breeds: if breed in self.breeds.keys():
url = '{}/breed/{}/images/random'.format(self.BASE_URL, breed) url = '{}/breed/{}/images/random'.format(self.BASE_URL, breed)
else: else:
return 'Breed not found: {}. List breeds with !listbreeds'.format(breed) return 'Breed not found: {}. List breeds with !listbreeds'.format(breed)
@ -52,7 +50,7 @@ class Doggo(BotPlugin):
# Send the output to the user to prevent spamming the channel # Send the output to the user to prevent spamming the channel
direct_to_user = self.build_identifier(str(msg.frm)) direct_to_user = self.build_identifier(str(msg.frm))
for breed in sorted(self.breeds): for breed in sorted(self.breeds.keys()):
self.send(direct_to_user, breed) self.send(direct_to_user, breed)
@ -74,4 +72,5 @@ class Doggo(BotPlugin):
if not isinstance(data, list): if not isinstance(data, list):
return 'Unable to load breeds list' return 'Unable to load breeds list'
self.breeds = data for breed in data:
self.breeds[breed] = []