Browse Source

fix response handler (closes #19)

Signed-off-by: r4sas <r4sas@i2pmail.org>
dependabot/add-v2-config-file
R4SAS 5 years ago
parent
commit
b596f42b7e
Signed by untrusted user: r4sas
GPG Key ID: 66F6C87B98EBCFE2
  1. 1
      pbincli/actions.py
  2. 4
      pbincli/api.py

1
pbincli/actions.py

@ -73,6 +73,7 @@ def send(args, api_client, settings=None):
PBinCLIError("Something went wrong...\nError: Empty response.") PBinCLIError("Something went wrong...\nError: Empty response.")
if args.short: if args.short:
print("\nQuerying URL shortening service...")
shortener.getlink("{}?{}#{}".format( shortener.getlink("{}?{}#{}".format(
settings['server'], settings['server'],
result['id'], result['id'],

4
pbincli/api.py

@ -125,7 +125,7 @@ class Shortener:
else: else:
response = result.json() response = result.json()
if {'status', 'code', 'message'} <= set(response.keys()): if {'status', 'statusCode', 'message'} <= set(response.keys()):
if response['status'] == 'fail': if response['status'] == 'fail':
PBinCLIError("YOURLS: Received error from API: {}".format(response['message'])) PBinCLIError("YOURLS: Received error from API: {}".format(response['message']))
if not 'shorturl' in response: if not 'shorturl' in response:
@ -133,7 +133,7 @@ class Shortener:
else: else:
print("Short Link:\t{}".format(response['shorturl'])) print("Short Link:\t{}".format(response['shorturl']))
else: else:
PBinCLIError("YOURLS: No status, code and message fields in response! Received:\n{}".format(response)) PBinCLIError("YOURLS: No status, statusCode or message fields in response! Received:\n{}".format(response))
elif self.api == 'clckru': elif self.api == 'clckru':
# from urllib.parse import quote_plus # from urllib.parse import quote_plus

Loading…
Cancel
Save