X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/5cfa8e119c86e2bf7c315ed1b82a10b7770fcfac..b17def3f6b3c3f002d1bf7ef7d838110374d015d:/pinch.py

diff --git a/pinch.py b/pinch.py
index 0eafb90..e3b6882 100644
--- a/pinch.py
+++ b/pinch.py
@@ -27,6 +27,7 @@ Digest32 = NewType('Digest32', str)
 
 
 class ChannelTableEntry(types.SimpleNamespace):
+    absolute_url: str
     digest: Digest16
     file: str
     size: int
@@ -35,6 +36,7 @@ class ChannelTableEntry(types.SimpleNamespace):
 
 class Channel(types.SimpleNamespace):
     channel_html: bytes
+    channel_url: str
     forwarded_url: str
     git_cachedir: str
     git_ref: str
@@ -42,7 +44,6 @@ class Channel(types.SimpleNamespace):
     git_revision: str
     release_name: str
     table: Dict[str, ChannelTableEntry]
-    url: str
 
 
 class VerificationError(Exception):
@@ -110,11 +111,11 @@ def compare(a: str, b: str) -> Tuple[List[str], List[str], List[str]]:
 
 def fetch(v: Verification, channel: Channel) -> None:
     v.status('Fetching channel')
-    request = urllib.request.urlopen(channel.url, timeout=10)
+    request = urllib.request.urlopen(channel.channel_url, timeout=10)
     channel.channel_html = request.read()
     channel.forwarded_url = request.geturl()
     v.result(request.status == 200)
-    v.check('Got forwarded', channel.url != channel.forwarded_url)
+    v.check('Got forwarded', channel.channel_url != channel.forwarded_url)
 
 
 def parse_channel(v: Verification, channel: Channel) -> None:
@@ -200,8 +201,10 @@ def fetch_with_nix_prefetch_url(
 def fetch_resources(v: Verification, channel: Channel) -> None:
     for resource in ['git-revision', 'nixexprs.tar.xz']:
         fields = channel.table[resource]
-        url = urllib.parse.urljoin(channel.forwarded_url, fields.url)
-        fields.file = fetch_with_nix_prefetch_url(v, url, fields.digest)
+        fields.absolute_url = urllib.parse.urljoin(
+            channel.forwarded_url, fields.url)
+        fields.file = fetch_with_nix_prefetch_url(
+            v, fields.absolute_url, fields.digest)
     v.status('Verifying git commit on main page matches git commit in table')
     v.result(
         open(
@@ -219,7 +222,7 @@ def git_fetch(v: Verification, channel: Channel) -> None:
     channel.git_cachedir = os.path.expanduser(
         '~/.cache/nix-pin-channel/git/%s' %
         digest_string(
-            channel.url.encode()))
+            channel.git_repo.encode()))
     if not os.path.exists(channel.git_cachedir):
         v.status("Initializing git repo")
         process = subprocess.run(
@@ -370,7 +373,11 @@ def main(argv: List[str]) -> None:
         fetch_resources(v, channel)
         git_fetch(v, channel)
         check_channel_contents(v, channel)
-        print(channel)
+        config[section]['git_rev'] = channel.git_revision
+        config[section]['tarball_url'] = channel.table['nixexprs.tar.xz'].absolute_url
+        config[section]['tarball_sha256'] = channel.table['nixexprs.tar.xz'].digest
+    with open(argv[1], 'w') as configfile:
+        config.write(configfile)
 
 
 main(sys.argv)