github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 02:13:38 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Address review feedback

Browse Source
This commit is contained in:
Fabian Homborg 2021-07-11 11:23:16 +02:00
parent fa20dc8141
commit e021773288
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
share/tools/web_config/webconfig.py
View File

@ -881,7 +881,7 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
self.wfile.write(txt.encode("utf-8")) self.wfile.write(txt.encode("utf-8"))
def do_get_colors(self, path=None): def do_get_colors(self, path=None):
""" Read the colors from a .theme file or the current shell config (if no path has been given) """ """ Read the colors from a .theme file in path, or the current shell if no path has been given """
# Looks for fish_color_*. # Looks for fish_color_*.
# Returns an array of lists [color_name, color_description, color_value] # Returns an array of lists [color_name, color_description, color_value]
result = [] result = []
@ -952,9 +952,9 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
key = key.strip("# '") key = key.strip("# '")
value = value.strip(" '\"") value = value.strip(" '\"")
# Only use keys we know # Only use keys we know
if not key in ["name", "preferred_background", "url"]: continue if not key in ("name", "preferred_background", "url"): continue
if key == "preferred_background": if key == "preferred_background":
if not value in named_colors and not value.startswith("#"): if value not in named_colors and not value.startswith("#"):
value = "#" + value value = "#" + value
extrainfo[key] = value extrainfo[key] = value
@ -1320,13 +1320,11 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
output = [curinfo, definfo] output = [curinfo, definfo]
paths = sorted(glob.iglob("themes/*.theme"), key=str.casefold) paths = sorted(glob.iglob("themes/*.theme"), key=str.casefold)
for p in paths: for p in paths:
# Strip ".theme" suffix and path theme = os.path.splitext(os.path.basename(p))[0]
theme = os.path.basename(p)[:-6]
if any(theme == d["theme"] for d in output): continue if any(theme == d["theme"] for d in output): continue
out, outinfo = self.do_get_colors(p) out, outinfo = self.do_get_colors(p)
outinfo.update({ "theme": theme, "colors": out }) outinfo.update({ "theme": theme, "colors": out })
output.append(outinfo) output.append(outinfo)
print(len(output))
elif p == "/functions/": elif p == "/functions/":
output = self.do_get_functions() output = self.do_get_functions()
elif p == "/variables/": elif p == "/variables/":