From 3bb00f0006a4088a0d72d72687b95f31c9ea4d66 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sun, 7 Jun 2015 21:52:23 +0200 Subject: [PATCH] store json record requests --- lib/commands.py | 35 ++++++++------- lib/payrequest.html | 106 ++++++++++++++++++++++---------------------- 2 files changed, 74 insertions(+), 67 deletions(-) diff --git a/lib/commands.py b/lib/commands.py index afd9130d0..00b048071 100644 --- a/lib/commands.py +++ b/lib/commands.py @@ -542,17 +542,16 @@ class Commands: } # check if bip70 file exists rdir = self.config.get('requests_dir') - if rdir: - path = os.path.join(rdir, key + '.bip70') - if os.path.exists(path): - out['path'] = path - url = 'file://' + path - r = self.config.get('url_rewrite') - if r: - a, b = r - url = url.replace(a, b) - out['request_url'] = url - out['URI'] += '&r=' + url + path = os.path.join(rdir, key + '.bip70') + if rdir and os.path.exists(path): + out['path'] = path + baseurl = 'file://' + rdir + rewrite = self.config.get('url_rewrite') + if rewrite: + baseurl = baseurl.replace(*rewrite) + out['request_url'] = os.path.join(baseurl, key + '.bip70') + out['URI'] += '&r=' + out['request_url'] + out['index_url'] = os.path.join(baseurl, 'index.html') + '?id=' + key return out @@ -575,16 +574,22 @@ class Commands: return map(self._format_request, self.wallet.get_sorted_requests()) @command('w') - def addrequest(self, requested_amount, reason='', expiration=None): + def addrequest(self, requested_amount, reason='', expiration=60*60): """Create a payment request.""" amount = int(Decimal(requested_amount)*COIN) key = self.wallet.add_payment_request(amount, reason, expiration) if key is None: return - # create file req = self.wallet.get_payment_request(key) - paymentrequest.publish_request(self.config, key, req) - return self._format_request(req) + rdir = self.config.get('requests_dir') + if rdir: + path = paymentrequest.publish_request(self.config, key, req) + req['path'] = path + req = self._format_request(req) + if rdir: + with open(os.path.join(rdir, key + '.json'), 'w') as f: + f.write(json.dumps(req)) + return req @command('w') def rmrequest(self, address): diff --git a/lib/payrequest.html b/lib/payrequest.html index da388b3ea..35c963367 100644 --- a/lib/payrequest.html +++ b/lib/payrequest.html @@ -2,66 +2,69 @@ Payment request - + - - - - + + + }) + .fail(function() { + console.log( "error fail" ); + $("

").text("error").appendTo($("p#error")); + }); +}; +

@@ -79,4 +82,3 @@ $(function () { -