From c3e0554fd77f976b58a8da10d4878353bb895a78 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 16 Mar 2014 02:53:41 -0400 Subject: [PATCH] Clean code --- gogs.go | 2 +- models/action.go | 4 ++-- update.go | 27 ++++++++++++++++++++------- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/gogs.go b/gogs.go index 315297b10..9d1f2032d 100644 --- a/gogs.go +++ b/gogs.go @@ -20,7 +20,7 @@ import ( // Test that go1.1 tag above is included in builds. main.go refers to this definition. const go11tag = true -const APP_VER = "0.0.8.0315" +const APP_VER = "0.0.8.0316.1" func init() { base.AppVer = APP_VER diff --git a/models/action.go b/models/action.go index 93c1e2768..9e075646a 100644 --- a/models/action.go +++ b/models/action.go @@ -43,6 +43,7 @@ func (a Action) GetRepoName() string { return a.RepoName } +// CommitRepoAction records action for commit repository. func CommitRepoAction(userId int64, userName string, repoId int64, repoName string, msg string) error { _, err := orm.InsertOne(&Action{ @@ -57,8 +58,7 @@ func CommitRepoAction(userId int64, userName string, return err } -// NewRepoAction inserts action for create repository. - +// NewRepoAction records action for create repository. func NewRepoAction(user *User, repo *Repository) error { _, err := orm.InsertOne(&Action{ UserId: user.Id, diff --git a/update.go b/update.go index 339b3ab94..477989e86 100644 --- a/update.go +++ b/update.go @@ -1,13 +1,19 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package main import ( "os" "strconv" - "github.com/gogits/gogs/models" - "github.com/codegangsta/cli" + git "github.com/gogits/git" + + "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/log" ) var CmdUpdate = cli.Command{ @@ -41,11 +47,18 @@ func runUpdate(*cli.Context) { if err != nil { return } - sUserId, _ := strconv.Atoi(userId) - sRepoId, _ := strconv.Atoi(repoId) - err = models.CommitRepoAction(int64(sUserId), userName, - int64(sRepoId), repoName, lastCommit.Message()) + sUserId, err := strconv.Atoi(userId) if err != nil { - //TODO: log + log.Error("runUpdate.Parse userId: %v", err) + return + } + sRepoId, err := strconv.Atoi(repoId) + if err != nil { + log.Error("runUpdate.Parse repoId: %v", err) + return + } + if err = models.CommitRepoAction(int64(sUserId), userName, + int64(sRepoId), repoName, lastCommit.Message()); err != nil { + log.Error("runUpdate.models.CommitRepoAction: %v", err) } }