fix import and module paths

This commit is contained in:
gutmet 2024-06-18 23:01:52 +02:00
parent 87d2fa096f
commit 3520a0b450
12 changed files with 45 additions and 38 deletions

View File

@ -13,8 +13,8 @@ import (
"text/template" "text/template"
"time" "time"
goutil "git.gutmet.org/goutil.git/misc" goutil "git.fireandbrimst.one/aw/goutil/misc"
. "git.gutmet.org/wombat.git/templatestructures" . "git.fireandbrimst.one/aw/wombat/templatestructures"
) )
const postsPerPage int = 5 const postsPerPage int = 5

View File

@ -2,10 +2,11 @@ package converter
import ( import (
"fmt" "fmt"
goutil "git.gutmet.org/goutil.git/misc"
"github.com/russross/blackfriday/v2"
"os" "os"
"sync" "sync"
goutil "git.fireandbrimst.one/aw/goutil/misc"
"github.com/russross/blackfriday/v2"
) )
func convert(f string) { func convert(f string) {

View File

@ -3,9 +3,10 @@ package gallery
import ( import (
"flag" "flag"
"fmt" "fmt"
"git.gutmet.org/finstr.git"
goutil "git.gutmet.org/goutil.git/misc"
"path/filepath" "path/filepath"
"git.fireandbrimst.one/aw/finstr"
goutil "git.fireandbrimst.one/aw/goutil/misc"
) )
const Prefix string = "photos" const Prefix string = "photos"

View File

@ -3,8 +3,9 @@ package gallery
import ( import (
"errors" "errors"
"flag" "flag"
finstr "git.gutmet.org/finstr.git/initer"
goutil "git.gutmet.org/goutil.git/misc" finstr "git.fireandbrimst.one/aw/finstr/initer"
goutil "git.fireandbrimst.one/aw/goutil/misc"
) )
func New(fl finstr.IniterFlags) error { func New(fl finstr.IniterFlags) error {

View File

@ -3,15 +3,16 @@ package generate
import ( import (
"flag" "flag"
"fmt" "fmt"
"git.gutmet.org/goutil.git/copy"
goutil "git.gutmet.org/goutil.git/misc"
"git.gutmet.org/simpleserver.git"
"git.gutmet.org/wombat.git/blog"
"git.gutmet.org/wombat.git/converter"
"git.gutmet.org/wombat.git/gallery"
"git.gutmet.org/wombat.git/site"
"git.gutmet.org/wombat.git/splitter"
"os" "os"
"git.fireandbrimst.one/aw/goutil/copy"
goutil "git.fireandbrimst.one/aw/goutil/misc"
"git.fireandbrimst.one/aw/simpleserver"
"git.fireandbrimst.one/aw/wombat/blog"
"git.fireandbrimst.one/aw/wombat/converter"
"git.fireandbrimst.one/aw/wombat/gallery"
"git.fireandbrimst.one/aw/wombat/site"
"git.fireandbrimst.one/aw/wombat/splitter"
) )
func removeAll(path string) { func removeAll(path string) {

8
go.mod
View File

@ -1,11 +1,11 @@
module git.gutmet.org/wombat.git module git.fireandbrimst.one/aw/wombat
go 1.14 go 1.14
require ( require (
git.gutmet.org/finstr.git v0.0.0-20210628072143-8f552a2440f5 git.fireandbrimst.one/aw/finstr v0.0.0-20240618203916-03caf453f551
git.gutmet.org/goutil.git v0.0.0-20201108182825-c19893df11f9 git.fireandbrimst.one/aw/goutil v0.0.0-20230304172414-ed46142b443c
git.gutmet.org/simpleserver.git v0.0.0-20201011112611-555b83d5de53 git.fireandbrimst.one/aw/simpleserver v0.0.0-20240618204754-ba16ff26e972
github.com/pmezard/go-difflib v1.0.0 // indirect 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 v1.0.0 // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect

View File

@ -7,9 +7,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
finstr "git.gutmet.org/finstr.git/initer" finstr "git.fireandbrimst.one/aw/finstr/initer"
goutil "git.gutmet.org/goutil.git/misc" goutil "git.fireandbrimst.one/aw/goutil/misc"
"git.gutmet.org/wombat.git/gallery" "git.fireandbrimst.one/aw/wombat/gallery"
) )
const ( const (

View File

@ -5,12 +5,13 @@ import (
"errors" "errors"
"flag" "flag"
"fmt" "fmt"
goutil "git.gutmet.org/goutil.git/misc"
gen "git.gutmet.org/wombat.git/generate"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"text/template" "text/template"
goutil "git.fireandbrimst.one/aw/goutil/misc"
gen "git.fireandbrimst.one/aw/wombat/generate"
) )
var pageStub string = `--- var pageStub string = `---

View File

@ -11,9 +11,9 @@ import (
"text/template" "text/template"
"time" "time"
goutil "git.gutmet.org/goutil.git/misc" goutil "git.fireandbrimst.one/aw/goutil/misc"
"git.gutmet.org/wombat.git/blog" "git.fireandbrimst.one/aw/wombat/blog"
gen "git.gutmet.org/wombat.git/generate" gen "git.fireandbrimst.one/aw/wombat/generate"
) )
const dateformat string = "2006-01-02" const dateformat string = "2006-01-02"

View File

@ -11,8 +11,8 @@ import (
"strings" "strings"
"text/template" "text/template"
goutil "git.gutmet.org/goutil.git/misc" goutil "git.fireandbrimst.one/aw/goutil/misc"
. "git.gutmet.org/wombat.git/templatestructures" . "git.fireandbrimst.one/aw/wombat/templatestructures"
) )
type metadata struct { type metadata struct {

View File

@ -4,10 +4,11 @@ import (
"bufio" "bufio"
"bytes" "bytes"
"fmt" "fmt"
goutil "git.gutmet.org/goutil.git/misc"
"os" "os"
"strings" "strings"
"sync" "sync"
goutil "git.fireandbrimst.one/aw/goutil/misc"
) )
func writeMetadata(filename string, metadata string) { func writeMetadata(filename string, metadata string) {

View File

@ -2,14 +2,15 @@ package main
import ( import (
"fmt" "fmt"
goutil "git.gutmet.org/goutil.git/misc"
"git.gutmet.org/simpleserver.git"
"git.gutmet.org/wombat.git/gallery"
"git.gutmet.org/wombat.git/generate"
"git.gutmet.org/wombat.git/initer"
"git.gutmet.org/wombat.git/page"
"git.gutmet.org/wombat.git/post"
"os" "os"
goutil "git.fireandbrimst.one/aw/goutil/misc"
"git.fireandbrimst.one/aw/simpleserver"
"git.fireandbrimst.one/aw/wombat/gallery"
"git.fireandbrimst.one/aw/wombat/generate"
"git.fireandbrimst.one/aw/wombat/initer"
"git.fireandbrimst.one/aw/wombat/page"
"git.fireandbrimst.one/aw/wombat/post"
) )
func serve(args []string) error { func serve(args []string) error {