Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Restructure go project (#2356)

Browse Source 
* Move main to cmd
* Move api to internal
* Move logger and manager to internal
* Move shell hiding code to separate package
* Decouple job from desktop and utils
* Decouple session from config
* Move static into internal
* Decouple config from dlna
* Move desktop to internal
* Move dlna to internal
* Decouple remaining packages from config
* Move config into internal
* Move jsonschema and paths to models
* Make ffmpeg functions private
* Move file utility methods into fsutil package
* Move symwalk into fsutil
* Move single-use util functions into client package
* Move slice functions to separate packages
* Add env var to suppress windowsgui arg
* Move hash functions into separate package
* Move identify to internal
* Move autotag to internal
* Touch UI when generating backend
This commit is contained in:
WithoutPants
2022-03-17 11:33:59 +11:00
committed by GitHub
parent dcee874f59
commit f69bd8a94f
334 changed files with 1845 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/sqlite/filter.go
View File

@@ -8,9 +8,9 @@ import (
"strings"
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/utils"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/utils"
)
type sqlClause struct {

6
pkg/sqlite/movies_test.go
View File

@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stashapp/stash/pkg/hash/md5"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/utils"
)
func TestMovieFindByName(t *testing.T) {
@@ -222,7 +222,7 @@ func TestMovieUpdateMovieImages(t *testing.T) {
const name = "TestMovieUpdateMovieImages"
movie := models.Movie{
Name: sql.NullString{String: name, Valid: true},
Checksum: utils.MD5FromString(name),
Checksum: md5.FromString(name),
}
created, err := mqb.Create(movie)
if err != nil {
@@ -289,7 +289,7 @@ func TestMovieDestroyMovieImages(t *testing.T) {
const name = "TestMovieDestroyMovieImages"
movie := models.Movie{
Name: sql.NullString{String: name, Valid: true},
Checksum: utils.MD5FromString(name),
Checksum: md5.FromString(name),
}
created, err := mqb.Create(movie)
if err != nil {

8
pkg/sqlite/performer_test.go
View File

@@ -13,8 +13,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stashapp/stash/pkg/hash/md5"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/utils"
)
func TestPerformerFindBySceneID(t *testing.T) {
@@ -266,7 +266,7 @@ func TestPerformerUpdatePerformerImage(t *testing.T) {
const name = "TestPerformerUpdatePerformerImage"
performer := models.Performer{
Name: sql.NullString{String: name, Valid: true},
Checksum: utils.MD5FromString(name),
Checksum: md5.FromString(name),
Favorite: sql.NullBool{Bool: false, Valid: true},
}
created, err := qb.Create(performer)
@@ -307,7 +307,7 @@ func TestPerformerDestroyPerformerImage(t *testing.T) {
const name = "TestPerformerDestroyPerformerImage"
performer := models.Performer{
Name: sql.NullString{String: name, Valid: true},
Checksum: utils.MD5FromString(name),
Checksum: md5.FromString(name),
Favorite: sql.NullBool{Bool: false, Valid: true},
}
created, err := qb.Create(performer)
@@ -827,7 +827,7 @@ func TestPerformerStashIDs(t *testing.T) {
const name = "TestStashIDs"
performer := models.Performer{
Name: sql.NullString{String: name, Valid: true},
Checksum: utils.MD5FromString(name),
Checksum: md5.FromString(name),
Favorite: sql.NullBool{Bool: false, Valid: true},
}
created, err := qb.Create(performer)

10
pkg/sqlite/scene_test.go
View File

@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stashapp/stash/pkg/hash/md5"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/utils"
)
func TestSceneFind(t *testing.T) {
@@ -761,7 +761,7 @@ func createScene(queryBuilder models.SceneReaderWriter, width int64, height int6
Int64: height,
Valid: true,
},
Checksum: sql.NullString{String: utils.MD5FromString(name), Valid: true},
Checksum: sql.NullString{String: md5.FromString(name), Valid: true},
}
return queryBuilder.Create(scene)
@@ -1597,7 +1597,7 @@ func TestSceneUpdateSceneCover(t *testing.T) {
const name = "TestSceneUpdateSceneCover"
scene := models.Scene{
Path: name,
Checksum: sql.NullString{String: utils.MD5FromString(name), Valid: true},
Checksum: sql.NullString{String: md5.FromString(name), Valid: true},
}
created, err := qb.Create(scene)
if err != nil {
@@ -1637,7 +1637,7 @@ func TestSceneDestroySceneCover(t *testing.T) {
const name = "TestSceneDestroySceneCover"
scene := models.Scene{
Path: name,
Checksum: sql.NullString{String: utils.MD5FromString(name), Valid: true},
Checksum: sql.NullString{String: md5.FromString(name), Valid: true},
}
created, err := qb.Create(scene)
if err != nil {
@@ -1676,7 +1676,7 @@ func TestSceneStashIDs(t *testing.T) {
const name = "TestSceneStashIDs"
scene := models.Scene{
Path: name,
Checksum: sql.NullString{String: utils.MD5FromString(name), Valid: true},
Checksum: sql.NullString{String: md5.FromString(name), Valid: true},
}
created, err := qb.Create(scene)
if err != nil {

11
pkg/sqlite/setup_test.go
View File

@@ -15,10 +15,11 @@ import (
"github.com/stashapp/stash/pkg/database"
"github.com/stashapp/stash/pkg/gallery"
"github.com/stashapp/stash/pkg/hash/md5"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/scene"
"github.com/stashapp/stash/pkg/sliceutil/intslice"
"github.com/stashapp/stash/pkg/sqlite"
"github.com/stashapp/stash/pkg/utils"
)
const (
@@ -755,7 +756,7 @@ func createMovies(mqb models.MovieReaderWriter, n int, o int) error {
movie := models.Movie{
Name: sql.NullString{String: name, Valid: true},
URL: getMovieNullStringValue(index, urlField),
Checksum: utils.MD5FromString(name),
Checksum: md5.FromString(name),
}
created, err := mqb.Create(movie)
@@ -976,7 +977,7 @@ func getStudioNullStringValue(index int, field string) sql.NullString {
func createStudio(sqb models.StudioReaderWriter, name string, parentID *int64) (*models.Studio, error) {
studio := models.Studio{
Name: sql.NullString{String: name, Valid: true},
Checksum: utils.MD5FromString(name),
Checksum: md5.FromString(name),
}
if parentID != nil {
@@ -1014,7 +1015,7 @@ func createStudios(sqb models.StudioReaderWriter, n int, o int) error {
name = getStudioStringValue(index, name)
studio := models.Studio{
Name: sql.NullString{String: name, Valid: true},
Checksum: utils.MD5FromString(name),
Checksum: md5.FromString(name),
URL: getStudioNullStringValue(index, urlField),
}
created, err := createStudioFromModel(sqb, studio)
@@ -1129,7 +1130,7 @@ func linkPerformerTags(qb models.PerformerReaderWriter) error {
return err
}
tagIDs = utils.IntAppendUnique(tagIDs, tagID)
tagIDs = intslice.IntAppendUnique(tagIDs, tagID)
return qb.UpdateTags(performerID, tagIDs)
})