1
0

fix web request server. fixes #1455

This commit is contained in:
ThomasV
2015-09-30 11:06:27 +02:00
parent dd679ccb27
commit f3bd1662f7
4 changed files with 31 additions and 27 deletions

View File

@@ -407,28 +407,6 @@ def get_daemon(config, start_daemon):
def check_www_dir(rdir):
# rewrite index.html every time
import urllib, urlparse, shutil, os
if not os.path.exists(rdir):
os.mkdir(rdir)
index = os.path.join(rdir, 'index.html')
src = os.path.join(os.path.dirname(__file__), 'www', 'index.html')
shutil.copy(src, index)
files = [
"https://code.jquery.com/jquery-1.9.1.min.js",
"https://raw.githubusercontent.com/davidshimjs/qrcodejs/master/qrcode.js",
"https://code.jquery.com/ui/1.10.3/jquery-ui.js",
"https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css"
]
for URL in files:
path = urlparse.urlsplit(URL).path
filename = os.path.basename(path)
path = os.path.join(rdir, filename)
if not os.path.exists(path):
print_error("downloading ", URL)
urllib.urlretrieve(URL, path)
@@ -546,10 +524,10 @@ if __name__ == '__main__':
network.start()
server = NetworkServer(config, network)
if config.get('websocket_server'):
import websockets
from electrum import websockets
websockets.WebSocketServer(config, server).start()
if config.get('requests_dir'):
check_www_dir(config.get('requests_dir'))
util.check_www_dir(config.get('requests_dir'))
server.start()
server.join()
else: