From 0a4120a6af6b68c84a5d9a18a4ef3d843185a83e Mon Sep 17 00:00:00 2001 From: akidon0000 Date: Sun, 7 Apr 2024 21:33:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[191]=20=E5=9B=B3=E6=9B=B8=E9=A4=A8web?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=83=88=E3=81=AE=E4=BB=95=E6=A7=98=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Features/LibraryCalendarWebScraper.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Features/LibraryCalendarWebScraper.swift b/Features/LibraryCalendarWebScraper.swift index 9f2a8e2f..a710a671 100644 --- a/Features/LibraryCalendarWebScraper.swift +++ b/Features/LibraryCalendarWebScraper.swift @@ -34,8 +34,8 @@ public struct LibraryCalendarWebScraper: LibraryCalendarWebScraperInterface { do { let doc = try HTML(html: data, encoding: String.Encoding.utf8) for node in doc.xpath("//a") { - if let str = node["href"], str.contains("pub/pdf/calender/") { - urlStr = urlStr + str + if let str = node["href"], str.contains("drupal/ja/library_calendar/annual/") { + urlStr = str } } } catch let parseError { From d7d3b90cb8aaa74a08ea52333df1ce2b3a6e4266 Mon Sep 17 00:00:00 2001 From: akidon0000 Date: Sun, 7 Apr 2024 21:35:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[191]=20=E3=83=AA=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=AF=E3=82=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Features/LibraryCalendarWebScraper.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Features/LibraryCalendarWebScraper.swift b/Features/LibraryCalendarWebScraper.swift index a710a671..abfda32e 100644 --- a/Features/LibraryCalendarWebScraper.swift +++ b/Features/LibraryCalendarWebScraper.swift @@ -16,8 +16,6 @@ public protocol LibraryCalendarWebScraperInterface { public struct LibraryCalendarWebScraper: LibraryCalendarWebScraperInterface { public init() {} - private let baseURLString = "https://www.lib.tokushima-u.ac.jp/" - public func getLibraryCalendarURL(libraryUrl: URL) -> RxSwift.Single { return .create { observer in let task = URLSession.shared.dataTask(with: libraryUrl) { (data, response , error) in @@ -30,7 +28,7 @@ public struct LibraryCalendarWebScraper: LibraryCalendarWebScraperInterface { return observer(.failure(WebScrapeError.noDataAvailable(statusCode: statusCode))) } - var urlStr = self.baseURLString + var urlStr = "" do { let doc = try HTML(html: data, encoding: String.Encoding.utf8) for node in doc.xpath("//a") {