Rename top-level command functions

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index f5fbb481bea3cb0df30bf45f12c40d58dda55f83..6f3f2567975758af3b81bc1f225706c686174525 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -22,9 +22,11 @@ from typing import (
     Dict,
     Iterable,
     List,
     Dict,
     Iterable,
     List,

+    Mapping,

     NamedTuple,
     NewType,
     Tuple,
     NamedTuple,
     NewType,
     Tuple,

+    Type,

     Union,
 )
 
     Union,
 )
 


@@ -161,7 +163,11 @@ class ChannelSearchPath(TarrableSearchPath):
             self.old_git_revision = self.git_revision
             del self.git_revision
 
             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,
         return ChannelPin(
             release_name=self.release_name,
             tarball_url=self.table['nixexprs.tar.xz'].absolute_url,


@@ -299,7 +305,7 @@ def fetch_with_nix_prefetch_url(
     return path  # type: ignore  # (for old mypy)
 
 
     return path  # type: ignore  # (for old mypy)
 
 

-def fetch_resources(v: Verification, channel: TarrableSearchPath) -> None:
+def fetch_resources(v: Verification, channel: ChannelSearchPath) -> None:

     for resource in ['git-revision', 'nixexprs.tar.xz']:
         fields = channel.table[resource]
         fields.absolute_url = urllib.parse.urljoin(
     for resource in ['git-revision', 'nixexprs.tar.xz']:
         fields = channel.table[resource]
         fields.absolute_url = urllib.parse.urljoin(


@@ -559,14 +565,6 @@ def check_channel_contents(
     v.ok()
 
 
     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',
 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:
 
 
 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:
 
 
 def read_config(filename: str) -> configparser.ConfigParser:


@@ -610,7 +609,7 @@ def read_config_files(
     return merged_config
 
 
     return merged_config
 
 

-def pin(args: argparse.Namespace) -> None:
+def pinCommand(args: argparse.Namespace) -> None:

     v = Verification()
     config = read_config(args.channels_file)
     for section in config.sections():
     v = Verification()
     config = read_config(args.channels_file)
     for section in config.sections():


@@ -625,7 +624,7 @@ def pin(args: argparse.Namespace) -> None:
         config.write(configfile)
 
 
         config.write(configfile)
 
 

-def update(args: argparse.Namespace) -> None:
+def updateCommand(args: argparse.Namespace) -> None:

     v = Verification()
     exprs: Dict[str, str] = {}
     config = read_config_files(args.channels_file)
     v = Verification()
     exprs: Dict[str, str] = {}
     config = read_config_files(args.channels_file)


@@ -667,11 +666,11 @@ def main() -> None:
     parser_pin = subparsers.add_parser('pin')
     parser_pin.add_argument('channels_file', type=str)
     parser_pin.add_argument('channels', type=str, nargs='*')
     parser_pin = subparsers.add_parser('pin')
     parser_pin.add_argument('channels_file', type=str)
     parser_pin.add_argument('channels', type=str, nargs='*')

-    parser_pin.set_defaults(func=pin)
+    parser_pin.set_defaults(func=pinCommand)

     parser_update = subparsers.add_parser('update')
     parser_update.add_argument('--dry-run', action='store_true')
     parser_update.add_argument('channels_file', type=str, nargs='+')
     parser_update = subparsers.add_parser('update')
     parser_update.add_argument('--dry-run', action='store_true')
     parser_update.add_argument('channels_file', type=str, nargs='+')

-    parser_update.set_defaults(func=update)
+    parser_update.set_defaults(func=updateCommand)

     args = parser.parse_args()
     args.func(args)
 
     args = parser.parse_args()
     args.func(args)