From 75e68aa1c8886e69d63a0e0b365fd6a7c309412c Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Thu, 28 May 2026 13:24:20 -0300 Subject: data: Track.directoryWithinAlbum --- src/data/things/album/Album.js | 11 +++++------ src/data/things/album/TrackSection.js | 16 ++++++++-------- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'src/data/things/album') diff --git a/src/data/things/album/Album.js b/src/data/things/album/Album.js index 7efc2d8c..369186f3 100644 --- a/src/data/things/album/Album.js +++ b/src/data/things/album/Album.js @@ -122,8 +122,7 @@ export class Album extends Thing { directory: directory(), - // note: this is currently strictly "directory suffix for tracks" - directorySuffix: [ + directorySuffixForTracks: [ exposeUpdateValueOrContinue({ validate: input.value(isDirectory), }), @@ -137,6 +136,8 @@ export class Album extends Thing { }, ], + suffixTrackDirectoriesByDefault: flag(V(false)), + alwaysReferenceByDirectory: flag(V(false)), referenceTracksByDirectory: [ @@ -153,8 +154,6 @@ export class Album extends Thing { exposeConstant(V('normally')), ], - suffixTrackDirectories: flag(V(false)), - style: [ exposeUpdateValueOrContinue({ validate: input.value(is(...[ @@ -640,8 +639,8 @@ export class Album extends Thing { 'Name Detail For Tracks': {property: 'nameDetailForTracks'}, 'Directory': {property: 'directory'}, - 'Directory Suffix': {property: 'directorySuffix'}, - 'Suffix Track Directories': {property: 'suffixTrackDirectories'}, + 'Directory Suffix': {property: 'directorySuffixForTracks'}, + 'Suffix Track Directories': {property: 'suffixTrackDirectoriesByDefault'}, 'Always Reference By Directory': {property: 'alwaysReferenceByDirectory'}, diff --git a/src/data/things/album/TrackSection.js b/src/data/things/album/TrackSection.js index 451f8f7b..00963d1b 100644 --- a/src/data/things/album/TrackSection.js +++ b/src/data/things/album/TrackSection.js @@ -50,22 +50,22 @@ export class TrackSection extends Thing { unqualifiedDirectory: directory(), - directorySuffix: [ + directorySuffixForTracks: [ exposeUpdateValueOrContinue({ validate: input.value(isDirectory), }), - withPropertyFromObject('album', V('directorySuffix')), - exposeDependency('#album.directorySuffix'), + withPropertyFromObject('album', V('directorySuffixForTracks')), + exposeDependency('#album.directorySuffixForTracks'), ], - suffixTrackDirectories: [ + suffixTrackDirectoriesByDefault: [ exposeUpdateValueOrContinue({ validate: input.value(isBoolean), }), - withPropertyFromObject('album', V('suffixTrackDirectories')), - exposeDependency('#album.suffixTrackDirectories'), + withPropertyFromObject('album', V('suffixTrackDirectoriesByDefault')), + exposeDependency('#album.suffixTrackDirectoriesByDefault'), ], color: [ @@ -204,8 +204,8 @@ export class TrackSection extends Thing { static [Thing.yamlDocumentSpec] = { fields: { 'Section': {property: 'name'}, - 'Directory Suffix': {property: 'directorySuffix'}, - 'Suffix Track Directories': {property: 'suffixTrackDirectories'}, + 'Directory Suffix': {property: 'directorySuffixForTracks'}, + 'Suffix Track Directories': {property: 'suffixTrackDirectoriesByDefault'}, 'Color': {property: 'color'}, 'Has Track Numbers': {property: 'hasTrackNumbers'}, -- cgit 1.3.0-6-gf8a5