comment cleanup

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Jul 5, 2022 · b21ce72 · b21ce72
1 parent 859654d
commit b21ce72
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 12 deletions.
diff --git a/internal/http/services/owncloud/ocdav/locks.go b/internal/http/services/owncloud/ocdav/locks.go
@@ -400,7 +400,6 @@ func (s *svc) handleSpacesLock(w http.ResponseWriter, r *http.Request, spaceID s
 
  span.SetAttributes(attribute.String("component", "ocdav"))
 
- // build storage space reference
  ref, err := spacelookup.MakeStorageSpaceReference(spaceID, r.URL.Path)
  if err != nil {
  return http.StatusBadRequest, fmt.Errorf("invalid space id")

diff --git a/internal/http/services/owncloud/ocdav/propfind/propfind.go b/internal/http/services/owncloud/ocdav/propfind/propfind.go
@@ -310,7 +310,6 @@ func (p *Handler) HandleSpacesPropfind(w http.ResponseWriter, r *http.Request, s
  var space *provider.StorageSpace
  if res.Info.Space == nil {
  sublog.Debug().Msg("stat did not include a space, executing an additional lookup request")
- // TODO look up space? hm can the isShared check even work when stating a space? hm yeah ... well ... *mindblown*
  // fake a space root
  space = &provider.StorageSpace{
  Id: &provider.StorageSpaceId{OpaqueId: spaceID},
@@ -672,9 +671,6 @@ func (p *Handler) getSpaceResourceInfos(ctx context.Context, w http.ResponseWrit
 
  metadataKeys, _ := metadataKeys(pf)
 
- // we need to prefix the path with / to make subsequent prefix matches work
- // info.Path = filepath.Join("/", spaceRef.Path)
-
  resourceInfos := []*provider.ResourceInfo{}
 
  req := &provider.ListContainerRequest{

diff --git a/internal/http/services/owncloud/ocdav/report.go b/internal/http/services/owncloud/ocdav/report.go
@@ -110,7 +110,7 @@ func (s *svc) doFilterFiles(w http.ResponseWriter, r *http.Request, ff *reportFi
  infos = append(infos, statRes.Info)
  }
 
- responsesXML, err := propfind.MultistatusResponse(ctx, &propfind.XML{Prop: ff.Prop}, infos, s.c.PublicURL, namespace /*"",*/, nil)
+ responsesXML, err := propfind.MultistatusResponse(ctx, &propfind.XML{Prop: ff.Prop}, infos, s.c.PublicURL, namespace, nil)
  if err != nil {
  log.Error().Err(err).Msg("error formatting propfind")
  w.WriteHeader(http.StatusInternalServerError)

diff --git a/internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go b/internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go
@@ -99,11 +99,6 @@ func LookUpStorageSpacesForPathWithChildren(ctx context.Context, client gateway.
  // TODO use ListContainerStream to listen for changes
  // retrieve a specific storage space
  lSSReq := &storageProvider.ListStorageSpacesRequest{
- Opaque: &typesv1beta1.Opaque{
- Map: map[string]*typesv1beta1.OpaqueEntry{
- // TODO encode requested metadata as json
- // "metadata": {Decoder: "json", Value: []byte("*")},
- }},
  // get all fields, including root_info
  FieldMask: &fieldmaskpb.FieldMask{Paths: []string{"*"}},
  }

diff --git a/internal/http/services/owncloud/ocdav/versions.go b/internal/http/services/owncloud/ocdav/versions.go
@@ -189,7 +189,7 @@ func (h *VersionsHandler) doListVersions(w http.ResponseWriter, r *http.Request,
  infos = append(infos, vi)
  }
 
- propRes, err := propfind.MultistatusResponse(ctx, &pf, infos, s.c.PublicURL, "" /*"",*/, nil)
+ propRes, err := propfind.MultistatusResponse(ctx, &pf, infos, s.c.PublicURL, "", nil)
  if err != nil {
  sublog.Error().Err(err).Msg("error formatting propfind")
  w.WriteHeader(http.StatusInternalServerError)