mirror of
https://github.com/dylanaraps/pywal.git
synced 2025-05-29 06:07:35 +02:00
Add --current argument. Prints current / last used theme name.
squashed: flake8 / pylint Fix line length in pywal/export.py
This commit is contained in:
7brokenmirrors
parent
ffa427c095
commit
d3491924ac
@ -67,6 +67,9 @@ def get_args():
|
||||
arg.add_argument("--vte", action="store_true",
|
||||
help="Fix text-artifacts printed in VTE terminals.")
|
||||
|
||||
arg.add_argument("--current", action="store_true",
|
||||
help="Print the current / last used theme name.")
|
||||
|
||||
arg.add_argument("-c", action="store_true",
|
||||
help="Delete all cached colorschemes.")
|
||||
|
||||
@ -143,6 +146,13 @@ def parse_args_exit(parser):
|
||||
shutil.rmtree(scheme_dir, ignore_errors=True)
|
||||
sys.exit(0)
|
||||
|
||||
if args.current:
|
||||
theme_name = theme.get_last_used_theme()
|
||||
if theme_name:
|
||||
print(theme_name)
|
||||
sys.exit(0)
|
||||
sys.exit(1)
|
||||
|
||||
if not args.i and \
|
||||
not args.theme and \
|
||||
not args.R and \
|
||||
|
||||
145
pywal/export.py
145
pywal/export.py
@ -1,145 +0,0 @@
|
||||
"""
|
||||
Export colors in various formats.
|
||||
"""
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
|
||||
from . import util
|
||||
from .settings import CACHE_DIR, CONF_DIR, MODULE_DIR
|
||||
|
||||
|
||||
def template(colors, input_file, output_file=None):
|
||||
"""Read template file, substitute markers and
|
||||
save the file elsewhere."""
|
||||
# pylint: disable-msg=too-many-locals
|
||||
template_data = util.read_file_raw(input_file)
|
||||
for i, l in enumerate(template_data):
|
||||
for match in re.finditer(r"(?<=(?<!\{))(\{([^{}]+)\})(?=(?!\}))", l):
|
||||
# Get the color, and the functions associated with it
|
||||
cname, _, funcs = match.group(2).partition(".")
|
||||
# Check that functions are needed for this color
|
||||
if len(funcs) == 0:
|
||||
continue
|
||||
# Build up a string which will be replaced with the new color
|
||||
replace_str = cname
|
||||
# Color to be modified copied into new one
|
||||
new_color = util.Color(colors[cname].hex_color)
|
||||
# Execute each function to be done
|
||||
for func in filter(None, re.split(r"\)|\.", funcs)):
|
||||
# Get function name and arguments
|
||||
func = func.split("(")
|
||||
fname = func[0]
|
||||
if fname[0] == '.':
|
||||
fname = fname[1:]
|
||||
if not hasattr(new_color, fname):
|
||||
logging.error(
|
||||
"Syntax error in template file '%s' on line '%s'",
|
||||
input_file, i)
|
||||
function = getattr(new_color, fname)
|
||||
|
||||
# If the function is callable, call it
|
||||
if callable(function):
|
||||
if len(func) > 1:
|
||||
new_color = function(*func[1].split(","))
|
||||
else:
|
||||
new_color = function()
|
||||
# string to replace generated colors
|
||||
if func[0] != '.':
|
||||
replace_str += "."
|
||||
replace_str += "(".join(func) + ")"
|
||||
else:
|
||||
# if it is an attribute i.e. rgb
|
||||
replace_str += '.' + fname
|
||||
new_color = function
|
||||
|
||||
if isinstance(new_color, util.Color):
|
||||
new_color = new_color.strip
|
||||
# If the color was changed, replace with a unique identifier.
|
||||
if new_color is not colors[cname]:
|
||||
new_color = str(new_color)
|
||||
new_color_clean = (new_color.replace('[', '_')
|
||||
.replace(']', '_')
|
||||
.replace('.', '_'))
|
||||
template_data[i] = l.replace(replace_str,
|
||||
"color" + new_color_clean)
|
||||
colors["color" + new_color_clean] = new_color
|
||||
try:
|
||||
template_data = "".join(template_data).format(**colors)
|
||||
except (ValueError, KeyError, AttributeError) as exc:
|
||||
logging.error(
|
||||
"Syntax error in template file '%s': %r.",
|
||||
input_file, exc)
|
||||
return
|
||||
util.save_file(template_data, output_file)
|
||||
|
||||
|
||||
def flatten_colors(colors):
|
||||
"""Prepare colors to be exported.
|
||||
Flatten dicts and convert colors to util.Color()"""
|
||||
all_colors = {"wallpaper": colors["wallpaper"],
|
||||
"alpha": colors["alpha"],
|
||||
**colors["special"],
|
||||
**colors["colors"]}
|
||||
return {k: util.Color(v) for k, v in all_colors.items()}
|
||||
|
||||
|
||||
def get_export_type(export_type):
|
||||
"""Convert template type to the right filename."""
|
||||
return {
|
||||
"css": "colors.css",
|
||||
"dmenu": "colors-wal-dmenu.h",
|
||||
"dwm": "colors-wal-dwm.h",
|
||||
"st": "colors-wal-st.h",
|
||||
"tabbed": "colors-wal-tabbed.h",
|
||||
"gtk2": "colors-gtk2.rc",
|
||||
"json": "colors.json",
|
||||
"konsole": "colors-konsole.colorscheme",
|
||||
"kitty": "colors-kitty.conf",
|
||||
"nqq": "colors-nqq.css",
|
||||
"plain": "colors",
|
||||
"putty": "colors-putty.reg",
|
||||
"rofi": "colors-rofi.Xresources",
|
||||
"scss": "colors.scss",
|
||||
"shell": "colors.sh",
|
||||
"speedcrunch": "colors-speedcrunch.json",
|
||||
"sway": "colors-sway",
|
||||
"tty": "colors-tty.sh",
|
||||
"vscode": "colors-vscode.json",
|
||||
"waybar": "colors-waybar.css",
|
||||
"xresources": "colors.Xresources",
|
||||
"xmonad": "colors.hs",
|
||||
"yaml": "colors.yml",
|
||||
}.get(export_type, export_type)
|
||||
|
||||
|
||||
def every(colors, output_dir=CACHE_DIR):
|
||||
"""Export all template files."""
|
||||
colors = flatten_colors(colors)
|
||||
template_dir = os.path.join(MODULE_DIR, "templates")
|
||||
template_dir_user = os.path.join(CONF_DIR, "templates")
|
||||
util.create_dir(template_dir_user)
|
||||
|
||||
join = os.path.join # Minor optimization.
|
||||
for file in [*os.scandir(template_dir),
|
||||
*os.scandir(template_dir_user)]:
|
||||
if file.name != ".DS_Store" and not file.name.endswith(".swp"):
|
||||
template(colors, file.path, join(output_dir, file.name))
|
||||
|
||||
logging.info("Exported all files.")
|
||||
logging.info("Exported all user files.")
|
||||
|
||||
|
||||
def color(colors, export_type, output_file=None):
|
||||
"""Export a single template file."""
|
||||
all_colors = flatten_colors(colors)
|
||||
|
||||
template_name = get_export_type(export_type)
|
||||
template_file = os.path.join(MODULE_DIR, "templates", template_name)
|
||||
output_file = output_file or os.path.join(CACHE_DIR, template_name)
|
||||
|
||||
if os.path.isfile(template_file):
|
||||
template(all_colors, template_file, output_file)
|
||||
logging.info("Exported %s.", export_type)
|
||||
else:
|
||||
logging.warning("Template '%s' doesn't exist.", export_type)
|
||||
@ -19,11 +19,7 @@ def list_out():
|
||||
user_themes = [theme.name.replace(".json", "")
|
||||
for theme in list_themes_user()]
|
||||
|
||||
try:
|
||||
last_used_theme = util.read_file(os.path.join(
|
||||
CACHE_DIR, "last_used_theme"))[0].replace(".json", "")
|
||||
except FileNotFoundError:
|
||||
last_used_theme = ""
|
||||
last_used_theme = get_last_used_theme()
|
||||
|
||||
if user_themes:
|
||||
print("\033[1;32mUser Themes\033[0m:")
|
||||
@ -152,3 +148,14 @@ def save(colors, theme_name, light=False):
|
||||
theme_path = os.path.join(CONF_DIR, "colorschemes",
|
||||
"light" if light else "dark", theme_file)
|
||||
util.save_file_json(colors, theme_path)
|
||||
|
||||
|
||||
def get_last_used_theme():
|
||||
"""Get the name of the current / last used theme."""
|
||||
try:
|
||||
last_used_theme = util.read_file(os.path.join(
|
||||
CACHE_DIR, "last_used_theme"))[0].replace(".json", "")
|
||||
except FileNotFoundError:
|
||||
last_used_theme = ""
|
||||
|
||||
return last_used_theme
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user