go-annex is now in libgin

See G-Node/libgin#4

internal/dav/dav.go

@@ -12,11 +12,11 @@ import (
 	"io/ioutil"
 
 	"github.com/G-Node/git-module"
-	gannex "github.com/G-Node/go-annex"
 	gctx "github.com/G-Node/gogs/internal/context"
 	"github.com/G-Node/gogs/internal/db"
 	"github.com/G-Node/gogs/internal/setting"
 	"github.com/G-Node/gogs/internal/tool"
+	"github.com/G-Node/libgin/libgin/annex"
 	"golang.org/x/net/context"
 	"golang.org/x/net/webdav"
 	log "gopkg.in/clog.v1"
@@ -153,7 +153,7 @@ func (f *GinFile) Read(p []byte) (int, error) {
 
 	annexed := tool.IsAnnexedFile(tmp)
 	if annexed {
-		af, err := gannex.NewAFile(f.rpath, "annex", f.trentry.Name(), tmp)
+		af, err := annex.NewAFile(f.rpath, "annex", f.trentry.Name(), tmp)
 		if err != nil {
 			return n, err
 		}
@@ -265,7 +265,7 @@ func (f GinFile) Stat() (os.FileInfo, error) {
 	}
 	peek = peek[:n]
 	if tool.IsAnnexedFile(peek) {
-		af, err := gannex.NewAFile(f.rpath, "annex", f.trentry.Name(), peek)
+		af, err := annex.NewAFile(f.rpath, "annex", f.trentry.Name(), peek)
 		if err != nil {
 			return nil, err
 		}

internal/db/models_gin.go

@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	gannex "github.com/G-Node/go-annex"
 	"github.com/G-Node/gogs/internal/setting"
 	"github.com/G-Node/libgin/libgin"
+	"github.com/G-Node/libgin/libgin/annex"
 	log "gopkg.in/clog.v1"
 )
 
@@ -90,7 +90,7 @@ func annexUninit(path string) {
 	}
 
 	log.Trace("Uninit annex at '%s'", path)
-	if msg, err := gannex.Uninit(path); err != nil {
+	if msg, err := annex.Uninit(path); err != nil {
 		log.Error(3, "uninit failed: %v (%s)", err, msg)
 		if werr := filepath.Walk(path, walker); werr != nil {
 			log.Error(3, "file permission change failed: %v", werr)
@@ -102,36 +102,36 @@ func annexSetup(path string) {
 	log.Trace("Running annex add (with filesize filter) in '%s'", path)
 
 	// Initialise annex in case it's a new repository
-	if msg, err := gannex.Init(path, "--version=7"); err != nil {
+	if msg, err := annex.Init(path, "--version=7"); err != nil {
 		log.Error(2, "Annex init failed: %v (%s)", err, msg)
 		return
 	}
 
 	// Upgrade to v7 in case the directory was here before and wasn't cleaned up properly
-	if msg, err := gannex.Upgrade(path); err != nil {
+	if msg, err := annex.Upgrade(path); err != nil {
 		log.Error(2, "Annex upgrade failed: %v (%s)", err, msg)
 		return
 	}
 
 	// Enable addunlocked for annex v7
-	if msg, err := gannex.SetAddUnlocked(path); err != nil {
+	if msg, err := annex.SetAddUnlocked(path); err != nil {
 		log.Error(2, "Failed to set 'addunlocked' annex option: %v (%s)", err, msg)
 	}
 
 	// Set MD5 as default backend
-	if msg, err := gannex.MD5(path); err != nil {
+	if msg, err := annex.MD5(path); err != nil {
 		log.Error(2, "Failed to set default backend to 'MD5': %v (%s)", err, msg)
 	}
 
 	// Set size filter in config
-	if msg, err := gannex.SetAnnexSizeFilter(path, setting.Repository.Upload.AnnexFileMinSize*gannex.MEGABYTE); err != nil {
+	if msg, err := annex.SetAnnexSizeFilter(path, setting.Repository.Upload.AnnexFileMinSize*annex.MEGABYTE); err != nil {
 		log.Error(2, "Failed to set size filter for annex: %v (%s)", err, msg)
 	}
 }
 
 func annexSync(path string) error {
 	log.Trace("Synchronising annexed data")
-	if msg, err := gannex.ASync(path, "--content"); err != nil {
+	if msg, err := annex.ASync(path, "--content"); err != nil {
 		// TODO: This will also DOWNLOAD content, which is unnecessary for a simple upload
 		// TODO: Use gin-cli upload function instead
 		log.Error(2, "Annex sync failed: %v (%s)", err, msg)
@@ -139,7 +139,7 @@ func annexSync(path string) error {
 	}
 
 	// run twice; required if remote annex is not initialised
-	if msg, err := gannex.ASync(path, "--content"); err != nil {
+	if msg, err := annex.ASync(path, "--content"); err != nil {
 		log.Error(2, "Annex sync failed: %v (%s)", err, msg)
 		return fmt.Errorf("git annex sync --content [%s]", path)
 	}

internal/route/repo/repo_gin.go

@@ -7,22 +7,22 @@ import (
 	"io/ioutil"
 
 	"github.com/G-Node/git-module"
-	gannex "github.com/G-Node/go-annex"
 	"github.com/G-Node/gogs/internal/context"
 	"github.com/G-Node/gogs/internal/setting"
 	"github.com/G-Node/gogs/internal/tool"
 	"github.com/G-Node/libgin/libgin"
+	"github.com/G-Node/libgin/libgin/annex"
 	"github.com/go-macaron/captcha"
 	log "gopkg.in/clog.v1"
 	"gopkg.in/yaml.v2"
 )
 
 func serveAnnexedData(ctx *context.Context, name string, cpt *captcha.Captcha, buf []byte) error {
-	annexFile, err := gannex.NewAFile(ctx.Repo.Repository.RepoPath(), "annex", name, buf)
+	annexFile, err := annex.NewAFile(ctx.Repo.Repository.RepoPath(), "annex", name, buf)
 	if err != nil {
 		return err
 	}
-	if cpt != nil && annexFile.Info.Size() > gannex.MEGABYTE*setting.Repository.RawCaptchaMinFileSize && !cpt.VerifyReq(ctx.Req) &&
+	if cpt != nil && annexFile.Info.Size() > annex.MEGABYTE*setting.Repository.RawCaptchaMinFileSize && !cpt.VerifyReq(ctx.Req) &&
 		!ctx.IsLogged {
 		ctx.Data["EnableCaptcha"] = true
 		ctx.HTML(200, "repo/download")
@@ -104,7 +104,7 @@ func resolveAnnexedContent(c *context.Context, buf []byte, dataRc io.Reader) ([]
 		return buf, dataRc, nil
 	}
 	log.Trace("Annexed file requested: Resolving content for [%s]", bytes.TrimSpace(buf))
-	af, err := gannex.NewAFile(c.Repo.Repository.RepoPath(), "annex", "", buf)
+	af, err := annex.NewAFile(c.Repo.Repository.RepoPath(), "annex", "", buf)
 	if err != nil {
 		log.Trace("Could not get annex file: %v", err)
 		c.Data["IsAnnexedFile"] = true

internal/route/repo/view.go

@@ -17,7 +17,7 @@ import (
 	log "gopkg.in/clog.v1"
 
 	"github.com/G-Node/git-module"
-	gannex "github.com/G-Node/go-annex"
+	"github.com/G-Node/libgin/libgin/annex"
 
 	"github.com/G-Node/gogs/internal/context"
 	"github.com/G-Node/gogs/internal/db"
@@ -256,16 +256,16 @@ func renderFile(c *context.Context, entry *git.TreeEntry, treeLink, rawLink stri
 			c.Data["EditFileTooltip"] = c.Tr("repo.editor.fork_before_edit")
 		}
 
-	case tool.IsPDFFile(buf) && (c.Data["FileSize"].(int64) < setting.Repository.RawCaptchaMinFileSize*gannex.MEGABYTE ||
+	case tool.IsPDFFile(buf) && (c.Data["FileSize"].(int64) < setting.Repository.RawCaptchaMinFileSize*annex.MEGABYTE ||
 		c.IsLogged):
 		c.Data["IsPDFFile"] = true
-	case tool.IsVideoFile(buf) && (c.Data["FileSize"].(int64) < setting.Repository.RawCaptchaMinFileSize*gannex.MEGABYTE ||
+	case tool.IsVideoFile(buf) && (c.Data["FileSize"].(int64) < setting.Repository.RawCaptchaMinFileSize*annex.MEGABYTE ||
 		c.IsLogged):
 		c.Data["IsVideoFile"] = true
-	case tool.IsImageFile(buf) && (c.Data["FileSize"].(int64) < setting.Repository.RawCaptchaMinFileSize*gannex.MEGABYTE ||
+	case tool.IsImageFile(buf) && (c.Data["FileSize"].(int64) < setting.Repository.RawCaptchaMinFileSize*annex.MEGABYTE ||
 		c.IsLogged):
 		c.Data["IsImageFile"] = true
-	case tool.IsAnnexedFile(buf) && (c.Data["FileSize"].(int64) < setting.Repository.RawCaptchaMinFileSize*gannex.MEGABYTE ||
+	case tool.IsAnnexedFile(buf) && (c.Data["FileSize"].(int64) < setting.Repository.RawCaptchaMinFileSize*annex.MEGABYTE ||
 		c.IsLogged):
 		c.Data["IsAnnexedFile"] = true
 	}