Update useProject hook to handle consolidated project structure data.
This commit is contained in:
@@ -12,8 +12,7 @@ import { getProjectFile } from '../lib/midi';
|
|||||||
import {
|
import {
|
||||||
collectEffects,
|
collectEffects,
|
||||||
collectPads,
|
collectPads,
|
||||||
collectScenesAndPatterns,
|
collectProjectStructure,
|
||||||
collectScenesSettings,
|
|
||||||
collectSettings,
|
collectSettings,
|
||||||
collectSounds,
|
collectSounds,
|
||||||
loadSoundsFromBackup,
|
loadSoundsFromBackup,
|
||||||
@@ -71,8 +70,10 @@ function useProject(id?: number | string) {
|
|||||||
: await collectSounds(files);
|
: await collectSounds(files);
|
||||||
const settings = collectSettings(files);
|
const settings = collectSettings(files);
|
||||||
const pads = collectPads(files, sounds);
|
const pads = collectPads(files, sounds);
|
||||||
const scenes = collectScenesAndPatterns(files, device?.sku || backupSku || deviceSku);
|
const projectStructure = collectProjectStructure(
|
||||||
const scenesSettings = collectScenesSettings(files);
|
files,
|
||||||
|
device?.sku || backupSku || deviceSku,
|
||||||
|
);
|
||||||
const effects = collectEffects(files);
|
const effects = collectEffects(files);
|
||||||
|
|
||||||
// @ts-expect-error wrong typing?
|
// @ts-expect-error wrong typing?
|
||||||
@@ -88,12 +89,14 @@ function useProject(id?: number | string) {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
pads,
|
pads,
|
||||||
scenes,
|
groupPatterns: projectStructure.groupPatterns,
|
||||||
|
scenes: projectStructure.scenes,
|
||||||
|
songPositions: projectStructure.songPositions,
|
||||||
settings,
|
settings,
|
||||||
sounds,
|
sounds,
|
||||||
effects,
|
effects,
|
||||||
projectFile,
|
projectFile,
|
||||||
scenesSettings,
|
scenesSettings: projectStructure.scenesSettings,
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const message = error instanceof Error ? error.message : 'Failed to load project';
|
const message = error instanceof Error ? error.message : 'Failed to load project';
|
||||||
|
|||||||
Reference in New Issue
Block a user