mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 12:54:38 +03:00
File storage rewrite (#2676)
* Restructure data layer part 2 (#2599) * Refactor and separate image model * Refactor image query builder * Handle relationships in image query builder * Remove relationship management methods * Refactor gallery model/query builder * Add scenes to gallery model * Convert scene model * Refactor scene models * Remove unused methods * Add unit tests for gallery * Add image tests * Add scene tests * Convert unnecessary scene value pointers to values * Convert unnecessary pointer values to values * Refactor scene partial * Add scene partial tests * Refactor ImagePartial * Add image partial tests * Refactor gallery partial update * Add partial gallery update tests * Use zero/null package for null values * Add files and scan system * Add sqlite implementation for files/folders * Add unit tests for files/folders * Image refactors * Update image data layer * Refactor gallery model and creation * Refactor scene model * Refactor scenes * Don't set title from filename * Allow galleries to freely add/remove images * Add multiple scene file support to graphql and UI * Add multiple file support for images in graphql/UI * Add multiple file for galleries in graphql/UI * Remove use of some deprecated fields * Remove scene path usage * Remove gallery path usage * Remove path from image * Move funscript to video file * Refactor caption detection * Migrate existing data * Add post commit/rollback hook system * Lint. Comment out import/export tests * Add WithDatabase read only wrapper * Prepend tasks to list * Add 32 pre-migration * Add warnings in release and migration notes
This commit is contained in:
@@ -7,6 +7,7 @@ import { useToast } from "src/hooks";
|
||||
import { ConfigurationContext } from "src/hooks/Config";
|
||||
import { FormattedMessage, useIntl } from "react-intl";
|
||||
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
|
||||
import { objectPath } from "src/core/files";
|
||||
|
||||
interface IDeleteSceneDialogProps {
|
||||
selected: GQL.SlimSceneDataFragment[];
|
||||
@@ -69,13 +70,13 @@ export const DeleteScenesDialog: React.FC<IDeleteSceneDialogProps> = (
|
||||
setIsDeleting(false);
|
||||
}
|
||||
|
||||
function funscriptPath(scenePath: string) {
|
||||
const extIndex = scenePath.lastIndexOf(".");
|
||||
function funscriptPath(sp: string) {
|
||||
const extIndex = sp.lastIndexOf(".");
|
||||
if (extIndex !== -1) {
|
||||
return scenePath.substring(0, extIndex + 1) + "funscript";
|
||||
return sp.substring(0, extIndex + 1) + "funscript";
|
||||
}
|
||||
|
||||
return scenePath;
|
||||
return sp;
|
||||
}
|
||||
|
||||
function maybeRenderDeleteFileAlert() {
|
||||
@@ -86,9 +87,10 @@ export const DeleteScenesDialog: React.FC<IDeleteSceneDialogProps> = (
|
||||
const deletedFiles: string[] = [];
|
||||
|
||||
props.selected.forEach((s) => {
|
||||
deletedFiles.push(s.path);
|
||||
if (s.interactive) {
|
||||
deletedFiles.push(funscriptPath(s.path));
|
||||
const paths = s.files.map((f) => f.path);
|
||||
deletedFiles.push(...paths);
|
||||
if (s.interactive && s.files.length) {
|
||||
deletedFiles.push(funscriptPath(objectPath(s)));
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user