summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Araps <dylan.araps@gmail.com>2017-07-09 20:55:07 +1000
committerDylan Araps <dylan.araps@gmail.com>2017-07-09 20:55:07 +1000
commit07fd6fa6619444c0da248cce96604de972a04720 (patch)
treeb79656464e22daa7f94ab8a59e9e44fb57578941
parentdd95c26b40fc08abe9b9a6b27cbab77ffb00ad28 (diff)
export: Add wallpaper to export files,
-rw-r--r--pywal/export.py4
-rw-r--r--pywal/magic.py12
-rw-r--r--pywal/templates/colors.css5
-rw-r--r--pywal/templates/colors.json2
-rw-r--r--pywal/templates/colors.scss5
-rw-r--r--pywal/templates/colors.sh5
6 files changed, 27 insertions, 6 deletions
diff --git a/pywal/export.py b/pywal/export.py
index 5e7f2e6..9eea198 100644
--- a/pywal/export.py
+++ b/pywal/export.py
@@ -35,7 +35,9 @@ def export_all_templates(colors, template_dir=None, output_dir=CACHE_DIR):
# Merge all colors (specials and normals) into one dict so we can access
# their values simpler.
- all_colors = {**colors["special"], **colors["colors"]}
+ all_colors = {"wallpaper": colors["wallpaper"],
+ **colors["special"],
+ **colors["colors"]}
# Turn all those colors into util.Color instances for accessing the
# .hex and .rgb formats
diff --git a/pywal/magic.py b/pywal/magic.py
index 3af10ce..0cc868a 100644
--- a/pywal/magic.py
+++ b/pywal/magic.py
@@ -75,7 +75,7 @@ def get_colors(img, quiet):
# Generate the colors.
colors = gen_colors(img)
- colors = sort_colors(colors)
+ colors = sort_colors(img, colors)
# Cache the colorscheme.
util.save_file_json(colors, cache_file)
@@ -87,27 +87,29 @@ def get_colors(img, quiet):
return colors
-def sort_colors(colors):
+def sort_colors(img, colors):
"""Sort the generated colors and store them in a dict that
we will later save in json format."""
raw_colors = colors[:1] + colors[9:] + colors[8:]
+ # Wallpaper.
+ colors = {"wallpaper": img}
+
# Special colors.
colors_special = {}
colors_special.update({"background": raw_colors[0]})
colors_special.update({"foreground": raw_colors[15]})
colors_special.update({"cursor": raw_colors[15]})
- # Colors 0-15
+ # Colors 0-15.
colors_hex = {}
[colors_hex.update({f"color{index}": color}) # pylint: disable=W0106
for index, color in enumerate(raw_colors)]
- # Color 8
+ # Color 8.
colors_hex["color8"] = util.set_grey(raw_colors)
# Add the colors to a dict.
- colors = {}
colors["special"] = colors_special
colors["colors"] = colors_hex
diff --git a/pywal/templates/colors.css b/pywal/templates/colors.css
index 04c2aa9..11e00d3 100644
--- a/pywal/templates/colors.css
+++ b/pywal/templates/colors.css
@@ -1,9 +1,14 @@
/* CSS variables
Generated by 'wal' */
:root {{
+ --wallpaper: "{wallpaper}";
+
+ /* Special */
--background: {background};
--foreground: {foreground};
--cursor: {cursor};
+
+ /* Colors */
--color0: {color0};
--color1: {color1};
--color2: {color2};
diff --git a/pywal/templates/colors.json b/pywal/templates/colors.json
index fdd9828..5c94bc4 100644
--- a/pywal/templates/colors.json
+++ b/pywal/templates/colors.json
@@ -1,4 +1,6 @@
{{
+ "wallpaper": "{wallpaper}",
+
"special": {{
"background": "{background}",
"foreground": "{foreground}",
diff --git a/pywal/templates/colors.scss b/pywal/templates/colors.scss
index 1a2e183..001be1f 100644
--- a/pywal/templates/colors.scss
+++ b/pywal/templates/colors.scss
@@ -1,8 +1,13 @@
// SCSS Variables
// Generated by 'wal'
+$wallpaper: "{wallpaper}";
+
+// Special
$background: {background};
$foreground: {foreground};
$cursor: {cursor};
+
+// Colors
$color0: {color0};
$color1: {color1};
$color2: {color2};
diff --git a/pywal/templates/colors.sh b/pywal/templates/colors.sh
index 607d19e..19b31c7 100644
--- a/pywal/templates/colors.sh
+++ b/pywal/templates/colors.sh
@@ -1,8 +1,13 @@
# Shell variables
# Generated by 'wal'
+wallpaper='{wallpaper}'
+
+# Special
background='{background}'
foreground='{foreground}'
cursor='{cursor}'
+
+# Colors
color0='{color0}'
color1='{color1}'
color2='{color2}'