New UI for this project

.gitignore

@@ -18,7 +18,9 @@ dist/
 node_modules/
 assets_vfsdata.go
 .vscode/
+.idea/
 assets_vfsdata.go
+__debug_bin
 # Dependency directories (remove the comment below to include it)
 # vendor/
 

Dockerfile

@@ -1,20 +1,19 @@
 ARG VERSION=0.0.0
-FROM --platform=$BUILDPLATFORM node:lts-alpine as uibuilder
+FROM --platform=$BUILDPLATFORM node:lts as uibuilder
 WORKDIR /src
-COPY ui .
+COPY new-ui .
 RUN yarn && yarn build 
 
 FROM golang:1-alpine as gobuilder
 ARG VERSION
 WORKDIR /src
-COPY . .
-COPY --from=uibuilder /src/build ./ui/build
 RUN apk add git
+COPY . .
+COPY --from=uibuilder /src/dist ./new-ui/dist
 RUN go generate ./... && CGO_ENABLED=0 go build -ldflags "-s -w -X main.version=${VERSION}" -o rmfakecloud-docker ./cmd/rmfakecloud/
 
-FROM scratch
+FROM alpine
 EXPOSE 3000
-RUN --mount=from=busybox:latest,src=/bin/,dst=/bin/ mkdir -m 1755 /tmp
 COPY --from=gobuilder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=gobuilder /src/rmfakecloud-docker /
-ENTRYPOINT ["/rmfakecloud-docker"]
+CMD ["/rmfakecloud-docker"]

Makefile

@@ -4,14 +4,15 @@ OUT_DIR := dist
 CMD := ./cmd/rmfakecloud
 BINARY := rmfakecloud
 BUILD = go build -ldflags $(LDFLAGS) -o $(@) $(CMD) 
-ASSETS = ui/build
+ASSETS = new-ui/dist
 GOFILES := $(shell find . -iname '*.go' ! -iname "*_test.go")
 GOFILES += $(ASSETS)
-UIFILES := $(shell find ui/src)
-UIFILES += $(shell find ui/public)
-UIFILES += ui/package.json
+UIFILES := $(shell find new-ui/src)
+UIFILES += $(shell find new-ui/public)
+UIFILES += $(shell find new-ui/types)
+UIFILES += new-ui/package.json
 TARGETS := $(addprefix $(OUT_DIR)/$(BINARY)-, x64 armv6 armv7 arm64 win64 docker)
-YARN	= yarn --cwd ui  
+YARN	= yarn --cwd new-ui  
 
 .PHONY: all run runui clean test testgo testui
 
@@ -43,21 +44,18 @@ container: $(OUT_DIR)/$(BINARY)-docker
 run: $(ASSETS)
 	go run $(CMD) $(ARG)
 
-$(ASSETS): $(UIFILES) ui/yarn.lock
-	@cp ui/node_modules/pdfjs-dist/build/pdf.worker.js ui/public/
+$(ASSETS): $(UIFILES) new-ui/yarn.lock
 	$(YARN) build
-	@#remove unneeded stuff, todo: eject
-	@rm ui/build/service-worker.js ui/build/precache-manifest* ui/build/asset-manifest.json 2> /dev/null || true
 
-ui/yarn.lock: ui/node_modules ui/package.json
+new-ui/yarn.lock: new-ui/node_modules new-ui/package.json
 	$(YARN)
 	@touch -mr $(shell ls -Atd $? | head -1) $@
 
-ui/node_modules:
+new-ui/node_modules:
 	mkdir -p $@
 
-runui: ui/yarn.lock
-	$(YARN) start
+runui: new-ui/yarn.lock
+	$(YARN) dev
 
 clean:
 	rm -f $(OUT_DIR)/*

internal/app/app.go

@@ -142,7 +142,8 @@ func NewApp(cfg *config.Config) App {
 			Cfg: cfg,
 		},
 	}
-	uiApp := ui.New(cfg, fsStorage, codeConnector, ntfHub, fsStorage, fsStorage)
+
+	uiApp := ui.New(cfg, fsStorage, codeConnector, ntfHub, fsStorage, fsStorage, fsStorage)
 
 	storageapp := fs.NewApp(cfg, fsStorage)
 

internal/messages/messages.go

@@ -69,6 +69,9 @@ type RawMetadata struct {
 	CurrentPage       int    `json:"CurrentPage"`
 	Bookmarked        bool   `json:"Bookmarked"`
 	Parent            string `json:"Parent"`
+
+	// For distinguish file type at file tree, don't dump to disk
+	Extension string `json:"-"`
 }
 
 // IDRequest request with only an id

internal/storage/fs/blob_folder.go

@@ -0,0 +1,124 @@
+package fs
+
+import (
+	"errors"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/ddvk/rmfakecloud/internal/storage"
+	"github.com/ddvk/rmfakecloud/internal/storage/models"
+	"github.com/google/uuid"
+)
+
+// CreateBlobFolder create a sync15 folder
+func (fs *FileSystemStorage) CreateBlobFolder(uid, name, parent string) (*storage.Document, error) {
+	name = strings.TrimSpace(name)
+	parent = strings.TrimSpace(parent)
+
+	tree, err := fs.GetTree(uid)
+
+	if err != nil {
+		return nil, err
+	}
+
+	// Check parent
+	if len(parent) != 0 {
+		parentDoc, err := tree.FindDoc(parent)
+
+		if err != nil {
+			return nil, err
+		}
+
+		if parentDoc.MetadataFile.CollectionType != models.CollectionType {
+			return nil, errors.New("Parent is not a folder")
+		}
+	}
+
+	docId := uuid.New().String()
+	blobPath := fs.getUserBlobPath(uid)
+
+	// Create metadata
+	metadata := models.MetadataFile{
+		DocumentName:     name,
+		CollectionType:   models.CollectionType,
+		Parent:           parent,
+		Version:          1,
+		LastModified:     strconv.FormatInt(time.Now().UnixMilli(), 10),
+		Synced:           true,
+		MetadataModified: true,
+	}
+
+	mdHash, mdSize, err := createMetadataFile(metadata, blobPath)
+
+	if err != nil {
+		return nil, err
+	}
+
+	mdHashEntry := models.NewFileHashEntry(mdHash, docId+models.MetadataFileExt)
+	mdHashEntry.Size = mdSize
+
+	// New hash doc
+	hashDoc := models.NewHashDocMeta(docId, metadata)
+
+	if err = hashDoc.AddFile(mdHashEntry); err != nil {
+		return nil, err
+	}
+
+	// Create content
+	content := `{"tags":[]}`
+	contentHash, contentSize, err := models.Hash(strings.NewReader(content))
+	if err != nil {
+		return nil, err
+	}
+	if err = saveTo(strings.NewReader(content), contentHash, blobPath); err != nil {
+		return nil, err
+	}
+	contentHashEntry := models.NewFileHashEntry(contentHash, docId+models.ContentFileExt)
+	contentHashEntry.Size = contentSize
+	if err = hashDoc.AddFile(contentHashEntry); err != nil {
+		return nil, err
+	}
+
+	if err = tree.Add(hashDoc); err != nil {
+		return nil, err
+	}
+
+	hashDocIndexReader, err := hashDoc.IndexReader()
+	if err != nil {
+		return nil, err
+	}
+	if err = saveTo(hashDocIndexReader, hashDoc.Hash, blobPath); err != nil {
+		return nil, err
+	}
+
+	rootIndexReader, err := tree.RootIndex()
+	if err != nil {
+		return nil, err
+	}
+	if err = saveTo(rootIndexReader, tree.Hash, blobPath); err != nil {
+		return nil, err
+	}
+
+	blobStorage := &LocalBlobStorage{
+		fs:  fs,
+		uid: uid,
+	}
+
+	gen, err := blobStorage.WriteRootIndex(tree.Generation, tree.Hash)
+	if err != nil {
+		return nil, err
+	}
+	tree.Generation = gen
+
+	if err = fs.SaveTree(uid, tree); err != nil {
+		return nil, err
+	}
+
+	return &storage.Document{
+		ID:      docId,
+		Type:    models.CollectionType,
+		Name:    name,
+		Version: 1,
+	}, nil
+}

internal/storage/fs/blobstore.go

@@ -374,6 +374,112 @@ func (fs *FileSystemStorage) StoreBlob(uid, id string, stream io.Reader, lastGen
 	return
 }
 
+// GetBlobMetadata get metadata for a blob document
+func (fs *FileSystemStorage) GetBlobMetadata(uid, docId string) (*models.MetadataFile, error) {
+	tree, err := fs.GetTree(uid)
+
+	if err != nil {
+		return nil, err
+	}
+
+	hashDoc, err := tree.FindDoc(docId)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &hashDoc.MetadataFile, nil
+}
+
+func (fs *FileSystemStorage) UpdateBlobMetadata(uid, docId string, md *models.MetadataFile) error {
+	tree, err := fs.GetTree(uid)
+
+	if err != nil {
+		return err
+	}
+
+	hashDoc, err := tree.FindDoc(docId)
+
+	if err != nil {
+		return err
+	}
+
+	md.MetadataModified = true
+	md.Synced = false
+	md.Version += 1
+	md.LastModified = strconv.FormatInt(time.Now().UnixMilli(), 10)
+
+	blobPath := fs.getUserBlobPath(uid)
+
+	// Recreate metadata file
+	mdHash, mdSize, err := createMetadataFile(*md, blobPath)
+
+	if err != nil {
+		return err
+	}
+
+	mdHashEntry := models.NewFileHashEntry(mdHash, docId+models.MetadataFileExt)
+	mdHashEntry.Size = mdSize
+
+	// New hash doc
+	newHashDoc := models.NewHashDocMeta(docId, *md)
+
+	if err = newHashDoc.AddFile(mdHashEntry); err != nil {
+		return err
+	}
+
+	// Copy entries from old hash doc except metadata
+	for _, entry := range hashDoc.Files {
+		if strings.HasSuffix(entry.EntryName, models.MetadataFileExt) {
+			continue
+		}
+		if err = newHashDoc.AddFile(entry); err != nil {
+			return err
+		}
+	}
+
+	if err = tree.Remove(docId); err != nil {
+		return err
+	}
+
+	if err = tree.Add(newHashDoc); err != nil {
+		return err
+	}
+
+	hashDocIndexReader, err := newHashDoc.IndexReader()
+	if err != nil {
+		return err
+	}
+	if err = saveTo(hashDocIndexReader, newHashDoc.Hash, blobPath); err != nil {
+		return err
+	}
+
+	rootIndexReader, err := tree.RootIndex()
+	if err != nil {
+		return err
+	}
+	if err = saveTo(rootIndexReader, tree.Hash, blobPath); err != nil {
+		return err
+	}
+
+	blobStorage := &LocalBlobStorage{
+		fs:  fs,
+		uid: uid,
+	}
+
+	gen, err := blobStorage.WriteRootIndex(tree.Generation, tree.Hash)
+	if err != nil {
+		return err
+	}
+	tree.Generation = gen
+
+	if err = fs.SaveTree(uid, tree); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 //use file size as generation
 func generationFromFileSize(size int64) int64 {
 	//time + 1 space + 64 hash + 1 newline

internal/storage/fs/documentcreator.go

@@ -25,6 +25,7 @@ func createContent(fileType string) string {
 		`
 {
 	"dummyDocument": false,
+	"coverPageNumber": 0,
 	"extraMetadata": {
 		"LastPen": "Finelinerv2",
 		"LastTool": "Finelinerv2",