moved internal packages to handler for more useful path logic.

Defacto2 · Sep 2, 2024 · a87c85d · a87c85d
1 parent aedff49
commit a87c85d
Show file tree

Hide file tree

Showing 33 changed files with 42 additions and 40 deletions.
diff --git a/handler/app/context.go b/handler/app/context.go
@@ -18,16 +18,16 @@ import (
 	"github.com/Defacto2/releaser/initialism"
 	"github.com/Defacto2/server/handler/app/internal/mfs"
 	"github.com/Defacto2/server/handler/app/internal/remote"
+	"github.com/Defacto2/server/handler/cache"
+	"github.com/Defacto2/server/handler/demozoo"
 	"github.com/Defacto2/server/handler/download"
+	"github.com/Defacto2/server/handler/pouet"
 	"github.com/Defacto2/server/handler/sess"
-	"github.com/Defacto2/server/internal/cache"
+	"github.com/Defacto2/server/handler/site"
+	"github.com/Defacto2/server/handler/sixteen"
 	"github.com/Defacto2/server/internal/config"
-	"github.com/Defacto2/server/internal/demozoo"
 	"github.com/Defacto2/server/internal/postgres"
 	"github.com/Defacto2/server/internal/postgres/models"
-	"github.com/Defacto2/server/internal/pouet"
-	"github.com/Defacto2/server/internal/site"
-	"github.com/Defacto2/server/internal/sixteen"
 	"github.com/Defacto2/server/internal/tags"
 	"github.com/Defacto2/server/model"
 	"github.com/google/uuid"

diff --git a/handler/app/dirs.go b/handler/app/dirs.go
@@ -23,9 +23,9 @@ import (
 	"github.com/Defacto2/server/handler/app/internal/mf"
 	"github.com/Defacto2/server/handler/app/internal/readme"
 	"github.com/Defacto2/server/handler/app/internal/str"
+	"github.com/Defacto2/server/handler/render"
 	"github.com/Defacto2/server/handler/sess"
 	"github.com/Defacto2/server/internal/postgres/models"
-	"github.com/Defacto2/server/internal/render"
 	"github.com/Defacto2/server/internal/tags"
 	"github.com/Defacto2/server/model"
 	"github.com/dustin/go-humanize"

diff --git a/handler/app/internal/mf/mf.go b/handler/app/internal/mf/mf.go
@@ -23,7 +23,7 @@ import (
 	"github.com/Defacto2/server/handler/app/internal/exts"
 	"github.com/Defacto2/server/handler/app/internal/readme"
 	"github.com/Defacto2/server/handler/app/internal/str"
-	"github.com/Defacto2/server/internal/jsdos/msdos"
+	"github.com/Defacto2/server/handler/jsdos/msdos"
 	"github.com/Defacto2/server/internal/postgres/models"
 	"github.com/Defacto2/server/internal/tags"
 	"github.com/Defacto2/server/model"

diff --git a/handler/app/internal/readme/readme.go b/handler/app/internal/readme/readme.go
@@ -15,8 +15,8 @@ import (
 	uni "unicode"
 
 	"github.com/Defacto2/magicnumber"
+	"github.com/Defacto2/server/handler/render"
 	"github.com/Defacto2/server/internal/postgres/models"
-	"github.com/Defacto2/server/internal/render"
 )
 
 // Suggest returns a suggested readme file name for the record.

diff --git a/handler/app/internal/remote/remote.go b/handler/app/internal/remote/remote.go
@@ -16,9 +16,9 @@ import (
 	"github.com/Defacto2/archive"
 	"github.com/Defacto2/helper"
 	"github.com/Defacto2/server/handler/app/internal/str"
-	"github.com/Defacto2/server/internal/demozoo"
+	"github.com/Defacto2/server/handler/demozoo"
+	"github.com/Defacto2/server/handler/pouet"
 	"github.com/Defacto2/server/internal/postgres/models"
-	"github.com/Defacto2/server/internal/pouet"
 	"github.com/Defacto2/server/model"
 	"github.com/labstack/echo/v4"
 	"github.com/volatiletech/null/v8"

diff --git a/handler/app/template.go b/handler/app/template.go
@@ -18,10 +18,10 @@ import (
 	"github.com/Defacto2/releaser/name"
 	"github.com/Defacto2/server/handler/app/internal/mf"
 	"github.com/Defacto2/server/handler/app/internal/str"
+	"github.com/Defacto2/server/handler/demozoo"
+	"github.com/Defacto2/server/handler/form"
+	"github.com/Defacto2/server/handler/pouet"
 	"github.com/Defacto2/server/internal/config"
-	"github.com/Defacto2/server/internal/demozoo"
-	"github.com/Defacto2/server/internal/form"
-	"github.com/Defacto2/server/internal/pouet"
 	"github.com/Defacto2/server/internal/tags"
 	"github.com/volatiletech/null/v8"
 )

diff --git a/internal/cache/cache.go → handler/cache/cache.go b/internal/cache/cache.go → handler/cache/cache.go
diff --git a/internal/cache/cache_test.go → handler/cache/cache_test.go b/internal/cache/cache_test.go → handler/cache/cache_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/Defacto2/helper"
-	"github.com/Defacto2/server/internal/cache"
+	"github.com/Defacto2/server/handler/cache"
 )
 
 func TestCache(t *testing.T) {

diff --git a/internal/demozoo/demozoo.go → handler/demozoo/demozoo.go b/internal/demozoo/demozoo.go → handler/demozoo/demozoo.go
@@ -34,8 +34,8 @@ var (
 
 const (
 	ProdURL = "https://demozoo.org/api/v1/productions/" // ProdURL is the base URL for the Demozoo production API.
-	Timeout = 10 * time.Second                          // HTTP client timeout, Demozoo replies can be slow.
 	Sanity  = 450000                                    // Sanity is to check the maximum permitted production ID.
+	Timeout = 10 * time.Second                          // HTTP client timeout, Demozoo replies can be slow.
 	firstID = 1                                         // firstID is the first production ID on Pouet.
 )
 

diff --git a/internal/demozoo/demozoo_test.go → handler/demozoo/demozoo_test.go b/internal/demozoo/demozoo_test.go → handler/demozoo/demozoo_test.go
@@ -3,7 +3,7 @@ package demozoo_test
 import (
 	"testing"
 
-	"github.com/Defacto2/server/internal/demozoo"
+	"github.com/Defacto2/server/handler/demozoo"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/internal/form/form.go → handler/form/form.go b/internal/form/form.go → handler/form/form.go
diff --git a/internal/form/form_test.go → handler/form/form_test.go b/internal/form/form_test.go → handler/form/form_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Defacto2/server/internal/form"
+	"github.com/Defacto2/server/handler/form"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/internal/ext/ext.go → handler/html3/ext/ext.go b/internal/ext/ext.go → handler/html3/ext/ext.go
diff --git a/internal/ext/ext_test.go → handler/html3/ext/ext_test.go b/internal/ext/ext_test.go → handler/html3/ext/ext_test.go
diff --git a/handler/htmx/artifact.go b/handler/htmx/artifact.go
@@ -17,11 +17,11 @@ import (
 	"github.com/Defacto2/helper"
 	"github.com/Defacto2/releaser"
 	"github.com/Defacto2/server/handler/app"
+	"github.com/Defacto2/server/handler/demozoo"
+	"github.com/Defacto2/server/handler/form"
+	"github.com/Defacto2/server/handler/jsdos"
+	"github.com/Defacto2/server/handler/pouet"
 	"github.com/Defacto2/server/internal/command"
-	"github.com/Defacto2/server/internal/demozoo"
-	"github.com/Defacto2/server/internal/form"
-	"github.com/Defacto2/server/internal/jsdos"
-	"github.com/Defacto2/server/internal/pouet"
 	"github.com/Defacto2/server/model"
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"

diff --git a/handler/htmx/htmx.go b/handler/htmx/htmx.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/Defacto2/helper"
 	"github.com/Defacto2/releaser/initialism"
-	"github.com/Defacto2/server/internal/cache"
-	"github.com/Defacto2/server/internal/demozoo"
+	"github.com/Defacto2/server/handler/cache"
+	"github.com/Defacto2/server/handler/demozoo"
+	"github.com/Defacto2/server/handler/pouet"
 	"github.com/Defacto2/server/internal/postgres"
-	"github.com/Defacto2/server/internal/pouet"
 	"github.com/Defacto2/server/model"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"

diff --git a/handler/htmx/transfer.go b/handler/htmx/transfer.go
@@ -25,11 +25,11 @@ import (
 	"github.com/Defacto2/helper"
 	"github.com/Defacto2/magicnumber"
 	"github.com/Defacto2/server/handler/app"
+	"github.com/Defacto2/server/handler/demozoo"
+	"github.com/Defacto2/server/handler/form"
+	"github.com/Defacto2/server/handler/pouet"
 	"github.com/Defacto2/server/handler/sess"
 	"github.com/Defacto2/server/internal/command"
-	"github.com/Defacto2/server/internal/demozoo"
-	"github.com/Defacto2/server/internal/form"
-	"github.com/Defacto2/server/internal/pouet"
 	"github.com/Defacto2/server/internal/tags"
 	"github.com/Defacto2/server/model"
 	"github.com/google/uuid"

diff --git a/internal/jsdos/jsdos.go → handler/jsdos/jsdos.go b/internal/jsdos/jsdos.go → handler/jsdos/jsdos.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/Defacto2/server/internal/jsdos/msdos"
+	"github.com/Defacto2/server/handler/jsdos/msdos"
 )
 
 const AudioRate = "44100" // AudioRate is the sample rate of the audio that is emulated.

diff --git a/internal/jsdos/jsdos_test.go → handler/jsdos/jsdos_test.go b/internal/jsdos/jsdos_test.go → handler/jsdos/jsdos_test.go
@@ -3,7 +3,7 @@ package jsdos_test
 import (
 	"testing"
 
-	"github.com/Defacto2/server/internal/jsdos"
+	"github.com/Defacto2/server/handler/jsdos"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/subpop/go-ini"

diff --git a/internal/jsdos/msdos/msdos.go → handler/jsdos/msdos/msdos.go b/internal/jsdos/msdos/msdos.go → handler/jsdos/msdos/msdos.go
diff --git a/internal/jsdos/msdos/msdos_test.go → handler/jsdos/msdos/msdos_test.go b/internal/jsdos/msdos/msdos_test.go → handler/jsdos/msdos/msdos_test.go
diff --git a/internal/pouet/pouet.go → handler/pouet/pouet.go b/internal/pouet/pouet.go → handler/pouet/pouet.go
diff --git a/internal/pouet/pouet_test.go → handler/pouet/pouet_test.go b/internal/pouet/pouet_test.go → handler/pouet/pouet_test.go
diff --git a/internal/render/render.go → handler/render/render.go b/internal/render/render.go → handler/render/render.go
diff --git a/internal/render/render_test.go → handler/render/render_test.go b/internal/render/render_test.go → handler/render/render_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/Defacto2/helper"
+	"github.com/Defacto2/server/handler/render"
 	"github.com/Defacto2/server/internal/postgres/models"
-	"github.com/Defacto2/server/internal/render"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/volatiletech/null/v8"

diff --git a/internal/site/site.go → handler/site/site.go b/internal/site/site.go → handler/site/site.go
diff --git a/internal/site/site_test.go → handler/site/site_test.go b/internal/site/site_test.go → handler/site/site_test.go
@@ -3,7 +3,7 @@ package site_test
 import (
 	"testing"
 
-	"github.com/Defacto2/server/internal/site"
+	"github.com/Defacto2/server/handler/site"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/internal/sixteen/sixteen.go → handler/sixteen/sixteen.go b/internal/sixteen/sixteen.go → handler/sixteen/sixteen.go
diff --git a/internal/sixteen/sixteen_test.go → handler/sixteen/sixteen_test.go b/internal/sixteen/sixteen_test.go → handler/sixteen/sixteen_test.go
diff --git a/model/html3/html3.go b/model/html3/html3.go
@@ -11,7 +11,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/Defacto2/helper"
-	"github.com/Defacto2/server/internal/ext"
+	"github.com/Defacto2/server/handler/html3/ext"
 	"github.com/Defacto2/server/internal/postgres"
 	"github.com/Defacto2/server/internal/postgres/models"
 	"github.com/Defacto2/server/model/expr"

diff --git a/model/insert.go b/model/insert.go
@@ -9,9 +9,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/Defacto2/server/internal/demozoo"
+	"github.com/Defacto2/server/handler/pouet"
 	"github.com/Defacto2/server/internal/postgres/models"
-	"github.com/Defacto2/server/internal/pouet"
 	"github.com/google/uuid"
 	"github.com/volatiletech/null/v8"
 	"github.com/volatiletech/sqlboiler/v4/boil"
@@ -24,7 +23,7 @@ func InsertDemozoo(ctx context.Context, exec boil.ContextExecutor, id int64) (in
 	if exec == nil {
 		return 0, "", ErrDB
 	}
-	if id < startID || id > demozoo.Sanity {
+	if id < startID || id > DemozooSanity {
 		return 0, "", fmt.Errorf("%w: %d", ErrID, id)
 	}
 

diff --git a/model/model.go b/model/model.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/Defacto2/server/internal/jsdos"
-	"github.com/Defacto2/server/internal/jsdos/msdos"
+	"github.com/Defacto2/server/handler/jsdos"
+	"github.com/Defacto2/server/handler/jsdos/msdos"
 	"github.com/Defacto2/server/internal/postgres/models"
 	"github.com/subpop/go-ini"
 )
@@ -57,6 +57,10 @@ const ClauseOldDate = "date_issued_year ASC NULLS LAST, " +
 // ClauseNoSoftDel is the clause to exclude soft deleted records.
 const ClauseNoSoftDel = "deletedat IS NULL"
 
+const (
+	DemozooSanity = 450000 // Sanity is to check the maximum permitted production ID.
+)
+
 func calc(o, l int) int {
 	if o < 1 {
 		o = 1

diff --git a/model/update.go b/model/update.go
@@ -11,9 +11,8 @@ import (
 
 	"github.com/Defacto2/helper"
 	"github.com/Defacto2/releaser"
-	"github.com/Defacto2/server/internal/demozoo"
+	"github.com/Defacto2/server/handler/pouet"
 	"github.com/Defacto2/server/internal/postgres/models"
-	"github.com/Defacto2/server/internal/pouet"
 	"github.com/Defacto2/server/internal/tags"
 	"github.com/volatiletech/null/v8"
 	"github.com/volatiletech/sqlboiler/v4/boil"
@@ -323,7 +322,7 @@ func UpdateInt64From(db *sql.DB, column int64From, id int64, val string) error {
 	case i64 == 0 && column == pouetProd:
 		f.WebIDPouet = null.Int64FromPtr(nil)
 	case column == demozooProd:
-		invalid = i64 < 0 || i64 > demozoo.Sanity
+		invalid = i64 < 0 || i64 > DemozooSanity
 		f.WebIDDemozoo = null.Int64From(i64)
 	case column == pouetProd:
 		invalid = i64 < 0 || i64 > pouet.Sanity