« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src/data/composite/things/track
diff options
context:
space:
mode:
Diffstat (limited to 'src/data/composite/things/track')
-rw-r--r--src/data/composite/things/track/index.js1
-rw-r--r--src/data/composite/things/track/withCoverArtistContribs.js7
-rw-r--r--src/data/composite/things/track/withTrackArtDate.js58
3 files changed, 2 insertions, 64 deletions
diff --git a/src/data/composite/things/track/index.js b/src/data/composite/things/track/index.js
index 35deb93f..96865e09 100644
--- a/src/data/composite/things/track/index.js
+++ b/src/data/composite/things/track/index.js
@@ -11,5 +11,4 @@ export {default as withOtherReleases} from './withOtherReleases.js';
 export {default as withPropertyFromAlbum} from './withPropertyFromAlbum.js';
 export {default as withPropertyFromMainRelease} from './withPropertyFromMainRelease.js';
 export {default as withSuffixDirectoryFromAlbum} from './withSuffixDirectoryFromAlbum.js';
-export {default as withTrackArtDate} from './withTrackArtDate.js';
 export {default as withTrackNumber} from './withTrackNumber.js';
diff --git a/src/data/composite/things/track/withCoverArtistContribs.js b/src/data/composite/things/track/withCoverArtistContribs.js
index 313d4552..26f21160 100644
--- a/src/data/composite/things/track/withCoverArtistContribs.js
+++ b/src/data/composite/things/track/withCoverArtistContribs.js
@@ -11,7 +11,6 @@ import {
 
 import exitWithoutUniqueCoverArt from './exitWithoutUniqueCoverArt.js';
 import withPropertyFromAlbum from './withPropertyFromAlbum.js';
-import withTrackArtDate from './withTrackArtDate.js';
 
 export default templateCompositeFrom({
   annotation: `withCoverArtistContribs`,
@@ -31,13 +30,11 @@ export default templateCompositeFrom({
       value: input.value([]),
     }),
 
-    withTrackArtDate(),
-
     withResolvedContribs({
       from: input('from'),
       thingProperty: input.value('coverArtistContribs'),
       artistProperty: input.value('trackCoverArtistContributions'),
-      date: '#trackArtDate',
+      date: 'coverArtDate',
     }).outputs({
       '#resolvedContribs': '#coverArtistContribs',
     }),
@@ -58,7 +55,7 @@ export default templateCompositeFrom({
 
     withRedatedContributionList({
       list: '#album.trackCoverArtistContribs',
-      date: '#trackArtDate',
+      date: 'coverArtDate',
     }),
 
     {
diff --git a/src/data/composite/things/track/withTrackArtDate.js b/src/data/composite/things/track/withTrackArtDate.js
deleted file mode 100644
index d7d043d6..00000000
--- a/src/data/composite/things/track/withTrackArtDate.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import {input, templateCompositeFrom} from '#composite';
-import {isDate} from '#validators';
-
-import {raiseOutputWithoutDependency} from '#composite/control-flow';
-
-import withPropertyFromAlbum from './withPropertyFromAlbum.js';
-
-export default templateCompositeFrom({
-  annotation: `withTrackArtDate`,
-
-  inputs: {
-    from: input({
-      validate: isDate,
-      defaultDependency: '_coverArtDate',
-      acceptsNull: true,
-    }),
-  },
-
-  outputs: ['#trackArtDate'],
-
-  steps: () => [
-    raiseOutputWithoutDependency({
-      dependency: 'hasUniqueCoverArt',
-      mode: input.value('falsy'),
-      output: input.value({'#trackArtDate': null}),
-    }),
-
-    {
-      dependencies: [input('from')],
-      compute: (continuation, {
-        [input('from')]: from,
-      }) =>
-        (from
-          ? continuation.raiseOutput({'#trackArtDate': from})
-          : continuation()),
-    },
-
-    withPropertyFromAlbum({
-      property: input.value('trackArtDate'),
-    }),
-
-    {
-      dependencies: ['#album.trackArtDate'],
-      compute: (continuation, {
-        ['#album.trackArtDate']: albumTrackArtDate,
-      }) =>
-        (albumTrackArtDate
-          ? continuation.raiseOutput({'#trackArtDate': albumTrackArtDate})
-          : continuation()),
-    },
-
-    {
-      dependencies: ['date'],
-      compute: (continuation, {date}) =>
-        continuation({'#trackArtDate': date}),
-    },
-  ],
-});