This commit is contained in:
parent
4281ccd5b6
commit
3d59a19cf1
|
|
@ -0,0 +1,339 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
NAME=norikae
|
||||
VERSION := $(shell cat main.go | grep "var version" | awk '{print $4}' | sed "s/\"//g")
|
||||
# Linux、Solaris、Haiku
|
||||
PREFIX=/usr
|
||||
# FreeBSDとOpenBSD
|
||||
#PREFIX=/usr/local
|
||||
# NetBSD
|
||||
#PREFIX=/usr/pkg
|
||||
MANPREFIX=${PREFIX}/share/man
|
||||
# Linux、OpenBSD、Solaris、Haiku
|
||||
CNFPREFIX=/etc
|
||||
# FreeBSD
|
||||
#CNFPREFIX=/usr/local/etc
|
||||
# NetBSD
|
||||
#CNFPREFIX=/usr/pkg/etc
|
||||
CC=CGO_ENABLED=0 go build
|
||||
# リリース。なし＝デバッグ。
|
||||
RELEASE=-ldflags="-s -w" -buildvcs=false
|
||||
|
||||
all:
|
||||
${CC} ${RELEASE} -o ${NAME}
|
||||
|
||||
clean:
|
||||
rm -f ${NAME} ${NAME}-${VERSION}.tar.gz
|
||||
|
||||
dist: clean
|
||||
mkdir -p ${NAME}${VERSION}
|
||||
cp -R LICENSE.txt Makefile README.md CHANGELOG.md\
|
||||
view static logo.jpg\
|
||||
${NAME}.1 *.go *.json ${NAME}-${VERSION}
|
||||
tar -zcfv ${NAME}-${VERSION}.tar.gz ${NAME}-${VERSION}
|
||||
rm -rf ${NAME}-${VERSION}
|
||||
|
||||
install: all
|
||||
mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
cp -f ${NAME} ${DESTDIR}${PREFIX}/bin
|
||||
chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME}
|
||||
mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||
sed "s/VERSION/${VERSION}/g" < ${NAME}.1 > ${DESTDIR}${MANPREFIX}/man1/${NAME}.1
|
||||
chmod 644 ${DESTDIR}${MANPREFIX}/man1/${NAME}.1
|
||||
mkdir -p ${DESTDIR}${CNFPREFIX}/${NAME}
|
||||
chmod 755 ${DESTDIR}${CNFPREFIX}/${NAME}
|
||||
|
||||
uninstall:
|
||||
rm -f ${DESTDIOR}${PREFIX}/bin/${NAME}\
|
||||
${DESTDIR}${MANPREFIX}/man1/${NAME}.1\
|
||||
${DESTDIR}${CNFPREFIX}/${NAME}\
|
||||
${DESTDIR}${PREFIX}/share/${NAME}
|
||||
|
||||
.PHONY: all options clean dist install uninstall
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
# 乗換
|
||||
CLIでの路線情報
|
||||
|
||||
## インストールする方法
|
||||
```sh
|
||||
cd norikae
|
||||
make
|
||||
doas make install
|
||||
```
|
||||
|
|
@ -20,7 +20,7 @@ func geturl (f Opts) string {
|
|||
m1 := string(minute[0])
|
||||
m2 := string(minute[1])
|
||||
|
||||
curl, _ := url.Parse("https://transit.yahoo.co.jp/search/result?from=" + f.From + "&to=" + f.To + "&y=" + year + "&m=" + month + "&d=" + day + "&hh=" + hour + "&m1=" + m1 + "&m2=" + m2 + "&type=" + f.Mode + "&ticket=ic&expkind=1&userpass=1&ws=" + f.Route + "&al=" + b2s(f.NoAirplane) + "&shin=" + b2s(f.NoShinkansen) + "&ex=" + b2s(f.NoExpress) + "&hb=" + b2s(f.NoExpressBus) + "&lb=" + b2s(f.NoBus) + "&sr=" + b2s(f.NoFairy))
|
||||
curl, _ := url.Parse("https://transit.yahoo.co.jp/search/result?from=" + url.QueryEscape(f.From) + "&to=" + url.QueryEscape(f.To) + "&y=" + year + "&m=" + month + "&d=" + day + "&hh=" + hour + "&m1=" + m1 + "&m2=" + m2 + "&type=" + f.Mode + "&ticket=ic&expkind=1&userpass=1&ws=" + f.Route + "&al=" + b2s(f.NoAirplane) + "&shin=" + b2s(f.NoShinkansen) + "&ex=" + b2s(f.NoExpress) + "&hb=" + b2s(f.NoExpressBus) + "&lb=" + b2s(f.NoBus) + "&sr=" + b2s(f.NoFairy))
|
||||
|
||||
return curl.String()
|
||||
}
|
||||
|
|
|
|||
3
go.mod
3
go.mod
|
|
@ -12,10 +12,13 @@ require (
|
|||
github.com/gocolly/colly v1.2.0 // indirect
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||
github.com/golang/protobuf v1.3.1 // indirect
|
||||
github.com/gookit/color v1.5.3 // indirect
|
||||
github.com/kennygrant/sanitize v1.2.4 // indirect
|
||||
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
|
||||
github.com/temoto/robotstxt v1.1.2 // indirect
|
||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
|
||||
golang.org/x/net v0.11.0 // indirect
|
||||
golang.org/x/sys v0.9.0 // indirect
|
||||
golang.org/x/text v0.10.0 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
)
|
||||
|
|
|
|||
6
go.sum
6
go.sum
|
|
@ -18,6 +18,8 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l
|
|||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
|
||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/gookit/color v1.5.3 h1:twfIhZs4QLCtimkP7MOxlF3A0U/5cDPseRT9M/+2SCE=
|
||||
github.com/gookit/color v1.5.3/go.mod h1:NUzwzeehUfl7GIb36pqId+UGmRfQcU/WiiyTTeNjHtE=
|
||||
github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o=
|
||||
github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
|
|
@ -27,6 +29,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
|
|||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/temoto/robotstxt v1.1.2 h1:W2pOjSJ6SWvldyEuiFXNxz3xZ8aiWX5LbfDiOFd7Fxg=
|
||||
github.com/temoto/robotstxt v1.1.2/go.mod h1:+1AmkuG3IYkh1kv0d2qEB9Le88ehNO0zwOr3ujewlOo=
|
||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
|
||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
|
||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
|
|
@ -50,6 +54,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
|
||||
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
|
||||
|
|
|
|||
9
main.go
9
main.go
|
|
@ -8,11 +8,6 @@ import (
|
|||
|
||||
var version = "1.0.0"
|
||||
|
||||
type Opts struct {
|
||||
From, To, Date, Time, Mode, Route string
|
||||
NoAirplane, NoShinkansen, NoExpress, NoExpressBus, NoBus, NoFairy bool
|
||||
}
|
||||
|
||||
func help () {
|
||||
fmt.Println("使い方：")
|
||||
fmt.Println("norikae -v ：バージョンを表示")
|
||||
|
|
@ -94,6 +89,6 @@ func main () {
|
|||
}
|
||||
|
||||
gurl := geturl(opts)
|
||||
fmt.Println(gurl)
|
||||
//scrape(gurl)
|
||||
route := scrape(gurl)
|
||||
render(route)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,58 @@
|
|||
.TH 乗換 1 norikae\-VERSION
|
||||
.SH ソフト名
|
||||
乗換 - CLIでの路線情報
|
||||
.SH 概要
|
||||
.B norikae
|
||||
[\fI\,オプション\/\fR] [\fI\,ほげほげ\/\fR]
|
||||
.SH 説明
|
||||
.PP
|
||||
CLIでの路線情報
|
||||
.TP
|
||||
\fB\-v\fR
|
||||
バージョンを表示
|
||||
.TP
|
||||
\fB\-h\fR
|
||||
ヘルプを表示
|
||||
.SH 必須のオプション
|
||||
.TP
|
||||
\fB\-f [駅名]\fR
|
||||
出社駅、例：秋葉原、渋谷、大手町（東京）
|
||||
.TP
|
||||
\fB\-t [駅名]\fR
|
||||
到着駅、例：秋葉原、渋谷、大手町（東京）
|
||||
.SH 任意のオプション
|
||||
.TP
|
||||
\fB\-n [YYYY-MM-DD]\fR
|
||||
年月日、ハイフン（-）で分けて、デフォルト＝今
|
||||
.TP
|
||||
\fB\-j [HH:MM]\fR
|
||||
時間、デフォルト＝今
|
||||
.TP
|
||||
\fB\-m [数字]\fR
|
||||
0 = 出発、1 = 指定なし、2 = 終電、3 = 始発、4 = 到着、デフォルト＝0
|
||||
.TP
|
||||
\fB\-r [数字]\fR
|
||||
0 = 到着が早い順、1 = 料金が高い順、2 = 乗り換え回数順、デフォルト＝0
|
||||
.TP
|
||||
\fB\--no-airplane\fR
|
||||
空路を省く
|
||||
.TP
|
||||
\fB\--no-shinkansen\fR
|
||||
新幹線を省く
|
||||
.TP
|
||||
\fB\--no-express\fR
|
||||
有料特急を省く
|
||||
.TP
|
||||
\fB\--no-expressbus\fR
|
||||
高速バスを省く
|
||||
.TP
|
||||
\fB\--no-bus\fR
|
||||
路線/連絡バスを省く
|
||||
.TP
|
||||
\fB\--no-ferry\fR
|
||||
フェリーを省く
|
||||
.SH バグ報告
|
||||
.PP
|
||||
バグは下記のURLまでご報告下さい：
|
||||
.br
|
||||
https://gitler.moe/suwako/norikae/issues
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/gookit/color"
|
||||
)
|
||||
|
||||
func render (route []Route) {
|
||||
var r, g, b uint8
|
||||
col := "fcfcfc"
|
||||
fmt.Sscanf("ff7e56", "%2x%2x%2x", &r, &g, &b)
|
||||
b1 := color.RGB(uint8(r), uint8(g), uint8(b)).Sprint("早")
|
||||
fmt.Sscanf("60bddb", "%2x%2x%2x", &r, &g, &b)
|
||||
b2 := color.RGB(uint8(r), uint8(g), uint8(b)).Sprint("楽")
|
||||
fmt.Sscanf("fab60a", "%2x%2x%2x", &r, &g, &b)
|
||||
b3 := color.RGB(uint8(r), uint8(g), uint8(b)).Sprint("安")
|
||||
fmt.Sscanf(col, "%2x%2x%2x", &r, &g, &b)
|
||||
c := color.RGB(uint8(r), uint8(g), uint8(b)).Sprint("")
|
||||
|
||||
for key, value := range route {
|
||||
color.Style{color.FgBlack, color.BgMagenta, color.OpBold}.Println("# ルート" + fmt.Sprintf("%d", key+1))
|
||||
badges := ""
|
||||
for _, badge := range value.Badges {
|
||||
if badge == 1 {
|
||||
badges += "〈" + b1 + "〉"
|
||||
}
|
||||
if badge == 2 {
|
||||
badges += "〈" + b2 + "〉"
|
||||
}
|
||||
if badge == 3 {
|
||||
badges += "〈" + b3 + "〉"
|
||||
}
|
||||
}
|
||||
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 {
|
||||
if k == i {
|
||||
col = fare.Color
|
||||
fmt.Sscanf(col, "%2x%2x%2x", &r, &g, &b)
|
||||
text := fare.Train
|
||||
if fare.Platform != "" { text += "\n" + fare.Platform }
|
||||
c = color.RGB(uint8(r), uint8(g), uint8(b)).Sprint(text)
|
||||
fmt.Println(c)
|
||||
}
|
||||
}
|
||||
}
|
||||
fmt.Println("")
|
||||
}
|
||||
}
|
||||
151
scrape.go
151
scrape.go
|
|
@ -3,66 +3,109 @@ package main
|
|||
import (
|
||||
"log"
|
||||
"net/http"
|
||||
"time"
|
||||
"net"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/gocolly/colly"
|
||||
)
|
||||
|
||||
type (
|
||||
Badge struct {
|
||||
Text, Color string
|
||||
}
|
||||
Route struct {
|
||||
Id, From, To, Duration, RideDuration, TransitCunt, Km string
|
||||
Price, Sum int
|
||||
Badges []Badge
|
||||
Trains []Train
|
||||
}
|
||||
Stops struct {
|
||||
Time, Name string
|
||||
}
|
||||
Train struct {
|
||||
From, To, Name, LineColor, Station, LineName, FromTrack, ToTrack string
|
||||
Stop []Stops
|
||||
}
|
||||
ScrapeData struct {
|
||||
Err string
|
||||
}
|
||||
)
|
||||
|
||||
func scrape (gurl string) *ScrapeData {
|
||||
var scrapeData *ScrapeData
|
||||
var badge1, badge2, badge3 Badge
|
||||
badge1.Text = "早"
|
||||
badge1.Color = "#ff7e56"
|
||||
badge2.Text = "楽"
|
||||
badge2.Color = "#60bddb"
|
||||
badge3.Text = "安"
|
||||
badge3.Color = "#fab60a"
|
||||
log.Println(gurl)
|
||||
|
||||
resp, err := http.Get(gurl)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
if resp.StatusCode == 404 {
|
||||
log.Fatal("見つけられません。")
|
||||
}
|
||||
|
||||
func scrape (gurl string) []Route {
|
||||
ua := "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36"
|
||||
sc := colly.NewCollector(colly.AllowedDomains("transit.yahoo.co.jp"), colly.UserAgent(ua))
|
||||
sc := colly.NewCollector(
|
||||
colly.AllowURLRevisit(),
|
||||
colly.Async(true),
|
||||
)
|
||||
|
||||
sc.OnHTML("div.elmRouteDetail", func (e *colly.HTMLElement) {
|
||||
log.Println(e.Attr("class"))
|
||||
log.Println(e.Attr("id"))
|
||||
if e.Attr("class") == "pos-im" {
|
||||
return
|
||||
}
|
||||
|
||||
e.ForEach("div", func (i int, el *colly.HTMLElement) {
|
||||
log.Println("cunny")
|
||||
//el.ClassText()
|
||||
})
|
||||
sc.WithTransport(&http.Transport {
|
||||
Proxy: http.ProxyFromEnvironment,
|
||||
DialContext: (&net.Dialer{
|
||||
Timeout: 30 * time.Second,
|
||||
KeepAlive: 30 * time.Second,
|
||||
DualStack: true,
|
||||
}).DialContext,
|
||||
ForceAttemptHTTP2: true,
|
||||
MaxIdleConns: 100,
|
||||
IdleConnTimeout: 90 * time.Second,
|
||||
TLSHandshakeTimeout: 10 * time.Second,
|
||||
ExpectContinueTimeout: 1 * time.Second,
|
||||
})
|
||||
|
||||
return scrapeData
|
||||
sc.OnRequest(func(r *colly.Request) {
|
||||
r.Headers.Set("User-Agent", ua)
|
||||
r.Headers.Set("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
|
||||
r.Headers.Set("Accept-Language", "en-US,en;q=0.5")
|
||||
})
|
||||
|
||||
sc.OnError(func(_ *colly.Response, err error) {
|
||||
log.Fatal("エラー：", err)
|
||||
})
|
||||
|
||||
var routeArr []Route
|
||||
|
||||
for i := 1; i <= 3; i++ {
|
||||
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) {
|
||||
if el.Attr("class") == "icnPriTime" {
|
||||
Routes.Badges = append(Routes.Badges, 1)
|
||||
}
|
||||
if el.Attr("class") == "icnPriFare" {
|
||||
Routes.Badges = append(Routes.Badges, 2)
|
||||
}
|
||||
if el.Attr("class") == "icnPriTrans" {
|
||||
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"), "")
|
||||
time2 := strings.Split(time, "着")
|
||||
Routes.Time = time2[0] + "着"
|
||||
|
||||
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優先：", "")
|
||||
Stations := Station{}
|
||||
Fares := Fare{}
|
||||
Stops := Stop{}
|
||||
e.ForEach("div.routeDetail div.station", func (j int, el *colly.HTMLElement) {
|
||||
Stations.Time = el.ChildText("ul.time li")
|
||||
if el.ChildText("p.icon span") == "[dep]" { Stations.Time += "発" }
|
||||
if el.ChildText("p.icon span") == "[arr]" { Stations.Time += "着" }
|
||||
Stations.Name = el.ChildText("dl dt a")
|
||||
e.ForEach("div.routeDetail div.fareSection div.access", func (jf int, elf *colly.HTMLElement) {
|
||||
Fares.Stops = nil
|
||||
if jf == j {
|
||||
Fares.Train = strings.ReplaceAll(elf.ChildText("li.transport div"), "[train]", "")
|
||||
Fares.Platform = elf.ChildText("li.platform")
|
||||
Fares.Color = strings.ReplaceAll(elf.ChildAttr("span", "style"), "border-color:#", "")
|
||||
elf.ForEach("li.stop ul", func (js int, els *colly.HTMLElement) {
|
||||
Stops.Time = els.ChildText("li dl dt")
|
||||
Stops.Name = strings.ReplaceAll(els.ChildText("li dl dd"), "○", "")
|
||||
Fares.Stops = append(Fares.Stops, Stops)
|
||||
})
|
||||
Stations.Fares = append(Stations.Fares, Fares)
|
||||
}
|
||||
})
|
||||
e.ForEach("div.routeDetail div.walk ul.info", func (jw int, elw *colly.HTMLElement) {
|
||||
if jw == j {
|
||||
Fares.Train = strings.ReplaceAll(elw.ChildText("li.transport"), "[line][walk]", "")
|
||||
Fares.Platform = ""
|
||||
Fares.Color = "a8a8a8"
|
||||
Stations.Fares = append(Stations.Fares, Fares)
|
||||
}
|
||||
})
|
||||
Routes.Stations = append(Routes.Stations, Stations)
|
||||
})
|
||||
|
||||
routeArr = append(routeArr, Routes)
|
||||
})
|
||||
}
|
||||
|
||||
sc.Visit(gurl)
|
||||
sc.Wait()
|
||||
|
||||
return routeArr
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
package main
|
||||
|
||||
type (
|
||||
Opts struct {
|
||||
From, To, Date, Time, Mode, Route string
|
||||
NoAirplane, NoShinkansen, NoExpress, NoExpressBus, NoBus, NoFairy bool
|
||||
}
|
||||
Route struct {
|
||||
Time, Duration, TransitCunt, Fare string
|
||||
Badges []int
|
||||
Stations []Station
|
||||
}
|
||||
Station struct {
|
||||
Time, Name string
|
||||
Fares []Fare
|
||||
}
|
||||
Fare struct {
|
||||
Train, Color, Platform string
|
||||
Stops []Stop
|
||||
}
|
||||
Stop struct {
|
||||
Time, Name string
|
||||
}
|
||||
)
|
||||
Loading…
Reference in New Issue