kemko/reproxy
1
0
Fork 0
mirror of https://github.com/kemko/reproxy.git synced 2026-01-01 15:55:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

quick attempt to de-prioritize assets rules

Browse Source
This commit is contained in:
Umputun
2021-06-07 14:54:09 -05:00
parent 15616dfa57
commit f8f5871411
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/discovery/discovery.go
View File

@@ -240,14 +240,14 @@ func (s *Service) Mappers() (mappers []URLMapper) {
for _, m := range s.mappers {
mappers = append(mappers, m...)
}
sort.Slice(mappers, func(i, j int) bool {
// sort by len first, to make longer matches first
if len(mappers[i].SrcMatch.String()) != len(mappers[j].SrcMatch.String()) {
return len(mappers[i].SrcMatch.String()) > len(mappers[j].SrcMatch.String())
}
// if len identical sort by SrcMatch string to keep same SrcMatch grouped together
return mappers[i].SrcMatch.String() < mappers[j].SrcMatch.String()
})
// sort.Slice(mappers, func(i, j int) bool {
// // sort by len first, to make longer matches first
// if len(mappers[i].SrcMatch.String()) != len(mappers[j].SrcMatch.String()) {
// return len(mappers[i].SrcMatch.String()) > len(mappers[j].SrcMatch.String())
// }
// // if len identical sort by SrcMatch string to keep same SrcMatch grouped together
// return mappers[i].SrcMatch.String() < mappers[j].SrcMatch.String()
// })
return mappers
}
@@ -322,6 +322,21 @@ func (s *Service) mergeLists() (res []URLMapper) {
}
res = append(res, lst...)
}
// sort rules to make assets last and prioritize longer rules first
sort.Slice(res, func(i, j int) bool {
// sort by len first, to make longer matches first
if len(res[i].SrcMatch.String()) != len(res[j].SrcMatch.String()) {
return len(res[i].SrcMatch.String()) > len(res[j].SrcMatch.String())
}
// if len identical sort by SrcMatch string to keep same SrcMatch grouped together
return res[i].SrcMatch.String() < res[j].SrcMatch.String()
})
sort.Slice(res, func(i, j int) bool {
return res[i].MatchType < res[j].MatchType
})
return res
}