Skip to content

Create BGContinuedProcessingTask to upload media #24891

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
wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open

Create BGContinuedProcessingTask to upload media #24891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e19fd0
Create `BGContinuedProcessingTask` to upload media
crazytonyli Sep 26, 2025
fcbba11
Handle cancelling media uploads from Live Activity UI
crazytonyli Oct 5, 2025
d5785da
Change optional init to non-optional
crazytonyli Oct 5, 2025
f174086
Improve uploading status reporting
crazytonyli Oct 6, 2025
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
1 change: 1 addition & 0 deletions Sources/Jetpack/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<array>
<string>org.wordpress.bgtask.weeklyroundup</string>
<string>org.wordpress.bgtask.weeklyroundup.processing</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).mediaUpload</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
Expand Down
17 changes: 9 additions & 8 deletions Sources/WordPress/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<array>
<string>org.wordpress.bgtask.weeklyroundup</string>
<string>org.wordpress.bgtask.weeklyroundup.processing</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).mediaUpload</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
Expand Down Expand Up @@ -191,13 +192,13 @@
<key>UIPrerenderedIcon</key>
<true/>
</dict>
<key>Spectrum &apos;22</key>
<key>Spectrum '22</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>spectrum-&apos;22-icon-app-60x60</string>
<string>spectrum-&apos;22-icon-app-76x76</string>
<string>spectrum-&apos;22-icon-app-83.5x83.5</string>
<string>spectrum-'22-icon-app-60x60</string>
<string>spectrum-'22-icon-app-76x76</string>
<string>spectrum-'22-icon-app-83.5x83.5</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Xcode made these changes. Xcode also made the original changes. Somehow, Xcode decides to revert changes that were made by itself...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What version of Xcode are you on?

</array>
<key>UIPrerenderedIcon</key>
<true/>
Expand Down Expand Up @@ -406,13 +407,13 @@
<key>UIPrerenderedIcon</key>
<true/>
</dict>
<key>Spectrum &apos;22</key>
<key>Spectrum '22</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>spectrum-&apos;22-icon-app-60x60</string>
<string>spectrum-&apos;22-icon-app-76x76</string>
<string>spectrum-&apos;22-icon-app-83.5x83.5</string>
<string>spectrum-'22-icon-app-60x60</string>
<string>spectrum-'22-icon-app-76x76</string>
<string>spectrum-'22-icon-app-83.5x83.5</string>
</array>
<key>UIPrerenderedIcon</key>
<true/>
Expand Down
6 changes: 3 additions & 3 deletions WordPress/Classes/Services/MediaCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class MediaCoordinator: NSObject {
/// - parameter origin: The location in the app where the upload was initiated (optional).
///
func addMedia(from asset: ExportableAsset, to blog: Blog, analyticsInfo: MediaAnalyticsInfo? = nil) {
addMedia(from: asset, blog: blog, post: nil, coordinator: mediaLibraryProgressCoordinator, analyticsInfo: analyticsInfo)
addMedia(from: asset, blog: blog, coordinator: mediaLibraryProgressCoordinator, analyticsInfo: analyticsInfo)
}

/// Adds the specified media asset to the specified post. The upload process
Expand Down Expand Up @@ -192,14 +192,14 @@ class MediaCoordinator: NSObject {
/// Create a `Media` instance and upload the asset to the Media Library.
///
/// - SeeAlso: `MediaImportService.createMedia(with:blog:post:receiveUpdate:thumbnailCallback:completion:)`
private func addMedia(from asset: ExportableAsset, blog: Blog, post: AbstractPost?, coordinator: MediaProgressCoordinator, analyticsInfo: MediaAnalyticsInfo? = nil) {
private func addMedia(from asset: ExportableAsset, blog: Blog, coordinator: MediaProgressCoordinator, analyticsInfo: MediaAnalyticsInfo? = nil) {
coordinator.track(numberOfItems: 1)
let service = MediaImportService(coreDataStack: coreDataStack)
let totalProgress = Progress.discreteProgress(totalUnitCount: MediaExportProgressUnits.done)
let creationProgress = service.createMedia(
with: asset,
blog: blog,
post: post,
post: nil,
receiveUpdate: { [weak self] media in
self?.processing(media)
coordinator.track(progress: totalProgress, of: media, withIdentifier: media.uploadID)
Expand Down
7 changes: 7 additions & 0 deletions WordPress/Classes/ViewRelated/Aztec/Media/MediaProgressCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ public class MediaProgressCoordinator: NSObject {

private static var mediaProgressObserverContext = 0

private lazy var bgTaskTracker: MediaUploadBackgroundTracker? = mediaUploadBackgroundTracker()

deinit {
mediaGlobalProgress?.removeObserver(self, forKeyPath: #keyPath(Progress.fractionCompleted))
}
Expand Down Expand Up @@ -72,6 +74,11 @@ public class MediaProgressCoordinator: NSObject {
progress.setUserInfoObject(media, forKey: .mediaObject)
mediaGlobalProgress?.addChild(progress, withPendingUnitCount: 1)
mediaInProgress[mediaID] = progress

let objectID = TaggedManagedObjectID(media)
Task {
await bgTaskTracker?.track(progress: progress, media: objectID)
}
}

/// Finish one of the tasks.
Expand Down
Loading