Merge pull request #215 from FleekHQ/develop

Release develop to master
FleekHQ · Oct 21, 2020 · e51b415 · e51b415
2 parents 1bef0c3 + 9868777
commit e51b415
Show file tree

Hide file tree

Showing 32 changed files with 2,480 additions and 931 deletions.
diff --git a/core/fsds/files_ds.go b/core/fsds/files_ds.go
@@ -37,7 +37,7 @@ func (f *filesDataSource) Get(ctx context.Context, path string) (*DirEntry, erro
 
 	log.Debug("FileDS Get", fmt.Sprintf("path:%s", path))
 
-	itemsInParent, err := f.service.ListDir(ctx, path, DefaultBucketName)
+	itemsInParent, err := f.service.ListDir(ctx, path, DefaultBucketName, true)
 	if err != nil {
 		if !isNotExistError(err) {
 			return nil, EntryNotFound
@@ -87,7 +87,7 @@ func (f *filesDataSource) Get(ctx context.Context, path string) (*DirEntry, erro
 
 func (f *filesDataSource) GetChildren(ctx context.Context, path string) ([]*DirEntry, error) {
 	log.Debug("FileDS GetChildren", fmt.Sprintf("path:%s", path))
-	domainEntries, err := f.service.ListDir(ctx, path, DefaultBucketName)
+	domainEntries, err := f.service.ListDir(ctx, path, DefaultBucketName, true)
 	if err != nil {
 		return nil, err
 	}

diff --git a/core/space/domain/domain.go b/core/space/domain/domain.go
@@ -64,6 +64,7 @@ type AddWatchFile struct {
 	BucketPath string `json:"bucket_path"`
 	BucketKey  string `json:"bucket_key"`
 	BucketSlug string `json:"bucket_slug"`
+	IsRemote   bool   `json:"isRemote"`
 }
 
 type Identity struct {
@@ -159,8 +160,9 @@ type MirrorFile struct {
 }
 
 type SharedDirEntry struct {
-	DbID   string
-	Bucket string
+	DbID         string
+	Bucket       string
+	IsPublicLink bool
 	FileInfo
 	Members []Member // XXX: it is duplicated from FileInfo
 }