From a146ebbc3261f6cba6dc10e5a5524f6eca9ac98d Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 8 Jan 2019 14:12:15 -0800 Subject: start refactoring API object passing --- python/fatcat_export.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'python/fatcat_export.py') diff --git a/python/fatcat_export.py b/python/fatcat_export.py index 6a5395de..a59fcc0b 100755 --- a/python/fatcat_export.py +++ b/python/fatcat_export.py @@ -15,11 +15,9 @@ from fatcat_client.rest import ApiException from fatcat_client import ReleaseEntity from fatcat_tools import uuid2fcid, entity_from_json, release_to_elasticsearch -def run_export_releases(args): - conf = fatcat_client.Configuration() - conf.host = args.host_url - api = fatcat_client.DefaultApi(fatcat_client.ApiClient(conf)) +def run_export_releases(args): + api = args.api for line in args.ident_file: ident = uuid2fcid(line.split()[0]) release = api.get_release(id=ident, expand="all") @@ -35,10 +33,7 @@ def run_transform_releases(args): json.dumps(release_to_elasticsearch(release)) + '\n') def run_export_changelog(args): - conf = fatcat_client.Configuration() - conf.host = args.host_url - api = fatcat_client.DefaultApi(fatcat_client.ApiClient(conf)) - + api = args.api end = args.end if end is None: latest = api.get_changelog(limit=1)[0] @@ -92,6 +87,8 @@ def main(): if not args.__dict__.get("func"): print("tell me what to do!") sys.exit(-1) + + args.api = public_api(args.host_url) args.func(args) if __name__ == '__main__': -- cgit v1.2.3 From 7e443092aee825ce30a0ffe14cd41d1e0ef3fe52 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 8 Jan 2019 14:20:05 -0800 Subject: partial fixes to fatcat_export.py --- python/fatcat_export.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'python/fatcat_export.py') diff --git a/python/fatcat_export.py b/python/fatcat_export.py index a59fcc0b..921b75ed 100755 --- a/python/fatcat_export.py +++ b/python/fatcat_export.py @@ -13,7 +13,8 @@ import argparse import fatcat_client from fatcat_client.rest import ApiException from fatcat_client import ReleaseEntity -from fatcat_tools import uuid2fcid, entity_from_json, release_to_elasticsearch +from fatcat_tools import uuid2fcid, entity_from_json, entity_to_dict, \ + release_to_elasticsearch, public_api def run_export_releases(args): @@ -21,7 +22,8 @@ def run_export_releases(args): for line in args.ident_file: ident = uuid2fcid(line.split()[0]) release = api.get_release(id=ident, expand="all") - args.json_output.write(json.dumps(release.to_dict()) + "\n") + args.json_output.write( + json.dumps(entity_to_dict(release)) + "\n") def run_transform_releases(args): for line in args.json_input: @@ -40,8 +42,9 @@ def run_export_changelog(args): end = latest.index for i in range(args.start, end): - entry = api.get_changelog_entry(id=i) - args.json_output.write(json.dumps(entry.to_dict()) + "\n") + entry = api.get_changelog_entry(index=i) + args.json_output.write( + json.dumps(entity_to_dict(entry)) + "\n") def main(): parser = argparse.ArgumentParser() -- cgit v1.2.3