diff --git a/createDiffHTML.py b/createDiffHTML.py index 2ae417a..cf5ecbb 100755 --- a/createDiffHTML.py +++ b/createDiffHTML.py @@ -10,17 +10,11 @@ p.add_argument("padid") p.add_argument("--startrev", type=int, default=0, help="starting revision") p.add_argument("--endrev", type=int, default=None, help="ending revision, default: last") p.add_argument("--padinfo", default="padinfo.json", help="padinfo, default: padinfo.json") -p.add_argument("--protocol", default="http") p.add_argument("--showurl", default=False, action="store_true") args = p.parse_args() with open(args.padinfo) as f: info = json.load(f) -if "protocol" not in info: - info['protocol'] = args.protocol -if "port" not in info: - info['port'] = 9001 - apiurl = "{0[protocol]}://{0[hostname]}:{0[port]}{0[apiurl]}{0[apiversion]}/".format(info) data = {} data['apikey'] = info['apikey'] diff --git a/listAllPads.py b/listAllPads.py new file mode 100755 index 0000000..5fbfe36 --- /dev/null +++ b/listAllPads.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +from argparse import ArgumentParser +import json +from urllib import urlencode +from urllib2 import urlopen, HTTPError, URLError + +p = ArgumentParser("") +p.add_argument("--padinfo", default="padinfo.json", help="padinfo, default: padinfo.json") +p.add_argument("--showurl", default=False, action="store_true") +args = p.parse_args() + +with open(args.padinfo) as f: + info = json.load(f) +apiurl = "{0[protocol]}://{0[hostname]}:{0[port]}{0[apiurl]}{0[apiversion]}/".format(info) +data = {} +data['apikey'] = info['apikey'] +requesturl = apiurl+'listAllPads?'+urlencode(data) +if args.showurl: + print requesturl +else: + print json.dumps(json.load(urlopen(requesturl))['data']['padIDs']) + diff --git a/padinfo.sample.json b/padinfo.sample.json index a6f17b4..bfa3bbd 100644 --- a/padinfo.sample.json +++ b/padinfo.sample.json @@ -1,4 +1,5 @@ { + "protocol": "http", "hostname": "localhost", "port": 9001, "apiurl": "/api/",