Rename Info -> Channel

diff --git a/pinch.py b/pinch.py
index f0f0422047a0f434b9c07c618a9ac5dea45f84ea..89e053b9bb648244ce8758e8cef4e3373c8708b0 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -25,19 +25,19 @@ Digest16 = NewType('Digest16', str)
 Digest32 = NewType('Digest32', str)
 
 
 Digest32 = NewType('Digest32', str)
 
 

-class InfoTableEntry(types.SimpleNamespace):
+class ChannelTableEntry(types.SimpleNamespace):

     digest: Digest16
     file: str
     size: int
     url: str
 
 
     digest: Digest16
     file: str
     size: int
     url: str
 
 

-class Info(types.SimpleNamespace):
+class Channel(types.SimpleNamespace):

     channel_html: bytes
     forwarded_url: str
     git_revision: str
     release_name: str
     channel_html: bytes
     forwarded_url: str
     git_revision: str
     release_name: str

-    table: Dict[str, InfoTableEntry]
+    table: Dict[str, ChannelTableEntry]

     url: str
 
 
     url: str
 
 


@@ -107,22 +107,22 @@ def compare(a: str,
     return filecmp.cmpfiles(a, b, files, shallow=False)
 
 
     return filecmp.cmpfiles(a, b, files, shallow=False)
 
 

-def fetch(v: Verification, channel_url: str) -> Info:
-    info = Info()
-    info.url = channel_url
+def fetch(v: Verification, channel_url: str) -> Channel:
+    channel = Channel()
+    channel.url = channel_url

     v.status('Fetching channel')
     request = urllib.request.urlopen(
         'https://channels.nixos.org/nixos-20.03', timeout=10)
     v.status('Fetching channel')
     request = urllib.request.urlopen(
         'https://channels.nixos.org/nixos-20.03', timeout=10)

-    info.channel_html = request.read()
-    info.forwarded_url = request.geturl()
+    channel.channel_html = request.read()
+    channel.forwarded_url = request.geturl()

     v.result(request.status == 200)
     v.result(request.status == 200)

-    v.check('Got forwarded', info.url != info.forwarded_url)
-    return info
+    v.check('Got forwarded', channel.url != channel.forwarded_url)
+    return channel

 
 
 
 

-def parse_channel(v: Verification, info: Info) -> None:
+def parse_channel(v: Verification, channel: Channel) -> None:

     v.status('Parsing channel description as XML')
     v.status('Parsing channel description as XML')

-    d = xml.dom.minidom.parseString(info.channel_html)
+    d = xml.dom.minidom.parseString(channel.channel_html)

     v.ok()
 
     v.status('Extracting release name:')
     v.ok()
 
     v.status('Extracting release name:')


@@ -131,24 +131,24 @@ def parse_channel(v: Verification, info: Info) -> None:
     h1_name = d.getElementsByTagName('h1')[0].firstChild.nodeValue.split()[2]
     v.status(title_name)
     v.result(title_name == h1_name)
     h1_name = d.getElementsByTagName('h1')[0].firstChild.nodeValue.split()[2]
     v.status(title_name)
     v.result(title_name == h1_name)

-    info.release_name = title_name
+    channel.release_name = title_name

 
     v.status('Extracting git commit:')
     git_commit_node = d.getElementsByTagName('tt')[0]
 
     v.status('Extracting git commit:')
     git_commit_node = d.getElementsByTagName('tt')[0]

-    info.git_commit = git_commit_node.firstChild.nodeValue
-    v.status(info.git_commit)
+    channel.git_commit = git_commit_node.firstChild.nodeValue
+    v.status(channel.git_commit)

     v.ok()
     v.status('Verifying git commit label')
     v.result(git_commit_node.previousSibling.nodeValue == 'Git commit ')
 
     v.status('Parsing table')
     v.ok()
     v.status('Verifying git commit label')
     v.result(git_commit_node.previousSibling.nodeValue == 'Git commit ')
 
     v.status('Parsing table')

-    info.table = {}
+    channel.table = {}

     for row in d.getElementsByTagName('tr')[1:]:
         name = row.childNodes[0].firstChild.firstChild.nodeValue
         url = row.childNodes[0].firstChild.getAttribute('href')
         size = int(row.childNodes[1].firstChild.nodeValue)
         digest = Digest16(row.childNodes[2].firstChild.firstChild.nodeValue)
     for row in d.getElementsByTagName('tr')[1:]:
         name = row.childNodes[0].firstChild.firstChild.nodeValue
         url = row.childNodes[0].firstChild.getAttribute('href')
         size = int(row.childNodes[1].firstChild.nodeValue)
         digest = Digest16(row.childNodes[2].firstChild.firstChild.nodeValue)

-        info.table[name] = InfoTableEntry(url=url, digest=digest, size=size)
+        channel.table[name] = ChannelTableEntry(url=url, digest=digest, size=size)

     v.ok()
 
 
     v.ok()
 
 


@@ -195,21 +195,21 @@ def fetch_with_nix_prefetch_url(
     return path
 
 
     return path
 
 

-def fetch_resources(v: Verification, info: Info) -> None:
+def fetch_resources(v: Verification, channel: Channel) -> None:

     for resource in ['git-revision', 'nixexprs.tar.xz']:
     for resource in ['git-revision', 'nixexprs.tar.xz']:

-        fields = info.table[resource]
-        url = urllib.parse.urljoin(info.forwarded_url, fields.url)
+        fields = channel.table[resource]
+        url = urllib.parse.urljoin(channel.forwarded_url, fields.url)

         fields.file = fetch_with_nix_prefetch_url(v, url, fields.digest)
     v.status('Verifying git commit on main page matches git commit in table')
     v.result(
         open(
         fields.file = fetch_with_nix_prefetch_url(v, url, fields.digest)
     v.status('Verifying git commit on main page matches git commit in table')
     v.result(
         open(

-            info.table['git-revision'].file).read(999) == info.git_commit)
+            channel.table['git-revision'].file).read(999) == channel.git_commit)

 
 
 
 

-def check_channel_contents(v: Verification, info: Info) -> None:
+def check_channel_contents(v: Verification, channel: Channel) -> None:

     with tempfile.TemporaryDirectory() as d:
     with tempfile.TemporaryDirectory() as d:

-        v.status('Extracting %s' % info.table['nixexprs.tar.xz'].file)
-        shutil.unpack_archive(info.table['nixexprs.tar.xz'].file, d)
+        v.status('Extracting %s' % channel.table['nixexprs.tar.xz'].file)
+        shutil.unpack_archive(channel.table['nixexprs.tar.xz'].file, d)

         v.ok()
         v.status('Removing temporary directory')
     v.ok()
         v.ok()
         v.status('Removing temporary directory')
     v.ok()


@@ -217,11 +217,11 @@ def check_channel_contents(v: Verification, info: Info) -> None:
 
 def main() -> None:
     v = Verification()
 
 def main() -> None:
     v = Verification()

-    info = fetch(v, 'https://channels.nixos.org/nixos-20.03')
-    parse_channel(v, info)
-    fetch_resources(v, info)
-    check_channel_contents(v, info)
-    print(info)
+    channel = fetch(v, 'https://channels.nixos.org/nixos-20.03')
+    parse_channel(v, channel)
+    fetch_resources(v, channel)
+    check_channel_contents(v, channel)
+    print(channel)

 
 
 main()
 
 
 main()