refactor: Update parsing of flight schedule data for improved accuracy and functionality

internal/parsers/schedule_parser.go

@@ -7,11 +7,19 @@ import (
 	"strings"
 )
 
+type LineParser struct {
+	Airlines      []string
+	MinLen        int
+	WaypointStart int
+	Fields        map[int]string
+}
+
 const (
-	AirportCode         = "airport"
-	Date                = "date"
-	Task                = "task"
-	IndexPattern        = `^(?P<idx>\(?L?[0-9]+\)?\.?)$`
+	AirportCode = "airport"
+	Date        = "date"
+	Task        = "task"
+	// Index               = "idx"
+	IndexPattern        = `^(?P<idx>\(?L?[0-9]+\)?:?\.?)$`
 	DatePattern         = `^(?P<date>\d{2}\w{3})$`
 	TaskPattern         = `^(?P<task>[A-Z]\/[A-Z])$`
 	WaypointPattern     = `^(SI:)?(?P<arr_time>\d{4}(\(\d{2}[A-Z]{3}\))?)?\/?(?P<airport>[A-Z]{3})\/?(?P<dep_time>\d{4}(\(\d{2}[A-Z]{3}\))?)?$`
@@ -34,6 +42,57 @@ var (
 		FlightNumber: FlightNumberExpression,
 		Register:     RegisterExpression,
 	}
+
+	parserDef = &[]LineParser{
+		{
+			/**
+			* 上航（FM）解析
+			* 解析参考
+			* W/Z FM9134 B2688 1/1ILS (00) TSN0100 SHA
+			* W/Z FM9133 B2688 1/1ILS (00) SHA0340 TSN
+			 */
+			Airlines:      []string{"FM"},
+			MinLen:        6,
+			WaypointStart: 5,
+			Fields: map[int]string{
+				0: Task,
+				1: FlightNumber,
+				2: Register,
+			},
+		},
+		{
+			/**
+			* 解析厦航(MF)计划
+			* 01) MF8193 B5595 ILS(8) HGH1100 1305TSN
+			* 02) MF8194 B5595 ILS(8) TSN1355 1550HGH
+			 */
+			Airlines:      []string{"MF"},
+			MinLen:        5,
+			WaypointStart: 4,
+			Fields: map[int]string{
+				0: Index,
+				1: FlightNumber,
+				2: Register,
+			},
+		},
+		{
+			/**
+			* 解析奥凯(8X)计划
+			* 计划参考：
+			*L1:  29OCT  BK2735 B2863  ILS  IS (3/6)  TSN2350(28OCT)   HAK
+			*L2:  29OCT  BK2735 B2863  ILS  IS (3/6)  HAK0435   NKG
+			 */
+			Airlines:      []string{"8X"},
+			MinLen:        9,
+			WaypointStart: 7,
+			Fields: map[int]string{
+				0: Index,
+				1: Date,
+				2: FlightNumber,
+				3: Register,
+			},
+		},
+	}
 )
 
 func ExtractWaypoint(message string) *domain.WayPoint {
@@ -57,6 +116,70 @@ func ExtractWaypoint(message string) *domain.WayPoint {
 	return result
 }
 
+func FindDef(code string) *LineParser {
+	// fmt.Printf("Finding definition for %s\n", code)
+	// fmt.Println("ParserDef: ", parserDef)
+	for _, def := range *parserDef {
+		for _, airline := range def.Airlines {
+			if airline == code {
+				return &def
+			}
+		}
+	}
+	return nil
+}
+
+func standardizeSpaces(s string) string {
+	return strings.Join(strings.Fields(s), " ")
+}
+
+func ParseWithDef(line string, parserDef *LineParser) *domain.ScheduleLine {
+	log := utils.GetSugaredLogger()
+	cleanLine := standardizeSpaces(strings.TrimSpace(line))
+	words := strings.Split(cleanLine, " ")
+	var flightSchedule = &domain.ScheduleLine{
+		Reference: line,
+	}
+	// var result map[string]string
+	if parserDef == nil {
+		log.Warnf("No definition found: %s", line)
+		flightSchedule.Comments = "No definition found [" + line + "] "
+		return flightSchedule
+	}
+	if len(words) < parserDef.MinLen {
+		log.Warnf("Line too short: %s", line)
+		flightSchedule.Comments = "Line too short [" + line + "] "
+		return flightSchedule
+	}
+
+	for i, field := range parserDef.Fields {
+		// log.Debugf("Parsing field %v -> %s", i, field)
+		data := extract(words[i], parserMap[field])
+		if data != nil {
+			switch field {
+			case Index:
+				flightSchedule.Index = data[Index]
+			case Date:
+				flightSchedule.Date = data[Date]
+			case Task:
+				flightSchedule.Task = data[Task]
+			case FlightNumber:
+				flightSchedule.FlightNumber = append(flightSchedule.FlightNumber, data[FlightNumber])
+			case Register:
+				flightSchedule.AircraftReg = data[Register]
+			}
+		}
+	}
+	if len(words) > parserDef.WaypointStart {
+		flightSchedule.Waypoints = parseWaypoints(words[parserDef.WaypointStart:])
+	} else {
+		log.Warn("No waypoints found")
+		flightSchedule.Comments = "No waypoints found"
+	}
+
+	return flightSchedule
+}
+
 func ParseLine(line string) *domain.ScheduleLine {
 	log := utils.GetSugaredLogger()
 	cleanLine := strings.TrimSpace(line)
@@ -66,7 +189,7 @@ func ParseLine(line string) *domain.ScheduleLine {
 	}
 	var data map[string]string
 
-	if indexData := parse(words[0], IndexExpression); indexData != nil {
+	if indexData := extract(words[0], IndexExpression); indexData != nil {
 		flightSchedule.Index = indexData[Index]
 		words = words[1:]
 	}
@@ -92,7 +215,7 @@ func ParseLine(line string) *domain.ScheduleLine {
 				continue
 			}
 			// Parse the word
-			if data = parse(word, parserMap[name]); data != nil {
+			if data = extract(word, parserMap[name]); data != nil {
 				// Update the flight schedule
 				switch name {
 				case Task:
@@ -138,7 +261,7 @@ func parseWaypoints(points []string) []domain.WayPoint {
 	//find first waypoint
 	var realWaypoints []string
 	for i, point := range points {
-		if parse(point, WaypointExpression) != nil {
+		if extract(point, WaypointExpression) != nil {
 			realWaypoints = points[i:]
 			break
 		}
@@ -149,14 +272,14 @@ func parseWaypoints(points []string) []domain.WayPoint {
 	}
 	var waypoints []domain.WayPoint
 	for _, point := range realWaypoints {
-		log.Debugf("Parsing waypoint: %s", point)
+		// log.Debugf("Parsing waypoint: %s", point)
 		if waypoint := ExtractWaypoint(point); waypoint != nil {
-			log.Debugf("Waypoint: %v", waypoint)
+			// log.Debugf("Waypoint: %v", waypoint)
 			waypoints = append(waypoints, *waypoint)
 		} else {
 			log.Warnf("Failed to parse waypoint: %s", point)
 		}
 	}
-	log.Debugf("Found %d waypoints", len(waypoints))
+	// log.Debugf("Found %d waypoints", len(waypoints))
 	return waypoints
 }