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

Replace natural_sort with third party call (#964)

Browse Source
This commit is contained in:
WithoutPants
2020-11-27 08:01:36 +11:00
committed by GitHub
parent 89277f1e25
commit 1d910419d1
2 changed files with 3 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/manager/generator_sprite.go
View File

@@ -8,10 +8,12 @@ import (
"math"
"os"
"path/filepath"
"sort"
"strings"
"github.com/bmatcuk/doublestar/v2"
"github.com/disintegration/imaging"
"github.com/fvbommel/sortorder"
"github.com/stashapp/stash/pkg/ffmpeg"
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/utils"
@@ -89,7 +91,7 @@ func (g *SpriteGenerator) generateSpriteImage(encoder *ffmpeg.Encoder) error {
// Combine all of the thumbnails into a sprite image
globPath := filepath.Join(instance.Paths.Generated.Tmp, fmt.Sprintf("thumbnail_%s_*.jpg", g.VideoChecksum))
imagePaths, _ := doublestar.Glob(globPath)
utils.NaturalSort(imagePaths)
sort.Sort(sortorder.Natural(imagePaths))
var images []image.Image
for _, imagePath := range imagePaths {
img, err := imaging.Open(imagePath)