Reorg

gqlgen.yml

@@ -6,27 +6,27 @@
 schema:
   - schema/schema.graphql
 exec:
-  filename: models/generated_exec.go
+  filename: pkg/models/generated_exec.go
 model:
-  filename: models/generated_models.go
+  filename: pkg/models/generated_models.go
 resolver:
-  filename: api/resolver.go
+  filename: pkg/api/resolver.go
   type: Resolver
 
 struct_tag: gqlgen
 
 models:
   Gallery:
-    model: github.com/stashapp/stash/models.Gallery
+    model: github.com/stashapp/stash/pkg/models.Gallery
   Performer:
-    model: github.com/stashapp/stash/models.Performer
+    model: github.com/stashapp/stash/pkg/models.Performer
   Scene:
-    model: github.com/stashapp/stash/models.Scene
+    model: github.com/stashapp/stash/pkg/models.Scene
   SceneMarker:
-    model: github.com/stashapp/stash/models.SceneMarker
+    model: github.com/stashapp/stash/pkg/models.SceneMarker
   ScrapedItem:
-    model: github.com/stashapp/stash/models.ScrapedItem
+    model: github.com/stashapp/stash/pkg/models.ScrapedItem
   Studio:
-    model: github.com/stashapp/stash/models.Studio
+    model: github.com/stashapp/stash/pkg/models.Studio
   Tag:
-    model: github.com/stashapp/stash/models.Tag
+    model: github.com/stashapp/stash/pkg/models.Tag

main.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/stashapp/stash/api"
-	"github.com/stashapp/stash/database"
-	"github.com/stashapp/stash/manager"
+	"github.com/stashapp/stash/pkg/api"
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/manager"
 
 	_ "github.com/golang-migrate/migrate/v4/database/sqlite3"
 	_ "github.com/golang-migrate/migrate/v4/source/file"

pkg/api/resolver.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/scraper"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/scraper"
 	"sort"
 	"strconv"
 )

pkg/api/resolver_model_gallery.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_model_performer.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/api/urlbuilders"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/api/urlbuilders"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_model_scene.go

@@ -2,10 +2,10 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/api/urlbuilders"
-	"github.com/stashapp/stash/manager"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/api/urlbuilders"
+	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"strconv"
 )
 

pkg/api/resolver_model_scene_marker.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/api/urlbuilders"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/api/urlbuilders"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_model_studio.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/api/urlbuilders"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/api/urlbuilders"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_model_tag.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_mutation_performer.go

@@ -3,9 +3,9 @@ package api
 import (
 	"context"
 	"database/sql"
-	"github.com/stashapp/stash/database"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"strconv"
 	"time"
 )

pkg/api/resolver_mutation_scene.go

@@ -3,8 +3,8 @@ package api
 import (
 	"context"
 	"database/sql"
-	"github.com/stashapp/stash/database"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 	"time"
 )

pkg/api/resolver_mutation_studio.go

@@ -3,9 +3,9 @@ package api
 import (
 	"context"
 	"database/sql"
-	"github.com/stashapp/stash/database"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"strconv"
 	"time"
 )

pkg/api/resolver_mutation_tag.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/database"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 	"time"
 )

pkg/api/resolver_query_find_gallery.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_query_find_performer.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_query_find_scene.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_query_find_scene_marker.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 )
 
 func (r *queryResolver) FindSceneMarkers(ctx context.Context, scene_marker_filter *models.SceneMarkerFilterType, filter *models.FindFilterType) (models.FindSceneMarkersResultType, error) {

pkg/api/resolver_query_find_studio.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_query_find_tag.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"strconv"
 )
 

pkg/api/resolver_query_metadata.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/manager"
+	"github.com/stashapp/stash/pkg/manager"
 )
 
 func (r *queryResolver) MetadataScan(ctx context.Context) (string, error) {

pkg/api/resolver_subscription_metadata.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/manager"
+	"github.com/stashapp/stash/pkg/manager"
 	"time"
 )
 

pkg/api/routes_gallery.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"github.com/go-chi/chi"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"net/http"
 	"strconv"
 )

pkg/api/routes_performer.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"github.com/go-chi/chi"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"net/http"
 	"strconv"
 )

pkg/api/routes_scene.go

@@ -3,10 +3,10 @@ package api
 import (
 	"context"
 	"github.com/go-chi/chi"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/manager"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"net/http"
 	"strconv"
 	"strings"

pkg/api/routes_studio.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"github.com/go-chi/chi"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/models"
 	"net/http"
 	"strconv"
 )

pkg/api/server.go

@@ -11,11 +11,11 @@ import (
 	"github.com/gobuffalo/packr/v2"
 	"github.com/gorilla/websocket"
 	"github.com/rs/cors"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/manager"
-	"github.com/stashapp/stash/manager/jsonschema"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/manager/jsonschema"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"net/http"
 	"os"
 	"path"
@@ -37,9 +37,9 @@ func Start() {
 	//	port = defaultPort
 	//}
 
-	certsBox = packr.New("Cert Box", "../certs")
-	uiBox = packr.New("UI Box", "../ui/v1/dist/stash-frontend")
-	setupUIBox = packr.New("Setup UI Box", "../ui/setup")
+	certsBox = packr.New("Cert Box", "../../certs")
+	uiBox = packr.New("UI Box", "../../ui/v1/dist/stash-frontend")
+	setupUIBox = packr.New("Setup UI Box", "../../ui/setup")
 
 	r := chi.NewRouter()
 

pkg/database/database.go

@@ -7,8 +7,8 @@ import (
 	"github.com/golang-migrate/migrate/v4/source"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/utils"
 	"os"
 )
 

pkg/ffmpeg/downloader.go

@@ -3,7 +3,7 @@ package ffmpeg
 import (
 	"archive/zip"
 	"fmt"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/utils"
 	"io"
 	"net/http"
 	"os"

pkg/ffmpeg/encoder.go

@@ -1,7 +1,7 @@
 package ffmpeg
 
 import (
-	"github.com/stashapp/stash/logger"
+	"github.com/stashapp/stash/pkg/logger"
 	"io/ioutil"
 	"os/exec"
 	"regexp"

pkg/ffmpeg/encoder_scene_preview_chunk.go

@@ -2,7 +2,7 @@ package ffmpeg
 
 import (
 	"fmt"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/utils"
 	"strconv"
 )
 

pkg/manager/generator.go

@@ -2,9 +2,9 @@ package manager
 
 import (
 	"fmt"
-	"github.com/stashapp/stash/ffmpeg"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/utils"
 	"os/exec"
 	"strconv"
 )

pkg/manager/generator_preview.go

@@ -3,9 +3,9 @@ package manager
 import (
 	"bufio"
 	"fmt"
-	"github.com/stashapp/stash/ffmpeg"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/utils"
 	"os"
 	"path/filepath"
 )

pkg/manager/generator_sprite.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"github.com/bmatcuk/doublestar"
 	"github.com/disintegration/imaging"
-	"github.com/stashapp/stash/ffmpeg"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/utils"
 	"image"
 	"image/color"
 	"io/ioutil"

pkg/manager/json_utils.go

@@ -1,7 +1,7 @@
 package manager
 
 import (
-	"github.com/stashapp/stash/manager/jsonschema"
+	"github.com/stashapp/stash/pkg/manager/jsonschema"
 )
 
 type jsonUtils struct{}

pkg/manager/jsonschema/config.go

@@ -3,7 +3,7 @@ package jsonschema
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/stashapp/stash/logger"
+	"github.com/stashapp/stash/pkg/logger"
 	"os"
 )
 

pkg/manager/manager.go

@@ -1,11 +1,11 @@
 package manager
 
 import (
-	"github.com/stashapp/stash/ffmpeg"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/manager/jsonschema"
-	"github.com/stashapp/stash/manager/paths"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager/jsonschema"
+	"github.com/stashapp/stash/pkg/manager/paths"
+	"github.com/stashapp/stash/pkg/utils"
 	"sync"
 )
 

pkg/manager/manager_subscription_handler.go

@@ -2,7 +2,7 @@ package manager
 
 import (
 	"encoding/json"
-	"github.com/stashapp/stash/logger"
+	"github.com/stashapp/stash/pkg/logger"
 )
 
 type metadataUpdatePayload struct {

pkg/manager/manager_tasks.go

@@ -2,9 +2,9 @@ package manager
 
 import (
 	"github.com/bmatcuk/doublestar"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"path/filepath"
 	"sync"
 )

pkg/manager/paths/paths.go

@@ -1,7 +1,7 @@
 package paths
 
 import (
-	"github.com/stashapp/stash/manager/jsonschema"
+	"github.com/stashapp/stash/pkg/manager/jsonschema"
 )
 
 type Paths struct {

pkg/manager/paths/paths_gallery.go

@@ -1,7 +1,7 @@
 package paths
 
 import (
-	"github.com/stashapp/stash/manager/jsonschema"
+	"github.com/stashapp/stash/pkg/manager/jsonschema"
 	"path/filepath"
 )
 

pkg/manager/paths/paths_generated.go

@@ -1,7 +1,7 @@
 package paths
 
 import (
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/utils"
 	"path/filepath"
 )
 

pkg/manager/paths/paths_scenes.go

@@ -1,7 +1,7 @@
 package paths
 
 import (
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/utils"
 	"path/filepath"
 )
 

pkg/manager/task_export.go

@@ -3,11 +3,11 @@ package manager
 import (
 	"context"
 	"fmt"
-	"github.com/stashapp/stash/database"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/manager/jsonschema"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager/jsonschema"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"math"
 	"strconv"
 	"sync"

pkg/manager/task_generate_markers.go

@@ -1,10 +1,10 @@
 package manager
 
 import (
-	"github.com/stashapp/stash/ffmpeg"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"os"
 	"path/filepath"
 	"strconv"

pkg/manager/task_generate_preview.go

@@ -1,10 +1,10 @@
 package manager
 
 import (
-	"github.com/stashapp/stash/ffmpeg"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"sync"
 )
 

pkg/manager/task_generate_sprite.go

@@ -1,10 +1,10 @@
 package manager
 
 import (
-	"github.com/stashapp/stash/ffmpeg"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"sync"
 )
 

pkg/manager/task_import.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"database/sql"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/database"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/manager/jsonschema"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager/jsonschema"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"strconv"
 	"sync"
 	"time"

pkg/manager/task_scan.go

@@ -3,11 +3,11 @@ package manager
 import (
 	"context"
 	"database/sql"
-	"github.com/stashapp/stash/database"
-	"github.com/stashapp/stash/ffmpeg"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 	"path/filepath"
 	"strconv"
 	"sync"

pkg/manager/task_transcode.go

@@ -1,9 +1,9 @@
 package manager
 
 import (
-	"github.com/stashapp/stash/ffmpeg"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/models"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/models"
 	"os"
 	"sync"
 )

pkg/manager/utils.go

@@ -2,8 +2,8 @@ package manager
 
 import (
 	"fmt"
-	"github.com/stashapp/stash/models"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 )
 
 func IsStreamable(scene *models.Scene) (bool, error) {

pkg/models/model_gallery.go

@@ -5,9 +5,9 @@ import (
 	"bytes"
 	"database/sql"
 	"github.com/disintegration/imaging"
-	"github.com/stashapp/stash/api/urlbuilders"
-	"github.com/stashapp/stash/logger"
-	"github.com/stashapp/stash/utils"
+	"github.com/stashapp/stash/pkg/api/urlbuilders"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/utils"
 	"image"
 	"image/jpeg"
 	"io/ioutil"

pkg/models/querybuilder_gallery.go

@@ -3,7 +3,7 @@ package models
 import (
 	"database/sql"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/database"
+	"github.com/stashapp/stash/pkg/database"
 	"path/filepath"
 )
 

pkg/models/querybuilder_performer.go

@@ -3,7 +3,7 @@ package models
 import (
 	"database/sql"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/database"
+	"github.com/stashapp/stash/pkg/database"
 )
 
 type PerformerQueryBuilder struct{}

pkg/models/querybuilder_scene.go

@@ -3,7 +3,7 @@ package models
 import (
 	"database/sql"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/database"
+	"github.com/stashapp/stash/pkg/database"
 	"strconv"
 	"strings"
 )

pkg/models/querybuilder_scene_marker.go

@@ -3,7 +3,7 @@ package models
 import (
 	"database/sql"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/database"
+	"github.com/stashapp/stash/pkg/database"
 	"strconv"
 )
 

pkg/models/querybuilder_scraped_item.go

@@ -3,7 +3,7 @@ package models
 import (
 	"database/sql"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/database"
+	"github.com/stashapp/stash/pkg/database"
 )
 
 type ScrapedItemQueryBuilder struct{}

pkg/models/querybuilder_sql.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/database"
+	"github.com/stashapp/stash/pkg/database"
 	"reflect"
 	"strconv"
 	"strings"

pkg/models/querybuilder_studio.go

@@ -3,7 +3,7 @@ package models
 import (
 	"database/sql"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/database"
+	"github.com/stashapp/stash/pkg/database"
 )
 
 type StudioQueryBuilder struct{}

pkg/models/querybuilder_tag.go

@@ -3,7 +3,7 @@ package models
 import (
 	"database/sql"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/database"
+	"github.com/stashapp/stash/pkg/database"
 )
 
 type TagQueryBuilder struct{}