Browse Source

[dav] anexed filename buffer size needs to be cut

to get annexed detection working
cgars 7 years ago
parent
commit
02e7c4071f
1 changed files with 7 additions and 2 deletions
  1. 7 2
      pkg/dav/dav.go

+ 7 - 2
pkg/dav/dav.go

@@ -15,6 +15,7 @@ import (
 	"github.com/G-Node/gogs/pkg/tool"
 	"github.com/G-Node/gogs/pkg/tool"
 	"golang.org/x/net/context"
 	"golang.org/x/net/context"
 	"golang.org/x/net/webdav"
 	"golang.org/x/net/webdav"
+	log "gopkg.in/clog.v1"
 )
 )
 
 
 var (
 var (
@@ -111,10 +112,14 @@ func (f *GinFile) Read(p []byte) (n int, err error) {
 	if err != nil {
 	if err != nil {
 		return n, err
 		return n, err
 	}
 	}
-
+	p = p[:n]
+	log.Info("%s", string(p))
 	annexed := tool.IsAnnexedFile(p)
 	annexed := tool.IsAnnexedFile(p)
 	if annexed {
 	if annexed {
-		af, _ := gannex.NewAFile( f.rpath,"annex", f.trentry.Name(), p)
+		af, err := gannex.NewAFile(f.rpath, "annex", f.trentry.Name(), p)
+		if err != nil {
+			return n, err
+		}
 		afp, _ := af.Open()
 		afp, _ := af.Open()
 		defer afp.Close()
 		defer afp.Close()
 		afp.Seek(f.seekoset, io.SeekStart)
 		afp.Seek(f.seekoset, io.SeekStart)