Merge pull request #2 from PreciousNyasulu/read_with_sheetname

Read with sheetname

README.md

@@ -40,7 +40,20 @@ import (
 )
 
 func main() {
-    data, err := structurama.ReadFile("./example.xlsx", Person{}, true)
+    data, err := structurama.ReadFileDefault("./example.xlsx", Person{}, true)
+    if err != nil {
+        fmt.Println(err)
+        return
+    }
+    fmt.Println(data)
+}
+```
+
+Here is how you can read file by Sheetname: 
+
+```go
+func main() {
+    data, err := structurama.ReadFileBySheetName("./example.xlsx", Person{}, true,"Sheet1")
     if err != nil {
         fmt.Println(err)
         return
@@ -53,7 +66,7 @@ func main() {
 
 ```go
 func main() {
-    data, err := structurama.ReadFile("./example.xlsx", Person{}, true)
+    data, err := structurama.ReadFileDefault("./example.xlsx", Person{}, true)
     if err != nil {
         fmt.Println(err)
         return
@@ -73,6 +86,9 @@ func main() {
 
 Contributions are welcome! Feel free to open issues or submit pull requests.
 
+## Inspiration 
+[tealeg/xlsx](https://github.com/tealeg/xlsx) - Go library for reading and writing XLSX files.
+
 ## License
 
 This package is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.

example/main.go

@@ -5,8 +5,15 @@ import (
 	"github.com/PreciousNyasulu/structurama/reader"
 )
 
+type Person struct {
+	Id        string `xlsx:"0"`
+	FirstName string `xlsx:"1"`
+	LastName  string `xlsx:"2"`
+	Age       string `xlsx:"3"`
+}
+
 func main() {
-	data, err := structurama.ReadFile("./example.xlsx", Person{}, true)
+	data, err := structurama.ReadFileDefault("./example.xlsx", Person{}, true)
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -19,11 +26,4 @@ func main() {
 			fmt.Println(item.Id, item.FirstName, item.LastName, item.Age)
 		}
 	}
-}
-
-type Person struct {
-	Id        string `xlsx:"0"`
-	FirstName string `xlsx:"1"`
-	LastName  string `xlsx:"2"`
-	Age       string `xlsx:"3"`
-}
+}

reader/reader.go

@@ -9,15 +9,18 @@ import (
 	"time"
 )
 
-func ReadFile(filePath string, sheetStruct interface{}, skipHeader bool, sheetNumber ...int) (interface{}, error) {
+var sheet *xlsx.Sheet
+var sheetStruct interface{}
+var _skipHeader bool
 
+func ReadFileDefault(filePath string, customStruct interface{}, skipHeader bool, sheetNumber ...int) (interface{}, error) {
+	sheetStruct = customStruct
+	_skipHeader = skipHeader
 	xlFile, err := xlsx.OpenFile(filePath)
 	if err != nil {
 		return nil, err
 	}
 
-	var sheet *xlsx.Sheet
-
 	if len(sheetNumber) > 0 {
 		sheet, err = getSheetByNumber(xlFile, sheetNumber[0])
 		if err != nil {
@@ -27,6 +30,36 @@ func ReadFile(filePath string, sheetStruct interface{}, skipHeader bool, sheetNu
 		sheet = xlFile.Sheets[0]
 	}
 
+	data, err := read(sheet)
+	if err != nil {
+		return nil, err
+	}
+
+	return data, nil
+}
+
+func ReadFileBySheetName(filePath string, customStruct interface{}, skipHeader bool, sheetName string) (interface{}, error) {
+	sheetStruct = customStruct
+	_skipHeader = skipHeader
+	xlFile, err := xlsx.OpenFile(filePath)
+	if err != nil {
+		return nil, err
+	}
+
+	sheet, err = getSheetByName(xlFile, sheetName)
+	if err != nil {
+		return nil, err
+	}
+
+	data, err := read(sheet)
+	if err != nil {
+		return nil, err
+	}
+
+	return data, nil
+}
+
+func read(sheet *xlsx.Sheet) (interface{}, error) {
 	// Get the type of struct
 	templateType := reflect.TypeOf(sheetStruct)
 
@@ -37,7 +70,7 @@ func ReadFile(filePath string, sheetStruct interface{}, skipHeader bool, sheetNu
 	// Iterate through rows
 	for r_i, row := range sheet.Rows {
 		// Skip header if
-		if skipHeader && r_i == 0 {
+		if _skipHeader && r_i == 0 {
 			continue
 		}
 
@@ -48,7 +81,7 @@ func ReadFile(filePath string, sheetStruct interface{}, skipHeader bool, sheetNu
 			// Get the field corresponding to the current column index
 			field := newStruct.FieldByIndex([]int{i})
 			if field.IsValid() {
-				err = handleFieldKind(field, cell)
+				err := handleFieldKind(field, cell)
 				if err != nil {
 					return nil, err
 				}
@@ -69,7 +102,14 @@ func getSheetByNumber(xlFile *xlsx.File, sheetNumber int) (*xlsx.Sheet, error) {
 	if isValidSheetNumber(sheetNumber, len(xlFile.Sheets)) {
 		return xlFile.Sheets[sheetNumber], nil
 	}
-	return nil, fmt.Errorf("Invalid sheet number: %v", sheetNumber)
+	return nil, fmt.Errorf("invalid sheet number: %v", sheetNumber)
+}
+
+func getSheetByName(xlFile *xlsx.File, sheetName string) (*xlsx.Sheet, error) {
+	if xlFile.Sheet[sheetName] != nil {
+		return xlFile.Sheet[sheetName], nil
+	}
+	return nil, fmt.Errorf("invalid sheet name: %s", sheetName)
 }
 
 // handleFieldKind: Convert cell value based on the field type
@@ -103,7 +143,7 @@ func handleFieldKind(field reflect.Value, cell *xlsx.Cell) error {
 				}
 			}
 		} else {
-			fmt.Errorf("Unsupported type for pointer: %v", field.Type().Elem().Kind())
+			return fmt.Errorf("unsupported type for pointer: %v", field.Type().Elem().Kind())
 		}
 
 	case reflect.Struct: