From: Scott Worley Date: Sat, 23 May 2020 00:25:24 +0000 (-0700) Subject: Use xdg packge to find XDG cache dir X-Git-Tag: 1.3~10 X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/26125a281f6733d08ffb488668b052ee9c20061a?ds=inline Use xdg packge to find XDG cache dir --- diff --git a/pinch.py b/pinch.py index a7d5b65..1827281 100644 --- a/pinch.py +++ b/pinch.py @@ -25,6 +25,9 @@ from typing import ( Tuple, ) +import xdg + + Digest16 = NewType('Digest16', str) Digest32 = NewType('Digest32', str) @@ -216,9 +219,9 @@ def fetch_resources(v: Verification, channel: Channel) -> None: def git_cachedir(git_repo: str) -> str: - # TODO: Consider using pyxdg to find this path. - return os.path.expanduser( - '~/.cache/pinch/git/%s' % + return os.path.join( + xdg.XDG_CACHE_HOME, + 'pinch/git', digest_string( git_repo.encode())) diff --git a/shell.nix b/shell.nix index b408ea4..11e4f03 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,7 @@ { pkgs ? import { } }: pkgs.mkShell rec { doCheck = true; - buildInputs = with pkgs; [ python3 ]; + buildInputs = with pkgs; [ (python3.withPackages (ps: with ps; [ xdg ])) ]; checkInputs = with pkgs; [ mypy python3Packages.autopep8