Moved everything out of internal

api/resolver.go

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

api/resolver_model_gallery.go

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

api/resolver_model_performer.go

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

api/resolver_model_scene.go

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

api/resolver_model_scene_marker.go

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

api/resolver_model_studio.go

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

api/resolver_model_tag.go

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

api/resolver_mutation_performer.go

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

api/resolver_mutation_scene.go

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

api/resolver_mutation_studio.go

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

api/resolver_mutation_tag.go

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

api/resolver_query_find_gallery.go

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

api/resolver_query_find_performer.go

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

api/resolver_query_find_scene.go

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

api/resolver_query_find_scene_marker.go

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

api/resolver_query_find_studio.go

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

api/resolver_query_find_tag.go

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

api/resolver_query_metadata.go

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

api/routes_gallery.go

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

api/routes_performer.go

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

api/routes_scene.go

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

api/routes_studio.go

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

api/server.go

@@ -10,8 +10,8 @@ import (
 	"github.com/go-chi/chi/middleware"
 	"github.com/gobuffalo/packr/v2"
 	"github.com/rs/cors"
-	"github.com/stashapp/stash/internal/logger"
-	"github.com/stashapp/stash/internal/models"
+	"github.com/stashapp/stash/logger"
+	"github.com/stashapp/stash/models"
 	"net/http"
 	"path"
 	"runtime/debug"

database/database.go

@@ -7,7 +7,7 @@ import (
 	"github.com/golang-migrate/migrate/v4/source"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
-	"github.com/stashapp/stash/internal/logger"
+	"github.com/stashapp/stash/logger"
 	"runtime"
 	"strings"
 )

ffmpeg/encoder.go

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

main.go

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

manager/json_utils.go

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

manager/jsonschema/config.go

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

manager/manager.go

@@ -2,8 +2,8 @@ package manager
 
 import (
 	"github.com/bmatcuk/doublestar"
-	"github.com/stashapp/stash/internal/logger"
-	"github.com/stashapp/stash/internal/manager/paths"
+	"github.com/stashapp/stash/logger"
+	"github.com/stashapp/stash/manager/paths"
 	"path/filepath"
 	"sync"
 )

manager/paths/paths.go

@@ -1,8 +1,8 @@
 package paths
 
 import (
-	"github.com/stashapp/stash/internal/manager/jsonschema"
-	"github.com/stashapp/stash/internal/utils"
+	"github.com/stashapp/stash/manager/jsonschema"
+	"github.com/stashapp/stash/utils"
 	"os"
 	"os/user"
 	"path/filepath"

manager/paths/paths_fixed.go

@@ -2,7 +2,7 @@ package paths
 
 import (
 	"fmt"
-	"github.com/stashapp/stash/internal/utils"
+	"github.com/stashapp/stash/utils"
 	"path/filepath"
 	"runtime"
 	"strings"

manager/paths/paths_gallery.go

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

manager/paths/paths_generated.go

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

manager/paths/paths_json.go

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

manager/paths/paths_scenes.go

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

manager/task_export.go

@@ -3,11 +3,11 @@ package manager
 import (
 	"context"
 	"fmt"
-	"github.com/stashapp/stash/internal/database"
-	"github.com/stashapp/stash/internal/logger"
-	"github.com/stashapp/stash/internal/manager/jsonschema"
-	"github.com/stashapp/stash/internal/models"
-	"github.com/stashapp/stash/internal/utils"
+	"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"
 	"math"
 	"strconv"
 	"sync"

manager/task_import.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"database/sql"
 	"github.com/jmoiron/sqlx"
-	"github.com/stashapp/stash/internal/database"
-	"github.com/stashapp/stash/internal/logger"
-	"github.com/stashapp/stash/internal/manager/jsonschema"
-	"github.com/stashapp/stash/internal/models"
-	"github.com/stashapp/stash/internal/utils"
+	"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"
 	"strconv"
 	"sync"
 	"time"

manager/task_scan.go

@@ -3,11 +3,11 @@ package manager
 import (
 	"context"
 	"database/sql"
-	"github.com/stashapp/stash/internal/database"
-	"github.com/stashapp/stash/internal/ffmpeg"
-	"github.com/stashapp/stash/internal/logger"
-	"github.com/stashapp/stash/internal/models"
-	"github.com/stashapp/stash/internal/utils"
+	"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"
 	"path/filepath"
 	"strconv"
 	"sync"

manager/utils.go

@@ -1,6 +1,6 @@
 package manager
 
-import "github.com/stashapp/stash/internal/utils"
+import "github.com/stashapp/stash/utils"
 
 func IsStreamable(videoPath string, checksum string) (bool, error) {
 	fileType, err := utils.FileType(videoPath)

models/model_gallery.go

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

models/querybuilder_gallery.go

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

models/querybuilder_performer.go

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

models/querybuilder_scene.go

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

models/querybuilder_scene_marker.go

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

models/querybuilder_scraped_item.go

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

models/querybuilder_sql.go

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

models/querybuilder_studio.go

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

models/querybuilder_tag.go

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

scraper/freeones.go

@@ -3,8 +3,8 @@ package scraper
 import (
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
-	"github.com/stashapp/stash/internal/logger"
-	"github.com/stashapp/stash/internal/models"
+	"github.com/stashapp/stash/logger"
+	"github.com/stashapp/stash/models"
 	"net/http"
 	"net/url"
 	"regexp"