Add migration to reset scene sizes and scan logic to repopulate if empty

stashapp · Dec 15, 2020 · d8cd40c · d8cd40c
1 parent 81e2add
commit d8cd40c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/pkg/database/database.go b/pkg/database/database.go
@@ -20,7 +20,7 @@ import (
 
 var DB *sqlx.DB
 var dbPath string
-var appSchemaVersion uint = 15
+var appSchemaVersion uint = 16
 var databaseSchemaVersion uint
 
 const sqlite3Driver = "sqlite3ex"

diff --git a/pkg/database/migrations/16_reset_scene_size.up.sql b/pkg/database/migrations/16_reset_scene_size.up.sql
@@ -0,0 +1 @@
+UPDATE `scenes` SET `size` = NULL;
diff --git a/pkg/manager/task_scan.go b/pkg/manager/task_scan.go
@@ -360,7 +360,7 @@ func (t *ScanTask) scanScene() *models.Scene {
 		// if the mod time of the file is different than that of the associated
 		// scene, then recalculate the checksum and regenerate the thumbnail
 		modified := t.isFileModified(fileModTime, scene.FileModTime)
-		if modified {
+		if modified || !scene.Size.Valid {
 			scene, err = t.rescanScene(scene, fileModTime)
 			if err != nil {
 				logger.Error(err.Error())
@@ -534,7 +534,7 @@ func (t *ScanTask) scanScene() *models.Scene {
 			Height:     sql.NullInt64{Int64: int64(videoFile.Height), Valid: true},
 			Framerate:  sql.NullFloat64{Float64: videoFile.FrameRate, Valid: true},
 			Bitrate:    sql.NullInt64{Int64: videoFile.Bitrate, Valid: true},
-			Size:       sql.NullString{String: strconv.Itoa(int(videoFile.Size)), Valid: true},
+			Size:       sql.NullString{String: strconv.FormatInt(videoFile.Size, 10), Valid: true},
 			FileModTime: models.NullSQLiteTimestamp{
 				Timestamp: fileModTime,
 				Valid:     true,
@@ -610,7 +610,7 @@ func (t *ScanTask) rescanScene(scene *models.Scene, fileModTime time.Time) (*mod
 		Height:     &sql.NullInt64{Int64: int64(videoFile.Height), Valid: true},
 		Framerate:  &sql.NullFloat64{Float64: videoFile.FrameRate, Valid: true},
 		Bitrate:    &sql.NullInt64{Int64: videoFile.Bitrate, Valid: true},
-		Size:       &sql.NullString{String: strconv.Itoa(int(videoFile.Size)), Valid: true},
+		Size:       &sql.NullString{String: strconv.FormatInt(videoFile.Size, 10), Valid: true},
 		FileModTime: &models.NullSQLiteTimestamp{
 			Timestamp: fileModTime,
 			Valid:     true,

diff --git a/ui/v2.5/src/components/Changelog/versions/v050.md b/ui/v2.5/src/components/Changelog/versions/v050.md
@@ -1,3 +1,5 @@
+#### 💥 **Note: After upgrading, all scene file sizes will be 0B until a new [scan](/settings?tab=tasks) is run.
+
 ### ✨ New Features
 * Allow configuration of visible navbar items.
 
@@ -12,4 +14,5 @@
 * Support configurable number of threads for scanning and generation.
 
 ### 🐛 Bug fixes
+* Corrected file sizes on 32bit platforms
 * Fixed login redirect to remember the current page.