1.3.0

CHANGELOG.md

@@ -1,6 +1,18 @@
+# 1.3.0
+* BSD2clause→ISCライセンスに変更
+* 変なエンコーディングの変換
+
+# 1.2.0
+* 静的ファイルの修正
+* 新しいルールに従い
+* GNU MakeからBSD Makeに変更
+* GPLv2→BSD2clouseライセンスに変更
+
 # 1.1.0
 * 言語はliblocale化
 * 複数言語対応
+* NetBSD対応
+* IPアドレスを設定する様に
 
 # 1.0.0
 * PHPからGoに交換しました

LICENSE.txt

@@ -1,339 +1,14 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+Copyright © 2004-2011 by Internet Systems Consortium, Inc. ("ISC")
+Copyright © 2018-2024 by 076.moe
 
- 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.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-                            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.
+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.

Makefile

@@ -1,20 +1,9 @@
-NAME=hozonsite
-VERSION := $(shell cat main.go | grep "var version" | awk '{print $$4}' | sed "s/\"//g")
-# Linux、Illumos
-PREFIX=/usr
-# FreeBSDとOpenBSD
-#PREFIX=/usr/local
-# NetBSD
-#PREFIX=/usr/pkg
-MANPREFIX=${PREFIX}/share/man
-# Linux、Illumos、とOpenBSD
-CNFPREFIX=/etc
-# FreeBSD
-#CNFPREFIX=/usr/local/etc
-# NetBSD
-#CNFPREFIX=/usr/pkg/etc
+NAME!=cat common/common.go | grep "var sofname" | awk '{print $$4}' | sed "s/\"//g"
+VERSION!=cat common/common.go | grep "var version" | awk '{print $$4}' | sed "s/\"//g"
+PREFIX=/usr/local
+MANPREFIX=${PREFIX}/man
+CNFPREFIX?=/etc
 CC=CGO_ENABLED=0 go build
-# リリース。なし＝デバッグ。
 RELEASE=-ldflags="-s -w" -buildvcs=false
 
 all:
@@ -50,12 +39,12 @@ clean:
 dist: clean
 	mkdir -p ${NAME}-${VERSION}
 	cp -R LICENSE.txt Makefile README.md CHANGELOG.md\
-		view static logo.jpg\
-		${NAME}.1 *.go *.json go.mod ${NAME}-${VERSION}
+		view static common src logo.jpg\
+		${NAME}.1 main.go *.json go.mod go.sum ${NAME}-${VERSION}
 	tar zcfv ${NAME}-${VERSION}.tar.gz ${NAME}-${VERSION}
 	rm -rf ${NAME}-${VERSION}
 
-install: all
+install:
 	mkdir -p ${DESTDIR}${PREFIX}/bin
 	cp -f ${NAME} ${DESTDIR}${PREFIX}/bin
 	chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME}

README.md

@@ -1,9 +1,31 @@
 # 保存サイト
 世界初FOSS系ウエブアーカイバーです。
 
-## インストールする方法
+# インストールする方法
+## OpenBSD
 ```sh
-cd hozon.site
+cd hozonsite
 make
 doas make install
 ```
+
+## FreeBSD
+```sh
+cd hozonsite
+make
+doas make install MANPREFIX=/usr/local/share/man
+```
+
+## NetBSD
+```sh
+cd hozonsite
+make
+doas make install PREFIX=/usr/pkg MANPREFIX=/usr/pkg/share/man
+```
+
+## Linux
+```sh
+cd hozonsite
+bmake
+doas bmake install PREFIX=/usr MANPREFIX=/usr/share/man
+```

common/common.go

@@ -0,0 +1,12 @@
+package common
+
+var sofname = "hozonsite"
+var version = "1.3.0"
+
+func GetSofname() string {
+  return sofname
+}
+
+func GetVersion() string {
+  return version
+}

config.go

@@ -1,49 +0,0 @@
-package main
-
-import (
-  "os"
-  "fmt"
-  "runtime"
-  "encoding/json"
-)
-
-type Config struct {
-  configpath, webpath, datapath, domain string
-}
-
-func getconf () Config {
-  var payload map[string]interface{}
-  var cnf Config
-
-  // バイナリ、データ、及びFreeBSDとNetBSDの場合、コンフィグ
-  prefix := "/usr"
-  // BSDだけはただの/usrではない
-  if runtime.GOOS == "freebsd" || runtime.GOOS == "openbsd" {
-    prefix += "/local"
-  } else if runtime.GOOS == "netbsd" {
-    prefix += "/pkg"
-  }
-
-  // コンフィグファイル
-  cnf.configpath = "/etc/hozonsite/config.json"
-  cnf.datapath = prefix + "/share/hozonsite"
-
-  // また、FreeBSDとNetBSDだけは違う場所だ。OpenBSDは正しい場所
-  // FreeBSD = /usr/local/etc/hozonsite/config.json
-  // NetBSD  = /usr/pkg/etc/hozonsite/config.json
-  if runtime.GOOS == "freebsd" || runtime.GOOS == "netbsd" {
-    cnf.configpath = prefix + cnf.configpath
-  }
-
-  // コンフィグファイルがなければ、死ね
-  data, err := os.ReadFile(cnf.configpath)
-  if err != nil {
-    fmt.Println("エラー：", err)
-  }
-  json.Unmarshal(data, &payload)
-  cnf.webpath = payload["webpath"].(string) // データパス
-  cnf.domain = payload["domain"].(string) // ドメイン名
-  payload = nil // もういらなくなった
-
-  return cnf
-}

config.json

@@ -1,4 +1,5 @@
 {
   "webpath": "/var/www/htdocs/hozonsite",
-  "domain": "https://hozon.site"
+  "domain": "https://hozon.site",
+  "ip": "0.0.0.0"
 }

getpage.go

@@ -1,47 +0,0 @@
-package main
-
-import (
-  "os"
-  "fmt"
-  "net/http"
-  "io"
-  "strings"
-)
-
-// URLでパラメートル（?、=等）がある場合
-func stripurl (url string) string {
-  res := strings.ReplaceAll(url, "?", "")
-  res = strings.ReplaceAll(res, "=", "")
-  return res
-}
-
-func getpage (url string, path string) {
-  // ページを読み込む
-  curl, err := http.Get(url)
-  if err != nil {
-    fmt.Println("CURLエラー：", err)
-    return
-  }
-  defer curl.Body.Close() // ソフトの終了する時に実行する
-
-  // ページの内容を読み込む
-  body, err2 := io.ReadAll(curl.Body)
-  if err2 != nil {
-    fmt.Println("読込エラー：", err2)
-    return
-  }
-
-  // 空index.htmlファイルを創作する
-  fn, err3 := os.Create(path + "/index.html")
-  if err3 != nil {
-    fmt.Println("ファイルの創作エラー：", err3)
-    return
-  }
-  defer fn.Close() // ソフトの終了する時に実行する
-
-  // あのindex.htmlファイルに内容をそのまま書き込む
-  _, err4 := fn.WriteString(string(body))
-  if err4 != nil {
-    fmt.Println("ファイル書込エラー：", err4)
-  }
-}

go.mod

@@ -1,5 +1,7 @@
-module 076/hozonsite
+module gitler.moe/suwako/hozonsite
 
 go 1.20
 
 require gitler.moe/suwako/goliblocale v1.0.0
+
+require golang.org/x/text v0.14.0 // indirect

go.sum

@@ -1,2 +1,4 @@
 gitler.moe/suwako/goliblocale v1.0.0 h1:QiQKNzdgpavwmAaYhAb5pth0I6qS8IJ7q2hYAgpXacU=
 gitler.moe/suwako/goliblocale v1.0.0/go.mod h1:pdv9Go5taevY8ClBOA+oLXjGap7G1RmIVKUMF8HSJmU=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=

main.go

@@ -5,63 +5,108 @@ import (
   "os"
   "strings"
   "strconv"
+
+  "gitler.moe/suwako/hozonsite/src"
+  "gitler.moe/suwako/hozonsite/common"
 )
 
-var version = "1.1.0"
-
-func help () {
-  fmt.Println("使い方：");
-  fmt.Println("hozonsite -v               ：バージョンを表示");
-  fmt.Println("hozonsite -s [ポート番号]  ：ポート番号でウェブサーバーを実行（デフォルト＝9920）");
-  fmt.Println("hozonsite -h               ：ヘルプを表示");
-  fmt.Println("hozonsite <URL>            ：コマンドラインでウェブサイトを保存");
+func help() {
+  fmt.Println("使い方：")
+  fmt.Println(
+    common.GetSofname() + " -v               ：バージョンを表示",
+  )
+  fmt.Println(
+    common.GetSofname() +
+    " -s [ポート番号]  ：ポート番号でウェブサーバーを実行（デフォルト＝9920）",
+  )
+  fmt.Println(
+    common.GetSofname() +
+    " -h               ：ヘルプを表示",
+  )
+  fmt.Println(
+    common.GetSofname() +
+    " <URL>            ：コマンドラインでウェブサイトを保存",
+  )
 }
 
-func main () {
-  cnf := getconf() // コンフィグファイル
-  args := os.Args // コマンドラインのパラメートル
+func saveurlcmd(url string, cnf src.Config) {
+  // 結局HTTPかHTTPSじゃないわね…
+  if !src.Checkprefix(url) {
+    fmt.Println("URLは不正です。終了…")
+    return
+  }
+
+  // パラメートルの文字（?、=等）を削除
+  eurl := src.Stripurl(url)
+
+  // 既に/usr/local/share/hozonsite/archiveに存在するかどうか
+  exist := src.Checkexist(eurl, cnf.Datapath)
+
+  // 既に存在したら、使う
+  var confirm string
+
+  // あ、既に存在する
+  if len(exist) > 0 {
+    fmt.Println("このページが既に保存されているみたいです。")
+    fmt.Println("本当に手続きましょうか？ [y/N]")
+
+    // 既に存在するページのURLを表示
+    for _, ex := range exist {
+      fmt.Println(strings.Replace(ex, cnf.Datapath, cnf.Domain, 1))
+    }
+    fmt.Scanf("%s", &confirm)
+  }
+
+  // 存在しない OR 「本当に手続きましょうか？」でYを入力した場合
+  if len(exist) == 0 || confirm == "y" || confirm == "Y" {
+    path := src.Mkdirs(eurl, cnf.Datapath)
+    // ページをダウンロード
+    src.Getpage(url, path)
+    // 色々の必須な編集
+    src.Scanpage(path, eurl, cnf.Datapath)
+    // 新しいURLを表示
+    fmt.Println(cnf.Domain + strings.Replace(path, cnf.Datapath, "", 1))
+  }
+}
+
+func main() {
+  // コンフィグファイル
+  cnf, err := src.Getconf()
+  if err != nil {
+    fmt.Println(err)
+    return
+  }
+
+  // コマンドラインのパラメートル
+  args := os.Args
+
   if len(args) == 2 {
-    if args[1] == "-v" { // バージョンを表示
-      fmt.Println("hozonsite-" + version)
+    // バージョンを表示
+    if args[1] == "-v" {
+      fmt.Println(common.GetSofname() + "-" + common.GetVersion())
       return
     } else if args[1] == "-s" { // :9920でウェブサーバーを実行
-      serv(cnf, 9920)
+      src.Serv(cnf, 9920)
     } else if args[1] == "-h" { // ヘルプを表示
       help()
       return
-    } else { // コマンドラインでウェブサイトを保存
-      if checkprefix(args[1]) { // プロトコールはあってるかどうか
-        eurl := stripurl(args[1]) // パラメートルの文字（?、=等）を削除
-        exist := checkexist(eurl, cnf.datapath) // 既に/usr/share/hozonsite/archiveに存在するかどうか
-        var confirm string // 既に存在したら、使う
-        if len(exist) > 0 { // あ、既に存在する
-          fmt.Println("このページが既に保存されているみたいです。")
-          fmt.Println("本当に手続きましょうか？ [y/N]")
-          for _, ex := range exist { // 既に存在するページのURLを表示
-            fmt.Println(strings.Replace(ex, cnf.datapath, cnf.domain, 1))
-          }
-          fmt.Scanf("%s", &confirm)
-        }
-        if len(exist) == 0 || confirm == "y" || confirm == "Y" { // 存在しない OR 「本当に手続きましょうか？」でYを入力した場合
-          path := mkdirs(eurl, cnf.datapath)
-          getpage(args[1], path) // ページをダウンロード
-          scanpage(path, eurl, cnf.datapath) // 色々の必須な編集
-          fmt.Println(cnf.domain + strings.Replace(path, cnf.datapath, "", 1)) // 新しいURLを表示
-        }
-        return
-      } else { // 結局HTTPかHTTPSじゃないわね…
-        fmt.Println("URLは不正です。終了…")
-        return
-      }
+    } else {
+      // コマンドラインでウェブサイトを保存
+      saveurlcmd(args[1], cnf)
+      return
     }
-  } else if len(args) == 3 && args[1] == "-s" { // 好みなポート番号でウェブサーバーを実行
-    if port, err := strconv.Atoi(args[2]); err != nil { // でも、数字じゃないかもしん
+  } else if len(args) == 3 && args[1] == "-s" {
+    // 好みなポート番号でウェブサーバーを実行
+    // でも、数字じゃないかもしん
+    if port, err := strconv.Atoi(args[2]); err != nil {
       fmt.Printf("%qは数字ではありません。\n", args[2])
       return
-    } else { // OK、実行しよ〜
-      serv(cnf, port)
+    } else {
+      // OK、実行しよ〜
+      src.Serv(cnf, port)
     }
-  } else { // パラメートルは不明の場合、ヘルプを表示
+  } else {
+    // パラメートルは不明の場合、ヘルプを表示
     help()
     return
   }

src/config.go

@@ -0,0 +1,71 @@
+package src
+
+import (
+  "os"
+  "fmt"
+  "runtime"
+  "encoding/json"
+  "io/ioutil"
+  "errors"
+)
+
+type Config struct {
+  Configpath, Webpath, Datapath, Domain, IP string
+}
+
+var cnf Config
+
+func Getconf () (Config, error) {
+  // バイナリ、データ、及びFreeBSDとNetBSDの場合、コンフィグ
+  prefix := "/usr"
+  // BSDだけはただの/usrではない
+  if runtime.GOOS == "freebsd" || runtime.GOOS == "openbsd" {
+    prefix += "/local"
+  } else if runtime.GOOS == "netbsd" {
+    prefix += "/pkg"
+  }
+
+  // コンフィグファイル
+  cnf.Configpath = "/etc/hozonsite/config.json"
+  cnf.Datapath = prefix + "/share/hozonsite"
+
+  // また、FreeBSDとNetBSDだけは違う場所だ。OpenBSDは正しい場所
+  // FreeBSD = /usr/local/etc/hozonsite/config.json
+  // NetBSD  = /usr/pkg/etc/hozonsite/config.json
+  if runtime.GOOS == "freebsd" || runtime.GOOS == "netbsd" {
+    cnf.Configpath = prefix + cnf.Configpath
+  }
+
+  // コンフィグファイルがなければ、死ね
+  data, err := ioutil.ReadFile(cnf.Configpath)
+  if err != nil {
+    fmt.Println("confif.jsonを開けられません：", err)
+    return cnf, errors.New(
+      "コンフィグファイルは " + cnf.Configpath + " に創作して下さい。",
+    )
+  }
+
+  var payload map[string]interface{}
+  json.Unmarshal(data, &payload)
+  if payload["webpath"] == nil {
+    return cnf, errors.New("「webpath」の値が設置していません。")
+  }
+  if payload["domain"] == nil {
+    return cnf, errors.New("「domain」の値が設置していません。")
+  }
+  if payload["ip"] == nil {
+    return cnf, errors.New("「ip」の値が設置していません。")
+  }
+  if _, err := os.Stat(payload["webpath"].(string)); err != nil {
+    fmt.Printf("%v\n", err)
+    return cnf, errors.New(
+      "mkdiorコマンドをつかって、 " + payload["webpath"].(string),
+    )
+  }
+  cnf.Webpath = payload["webpath"].(string) // データパス
+  cnf.Domain = payload["domain"].(string) // ドメイン名
+  cnf.IP = payload["ip"].(string) // IP
+  payload = nil // もういらなくなった
+
+  return cnf, nil
+}

src/getpage.go

@@ -0,0 +1,97 @@
+package src
+
+import (
+  "os"
+  "fmt"
+  "net/http"
+  "io"
+  "regexp"
+  "strings"
+
+  "golang.org/x/text/encoding/japanese"
+  "golang.org/x/text/transform"
+)
+
+// URLでパラメートル（?、=等）がある場合
+func Stripurl (url string) string {
+  res := strings.ReplaceAll(url, "?", "")
+  res = strings.ReplaceAll(res, "=", "")
+  return res
+}
+
+func Getpage (url string, path string) {
+  // ページを読み込む
+  curl, err := http.Get(url)
+  if err != nil {
+    fmt.Println("CURLエラー：", err)
+    return
+  }
+  // ソフトの終了する時に実行する
+  defer curl.Body.Close()
+
+  // ページの内容を読み込む
+  body, err2 := io.ReadAll(curl.Body)
+  if err2 != nil {
+    fmt.Println("読込エラー：", err2)
+    return
+  }
+
+  // Content-TypeヘッダーはUTF-8又は駄目のエンコーディングかの確認
+  checkJis := `(?i)<meta.*?charset=(["']?)shift[_-]?jis`
+  jisRegex, errr := regexp.Compile(checkJis)
+  if errr != nil {
+    fmt.Println(errr)
+    return
+  }
+
+  checkEuc := `(?i)<meta.*?charset=(["']?)euc[_-]?jp`
+  eucRegex, erre := regexp.Compile(checkEuc)
+  if erre != nil {
+    fmt.Println(erre)
+    return
+  }
+
+  // 文字エンコーディングを変換する
+  if jisRegex.Match(body) {
+    shiftJISDecoder := japanese.ShiftJIS.NewDecoder()
+    utf8Reader := transform.NewReader(
+      strings.NewReader(string(body)),
+      shiftJISDecoder,
+    )
+    utf8Body, err3 := io.ReadAll(utf8Reader)
+    if err3 != nil {
+      fmt.Println("文字エンコーディング変換エラー：", err3)
+      return
+    }
+
+    body = utf8Body
+  } else if eucRegex.Match(body) {
+    eucJPDecoder := japanese.EUCJP.NewDecoder()
+    utf8Reader := transform.NewReader(
+      strings.NewReader(string(body)),
+      eucJPDecoder,
+    )
+    utf8Body, err3 := io.ReadAll(utf8Reader)
+    if err3 != nil {
+      fmt.Println("文字エンコーディング変換エラー：", err3)
+      return
+    }
+
+    body = utf8Body
+  }
+
+  // 空index.htmlファイルを創作する
+  fn, err4 := os.Create(path + "/index.html")
+  if err4 != nil {
+    fmt.Println("ファイルの創作エラー：", err4)
+    return
+  }
+  // ソフトの終了する時に実行する
+  defer fn.Close()
+
+  // あのindex.htmlファイルに内容をそのまま書き込む
+  _, err5 := fn.WriteString(string(body))
+  if err5 != nil {
+    fmt.Println("ファイル書込エラー：", err5)
+  }
+}

src/mime.go

@@ -1,4 +1,4 @@
-package main
+package src
 
 func getmime () map[string]string {
   return map[string]string {

src/prep.go

@@ -1,4 +1,4 @@
-package main
+package src
 
 import (
   "os"
@@ -9,12 +9,14 @@ import (
 )
 
 // HTTPかHTTPSの確認
-func checkprefix (url string) bool {
-  return strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")
+func Checkprefix (url string) bool {
+  return strings.HasPrefix(
+    url, "http://") || strings.HasPrefix(url, "https://",
+  )
 }
 
 // ページは既に存在するの？
-func checkexist (url string, prefix string) []string {
+func Checkexist (url string, prefix string) []string {
   res, err := filepath.Glob(prefix + "/archive/*" + url2path(url))
   if err != nil {
     fmt.Println("Err:", err)
@@ -39,7 +41,7 @@ func url2path (url string) string {
 }
 
 // 必要なフォルダの創作
-func mkdirs (url string, prefix string) string {
+func Mkdirs (url string, prefix string) string {
   rep := url2path(url)
   t := time.Now().Unix()
 

src/scanpage.go

@@ -1,4 +1,4 @@
-package main
+package src
 
 import (
   "os"
@@ -12,40 +12,49 @@ import (
   "path/filepath"
 )
 
-func scanpage (path string, domain string, thisdomain string) error {
+func Scanpage (path string, domain string, thisdomain string) error {
   // 先に保存したページを読み込む
   fn, err := os.ReadFile(path + "/index.html")
-  if err != nil {
-    return err
-  }
+  if err != nil { return err }
 
   // 要らないタグを削除
-  var script = regexp.MustCompile(`(<script.*</script>)`).ReplaceAllString(string(fn), "")
-  var noscript = regexp.MustCompile(`(<noscript.*</noscript>)`).ReplaceAllString(string(script), "")
-  var audio = regexp.MustCompile(`(<audio.*</audio>)`).ReplaceAllString(string(noscript), "")
-  var video = regexp.MustCompile(`(<video.*</video>)`).ReplaceAllString(string(audio), "")
-  var iframe = regexp.MustCompile(`(<iframe.*</iframe>)`).ReplaceAllString(string(video), "")
+  var script = regexp.MustCompile(
+    `(<script.*</script>)`).ReplaceAllString(string(fn), "",
+  )
+  var noscript = regexp.MustCompile(
+    `(<noscript.*</noscript>)`).ReplaceAllString(string(script), "",
+  )
+  var audio = regexp.MustCompile(
+    `(<audio.*</audio>)`).ReplaceAllString(string(noscript), "",
+  )
+  var video = regexp.MustCompile(
+    `(<video.*</video>)`).ReplaceAllString(string(audio), "",
+  )
+  var iframe = regexp.MustCompile(
+    `(<iframe.*</iframe>)`).ReplaceAllString(string(video), "",
+  )
   // 追加ダウンロード＋ローカル化
-  var ass = regexp.MustCompile(`(<img.*src=['"]|<meta.*content=['"]|<link.*href=['"])(.*\.)(png|webp|jpg|jpeg|gif|css|js|ico|svg|ttf|woff2)(\?[^'"]*)?`)
+  var ass = regexp.MustCompile(
+    // ルールに違反けど、長いからしょうがない・・・
+    `(<img.*src=['"]|<meta.*content=['"]|<link.*href=['"])(.*\.)(png|webp|jpg|jpeg|gif|css|js|ico|svg|ttf|woff2)(\?[^'"]*)?`,
+  )
 
   // 必要であれば、ページ内のURLを修正
   spath := "static/"
-  if !strings.HasSuffix(path, "/") {
-    spath = "/" + spath
-  }
+  if !strings.HasSuffix(path, "/") { spath = "/" + spath }
   spath = path + spath
 
   // また、追加ダウンロードのファイルに上記のフォルダを創作
   err = os.Mkdir(spath, 0755)
-  if err != nil {
-    return err
-  }
+  if err != nil { return err }
 
   repmap := make(map[string]string)
 
   for _, cssx := range ass.FindAllString(iframe, -1) {
     // ページ内のURLを受け取る
-    s := regexp.MustCompile(`(.*src=['"]|.*content=['"]|.*href=['"])`).Split(cssx, -1)
+    s := regexp.MustCompile(
+      `(.*src=['"]|.*content=['"]|.*href=['"])`).Split(cssx, -1,
+    )
     ss := regexp.MustCompile(`(['"].*)`).Split(s[1], -1)
 
     ogurl := ss[0] // 変わる前に元のURLを保存して
@@ -60,43 +69,36 @@ func scanpage (path string, domain string, thisdomain string) error {
     filename := fss[len(fss)-1]
 
     // httpかhttpsで始まる場合
-    if strings.HasPrefix(ss[0], "http://") || strings.HasPrefix(ss[0], "https://") {
+    if strings.HasPrefix(ss[0], "http://") || 
+       strings.HasPrefix(ss[0], "https://") {
       assdom = fss[2]
     }
 
     // フォルダの創作
     asspath := path + "/static/" + assdom
     err = os.MkdirAll(asspath, 0755)
-    if err != nil { // 出来なければ、死ね
-      return err
-    }
+    // 出来なければ、死ね
+    if err != nil { return err }
 
-    if filename == "" { // ファイル名がなければ、次に値にスキップしてね
-      continue
-    }
+    // ファイル名がなければ、次に値にスキップしてね
+    if filename == "" { continue }
 
-    if strings.HasPrefix(ss[0], "http://") || strings.HasPrefix(ss[0], "https://") { // httpかhttpsで始まったら、ダウンロードだけしよう
+    // httpかhttpsで始まったら、ダウンロードだけしよう
+    if strings.HasPrefix(ss[0], "http://") ||
+       strings.HasPrefix(ss[0], "https://") {
       err = dlres(ss[0], filepath.Join(asspath, filename))
-      if err != nil { // 出来なければ、死ね
-        return err
-      }
-    } else { // ローカルファイルなら、ちょっと変更は必要となるかしら
+      if err != nil { return err }
+    } else {
+      // ローカルファイルなら、ちょっと変更は必要となるかしら
       u, err := url.Parse(domain)
-      if err != nil { // 出来なければ、死ね
-        return err
-      }
+      if err != nil { return err }
 
       rel, err := url.Parse(ss[0])
-      if err != nil { // 出来なければ、死ね
-        return err
-      }
+      if err != nil { return err }
 
       af := u.ResolveReference(rel).String()
-
       err = dlres(af, filepath.Join(asspath, filename))
-      if err != nil { // 出来なければ、死ね
-        return err
-      }
+      if err != nil { return err }
     }
 
     repmap[ogurl] = filepath.Join("/static", assdom, filename)
@@ -104,7 +106,7 @@ func scanpage (path string, domain string, thisdomain string) error {
       repmap[ogurl] = filepath.Join("/static", filename)
     }
 
-    if err != nil { // 出来なければ、死ね
+    if err != nil {
       fmt.Println(err)
       return errors.New("ダウンロードに失敗：")
     }
@@ -118,12 +120,13 @@ func scanpage (path string, domain string, thisdomain string) error {
 
   // index.htmlファイルを更新する
   err = os.WriteFile(path + "/index.html", []byte(iframe), 0644)
-  if err != nil { // 出来なければ、死ね
+  if err != nil {
     fmt.Println(err)
     return errors.New("書込に失敗")
   }
 
-  return nil // エラーが出なかったから、返すのは不要
+  // エラーが出なかったから、返すのは不要
+  return nil
 }
 
 // 画像、JS、CSS等ファイルのURLでパラメートルがある場合
@@ -141,12 +144,11 @@ func stripver (durl string) string {
 func dlres (durl string, dest string) error {
   // ダウンロード
   res, err := http.Get(durl)
-  if err != nil {
-    return err
-  }
+  if err != nil { return err }
   defer res.Body.Close()
 
-  dest = stripver(dest) // URLでパラメートルがあれば、消す
+  // URLでパラメートルがあれば、消す
+  dest = stripver(dest)
 
   // MIMEタイプを確認
   ct := res.Header.Get("Content-Type")
@@ -159,16 +161,12 @@ func dlres (durl string, dest string) error {
 
   // ファイルを作成
   f, err := os.Create(dest)
-  if err != nil {
-    return err
-  }
+  if err != nil { return err }
   defer f.Close()
 
   // ファイルを書き込む
   _, err = io.Copy(f, res.Body)
-  if err != nil {
-    return err
-  }
+  if err != nil { return err }
 
   return nil
 }

src/srv.go

@@ -0,0 +1,291 @@
+package src
+
+import (
+  "text/template"
+  "fmt"
+  "net/http"
+  "strings"
+  "strconv"
+  "time"
+  "os"
+  "encoding/json"
+
+  "gitler.moe/suwako/hozonsite/common"
+  "gitler.moe/suwako/goliblocale"
+)
+
+type (
+  Page struct {
+    Err, Lan, Ver, Ves, Url, Body string
+    i18n map[string]string
+    Ext []Exist // 既に存在する場合
+  }
+  Stat struct { // APIのみ
+    Url, Ver string
+  }
+  Exist struct {
+    Date, Url string
+  }
+)
+
+var ftmpl []string
+var data *Page
+
+func (p Page) T (key string) string {
+  return p.i18n[key]
+}
+
+// 言語設定、デフォルト＝ja
+func initloc (r *http.Request) string {
+  supportedLanguages := map[string]bool{
+    "ja": true,
+    "en": true,
+  }
+
+  cookie, err := r.Cookie("lang")
+  if err != nil {
+    return "ja"
+  }
+
+  if _, ok := supportedLanguages[cookie.Value]; ok {
+    return cookie.Value
+  } else {
+    return "ja"
+  }
+}
+
+func tspath (p string) string {
+  pc := strings.Split(p, "/")
+
+  for i := len(pc) - 1; i >= 0; i-- {
+    if _, err := strconv.Atoi(pc[i]); err == nil {
+      return pc[i]
+    }
+  }
+
+  return ""
+}
+
+func handleStatic(path string, cnf Config, w http.ResponseWriter, r *http.Request) {
+    if !strings.HasSuffix(path, ".css") &&
+       !strings.HasSuffix(path, ".png") &&
+       !strings.HasSuffix(path, ".jpeg") &&
+       !strings.HasSuffix(path, ".jpg") &&
+       !strings.HasSuffix(path, ".webm") &&
+       !strings.HasSuffix(path, ".gif") &&
+       !strings.HasSuffix(path, ".js") {
+    http.NotFound(w, r)
+    return
+  }
+
+  fpath := cnf.Datapath + "/archive/" + path
+  http.ServeFile(w, r, fpath)
+}
+
+func handlePost(w http.ResponseWriter, r *http.Request, cnf Config) {
+  err := r.ParseForm()
+  if err != nil {
+    fmt.Println(err)
+    http.Redirect(w, r, "/", http.StatusSeeOther)
+    return
+  }
+
+  // 言語変更
+  if lang := r.PostFormValue("lang"); lang != "" {
+    http.SetCookie(
+      w,
+      &http.Cookie{Name: "lang", Value: lang, MaxAge: 31536000, Path: "/"},
+    )
+    http.Redirect(w, r, "/", http.StatusSeeOther)
+    return
+  }
+
+  var exist []string
+  langu := initloc(r)
+  i18n, err := goliblocale.GetLocale(cnf.Webpath + "/locale/" + langu)
+  if err != nil {
+    fmt.Printf("liblocaleエラー：%v", err)
+    return
+  }
+
+  if r.PostForm.Get("hozonsite") == "" {
+    data.Err = i18n["errfusei"]
+    ftmpl[0] = cnf.Webpath + "/view/404.html"
+    return
+  }
+
+  url := r.PostForm.Get("hozonsite")
+  // HTTPかHTTPSじゃない場合
+  if !Checkprefix(url) {
+    data.Err = i18n["errfuseiurl"]
+    ftmpl[0] = cnf.Webpath + "/view/404.html"
+    return
+  }
+
+  eurl := Stripurl(url)
+  exist = Checkexist(eurl, cnf.Datapath)
+  if len(exist) == 0 || r.PostForm.Get("agree") == "1" {
+    path := Mkdirs(eurl, cnf.Datapath)
+    Getpage(url, path)
+    Scanpage(path, eurl, cnf.Datapath)
+    http.Redirect(
+      w,
+      r,
+      cnf.Domain + strings.Replace(path, cnf.Datapath, "", 1),
+      http.StatusSeeOther,
+    )
+    return
+  }
+
+  ftmpl[0] = cnf.Webpath + "/view/check.html"
+  data.Url = url
+  var existing []Exist
+  e := Exist{}
+  for _, ex := range exist {
+    ti, err := strconv.ParseInt(tspath(ex), 10, 64)
+    if err != nil {
+      fmt.Println(err)
+      http.Redirect(w, r, "/", http.StatusSeeOther)
+      return
+    }
+
+    t := time.Unix(ti, 0)
+    e.Date = t.Format("2006年01月02日 15:04:05")
+    e.Url = strings.Replace(ex, cnf.Datapath, cnf.Domain, 1)
+    existing = append(existing, e)
+  }
+
+  data.Ext = existing
+}
+
+// ホームページ
+func siteHandler (cnf Config) func (http.ResponseWriter, *http.Request) {
+  return func (w http.ResponseWriter, r *http.Request) {
+    ftmpl = []string{
+      cnf.Webpath + "/view/index.html",
+      cnf.Webpath + "/view/header.html",
+      cnf.Webpath + "/view/footer.html",
+    }
+
+    version := common.GetVersion()
+    data = &Page{
+      Ver: version,
+      Ves: strings.ReplaceAll(version, ".", ""),
+    }
+
+    lang := initloc(r)
+    data.Lan = lang
+
+    i18n, err := goliblocale.GetLocale(cnf.Webpath + "/locale/" + lang)
+    if err != nil {
+      fmt.Printf("liblocaleエラー：%v", err)
+      return
+    }
+    data.i18n = i18n
+    ftmpl[0] = cnf.Webpath + "/view/index.html"
+    tmpl := template.Must(template.ParseFiles(ftmpl[0], ftmpl[1], ftmpl[2]))
+
+    if r.Method == "POST" {
+      handlePost(w, r, cnf)
+    }
+
+    tmpl = template.Must(template.ParseFiles(ftmpl[0], ftmpl[1], ftmpl[2]))
+    tmpl.Execute(w, data)
+  }
+}
+
+// /api TODO
+func apiHandler (cnf Config) func (http.ResponseWriter, *http.Request) {
+  return func (w http.ResponseWriter, r *http.Request) {
+    w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+    w.WriteHeader(200)
+    version := common.GetVersion()
+
+    buf, _ := json.MarshalIndent(
+      &Stat{Url: cnf.Domain, Ver: version},
+      "",
+      "  ",
+    )
+    _, _ = w.Write(buf)
+  }
+}
+
+// /archive
+func archiveHandler (cnf Config) func (http.ResponseWriter, *http.Request) {
+  return func (w http.ResponseWriter, r *http.Request) {
+    version := common.GetVersion()
+
+    ftmpl := []string{
+      cnf.Webpath + "/view/index.html",
+      cnf.Webpath + "/view/header.html",
+      cnf.Webpath + "/view/footer.html",
+    }
+
+    data := &Page{Ver: version, Ves: strings.ReplaceAll(version, ".", "")}
+    lang := initloc(r)
+    data.Lan = lang
+
+    i18n, err := goliblocale.GetLocale(cnf.Webpath + "/locale/" + lang)
+    if err != nil {
+      fmt.Printf("liblocaleエラー：%v", err)
+      return
+    }
+    data.i18n = i18n
+    ftmpl[0] = cnf.Webpath + "/view/index.html"
+    tmpl := template.Must(template.ParseFiles(ftmpl[0], ftmpl[1], ftmpl[2]))
+    path := strings.TrimPrefix(r.URL.Path, "/archive/")
+
+    if strings.Contains(path, "/static/") {
+      handleStatic(path, cnf, w, r)
+      return
+    }
+
+    pth := r.URL.Path
+    if !strings.HasSuffix(pth, "/") &&
+       !strings.HasSuffix(pth, "index.html") {
+      pth += "/index.html"
+    } else if strings.HasSuffix(pth, "/") &&
+              !strings.HasSuffix(pth, "index.html") {
+      pth += "index.html"
+    }
+
+    file := cnf.Datapath + pth
+    if _, err := os.Stat(file); os.IsNotExist(err) {
+      http.Redirect(w, r, "/404", http.StatusSeeOther)
+      return
+    }
+
+    bdy, err := os.ReadFile(file)
+    if err != nil {
+      http.Redirect(w, r, "/404", http.StatusSeeOther)
+      return
+    }
+
+    data.Body = string(bdy)
+    tmpl = template.Must(
+      template.ParseFiles(cnf.Webpath + "/view/archive.html"),
+    )
+    tmpl.Execute(w, data)
+    data = nil
+  }
+}
+
+// サーバー
+func Serv (cnf Config, port int) {
+  http.Handle(
+    "/static/",
+    http.StripPrefix("/static/",
+    http.FileServer(http.Dir(cnf.Webpath + "/static"))),
+  )
+
+  http.HandleFunc("/api/", apiHandler(cnf))
+  http.HandleFunc("/archive/", archiveHandler(cnf))
+  http.HandleFunc("/", siteHandler(cnf))
+
+  fmt.Println(fmt.Sprint(
+    "http://" + cnf.IP + ":",
+    port,
+    " でサーバーを実行中。終了するには、CTRL+Cを押して下さい。"),
+  )
+  http.ListenAndServe(fmt.Sprint(cnf.IP + ":", port), nil)
+}

srv.go

@@ -1,209 +0,0 @@
-package main
-
-import (
-  "text/template"
-  "fmt"
-  "net/http"
-  "strings"
-  "strconv"
-  "time"
-  "os"
-  "encoding/json"
-  "gitler.moe/suwako/goliblocale"
-)
-
-type (
-  Page struct {
-    Err, Lan, Ver, Ves, Url, Body string
-    i18n map[string]string
-    Ext []Exist // 既に存在する場合
-  }
-  Stat struct { // APIのみ
-    Url, Ver string
-  }
-  Exist struct {
-    Date, Url string
-  }
-)
-
-func (p Page) T (key string) string {
-  return p.i18n[key]
-}
-
-// 日本語か英語 TODO：複数言語対応
-func initloc (r *http.Request) string {
-  cookie, err := r.Cookie("lang")
-  if err == nil && cookie.Value == "en" {
-    return "en"
-  }
-  return "ja"
-}
-
-func tspath (p string) string {
-  pc := strings.Split(p, "/")
-
-  for i := len(pc) - 1; i >= 0; i-- {
-    if _, err := strconv.Atoi(pc[i]); err == nil {
-      return pc[i]
-    }
-  }
-
-  return ""
-}
-
-// ホームページ
-func siteHandler (cnf Config) func (http.ResponseWriter, *http.Request) {
-  return func (w http.ResponseWriter, r *http.Request) {
-    ftmpl := []string{cnf.webpath + "/view/index.html", cnf.webpath + "/view/header.html", cnf.webpath + "/view/footer.html"}
-    data := &Page{Ver: version, Ves: strings.ReplaceAll(version, ".", "")}
-
-    lang := initloc(r)
-    data.Lan = lang
-
-    i18n, err := goliblocale.GetLocale("locale/" + lang)
-    if err != nil {
-      fmt.Println("liblocaleエラー：%v", err)
-      return
-    }
-    data.i18n = i18n
-    ftmpl[0] = cnf.webpath + "/view/index.html"
-    tmpl := template.Must(template.ParseFiles(ftmpl[0], ftmpl[1], ftmpl[2]))
-
-    if r.Method == "POST" {
-      err := r.ParseForm()
-      if err != nil {
-        fmt.Println(err)
-        http.Redirect(w, r, "/", http.StatusSeeOther)
-        return
-      }
-
-      // 言語変更
-      if lang := r.PostFormValue("lang"); lang != "" {
-        http.SetCookie(w, &http.Cookie{Name: "lang", Value: lang, MaxAge: 31536000, Path: "/"})
-        http.Redirect(w, r, "/", http.StatusSeeOther)
-        return
-      }
-
-      var exist []string
-
-      if r.PostForm.Get("hozonsite") != "" {
-        url := r.PostForm.Get("hozonsite")
-        // HTTPかHTTPSじゃない場合
-        if !checkprefix(url) {
-          data.Err = i18n["errfuseiurl"]
-          ftmpl[0] = cnf.webpath + "/view/404.html"
-        } else {
-          eurl := stripurl(url)
-          exist = checkexist(eurl, cnf.datapath)
-          if len(exist) == 0 || r.PostForm.Get("agree") == "1" {
-            path := mkdirs(eurl, cnf.datapath)
-            getpage(url, path)
-            scanpage(path, eurl, cnf.datapath)
-            http.Redirect(w, r, cnf.domain + strings.Replace(path, cnf.datapath, "", 1), http.StatusSeeOther)
-          } else if len(exist) > 0 {
-            ftmpl[0] = cnf.webpath + "/view/check.html"
-            data.Url = url
-            var existing []Exist
-            e := Exist{}
-            for _, ex := range exist {
-              ti, err := strconv.ParseInt(tspath(ex), 10, 64)
-              if err != nil {
-                fmt.Println(err)
-                http.Redirect(w, r, "/", http.StatusSeeOther)
-                return
-              }
-
-              t := time.Unix(ti, 0)
-              e.Date = t.Format("2006年01月02日 15:04:05")
-              e.Url = strings.Replace(ex, cnf.datapath, cnf.domain, 1)
-              existing = append(existing, e)
-            }
-            data.Ext = existing
-          } else {
-            data.Err = i18n["errfusei"]
-            ftmpl[0] = cnf.webpath + "/view/404.html"
-          }
-        }
-      }
-    }
-
-    tmpl = template.Must(template.ParseFiles(ftmpl[0], ftmpl[1], ftmpl[2]))
-    tmpl.Execute(w, data)
-  }
-}
-
-// /api TODO
-func apiHandler (cnf Config) func (http.ResponseWriter, *http.Request) {
-  return func (w http.ResponseWriter, r *http.Request) {
-    w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-    w.WriteHeader(200)
-    buf, _ := json.MarshalIndent(&Stat{Url: cnf.domain, Ver: version}, "", "  ")
-    _, _ = w.Write(buf)
-  }
-}
-
-// /archive
-func archiveHandler (cnf Config) func (http.ResponseWriter, *http.Request) {
-  return func (w http.ResponseWriter, r *http.Request) {
-    ftmpl := []string{cnf.webpath + "/view/index.html", cnf.webpath + "/view/header.html", cnf.webpath + "/view/footer.html"}
-    data := &Page{Ver: version, Ves: strings.ReplaceAll(version, ".", "")}
-    lang := initloc(r)
-    data.Lan = lang
-
-    i18n, err := goliblocale.GetLocale("locale/" + lang)
-    if err != nil {
-      fmt.Println("liblocaleエラー：%v", err)
-      return
-    }
-    data.i18n = i18n
-    ftmpl[0] = cnf.webpath + "/view/index.html"
-    tmpl := template.Must(template.ParseFiles(ftmpl[0], ftmpl[1], ftmpl[2]))
-    path := strings.TrimPrefix(r.URL.Path, "/archive/")
-
-    if strings.Contains(path, "/static/") {
-      if !strings.HasSuffix(path, ".css") && !strings.HasSuffix(path, ".png") && !strings.HasSuffix(path, ".jpeg") && !strings.HasSuffix(path, ".jpg") && !strings.HasSuffix(path, ".webm") && !strings.HasSuffix(path, ".gif") && !strings.HasSuffix(path, ".js") {
-        http.NotFound(w, r)
-        return
-      }
-
-      fpath := cnf.datapath + "/archive/" + path
-      http.ServeFile(w, r, fpath)
-    } else {
-      pth := r.URL.Path
-      if !strings.HasSuffix(pth, "/") && !strings.HasSuffix(pth, "index.html") {
-        pth += "/index.html"
-      } else if strings.HasSuffix(pth, "/") && !strings.HasSuffix(pth, "index.html") {
-        pth += "index.html"
-      }
-
-      file := cnf.datapath + pth
-      if _, err := os.Stat(file); os.IsNotExist(err) {
-        http.Redirect(w, r, "/404", http.StatusSeeOther)
-        return
-      }
-
-      bdy, err := os.ReadFile(file)
-      if err != nil {
-        http.Redirect(w, r, "/404", http.StatusSeeOther)
-        return
-      }
-
-      data.Body = string(bdy)
-      tmpl = template.Must(template.ParseFiles(cnf.webpath + "/view/archive.html"))
-      tmpl.Execute(w, data)
-      data = nil
-    }
-  }
-}
-
-// サーバー
-func serv (cnf Config, port int) {
-  http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
-
-  http.HandleFunc("/api/", apiHandler(cnf))
-  http.HandleFunc("/archive/", archiveHandler(cnf))
-  http.HandleFunc("/", siteHandler(cnf))
-
-  fmt.Println(fmt.Sprint("http://127.0.0.1:", port, " でサーバーを実行中。終了するには、CTRL+Cを押して下さい。"))
-  http.ListenAndServe(fmt.Sprint(":", port), nil)
-}

static/style.css

@@ -86,13 +86,10 @@ select, input.langchange {
 }
 
 .submit, .footer, h1 {
+  margin-top: 32px;
   text-align: center;
 }
 
 input.langchange {
   font-size: 24px;
 }
-
-.submit, .footer, h1 {
-  margin-top: 32px;
-}

view/header.html

@@ -24,7 +24,7 @@
             <option value="ja"{{if eq .Lan "ja"}} selected{{end}}>日本語</option>
             <option value="en"{{if eq .Lan "en"}} selected{{end}}>English</option>
           </select>
-          <input class="langchange" type="submit" name="chen" value="{{.T "langchange"}}" />
+          <input class="langchange" type="submit" name="langchange" value="{{.T "langchange"}}" />
         </div>
       </form>
       <hr />