summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordgrisham <dgrisham@mines.edu>2018-09-27 10:50:13 -0600
committerdgrisham <dgrisham@mines.edu>2018-09-27 10:50:13 -0600
commitb08648c7201c9d3e7b10b412c43b494791e4b52e (patch)
tree30ac3ac41ad33d32cb256a6045ae4bb88ed6b271
parent499b1c4ff5b90a754384a5ca91b770d062d76db8 (diff)
move hashf() to util.py
-rw-r--r--pywal/colors.py10
-rw-r--r--pywal/util.py10
2 files changed, 11 insertions, 9 deletions
diff --git a/pywal/colors.py b/pywal/colors.py
index b0cfbe6..63200c5 100644
--- a/pywal/colors.py
+++ b/pywal/colors.py
@@ -6,7 +6,6 @@ import os
import random
import re
import sys
-import hashlib
from . import theme
from . import util
@@ -87,19 +86,12 @@ def saturate_colors(colors, amount):
def cache_fname(img, backend, light, cache_dir, sat=""):
"""Create the cache file name."""
color_type = "light" if light else "dark"
- file_hash = hashf(img)
+ file_hash = util.hashf(img)
file_parts = [file_hash, color_type, backend, sat, __cache_version__]
return [cache_dir, "schemes", "%s_%s_%s_%s_%s.json" % (*file_parts,)]
-def hashf(fpath):
- return hashlib.md5(file_bytes(open(fpath, 'rb'))).hexdigest()
-
-def file_bytes(fpath):
- with fpath:
- return fpath.read()
-
def get_backend(backend):
"""Figure out which backend to use."""
if backend == "random":
diff --git a/pywal/util.py b/pywal/util.py
index 0557cc4..b58f5e4 100644
--- a/pywal/util.py
+++ b/pywal/util.py
@@ -2,6 +2,7 @@
Misc helper functions.
"""
import colorsys
+import hashlib
import json
import logging
import os
@@ -178,3 +179,12 @@ def get_pid(name):
return False
return True
+
+
+def hashf(fpath):
+ return hashlib.md5(file_bytes(open(fpath, 'rb'))).hexdigest()
+
+
+def file_bytes(fpath):
+ with fpath:
+ return fpath.read()