Skip to content

Commit

Permalink
Allow to set non utf-8 location, both as command argument and config …
Browse files Browse the repository at this point in the history 
…value. (#945)
  • Loading branch information
@Nihisil @douglascamata
Nihisil authored and douglascamata committed Jul 26, 2016
1 parent a0246e5 commit c4c3487
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 74 deletions.
156 changes: 85 additions & 71 deletions pokecli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
if sys.version_info >= (2, 7, 9):
ssl._create_default_https_context = ssl._create_unverified_context


def init_config():
parser = argparse.ArgumentParser()
config_file = "configs/config.json"
Expand All @@ -50,7 +51,7 @@ def init_config():

# Select a config file code
parser.add_argument("-cf", "--config", help="Config File to use")
config_arg = unicode(parser.parse_args().config)
config_arg = parser.parse_known_args() and parser.parse_known_args()[0].config or None
if os.path.isfile(config_arg):
with open(config_arg) as data:
load.update(json.load(data))
Expand All @@ -61,103 +62,119 @@ def init_config():
else:
logger.log('Error: No /configs/config.json or specified config', 'red')


# Read passed in Arguments
required = lambda x: not x in load
parser.add_argument("-a",
"--auth_service",
help="Auth Service ('ptc' or 'google')",
required=required("auth_service"))
parser.add_argument(
"-a",
"--auth_service",
help="Auth Service ('ptc' or 'google')",
required=required("auth_service")
)
parser.add_argument("-u", "--username", help="Username")
parser.add_argument("-p", "--password", help="Password")
parser.add_argument("-l", "--location", help="Location")
parser.add_argument("-lc",
"--location_cache",
help="Bot will start at last known location",
type=bool,
default=False)
parser.add_argument("-m",
"--mode",
help="Farming Mode",
type=str,
default="all")
parser.add_argument("-l", "--location", help="Location", type=lambda s: unicode(s, 'utf8'))
parser.add_argument(
"-lc",
"--location_cache",
help="Bot will start at last known location",
type=bool,
default=False
)
parser.add_argument(
"-m",
"--mode",
help="Farming Mode",
type=str,
default="all"
)
parser.add_argument(
"-w",
"--walk",
help=
"Walk instead of teleport with given speed (meters per second, e.g. 2.5)",
type=float,
default=2.5)
parser.add_argument("-k",
"--gmapkey",
help="Set Google Maps API KEY",
type=str,
default=None)
default=2.5
)
parser.add_argument(
"-k",
"--gmapkey",
help="Set Google Maps API KEY",
type=str,
default=None
)
parser.add_argument(
"-ms",
"--max_steps",
help=
"Set the steps around your initial location(DEFAULT 5 mean 25 cells around your location)",
type=int,
default=50)
default=50
)
parser.add_argument(
"-it",
"--initial_transfer",
help=
"Transfer all duplicate pokemon with same ID on bot start, except pokemon with highest CP. Accepts a number to prevent transferring pokemon with a CP above the provided value. Default is 0 (aka transfer none).",
help="Transfer all duplicate pokemon with same ID on bot start, except pokemon with highest CP. Accepts a number to prevent transferring pokemon with a CP above the provided value. Default is 0 (aka transfer none).",
type=int,
default=0)
parser.add_argument("-d",
"--debug",
help="Debug Mode",
type=bool,
default=False)
parser.add_argument("-t",
"--test",
help="Only parse the specified location",
type=bool,
default=False)
default=0
)
parser.add_argument(
"-d",
"--debug",
help="Debug Mode",
type=bool,
default=False
)
parser.add_argument(
"-t",
"--test",
help="Only parse the specified location",
type=bool,
default=False
)
parser.add_argument(
"-du",
"--distance_unit",
help=
"Set the unit to display distance in (e.g, km for kilometers, mi for miles, ft for feet)",
help="Set the unit to display distance in (e.g, km for kilometers, mi for miles, ft for feet)",
type=str,
default="km")

default="km"
)
parser.add_argument(
"-if",
"--item_filter",
help=
"Pass a list of unwanted items to recycle when collected at a Pokestop (e.g, SYNTAX FOR CONFIG.JSON : [\"101\",\"102\",\"103\",\"104\"] to recycle potions when collected, SYNTAX FOR CONSOLE ARGUMENT : \"101\",\"102\",\"103\",\"104\")",
help="Pass a list of unwanted items to recycle when collected at a Pokestop (e.g, SYNTAX FOR CONFIG.JSON : [\"101\",\"102\",\"103\",\"104\"] to recycle potions when collected, SYNTAX FOR CONSOLE ARGUMENT : \"101\",\"102\",\"103\",\"104\")",
type=list,
default=[])

parser.add_argument("-ev",
"--evolve_all",
help="(Batch mode) Pass \"all\" or a list of pokemons to evolve (e.g., \"Pidgey,Weedle,Caterpie\"). Bot will start by attempting to evolve all pokemons. Great after popping a lucky egg!",
type=str,
default=[])

default=[]
)
parser.add_argument(
"-ev",
"--evolve_all",
help="(Batch mode) Pass \"all\" or a list of pokemons to evolve (e.g., \"Pidgey,Weedle,Caterpie\"). Bot will start by attempting to evolve all pokemons. Great after popping a lucky egg!",
type=str,
default=[]
)
parser.add_argument(
"-cm",
"--cp_min",
help=
"Minimum CP for evolve all. Bot will attempt to first evolve highest IV pokemons with CP larger than this.",
help="Minimum CP for evolve all. Bot will attempt to first evolve highest IV pokemons with CP larger than this.",
type=int,
default=300)

parser.add_argument("-ec",
"--evolve_captured",
help="(Ad-hoc mode) Bot will attempt to evolve all the pokemons captured!",
type=bool,
default=False)
parser.add_argument("-le",
"--use_lucky_egg",
help="Uses lucky egg when using evolve_all",
type=bool,
default=False)

default=300
)
parser.add_argument(
"-ec",
"--evolve_captured",
help="(Ad-hoc mode) Bot will attempt to evolve all the pokemons captured!",
type=bool,
default=False
)
parser.add_argument(
"-le",
"--use_lucky_egg",
help="Uses lucky egg when using evolve_all",
type=bool,
default=False
)

# Start to parse other attrs
config = parser.parse_args()
if not config.username and 'username' not in load:
config.username = raw_input("Username: ")
Expand All @@ -166,7 +183,7 @@ def init_config():

# Passed in arguments should trump
for key in config.__dict__:
if key in load:
if key in load and load[key]:
config.__dict__[key] = load[key]

if 'catch' in load:
Expand Down Expand Up @@ -203,12 +220,9 @@ def init_config():

return config

def main():

def main():
logger.log('PokemonGO Bot v1.0', 'green')
# log settings
# log format
#logging.basicConfig(level=logging.DEBUG, format='%(asctime)s [%(module)10s] [%(levelname)5s] %(message)s')
sys.stdout = codecs.getwriter('utf8')(sys.stdout)
sys.stderr = codecs.getwriter('utf8')(sys.stderr)

Expand Down
5 changes: 2 additions & 3 deletions pokemongo_bot/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,12 @@ def _set_starting_position(self):

if self.config.location:
try:
location_str = str(self.config.location)
location_str = u'{}'.format(self.config.location)
location = (self._get_pos_by_name(location_str.replace(" ", "")))
self.position = location
self.api.set_position(*self.position)
logger.log('')
logger.log(u'Location Found: {}'.format(self.config.location.decode(
'utf-8')))
logger.log(u'Location Found: {}'.format(location_str))
logger.log('GeoPosition: {}'.format(self.position))
logger.log('')
has_position = True
Expand Down

3 comments on commit c4c3487

@AnakTeka
Copy link

@AnakTeka AnakTeka commented on c4c3487 Jul 26, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't start the bot after this commit.

[18:29:05] PokemonGO Bot v1.0
Traceback (most recent call last):
  File "pokecli.py", line 250, in <module>
    main()
  File "pokecli.py", line 229, in main
    config = init_config()
  File "pokecli.py", line 55, in init_config
    if os.path.isfile(config_arg):
  File "/home/ayyy/opt/python/PokemonGo-Bot/venv/lib/python2.7/genericpath.py", line 29, in isfile
    st = os.stat(path)
TypeError: coercing to Unicode: need string or buffer, NoneType found

@mikexine
Copy link

@mikexine mikexine commented on c4c3487 Jul 26, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same error here. I have a configs/config.json file.
if I run the bot with python pokecli.py I get that same error, but with python pokecli.py -cf [something-random-here] it works (and it gets the file in configs/config.json)

@mehdi-S
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikexine workaroud dont work for me, issue created : #966

Please sign in to comment.