From 5a2394d76a96322c3c01c3dd7f667a61ffb4531d Mon Sep 17 00:00:00 2001 From: ZhengYang Date: Fri, 1 Aug 2014 16:04:09 +0800 Subject: [PATCH] move generateCode.Run() to g.go --- g_docs.go | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/g_docs.go b/g_docs.go index abbaab2..213bd6f 100644 --- a/g_docs.go +++ b/g_docs.go @@ -103,7 +103,6 @@ var modelsList map[string]map[string]swagger.Model var rootapi swagger.ResourceListing func init() { - cmdGenerate.Run = generateCode pkgCache = make(map[string]bool) controllerComments = make(map[string]string) importlist = make(map[string]string) @@ -383,7 +382,7 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat if _, ok := modelsList[pkgpath+controllerName]; !ok { modelsList[pkgpath+controllerName] = make(map[string]swagger.Model, 0) } - modelsList[pkgpath+controllerName][st[2]] = mod + modelsList[pkgpath+controllerName][st[2]] = mod appendModels(cmpath, pkgpath, controllerName, realTypes) } @@ -626,20 +625,20 @@ func grepJsonTag(tag string) string { // append models func appendModels(cmpath, pkgpath, controllerName string, realTypes []string) { - var p string - if cmpath != "" { - p = strings.Join(strings.Split(cmpath, "/"), ".") + "." - } else { - p = "" - } + var p string + if cmpath != "" { + p = strings.Join(strings.Split(cmpath, "/"), ".") + "." + } else { + p = "" + } for _, realType := range realTypes { if realType != "" && !isBasicType(strings.TrimLeft(realType, "[]")) && !strings.HasPrefix(realType, "map") && !strings.HasPrefix(realType, "&") { - if _, ok := modelsList[pkgpath+controllerName][p+realType]; ok { - continue - } - fmt.Printf(pkgpath+":"+controllerName+":"+cmpath+":"+realType+"\n") - _, _, mod, newRealTypes := getModel(p+realType) + if _, ok := modelsList[pkgpath+controllerName][p+realType]; ok { + continue + } + fmt.Printf(pkgpath + ":" + controllerName + ":" + cmpath + ":" + realType + "\n") + _, _, mod, newRealTypes := getModel(p + realType) modelsList[pkgpath+controllerName][p+realType] = mod appendModels(cmpath, pkgpath, controllerName, newRealTypes) }