From e5d9bee80c39cefad58474b4ebf201dae9d515ac Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@redhat.com>
Date: Mon, 29 Feb 2016 11:27:43 +0100
Subject: [PATCH] remove img-type

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
---
 inspect.go | 38 +++++++++++++++++++++++++++++---------
 main.go    |  5 -----
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/inspect.go b/inspect.go
index 0e407406..4d096358 100644
--- a/inspect.go
+++ b/inspect.go
@@ -2,34 +2,54 @@ package main
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/codegangsta/cli"
 	"github.com/runcom/skopeo/docker"
 	"github.com/runcom/skopeo/types"
 )
 
+type imgKind int
+
 const (
-	imgTypeDocker = "docker"
-	imgTypeAppc   = "appc"
+	imgTypeDocker = "docker://"
+	imgTypeAppc   = "appc://"
+
+	kindUnknown = iota
+	kindDocker
+	kindAppc
 )
 
+func getImgType(img string) imgKind {
+	if strings.HasPrefix(img, imgTypeDocker) {
+		return kindDocker
+	}
+	if strings.HasPrefix(img, imgTypeAppc) {
+		return kindAppc
+	}
+	// TODO(runcom): v2 will support this
+	//return kindUnknown
+	return kindDocker
+}
+
 func inspect(c *cli.Context) (*types.ImageInspect, error) {
 	var (
 		imgInspect *types.ImageInspect
 		err        error
 		name       = c.Args().First()
-		imgType    = c.GlobalString("img-type")
+		kind       = getImgType(name)
 	)
-	switch imgType {
-	case imgTypeDocker:
-		imgInspect, err = docker.GetData(c, name)
+
+	switch kind {
+	case kindDocker:
+		imgInspect, err = docker.GetData(c, strings.Replace(name, imgTypeDocker, "", -1))
 		if err != nil {
 			return nil, err
 		}
-	case imgTypeAppc:
-		return nil, fmt.Errorf("sorry, not implemented yet")
+	case kindAppc:
+		return nil, fmt.Errorf("not implemented yet")
 	default:
-		return nil, fmt.Errorf("%s image type is invalid, please use either 'docker' or 'appc'", imgType)
+		return nil, fmt.Errorf("%s image is invalid, please use either 'docker://' or 'appc://'", name)
 	}
 	return imgInspect, nil
 }
diff --git a/main.go b/main.go
index 363cac90..082af9e7 100644
--- a/main.go
+++ b/main.go
@@ -52,11 +52,6 @@ func main() {
 			Value: cliconfig.ConfigDir(),
 			Usage: "Docker's cli config for auth",
 		},
-		cli.StringFlag{
-			Name:  "img-type",
-			Value: imgTypeDocker,
-			Usage: "Either docker or appc",
-		},
 	}
 	app.Before = func(c *cli.Context) error {
 		if c.GlobalBool("debug") {