From 829c5c55a3e6104117f8e59e4fc00744ee93eaad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= <suwako@076.moe>
Date: Mon, 23 Oct 2023 15:46:42 +0900
Subject: [PATCH] 1.0.2

---
 CHANGELOG.md |  3 +++
 FUNDING.yml  |  2 ++
 Makefile     |  6 +-----
 main.go      |  2 +-
 render.go    |  2 +-
 scrape.go    | 15 +++++++++------
 6 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 FUNDING.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6df8b49..f028b9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.0.2
+* ヤフー社はHTMLをちょっと更新されたから、乗換を修正する事が必要となった
+
 # 1.0.1
 * -vを修正
 * 電車・バス・空路の表示
diff --git a/FUNDING.yml b/FUNDING.yml
new file mode 100644
index 0000000..53909c7
--- /dev/null
+++ b/FUNDING.yml
@@ -0,0 +1,2 @@
+custom: ["https://076.moe/support/"]
+github: TechnicalSuwako
diff --git a/Makefile b/Makefile
index d288f15..f46ab8f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,7 @@
 NAME=norikae
 VERSION := $(shell cat main.go | grep "var version" | awk '{print $$4}' | sed "s/\"//g")
-# Linux、Illumos
+# LinuxとIllumos＝/usr、FreeBSDとOpenBSD＝/usr/local、NetBSD＝/usr/pkg
 PREFIX=/usr
-# FreeBSDとOpenBSD
-#PREFIX=/usr/local
-# NetBSD
-#PREFIX=/usr/pkg
 MANPREFIX=${PREFIX}/share/man
 CC=CGO_ENABLED=0 go build
 # リリース。なし＝デバッグ。
diff --git a/main.go b/main.go
index 706aab0..7deba22 100644
--- a/main.go
+++ b/main.go
@@ -6,7 +6,7 @@ import (
   "time"
 )
 
-var version = "1.0.1"
+var version = "1.0.2"
 
 func help () {
   fmt.Println("使い方：")
diff --git a/render.go b/render.go
index 06e8755..0723f8b 100644
--- a/render.go
+++ b/render.go
@@ -32,7 +32,7 @@ func render (route []Route) {
         badges += "〈" + b3 + "〉"
       }
     }
-    fmt.Println(value.Time + " (" + value.Duration + "), " + value.Fare + ", 乗換：" + value.TransitCunt + " " + badges)
+    fmt.Println(value.Time + " (" + value.Duration + "), " + value.Fare + ", 乗換数：" + value.TransitCunt + " " + badges)
     for k, v := range value.Stations {
       fmt.Println(v.Time + " " + v.Name)
       for i, fare := range v.Fares {
diff --git a/scrape.go b/scrape.go
index 22fb38a..a0dde59 100644
--- a/scrape.go
+++ b/scrape.go
@@ -48,7 +48,7 @@ func scrape (gurl string) []Route {
     route := fmt.Sprintf("div#route%02d", i)
     sc.OnHTML("div.elmRouteDetail " + route, func (e *colly.HTMLElement) {
       Routes := Route{}
-      e.ForEach("dl.routeSummary ul.priority li span", func (j int, el *colly.HTMLElement) {
+      e.ForEach("div.routeSummary div ul.priority li span", func (j int, el *colly.HTMLElement) {
         if el.Attr("class") == "icnPriTime" {
           Routes.Badges = append(Routes.Badges, 1)
         }
@@ -59,14 +59,17 @@ func scrape (gurl string) []Route {
           Routes.Badges = append(Routes.Badges, 3)
         }
       })
-      base := e.ChildText("dl.routeSummary li.time span")
-      time := strings.ReplaceAll(base, e.ChildText("dl.routeSummary li.time span.small"), "")
+      base := e.ChildText("ul.summary li.time span")
+      time := strings.ReplaceAll(base, e.ChildText("ul.summary li.time span.small"), "")
       time2 := strings.Split(time, "着")
       Routes.Time = time2[0] + "着"
+      durabase := e.ChildText("ul.summary li.time")
+      durasi := strings.Index(durabase, "着") + len("着")
+      duraei := strings.Index(durabase[durasi:], "分") + len("分") + durasi
 
-      Routes.Duration = e.ChildText("dl.routeSummary li.time span.small")
-      Routes.TransitCunt = strings.ReplaceAll(e.ChildText("dl.routeSummary li.transfer"), "乗換：", "")
-      Routes.Fare = strings.ReplaceAll(e.ChildText("dl.routeSummary li.fare"), "[priic]IC優先：", "")
+      Routes.Duration = durabase[durasi:duraei]
+      Routes.TransitCunt = strings.ReplaceAll(e.ChildText("ul.summary li.transfer"), "乗換：", "")
+      Routes.Fare = strings.ReplaceAll(e.ChildText("ul.summary li.fare"), "[priic]IC優先：", "")
       Stations := Station{}
       Fares := Fare{}
       Stops := Stop{}