Renamed the module to codeberg.org/readeck/readeck

This project was never on github in the first place, so there's no
need to have yet another github namespace.
This commit is contained in:
Olivier Meunier
2021-03-20 14:53:56 +01:00
parent 2f59bd3854
commit 3c492df297
46 changed files with 98 additions and 96 deletions

View File

@@ -5,8 +5,8 @@ DATE := $(shell date -u +%Y-%m-%dT%H:%M:%S)
TAGS := omit_load_extension foreign_keys json1 fts5 secure_delete
BUILD_TAGS := $(TAGS)
VERSION_FLAGS := \
-X 'github.com/readeck/readeck/configs.version=$(VERSION)' \
-X 'github.com/readeck/readeck/configs.buildTimeStr=$(DATE)'
-X 'codeberg.org/readeck/readeck/configs.version=$(VERSION)' \
-X 'codeberg.org/readeck/readeck/configs.buildTimeStr=$(DATE)'
SITECONFIG_REPO=https://github.com/j0k3r/graby-site-config.git
SITECONFIG_CLONE=graby-site-config
@@ -40,7 +40,7 @@ clean:
# Launch the documentation
.PHONY: doc
doc:
@echo "Visit http://localhost:6060/pkg/github.com/readeck/readeck/?m=all"
@echo "Visit http://localhost:6060/pkg/codeberg.org/readeck/readeck/?m=all"
godoc
# Lint code

2
go.mod
View File

@@ -1,4 +1,4 @@
module github.com/readeck/readeck
module codeberg.org/readeck/readeck
go 1.16

View File

@@ -13,10 +13,10 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/readeck/readeck/configs"
"github.com/readeck/readeck/internal/auth/users"
"github.com/readeck/readeck/internal/db"
"github.com/readeck/readeck/pkg/extract/fftr"
"codeberg.org/readeck/readeck/configs"
"codeberg.org/readeck/readeck/internal/auth/users"
"codeberg.org/readeck/readeck/internal/db"
"codeberg.org/readeck/readeck/pkg/extract/fftr"
)
var rootCmd = &cobra.Command{

View File

@@ -6,14 +6,14 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/readeck/readeck/configs"
"github.com/readeck/readeck/internal/assets"
"github.com/readeck/readeck/internal/auth/signin"
"github.com/readeck/readeck/internal/bookmarks"
"github.com/readeck/readeck/internal/cookbook"
"github.com/readeck/readeck/internal/dashboard"
"github.com/readeck/readeck/internal/profile"
"github.com/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/configs"
"codeberg.org/readeck/readeck/internal/assets"
"codeberg.org/readeck/readeck/internal/auth/signin"
"codeberg.org/readeck/readeck/internal/bookmarks"
"codeberg.org/readeck/readeck/internal/cookbook"
"codeberg.org/readeck/readeck/internal/dashboard"
"codeberg.org/readeck/readeck/internal/profile"
"codeberg.org/readeck/readeck/internal/server"
)
func init() {

View File

@@ -13,9 +13,9 @@ import (
"github.com/go-chi/chi/v5"
"github.com/readeck/readeck/assets"
"github.com/readeck/readeck/configs"
"github.com/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/assets"
"codeberg.org/readeck/readeck/configs"
"codeberg.org/readeck/readeck/internal/server"
)
var (

View File

@@ -6,8 +6,8 @@ import (
"github.com/go-chi/chi/v5"
"github.com/readeck/readeck/configs"
"github.com/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/configs"
"codeberg.org/readeck/readeck/internal/server"
)
const svgGradient = `<?xml version="1.0" encoding="UTF-8"?>` +

View File

@@ -7,7 +7,7 @@ import (
"github.com/doug-martin/goqu/v9"
"github.com/readeck/readeck/internal/auth/users"
"codeberg.org/readeck/readeck/internal/auth/users"
)
// BasicAuthProvider handles basic HTTP authentication method

View File

@@ -6,8 +6,8 @@ import (
"github.com/doug-martin/goqu/v9"
"github.com/gorilla/sessions"
"github.com/readeck/readeck/configs"
"github.com/readeck/readeck/internal/auth/users"
"codeberg.org/readeck/readeck/configs"
"codeberg.org/readeck/readeck/internal/auth/users"
)
// SessionAuthProvider is the last authentication provider.

View File

@@ -5,7 +5,7 @@ import (
"net/http"
"strings"
"github.com/readeck/readeck/internal/auth/tokens"
"codeberg.org/readeck/readeck/internal/auth/tokens"
)
// TokenAuthProvider handles authentication using a bearer token

View File

@@ -4,7 +4,7 @@ import (
"context"
"net/http"
"github.com/readeck/readeck/internal/auth/users"
"codeberg.org/readeck/readeck/internal/auth/users"
)
type ctxKeyProvider struct{}

View File

@@ -6,10 +6,10 @@ import (
"github.com/doug-martin/goqu/v9"
"github.com/go-chi/chi/v5"
"github.com/readeck/readeck/internal/auth/tokens"
"github.com/readeck/readeck/internal/auth/users"
"github.com/readeck/readeck/internal/server"
"github.com/readeck/readeck/pkg/form"
"codeberg.org/readeck/readeck/internal/auth/tokens"
"codeberg.org/readeck/readeck/internal/auth/users"
"codeberg.org/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/pkg/form"
)
type authAPI struct {

View File

@@ -7,9 +7,9 @@ import (
"github.com/doug-martin/goqu/v9"
"github.com/go-chi/chi/v5"
"github.com/readeck/readeck/internal/auth/users"
"github.com/readeck/readeck/internal/server"
"github.com/readeck/readeck/pkg/form"
"codeberg.org/readeck/readeck/internal/auth/users"
"codeberg.org/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/pkg/form"
)
// SetupRoutes mounts the routes for the auth domain.

View File

@@ -5,7 +5,8 @@ import (
"fmt"
"github.com/cristalhq/jwt/v3"
"github.com/readeck/readeck/configs"
"codeberg.org/readeck/readeck/configs"
)
// NewJwtToken returns a new JWT token instance using

View File

@@ -7,8 +7,9 @@ import (
"github.com/doug-martin/goqu/v9"
"github.com/lithammer/shortuuid/v3"
"github.com/readeck/readeck/internal/auth/users"
"github.com/readeck/readeck/internal/db"
"codeberg.org/readeck/readeck/internal/auth/users"
"codeberg.org/readeck/readeck/internal/db"
)
const (

View File

@@ -9,7 +9,7 @@ import (
"github.com/doug-martin/goqu/v9"
"github.com/hlandau/passlib"
"github.com/readeck/readeck/internal/db"
"codeberg.org/readeck/readeck/internal/db"
)
func init() {

View File

@@ -20,11 +20,11 @@ import (
log "github.com/sirupsen/logrus"
"github.com/thoas/go-funk"
"github.com/readeck/readeck/configs"
"github.com/readeck/readeck/internal/auth"
"github.com/readeck/readeck/internal/server"
"github.com/readeck/readeck/pkg/form"
"github.com/readeck/readeck/pkg/zipfs"
"codeberg.org/readeck/readeck/configs"
"codeberg.org/readeck/readeck/internal/auth"
"codeberg.org/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/pkg/form"
"codeberg.org/readeck/readeck/pkg/zipfs"
)
var validSchemes = map[string]bool{"http": true, "https": true}

View File

@@ -14,9 +14,9 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/sync/semaphore"
"github.com/readeck/readeck/pkg/archiver"
"github.com/readeck/readeck/pkg/extract"
"github.com/readeck/readeck/pkg/img"
"codeberg.org/readeck/readeck/pkg/archiver"
"codeberg.org/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/img"
)
const (

View File

@@ -7,8 +7,8 @@ import (
"github.com/go-chi/chi/v5"
"github.com/readeck/readeck/internal/server"
"github.com/readeck/readeck/pkg/zipfs"
"codeberg.org/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/pkg/zipfs"
)
type ctxKey struct{}

View File

@@ -14,11 +14,11 @@ import (
"github.com/gammazero/workerpool"
log "github.com/sirupsen/logrus"
"github.com/readeck/readeck/pkg/archiver"
"github.com/readeck/readeck/pkg/extract"
"github.com/readeck/readeck/pkg/extract/contents"
"github.com/readeck/readeck/pkg/extract/fftr"
"github.com/readeck/readeck/pkg/extract/meta"
"codeberg.org/readeck/readeck/pkg/archiver"
"codeberg.org/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/extract/contents"
"codeberg.org/readeck/readeck/pkg/extract/fftr"
"codeberg.org/readeck/readeck/pkg/extract/meta"
)
var workerPool *workerpool.WorkerPool

View File

@@ -20,8 +20,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/weppos/publicsuffix-go/publicsuffix"
"github.com/readeck/readeck/configs"
"github.com/readeck/readeck/internal/db"
"codeberg.org/readeck/readeck/configs"
"codeberg.org/readeck/readeck/internal/db"
)
// BookmarkState is the current bookmark state

View File

@@ -8,8 +8,8 @@ import (
"github.com/go-chi/chi/v5"
"github.com/readeck/readeck/internal/server"
"github.com/readeck/readeck/pkg/form"
"codeberg.org/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/pkg/form"
)
type bookmarkViews struct {

View File

@@ -11,11 +11,11 @@ import (
"github.com/go-chi/chi/v5"
log "github.com/sirupsen/logrus"
"github.com/readeck/readeck/internal/server"
"github.com/readeck/readeck/pkg/extract"
"github.com/readeck/readeck/pkg/extract/contents"
"github.com/readeck/readeck/pkg/extract/fftr"
"github.com/readeck/readeck/pkg/extract/meta"
"codeberg.org/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/extract/contents"
"codeberg.org/readeck/readeck/pkg/extract/fftr"
"codeberg.org/readeck/readeck/pkg/extract/meta"
)
// cookbookAPI is the base cookbook api router.

View File

@@ -1,7 +1,7 @@
package cookbook
import (
"github.com/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/internal/server"
)
// SetupRoutes mounts the routes for the cookbook domain.

View File

@@ -7,8 +7,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/readeck/readeck/pkg/archiver"
"github.com/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/archiver"
"codeberg.org/readeck/readeck/pkg/extract"
)
func archiveProcessor(m *extract.ProcessMessage, next extract.Processor) extract.Processor {

View File

@@ -3,7 +3,7 @@ package dashboard
import (
"net/http"
"github.com/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/internal/server"
)
// SetupRoutes mounts the routes for the auth domain.

View File

@@ -11,7 +11,7 @@ import (
"github.com/doug-martin/goqu/v9"
log "github.com/sirupsen/logrus"
"github.com/readeck/readeck/internal/db/migrations"
"codeberg.org/readeck/readeck/internal/db/migrations"
)
// Connector is an interface for a database connector.

View File

@@ -8,11 +8,11 @@ import (
"github.com/doug-martin/goqu/v9"
"github.com/go-chi/chi/v5"
"github.com/readeck/readeck/internal/auth"
"github.com/readeck/readeck/internal/auth/tokens"
"github.com/readeck/readeck/internal/auth/users"
"github.com/readeck/readeck/internal/server"
"github.com/readeck/readeck/pkg/form"
"codeberg.org/readeck/readeck/internal/auth"
"codeberg.org/readeck/readeck/internal/auth/tokens"
"codeberg.org/readeck/readeck/internal/auth/users"
"codeberg.org/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/pkg/form"
)
// profileAPI is the base settings API router.

View File

@@ -1,7 +1,7 @@
package profile
import (
"github.com/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/internal/server"
)
// SetupRoutes mounts the routes for the auth domain.

View File

@@ -7,10 +7,10 @@ import (
"github.com/doug-martin/goqu/v9"
"github.com/go-chi/chi/v5"
"github.com/readeck/readeck/internal/auth"
"github.com/readeck/readeck/internal/auth/tokens"
"github.com/readeck/readeck/internal/server"
"github.com/readeck/readeck/pkg/form"
"codeberg.org/readeck/readeck/internal/auth"
"codeberg.org/readeck/readeck/internal/auth/tokens"
"codeberg.org/readeck/readeck/internal/server"
"codeberg.org/readeck/readeck/pkg/form"
)
// profileViews is an HTTP handler for the user profile web views

View File

@@ -9,7 +9,7 @@ import (
"github.com/go-chi/chi/v5/middleware"
log "github.com/sirupsen/logrus"
"github.com/readeck/readeck/configs"
"codeberg.org/readeck/readeck/configs"
)
type httpLogFormatter struct{}

View File

@@ -7,8 +7,8 @@ import (
"github.com/gorilla/csrf"
"github.com/readeck/readeck/configs"
"github.com/readeck/readeck/internal/auth"
"codeberg.org/readeck/readeck/configs"
"codeberg.org/readeck/readeck/internal/auth"
)
const (

View File

@@ -8,7 +8,7 @@ import (
"net/url"
"strconv"
"github.com/readeck/readeck/pkg/form"
"codeberg.org/readeck/readeck/pkg/form"
)
type PaginationForm struct {

View File

@@ -8,7 +8,7 @@ import (
"sort"
"time"
"github.com/readeck/readeck/configs"
"codeberg.org/readeck/readeck/configs"
)
// Message is used by the server's Message() method.

View File

@@ -17,8 +17,8 @@ import (
"github.com/go-chi/chi/v5/middleware"
log "github.com/sirupsen/logrus"
"github.com/readeck/readeck/configs"
"github.com/readeck/readeck/internal/auth"
"codeberg.org/readeck/readeck/configs"
"codeberg.org/readeck/readeck/internal/auth"
)
// Server is a wrapper around chi router.

View File

@@ -8,7 +8,7 @@ import (
"github.com/gorilla/sessions"
"github.com/readeck/readeck/configs"
"codeberg.org/readeck/readeck/configs"
)
type ctxKeySession struct{}

View File

@@ -6,8 +6,8 @@ import (
"github.com/gorilla/csrf"
"github.com/readeck/readeck/assets"
"github.com/readeck/readeck/internal/xtemplate"
"codeberg.org/readeck/readeck/assets"
"codeberg.org/readeck/readeck/internal/xtemplate"
)
var xt *xtemplate.Xtemplate

View File

@@ -4,7 +4,7 @@ import (
"fmt"
"os"
"github.com/readeck/readeck/internal/app"
"codeberg.org/readeck/readeck/internal/app"
)
func main() {

View File

@@ -13,7 +13,7 @@ import (
"github.com/go-shiori/dom"
"github.com/go-shiori/go-readability"
"github.com/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/extract"
)
var (

View File

@@ -11,7 +11,7 @@ import (
"github.com/araddon/dateparse"
"github.com/go-shiori/dom"
"github.com/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/extract"
)
// LoadConfiguration will try to find a matching fftr configuration

View File

@@ -8,7 +8,7 @@ import (
"net/http"
"net/url"
"github.com/readeck/readeck/pkg/img"
"codeberg.org/readeck/readeck/pkg/img"
)
// NewRemoteImage loads an image and returns a new img.Image instance.

View File

@@ -14,7 +14,7 @@ import (
"github.com/antchfx/htmlquery"
"github.com/go-shiori/dom"
"github.com/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/extract"
)
var (

View File

@@ -11,7 +11,7 @@ import (
"github.com/araddon/dateparse"
"github.com/go-shiori/dom"
"github.com/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/extract"
)
var (

View File

@@ -17,7 +17,7 @@ import (
"github.com/jarcoal/httpmock"
"github.com/stretchr/testify/assert"
"github.com/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/extract"
)
func getFileContents(name string) []byte {

View File

@@ -11,7 +11,7 @@ import (
"github.com/antchfx/htmlquery"
"github.com/go-shiori/dom"
"github.com/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/extract"
)
// ExtractOembed is a processor that extracts the picture from the document

View File

@@ -3,7 +3,7 @@ package meta
import (
"net/url"
"github.com/readeck/readeck/pkg/extract"
"codeberg.org/readeck/readeck/pkg/extract"
)
// ExtractPicture is a processor that extracts the picture from the document

View File

@@ -17,7 +17,7 @@ import (
"regexp"
"strings"
"github.com/readeck/readeck/pkg/extract/fftr"
"codeberg.org/readeck/readeck/pkg/extract/fftr"
)
func main() {