Skip to content

Replace successes with PromiseKit's when #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andreterron wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace successes with PromiseKit's when #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions Sources/Application.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,18 +242,19 @@ final class OSXApplicationDelegate<
// Initialize OSXWindowDelegates from the window elements.
let windowPromises = windowElements.map({ windowElement in
self.createWindowForElementIfNotExists(windowElement)
// Log any errors we encounter, but don't fail.
.recover { (error: Error) -> Promise<WinDelegate?> in
log.debug({
let description: String =
(try? windowElement.attribute(.description) ?? "") ?? ""
return "Couldn't initialize window for element \(windowElement) "
+ "(\(description)) of \(self): \(error)"
}())
return Promise<WinDelegate?>.value(nil)
}
})

return successes(windowPromises, onError: { index, error in
// Log any errors we encounter, but don't fail.
let windowElement = windowElements[index]
log.debug({
let description: String =
(try? windowElement.attribute(.description) ?? "") ?? ""
return "Couldn't initialize window for element \(windowElement) "
+ "(\(description)) of \(self): \(error)"
}())
}).asVoid()

return when(fulfilled: windowPromises).asVoid()
}
}

Expand Down
32 changes: 0 additions & 32 deletions Sources/Successes+PromiseKit.swift
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions Swindler.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
2F00BBD92142F32700457FB2 /* FakeSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F00BBD82142F32700457FB2 /* FakeSpec.swift */; };
2F00BBDB21432A9000457FB2 /* FakeAXSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F00BBDA21432A9000457FB2 /* FakeAXSwift.swift */; };
2F00BBDD2143769C00457FB2 /* FakeSwindler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F00BBDC2143769C00457FB2 /* FakeSwindler.swift */; };
2F55343D1C0AC86500B87C42 /* Successes+PromiseKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F55343C1C0AC86500B87C42 /* Successes+PromiseKit.swift */; };
2F61898F1C22718E00C422C0 /* ApplicationSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F61898B1C22718E00C422C0 /* ApplicationSpec.swift */; };
2F6189901C22718E00C422C0 /* StateSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F61898C1C22718E00C422C0 /* StateSpec.swift */; };
2F6189921C22718E00C422C0 /* WindowSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F61898E1C22718E00C422C0 /* WindowSpec.swift */; };
Expand Down Expand Up @@ -56,7 +55,6 @@
2F00BBD82142F32700457FB2 /* FakeSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FakeSpec.swift; sourceTree = "<group>"; };
2F00BBDA21432A9000457FB2 /* FakeAXSwift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FakeAXSwift.swift; sourceTree = "<group>"; };
2F00BBDC2143769C00457FB2 /* FakeSwindler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FakeSwindler.swift; sourceTree = "<group>"; };
2F55343C1C0AC86500B87C42 /* Successes+PromiseKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Successes+PromiseKit.swift"; sourceTree = "<group>"; };
2F61898B1C22718E00C422C0 /* ApplicationSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationSpec.swift; sourceTree = "<group>"; };
2F61898C1C22718E00C422C0 /* StateSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StateSpec.swift; sourceTree = "<group>"; };
2F61898E1C22718E00C422C0 /* WindowSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WindowSpec.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -195,7 +193,6 @@
2F86CEE11BD6D9E1007E8C29 /* Events.swift */,
2F7F01011C11570D00C97949 /* Errors.swift */,
2F7F01031C11578800C97949 /* AXSwiftProtocols.swift */,
2F55343C1C0AC86500B87C42 /* Successes+PromiseKit.swift */,
2F86CECB1BD60117007E8C29 /* Info.plist */,
2F9E31A81BF050AF00EAD248 /* Property.swift */,
2FEEA2E21C1E6E9200CD515E /* Log.swift */,
Expand Down Expand Up @@ -345,6 +342,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -507,7 +505,6 @@
2F7F01041C11578800C97949 /* AXSwiftProtocols.swift in Sources */,
2F9E31A91BF050AF00EAD248 /* Property.swift in Sources */,
2F6314291C49C0DD001D1E24 /* Screen.swift in Sources */,
2F55343D1C0AC86500B87C42 /* Successes+PromiseKit.swift in Sources */,
2F7F01021C11570D00C97949 /* Errors.swift in Sources */,
2F86CEE41BD6DAD7007E8C29 /* State.swift in Sources */,
2F86CEE21BD6D9E1007E8C29 /* Events.swift in Sources */,
Expand Down