fix import and module paths

This commit is contained in:
gutmet 2024-06-18 22:39:16 +02:00
parent 06e0960bde
commit 03caf453f5
6 changed files with 20 additions and 16 deletions

View File

@ -6,7 +6,7 @@ finstr is a bullshit-free image gallery generator. It produces pages according t
build build
======= =======
If you want to build the executable yourself, you need go1.11+ with module support. Checkout the repository and run 'go build cmd/finstr.go'. If you want to build the executable yourself, you need go1.14 or higher. Checkout the repository and run 'go build cmd/finstr.go'.
quick start quick start
===== =====
@ -18,7 +18,7 @@ Put the executable somewhere in your path, create a folder for your gallery, the
> finstr init > finstr init
``` ```
Put some .jpgs inside the img folder. Tag them by creating files with the same name but .tags suffix. Each line is a tag, then Put some .jpgs inside the img folder. Tag them by creating files with the same name but '.tags' suffix. Each line is a tag, then
``` ```
> finstr gen > finstr gen
@ -26,4 +26,4 @@ Put some .jpgs inside the img folder. Tag them by creating files with the same n
> firefox index.html > firefox index.html
``` ```
finstr has also been integrated into the static site generator [wombat](/wombat/about). finstr has also been integrated into the static site generator [wombat](/aw/wombat).

View File

@ -2,10 +2,11 @@ package main
import ( import (
"fmt" "fmt"
"git.gutmet.org/finstr.git"
"git.gutmet.org/finstr.git/initer"
goutil "git.gutmet.org/goutil.git/misc"
"os" "os"
"git.fireandbrimst.one/aw/finstr"
"git.fireandbrimst.one/aw/finstr/initer"
goutil "git.fireandbrimst.one/aw/goutil/misc"
) )
func main() { func main() {

View File

@ -2,8 +2,9 @@ package crop
import ( import (
"errors" "errors"
goutil "git.gutmet.org/goutil.git/misc"
"image" "image"
goutil "git.fireandbrimst.one/aw/goutil/misc"
) )
func boundInt(i, min, max int) int { func boundInt(i, min, max int) int {

View File

@ -5,10 +5,6 @@ import (
"errors" "errors"
"flag" "flag"
"fmt" "fmt"
"git.gutmet.org/finstr.git/crop"
"git.gutmet.org/finstr.git/initer"
"git.gutmet.org/go-resize.git"
goutil "git.gutmet.org/goutil.git/misc"
goimg "image" goimg "image"
"image/jpeg" "image/jpeg"
"net/url" "net/url"
@ -20,6 +16,11 @@ import (
"text/template" "text/template"
"time" "time"
"unicode" "unicode"
"git.fireandbrimst.one/aw/finstr/crop"
"git.fireandbrimst.one/aw/finstr/initer"
"git.fireandbrimst.one/aw/go-resize"
goutil "git.fireandbrimst.one/aw/goutil/misc"
) )
var dir string var dir string

6
go.mod
View File

@ -1,8 +1,8 @@
module git.gutmet.org/finstr.git module git.fireandbrimst.one/aw/finstr
go 1.14 go 1.14
require ( require (
git.gutmet.org/go-resize.git v0.0.0-20180221191011-83c6a9932646 git.fireandbrimst.one/aw/go-resize v0.0.0-20180221191011-83c6a9932646
git.gutmet.org/goutil.git v0.0.0-20201011110813-b9f7ae29b4e6 git.fireandbrimst.one/aw/goutil v0.0.0-20230304172414-ed46142b443c
) )

View File

@ -2,9 +2,10 @@ package initer
import ( import (
"flag" "flag"
goutil "git.gutmet.org/goutil.git/misc"
"os" "os"
"path/filepath" "path/filepath"
goutil "git.fireandbrimst.one/aw/goutil/misc"
) )
const htmlTemplate = `<!DOCTYPE html> const htmlTemplate = `<!DOCTYPE html>
@ -117,7 +118,7 @@ func Init(fl IniterFlags) error {
template = htmlTemplate template = htmlTemplate
} }
err = goutil.OptDo(err, func() error { return goutil.WriteFile(InitFlag(dir), style) }) err = goutil.OptDo(err, func() error { return goutil.WriteFile(InitFlag(dir), style) })
err = goutil.OptDo(err, func() error { return goutil.WriteFile(readme(dir), "Put your .jpgs and .tags here") }) err = goutil.OptDo(err, func() error { return goutil.WriteFile(readme(dir), "Put your .jpgs and .tags here\n") })
err = goutil.OptDo(err, func() error { return goutil.WriteFile(TemplateFile(dir), template) }) err = goutil.OptDo(err, func() error { return goutil.WriteFile(TemplateFile(dir), template) })
return err return err
} }