Commit 5aec0e7

committed

Be more tolerant wrt errors

... fallback to default imp.

1 parent ceea911 commit 5aec0e7Copy full SHA for 5aec0e7

File tree

+19

-4

lines changed

+19

-4

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,13 @@ fileprivate func buildInitialFetchSpec<Object: ActiveRecordType>`
`317`	`317`	`if (fs.sortOrderings?.count ?? 0) == 0 {`
`318`	`318`	`fs.sortOrderings = dataSource.entity?.d2s.defaultSortOrderings ?? []`
`319`	`319`	`}`
`320`		`- assert(fs.sortOrderings != nil && !(fs.sortOrderings?.isEmpty ?? true))`
	`320`	`+ #if os(macOS)`
	`321`	`+ if !(fs.sortOrderings != nil && !(fs.sortOrderings?.isEmpty ?? true)) {`
	`322`	`+ globalD2SLogger.error("got no sort orderings for fetchspec:", fs)`
	`323`	`+ }`
	`324`	`+ #else`
	`325`	`+ assert(fs.sortOrderings != nil && !(fs.sortOrderings?.isEmpty ?? true))`
	`326`	`+ #endif`
`321`	`327`
`322`	`328`	`if let aux = auxiliaryQualifier {`
`323`	`329`	`fs.qualifier = aux.and(fs.qualifier)`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,13 @@ public extension BasicLook.PageWrapper.MasterDetail {`
`23`	`23`	`private var selectedEntity: Entity? {`
`24`	`24`	`guard let entityName = selectedEntityName else { return nil }`
`25`	`25`	`guard let entity = model[entity: entityName] else {`
`26`		`- fatalError("did not find entity: \(entityName) in \(model)")`
	`26`	`+ #if os(macOS)`
	`27`	`+ globalD2SLogger.error("did not find entity:", entityName,`
	`28`	`+ "in:", model)`
	`29`	`+ return nil`
	`30`	`+ #else`
	`31`	`+ fatalError("did not find entity: \(entityName) in \(model)")`
	`32`	`+ #endif`
`27`	`33`	`}`
`28`	`34`	`return entity`
`29`	`35`	`}`
`@@ -71,7 +77,8 @@ public extension BasicLook.PageWrapper.MasterDetail {`
`71`	`77`	`}`
`72`	`78`	`else {`
`73`	`79`	`EntityContent()`
`74`		`- .environment(\.entity, selectedEntity!)`
	`80`	`+ .environment(\.entity,`
	`81`	`+ selectedEntity ?? D2SKeys.entity.defaultValue)`
`75`	`82`	`}`
`76`	`83`	`}`
`77`	`84`	`.frame(minWidth: 400 as CGFloat, idealWidth: 600 as CGFloat,`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,9 @@ public extension BasicLook.PageWrapper.MasterDetail.EntityMasterDetailPage {`
`68`	`68`	`EntityName()`
`69`	`69`	`Spacer()`
`70`	`70`	`}`
`71`		`- .environment(\.entity, { self.model[entity: name]! }())`
	`71`	`+ .environment(\.entity, {`
	`72`	`+ self.model[entity: name] ?? D2SKeys.entity.defaultValue`
	`73`	`+ }())`
`72`	`74`	`.frame(maxWidth: .infinity, maxHeight: .infinity)`
`73`	`75`	`.foregroundColor(self.colorForEntityName(name))`
`74`	`76`	`.onTapGesture {`

Comments

(0)