|
8 | 8 | "fmt" |
9 | 9 | "os" |
10 | 10 | "path/filepath" |
| 11 | + "sort" |
11 | 12 | "strconv" |
12 | 13 | "strings" |
13 | 14 | "sync" |
@@ -565,33 +566,28 @@ func PruneMicroCache(dir string, options MicroPruneOptions) (int, error) { |
565 | 566 | } |
566 | 567 |
|
567 | 568 | func microStringJSONField(fields map[string]json.RawMessage, names ...string) (string, bool, error) { |
568 | | - for _, name := range names { |
569 | | - raw, ok := fields[name] |
570 | | - if !ok || string(raw) == "null" { |
571 | | - continue |
572 | | - } |
573 | | - var value string |
574 | | - if err := json.Unmarshal(raw, &value); err != nil { |
575 | | - return "", false, err |
576 | | - } |
577 | | - return value, true, nil |
| 569 | + raw, _, ok := microRawJSONField(fields, names...) |
| 570 | + if !ok || bytes.Equal(bytes.TrimSpace(raw), []byte("null")) { |
| 571 | + return "", false, nil |
578 | 572 | } |
579 | | - return "", false, nil |
| 573 | + var value string |
| 574 | + if err := json.Unmarshal(raw, &value); err != nil { |
| 575 | + return "", false, err |
| 576 | + } |
| 577 | + return value, true, nil |
580 | 578 | } |
581 | 579 |
|
582 | 580 | func microSummaryJSONField(fields map[string]json.RawMessage, names ...string) (string, bool, error) { |
583 | | - for _, name := range names { |
584 | | - raw, ok := fields[name] |
585 | | - if !ok || string(raw) == "null" { |
586 | | - continue |
587 | | - } |
588 | | - value, ok, err := microSummaryFromRaw(raw, name) |
589 | | - if err != nil { |
590 | | - return "", false, err |
591 | | - } |
592 | | - if ok { |
593 | | - return value, true, nil |
594 | | - } |
| 581 | + raw, name, ok := microRawJSONField(fields, names...) |
| 582 | + if !ok || bytes.Equal(bytes.TrimSpace(raw), []byte("null")) { |
| 583 | + return "", false, nil |
| 584 | + } |
| 585 | + value, ok, err := microSummaryFromRaw(raw, name) |
| 586 | + if err != nil { |
| 587 | + return "", false, err |
| 588 | + } |
| 589 | + if ok { |
| 590 | + return value, true, nil |
595 | 591 | } |
596 | 592 | return "", false, nil |
597 | 593 | } |
@@ -813,18 +809,15 @@ func microSummaryMessageText(raw json.RawMessage) (string, bool, error) { |
813 | 809 | } |
814 | 810 |
|
815 | 811 | func microBoolJSONField(fields map[string]json.RawMessage, names ...string) (bool, bool, error) { |
816 | | - for _, name := range names { |
817 | | - raw, ok := fields[name] |
818 | | - if !ok || string(raw) == "null" { |
819 | | - continue |
820 | | - } |
821 | | - value, err := microParseJSONBool(raw, name) |
822 | | - if err != nil { |
823 | | - return false, false, err |
824 | | - } |
825 | | - return value, true, nil |
| 812 | + raw, name, ok := microRawJSONField(fields, names...) |
| 813 | + if !ok || bytes.Equal(bytes.TrimSpace(raw), []byte("null")) { |
| 814 | + return false, false, nil |
| 815 | + } |
| 816 | + value, err := microParseJSONBool(raw, name) |
| 817 | + if err != nil { |
| 818 | + return false, false, err |
826 | 819 | } |
827 | | - return false, false, nil |
| 820 | + return value, true, nil |
828 | 821 | } |
829 | 822 |
|
830 | 823 | func microParseJSONBool(raw json.RawMessage, field string) (bool, error) { |
@@ -864,56 +857,76 @@ func microParseJSONBool(raw json.RawMessage, field string) (bool, error) { |
864 | 857 | } |
865 | 858 |
|
866 | 859 | func microIntJSONField(fields map[string]json.RawMessage, names ...string) (int, bool, error) { |
867 | | - for _, name := range names { |
868 | | - raw, ok := fields[name] |
869 | | - if !ok || string(raw) == "null" { |
870 | | - continue |
871 | | - } |
872 | | - var value int |
873 | | - if err := json.Unmarshal(raw, &value); err == nil { |
874 | | - return value, true, nil |
875 | | - } |
876 | | - var text string |
877 | | - if err := json.Unmarshal(raw, &text); err != nil { |
878 | | - return 0, false, err |
879 | | - } |
880 | | - parsed, err := strconv.Atoi(text) |
881 | | - if err != nil { |
882 | | - return 0, false, err |
883 | | - } |
884 | | - return parsed, true, nil |
| 860 | + raw, _, ok := microRawJSONField(fields, names...) |
| 861 | + if !ok || bytes.Equal(bytes.TrimSpace(raw), []byte("null")) { |
| 862 | + return 0, false, nil |
| 863 | + } |
| 864 | + var value int |
| 865 | + if err := json.Unmarshal(raw, &value); err == nil { |
| 866 | + return value, true, nil |
885 | 867 | } |
886 | | - return 0, false, nil |
| 868 | + var text string |
| 869 | + if err := json.Unmarshal(raw, &text); err != nil { |
| 870 | + return 0, false, err |
| 871 | + } |
| 872 | + parsed, err := strconv.Atoi(text) |
| 873 | + if err != nil { |
| 874 | + return 0, false, err |
| 875 | + } |
| 876 | + return parsed, true, nil |
887 | 877 | } |
888 | 878 |
|
889 | 879 | func microTimeJSONField(fields map[string]json.RawMessage, names ...string) (time.Time, bool, error) { |
890 | | - for _, name := range names { |
891 | | - raw, ok := fields[name] |
892 | | - if !ok || string(raw) == "null" { |
893 | | - continue |
894 | | - } |
895 | | - value, err := microParseJSONTime(raw, name) |
896 | | - if err != nil { |
897 | | - return time.Time{}, false, err |
898 | | - } |
899 | | - return value, true, nil |
| 880 | + raw, name, ok := microRawJSONField(fields, names...) |
| 881 | + if !ok || bytes.Equal(bytes.TrimSpace(raw), []byte("null")) { |
| 882 | + return time.Time{}, false, nil |
900 | 883 | } |
901 | | - return time.Time{}, false, nil |
| 884 | + value, err := microParseJSONTime(raw, name) |
| 885 | + if err != nil { |
| 886 | + return time.Time{}, false, err |
| 887 | + } |
| 888 | + return value, true, nil |
902 | 889 | } |
903 | 890 |
|
904 | 891 | func microDurationJSONField(fields map[string]json.RawMessage, names ...string) (time.Duration, bool, error) { |
| 892 | + raw, name, ok := microRawJSONField(fields, names...) |
| 893 | + if !ok || bytes.Equal(bytes.TrimSpace(raw), []byte("null")) { |
| 894 | + return 0, false, nil |
| 895 | + } |
| 896 | + value, err := microParseJSONDuration(raw, name) |
| 897 | + if err != nil { |
| 898 | + return 0, false, err |
| 899 | + } |
| 900 | + return value, true, nil |
| 901 | +} |
| 902 | + |
| 903 | +func microRawJSONField(fields map[string]json.RawMessage, names ...string) (json.RawMessage, string, bool) { |
905 | 904 | for _, name := range names { |
906 | | - raw, ok := fields[name] |
907 | | - if !ok || string(raw) == "null" { |
908 | | - continue |
| 905 | + if raw, ok := fields[name]; ok { |
| 906 | + return raw, name, true |
909 | 907 | } |
910 | | - value, err := microParseJSONDuration(raw, name) |
911 | | - if err != nil { |
912 | | - return 0, false, err |
| 908 | + } |
| 909 | + keys := make([]string, 0, len(fields)) |
| 910 | + for key := range fields { |
| 911 | + keys = append(keys, key) |
| 912 | + } |
| 913 | + sort.Strings(keys) |
| 914 | + for _, name := range names { |
| 915 | + normalized := microNormalizedJSONFieldName(name) |
| 916 | + for _, key := range keys { |
| 917 | + if microNormalizedJSONFieldName(key) == normalized { |
| 918 | + return fields[key], key, true |
| 919 | + } |
913 | 920 | } |
914 | | - return value, true, nil |
915 | 921 | } |
916 | | - return 0, false, nil |
| 922 | + return nil, "", false |
| 923 | +} |
| 924 | + |
| 925 | +func microNormalizedJSONFieldName(name string) string { |
| 926 | + name = strings.ToLower(strings.TrimSpace(name)) |
| 927 | + name = strings.ReplaceAll(name, "_", "") |
| 928 | + name = strings.ReplaceAll(name, "-", "") |
| 929 | + return name |
917 | 930 | } |
918 | 931 |
|
919 | 932 | func microParseJSONDuration(raw json.RawMessage, field string) (time.Duration, error) { |
|
0 commit comments