Merge pull request #246 from weiran/hnfix

weiran · web-flow · commit e14debd7a666 · 2022-09-29T07:48:55.000+01:00
Adapt to changed HTML
diff --git a/App/Services/OnboardingService.swift b/App/Services/OnboardingService.swift
@@ -15,6 +15,9 @@ enum OnboardingService {
             return nil
         }
 
+        // disable onboarding
+        return nil
+
         let whatsNew = WhatsNew(
             title: "What's New in Hackers",
             items: items()
diff --git a/Extensions/HackersActionExtension/Info.plist b/Extensions/HackersActionExtension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.5</string>
+	<string>4.7.6</string>
 	<key>CFBundleVersion</key>
-	<string>115</string>
+	<string>116</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/Extensions/HackersShareExtension/Info.plist b/Extensions/HackersShareExtension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.5</string>
+	<string>4.7.6</string>
 	<key>CFBundleVersion</key>
-	<string>115</string>
+	<string>116</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/Hackers.xcodeproj/project.pbxproj b/Hackers.xcodeproj/project.pbxproj
@@ -1270,7 +1270,7 @@
 				CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/Hackers.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 115;
+				CURRENT_PROJECT_VERSION = 116;
 				DEVELOPMENT_TEAM = 2KB59GPA9B;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1281,7 +1281,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.7.5;
+				MARKETING_VERSION = 4.7.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.weiranzhang.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = Hackers;
 				PROVISIONING_PROFILE_SPECIFIER = "Hackers Dev Profile";
@@ -1302,7 +1302,7 @@
 				CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/Hackers.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 115;
+				CURRENT_PROJECT_VERSION = 116;
 				DEVELOPMENT_TEAM = 2KB59GPA9B;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1313,7 +1313,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.7.5;
+				MARKETING_VERSION = 4.7.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.weiranzhang.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = Hackers;
 				PROVISIONING_PROFILE_SPECIFIER = "Hackers Prod Profile";
diff --git a/Shared Frameworks/HackersKit/HtmlParser.swift b/Shared Frameworks/HackersKit/HtmlParser.swift
@@ -42,8 +42,8 @@ enum HtmlParser {
         guard let id = Int(try postElement.attr("id")) else {
             throw Exception.Error(type: .SelectorParseException, Message: "Couldn't parse post ID")
         }
-        let urlString = try postElement.select(".titlelink").attr("href")
-        let title = try postElement.select(".titlelink").text()
+        let urlString = try postElement.select(".titleline").select("a").attr("href")
+        let title = try postElement.select(".titleline").text()
         guard let url = URL(string: urlString) else {
             throw Exception.Error(type: .SelectorParseException, Message: "Couldn't parse post URL")
         }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@ enum OnboardingService {`
`15`	`15`	`return nil`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ // disable onboarding`
	`19`	`+ return nil`
	`20`	`+`
`18`	`21`	`let whatsNew = WhatsNew(`
`19`	`22`	`title: "What's New in Hackers",`
`20`	`23`	`items: items()`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ enum HtmlParser {`
`42`	`42`	`guard let id = Int(try postElement.attr("id")) else {`
`43`	`43`	`throw Exception.Error(type: .SelectorParseException, Message: "Couldn't parse post ID")`
`44`	`44`	`}`
`45`		`- let urlString = try postElement.select(".titlelink").attr("href")`
`46`		`- let title = try postElement.select(".titlelink").text()`
	`45`	`+ let urlString = try postElement.select(".titleline").select("a").attr("href")`
	`46`	`+ let title = try postElement.select(".titleline").text()`
`47`	`47`	`guard let url = URL(string: urlString) else {`
`48`	`48`	`throw Exception.Error(type: .SelectorParseException, Message: "Couldn't parse post URL")`
`49`	`49`	`}`