ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-05-31 15:49:41 +03:00
Code Issues Projects Releases Wiki Activity

Can specify player account by Cmdr name

Browse Source
This commit is contained in:
Jonathan Harris 2017-07-31 09:11:39 +01:00
parent 70362d91a8
commit bfda388d65
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
EDMC.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python2
# #
# Command-line interface. Requires prior setup through the GUI. # Command-line interface. Requires prior setup through the GUI.
# #
@ -52,6 +52,7 @@ try:
parser.add_argument('-t', metavar='FILE', help='write player status to FILE in CSV format') parser.add_argument('-t', metavar='FILE', help='write player status to FILE in CSV format')
parser.add_argument('-d', metavar='FILE', help='write raw JSON data to FILE') parser.add_argument('-d', metavar='FILE', help='write raw JSON data to FILE')
parser.add_argument('-n', action='store_true', help='send data to EDDN') parser.add_argument('-n', action='store_true', help='send data to EDDN')
parser.add_argument('-p', metavar='CMDR', help='Returns data from the specified player account')
parser.add_argument('-j', help=argparse.SUPPRESS) # Import JSON dump parser.add_argument('-j', help=argparse.SUPPRESS) # Import JSON dump
args = parser.parse_args() args = parser.parse_args()
@ -79,7 +80,19 @@ try:
config.set('querytime', getmtime(args.j)) config.set('querytime', getmtime(args.j))
else: else:
session = companion.Session() session = companion.Session()
if config.get('cmdrs'): if args.p:
cmdrs = config.get('cmdrs') or []
if args.p in cmdrs:
idx = cmdrs.index(args.p)
else:
for idx, cmdr in enumerate(cmdrs):
if cmdr.lower() == args.p.lower():
break
else:
raise companion.CredentialsError
username = config.get('fdev_usernames')[idx]
session.login(username, config.get_password(username))
elif config.get('cmdrs'):
username = config.get('fdev_usernames')[0] username = config.get('fdev_usernames')[0]
session.login(username, config.get_password(username)) session.login(username, config.get_password(username))
else: # <= 2.25 not yet migrated else: # <= 2.25 not yet migrated
@ -171,7 +184,7 @@ try:
except companion.ServerError as e: except companion.ServerError as e:
sys.stderr.write('Server is down\n') sys.stderr.write('Server is down\n')
sys.exit(EXIT_SERVER_DOWN) sys.exit(EXIT_SERVER)
except companion.CredentialsError as e: except companion.CredentialsError as e:
sys.stderr.write('Invalid Credentials\n') sys.stderr.write('Invalid Credentials\n')
sys.exit(EXIT_CREDENTIALS) sys.exit(EXIT_CREDENTIALS)

4
README.md
View File

@ -202,8 +202,9 @@ Arguments:
``` ```
-h, --help show this help message and exit -h, --help show this help message and exit
-v, --version print program version and exit -v, --version print program version and exit
-a FILE write ship loadout to FILE in Companion API json format
-c FILE write ship loadout to FILE in Coriolis json format -c FILE write ship loadout to FILE in Coriolis json format
-e FILE write ship loadout to FILE in E:D Shipyard format -e FILE write ship loadout to FILE in E:D Shipyard plain text format
-l FILE write ship locations to FILE in CSV format -l FILE write ship locations to FILE in CSV format
-m FILE write station commodity market data to FILE in CSV format -m FILE write station commodity market data to FILE in CSV format
-o FILE write station outfitting data to FILE in CSV format -o FILE write station outfitting data to FILE in CSV format
@ -211,6 +212,7 @@ Arguments:
-t FILE write player status to FILE in CSV format -t FILE write player status to FILE in CSV format
-d FILE write raw JSON data to FILE -d FILE write raw JSON data to FILE
-n send data to EDDN -n send data to EDDN
-p CMDR Returns data from the specified player account
``` ```
The program returns one of the following exit codes. Further information may be written to stderr. The program returns one of the following exit codes. Further information may be written to stderr.