aw/wombat
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to recent goutil split

Browse Source
This commit is contained in:
gutmet 2020-10-11 13:35:13 +02:00
parent b5eeade846
commit 7795d055b1
11 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blog/blog.go
View File

@ -3,7 +3,7 @@ package blog
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"git.gutmet.org/goutil.git" goutil "git.gutmet.org/goutil.git/misc"
. "git.gutmet.org/wombat.git/templatestructures" . "git.gutmet.org/wombat.git/templatestructures"
"math" "math"
"os" "os"

2
converter/converter.go
View File

@ -2,7 +2,7 @@ package converter
import ( import (
"fmt" "fmt"
"git.gutmet.org/goutil.git" goutil "git.gutmet.org/goutil.git/misc"
"github.com/russross/blackfriday/v2" "github.com/russross/blackfriday/v2"
"os" "os"
"sync" "sync"

2
gallery/gallery.go
View File

@ -4,7 +4,7 @@ import (
"flag" "flag"
"fmt" "fmt"
"git.gutmet.org/finstr.git" "git.gutmet.org/finstr.git"
"git.gutmet.org/goutil.git" goutil "git.gutmet.org/goutil.git/misc"
"path/filepath" "path/filepath"
) )

2
gallery/new.go
View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"flag" "flag"
finstr "git.gutmet.org/finstr.git/initer" finstr "git.gutmet.org/finstr.git/initer"
"git.gutmet.org/goutil.git" goutil "git.gutmet.org/goutil.git/misc"
) )
func New(fl finstr.IniterFlags) error { func New(fl finstr.IniterFlags) error {

7
generate/generate.go
View File

@ -3,7 +3,8 @@ package generate
import ( import (
"flag" "flag"
"fmt" "fmt"
"git.gutmet.org/goutil.git" "git.gutmet.org/goutil.git/copy"
goutil "git.gutmet.org/goutil.git/misc"
"git.gutmet.org/simpleserver.git" "git.gutmet.org/simpleserver.git"
"git.gutmet.org/wombat.git/blog" "git.gutmet.org/wombat.git/blog"
"git.gutmet.org/wombat.git/converter" "git.gutmet.org/wombat.git/converter"
@ -27,7 +28,7 @@ func clean() {
} }
func stage1() { func stage1() {
goutil.CopyDirsLinkFiles("stage0", "stage1") copy.CopyDirsLinkFiles("stage0", "stage1")
mdfiles := goutil.RecListFilesExt("stage1", ".md") mdfiles := goutil.RecListFilesExt("stage1", ".md")
htmlfrags := goutil.RecListFilesExt("stage1", ".html") htmlfrags := goutil.RecListFilesExt("stage1", ".html")
splitter.SplitAll(append(mdfiles, htmlfrags...)) splitter.SplitAll(append(mdfiles, htmlfrags...))
@ -43,7 +44,7 @@ func blogs() []string {
} }
func stage2() { func stage2() {
goutil.CopyDirsLinkFiles("stage1", "stage2") copy.CopyDirsLinkFiles("stage1", "stage2")
site.Generate() site.Generate()
for _, blogdir := range blogs() { for _, blogdir := range blogs() {
blog.Generate(blogdir) blog.Generate(blogdir)

10
go.mod
View File

@ -1,10 +1,12 @@
module git.gutmet.org/wombat.git module git.gutmet.org/wombat.git
go 1.14
require ( require (
git.gutmet.org/finstr.git v0.0.0-20190103161247-f1cd2d363522 git.gutmet.org/finstr.git v0.0.0-20201011113018-f6da72ffcf26
git.gutmet.org/goutil.git v0.0.0-20190727202444-1a369915ff2f git.gutmet.org/goutil.git v0.0.0-20201011110813-b9f7ae29b4e6
git.gutmet.org/simpleserver.git v0.0.0-20181209151100-b298451c1f40 git.gutmet.org/simpleserver.git v0.0.0-20201011112611-555b83d5de53
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.0.1 github.com/russross/blackfriday/v2 v2.0.1
github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd // indirect
) )

2
initer/initer.go
View File

@ -5,7 +5,7 @@ import (
"flag" "flag"
"fmt" "fmt"
finstr "git.gutmet.org/finstr.git/initer" finstr "git.gutmet.org/finstr.git/initer"
"git.gutmet.org/goutil.git" goutil "git.gutmet.org/goutil.git/misc"
"git.gutmet.org/wombat.git/gallery" "git.gutmet.org/wombat.git/gallery"
"os" "os"
"path/filepath" "path/filepath"

2
post/post.go
View File

@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"flag" "flag"
"fmt" "fmt"
"git.gutmet.org/goutil.git" goutil "git.gutmet.org/goutil.git/misc"
"git.gutmet.org/wombat.git/blog" "git.gutmet.org/wombat.git/blog"
gen "git.gutmet.org/wombat.git/generate" gen "git.gutmet.org/wombat.git/generate"
"git.gutmet.org/wombat.git/initer" "git.gutmet.org/wombat.git/initer"

2
site/site.go
View File

@ -4,7 +4,7 @@ import (
"bufio" "bufio"
"bytes" "bytes"
"fmt" "fmt"
"git.gutmet.org/goutil.git" goutil "git.gutmet.org/goutil.git/misc"
. "git.gutmet.org/wombat.git/templatestructures" . "git.gutmet.org/wombat.git/templatestructures"
"io/ioutil" "io/ioutil"
"os" "os"

2
splitter/splitter.go
View File

@ -4,7 +4,7 @@ import (
"bufio" "bufio"
"bytes" "bytes"
"fmt" "fmt"
"git.gutmet.org/goutil.git" goutil "git.gutmet.org/goutil.git/misc"
"os" "os"
"strings" "strings"
"sync" "sync"

2
wombat.go
View File

@ -2,7 +2,7 @@ package main
import ( import (
"fmt" "fmt"
"git.gutmet.org/goutil.git" goutil "git.gutmet.org/goutil.git/misc"
"git.gutmet.org/simpleserver.git" "git.gutmet.org/simpleserver.git"
"git.gutmet.org/wombat.git/gallery" "git.gutmet.org/wombat.git/gallery"
"git.gutmet.org/wombat.git/generate" "git.gutmet.org/wombat.git/generate"