Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit770da43

Browse files
committed
clean up
1 parent9f6312b commit770da43

File tree

1 file changed

+14
-54
lines changed

1 file changed

+14
-54
lines changed

‎pkg/github/response_formatter.go‎

Lines changed: 14 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,13 @@ func toCSV(data interface{}) (string, error) {
119119
// How much values does it add? Using CSV for a single object feels a bit odd
120120
// -> honestly none imo - tested current implementation on get_commit and this does more harm than good
121121
// as we lose insight on certain, deeply nested, fields
122-
ifv.Kind()==reflect.Struct||v.Kind()==reflect.Map{
122+
ifv.Kind()==reflect.Struct {
123123
slice:=reflect.MakeSlice(reflect.SliceOf(v.Type()),1,1)
124124
slice.Index(0).Set(v)
125125
returnsliceToCSV(slice)
126126
}
127127

128-
// Return any primitive as is
129-
returnfmt.Sprintf("%v",data),nil
128+
return"",fmt.Errorf("unsupported data type: %v",v.Kind())
130129
}
131130

132131
// unwrap dereferences pointers and interfaces until reaching a concrete value
@@ -154,7 +153,11 @@ func sliceToCSV(slice reflect.Value) (string, error) {
154153

155154
// Get all possible headers from first element
156155
firstElem:=slice.Index(0)
157-
allHeaders:=extractHeaders(firstElem)
156+
firstElem,isNil:=unwrap(firstElem)
157+
ifisNil {
158+
return"",nil
159+
}
160+
allHeaders:=extractStructHeaders(firstElem,"")
158161
iflen(allHeaders)==0 {
159162
return"",fmt.Errorf("no fields found in data")
160163
}
@@ -220,22 +223,6 @@ func sliceToCSV(slice reflect.Value) (string, error) {
220223
returnbuf.String(),nil
221224
}
222225

223-
// extractHeaders gets all field names from an object, flattening nested structures
224-
funcextractHeaders(v reflect.Value) []string {
225-
v,isNil:=unwrap(v)
226-
ifisNil {
227-
returnnil
228-
}
229-
230-
ifv.Kind()==reflect.Struct {
231-
returnextractStructHeaders(v,"")
232-
}
233-
ifv.Kind()==reflect.Map {
234-
returnextractMapKeys(v)
235-
}
236-
returnnil
237-
}
238-
239226
// getFieldName extracts field name from struct field, preferring json tag
240227
funcgetFieldName(field reflect.StructField)string {
241228
ifjsonTag:=field.Tag.Get("json");jsonTag!=""&&jsonTag!="-" {
@@ -272,13 +259,13 @@ func extractStructHeaders(v reflect.Value, prefix string) []string {
272259

273260
kind:=fieldValue.Kind()
274261

275-
// Skip complex types (arrays,maps, interfaces), only allow primitives and timestamps
262+
// Skip complex types (arrays,slices, interfaces), only allow primitives and timestamps
276263
ifkind==reflect.Struct {
277264
typeName:=fieldValue.Type().Name()
278265
iftypeName!="Timestamp"&&typeName!="Time" {
279266
continue
280267
}
281-
}elseifkind==reflect.Slice||kind==reflect.Array||kind==reflect.Map||kind==reflect.Interface {
268+
}elseifkind==reflect.Slice||kind==reflect.Array||kind==reflect.Interface {
282269
continue
283270
}
284271
}
@@ -329,8 +316,7 @@ func hasPrimitiveFields(v reflect.Value) bool {
329316
kind:=field.Kind()
330317

331318
// Check for any primitive types
332-
ifkind==reflect.String||kind==reflect.Int||kind==reflect.Int64||
333-
kind==reflect.Bool||kind==reflect.Float32||kind==reflect.Float64 {
319+
ifkind==reflect.String||kind==reflect.Int||kind==reflect.Int64||kind==reflect.Bool {
334320
returntrue
335321
}
336322

@@ -346,20 +332,7 @@ func hasPrimitiveFields(v reflect.Value) bool {
346332
returnfalse
347333
}
348334

349-
// extractMapKeys gets keys from a map
350-
funcextractMapKeys(v reflect.Value) []string {
351-
varkeys []string
352-
iter:=v.MapRange()
353-
foriter.Next() {
354-
ifkey:=iter.Key();key.Kind()==reflect.String {
355-
keys=append(keys,key.String())
356-
}
357-
}
358-
359-
returnkeys
360-
}
361-
362-
// extractValues gets field values from an object in the same order as headers
335+
// extractValues gets field values from a struct in the same order as headers
363336
funcextractValues(v reflect.Value,headers []string) []string {
364337
v,isNil:=unwrap(v)
365338
values:=make([]string,len(headers))
@@ -386,12 +359,9 @@ func extractFieldValue(v reflect.Value, path string) string {
386359
return""
387360
}
388361

389-
switchv.Kind() {
390-
casereflect.Struct:
362+
ifv.Kind()==reflect.Struct {
391363
v=getStructField(v,part)
392-
casereflect.Map:
393-
v=v.MapIndex(reflect.ValueOf(part))
394-
default:
364+
}else {
395365
return""
396366
}
397367
}
@@ -438,21 +408,11 @@ func formatValue(v reflect.Value) string {
438408
returnstrings.Join(strings.Fields(v.String())," ")
439409

440410
// Handle numeric and boolean types
441-
casereflect.Int,reflect.Int8,reflect.Int16,reflect.Int32,reflect.Int64:
411+
casereflect.Int,reflect.Int64:
442412
ifn:=v.Int();n!=0 {
443413
returnfmt.Sprintf("%d",n)
444414
}
445415

446-
casereflect.Uint,reflect.Uint8,reflect.Uint16,reflect.Uint32,reflect.Uint64:
447-
ifn:=v.Uint();n!=0 {
448-
returnfmt.Sprintf("%d",n)
449-
}
450-
451-
casereflect.Float32,reflect.Float64:
452-
ifn:=v.Float();n!=0 {
453-
returnfmt.Sprintf("%g",n)
454-
}
455-
456416
casereflect.Bool:
457417
ifv.Bool() {
458418
return"true"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp