🚑 Fixed parse issue (#2)

Sources/AppDelegate.swift

@@ -38,11 +38,18 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         $0.keyEquivalent = "u"
         $0.tag = 3
     }
+
+    private let helpMenuItem = NSMenuItem().then {
+        $0.title = Localized.help
+        $0.action = #selector(onHelpClick)
+        $0.keyEquivalent = ""
+        $0.tag = 4
+    }
 
     private let quitMenuItem = NSMenuItem().then {
         $0.title = Localized.quit
         $0.action = #selector(onQuitClick)
-        $0.tag = 4
+        $0.tag = 5
         $0.keyEquivalent = "q"
     }
 
@@ -71,6 +78,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         menu.addItem(.separator())
         menu.addItem(userMenuItem)
         menu.addItem(.separator())
+        menu.addItem(helpMenuItem)
+        menu.addItem(.separator())
         menu.addItem(refreshMenuItem)
         menu.addItem(changeUserMenuItem)
         menu.addItem(quitMenuItem)
@@ -140,6 +149,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     @objc func onChangeUsernameClick() {
         showChangeUsernameAlert()
     }
+
+    @objc func onHelpClick() {
+        let url = URL(string: "https://github.com/techinpark/Jandi")!
+        NSWorkspace.shared.open(url)
+    }
+
 
     private func changeUsername(withUsername username: String) {
         UserDefaults.standard.setValue(username, forKey: Consts.usernameDefaultKey)
@@ -221,11 +236,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     private func parseHTML(html: String) {
         do {
-            let doc = try SwiftSoup.parse(html)
-            let days = try doc.getElementsByTag(ParseKeys.rect)
-            let weekend = days.suffix(Consts.fetchCount)
-            guard let today = days.last() else { return }
+            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)
+            guard let today = days.last else { return }
+
             _ = weekend.map {
                 guard let attr = $0.getAttributes() else { return }
                 let date: String = attr.get(key: ParseKeys.date)

Sources/Consts/Localized.swift

@@ -12,6 +12,7 @@ enum Localized {
     static let hello = NSLocalizedString("wellcome_user_message", comment: "👋 Hi,  @${username}")
     static let refresh = NSLocalizedString("refresh", comment: "refresh")
     static let changeUsername = NSLocalizedString("change_username", comment: "Change username")
+    static let help = NSLocalizedString("help", comment: "help")
     static let textFieldPlaceholder = NSLocalizedString("textfield_placeholder", comment: "Github username")
     static let setUsernameDescription = NSLocalizedString("username_description", comment: "Set username")
     static let changeUsernameDescription = NSLocalizedString("change_username_description", comment: "Change username")

Sources/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>

Supporting FIles/en.lproj/Localizable.strings

@@ -9,6 +9,7 @@
 "wellcome_user_message" = "👋 Hello,  @${username}";
 "refresh" = "⏳ Refresh";
 "change_username" = "⚙️ Change username";
+"help" = "🐛 Bug Report";
 "textfield_placeholder" = "GitHub username";
 "username_description" = "Set username";
 "change_username_description" = "Change username";

Supporting FIles/ko.lproj/Localizable.strings

@@ -9,6 +9,7 @@
 "wellcome_user_message" = "👋 안녕,  @${username}";
 "refresh" = "⏳ 새로고침";
 "change_username" = "⚙️ 아이디 변경";
+"help" = "🐛 버그 제보하기";
 "textfield_placeholder" = "Github 아이디";
 "username_description" = "아이디를 입력해주세요";
 "change_username_description" = "아이디를 변경합니다";

jandi.xcodeproj/project.pbxproj

@@ -353,7 +353,7 @@
 				CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Sources/jandi.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = U6GQL8JQMT;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
@@ -362,6 +362,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tmsae.jandi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -377,7 +378,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = U6GQL8JQMT;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
@@ -386,6 +387,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tmsae.jandi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;