Translate a couple of enums in Media to Swift

Sources/WordPressData/Objective-C/Media.m

@@ -35,29 +35,6 @@ @implementation Media
 
 #pragma mark -
 
-+ (NSString *)stringFromMediaType:(MediaType)mediaType
-{
-    switch (mediaType) {
-        case MediaTypeImage:
-            return @"image";
-            break;
-        case MediaTypeVideo:
-            return @"video";
-            break;
-        case MediaTypePowerpoint:
-            return @"powerpoint";
-            break;
-        case MediaTypeDocument:
-            return @"document";
-            break;
-        case MediaTypeAudio:
-            return @"audio";
-            break;
-    }
-}
-
-#pragma mark -
-
 - (NSString *)fileExtension
 {
     NSString *extension = [self.filename pathExtension];
@@ -72,60 +49,6 @@ - (NSString *)fileExtension
     return extension;
 }
 
-#pragma mark - Media Types
-
-- (MediaType)mediaType
-{
-    if ([self.mediaTypeString isEqualToString:[Media stringFromMediaType:MediaTypeImage]]) {
-        return MediaTypeImage;
-    } else if ([self.mediaTypeString isEqualToString:[Media stringFromMediaType:MediaTypeVideo]]) {
-        return MediaTypeVideo;
-    } else if ([self.mediaTypeString isEqualToString:[Media stringFromMediaType:MediaTypePowerpoint]]) {
-        return MediaTypePowerpoint;
-    } else if ([self.mediaTypeString isEqualToString:[Media stringFromMediaType:MediaTypeDocument]]) {
-        return MediaTypeDocument;
-    } else if ([self.mediaTypeString isEqualToString:[Media stringFromMediaType:MediaTypeAudio]]) {
-        return MediaTypeAudio;
-    }
-
-    return MediaTypeDocument;
-}
-
-- (void)setMediaType:(MediaType)mediaType
-{
-    self.mediaTypeString = [[self class] stringFromMediaType:mediaType];    
-}
-
-#pragma mark - Remote Status
-
-- (MediaRemoteStatus)remoteStatus
-{
-    return (MediaRemoteStatus)[[self remoteStatusNumber] intValue];
-}
-
-- (void)setRemoteStatus:(MediaRemoteStatus)aStatus
-{
-    [self setRemoteStatusNumber:@(aStatus)];
-}
-
-- (NSString *)remoteStatusText
-{
-    switch (self.remoteStatus) {
-        case MediaRemoteStatusPushing:
-            return NSLocalizedString(@"Uploading", @"Status for Media object that is being uploaded.");
-        case MediaRemoteStatusFailed:
-            return NSLocalizedString(@"Failed", @"Status for Media object that is failed upload or export.");
-        case MediaRemoteStatusSync:
-            return NSLocalizedString(@"Uploaded", @"Status for Media object that is uploaded and sync with server.");
-        case MediaRemoteStatusProcessing:
-            return NSLocalizedString(@"Pending", @"Status for Media object that is being processed locally.");
-        case MediaRemoteStatusLocal:
-            return NSLocalizedString(@"Local", @"Status for Media object that is only exists locally.");
-        case MediaRemoteStatusStub:
-            return NSLocalizedString(@"Stub", @"Status for Media object that is only has the mediaID locally.");
-    }
-}
-
 #pragma mark - Absolute URLs
 
 - (NSURL *)absoluteThumbnailLocalURL;

Sources/WordPressData/Objective-C/include/Media.h

@@ -4,23 +4,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NS_ENUM(NSUInteger, MediaRemoteStatus) {
-    MediaRemoteStatusSync,          /* Post synced. */
-    MediaRemoteStatusFailed,        /* Upload failed. */
-    MediaRemoteStatusLocal,         /* Only local version. */
-    MediaRemoteStatusPushing,       /* Uploading post. */
-    MediaRemoteStatusProcessing,    /* Intermediate status before uploading. */
-    MediaRemoteStatusStub,          /* We only have the mediaID information from the server */
-};
-
-typedef NS_ENUM(NSUInteger, MediaType) {
-    MediaTypeImage,
-    MediaTypeVideo,
-    MediaTypeDocument,
-    MediaTypePowerpoint,
-    MediaTypeAudio
-};
-
 @interface Media :  NSManagedObject
 
 // Managed properties
@@ -60,9 +43,6 @@ typedef NS_ENUM(NSUInteger, MediaType) {
 
 // Helper properties
 
-@property (nonatomic, assign) MediaType mediaType;
-@property (nonatomic, assign) MediaRemoteStatus remoteStatus;
-
 /**
  Local file URL for the Media's asset. e.g. an image, video, gif or other file.
  */
@@ -81,8 +61,6 @@ typedef NS_ENUM(NSUInteger, MediaType) {
 
 // Helper methods
 
-+ (NSString *)stringFromMediaType:(MediaType)mediaType;
-
 - (nullable NSString *)fileExtension;
 
 @end

Sources/WordPressData/Swift/Media.swift

@@ -1,6 +1,55 @@
 import Foundation
 import UniformTypeIdentifiers
 
+@objc
+public enum MediaType: UInt {
+    case image
+    case video
+    case document
+    case powerpoint
+    case audio
+
+    public var stringValue: String {
+        switch self {
+        case .image:
+            return "image"
+        case .video:
+            return "video"
+        case .powerpoint:
+            return "powerpoint"
+        case .document:
+            return "document"
+        case .audio:
+            return "audio"
+        }
+    }
+
+    public init(string: String) {
+        switch string {
+        case "image":
+            self = .image
+        case "video":
+            self = .video
+        case "powerpoint":
+            self = .powerpoint
+        case "audio":
+            self = .audio
+        default:
+            self = .document
+        }
+    }
+}
+
+@objc
+public enum MediaRemoteStatus: UInt {
+    case sync
+    case failed
+    case local
+    case pushing
+    case processing
+    case stub
+}
+
 public extension Media {
     // MARK: - AutoUpload Failure Count
 
@@ -43,6 +92,16 @@ public extension Media {
 
     // MARK: - Media Type
 
+    @objc
+    var mediaType: MediaType {
+        get {
+            mediaTypeString.flatMap(MediaType.init) ?? .document
+        }
+        set {
+            mediaTypeString = newValue.stringValue
+        }
+    }
+
     /// Returns the MIME type, e.g. "image/png".
     @objc var mimeType: String? {
         guard let fileExtension = self.fileExtension(),
@@ -75,6 +134,18 @@ public extension Media {
         type.map(MediaType.init) ?? .document
     }
 
+    // MARK: - Remote Status
+
+    @objc
+    var remoteStatus: MediaRemoteStatus {
+        get {
+            (remoteStatusNumber?.uintValue).flatMap(MediaRemoteStatus.init(rawValue:)) ?? .local
+        }
+        set {
+            remoteStatusNumber = NSNumber(value: newValue.rawValue)
+        }
+    }
+
     // MARK: - Media Link
 
     var link: String {

WordPress/Classes/Services/MediaRepository.swift

@@ -21,7 +21,7 @@
     /// Get the Media object from the server using the blog and the mediaID as the identifier of the resource
     func getMedia(withID mediaID: NSNumber, in blogID: TaggedManagedObjectID<Blog>) async throws -> TaggedManagedObjectID<Media> {
         let remote = try await remote(for: blogID)
         let remoteMedia: RemoteMedia? = try await withCheckedThrowingContinuation { continuation in
             remote.getMediaWithID(mediaID) {
                 continuation.resume(returning: $0)
             } failure: {
@@ -43,7 +43,7 @@
     /// Deletes the Media object from the server. Note the Media is deleted, not trashed.
     func delete(_ mediaID: TaggedManagedObjectID<Media>) async throws {
         // Delete the media from WordPress Media Library
         let queryResult: (MediaServiceRemote, RemoteMedia)? = try await coreDataStack.performQuery { [remoteFactory] context in
             guard let media = try? context.existingObject(with: mediaID) else {
                 return nil
             }
@@ -114,7 +114,7 @@
 extension MediaServiceRemote {
 
     func getMediaLibraryCount(forMediaTypes types: [MediaType]) async throws -> Int {
-        try await getMediaLibraryCount(forMediaTypes: types.map(Media.string(from:)))
+        try await getMediaLibraryCount(forMediaTypes: types.map(\.stringValue))
     }
 
     func getMediaLibraryCount(forMediaTypes mediaTypes: [String]) async throws -> Int {

WordPress/Classes/Services/MediaService.m

@@ -458,15 +458,6 @@ - (void)syncMediaLibraryForBlog:(Blog *)blog
     }];
 }
 
-#pragma mark - Private helpers
-
-- (NSString *)mimeTypeForMediaType:(NSNumber *)mediaType
-{
-    MediaType filter = (MediaType)[mediaType intValue];
-    NSString *mimeType = [Media stringFromMediaType:filter];
-    return mimeType;
-}
-
 #pragma mark - Media helpers
 
 - (id<MediaServiceRemote>)remoteForBlog:(Blog *)blog

WordPress/Classes/ViewRelated/Media/SiteMedia/Controllers/SiteMediaCollectionViewController.swift

@@ -11,9 +11,9 @@
 }
 
 extension SiteMediaCollectionViewControllerDelegate {
     func siteMediaViewController(_ viewController: SiteMediaCollectionViewController, didUpdateSelection: [Media]) {}
     func makeAddMediaMenu(for viewController: SiteMediaCollectionViewController) -> UIMenu? { nil }
     func siteMediaViewController(_ viewController: SiteMediaCollectionViewController, contextMenuFor media: Media, sourceView: UIView) -> UIMenu? { nil }
 }
 
 /// The internal view controller for managing the media collection view.
@@ -71,7 +71,7 @@
         super.init(nibName: nil, bundle: nil)
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
@@ -271,7 +271,7 @@
 
     // MARK: - Filter
 
     func setMediaType(_ mediaType: MediaType?) {
         if let mediaType {
             self.filter = [mediaType]
         } else {
@@ -289,7 +289,7 @@
         return true
     }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
         if gestureRecognizer === panGestureRecognizer {
             return isEditing
         }
@@ -364,7 +364,7 @@
     private func makePredicate(searchTerm: String) -> NSPredicate {
         var predicates = [NSPredicate(format: "blog == %@", blog)]
         if let filter {
-            let mediaTypes = filter.map(Media.string(from:))
+            let mediaTypes = filter.map(\.stringValue)
             predicates.append(NSPredicate(format: "mediaTypeString IN %@", mediaTypes))
         }
         if !isShowingPendingUploads {
@@ -390,11 +390,11 @@
 
     // MARK: - NSFetchedResultsControllerDelegate
 
     func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         pendingChanges = []
     }
 
     func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
         switch type {
         case .insert:
             guard let newIndexPath else { return }
@@ -430,7 +430,7 @@
         }
     }
 
     func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         guard !pendingChanges.isEmpty else {
             return
         }
@@ -453,7 +453,7 @@
 
     // MARK: - UICollectionViewDataSource
 
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         fetchController.fetchedObjects?.count ?? 0
     }
 
@@ -468,7 +468,7 @@
 
     // MARK: - UICollectionViewDelegate
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let media = fetchController.object(at: indexPath)
         if isEditing {
             toggleSelection(for: media)
@@ -486,7 +486,7 @@
         }
     }
 
     func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemsAt indexPaths: [IndexPath], point: CGPoint) -> UIContextMenuConfiguration? {
         guard let indexPath = indexPaths.first else {
             return nil
         }
@@ -507,14 +507,14 @@
 
     // MARK: - UICollectionViewDataSourcePrefetching
 
     func collectionView(_ collectionView: UICollectionView, prefetchItemsAt indexPaths: [IndexPath]) {
         for indexPath in indexPaths {
             let media = fetchController.object(at: indexPath)
             getViewModel(for: media).startPrefetching()
         }
     }
 
     func collectionView(_ collectionView: UICollectionView, cancelPrefetchingForItemsAt indexPaths: [IndexPath]) {
         let count = fetchController.fetchedObjects?.count ?? 0
         for indexPath in indexPaths where indexPath.row < count {
             let media = fetchController.object(at: indexPath)
@@ -524,13 +524,13 @@
 
     // MARK: - UISearchResultsUpdating
 
     func updateSearchResults(for searchController: UISearchController) {
         reloadFetchController()
     }
 
     // MARK: - SiteMediaPageViewControllerDelegate
 
     func siteMediaPageViewController(_ viewController: SiteMediaPageViewController, getMediaBeforeMedia media: Media) -> Media? {
         guard let fetchedObjects = fetchController.fetchedObjects,
               let index = fetchedObjects.firstIndex(of: media),
               index > 0 else {
@@ -539,7 +539,7 @@
         return fetchedObjects[index - 1]
     }
 
     func siteMediaPageViewController(_ viewController: SiteMediaPageViewController, getMediaAfterMedia media: Media) -> Media? {
         guard let fetchedObjects = fetchController.fetchedObjects,
               let index = fetchedObjects.firstIndex(of: media),
               index < (fetchedObjects.count - 1) else {