diff --git a/README.md b/README.md index b7cbd6f..6dc88d2 100644 --- a/README.md +++ b/README.md @@ -42,3 +42,15 @@ To get help on a subcommand: etherdump revisionscount --help +file sync +---------- +epfs? +pad to file + +etherdump init http://localhost:9001/ --path foo +etherdump status + compare state of files to etherpad & report +etherdump pull +etherdump sync + push / pull file contents to pad + diff --git a/etherdump/commands/creatediffhtml.py b/etherdump/commands/creatediffhtml.py index 5dc697c..06433e6 100644 --- a/etherdump/commands/creatediffhtml.py +++ b/etherdump/commands/creatediffhtml.py @@ -7,32 +7,33 @@ from urllib2 import urlopen, HTTPError, URLError def main(args): - p = ArgumentParser("calls the createDiffHTML API function for the given padid") - p.add_argument("padid", help="the padid") - p.add_argument("--padinfo", default="padinfo.json", help="padinfo, default: padinfo.json") - p.add_argument("--showurl", default=False, action="store_true") - p.add_argument("--format", default="text", help="output format, can be: text, json; default: text") - p.add_argument("--rev", type=int, default=None, help="revision, default: latest") - args = p.parse_args(args) + p = ArgumentParser("calls the createDiffHTML API function for the given padid") + p.add_argument("padid", help="the padid") + p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: .etherdump/settings.json") + p.add_argument("--showurl", default=False, action="store_true") + p.add_argument("--format", default="text", help="output format, can be: text, json; default: text") + p.add_argument("--rev", type=int, default=None, help="revision, default: latest") + args = p.parse_args(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'] - data['padID'] = args.padid - data['startRev'] = "0" - if args.rev != None: - data['rev'] = args.rev - requesturl = apiurl+'createDiffHTML?'+urlencode(data) - if args.showurl: - print requesturl - else: - try: - results = json.load(urlopen(requesturl))['data'] - if args.format == "json": - print json.dumps(results) - else: - print results['html'].encode("utf-8") - except HTTPError as e: - pass \ No newline at end of file + with open(args.padinfo) as f: + info = json.load(f) + apiurl = info.get("apiurl") + # apiurl = "{0[protocol]}://{0[hostname]}:{0[port]}{0[apiurl]}{0[apiversion]}/".format(info) + data = {} + data['apikey'] = info['apikey'] + data['padID'] = args.padid + data['startRev'] = "0" + if args.rev != None: + data['rev'] = args.rev + requesturl = apiurl+'createDiffHTML?'+urlencode(data) + if args.showurl: + print requesturl + else: + try: + results = json.load(urlopen(requesturl))['data'] + if args.format == "json": + print json.dumps(results) + else: + print results['html'].encode("utf-8") + except HTTPError as e: + pass \ No newline at end of file diff --git a/etherdump/commands/dumpcsv.py b/etherdump/commands/dumpcsv.py index 51468b0..0c4d761 100644 --- a/etherdump/commands/dumpcsv.py +++ b/etherdump/commands/dumpcsv.py @@ -31,13 +31,13 @@ def jsonload (url): def main (args): p = ArgumentParser("outputs a CSV of information all all pads") - p.add_argument("--padinfo", default="padinfo.json", help="padinfo, default: padinfo.json") + p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: .etherdump/settings.json") p.add_argument("--zerorevs", default=False, action="store_true", help="include pads with zero revisions, default: False") args = p.parse_args(args) with open(args.padinfo) as f: info = json.load(f) - apiurl = "{0[protocol]}://{0[hostname]}:{0[port]}{0[apiurl]}{0[apiversion]}/".format(info) + apiurl = info.get("apiurl") data = {} data['apikey'] = info['apikey'] requesturl = apiurl+'listAllPads?'+urlencode(data) diff --git a/etherdump/commands/gethtml.py b/etherdump/commands/gethtml.py index 9cd1347..c19e796 100644 --- a/etherdump/commands/gethtml.py +++ b/etherdump/commands/gethtml.py @@ -7,28 +7,29 @@ from urllib2 import urlopen, HTTPError, URLError def main(args): - p = ArgumentParser("calls the getHTML API function for the given padid") - p.add_argument("padid", help="the padid") - p.add_argument("--padinfo", default="padinfo.json", help="padinfo, default: padinfo.json") - p.add_argument("--showurl", default=False, action="store_true") - p.add_argument("--format", default="text", help="output format, can be: text, json; default: text") - p.add_argument("--rev", type=int, default=None, help="revision, default: latest") - args = p.parse_args(args) + p = ArgumentParser("calls the getHTML API function for the given padid") + p.add_argument("padid", help="the padid") + p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: .etherdump/settings.json") + p.add_argument("--showurl", default=False, action="store_true") + p.add_argument("--format", default="text", help="output format, can be: text, json; default: text") + p.add_argument("--rev", type=int, default=None, help="revision, default: latest") + args = p.parse_args(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'] - data['padID'] = args.padid - if args.rev != None: - data['rev'] = args.rev - requesturl = apiurl+'getHTML?'+urlencode(data) - if args.showurl: - print requesturl - else: - results = json.load(urlopen(requesturl))['data'] - if args.format == "json": - print json.dumps(results) - else: - print results['html'].encode("utf-8") + with open(args.padinfo) as f: + info = json.load(f) + apiurl = info.get("apiurl") + # apiurl = "{0[protocol]}://{0[hostname]}:{0[port]}{0[apiurl]}{0[apiversion]}/".format(info) + data = {} + data['apikey'] = info['apikey'] + data['padID'] = args.padid + if args.rev != None: + data['rev'] = args.rev + requesturl = apiurl+'getHTML?'+urlencode(data) + if args.showurl: + print requesturl + else: + results = json.load(urlopen(requesturl))['data'] + if args.format == "json": + print json.dumps(results) + else: + print results['html'].encode("utf-8") diff --git a/etherdump/commands/gettext.py b/etherdump/commands/gettext.py index 77e56c8..66f75c3 100644 --- a/etherdump/commands/gettext.py +++ b/etherdump/commands/gettext.py @@ -7,28 +7,29 @@ from urllib2 import urlopen, HTTPError, URLError def main(args): - p = ArgumentParser("calls the getText API function for the given padid") - p.add_argument("padid", help="the padid") - p.add_argument("--padinfo", default="padinfo.json", help="padinfo, default: padinfo.json") - p.add_argument("--showurl", default=False, action="store_true") - p.add_argument("--format", default="text", help="output format, can be: text, json; default: text") - p.add_argument("--rev", type=int, default=None, help="revision, default: latest") - args = p.parse_args(args) + p = ArgumentParser("calls the getText API function for the given padid") + p.add_argument("padid", help="the padid") + p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: .etherdump/settings.json") + p.add_argument("--showurl", default=False, action="store_true") + p.add_argument("--format", default="text", help="output format, can be: text, json; default: text") + p.add_argument("--rev", type=int, default=None, help="revision, default: latest") + args = p.parse_args(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'] - data['padID'] = args.padid # is utf-8 encoded - if args.rev != None: - data['rev'] = args.rev - requesturl = apiurl+'getText?'+urlencode(data) - if args.showurl: - print requesturl - else: - results = json.load(urlopen(requesturl))['data'] - if args.format == "json": - print json.dumps(results) - else: - print results['text'].encode("utf-8") + with open(args.padinfo) as f: + info = json.load(f) + apiurl = info.get("apiurl") + # apiurl = "{0[protocol]}://{0[hostname]}:{0[port]}{0[apiurl]}{0[apiversion]}/".format(info) + data = {} + data['apikey'] = info['apikey'] + data['padID'] = args.padid # is utf-8 encoded + if args.rev != None: + data['rev'] = args.rev + requesturl = apiurl+'getText?'+urlencode(data) + if args.showurl: + print requesturl + else: + results = json.load(urlopen(requesturl))['data'] + if args.format == "json": + print json.dumps(results) + else: + print results['text'].encode("utf-8") diff --git a/etherdump/commands/list.py b/etherdump/commands/list.py index f15a685..5edce33 100644 --- a/etherdump/commands/list.py +++ b/etherdump/commands/list.py @@ -6,25 +6,26 @@ from urllib import urlencode from urllib2 import urlopen, HTTPError, URLError def main (args): - p = ArgumentParser("call listAllPads and print the results") - p.add_argument("--padinfo", default="padinfo.json", help="padinfo, default: padinfo.json") - p.add_argument("--showurl", default=False, action="store_true") - p.add_argument("--format", default="lines", help="output format: lines, json; default lines") - args = p.parse_args(args) + p = ArgumentParser("call listAllPads and print the results") + p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: .etherdump/settings.json") + p.add_argument("--showurl", default=False, action="store_true") + p.add_argument("--format", default="lines", help="output format: lines, json; default lines") + args = p.parse_args(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: - results = json.load(urlopen(requesturl))['data']['padIDs'] - if args.format == "json": - print json.dumps(results) - else: - for r in results: - print r.encode("utf-8") + with open(args.padinfo) as f: + info = json.load(f) + apiurl = info.get("apiurl") + # 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: + results = json.load(urlopen(requesturl))['data']['padIDs'] + if args.format == "json": + print json.dumps(results) + else: + for r in results: + print r.encode("utf-8") diff --git a/etherdump/commands/listauthors.py b/etherdump/commands/listauthors.py index a02e6e2..7679f88 100644 --- a/etherdump/commands/listauthors.py +++ b/etherdump/commands/listauthors.py @@ -7,26 +7,26 @@ from urllib2 import urlopen, HTTPError, URLError def main(args): - p = ArgumentParser("call listAuthorsOfPad for the padid") - p.add_argument("padid", help="the padid") - p.add_argument("--padinfo", default="padinfo.json", help="padinfo, default: padinfo.json") - p.add_argument("--showurl", default=False, action="store_true") - p.add_argument("--format", default="lines", help="output format, can be: lines, json; default: lines") - args = p.parse_args(args) + p = ArgumentParser("call listAuthorsOfPad for the padid") + p.add_argument("padid", help="the padid") + p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: .etherdump/settings.json") + p.add_argument("--showurl", default=False, action="store_true") + p.add_argument("--format", default="lines", help="output format, can be: lines, json; default: lines") + args = p.parse_args(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'] - data['padID'] = args.padid.encode("utf-8") - requesturl = apiurl+'listAuthorsOfPad?'+urlencode(data) - if args.showurl: - print requesturl - else: - results = json.load(urlopen(requesturl))['data']['authorIDs'] - if args.format == "json": - print json.dumps(results) - else: - for r in results: - print r.encode("utf-8") + with open(args.padinfo) as f: + info = json.load(f) + apiurl = info.get("apiurl") + data = {} + data['apikey'] = info['apikey'] + data['padID'] = args.padid.encode("utf-8") + requesturl = apiurl+'listAuthorsOfPad?'+urlencode(data) + if args.showurl: + print requesturl + else: + results = json.load(urlopen(requesturl))['data']['authorIDs'] + if args.format == "json": + print json.dumps(results) + else: + for r in results: + print r.encode("utf-8") diff --git a/etherdump/commands/revisionscount.py b/etherdump/commands/revisionscount.py index 77d57c4..d85f5ef 100644 --- a/etherdump/commands/revisionscount.py +++ b/etherdump/commands/revisionscount.py @@ -6,21 +6,21 @@ from urllib import urlencode from urllib2 import urlopen, HTTPError, URLError def main(args): - p = ArgumentParser("call getRevisionsCount for the given padid") - p.add_argument("padid", help="the padid") - 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(args) + p = ArgumentParser("call getRevisionsCount for the given padid") + p.add_argument("padid", help="the padid") + p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: .etherdump/settings.json") + p.add_argument("--showurl", default=False, action="store_true") + args = p.parse_args(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'] - data['padID'] = args.padid.encode("utf-8") - requesturl = apiurl+'getRevisionsCount?'+urlencode(data) - if args.showurl: - print requesturl - else: - results = json.load(urlopen(requesturl))['data']['revisions'] - print results + with open(args.padinfo) as f: + info = json.load(f) + apiurl = info.get("apiurl") + data = {} + data['apikey'] = info['apikey'] + data['padID'] = args.padid.encode("utf-8") + requesturl = apiurl+'getRevisionsCount?'+urlencode(data) + if args.showurl: + print requesturl + else: + results = json.load(urlopen(requesturl))['data']['revisions'] + print results diff --git a/etherdump/commands/sync.py b/etherdump/commands/sync.py index ba9ff22..fee7ff5 100644 --- a/etherdump/commands/sync.py +++ b/etherdump/commands/sync.py @@ -24,16 +24,15 @@ def jsonload (url): def load_padinfo(p): with open(p) as f: info = json.load(f) - info['api'] = "{0[protocol]}://{0[hostname]}:{0[port]}{0[apiurl]}{0[apiversion]}/".format(info) return info def main (args): p = ArgumentParser("Check for pads that have changed since last sync (according to .meta.json)") p.add_argument("padid", nargs="*", default=[]) - p.add_argument("--padinfo", default="padinfo.json", help="padinfo, default: padinfo.json") + p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: .etherdump/settings.json") p.add_argument("--zerorevs", default=False, action="store_true", help="include pads with zero revisions, default: False (i.e. pads with no revisions are skipped)") - p.add_argument("--pub", default="pub", help="folder to store files for public pads, default: pub") + p.add_argument("--pub", default=".", help="folder to store files for public pads, default: pub") p.add_argument("--group", default="g", help="folder to store files for group pads, default: g") p.add_argument("--skip", default=None, type=int, help="skip this many items, default: None") p.add_argument("--meta", default=False, action="store_true", help="download meta to PADID.meta.json, default: False") @@ -50,7 +49,7 @@ def main (args): if args.padid: padids = args.padid else: - padids = jsonload(info['api']+'listAllPads?'+urlencode(data))['data']['padIDs'] + padids = jsonload(info['apiurl']+'listAllPads?'+urlencode(data))['data']['padIDs'] padids.sort() numpads = len(padids) # maxmsglen = 0 @@ -80,14 +79,14 @@ def main (args): if os.path.exists(metapath): with open(metapath) as f: meta = json.load(f) - revisions = jsonload(info['api']+'getRevisionsCount?'+urlencode(data))['data']['revisions'] + revisions = jsonload(info['apiurl']+'getRevisionsCount?'+urlencode(data))['data']['revisions'] if meta['revisions'] == revisions: skip=True break meta = {'padid': padid.encode("utf-8")} if revisions == None: - meta['revisions'] = jsonload(info['api']+'getRevisionsCount?'+urlencode(data))['data']['revisions'] + meta['revisions'] = jsonload(info['apiurl']+'getRevisionsCount?'+urlencode(data))['data']['revisions'] else: meta['revisions' ] = revisions @@ -99,9 +98,9 @@ def main (args): # todo: load more metadata! meta['pad'], meta['group'] = splitpadname(padid) meta['pathbase'] = p - meta['lastedited_raw'] = int(jsonload(info['api']+'getLastEdited?'+urlencode(data))['data']['lastEdited']) + meta['lastedited_raw'] = int(jsonload(info['apiurl']+'getLastEdited?'+urlencode(data))['data']['lastEdited']) meta['lastedited_iso'] = datetime.fromtimestamp(int(meta['lastedited_raw'])/1000).isoformat() - meta['author_ids'] = jsonload(info['api']+'listAuthorsOfPad?'+urlencode(data))['data']['authorIDs'] + meta['author_ids'] = jsonload(info['apiurl']+'listAuthorsOfPad?'+urlencode(data))['data']['authorIDs'] break except HTTPError as e: tries += 1 @@ -129,20 +128,20 @@ def main (args): # Process text, html, dhtml, all options if args.all or args.text: - text = jsonload(info['api']+'getText?'+urlencode(data)) + text = jsonload(info['apiurl']+'getText?'+urlencode(data)) text = text['data']['text'] with open(p+".txt", "w") as f: f.write(text.encode("utf-8")) if args.all or args.html: - html = jsonload(info['api']+'getHTML?'+urlencode(data)) + html = jsonload(info['apiurl']+'getHTML?'+urlencode(data)) html = html['data']['html'] with open(p+".html", "w") as f: f.write(html.encode("utf-8")) if args.all or args.dhtml: data['startRev'] = "0" - html = jsonload(info['api']+'createDiffHTML?'+urlencode(data)) + html = jsonload(info['apiurl']+'createDiffHTML?'+urlencode(data)) html = html['data']['html'] with open(p+".diff.html", "w") as f: f.write(html.encode("utf-8"))