Handle edge cases for FText

go.mod

@@ -3,6 +3,7 @@ module github.com/Vilsol/ue4pak
 go 1.14
 
 require (
+	github.com/davecgh/go-spew v1.1.1
 	github.com/fatih/color v1.10.0
 	github.com/gobwas/glob v0.2.3
 	github.com/sirupsen/logrus v1.7.0

parser/parser_common.go

@@ -85,6 +85,23 @@ func (parser *PakParser) ReadFText() *FText {
 		HistoryType: historyType,
 	}
 
+	if flags == 2 && historyType == -1 {
+		// TODO Unknown
+		if parser.ReadInt32() == 0 {
+			return &text
+		}
+
+		text.SourceString = parser.ReadString()
+		return &text
+	}
+
+	if flags == 0 && historyType == 11 {
+		// TODO Unknown
+		parser.Read(8)
+		text.SourceString = parser.ReadString()
+		return &text
+	}
+
 	if historyType != 0 {
 		return &text
 	}

parser/struct.go

@@ -105,6 +105,7 @@ var structResolvers = map[string]StructResolver{
 	"MovieSceneFloatChannel":             nil,
 	"LevelSequenceBindingReferenceArray": nil,
 	"MovieSceneTrackFieldData":           nil,
+	"NiagaraDataInterfaceGPUParamInfo":   nil,
 }
 
 type StructType struct {

utils/bytewise.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/fatih/color"
 	"math"
-	"strconv"
+	"strings"
 	"unicode/utf16"
 )
 
@@ -48,11 +48,6 @@ func HexDumpWidth(data []byte, perRow int) string {
 
 	rows := int(math.Ceil(float64(len(data)) / float64(perRow)))
 
-	rowWidth := perRow * 5
-	if len(data) < perRow {
-		rowWidth = len(data) * 5
-	}
-
 	lengthChars := 0
 	stringChars := uint32(0)
 
@@ -70,23 +65,28 @@ func HexDumpWidth(data []byte, perRow int) string {
 			}
 
 			hexTemp := fmt.Sprintf("%#-4x", data[offset]) + " "
-			charTemp := fmt.Sprintf("%s", safeChar(data[offset]))
+			charTemp := safeChar(data[offset])
 
-			if lengthChars > 0 {
+			switch {
+			case lengthChars > 0:
 				hexSide += color.BlueString(hexTemp)
 				charSide += color.BlueString(charTemp)
 				lengthChars--
-			} else if stringChars > 0 {
+			case stringChars > 0:
 				hexSide += color.GreenString(hexTemp)
 				charSide += color.GreenString(charTemp)
 				stringChars--
-			} else {
+			default:
 				hexSide += hexTemp
 				charSide += charTemp
 			}
 		}
 
-		result += fmt.Sprintf("%-#6x: %-"+strconv.Itoa(rowWidth)+"s%s\n", i*perRow, hexSide, charSide)
+		result += fmt.Sprintf("%-#6x: %s", i*perRow, hexSide)
+		if len(data[i*perRow:]) < perRow && len(data) > perRow {
+			result += strings.Repeat(" ", (perRow-len(data[i*perRow:]))*5)
+		}
+		result += fmt.Sprintf("%s\n", charSide)
 	}
 
 	return result