✨ Add a feature showing Streaks (#7)

Sources/AppDelegate.swift

@@ -23,7 +23,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     private var myContributes: [ContributeData] = []
     private var friendContributes: [ContributeData] = []
-
+    private var mystreaks: ContributeData = ContributeData(count: 0, weekend: "", date: "")
 
     private let userMenuItem = NSMenuItem().then {
         $0.title = Localized.hello
@@ -329,10 +329,22 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
         group.notify(queue: .main){
             self.updateContributions()
+            self.fetchStreaks(self.mystreaks)
         }
 
     }
 
+    private func fetchStreaks(_ date: ContributeData) {
+        let menuItem = NSMenuItem().then {
+            $0.isEnabled = true
+            $0.tag = Consts.contributionTag
+            $0.attributedTitle = date.getStreaks()
+        }
+
+        self.menu.insertItem(.separator(), at: .zero)
+        self.menu.insertItem(menuItem, at: .zero)
+    }
+
     private func fetchContributionsByUserame(username: String, isFriend: Bool = false, group: DispatchGroup? = nil ) {
         guard let targetURL = URL(string: "https://github.com/users/\(username)/contributions") else { return }
         URLSession.shared.dataTask(with: targetURL) { [weak self] data, response, error in
@@ -363,6 +375,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                 self.friendContributes = contributeDataList
             } else{
                 self.myContributes = contributeDataList
+                self.mystreaks = self.parseHtmltoDataForCount(html: html)
             }
 
             if group != nil {
@@ -395,15 +408,34 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             let doc: Document = try SwiftSoup.parse(html)
             let rects: Elements = try doc.getElementsByTag(ParseKeys.rect)
             let days: [Element] = rects.array().filter { $0.hasAttr(ParseKeys.date) }
-
             let weekend = days.suffix(Consts.fetchCount)
-
             let contributeDataList = weekend.map(mapFunction)
             return contributeDataList
 
-    } catch {
+        } catch {
             return []
         }
     }
+
+
+    private func parseHtmltoDataForCount(html: String) -> ContributeData {
+        do {
+            let doc: Document = try SwiftSoup.parse(html)
+            let rects: Elements = try doc.getElementsByTag(ParseKeys.rect)
+            let days: [Element] = rects.array().filter { $0.hasAttr(ParseKeys.date) }
+            let count = days.suffix(Consts.fetchStreak)
+            var contributeLastDate = count.map(mapFunction)
+            contributeLastDate.sort{ $0.date > $1.date }
+            for date in contributeLastDate {
+                if date.count == .zero {
+                    return date
+                }
+            }
+
+            return ContributeData(count: 0, weekend: "", date: "")
+        } catch {
+            return ContributeData(count: 0, weekend: "", date: "")
+        }
+    }
 
 }

Sources/Consts/Consts.swift

@@ -9,6 +9,7 @@ import Foundation
 
 enum Consts {
     static let fetchCount = 10
+    static let fetchStreak = 36500
     static let refreshInterval = 10
     static let contributionTag = 1
     static let usernameDefaultKey = "username"

Sources/Consts/Localized.swift

@@ -22,7 +22,10 @@ enum Localized {
     static let changeUsernameDescription = NSLocalizedString("change_username_description", comment: "Change username")
     static let information = NSLocalizedString("information", comment: "Enter your GitHub username. We’ll fetch the number of contributions.")
     static let friend_information = NSLocalizedString("friend_information", comment: "Enter your friend GitHub username. We'll fetch the number of contributions.")
-
+    static let streak_first_stage = NSLocalizedString("streak_first_stage", comment: "streak stage 1")
+    static let streak_second_stage = NSLocalizedString("streak_second_stage", comment: "streak stage 2")
+    static let streak_third_stage = NSLocalizedString("streak_third_stage", comment: "streak stage 3")
+    static let streak_fourth_stage = NSLocalizedString("streak_fourth_stage", comment: "streak stage 4")
     static let ok = NSLocalizedString("ok", comment: "Okay")
     static let cancel = NSLocalizedString("cancel", comment: "cancel")
     static let error = NSLocalizedString("error", comment: "error")

Sources/Extensions/Date+Extensions.swift

@@ -16,4 +16,17 @@ extension Date {
         dateFormatter.dateFormat = "E"
         return dateFormatter.string(from: self).capitalized
     }
+
+    func timeAgoSince() -> String {
+        let calendar = Calendar.current
+        let now = Date()
+
+        let unitFlags: NSCalendar.Unit = [.day]
+        let components = (calendar as NSCalendar).components(unitFlags, from: self, to: now, options: [])
+
+        guard let day = components.day else { return "0" }
+
+        return "\(day)"
+    }
+
 }

Sources/Extensions/Int+Extensions.swift

@@ -20,4 +20,17 @@ extension Int {
             return "🔥"
         }
     }
+
+    func getStreaks() -> String {
+        switch self {
+        case 0:
+            return Localized.streak_first_stage
+        case 1 ..< 4:
+            return Localized.streak_second_stage
+        case 4 ..< 10:
+            return Localized.streak_third_stage.replacingOccurrences(of: "${day}", with: self.description)
+        default:
+            return Localized.streak_fourth_stage.replacingOccurrences(of: "${day}", with: self.description)
+        }
+    }
 }

Sources/Extensions/String+Extensions.swift

@@ -0,0 +1,21 @@
+//
+//  String+Extensions.swift
+//  jandi
+//
+//  Created by 오준현 on 2021/02/24.
+//
+
+import Foundation
+
+extension String {
+
+    public func getDateFormat() -> Date {
+        let dateFormat = DateFormatter()
+        dateFormat.dateFormat = "yyyy-MM-dd"
+        dateFormat.timeZone = TimeZone(secondsFromGMT: 0)
+        guard let timeDateFormat = dateFormat.date(from: self) else { return Date() }
+
+        return timeDateFormat
+    }
+
+}

Sources/Models/ContributeData.swift

@@ -44,12 +44,25 @@ class ContributeData {
         var textString = "\(emoji) \(count)"
 
         if self.friendContributeData != nil {
-            guard let friendContributeData = self.friendContributeData else {return textString}
+            guard let friendContributeData = self.friendContributeData else { return textString }
             textString += " vs \(friendContributeData.count) \(friendContributeData.count.getEmoji())"
         }
         return textString
     }
 
+    public func getStreaks() -> NSAttributedString {
+        let statusDetailAttributedString = NSMutableAttributedString()
+        guard let day = Int(date.getDateFormat().timeAgoSince()) else { return statusDetailAttributedString }
+        var attribute = Attributes.red
+        let textString = day.getStreaks()
+        if day > 0 {
+            attribute = Attributes.green
+        }
+
+        let attributedString = NSAttributedString(string: textString, attributes: attribute)
+        statusDetailAttributedString.append(attributedString)
+        return statusDetailAttributedString
+    }
 
     public func getStatusDetailAttributedString() -> NSAttributedString {
         let statusDetailAttributedString = NSMutableAttributedString()

Supporting FIles/en.lproj/Localizable.strings

@@ -19,6 +19,10 @@
 "change_username_description" = "Change username";
 "information" = "Enter your GitHub username.\nWe’ll fetch the number of contributions.";
 "friend_information" = "Enter your friend GitHub username.\nWe'll fetch the number of contributions.";
+"streak_first_stage" = "😢 I haven't planted Jandi yet.";
+"streak_second_stage" = "🌱 I planted my first Jandi today.";
+"streak_third_stage" = "🌿 It has been ${day} days since the Jandi sprouts.";
+"streak_fourth_stage" = "🌳 It's been ${day} days since the Jandi has grown well.";
 "ok" = "Okay";
 "cancel" = "Cancel";
 "error" = "⚠️ Error";

Supporting FIles/ko.lproj/Localizable.strings

@@ -19,6 +19,10 @@
 "change_username_description" = "아이디를 변경합니다";
 "information" = "Github 아이디를 입력해주세요.\n입력해주신 정보를 기반으로 커밋정보를 가져옵니다";
 "friend_information" = "친구의 Github 아이디를 입력해주세요. \n입력해주신 정보를 기반으로 친구의 커밋정보를 가져옵니다";
+"streak_first_stage" = "😢 아직 잔디를 심지 못했어요.";
+"streak_second_stage" = "🌱 오늘 처음으로 잔디를 심었어요.";
+"streak_third_stage" = "🌿 잔디에 싹이 튼 지 ${day}일이 되었어요.";
+"streak_fourth_stage" = "🌳 잔디가 무럭무럭 자란지 ${day}일이 되었어요.";
 "ok" = "확인";
 "cancel" = "취소";
 "error" = "⚠️ 오류";

jandi.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		C5077EF725E69288008F1BE8 /* String+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5077EF625E69288008F1BE8 /* String+Extensions.swift */; };
 		ED15D02E25C5600E00C04BEC /* Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED15D02D25C5600E00C04BEC /* Localized.swift */; };
 		ED15D03225C5604800C04BEC /* ParseKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED15D03125C5604800C04BEC /* ParseKeys.swift */; };
 		ED15D03525C5605300C04BEC /* Consts.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED15D03425C5605300C04BEC /* Consts.swift */; };
@@ -24,6 +25,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		C5077EF625E69288008F1BE8 /* String+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extensions.swift"; sourceTree = "<group>"; };
 		ED15D02D25C5600E00C04BEC /* Localized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Localized.swift; sourceTree = "<group>"; };
 		ED15D03125C5604800C04BEC /* ParseKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseKeys.swift; sourceTree = "<group>"; };
 		ED15D03425C5605300C04BEC /* Consts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Consts.swift; sourceTree = "<group>"; };
@@ -105,6 +107,7 @@
 			children = (
 				ED18259B25C4420A00FCD100 /* Int+Extensions.swift */,
 				ED18259F25C4422D00FCD100 /* Date+Extensions.swift */,
+				C5077EF625E69288008F1BE8 /* String+Extensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -204,6 +207,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C5077EF725E69288008F1BE8 /* String+Extensions.swift in Sources */,
 				ED3FF1F225E3EEAA008CBD34 /* ContributeData.swift in Sources */,
 				ED18259C25C4420A00FCD100 /* Int+Extensions.swift in Sources */,
 				ED15D03525C5605300C04BEC /* Consts.swift in Sources */,