TechnicalSuwako/norikae
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1.0.2

Browse source
This commit is contained in:
諏訪子 2023-10-23 15:46:42 +09:00
parent 1f348e8537
commit 829c5c55a3
6 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,3 +1,6 @@
# 1.0.2
* ヤフー社はHTMLをちょっと更新されたから、乗換を修正する事が必要となった
# 1.0.1
* -vを修正
* 電車・バス・空路の表示

2
FUNDING.yml Normal file
View file

@ -0,0 +1,2 @@
custom: ["https://076.moe/support/"]
github: TechnicalSuwako

6
Makefile
View file

@ -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
# リリース。なし＝デバッグ。

2
main.go
View file

@ -6,7 +6,7 @@ import (
"time"
)
var version = "1.0.1"
var version = "1.0.2"
func help () {
fmt.Println("使い方：")

2
render.go
View file

@ -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 {

15
scrape.go
View file

@ -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{}