Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ only_rules:
# Prefer `first(where:)` over `filter { }.first`.
- first_where

# Prefer `flatMap { ... }` over `map { ... }.reduce([], +)`.
- flatmap_over_map_reduce

# When calling the `joined` method on an array of strings, omit an
# explicit empty-string separator since that is the default.
- joined_default_parameter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,22 @@ class GutenbergFilesAppMediaSource: NSObject {
self.gutenberg = gutenberg
}

func presentPicker(origin: UIViewController, filters: [Gutenberg.MediaType], allowedTypesOnBlog: [String], multipleSelection: Bool, callback: @escaping MediaPickerDidPickMediaCallback) {
func presentPicker(
origin: UIViewController,
filters: [Gutenberg.MediaType],
allowedTypesOnBlog: [String],
multipleSelection: Bool,
callback: @escaping MediaPickerDidPickMediaCallback
) {
mediaPickerCallback = callback
let documentTypes = GutenbergFilesAppMediaSource.getDocumentTypes(filters: filters, allowedTypesOnBlog: allowedTypesOnBlog)
let docPicker = UIDocumentPickerViewController(forOpeningContentTypes: documentTypes.compactMap(UTType.init), asCopy: true)
let documentTypes = GutenbergFilesAppMediaSource.getDocumentTypes(
filters: filters,
allowedTypesOnBlog: allowedTypesOnBlog
)
let docPicker = UIDocumentPickerViewController(
forOpeningContentTypes: documentTypes.compactMap(UTType.init),
asCopy: true
)
docPicker.delegate = self
docPicker.allowsMultipleSelection = multipleSelection
origin.present(docPicker, animated: true)
Expand All @@ -26,7 +38,7 @@ class GutenbergFilesAppMediaSource: NSObject {
if filters.contains(.any) {
return allowedTypesOnBlog
} else {
return filters.map { $0.filterTypesConformingTo(allTypes: allowedTypesOnBlog) }.reduce(into: []) { $0 += $1 }
return filters.flatMap { $0.filterTypesConformingTo(allTypes: allowedTypesOnBlog) }
}
}
}
Expand Down Expand Up @@ -58,7 +70,12 @@ extension GutenbergFilesAppMediaSource: UIDocumentPickerDelegate {
return nil
}
let mediaUploadID = media.gutenbergUploadID
return MediaInfo(id: mediaUploadID, url: url.absoluteString, type: media.mediaTypeString, title: url.lastPathComponent)
return MediaInfo(
id: mediaUploadID,
url: url.absoluteString,
type: media.mediaTypeString,
title: url.lastPathComponent
)
})

callback(mediaInfo)
Expand Down