From 4974e9405f6bbecf2b348ee23ffbd479b1bf91ee Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Mon, 26 Dec 2022 18:49:45 -0800
Subject: [PATCH] use scbase not base for fileops

---
 pkg/scbase/scbase.go  | 6 ++++++
 pkg/sstore/fileops.go | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkg/scbase/scbase.go b/pkg/scbase/scbase.go
index 8199654b..3bcd8bde 100644
--- a/pkg/scbase/scbase.go
+++ b/pkg/scbase/scbase.go
@@ -146,6 +146,12 @@ func EnsureSessionDir(sessionId string) (string, error) {
 	return sdir, nil
 }
 
+func GetSessionsDir() string {
+	promptHome := GetPromptHomeDir()
+	sdir := path.Join(promptHome, SessionsDirBaseName)
+	return sdir
+}
+
 func ensureDir(dirName string) error {
 	info, err := os.Stat(dirName)
 	if errors.Is(err, fs.ErrNotExist) {
diff --git a/pkg/sstore/fileops.go b/pkg/sstore/fileops.go
index 164e9623..016c8413 100644
--- a/pkg/sstore/fileops.go
+++ b/pkg/sstore/fileops.go
@@ -8,7 +8,6 @@ import (
 	"path"
 
 	"github.com/google/uuid"
-	"github.com/scripthaus-dev/mshell/pkg/base"
 	"github.com/scripthaus-dev/mshell/pkg/cirfile"
 	"github.com/scripthaus-dev/sh2-server/pkg/scbase"
 )
@@ -96,7 +95,7 @@ func directorySize(dirName string) (SessionDiskSizeType, error) {
 }
 
 func SessionDiskSize(sessionId string) (SessionDiskSizeType, error) {
-	sessionDir, err := base.EnsureSessionDir(sessionId)
+	sessionDir, err := scbase.EnsureSessionDir(sessionId)
 	if err != nil {
 		return SessionDiskSizeType{}, err
 	}
@@ -104,7 +103,7 @@ func SessionDiskSize(sessionId string) (SessionDiskSizeType, error) {
 }
 
 func FullSessionDiskSize() (map[string]SessionDiskSizeType, error) {
-	sdir := base.GetSessionsDir()
+	sdir := scbase.GetSessionsDir()
 	entries, err := os.ReadDir(sdir)
 	if err != nil {
 		return nil, err
@@ -137,9 +136,10 @@ func DeletePtyOutFile(ctx context.Context, sessionId string, cmdId string) error
 }
 
 func DeleteSessionDir(ctx context.Context, sessionId string) error {
-	sessionDir, err := base.EnsureSessionDir(sessionId)
+	sessionDir, err := scbase.EnsureSessionDir(sessionId)
 	if err != nil {
 		return fmt.Errorf("error getting sessiondir: %w", err)
 	}
+	fmt.Printf("remove-all %s\n", sessionDir)
 	return os.RemoveAll(sessionDir)
 }