From fd58395db387ecc306d06aa4b477e25561bfb57d Mon Sep 17 00:00:00 2001 From: windyboy Date: Mon, 12 Aug 2024 14:23:31 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Remove=20commented-out=20regex?= =?UTF-8?q?=20patterns=20and=20initialization=20in=20config.=20(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/config/config.go | 110 +------------------------------------- 1 file changed, 2 insertions(+), 108 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index 28594e2..1593243 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -54,109 +54,10 @@ type HasuraConfig struct { const ( EnvProd = "prod" - // logConfigFile = "configs/log_config.json" - // arrPatternString represents the regular expression pattern used to match arrival patterns. - // The pattern matches strings in the format: "(TYPE-NUMBER-SSR-DEPARTURE-ARRIVAL)". - // The pattern captures the following named groups: - // - category: the three-letter category code - // - number: the alphanumeric flight number - // - ssr: the alphanumeric SSR code - // - departure: the four-letter departure airport code - // - arrival: the four-letter arrival airport code - // arrPatternString = `^\((?P[A-Z]{3})` + - // `-(?P[A-Z0-9]+)(\/?(?P[A-Z0-9]+))?` + - // `-(?P[A-Z]{4})` + - // `-(?P[A-Z]{4})(?P\d{4})\)$` - - // depPatternString represents the regular expression pattern used to match departure patterns. - // The pattern matches strings in the format: "(TYPE-NUMBER-SSR-DEPARTURE-DEPARTURE_TIME-ARRIVAL)". - // The pattern captures the following named groups: - // - category: the three-letter category code - // - number: the alphanumeric flight number - // - ssr: the alphanumeric SSR code - // - departure: the four-letter departure airport code - // - departure_time: the four-digit departure time - // - arrival: the four-letter arrival airport code - // depPatternString = `^\((?P[A-Z]{3})-(?P[A-Z0-9]+)(\/(?P[A-Z0-9]+))?-(?P[A-Z]{4})(?P\d{4})-(?P[A-Z]{4})\)$` - - // fplPatternString represents the regular expression pattern used to match flight plan patterns. - // The pattern matches strings in the format: "(CATEGORY-NUMBER-INDICATOR-AIRCRAFT-SURVE-DEPARTURE-DEPARTURE_TIME-SPEED-LEVEL-ROUTE-DESTINATION-ESTT-ALTER-OTHER)". - // The pattern captures the following named groups: - // - category: the three-letter category code - // - number: the alphanumeric flight number - // - indicator: the two-letter indicator - // - aircraft: the alphanumeric aircraft type, optionally followed by a slash and an uppercase letter - // - surve: any character sequence (surveillance information) - // - departure: the four-letter departure airport code - // - departure_time: the four-digit departure time - // - speed: one or more uppercase letters followed by one or more digits (e.g., N123) - // - level: one or more alphanumeric characters (e.g., FL350) - // - route: one or more characters (including newline) representing the flight route - // - destination: the four-letter destination airport code - // - estt: the four-digit estimated time of arrival - // - alter: one or more sequences of a whitespace character followed by exactly four uppercase letters - // - other: any other relevant information, starting with three uppercase letters followed by a forward slash and zero or more characters (including newline) - - // fplPatternString = `\((?P[A-Z]{3})-(?P[A-Z]+\d+)-(?P[A-Z]{2})\n-(?P[A-Z]+\d+\/?[A-Z]?)\n?-(?P.*)\n?-(?P[A-Z]{4})(?P\d{4})\n?-(?P[A-Z]+\d+)(?P[A-Z0-9]+)\s+(?P(.|\n)+)\n-(?P[A-Z]{4})(?P\d{4})\s?(?P(\s[A-Z]{4})+)\n?-([A-Z]{3}\/(?:[A-Z]{4}\d{4}\s?)+)?(?P(?m)[A-Z]{3}\/(.|\n)*)\)$` - - // cnlPatternString = `^\((?P[A-Z]{3})-(?P\w+\d+)-?(?P[A-Z]{4})?-?(?[A-Z]{4})\)$` - - // dlaPatternString = `^\((?P[A-Z]{3})-(?P\w+\d+)-?(?P[A-Z]{4})(?P\d{4})?-?(?[A-Z]{4})(?\d{4})?\)$` + EnvDev = "dev" + EnvTest = "test" ) -// Initialize the bodyPatterns map -// var bodyPatterns = map[string]BodyConfig{ -// "ARR": { -// Patterns: []PatternConfig{ -// { -// Pattern: arrPatternString, -// Comments: "Pattern for ARR message", -// Expression: regexp.MustCompile(arrPatternString), -// }, -// }, -// }, -// "DEP": { -// Patterns: []PatternConfig{ -// { -// Pattern: depPatternString, -// Comments: "Pattern for DEP message", -// Expression: regexp.MustCompile(depPatternString), -// }, -// }, -// }, -// "FPL": { -// Patterns: []PatternConfig{ -// { -// Pattern: fplPatternString, -// Comments: "Pattern for FPL message", -// Expression: regexp.MustCompile(fplPatternString), -// }, -// }, -// }, -// "CNL": { -// Patterns: []PatternConfig{ -// { -// Pattern: cnlPatternString, -// Comments: "Pattern for CNL message", -// Expression: regexp.MustCompile(cnlPatternString), -// }, -// }, -// }, -// "DLA": { -// Patterns: []PatternConfig{ -// { -// Pattern: dlaPatternString, -// Comments: "Pattern for DLA message", -// Expression: regexp.MustCompile(dlaPatternString), -// }, -// }, -// }, -// } - -// func GetBodyPatterns() map[string]BodyConfig { -// return bodyPatterns -// } - func SetMyConfig(cfg *Config) { MyConfig = cfg } @@ -193,19 +94,12 @@ func LoadConfig() (*Config, error) { return nil, fmt.Errorf(errMsg) } - // log.Debug("Config file read successfully") - // log.Debugf("Config keys: %v", viper.AllKeys()) - var config Config if err := viper.Unmarshal(&config); err != nil { errMsg := fmt.Sprintf("unable to decode config into struct for environment '%s': %v", env, err) // log.Error(errMsg) return nil, fmt.Errorf(errMsg) } - // loadLoggerConfig() - - // log.Debugf("Config loaded: %+v", config) - // loadLoggerConfig() return &config, nil }