Merge branch 'hotfix/crawling_hot_fix'

87kangsw · Dec 30, 2019 · f3cf593 · f3cf593
2 parents 1311669 + 2d0480b
commit f3cf593
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/GitTime.xcodeproj/project.pbxproj b/GitTime.xcodeproj/project.pbxproj
@@ -1469,7 +1469,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = R46Q3HW9V3;
 				INFOPLIST_FILE = "GitTime/Supporting Files/Info.plist";
@@ -1478,7 +1478,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.87kangsw.GitTime;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1492,15 +1492,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = R46Q3HW9V3;
 				INFOPLIST_FILE = "GitTime/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.87kangsw.GitTime;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/GitTime/Sources/ViewControllers/Trend/TrendViewReactor.swift b/GitTime/Sources/ViewControllers/Trend/TrendViewReactor.swift
@@ -213,22 +213,31 @@ final class TrendViewReactor: Reactor {
 
                 let name = item.xpath(".//div[@class='d-sm-flex flex-auto']/div[@class='col-sm-8 d-md-flex']/div[@class='col-md-6'][1]/h1")
                 let username = item.xpath(".//div[@class='d-sm-flex flex-auto']/div[@class='col-sm-8 d-md-flex']/div[@class='col-md-6'][1]/p")
-                let url = "https://github.com/"
+                let url = "https://github.com"
                 let avatar = item.xpath(".//div[@class='mx-3']/a[@class='d-inline-block']/img[@class='rounded-1']/@src")
 
-                let repoName = item.xpath("//h1[@class='h4 lh-condensed']")
+                let repoName = item.xpath(".//h1[@class='h4 lh-condensed']")
                 let repoURL = item.xpath(".//h1[@class='h4 lh-condensed']/a/@href")
                 let repoDescription = item.xpath(".//div[@class='f6 text-gray mt-1']")
+                let relativeURL = item.xpath(".//div[@class='d-sm-flex flex-auto']/div[@class='col-sm-8 d-md-flex']/div[@class='col-md-6'][1]/h1/a/@href")
 
                 if let name = name.first?.text?.striped {
                     trendDeveloper.name = name
                 }
 
+                if let relativeURL = relativeURL.first?.text?.striped {
+                    trendDeveloper.url = "\(url)\(relativeURL)"
+                    log.debug(trendDeveloper.url)
+                }
+
                 if let userName = username.first?.text?.striped {
                     trendDeveloper.userName = userName
-                    trendDeveloper.url = "\(url)\(userName)"
+                    // trendDeveloper.url = "\(url)\(userName)"
                 }
 
+
+
+
                 if let profileURL = avatar.first?.text?.striped {
                     trendDeveloper.profileURL = profileURL
                 }