Refactor

Author: hzyitc

amlCRC.go renamed to AmlCRC/amlCRC.go

@@ -1,4 +1,4 @@
-package AmlImg
+package AmlCRC
 
 import "hash/crc32"
 

cli/main.go renamed to AmlImg.go

@@ -8,44 +8,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hzyitc/AmlImg"
+	"github.com/hzyitc/AmlImg/AmlImg"
 )
 
-var version = "v0.0.0"
-
-func usage() {
-	print(os.Args[0] + " (" + version + ")\n")
-	print("Usage:\n")
-	print("  " + os.Args[0] + " unpack <img path> <extract dir path>\n")
-	print("  " + os.Args[0] + " pack <img path> <dir path>\n")
-}
-
-func main() {
-	if len(os.Args) != 4 {
-		usage()
-		return
-	}
-
-	switch os.Args[1] {
-	case "unpack":
-		os.MkdirAll(os.Args[3], 0755)
-
-		err := unpack(os.Args[2], os.Args[3])
-		if err != nil {
-			println(err.Error())
-			return
-		}
-
-	case "pack":
-		err := pack(os.Args[2], os.Args[3])
-		if err != nil {
-			println(err.Error())
-			return
-		}
-
-	}
-}
-
 func unpack(filePath, extractPath string) error {
 	img, err := AmlImg.NewReader(filePath, true)
 	if err != nil {

header.go renamed to AmlImg/header.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"io"
 	"os"
+
+	"github.com/hzyitc/AmlImg/AmlCRC"
 )
 
 type ImageReader struct {
@@ -42,7 +44,7 @@ func NewReader(path string, check bool) (*ImageReader, error) {
 		var buf [4096]byte
 		for {
 			n, err := file.Read(buf[:])
-			crc = AmlCRC(crc, buf[:n])
+			crc = AmlCRC.AmlCRC(crc, buf[:n])
 			if errors.Is(err, io.EOF) {
 				break
 			} else if err != nil {

item.go renamed to AmlImg/item.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"io"
 	"os"
+
+	"github.com/hzyitc/AmlImg/AmlCRC"
 )
 
 type ImageWriter struct {
@@ -125,7 +127,7 @@ func (w *ImageWriter) Write(path string, version uint32) error {
 	var buf [4096]byte
 	for {
 		n, err := file.Read(buf[:])
-		crc = AmlCRC(crc, buf[:n])
+		crc = AmlCRC.AmlCRC(crc, buf[:n])
 		if errors.Is(err, io.EOF) {
 			break
 		} else if err != nil {

reader.go renamed to AmlImg/reader.go

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PROGRAM="AmlImg"
-CLI="./cli"
+CLI="./"
 OUTPUT="bin/"
 LDFLAGS="-s -w"
 

writer.go renamed to AmlImg/writer.go

@@ -0,0 +1,39 @@
+package main
+
+import (
+	"os"
+)
+
+var version = "v0.0.0"
+
+func usage() {
+	print(os.Args[0] + " (" + version + ")\n")
+	print("Usage:\n")
+	print("  " + os.Args[0] + " unpack <img path> <extract dir path>\n")
+	print("  " + os.Args[0] + " pack <img path> <dir path>\n")
+}
+
+func main() {
+	if len(os.Args) != 4 {
+		usage()
+		return
+	}
+
+	switch os.Args[1] {
+	case "unpack":
+		os.MkdirAll(os.Args[3], 0755)
+
+		err := unpack(os.Args[2], os.Args[3])
+		if err != nil {
+			println(err.Error())
+			return
+		}
+
+	case "pack":
+		err := pack(os.Args[2], os.Args[3])
+		if err != nil {
+			println(err.Error())
+			return
+		}
+	}
+}