X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/10ddbaff0197f0ef93a910d7ea3f9f7d0ebac3a4..1b48018c3d40a9f70ac98aa3d3112fc5d8cb2201:/pinch.py

diff --git a/pinch.py b/pinch.py
index 10481e4..5d93c26 100644
--- a/pinch.py
+++ b/pinch.py
@@ -25,7 +25,17 @@ from typing import (
     Tuple,
 )
 
-import xdg
+# Use xdg module when it's less painful to have as a dependency
+
+
+class XDG(types.SimpleNamespace):
+    XDG_CACHE_HOME: str
+
+
+xdg = XDG(
+    XDG_CACHE_HOME=os.getenv(
+        'XDG_CACHE_HOME',
+        os.path.expanduser('~/.cache')))
 
 
 Digest16 = NewType('Digest16', str)
@@ -73,7 +83,7 @@ class Verification:
     def result(self, r: bool) -> None:
         message, color = {True: ('OK ', 92), False: ('FAIL', 91)}[r]
         length = len(message)
-        cols = shutil.get_terminal_size().columns
+        cols = shutil.get_terminal_size().columns or 80
         pad = (cols - (self.line_length + length)) % cols
         print(' ' * pad + self._color(message, color), file=sys.stderr)
         self.line_length = 0
@@ -222,8 +232,17 @@ def git_cachedir(git_repo: str) -> str:
     return os.path.join(
         xdg.XDG_CACHE_HOME,
         'pinch/git',
-        digest_string(
-            git_repo.encode()))
+        digest_string(git_repo.encode()))
+
+
+def tarball_cache_file(channel: Channel) -> str:
+    return os.path.join(
+        xdg.XDG_CACHE_HOME,
+        'pinch/git-tarball',
+        '%s-%s-%s' %
+        (digest_string(channel.git_repo.encode()),
+         channel.git_revision,
+         channel.release_name))
 
 
 def verify_git_ancestry(v: Verification, channel: Channel) -> None:
@@ -371,6 +390,12 @@ def git_checkout(v: Verification, channel: Channel, dest: str) -> None:
 
 
 def git_get_tarball(v: Verification, channel: Channel) -> str:
+    cache_file = tarball_cache_file(channel)
+    if os.path.exists(cache_file):
+        cached_tarball = open(cache_file).read(9999)
+        if os.path.exists(cached_tarball):
+            return cached_tarball
+
     with tempfile.TemporaryDirectory() as output_dir:
         output_filename = os.path.join(
             output_dir, channel.release_name + '.tar.xz')
@@ -394,7 +419,11 @@ def git_get_tarball(v: Verification, channel: Channel) -> str:
         process = subprocess.run(
             ['nix-store', '--add', output_filename], capture_output=True)
         v.result(process.returncode == 0)
-        return process.stdout.decode().strip()
+        store_tarball = process.stdout.decode().strip()
+
+        os.makedirs(os.path.dirname(cache_file), exist_ok=True)
+        open(cache_file, 'w').write(store_tarball)
+        return store_tarball
 
 
 def check_channel_metadata(
@@ -449,7 +478,7 @@ def git_revision_name(v: Verification, channel: Channel) -> str:
     process = subprocess.run(['git',
                               '-C',
                               git_cachedir(channel.git_repo),
-                              'lo',
+                              'log',
                               '-n1',
                               '--format=%ct-%h',
                               '--abbrev=11',