1 files changed, 30 insertions, 28 deletions

diff --git a/cmd/cli/main.go b/cmd/cli/main.go
index 8bb9a24..4613f89 100644
--- a/cmd/cli/main.go
+++ b/cmd/cli/main.go
@@ -9,7 +9,7 @@ import (
 	"riedstra.dev/mitch/steam-export/steam"
 )
 
-var	Version = "Development"
+var Version = "Development"
 
 func parseArgs(args []string) error {
 	if len(args) < 2 {
@@ -55,12 +55,12 @@ func listGames(args []string) error {
 
 	fl.Parse(args)
 
-	steamLib := &steam.Library{}
-	if err := steamLib.ProcessLibrary(*lib); err != nil {
+	l, err := steam.NewLibrary(*lib)
+	if err != nil {
 		return err
 	}
 
-	fmt.Println(steamLib)
+	fmt.Println(l)
 
 	return nil
 }
@@ -78,23 +78,18 @@ func packageGame(args []string) error {
 		return errors.New("You need to specify a file name")
 	}
 
-	lib := &steam.Library{}
-	if err := lib.ProcessLibrary(*libPth); err != nil {
+	lib, err := steam.NewLibrary(*libPth)
+	if err != nil {
 		return err
 	}
 
-	G, ok := lib.Games[*game]
-	if !ok {
-		return errors.New("Game does not exist")
-	}
-
 	f, err := os.OpenFile(*fileName, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0664)
 	if err != nil {
 		return err
 	}
 	defer f.Close()
 
-	err = G.Package(f)
+	err = lib.Package(*game, f)
 	if err != nil {
 		return err
 	}
@@ -111,18 +106,30 @@ func extractGame(args []string) error {
 
 	fl.Parse(args)
 
-	lib := &steam.Library{}
-
-	if err := lib.ProcessLibrary(*libPath); err != nil {
-		return err
-	}
-
-	fh, err := os.Open(*fileName)
+	lib, err := steam.NewLibrary(*libPath)
 	if err != nil {
 		return err
 	}
 
-	return lib.Extract(fh)
+	/*
+		fh, err := os.Open(*fileName)
+		if err != nil {
+			return err
+		}
+
+		g, err := lib.Extract(fh)
+		if err != nil {
+			return err
+		}
+
+		err = fh.Close()
+	*/
+
+	g, err := lib.ExtractFile(*fileName)
+
+	fmt.Println("Extracted: ", g)
+
+	return err
 }
 
 func deleteGame(args []string) error {
@@ -133,18 +140,13 @@ func deleteGame(args []string) error {
 
 	fl.Parse(args)
 
-	lib := &steam.Library{}
+	lib, err := steam.NewLibrary(*libPath)
 
-	if err := lib.ProcessLibrary(*libPath); err != nil {
+	if err != nil {
 		return err
 	}
 
-	G, ok := lib.Games[*game]
-	if !ok {
-		return errors.New("Game does not exist")
-	}
-
-	return G.Delete()
+	return lib.Delete(*game)
 }
 
 func main() {