extern/pywal
1
0
Fork 0
mirror of https://github.com/dylanaraps/pywal.git synced 2025-08-17 17:50:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

General: Cleanup

Browse Source
This commit is contained in:
Dylan Araps
2017-06-19 19:55:55 +10:00
parent d81e17945a
commit f391a4fcb2
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wal.py
View File

@@ -109,11 +109,7 @@ def process_colors(args):
# Import the colorscheme from file. # Import the colorscheme from file.
if cache_file.is_file(): if cache_file.is_file():
with open(cache_file) as file: colors = read_colors(cache_file)
colors = file.readlines()
# Strip newlines from each list element.
colors = [x.strip() for x in colors]
if len(colors) < 16: if len(colors) < 16:
print("error: Invalid colorscheme file chosen.") print("error: Invalid colorscheme file chosen.")
@@ -125,6 +121,17 @@ def process_colors(args):
return colors return colors
def read_colors(color_file):
"""Read colors from a file"""
with open(color_file) as file:
colors = file.readlines()
# Strip newlines from each list element.
colors = [x.strip() for x in colors]
return colors
# }}} # }}}
@@ -222,11 +229,8 @@ def get_colors(img):
file.write("%s\n" % (img)) file.write("%s\n" % (img))
if cache_file.is_file(): if cache_file.is_file():
with open(cache_file) as file: colors = read_colors(cache_file)
colors = file.readlines()
# Strip newlines from each list element.
colors = [x.strip() for x in colors]
else: else:
print("colors: Generating a colorscheme...") print("colors: Generating a colorscheme...")