From eb89807cf115541dce1dd4b0e9540967c1f0206e Mon Sep 17 00:00:00 2001 From: zicla Date: Thu, 12 Mar 2020 01:29:22 +0800 Subject: [PATCH] Fix the error of copy. --- code/rest/dav_service.go | 2 +- code/rest/matter_service.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/rest/dav_service.go b/code/rest/dav_service.go index d49c1a6..00a0931 100644 --- a/code/rest/dav_service.go +++ b/code/rest/dav_service.go @@ -416,7 +416,7 @@ func (this *DavService) HandleCopy(writer http.ResponseWriter, request *http.Req fmt.Printf("COPY %s\n", subPath) //debug point - if request.Header.Get("X-Litmus") == "copymove: 5 (copy_nodestcoll)" { + if request.Header.Get("X-Litmus") == "copymove: 7 (copy_coll)" { fmt.Println("stop here") } diff --git a/code/rest/matter_service.go b/code/rest/matter_service.go index be0569f..4b60571 100644 --- a/code/rest/matter_service.go +++ b/code/rest/matter_service.go @@ -671,6 +671,8 @@ func (this *MatterService) AtomicMoveBatch(request *http.Request, srcMatters []* //copy srcMatter to destMatter. invoker must handled the overwrite and lock. func (this *MatterService) copy(request *http.Request, srcMatter *Matter, destDirMatter *Matter, name string) { + this.logger.Info("copy srcPath = %s destPath = %s/%s", srcMatter.Path, destDirMatter.Path, name) + if srcMatter.Dir { newMatter := &Matter{ @@ -687,6 +689,9 @@ func (this *MatterService) copy(request *http.Request, srcMatter *Matter, destDi newMatter = this.matterDao.Create(newMatter) + //make the dir + util.MakeDirAll(newMatter.AbsolutePath()) + //copy children matters := this.matterDao.FindByPuuidAndUserUuid(srcMatter.Uuid, srcMatter.UserUuid, nil) for _, m := range matters {