From 8a651aa782b9b7d8193df42773a6ff6359f118ba Mon Sep 17 00:00:00 2001 From: MuDrone Date: Wed, 8 Nov 2023 20:56:56 +0800 Subject: [PATCH 1/2] replace deprecated io/util --- models/driver.go | 15 +++++++-------- utils/utils.go | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/models/driver.go b/models/driver.go index e509ead..0b39c2e 100644 --- a/models/driver.go +++ b/models/driver.go @@ -3,7 +3,6 @@ package models import ( "sync" // io/util is deprecated but I found no alternative on ChatGPT :), To be updated soon with newer one - "io/ioutil" //Maybe later on shift to a faster library for json encoding and decoding "encoding/json" "fmt" @@ -86,12 +85,12 @@ func (driver *Driver) Write(collection string, v interface{}) error { defer mutex.Unlock() dir := filepath.Join(driver.dir, collection) - tempdir := filepath.Join(dir, data) + tempDir := filepath.Join(dir, data) fnlPath := filepath.Join(dir, data+".json") tmpPath := fnlPath + ".tmp" // Check if the file already exists - if _, err := utils.Stat(tempdir); err == nil { + if _, err := utils.Stat(tempDir); err == nil { fmt.Println("Record already exists!") return fmt.Errorf("record already exists") } @@ -106,7 +105,7 @@ func (driver *Driver) Write(collection string, v interface{}) error { } b = append(b, byte('\n')) - if err := ioutil.WriteFile(tmpPath, b, 0644); err != nil { + if err := os.WriteFile(tmpPath, b, 0644); err != nil { return err } @@ -138,7 +137,7 @@ func (driver *Driver) Read(collection string, data string, c *cache.Cache, wantC } } - b, err := ioutil.ReadFile(record + ".json") + b, err := os.ReadFile(record + ".json") if err != nil { return "", err } @@ -168,11 +167,11 @@ func (driver *Driver) ReadAll(collection string, c *cache.Cache, wantCache bool) return records.([]string), nil } } - files, _ := ioutil.ReadDir(dir) + files, _ := os.ReadDir(dir) var records []string for _, file := range files { - b, err := ioutil.ReadFile(filepath.Join(dir, file.Name())) + b, err := os.ReadFile(filepath.Join(dir, file.Name())) if err != nil { return nil, err } @@ -262,7 +261,7 @@ func (driver *Driver) UpdateRecord(collection string, data string, v interface{} } b = append(b, byte('\n')) - if err := ioutil.WriteFile(record+".json", b, 0644); err != nil { + if err := os.WriteFile(record+".json", b, 0644); err != nil { return err } return nil diff --git a/utils/utils.go b/utils/utils.go index dd825ce..d59dab4 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -14,7 +14,7 @@ func Stat(path string) (fi os.FileInfo, err error) { return } -// Utility fucntion to check for tag "db" with value main in the struct and returning the struct member name +// Utility function to check for tag "db" with value main in the struct and returning the struct member name func CheckTag(s interface{}) (string, error) { v := reflect.ValueOf(s) t := v.Type() From 17c738df9a4b71af3017a94e35f840e3fed96f18 Mon Sep 17 00:00:00 2001 From: Shubham Singh Date: Wed, 8 Nov 2023 19:19:55 +0530 Subject: [PATCH 2/2] Corrected in Experimental Drivers --- examples/main.go | 2 +- models/driver.go | 1 - models/experimentalDrivers.go | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/main.go b/examples/main.go index decb575..5c0d234 100644 --- a/examples/main.go +++ b/examples/main.go @@ -65,7 +65,7 @@ func main() { // //Writing into the database Example for _, items := range employees { - db.Write("trials", User{ + db.Write("users", User{ Name: items.Name, Age: items.Age, Contact: items.Contact, diff --git a/models/driver.go b/models/driver.go index 0b39c2e..55fe14a 100644 --- a/models/driver.go +++ b/models/driver.go @@ -8,7 +8,6 @@ import ( "fmt" "os" "path/filepath" - "github.com/jcelliott/lumber" "github.com/patrickmn/go-cache" "github.com/shubhexists/go-json-db/utils" diff --git a/models/experimentalDrivers.go b/models/experimentalDrivers.go index 26af82a..f566a02 100644 --- a/models/experimentalDrivers.go +++ b/models/experimentalDrivers.go @@ -3,7 +3,7 @@ package models import ( "encoding/json" "fmt" - "io/ioutil" + "os" "path/filepath" // "github.com/jcelliott/lumber" "github.com/shubhexists/go-json-db/utils" @@ -23,7 +23,7 @@ func (driver *Driver) Update(collection string, data string, v interface{}, newV return err } - b, err := ioutil.ReadFile(record + ".json") + b, err := os.ReadFile(record + ".json") if err != nil { return err } @@ -50,7 +50,7 @@ func (driver *Driver) Update(collection string, data string, v interface{}, newV } b = append(b, byte('\n')) - if err := ioutil.WriteFile(record+".json", b, 0644); err != nil { + if err := os.WriteFile(record+".json", b, 0644); err != nil { return err }