GO-2746: fix comments

Signed-off-by: AnastasiaShemyakinskaya <shem98a@mail.ru>
anyproto · Aug 7, 2024 · 669c280 · 669c280
1 parent 9cf7e4e
commit 669c280
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/core/block/export/export.go b/core/block/export/export.go
@@ -467,8 +467,8 @@ func (e *export) writeMultiDoc(ctx context.Context,
 	return
 }
 
-func (e *export) writeDoc(ctx context.Context, req *pb.RpcObjectListExportRequest, wr writer, docInfo map[string]*types.Struct, queue process.Queue, docID string) (err error) {
-	return cache.Do(e.picker, docID, func(b sb.SmartBlock) error {
+func (e *export) writeDoc(ctx context.Context, req *pb.RpcObjectListExportRequest, wr writer, docInfo map[string]*types.Struct, queue process.Queue, docId string) (err error) {
+	return cache.Do(e.picker, docId, func(b sb.SmartBlock) error {
 		st := b.NewState()
 		if pbtypes.GetBool(st.CombinedDetails(), bundle.RelationKeyIsDeleted.String()) {
 			return nil
@@ -497,11 +497,11 @@ func (e *export) writeDoc(ctx context.Context, req *pb.RpcObjectListExportReques
 		}
 		conv.SetKnownDocs(docInfo)
 		result := conv.Convert(b.Type().ToProto())
-		filename := e.provideFileName(docID, req.SpaceId, conv, st, b.Type())
+		filename := e.provideFileName(docId, req.SpaceId, conv, st, b.Type())
 		if req.Format == model.Export_Markdown {
-			filename = e.provideMarkdownName(st, wr, docID, conv, req.SpaceId)
+			filename = e.provideMarkdownName(st, wr, docId, conv, req.SpaceId)
 		}
-		if docID == b.Space().DerivedIDs().Home {
+		if docId == b.Space().DerivedIDs().Home {
 			filename = "index" + conv.Ext()
 		}
 		lastModifiedDate := pbtypes.GetInt64(st.LocalDetails(), bundle.RelationKeyLastModifiedDate.String())
@@ -525,9 +525,9 @@ func (e *export) provideMarkdownName(s *state.State, wr writer, docID string, co
 	return wr.Namer().Get(path, docID, name, conv.Ext())
 }
 
-func (e *export) provideFileName(docID, spaceId string, conv converter.Converter, st *state.State, blockType smartblock.SmartBlockType) string {
+func (e *export) provideFileName(docId, spaceId string, conv converter.Converter, st *state.State, blockType smartblock.SmartBlockType) string {
 	dir := e.provideFileDirectory(blockType)
-	filename := filepath.Join(dir, docID+conv.Ext())
+	filename := filepath.Join(dir, docId+conv.Ext())
 	if spaceId == "" {
 		spaceId := pbtypes.GetString(st.LocalDetails(), bundle.RelationKeySpaceId.String())
 		filename = filepath.Join(spaceDirectory, spaceId, filename)

diff --git a/core/block/export/writer.go b/core/block/export/writer.go
@@ -59,11 +59,9 @@ func (d *dirWriter) Path() string {
 
 func (d *dirWriter) WriteFile(filename string, r io.Reader, lastModifiedDate int64) (err error) {
 	dir := filepath.Dir(filename)
-	if dir != "" {
-		err = os.MkdirAll(filepath.Join(d.path, dir), 0700)
-		if err != nil {
-			return err
-		}
+	err = os.MkdirAll(filepath.Join(d.path, dir), 0700)
+	if err != nil {
+		return err
 	}
 	filename = path.Join(d.path, filename)
 	f, err := os.Create(filename)