mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 08:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

config interface improvement

Browse source
This commit is contained in:
Anthony Scopatz 2019-10-23 17:20:10 -04:00
parent a7a4ecb9da
commit 9a3f0e5cb5
4 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
setup.py
View file

@ -378,6 +378,12 @@ def main():
"xonsh": ["*.json", "*.githash"],
"xontrib": ["*.xsh"],
"xonsh.lib": ["*.xsh"],
"xonsh.webconfig": [
"*.html",
"js/app.min.js",
"js/bootstrap.min.css",
"js/LICENSE-bootstrap",
]
},
cmdclass=cmdclass,
scripts=scripts,

4
xonsh/webconfig/index.html
View file

@ -4,8 +4,8 @@
<meta charset="UTF-8">
<title>Xonsh Web Config</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="js/bootstrap.min.css">
<script src="js/app.js"></script>
<link rel="stylesheet" href="/js/bootstrap.min.css">
<script src="/js/app.min.js"></script>
</head>
<body>

4
xonsh/webconfig/main.py
View file

@ -97,7 +97,7 @@ class XonshConfigHTTPRequestHandler(server.SimpleHTTPRequestHandler):
def make_parser():
p = ArgumentParser("xonfig-web")
p = ArgumentParser("xonfig web")
p.add_argument(
"--no-browser",
action="store_false",
@ -133,6 +133,8 @@ def main(args=None):
type, value = sys.exc_info()[:2]
if "Address already in use" not in str(value):
raise
except KeyboardInterrupt:
break
port += 1

27
xonsh/xonfig.py
View file

@ -2,6 +2,7 @@
import os
import re
import ast
import sys
import json
import shutil
import random
@ -617,9 +618,9 @@ def _tutorial(args):
def _web(args):
import os
import subprocess
os.system("python web_config/webconfig.py")
subprocess.run([sys.executable, '-m', 'xonsh.webconfig'] + args.orig_args[1:])
@functools.lru_cache(1)
@ -634,7 +635,15 @@ def _xonfig_create_parser():
info.add_argument(
"--json", action="store_true", default=False, help="reports results as json"
)
wiz = subp.add_parser("wizard", help="displays configuration information")
web = subp.add_parser("web", help="Launch configurator in browser.")
web.add_argument(
"--no-browser",
action="store_false",
dest="browser",
default=True,
help="don't open browser",
)
wiz = subp.add_parser("wizard", help="Launch configurator in terminal")
wiz.add_argument(
"--file", default=None, help="config file location, default=$XONSHRC"
)
@ -653,16 +662,15 @@ def _xonfig_create_parser():
"style", nargs="?", default=None, help="style to preview, default: <current>"
)
subp.add_parser("tutorial", help="Launch tutorial in browser.")
subp.add_parser("web", help="Launch configurator in browser.")
return p
_XONFIG_MAIN_ACTIONS = {
"info": _info,
"web": _web,
"wizard": _wizard,
"styles": _styles,
"colors": _colors,
"web": _web,
"tutorial": _tutorial,
}
@ -675,6 +683,7 @@ def xonfig_main(args=None):
args.insert(0, "info")
parser = _xonfig_create_parser()
ns = parser.parse_args(args)
ns.orig_args = args
if ns.action is None: # apply default action
ns = parser.parse_args(["info"] + args)
return _XONFIG_MAIN_ACTIONS[ns.action](ns)
@ -748,10 +757,10 @@ WELCOME_MSG = [
("{{INTENSE_BLACK}}", "<", "-"),
"{{GREEN}}xonfig{{NO_COLOR}} tutorial {{INTENSE_WHITE}}-> Launch the tutorial in "
"the browser{{NO_COLOR}}",
"{{GREEN}}xonfig{{NO_COLOR}} wizard {{INTENSE_WHITE}}-> Run the configuration "
"wizard and claim your shell {{NO_COLOR}}",
"{{INTENSE_BLACK}}(Note: Run the Wizard or create a {{RED}}~/.xonshrc{{INTENSE_BLACK}} file "
"to suppress the welcome screen)",
"{{GREEN}}xonfig{{NO_COLOR}} web {{INTENSE_WHITE}}-> Run the configuration "
"tool in the browser and claim your shell {{NO_COLOR}}",
"{{INTENSE_BLACK}}(Note: Run the configurationn tool or create a "
"{{RED}}~/.xonshrc{{INTENSE_BLACK}} file to suppress the welcome screen)",
"",
]