Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 16:34:02 +01:00
Code Issues Projects Releases Wiki Activity

temp

Browse source
This commit is contained in:
Stash Dev 2020-01-06 15:35:24 -08:00
parent f8aa0433a3
commit a24194164d
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/manager/task_import.go
View file

@ -70,9 +70,6 @@ func (t *ImportTask) ImportPerformers(ctx context.Context) {
logger.Progressf("[performers] %d of %d", index, len(t.Mappings.Performers)) logger.Progressf("[performers] %d of %d", index, len(t.Mappings.Performers))
// generate checksum from performer name rather than image
checksum := utils.MD5FromString(performerJSON.Name)
// Process the base 64 encoded image string // Process the base 64 encoded image string
_, imageData, err := utils.ProcessBase64Image(performerJSON.Image) _, imageData, err := utils.ProcessBase64Image(performerJSON.Image)
if err != nil { if err != nil {
@ -81,6 +78,8 @@ func (t *ImportTask) ImportPerformers(ctx context.Context) {
return return
} }
checksum := utils.MD5FromBytes(imageData)
// Populate a new performer from the input // Populate a new performer from the input
newPerformer := models.Performer{ newPerformer := models.Performer{
Image: imageData, Image: imageData,
@ -168,9 +167,6 @@ func (t *ImportTask) ImportStudios(ctx context.Context) {
logger.Progressf("[studios] %d of %d", index, len(t.Mappings.Studios)) logger.Progressf("[studios] %d of %d", index, len(t.Mappings.Studios))
// generate checksum from studio name rather than image
checksum := utils.MD5FromString(studioJSON.Name)
// Process the base 64 encoded image string // Process the base 64 encoded image string
_, imageData, err := utils.ProcessBase64Image(studioJSON.Image) _, imageData, err := utils.ProcessBase64Image(studioJSON.Image)
if err != nil { if err != nil {
@ -179,6 +175,8 @@ func (t *ImportTask) ImportStudios(ctx context.Context) {
return return
} }
checksum := utils.MD5FromBytes(imageData)
// Populate a new studio from the input // Populate a new studio from the input
newStudio := models.Studio{ newStudio := models.Studio{
Image: imageData, Image: imageData,

3
pkg/models/sqlite_date.go
View file

@ -32,6 +32,9 @@ func (t *SQLiteDate) Scan(value interface{}) error {
// Value implements the driver Valuer interface. // Value implements the driver Valuer interface.
func (t SQLiteDate) Value() (driver.Value, error) { func (t SQLiteDate) Value() (driver.Value, error) {
if !t.Valid {
return nil, nil
}
result, err := utils.ParseDateStringAsFormat(t.String, "2006-01-02") result, err := utils.ParseDateStringAsFormat(t.String, "2006-01-02")
if err != nil { if err != nil {
logger.Debugf("sqlite date conversion error: %s", err.Error()) logger.Debugf("sqlite date conversion error: %s", err.Error())