From f52ce807afcfbc726e81f90e8ae3b60b8328577e Mon Sep 17 00:00:00 2001 From: sentriz Date: Fri, 24 Apr 2020 23:14:59 +0100 Subject: [PATCH] upgrade sqlite3 --- Dockerfile | 3 +- Dockerfile.dev | 3 +- _build_tags | 2 - _build_vars | 1 - _do_build_scanner | 8 ---- _do_build_server | 6 +-- _do_bump_version | 1 - _do_run_scanner | 7 --- _do_run_server | 6 +-- cmd/gonic/main.go | 2 +- cmd/gonicembed/main.go | 20 +++------ cmd/gonicscan/main.go | 45 ------------------- go.mod | 1 + go.sum | 3 +- server/ctrladmin/ctrl.go | 2 +- server/ctrladmin/handlers.go | 4 +- server/ctrladmin/handlers_playlist.go | 2 +- server/ctrladmin/middleware.go | 2 +- server/ctrlbase/ctrl.go | 4 +- server/ctrlsubsonic/ctrl_test.go | 2 +- server/ctrlsubsonic/handlers_by_folder.go | 2 +- server/ctrlsubsonic/handlers_by_tags.go | 2 +- server/ctrlsubsonic/handlers_common.go | 4 +- server/ctrlsubsonic/handlers_raw.go | 2 +- server/ctrlsubsonic/spec/construct.go | 2 +- .../ctrlsubsonic/spec/construct_by_folder.go | 2 +- server/ctrlsubsonic/spec/construct_by_tags.go | 2 +- {db => server/db}/db.go | 13 +++--- {db => server/db}/db_test.go | 0 {db => server/db}/migrations.go | 0 {db => server/db}/model.go | 2 +- server/jukebox/jukebox.go | 2 +- server/lastfm/lastfm.go | 2 +- {mime => server/mime}/mime.go | 0 {scanner => server/scanner}/scanner.go | 8 ++-- {scanner => server/scanner}/scanner_test.go | 2 +- {scanner => server/scanner}/stack/stack.go | 2 +- .../scanner}/stack/stack_test.go | 2 +- {scanner => server/scanner}/tags/tags.go | 0 server/server.go | 4 +- 40 files changed, 48 insertions(+), 129 deletions(-) delete mode 100644 _build_tags delete mode 100644 _build_vars delete mode 100755 _do_build_scanner delete mode 100755 _do_run_scanner delete mode 100644 cmd/gonicscan/main.go rename {db => server/db}/db.go (88%) rename {db => server/db}/db_test.go (100%) rename {db => server/db}/migrations.go (100%) rename {db => server/db}/model.go (99%) rename {mime => server/mime}/mime.go (100%) rename {scanner => server/scanner}/scanner.go (98%) rename {scanner => server/scanner}/scanner_test.go (97%) rename {scanner => server/scanner}/stack/stack.go (96%) rename {scanner => server/scanner}/stack/stack_test.go (95%) rename {scanner => server/scanner}/tags/tags.go (100%) diff --git a/Dockerfile b/Dockerfile index af49675..5c4cc1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ COPY go.mod . COPY go.sum . RUN go mod download COPY . . -RUN ./_do_build_server && ./_do_build_scanner +RUN ./_do_build_server FROM alpine:3.9 RUN apk add -U --no-cache \ @@ -24,7 +24,6 @@ COPY --from=builder \ /usr/lib/ COPY --from=builder \ /src/gonic \ - /src/gonicscan \ /bin/ VOLUME ["/data", "/music", "/cache"] EXPOSE 80 diff --git a/Dockerfile.dev b/Dockerfile.dev index 4e5443b..fc09439 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -12,7 +12,7 @@ WORKDIR /src COPY . . RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ - ./_do_build_server && ./_do_build_scanner + ./_do_build_server FROM alpine:3.9 RUN apk add -U --no-cache \ @@ -25,7 +25,6 @@ COPY --from=builder \ /usr/lib/ COPY --from=builder \ /src/gonic \ - /src/gonicscan \ /bin/ VOLUME ["/data", "/music", "/cache"] EXPOSE 80 diff --git a/_build_tags b/_build_tags deleted file mode 100644 index 44c40bb..0000000 --- a/_build_tags +++ /dev/null @@ -1,2 +0,0 @@ -sqlite_foreign_keys -sqlite_vacuum_incr diff --git a/_build_vars b/_build_vars deleted file mode 100644 index 37b1096..0000000 --- a/_build_vars +++ /dev/null @@ -1 +0,0 @@ -export GO111MODULE=on diff --git a/_do_build_scanner b/_do_build_scanner deleted file mode 100755 index 33f7d22..0000000 --- a/_do_build_scanner +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# using sh, is run from alpine - -. ./_build_vars -go build \ - -o gonicscan \ - -tags "$(tr '\n' ' ' < _build_tags)" \ - cmd/gonicscan/main.go diff --git a/_do_build_server b/_do_build_server index 26d1697..1d54ade 100755 --- a/_do_build_server +++ b/_do_build_server @@ -1,9 +1,5 @@ #!/bin/sh # using sh, is run from alpine -. ./_build_vars ./_do_gen_assets -go build \ - -o gonic \ - -tags "$(tr '\n' ' ' < _build_tags)" \ - cmd/gonic/main.go +go build -o gonic cmd/gonic/main.go diff --git a/_do_bump_version b/_do_bump_version index 074fa39..b95830f 100755 --- a/_do_bump_version +++ b/_do_bump_version @@ -52,7 +52,6 @@ package version const NAME = "gonic" const NAME_UPPER = "GONIC" const NAME_EMBED = "gonicembed" -const NAME_SCAN = "gonicscan" const VERSION = "$new_version" EOL diff --git a/_do_run_scanner b/_do_run_scanner deleted file mode 100755 index 2cd0218..0000000 --- a/_do_run_scanner +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -. ./_build_vars -go run \ - -tags "$(tr '\n' ' ' < _build_tags)" \ - cmd/gonicscan/main.go \ - $@ diff --git a/_do_run_server b/_do_run_server index 9d7df97..c9a435d 100755 --- a/_do_run_server +++ b/_do_run_server @@ -1,8 +1,4 @@ #!/usr/bin/env bash -. ./_build_vars ./_do_gen_assets -go run \ - -tags "$(tr '\n' ' ' < _build_tags)" \ - cmd/gonic/main.go \ - $@ +go run cmd/gonic/main.go $@ diff --git a/cmd/gonic/main.go b/cmd/gonic/main.go index 71cffa8..c01ca23 100644 --- a/cmd/gonic/main.go +++ b/cmd/gonic/main.go @@ -12,7 +12,7 @@ import ( "github.com/oklog/run" "github.com/peterbourgon/ff" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" "go.senan.xyz/gonic/server" "go.senan.xyz/gonic/version" ) diff --git a/cmd/gonicembed/main.go b/cmd/gonicembed/main.go index c31e69f..1c2bea5 100644 --- a/cmd/gonicembed/main.go +++ b/cmd/gonicembed/main.go @@ -118,21 +118,11 @@ func processAssets(c *config, files []string) error { func main() { set := flag.NewFlagSet(version.NAME_EMBED, flag.ExitOnError) - outPath := set.String( - "out-path", "", - "generated file's path (required)") - pkgName := set.String( - "package-name", "assets", - "generated file's package name") - tagList := set.String( - "tag-list", "", - "generated file's build tag list") - assetsVarName := set.String( - "assets-var-name", "Assets", - "generated file's assets var name") - assetPathPrefix := set.String( - "asset-path-prefix", "", - "generated file's assets map key prefix to be stripped") + outPath := set.String("out-path", "", "generated file's path (required)") + pkgName := set.String("package-name", "assets", "generated file's package name") + tagList := set.String("tag-list", "", "generated file's build tag list") + assetsVarName := set.String("assets-var-name", "Assets", "generated assets var name") + assetPathPrefix := set.String("asset-path-prefix", "", "generated assets map key prefix") if err := ff.Parse(set, os.Args[1:]); err != nil { log.Fatalf("error parsing args: %v\n", err) } diff --git a/cmd/gonicscan/main.go b/cmd/gonicscan/main.go deleted file mode 100644 index 62e5350..0000000 --- a/cmd/gonicscan/main.go +++ /dev/null @@ -1,45 +0,0 @@ -package main - -import ( - "flag" - "log" - "os" - - _ "github.com/jinzhu/gorm/dialects/sqlite" - "github.com/peterbourgon/ff" - - "go.senan.xyz/gonic/db" - "go.senan.xyz/gonic/scanner" - "go.senan.xyz/gonic/version" -) - -func main() { - set := flag.NewFlagSet(version.NAME_SCAN, flag.ExitOnError) - musicPath := set.String("music-path", "", "path to music") - dbPath := set.String("db-path", "gonic.db", "path to database (optional)") - fullScan := set.Bool("full-scan", false, "ignore file modtimes while scanning (optional)") - if err := ff.Parse(set, os.Args[1:], - ff.WithEnvVarPrefix(version.NAME_UPPER), - ); err != nil { - log.Fatalf("error parsing args: %v\n", err) - } - if _, err := os.Stat(*musicPath); os.IsNotExist(err) { - log.Fatal("please provide a valid music directory") - } - db, err := db.New(*dbPath) - if err != nil { - log.Fatalf("error opening database: %v\n", err) - } - defer db.Close() - s := scanner.New(*musicPath, db) - var scan func() error - switch { - case *fullScan: - scan = s.StartFull - default: - scan = s.StartInc - } - if err := scan(); err != nil { - log.Fatalf("error during scan: %v\n", err) - } -} diff --git a/go.mod b/go.mod index e151b07..a8ec73f 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( github.com/josephburnett/jd v0.0.0-20190531151850-1f9071c800e7 github.com/karrick/godirwalk v1.15.2 github.com/kr/pretty v0.1.0 // indirect + github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/nicksellen/audiotags v0.0.0-20160226222119-94015fa599bd github.com/oklog/run v1.1.0 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c diff --git a/go.sum b/go.sum index abe54e8..bed6d68 100644 --- a/go.sum +++ b/go.sum @@ -130,8 +130,9 @@ github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= +github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mewkiz/flac v1.0.5 h1:dHGW/2kf+/KZ2GGqSVayNEhL9pluKn/rr/h/QqD9Ogc= github.com/mewkiz/flac v1.0.5/go.mod h1:EHZNU32dMF6alpurYyKHDLYpW1lYpBZ5WrXi/VuNIGs= diff --git a/server/ctrladmin/ctrl.go b/server/ctrladmin/ctrl.go index 6e04864..c505460 100644 --- a/server/ctrladmin/ctrl.go +++ b/server/ctrladmin/ctrl.go @@ -18,7 +18,7 @@ import ( "github.com/oxtoacart/bpool" "github.com/wader/gormstore" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" "go.senan.xyz/gonic/server/assets" "go.senan.xyz/gonic/server/ctrlbase" "go.senan.xyz/gonic/version" diff --git a/server/ctrladmin/handlers.go b/server/ctrladmin/handlers.go index d3fd05a..180c602 100644 --- a/server/ctrladmin/handlers.go +++ b/server/ctrladmin/handlers.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "go.senan.xyz/gonic/db" - "go.senan.xyz/gonic/scanner" + "go.senan.xyz/gonic/server/db" + "go.senan.xyz/gonic/server/scanner" "go.senan.xyz/gonic/server/encode" "go.senan.xyz/gonic/server/lastfm" ) diff --git a/server/ctrladmin/handlers_playlist.go b/server/ctrladmin/handlers_playlist.go index e075a16..4f4a76c 100644 --- a/server/ctrladmin/handlers_playlist.go +++ b/server/ctrladmin/handlers_playlist.go @@ -10,7 +10,7 @@ import ( "github.com/jinzhu/gorm" "github.com/pkg/errors" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" ) func playlistParseLine(c *Controller, path string) (int, error) { diff --git a/server/ctrladmin/middleware.go b/server/ctrladmin/middleware.go index 548552f..b5472f3 100644 --- a/server/ctrladmin/middleware.go +++ b/server/ctrladmin/middleware.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/sessions" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" ) func (c *Controller) WithSession(next http.Handler) http.Handler { diff --git a/server/ctrlbase/ctrl.go b/server/ctrlbase/ctrl.go index 194ccc0..604ebdd 100644 --- a/server/ctrlbase/ctrl.go +++ b/server/ctrlbase/ctrl.go @@ -6,8 +6,8 @@ import ( "net/http" "path" - "go.senan.xyz/gonic/db" - "go.senan.xyz/gonic/scanner" + "go.senan.xyz/gonic/server/db" + "go.senan.xyz/gonic/server/scanner" ) type statusWriter struct { diff --git a/server/ctrlsubsonic/ctrl_test.go b/server/ctrlsubsonic/ctrl_test.go index f96626b..ae4ca72 100644 --- a/server/ctrlsubsonic/ctrl_test.go +++ b/server/ctrlsubsonic/ctrl_test.go @@ -13,7 +13,7 @@ import ( jd "github.com/josephburnett/jd/lib" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" "go.senan.xyz/gonic/server/ctrlbase" "go.senan.xyz/gonic/server/ctrlsubsonic/params" ) diff --git a/server/ctrlsubsonic/handlers_by_folder.go b/server/ctrlsubsonic/handlers_by_folder.go index d5b78cc..2aac194 100644 --- a/server/ctrlsubsonic/handlers_by_folder.go +++ b/server/ctrlsubsonic/handlers_by_folder.go @@ -8,7 +8,7 @@ import ( "github.com/jinzhu/gorm" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" "go.senan.xyz/gonic/server/ctrlsubsonic/params" "go.senan.xyz/gonic/server/ctrlsubsonic/spec" ) diff --git a/server/ctrlsubsonic/handlers_by_tags.go b/server/ctrlsubsonic/handlers_by_tags.go index 7c37503..6048781 100644 --- a/server/ctrlsubsonic/handlers_by_tags.go +++ b/server/ctrlsubsonic/handlers_by_tags.go @@ -8,7 +8,7 @@ import ( "github.com/jinzhu/gorm" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" "go.senan.xyz/gonic/server/ctrlsubsonic/params" "go.senan.xyz/gonic/server/ctrlsubsonic/spec" "go.senan.xyz/gonic/server/lastfm" diff --git a/server/ctrlsubsonic/handlers_common.go b/server/ctrlsubsonic/handlers_common.go index 921f42d..94c325b 100644 --- a/server/ctrlsubsonic/handlers_common.go +++ b/server/ctrlsubsonic/handlers_common.go @@ -10,8 +10,8 @@ import ( "github.com/jinzhu/gorm" - "go.senan.xyz/gonic/db" - "go.senan.xyz/gonic/scanner" + "go.senan.xyz/gonic/server/db" + "go.senan.xyz/gonic/server/scanner" "go.senan.xyz/gonic/server/ctrlsubsonic/params" "go.senan.xyz/gonic/server/ctrlsubsonic/spec" "go.senan.xyz/gonic/server/lastfm" diff --git a/server/ctrlsubsonic/handlers_raw.go b/server/ctrlsubsonic/handlers_raw.go index 8ac4982..b0c67c2 100644 --- a/server/ctrlsubsonic/handlers_raw.go +++ b/server/ctrlsubsonic/handlers_raw.go @@ -9,7 +9,7 @@ import ( "github.com/jinzhu/gorm" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" "go.senan.xyz/gonic/server/ctrlsubsonic/params" "go.senan.xyz/gonic/server/ctrlsubsonic/spec" "go.senan.xyz/gonic/server/encode" diff --git a/server/ctrlsubsonic/spec/construct.go b/server/ctrlsubsonic/spec/construct.go index 047133a..e649d4c 100644 --- a/server/ctrlsubsonic/spec/construct.go +++ b/server/ctrlsubsonic/spec/construct.go @@ -1,6 +1,6 @@ package spec -import "go.senan.xyz/gonic/db" +import "go.senan.xyz/gonic/server/db" func NewPlaylist(p *db.Playlist) *Playlist { return &Playlist{ diff --git a/server/ctrlsubsonic/spec/construct_by_folder.go b/server/ctrlsubsonic/spec/construct_by_folder.go index 5b0b45a..1eda95a 100644 --- a/server/ctrlsubsonic/spec/construct_by_folder.go +++ b/server/ctrlsubsonic/spec/construct_by_folder.go @@ -3,7 +3,7 @@ package spec import ( "path" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" ) func NewAlbumByFolder(f *db.Album) *Album { diff --git a/server/ctrlsubsonic/spec/construct_by_tags.go b/server/ctrlsubsonic/spec/construct_by_tags.go index 1886077..310200a 100644 --- a/server/ctrlsubsonic/spec/construct_by_tags.go +++ b/server/ctrlsubsonic/spec/construct_by_tags.go @@ -3,7 +3,7 @@ package spec import ( "path" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" ) func NewAlbumByTags(a *db.Album, artist *db.Artist) *Album { diff --git a/db/db.go b/server/db/db.go similarity index 88% rename from db/db.go rename to server/db/db.go index 5af3d00..de611eb 100644 --- a/db/db.go +++ b/server/db/db.go @@ -1,7 +1,6 @@ package db import ( - "fmt" "log" "net/url" "os" @@ -16,11 +15,12 @@ var ( dbOptions = url.Values{ // with this, multiple connections share a single data and schema cache. // see https://www.sqlite.org/sharedcache.html - "cache": []string{"shared"}, + "cache": {"shared"}, // with this, the db sleeps for a little while when locked. can prevent // a SQLITE_BUSY. see https://www.sqlite.org/c3ref/busy_timeout.html - "_busy_timeout": []string{"30000"}, - "_journal_mode": []string{"WAL"}, + "_busy_timeout": {"30000"}, + "_journal_mode": {"WAL"}, + "_foreign_keys": {"true"}, } ) @@ -29,8 +29,9 @@ type DB struct { } func New(path string) (*DB, error) { - pathAndArgs := fmt.Sprintf("%s?%s", path, dbOptions.Encode()) - db, err := gorm.Open("sqlite3", pathAndArgs) + url := url.URL{Path: path} + url.RawQuery = dbOptions.Encode() + db, err := gorm.Open("sqlite3", url.String()) if err != nil { return nil, errors.Wrap(err, "with gorm") } diff --git a/db/db_test.go b/server/db/db_test.go similarity index 100% rename from db/db_test.go rename to server/db/db_test.go diff --git a/db/migrations.go b/server/db/migrations.go similarity index 100% rename from db/migrations.go rename to server/db/migrations.go diff --git a/db/model.go b/server/db/model.go similarity index 99% rename from db/model.go rename to server/db/model.go index 9ec2f68..e09ca06 100644 --- a/db/model.go +++ b/server/db/model.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "go.senan.xyz/gonic/mime" + "go.senan.xyz/gonic/server/mime" ) func splitInt(in, sep string) []int { diff --git a/server/jukebox/jukebox.go b/server/jukebox/jukebox.go index 83c18ea..9b627eb 100644 --- a/server/jukebox/jukebox.go +++ b/server/jukebox/jukebox.go @@ -14,7 +14,7 @@ import ( "github.com/faiface/beep/mp3" "github.com/faiface/beep/speaker" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" "go.senan.xyz/gonic/server/ctrlsubsonic/spec" ) diff --git a/server/lastfm/lastfm.go b/server/lastfm/lastfm.go index cfe8fa1..0dd6367 100644 --- a/server/lastfm/lastfm.go +++ b/server/lastfm/lastfm.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" ) var ( diff --git a/mime/mime.go b/server/mime/mime.go similarity index 100% rename from mime/mime.go rename to server/mime/mime.go diff --git a/scanner/scanner.go b/server/scanner/scanner.go similarity index 98% rename from scanner/scanner.go rename to server/scanner/scanner.go index 82e9452..7f4362d 100644 --- a/scanner/scanner.go +++ b/server/scanner/scanner.go @@ -15,10 +15,10 @@ import ( "github.com/pkg/errors" "github.com/rainycape/unidecode" - "go.senan.xyz/gonic/db" - "go.senan.xyz/gonic/mime" - "go.senan.xyz/gonic/scanner/stack" - "go.senan.xyz/gonic/scanner/tags" + "go.senan.xyz/gonic/server/db" + "go.senan.xyz/gonic/server/mime" + "go.senan.xyz/gonic/server/scanner/stack" + "go.senan.xyz/gonic/server/scanner/tags" ) // isScanning acts as an atomic boolean semaphore. we don't diff --git a/scanner/scanner_test.go b/server/scanner/scanner_test.go similarity index 97% rename from scanner/scanner_test.go rename to server/scanner/scanner_test.go index 5a8f333..86250b7 100644 --- a/scanner/scanner_test.go +++ b/server/scanner/scanner_test.go @@ -7,7 +7,7 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" ) var testScanner *Scanner diff --git a/scanner/stack/stack.go b/server/scanner/stack/stack.go similarity index 96% rename from scanner/stack/stack.go rename to server/scanner/stack/stack.go index f1c9c6d..937b78f 100644 --- a/scanner/stack/stack.go +++ b/server/scanner/stack/stack.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" ) type item struct { diff --git a/scanner/stack/stack_test.go b/server/scanner/stack/stack_test.go similarity index 95% rename from scanner/stack/stack_test.go rename to server/scanner/stack/stack_test.go index c8d004b..e838971 100644 --- a/scanner/stack/stack_test.go +++ b/server/scanner/stack/stack_test.go @@ -3,7 +3,7 @@ package stack import ( "testing" - "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/db" ) func TestFolderStack(t *testing.T) { diff --git a/scanner/tags/tags.go b/server/scanner/tags/tags.go similarity index 100% rename from scanner/tags/tags.go rename to server/scanner/tags/tags.go diff --git a/server/server.go b/server/server.go index 1d5e0c6..f852520 100644 --- a/server/server.go +++ b/server/server.go @@ -10,8 +10,8 @@ import ( "github.com/gorilla/mux" - "go.senan.xyz/gonic/db" - "go.senan.xyz/gonic/scanner" + "go.senan.xyz/gonic/server/db" + "go.senan.xyz/gonic/server/scanner" "go.senan.xyz/gonic/server/assets" "go.senan.xyz/gonic/server/ctrladmin" "go.senan.xyz/gonic/server/ctrlbase"