Merge pull request #22 from ddhhz/bugfix

Looks good. Thanks
shanzi · Dec 22, 2017 · 0077caf · 0077caf
2 parents c23c13b + 916a188
commit 0077caf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/diumoo/core/DMControlCenter/DMControlCenter.m b/diumoo/core/DMControlCenter/DMControlCenter.m
@@ -140,10 +140,12 @@ - (void)startToPlay:(DMPlayableItem*)aSong
 
         [self play];
         [playingItem prepareCoverWithCallbackBlock:^(NSImage* image) {
-            [diumooPanel setRated:playingItem.like];
-            [diumooPanel setPlayingItem:playingItem];
-            [notificationCenter notifyMusicPlaybackWithItem:playingItem];
-            [recordHandler addRecordWithItem:playingItem];
+            [DMService performOnMainQueue:^{
+                [diumooPanel setRated:playingItem.like];
+                [diumooPanel setPlayingItem:playingItem];
+                [notificationCenter notifyMusicPlaybackWithItem:playingItem];
+                [recordHandler addRecordWithItem:playingItem];
+            }];
         }];
     }
     pauseType = PAUSE_PASS;

diff --git a/diumoo/core/DMPlaylistFetcher.swift b/diumoo/core/DMPlaylistFetcher.swift
@@ -78,18 +78,18 @@ public class DMPlaylistFetcher : NSObject{
         let urlRequest = URLRequest.init(url: URL.init(string: urlString)!, cachePolicy: .useProtocolCachePolicy, timeoutInterval: 20.0)
 
         // Processing cookie
-        let validAttr = (attribute != nil) ? attribute : ""
+        let validAttr = attribute ?? ""
         let cookie = HTTPCookie.init(properties: [HTTPCookiePropertyKey.domain: "douban.fm",
                                                     HTTPCookiePropertyKey.name: "start",
-                                                   HTTPCookiePropertyKey.value: validAttr!,
+                                                   HTTPCookiePropertyKey.value: validAttr,
                                                  HTTPCookiePropertyKey.discard: true,
                                                     HTTPCookiePropertyKey.path:"/"])
 
         HTTPCookieStorage.shared.setCookie(cookie!)
 
         let session = URLSession.shared.dataTask(with: urlRequest) { data, response, error in
             if error != nil {
-                self.delegate?.fetchPlaylist(WithDictionary: dict, startAttribute: attribute!, errorThreshould: errCount + 1)
+                self.delegate?.fetchPlaylist(WithDictionary: dict, startAttribute: validAttr, errorThreshould: errCount + 1)
             } else {
                 do {
                     let jResponse = try JSONSerialization.jsonObject(with: data!, options: JSONSerialization.ReadingOptions.mutableContainers)
@@ -103,7 +103,7 @@ public class DMPlaylistFetcher : NSObject{
 
                         // Something's wrong
                         if jrVal != 0 {
-                            self.delegate?.fetchPlaylist(WithDictionary: dict, startAttribute: attribute!, errorThreshould: errCount + 1)
+                            self.delegate?.fetchPlaylist(WithDictionary: dict, startAttribute: validAttr, errorThreshould: errCount + 1)
                         } else {
                             let jList = jDict["song"] as? Array<Dictionary<String, AnyObject>>
                             if attribute != nil {
@@ -120,7 +120,7 @@ public class DMPlaylistFetcher : NSObject{
                         }
                     }
                 } catch _ {
-                    self.delegate?.fetchPlaylist(WithDictionary: dict, startAttribute: attribute!, errorThreshould: errCount + 1)
+                    self.delegate?.fetchPlaylist(WithDictionary: dict, startAttribute: validAttr, errorThreshould: errCount + 1)
                 }
             }
         }