mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2024-06-01 19:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
Justin Mazzocchi 2021-01-05 14:38:15 -08:00
parent 98ac456be6
commit 61d1a3619d
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
3 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ServiceLayer/Sources/ServiceLayer/Services/MediaProcessingService.swift
View file

@ -32,19 +32,15 @@ public extension MediaProcessingService {
return Future<Data, Error> { promise in return Future<Data, Error> { promise in
itemProvider.loadFileRepresentation(forTypeIdentifier: uniformType.identifier) { url, error in itemProvider.loadFileRepresentation(forTypeIdentifier: uniformType.identifier) { url, error in
if let error = error { if let error = error {
return promise(.failure(error)) promise(.failure(error))
} } else if let url = url {
guard let url = url else { return promise(.failure(MediaProcessingError.fileURLNotFound)) }
if uniformType.conforms(to: .image) { if uniformType.conforms(to: .image) {
return promise(imageData(url: url, type: uniformType)) promise(imageData(url: url, type: uniformType))
} else { } else {
do { promise(Result { try Data(contentsOf: url) })
return try promise(.success(Data(contentsOf: url)))
} catch {
return promise(.failure(error))
} }
} else {
promise(.failure(MediaProcessingError.fileURLNotFound))
} }
} }
} }

6
ServiceLayer/Sources/ServiceLayer/Services/UserNotificationService.swift
View file

@ -44,10 +44,10 @@ private extension UserNotificationService {
Future<Bool, Error> { promise in Future<Bool, Error> { promise in
userNotificationClient.requestAuthorization([.alert, .sound, .badge, .provisional]) { granted, error in userNotificationClient.requestAuthorization([.alert, .sound, .badge, .provisional]) { granted, error in
if let error = error { if let error = error {
return promise(.failure(error)) promise(.failure(error))
} else {
promise(.success(granted))
} }
return promise(.success(granted))
} }
} }
.eraseToAnyPublisher() .eraseToAnyPublisher()

12
ServiceLayer/Sources/ServiceLayer/Utilities/WebAuthSession.swift
View file

@ -22,14 +22,12 @@ extension WebAuthSession {
url: url, url: url,
callbackURLScheme: callbackURLScheme) { oauthCallbackURL, error in callbackURLScheme: callbackURLScheme) { oauthCallbackURL, error in
if let error = error { if let error = error {
return promise(.failure(error)) promise(.failure(error))
} else if let oauthCallbackURL = oauthCallbackURL {
promise(.success(oauthCallbackURL))
} else {
promise(.failure(URLError(.unknown)))
} }
guard let oauthCallbackURL = oauthCallbackURL else {
return promise(.failure(URLError(.unknown)))
}
return promise(.success(oauthCallbackURL))
} }
webAuthSession.presentationContextProvider = presentationContextProvider webAuthSession.presentationContextProvider = presentationContextProvider