From 125b37cca57e8287bff80822f2856304de6367d5 Mon Sep 17 00:00:00 2001 From: Marston Connell <34043723+TheMarstonConnell@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:57:20 -0400 Subject: [PATCH 1/2] removing delete function --- core/app.go | 2 +- file_system/file_system.go | 79 +++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/core/app.go b/core/app.go index 96c36b8..d8e61bd 100644 --- a/core/app.go +++ b/core/app.go @@ -228,7 +228,7 @@ func (a *App) Start() error { go a.monitor.Start() done := make(chan os.Signal, 1) - defer signal.Stop(done) //undo signal.Notify effect + defer signal.Stop(done) // undo signal.Notify effect signal.Notify(done, syscall.SIGINT, syscall.SIGTERM) <-done // Will block here until user hits ctrl+c diff --git a/file_system/file_system.go b/file_system/file_system.go index 9faeac7..a1672b1 100644 --- a/file_system/file_system.go +++ b/file_system/file_system.go @@ -11,9 +11,7 @@ import ( "github.com/ipfs/go-cid" - "github.com/dgraph-io/badger/v4" "github.com/rs/zerolog/log" - "github.com/wealdtech/go-merkletree/v2" "github.com/wealdtech/go-merkletree/v2/sha3" ) import jsoniter "github.com/json-iterator/go" @@ -114,45 +112,46 @@ func (f *FileSystem) WriteFile(reader io.Reader, merkle []byte, owner string, st } func (f *FileSystem) DeleteFile(merkle []byte, owner string, start int64) error { - log.Info().Msg(fmt.Sprintf("Removing %x from disk...", merkle)) - fileCount.Dec() - err := f.db.Update(func(txn *badger.Txn) error { - err := txn.Delete(treeKey(merkle, owner, start)) - if err != nil { - return err - } - - return nil - }) - if err != nil { - return err - } - - fcid := "" - _ = f.db.View(func(txn *badger.Txn) error { - b, err := txn.Get([]byte(fmt.Sprintf("cid/%x", merkle))) - if err != nil { - return err - } - - _ = b.Value(func(val []byte) error { - fcid = string(val) - return nil - }) - return nil - }) - - c, err := cid.Decode(fcid) - if err != nil { - return err - } - - err = f.ipfs.Remove(context.Background(), c) - if err != nil { - return err - } - return nil + //log.Info().Msg(fmt.Sprintf("Removing %x from disk...", merkle)) + //fileCount.Dec() + //err := f.db.Update(func(txn *badger.Txn) error { + // err := txn.Delete(treeKey(merkle, owner, start)) + // if err != nil { + // return err + // } + // + // return nil + //}) + //if err != nil { + // return err + //} + // + //fcid := "" + //_ = f.db.View(func(txn *badger.Txn) error { + // b, err := txn.Get([]byte(fmt.Sprintf("cid/%x", merkle))) + // if err != nil { + // return err + // } + // + // _ = b.Value(func(val []byte) error { + // fcid = string(val) + // return nil + // }) + // return nil + //}) + // + //c, err := cid.Decode(fcid) + //if err != nil { + // return err + //} + // + //err = f.ipfs.Remove(context.Background(), c) + //if err != nil { + // return err + //} + // + //return nil } func (f *FileSystem) ListFiles() ([][]byte, []string, []int64, error) { From 2e84760f95f570c9e67dd0b8052cf04b19f629dc Mon Sep 17 00:00:00 2001 From: Marston Connell <34043723+TheMarstonConnell@users.noreply.github.com> Date: Fri, 26 Jul 2024 09:39:39 -0400 Subject: [PATCH 2/2] adding back imports --- file_system/file_system.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file_system/file_system.go b/file_system/file_system.go index a1672b1..a7ac608 100644 --- a/file_system/file_system.go +++ b/file_system/file_system.go @@ -9,7 +9,9 @@ import ( "fmt" "io" + "github.com/dgraph-io/badger/v4" "github.com/ipfs/go-cid" + "github.com/wealdtech/go-merkletree/v2" "github.com/rs/zerolog/log" "github.com/wealdtech/go-merkletree/v2/sha3"