chore: move PieceContentStatusObj into more sensibly named file

nrkno · Oct 13, 2023 · 90f4e99 · 90f4e99
1 parent 48dbda2
commit 90f4e99
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/meteor/client/lib/shelf.ts b/meteor/client/lib/shelf.ts
@@ -13,7 +13,7 @@ import { UIShowStyleBase } from '../../lib/api/showStyles'
 import { PieceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PieceInstances } from '../collections'
 import { ReadonlyDeep } from 'type-fest'
-import { PieceContentStatusObj } from '../../lib/mediaObjects'
+import { PieceContentStatusObj } from '../../lib/api/pieceContentStatus'
 
 export interface ShelfDisplayOptions {
 	enableBuckets: boolean

diff --git a/meteor/client/ui/MediaStatus/MediaStatus.tsx b/meteor/client/ui/MediaStatus/MediaStatus.tsx
@@ -29,7 +29,7 @@ import { ProtectedString, unprotectString } from '@sofie-automation/corelib/dist
 import { ExpectedPackage } from '@sofie-automation/shared-lib/dist/package-manager/package'
 import { PartInvalidReason } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { IBlueprintActionManifestDisplayContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
-import { PieceContentStatusObj } from '../../../lib/mediaObjects'
+import { PieceContentStatusObj } from '../../../lib/api/pieceContentStatus'
 import { Piece, PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { assertNever, literal } from '@sofie-automation/corelib/dist/lib'
 import { UIPieceContentStatuses, UIShowStyleBases } from '../Collections'

diff --git a/meteor/client/ui/SegmentContainer/withResolvedSegment.ts b/meteor/client/ui/SegmentContainer/withResolvedSegment.ts
@@ -37,7 +37,7 @@ import { PieceInstances, Segments } from '../../collections'
 import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
 import { CalculateTimingsPiece } from '@sofie-automation/corelib/dist/playout/timings'
 import { ReadonlyDeep } from 'type-fest'
-import { PieceContentStatusObj } from '../../../lib/mediaObjects'
+import { PieceContentStatusObj } from '../../../lib/api/pieceContentStatus'
 import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
 
 export interface SegmentUi extends SegmentExtended {

diff --git a/meteor/client/ui/SegmentTimeline/withMediaObjectStatus.tsx b/meteor/client/ui/SegmentTimeline/withMediaObjectStatus.tsx
@@ -10,7 +10,7 @@ import { AdLibPieceUi } from '../../lib/shelf'
 import { UIStudio } from '../../../lib/api/studios'
 import { UIBucketContentStatuses, UIPieceContentStatuses } from '../Collections'
 import { Piece, PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { PieceContentStatusObj } from '../../../lib/mediaObjects'
+import { PieceContentStatusObj } from '../../../lib/api/pieceContentStatus'
 import { deepFreeze } from '@sofie-automation/corelib/dist/lib'
 import _ from 'underscore'
 import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'

diff --git a/meteor/lib/Rundown.ts b/meteor/lib/Rundown.ts
@@ -25,7 +25,7 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PieceInstances, Pieces } from './collections/libCollections'
 import { RundownPlaylistCollectionUtil } from './collections/rundownPlaylistUtil'
-import { PieceContentStatusObj } from './mediaObjects'
+import { PieceContentStatusObj } from './api/pieceContentStatus'
 import { ReadonlyDeep } from 'type-fest'
 import { PieceInstanceWithTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
 

diff --git a/meteor/lib/mediaObjects.ts → meteor/lib/api/pieceContentStatus.ts b/meteor/lib/mediaObjects.ts → meteor/lib/api/pieceContentStatus.ts
@@ -2,17 +2,6 @@ import { PackageInfo } from '@sofie-automation/blueprints-integration'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { ITranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 
-export interface ScanInfoForPackages {
-	[packageId: string]: ScanInfoForPackage
-}
-export interface ScanInfoForPackage {
-	/** Display name of the package  */
-	packageName: string
-	scan?: PackageInfo.FFProbeScan['payload']
-	deepScan?: PackageInfo.FFProbeDeepScan['payload']
-	timebase?: number // derived from scan
-}
-
 export interface PieceContentStatusObj {
 	status: PieceStatusCode
 	messages: ITranslatableMessage[]

diff --git a/meteor/lib/api/rundownNotifications.ts b/meteor/lib/api/rundownNotifications.ts
@@ -13,7 +13,7 @@ import {
 	SegmentId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ProtectedString } from '../lib'
-import { PieceContentStatusObj } from '../mediaObjects'
+import { PieceContentStatusObj } from './pieceContentStatus'
 import { ITranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 
 export type UISegmentPartNoteId = ProtectedString<'UISegmentPartNote'>

diff --git a/meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts b/meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts
@@ -31,7 +31,7 @@ import _ from 'underscore'
 import { getSideEffect } from '../../../lib/collections/ExpectedPackages'
 import { getActiveRoutes, getRoutedMappings } from '../../../lib/collections/Studios'
 import { ensureHasTrailingSlash, generateTranslation, unprotectString } from '../../../lib/lib'
-import { PieceContentStatusObj, ScanInfoForPackage, ScanInfoForPackages } from '../../../lib/mediaObjects'
+import { PieceContentStatusObj } from '../../../lib/api/pieceContentStatus'
 import { MediaObjects, PackageContainerPackageStatuses, PackageInfos } from '../../collections'
 import {
 	mediaObjectFieldSpecifier,
@@ -43,6 +43,17 @@ import {
 	PieceDependencies,
 } from './common'
 
+interface ScanInfoForPackages {
+	[packageId: string]: ScanInfoForPackage
+}
+interface ScanInfoForPackage {
+	/** Display name of the package  */
+	packageName: string
+	scan?: PackageInfo.FFProbeScan['payload']
+	deepScan?: PackageInfo.FFProbeDeepScan['payload']
+	timebase?: number // derived from scan
+}
+
 /**
  * Take properties from the mediainfo / medistream and transform into a
  * formatted string