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.

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

Jump to bottom

Fix for clash between CLI and JSON args #1420

Merged
merged 8 commits into from
Jul 28, 2016
Merged

Fix for clash between CLI and JSON args #1420

merged 8 commits into from
Jul 28, 2016

Commits on Jul 28, 2016

  1. makes spin forts and catch pokemon config in json not being overwritt… 

    …en by default cli args value if user dont provide cli args
    @douglascamata
    douglascamata committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    d7b4f99 View commit details
    Browse the repository at this point in the history

  2. huge fix to how cli and json parameters are loaded 

    The CLI parameter parser now uses JSON-loaded parameters as first
fallback to missing parameters. The second fallback to missing
parameters are the default values previously used.

This is the perfect handling for making CLI args override JSON
configuration only for provided args. Non-provided args that are not
found in are set to the default value we think most users are going to
like.
    @douglascamata
    douglascamata committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    b44572a View commit details
    Browse the repository at this point in the history

  3. overriding config from loaded JSON is not necessary here anymore

    @douglascamata
    douglascamata committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    6dfb640 View commit details
    Browse the repository at this point in the history

  4. trying to fix the auth_service parameters

    @douglascamata
    douglascamata committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    ef90572 View commit details
    Browse the repository at this point in the history

  5. add mixing cli args fixes that were forgotten

    @douglascamata
    douglascamata committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    5f4c818 View commit details
    Browse the repository at this point in the history

  6. fixing unicode load in location

    @douglascamata
    douglascamata committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    8a0f420 View commit details
    Browse the repository at this point in the history

  7. refactoring parameter configuration to avoid mistakes

    @douglascamata
    douglascamata committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    7215598 View commit details
    Browse the repository at this point in the history

  8. changed the order of functions in pokecli.py to follow some guidelines 

    main function comes first all all its children below
    @douglascamata
    douglascamata committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    9076926 View commit details
    Browse the repository at this point in the history