Merge pull request #32 from NghiaTranUIT/task/artify-31

Improve Fetch photo
NghiaTranUIT · Jun 7, 2018 · e10e564 · e10e564
2 parents b609934 + a4c01da
commit e10e564
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 7 deletions.
diff --git a/artify-core/artify-core/Algorithm/Gaussian/Extensions/GaussianEffect.m b/artify-core/artify-core/Algorithm/Gaussian/Extensions/GaussianEffect.m
@@ -61,7 +61,7 @@ @implementation GaussianEffect
 + (NSImage *)imageByApplyingLightEffectToImage:(NSImage*)inputImage
 {
     NSColor *tintColor = [NSColor colorWithWhite:1.0 alpha:0.3];
-    return [self imageByApplyingBlurToImage:inputImage withRadius:60 tintColor:tintColor saturationDeltaFactor:1.8 maskImage:nil];
+    return [self imageByApplyingBlurToImage:inputImage withRadius:80 tintColor:tintColor saturationDeltaFactor:1.8 maskImage:nil];
 }
 
 

diff --git a/artify-core/artify-core/Algorithm/Gaussian/GaussianAlgorithm.swift b/artify-core/artify-core/Algorithm/Gaussian/GaussianAlgorithm.swift
@@ -37,8 +37,9 @@ extension GaussianAlgorithm {
         final.lockFocus()
 
         // Background
-        let backgroundOrigin = NSPoint.zero
-        backgroundImage.draw(in: CGRect(origin: backgroundOrigin, size: size))
+        let backgroundOrigin = CGPoint(x: 0, y: (size.height - backgroundImage.pointSize.height) / 2)
+        let backgroundRect = CGRect(origin: backgroundOrigin, size: backgroundImage.pointSize)
+        backgroundImage.draw(in: backgroundRect)
 
         // Prepare
         let imageOrigin = NSPoint(x: (size.width - image.pointSize.width) / 2,

diff --git a/artify-core/artify-core/Extension/Observable+Extension.swift b/artify-core/artify-core/Extension/Observable+Extension.swift
@@ -8,3 +8,10 @@
 
 import Foundation
 import RxSwift
+
+extension Observable {
+
+    func mapToVoid() -> Observable<Void> {
+        return self.map { _ in }
+    }
+}
diff --git a/artify-core/artify-core/Models/FilePayload.swift b/artify-core/artify-core/Models/FilePayload.swift
@@ -28,13 +28,15 @@ struct FilePayload {
     let photo: Photo
     let kind: Kind
     let prefix: String?
-
+    let override: Bool
+
     // MARK: - Public
-    init(image: NSImage, photo: Photo, kind: Kind = .jpg, prefix: String? = nil) {
+    init(image: NSImage, photo: Photo, kind: Kind = .jpg, prefix: String? = nil, override: Bool = true) {
         self.image = image
         self.photo = photo
         self.kind = kind
         self.prefix = prefix
+        self.override = override
     }
 
     var fileExtension: String {

diff --git a/artify-core/artify-core/Services/FileManager.swift b/artify-core/artify-core/Services/FileManager.swift
@@ -35,9 +35,13 @@ final class FileStorage: FileHandler {
 
     func saveImageIfNeed(_ payload: FilePayload) -> URL {
         let path = appFolder.appendingPathComponent(payload.fileName)
-        guard !isPhotoFileExist(payload.fileName) else {
+
+        // Override file if need
+        if !payload.override && isPhotoFileExist(payload.fileName) {
             return path
         }
+
+        // Write
         try? payload.dataRepresentation.write(to: path, options: .atomic)
         return path
     }

diff --git a/artify-core/artify-core/ViewModels/StatusBarViewModel.swift b/artify-core/artify-core/ViewModels/StatusBarViewModel.swift
@@ -35,6 +35,10 @@ public final class StatusBarViewModel: StatusBarViewModelType, StatusBarViewMode
     public var input: StatusBarViewModelInput { return self }
     public var output: StatusBarViewModelOutput { return self }
 
+    struct Constant {
+        static let FetchInterval: RxTimeInterval = 4 * 60 * 60 // 4 hours
+    }
+
     // MARK: - Variable
     private let bag = DisposeBag()
 
@@ -72,7 +76,19 @@ public final class StatusBarViewModel: StatusBarViewModelType, StatusBarViewMode
             .disposed(by: bag)
 
         // Get feature
-        getFeatureWallpaperPublisher.asObserver()
+        let getFeature = getFeatureWallpaperPublisher.asObserver()
+
+        // Wake up
+        let appWakeup = NSWorkspace.shared.notificationCenter.rx
+            .notification(NSWorkspace.didWakeNotification, object: nil)
+            .mapToVoid()
+
+        // Interval
+        let interval = Observable<Int>.interval(Constant.FetchInterval, scheduler: MainScheduler.instance).mapToVoid()
+
+        // Get feature
+        Observable.merge([getFeature, appWakeup, interval])
+            .observeOn(MainScheduler.instance)
             .map { _ in self.menus.value.index(where: { $0.kind == Menu.Kind.getFeature } )! }
             .map { self.menuItems.value[$0] }
             .subscribe(onNext: {[weak self] (menu) in