Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-01-17 21:52:55 +01:00
Code Issues Projects Releases Wiki Activity

Use basename as title if empty when scraping by fragment (#3040)

Browse source 
* Fallback to file basename if title empty in scrape
* Populate dialog from basename if title empty
This commit is contained in:
WithoutPants 2022-10-24 14:36:22 +11:00 committed by GitHub
parent 091950615e
commit 47395ce13f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/models/model_gallery.go
View file

@ -2,6 +2,7 @@ package models
import (
"context"
"path/filepath"
"strconv"
"time"
@ -128,7 +129,7 @@ func (g Gallery) GetTitle() string {
return g.Title
}
return g.Path
return filepath.Base(g.Path)
}
// DisplayName returns a display name for the scene for logging purposes.

10
pkg/scraper/stash.go
View file

@ -319,9 +319,12 @@ func sceneToUpdateInput(scene *models.Scene) models.SceneUpdateInput {
return nil
}
// fallback to file basename if title is empty
title := scene.GetTitle()
return models.SceneUpdateInput{
ID: strconv.Itoa(scene.ID),
Title: &scene.Title,
Title: &title,
Details: &scene.Details,
URL: &scene.URL,
Date: dateToStringPtr(scene.Date),
@ -338,9 +341,12 @@ func galleryToUpdateInput(gallery *models.Gallery) models.GalleryUpdateInput {
return nil
}
// fallback to file basename if title is empty
title := gallery.GetTitle()
return models.GalleryUpdateInput{
ID: strconv.Itoa(gallery.ID),
Title: &gallery.Title,
Title: &title,
Details: &gallery.Details,
URL: &gallery.URL,
Date: dateToStringPtr(gallery.Date),

2
ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
View file

@ -476,7 +476,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
setScraper(undefined);
onSceneSelected(s);
}}
name={formik.values.title || ""}
name={formik.values.title || objectTitle(scene) || ""}
/>
);
};