mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Improve utils of slices (#22379)
- Move the file `compare.go` and `slice.go` to `slice.go`.
- Fix `ExistsInSlice`, it's buggy
  - It uses `sort.Search`, so it assumes that the input slice is sorted.
- It passes `func(i int) bool { return slice[i] == target })` to
`sort.Search`, that's incorrect, check the doc of `sort.Search`.
- Conbine `IsInt64InSlice(int64, []int64)` and `ExistsInSlice(string,
[]string)` to `SliceContains[T]([]T, T)`.
- Conbine `IsSliceInt64Eq([]int64, []int64)` and `IsEqualSlice([]string,
[]string)` to `SliceSortedEqual[T]([]T, T)`.
- Add `SliceEqual[T]([]T, T)` as a distinction from
`SliceSortedEqual[T]([]T, T)`.
- Redesign `RemoveIDFromList([]int64, int64) ([]int64, bool)` to
`SliceRemoveAll[T]([]T, T) []T`.
- Add `SliceContainsFunc[T]([]T, func(T) bool)` and
`SliceRemoveAllFunc[T]([]T, func(T) bool)` for general use.
- Add comments to explain why not `golang.org/x/exp/slices`.
- Add unit tests.
			
			
This commit is contained in:
		
							
								
								
									
										11
									
								
								cmd/dump.go
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								cmd/dump.go
									
									
									
									
									
								
							| @@ -409,15 +409,6 @@ func runDump(ctx *cli.Context) error { | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func contains(slice []string, s string) bool { | ||||
| 	for _, v := range slice { | ||||
| 		if v == s { | ||||
| 			return true | ||||
| 		} | ||||
| 	} | ||||
| 	return false | ||||
| } | ||||
|  | ||||
| // addRecursiveExclude zips absPath to specified insidePath inside writer excluding excludeAbsPath | ||||
| func addRecursiveExclude(w archiver.Writer, insidePath, absPath string, excludeAbsPath []string, verbose bool) error { | ||||
| 	absPath, err := filepath.Abs(absPath) | ||||
| @@ -438,7 +429,7 @@ func addRecursiveExclude(w archiver.Writer, insidePath, absPath string, excludeA | ||||
| 		currentAbsPath := path.Join(absPath, file.Name()) | ||||
| 		currentInsidePath := path.Join(insidePath, file.Name()) | ||||
| 		if file.IsDir() { | ||||
| 			if !contains(excludeAbsPath, currentAbsPath) { | ||||
| 			if !util.SliceContainsString(excludeAbsPath, currentAbsPath) { | ||||
| 				if err := addFile(w, currentInsidePath, currentAbsPath, false); err != nil { | ||||
| 					return err | ||||
| 				} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user