extern/pywal
1
0
Fork 0
mirror of https://github.com/dylanaraps/pywal.git synced 2025-01-24 23:09:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177 from deviantfero/master

Browse Source 
Use separate versioning for cache files and pywal.
This commit is contained in:
Dylan Araps 2018-02-05 08:44:06 +11:00 committed by GitHub
commit 59b42221c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pywal/__init__.py
View File

@ -9,7 +9,7 @@
Created by Dylan Araps. Created by Dylan Araps.
""" """
from .settings import __version__ from .settings import __version__, __cache_version__
from . import colors from . import colors
from . import export from . import export
from . import image from . import image
@ -19,6 +19,7 @@ from . import wallpaper
__all__ = [ __all__ = [
"__version__", "__version__",
"__cache_version__",
"colors", "colors",
"export", "export",
"image", "image",

4
pywal/colors.py
View File

@ -7,7 +7,7 @@ import shutil
import subprocess import subprocess
import sys import sys
from .settings import CACHE_DIR, COLOR_COUNT, __version__ from .settings import CACHE_DIR, COLOR_COUNT, __cache_version__
from . import util from . import util
@ -107,7 +107,7 @@ def get(img, cache_dir=CACHE_DIR,
color_type = "light" if light else "dark" color_type = "light" if light else "dark"
cache_file = re.sub("[/|\\|.]", "_", img) cache_file = re.sub("[/|\\|.]", "_", img)
cache_file = os.path.join(cache_dir, "schemes", "%s_%s_%s.json" cache_file = os.path.join(cache_dir, "schemes", "%s_%s_%s.json"
% (cache_file, color_type, __version__)) % (cache_file, color_type, __cache_version__))
if os.path.isfile(cache_file): if os.path.isfile(cache_file):
colors = file(cache_file) colors = file(cache_file)

3
pywal/settings.py
View File

@ -13,7 +13,8 @@ import os
import platform import platform
__version__ = "1.3.0" __version__ = "1.3.1"
__cache_version__ = "1.0.0"
HOME = os.getenv("HOME", os.getenv("USERPROFILE")) HOME = os.getenv("HOME", os.getenv("USERPROFILE"))