1.0.2
このコミットが含まれているのは:
コミット
829c5c55a3
|
@ -1,3 +1,6 @@
|
||||||
|
# 1.0.2
|
||||||
|
* ヤフー社はHTMLをちょっと更新されたから、乗換を修正する事が必要となった
|
||||||
|
|
||||||
# 1.0.1
|
# 1.0.1
|
||||||
* -vを修正
|
* -vを修正
|
||||||
* 電車・バス・空路の表示
|
* 電車・バス・空路の表示
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
custom: ["https://076.moe/support/"]
|
||||||
|
github: TechnicalSuwako
|
6
Makefile
6
Makefile
|
@ -1,11 +1,7 @@
|
||||||
NAME=norikae
|
NAME=norikae
|
||||||
VERSION := $(shell cat main.go | grep "var version" | awk '{print $$4}' | sed "s/\"//g")
|
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
|
PREFIX=/usr
|
||||||
# FreeBSDとOpenBSD
|
|
||||||
#PREFIX=/usr/local
|
|
||||||
# NetBSD
|
|
||||||
#PREFIX=/usr/pkg
|
|
||||||
MANPREFIX=${PREFIX}/share/man
|
MANPREFIX=${PREFIX}/share/man
|
||||||
CC=CGO_ENABLED=0 go build
|
CC=CGO_ENABLED=0 go build
|
||||||
# リリース。なし=デバッグ。
|
# リリース。なし=デバッグ。
|
||||||
|
|
2
main.go
2
main.go
|
@ -6,7 +6,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
var version = "1.0.1"
|
var version = "1.0.2"
|
||||||
|
|
||||||
func help () {
|
func help () {
|
||||||
fmt.Println("使い方:")
|
fmt.Println("使い方:")
|
||||||
|
|
|
@ -32,7 +32,7 @@ func render (route []Route) {
|
||||||
badges += "〈" + b3 + "〉"
|
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 {
|
for k, v := range value.Stations {
|
||||||
fmt.Println(v.Time + " " + v.Name)
|
fmt.Println(v.Time + " " + v.Name)
|
||||||
for i, fare := range v.Fares {
|
for i, fare := range v.Fares {
|
||||||
|
|
15
scrape.go
15
scrape.go
|
@ -48,7 +48,7 @@ func scrape (gurl string) []Route {
|
||||||
route := fmt.Sprintf("div#route%02d", i)
|
route := fmt.Sprintf("div#route%02d", i)
|
||||||
sc.OnHTML("div.elmRouteDetail " + route, func (e *colly.HTMLElement) {
|
sc.OnHTML("div.elmRouteDetail " + route, func (e *colly.HTMLElement) {
|
||||||
Routes := Route{}
|
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" {
|
if el.Attr("class") == "icnPriTime" {
|
||||||
Routes.Badges = append(Routes.Badges, 1)
|
Routes.Badges = append(Routes.Badges, 1)
|
||||||
}
|
}
|
||||||
|
@ -59,14 +59,17 @@ func scrape (gurl string) []Route {
|
||||||
Routes.Badges = append(Routes.Badges, 3)
|
Routes.Badges = append(Routes.Badges, 3)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
base := e.ChildText("dl.routeSummary li.time span")
|
base := e.ChildText("ul.summary li.time span")
|
||||||
time := strings.ReplaceAll(base, e.ChildText("dl.routeSummary li.time span.small"), "")
|
time := strings.ReplaceAll(base, e.ChildText("ul.summary li.time span.small"), "")
|
||||||
time2 := strings.Split(time, "着")
|
time2 := strings.Split(time, "着")
|
||||||
Routes.Time = time2[0] + "着"
|
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.Duration = durabase[durasi:duraei]
|
||||||
Routes.TransitCunt = strings.ReplaceAll(e.ChildText("dl.routeSummary li.transfer"), "乗換:", "")
|
Routes.TransitCunt = strings.ReplaceAll(e.ChildText("ul.summary li.transfer"), "乗換:", "")
|
||||||
Routes.Fare = strings.ReplaceAll(e.ChildText("dl.routeSummary li.fare"), "[priic]IC優先:", "")
|
Routes.Fare = strings.ReplaceAll(e.ChildText("ul.summary li.fare"), "[priic]IC優先:", "")
|
||||||
Stations := Station{}
|
Stations := Station{}
|
||||||
Fares := Fare{}
|
Fares := Fare{}
|
||||||
Stops := Stop{}
|
Stops := Stop{}
|
||||||
|
|
読み込み中…
新しいイシューから参照