GitHub/butterfly
1
0
Fork 0
mirror of https://github.com/paradoxxxzero/butterfly.git synced 2026-05-26 07:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix one-shot auto-open url when uri-root-path is used.

Browse Source
This commit is contained in:
Florian Mounier
2018-09-03 11:54:38 +02:00
parent 5b6b61286d
commit 82676862ca
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -22,7 +22,6 @@ check-outdated:
ARGS ?= --port=1212 --unsecure --debug ARGS ?= --port=1212 --unsecure --debug
run-debug: run-debug:
sleep 0.5 && $(BROWSER) http://localhost:1212&
$(PYTHON) ./butterfly.server.py $(ARGS) $(PYTHON) ./butterfly.server.py $(ARGS)
build-coffee: build-coffee:

6
butterfly.server.py
View File

@@ -375,8 +375,10 @@ ioloop = tornado.ioloop.IOLoop.instance()
if port == 0: if port == 0:
port = list(http_server._sockets.values())[0].getsockname()[1] port = list(http_server._sockets.values())[0].getsockname()[1]
url = "http%s://%s:%d/" % ( url = "http%s://%s:%d/%s" % (
"s" if not options.unsecure else "", host, port) "s" if not options.unsecure else "", host, port,
(options.uri_root_path.strip('/') + '/') if options.uri_root_path else ''
)
if not options.one_shot or not webbrowser.open(url): if not options.one_shot or not webbrowser.open(url):
log.warn('Butterfly is ready, open your browser to: %s' % url) log.warn('Butterfly is ready, open your browser to: %s' % url)