better check & reset for message.downloadState

djlalala · Feb 1, 2016 · 3d9b298 · 3d9b298
1 parent d4dd6b8
commit 3d9b298
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/Yep/Caches/ImageCache.swift b/Yep/Caches/ImageCache.swift
@@ -181,20 +181,24 @@ class ImageCache {
 
                 if imageDownloadState == MessageDownloadState.Downloaded.rawValue {
 
-                    if !fileName.isEmpty {
-                        if
-                            let imageFileURL = NSFileManager.yepMessageImageURLWithName(fileName),
-                            let image = UIImage(contentsOfFile: imageFileURL.path!) {
-
-                                let messageImage = image.bubbleImageWithTailDirection(tailDirection, size: size).decodedImage()
-
-                                self.cache.setObject(messageImage, forKey: imageKey)
-
-                                dispatch_async(dispatch_get_main_queue()) {
-                                    completion(loadingProgress: 1.0, image: messageImage)
-                                }
-
-                                return
+                    if !fileName.isEmpty, let imageFileURL = NSFileManager.yepMessageImageURLWithName(fileName), image = UIImage(contentsOfFile: imageFileURL.path!) {
+
+                        let messageImage = image.bubbleImageWithTailDirection(tailDirection, size: size).decodedImage()
+
+                        self.cache.setObject(messageImage, forKey: imageKey)
+
+                        dispatch_async(dispatch_get_main_queue()) {
+                            completion(loadingProgress: 1.0, image: messageImage)
+                        }
+
+                        return
+
+                    } else {
+                        // 找不到要再给下面的下载机会
+                        if let message = messageWithMessageID(messageID, inRealm: realm) {
+                            let _ = try? realm.write {
+                                message.downloadState = MessageDownloadState.NoDownload.rawValue
+                            }
                         }
                     }
                 }

diff --git a/Yep/Services/YepDownloader.swift b/Yep/Services/YepDownloader.swift
@@ -18,7 +18,7 @@ class YepDownloader: NSObject {
         let sessionConfig = NSURLSessionConfiguration.defaultSessionConfiguration()
         let session = NSURLSession(configuration: sessionConfig, delegate: self, delegateQueue: nil)
         return session
-        }()
+    }()
 
     private class func updateAttachmentOfMessage(message: Message, withAttachmentFileName attachmentFileName: String, inRealm realm: Realm) {