mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 04:44:37 +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:
@@ -21,7 +21,6 @@ import Icon from "src/components/Shared/Icon";
|
||||
import { useToast } from "src/hooks";
|
||||
import SceneQueue from "src/models/sceneQueue";
|
||||
import { ListFilterModel } from "src/models/list-filter/filter";
|
||||
import TextUtils from "src/utils/text";
|
||||
import Mousetrap from "mousetrap";
|
||||
import { OCounterButton } from "./OCounterButton";
|
||||
import { OrganizedButton } from "./OrganizedButton";
|
||||
@@ -51,6 +50,7 @@ const SceneGalleriesPanel = lazy(() => import("./SceneGalleriesPanel"));
|
||||
const DeleteScenesDialog = lazy(() => import("../DeleteScenesDialog"));
|
||||
const GenerateDialog = lazy(() => import("../../Dialogs/GenerateDialog"));
|
||||
const SceneVideoFilterPanel = lazy(() => import("./SceneVideoFilterPanel"));
|
||||
import { objectPath, objectTitle } from "src/core/files";
|
||||
|
||||
interface IProps {
|
||||
scene: GQL.SceneDataFragment;
|
||||
@@ -185,7 +185,7 @@ const ScenePage: React.FC<IProps> = ({
|
||||
|
||||
async function onRescan() {
|
||||
await mutateMetadataScan({
|
||||
paths: [scene.path],
|
||||
paths: [objectPath(scene)],
|
||||
});
|
||||
|
||||
Toast.success({
|
||||
@@ -452,10 +452,12 @@ const ScenePage: React.FC<IProps> = ({
|
||||
return collapsed ? ">" : "<";
|
||||
}
|
||||
|
||||
const title = objectTitle(scene);
|
||||
|
||||
return (
|
||||
<>
|
||||
<Helmet>
|
||||
<title>{scene.title ?? TextUtils.fileNameFromPath(scene.path)}</title>
|
||||
<title>{title}</title>
|
||||
</Helmet>
|
||||
{maybeRenderSceneGenerateDialog()}
|
||||
{maybeRenderDeleteDialog()}
|
||||
@@ -476,9 +478,7 @@ const ScenePage: React.FC<IProps> = ({
|
||||
</Link>
|
||||
</h1>
|
||||
)}
|
||||
<h3 className="scene-header">
|
||||
{scene.title ?? TextUtils.fileNameFromPath(scene.path)}
|
||||
</h3>
|
||||
<h3 className="scene-header">{title}</h3>
|
||||
</div>
|
||||
{renderTabs()}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user