Browse Source

Revert "Medialibrary: Handle thumbnail status return values"

This reverts commit 9a1348bf044b5ce88b877af8f0537c1f4434ba26.
Soomin Lee 5 years ago
parent
commit
8626384f32

+ 1 - 1
SharedSources/MediaLibraryModel/MediaLibraryBaseModel.swift

@@ -121,7 +121,7 @@ extension MediaCollectionModel {
     func thumbnail() -> UIImage? {
         var image: UIImage? = nil
         if image == nil {
-            for track in files() ?? [] where track.isThumbnailGenerated() == .available {
+            for track in files() ?? [] where track.isThumbnailGenerated() {
                 image = UIImage(contentsOfFile: track.thumbnail()?.path ?? "")
                 break
             }

+ 1 - 1
SharedSources/MediaLibraryModel/MediaModel.swift

@@ -92,7 +92,7 @@ extension VLCMLMedia {
         attributeSet.deliveryType = 0
         attributeSet.local = 1
         attributeSet.playCount = NSNumber(value: playCount())
-        if isThumbnailGenerated() == .available {
+        if isThumbnailGenerated() {
             let image = UIImage(contentsOfFile: thumbnail()?.path ?? "")
             attributeSet.thumbnailData = image?.jpegData(compressionQuality: 0.9)
         }

+ 1 - 8
SharedSources/MediaLibraryService.swift

@@ -452,15 +452,8 @@ extension MediaLibraryService {
 
 extension MediaLibraryService {
     func requestThumbnail(for media: VLCMLMedia) {
-        let thumbnailStatus = media.isThumbnailGenerated()
-
-        switch thumbnailStatus {
-        case .missing, .failure:
-            break
-        case .available, .persistentFailure, .crash:
+        if media.isThumbnailGenerated() || media.thumbnail() != nil {
             return
-        @unknown default:
-            assertionFailure("MediaLibraryService: requestThumbnail: Unknown thumbnail status.")
         }
 
         if !media.requestThumbnail(of: .thumbnail, desiredWidth: 320, desiredHeight: 200, atPosition: 0.03) {