Move pin_channel() into ChannelSearchPath.pin()

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index f5fbb481bea3cb0df30bf45f12c40d58dda55f83..78c6d52a325d70fc6b3d0aa065a744708f93fa95 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -22,9 +22,11 @@ from typing import (
     Dict,
     Iterable,
     List,
+    Mapping,
     NamedTuple,
     NewType,
     Tuple,
+    Type,
     Union,
 )
 
@@ -161,7 +163,11 @@ class ChannelSearchPath(TarrableSearchPath):
             self.old_git_revision = self.git_revision
             del self.git_revision
 
-        pin_channel(v, self)
+        fetch(v, self)
+        parse_channel(v, self)
+        fetch_resources(v, self)
+        ensure_git_rev_available(v, self)
+        check_channel_contents(v, self)
         return ChannelPin(
             release_name=self.release_name,
             tarball_url=self.table['nixexprs.tar.xz'].absolute_url,
@@ -559,14 +565,6 @@ def check_channel_contents(
     v.ok()
 
 
-def pin_channel(v: Verification, channel: TarrableSearchPath) -> None:
-    fetch(v, channel)
-    parse_channel(v, channel)
-    fetch_resources(v, channel)
-    ensure_git_rev_available(v, channel)
-    check_channel_contents(v, channel)
-
-
 def git_revision_name(v: Verification, channel: TarrableSearchPath) -> str:
     v.status('Getting commit date')
     process = subprocess.run(['git',
@@ -585,11 +583,12 @@ def git_revision_name(v: Verification, channel: TarrableSearchPath) -> str:
 
 
 def read_search_path(conf: configparser.SectionProxy) -> SearchPath:
-    if 'alias_of' in conf:
-        return AliasSearchPath(**dict(conf.items()))
-    if 'channel_url' in conf:
-        return ChannelSearchPath(**dict(conf.items()))
-    return GitSearchPath(**dict(conf.items()))
+    mapping: Mapping[str, Type[SearchPath]] = {
+        'alias': AliasSearchPath,
+        'channel': ChannelSearchPath,
+        'git': GitSearchPath,
+    }
+    return mapping[conf['type']](**dict(conf.items()))
 
 
 def read_config(filename: str) -> configparser.ConfigParser: