conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import BoxSeries from './boxSeries';
import {
BoxSeriesType,
BoxSeriesDataType,
ColumnChartOptions,
BarChartOptions,
Point,
Connector,
StackType,
} from '@t/options';
=======
import BoxSeries, { SeriesRawData, isLeftBottomSide } from './boxSeries';
import { ColumnChartOptions, BarChartOptions, P... |
<<<<<<<
declare module '*.json'
declare module '*.png'
declare module '*.jpg'
declare module '*.jpeg'
declare module '*.svg'
declare module '@generated' // .ovine/*
=======
declare module '@generated' // .ovine/*
interface Window {
BEFORE_OVINE_CREATE: any // 页面全局函数hook
AFTER_OVINE_CREATED: any // 页面全局函数hook
}
... |
<<<<<<<
// << (hide)
import {ModalDialogService} from "nativescript-angular/modal-dialog";
// >> (hide)
import { IfAndroidDirective, IfIosDirective } from "./ng-directives/create-custom-directive/create-custom-directive.component"
import { UnlessDirective } from "./ng-directives/unless-directive/directive-unless"
====... |
<<<<<<<
new Link("Formatted String", "/formattedStringExamplesComponent"),
new Link("Trace Module", "/traceExampleComponent"),
new Link("Timer Module", "/sampleTimerModuleExampleComponent"),
new Link("Platform Module ", "/platformExamplesComponent"),
new Link("Location Module", "/locationExamplesCom... |
<<<<<<<
{ path: "buttonTextExampleComponent", component: ButtonTextComponent, data: { title: "Text" } },
{ path: "buttonTapEventExampleComponent", component: ButtonTapEventComponent, data: { title: "Tap Event" } },
{ path: "scrollViewExampleComponent", component: ScrollViewExamplesComponent, data: { title: "Scrol... |
<<<<<<<
insertTimelineObject(cache, studioId, timelineObject)
cache.saveTimelineThenAllToDatabase()
=======
insertTimelineObject(this, cache, studioId, timelineObject)
waitForPromise(cache.saveAllToDatabase())
>>>>>>>
insertTimelineObject(this, cache, studioId, timelineObject)
cache.saveTimelineThe... |
<<<<<<<
import { mongoWhere, literal, Omit, ProtectedString, unprotectString, protectString, mongoModify, mongoFindOptions } from '../lib/lib'
=======
import {
pushOntoPath,
setOntoPath,
mongoWhere,
literal,
unsetPath,
pullFromPath,
Omit,
ProtectedString,
unprotectString,
protectString,
mongoModify,
mongo... |
<<<<<<<
if (showStyle && rundownStudio) {
const showStyleBase = showStyle
const studio = rundownStudio
const pieceStatus = Pieces.find({
rundownId: rundown._id
}).map((piece) => { // run these in parallel
const sourceLayer = showStyleBase.sourceLayers.find(i => i._id === piece.sourceLayerId)
c... |
<<<<<<<
if (mediaObject.mediainfo.streams) {
if (mediaObject.mediainfo.streams.length < 2) {
newStatus = RundownAPI.PieceStatusCode.SOURCE_BROKEN
messages.push(t('Source doesn\'t have audio & video', { fileName: displayName }))
}
const formats = getAcceptedFormats(settin... |
<<<<<<<
import { TransformedCollection } from '../typings/meteor'
import { applyClassToDocument, Time, registerCollection, ProtectedString, ProtectedStringProperties, protectString, unprotectString, Omit } from '../lib'
=======
import { TransformedCollection, MongoSelector, FindOptions } from '../typings/meteor'
impo... |
<<<<<<<
getAllAdLibPieces () {
return this.getAdLibPieces()
}
getTimings () {
// return a chronological list of timing events
let events: Array<{time: Time, type: string, elapsed: Time}> = []
_.each(['take', 'takeDone', 'startedPlayback', 'takeOut', 'stoppedPlayback', 'next'], (key) => {
if (this.timings)... |
<<<<<<<
import { Studios } from '../../lib/collections/Studios'
import { PeripheralDevices } from '../../lib/collections/PeripheralDevices'
import { ShowStyleBases } from '../../lib/collections/ShowStyleBases'
=======
import { CoreSystem } from '../../lib/collections/CoreSystem'
>>>>>>>
import { Studios } from '../.... |
<<<<<<<
export function bucketsRemoveBucket(context: MethodContext, id: BucketId) {
return ClientAPI.responseSuccess(BucketsAPI.removeBucket(context, id))
=======
export function bucketsRemoveBucket(id: BucketId) {
check(id, String)
return ClientAPI.responseSuccess(BucketsAPI.removeBucket(id))
>>>>>>>
export fun... |
<<<<<<<
checkAccessAndGetPeripheralDevice,
=======
extendIngestRundownCore,
modifyPlaylistExternalId,
>>>>>>>
checkAccessAndGetPeripheralDevice,
extendIngestRundownCore,
modifyPlaylistExternalId, |
<<<<<<<
import { takeNextPartInner, afterTake } from './take'
import { syncPlayheadInfinitesForNextPartInstance } from './infinites'
=======
import { PeripheralDeviceAPI } from '../../../lib/api/peripheralDevice'
import { check, Match } from '../../../lib/check'
>>>>>>>
import { takeNextPartInner, afterTake } from '... |
<<<<<<<
currentSegment: false,
showThumbnailsInList: false
=======
currentSegment: false,
>>>>>>>
currentSegment: false,
showThumbnailsInList: false, |
<<<<<<<
constructor (localName: string, options?: any) {
this.localName = localName
=======
private _transform?: (o: T) => T
constructor (name: string, options: any) {
>>>>>>>
private _transform?: (o: T) => T
constructor (name: string, options?: any) { |
<<<<<<<
import { check, Match } from 'meteor/check'
import { Rundowns, Rundown, RundownHoldState, RundownData } from '../../../lib/collections/Rundowns'
=======
import { check } from 'meteor/check'
import { Rundowns, Rundown, RundownHoldState } from '../../../lib/collections/Rundowns'
>>>>>>>
import { check, Match }... |
<<<<<<<
waitForPromise,
PreparedChanges,
prepareSaveIntoDb,
savePreparedChanges,
Optional
=======
waitForPromise,
asyncCollectionFindOne,
waitForPromiseAll,
asyncCollectionRemove,
normalizeArray,
normalizeArrayFunc,
asyncCollectionInsert
>>>>>>>
waitForPromise,
PreparedChanges,
prepareSaveIntoDb,
sav... |
<<<<<<<
import { RundownPlaylists } from '../../lib/collections/RundownPlaylists'
import { PartInstances } from '../../lib/collections/PartInstances'
import { PieceInstances, PieceInstance } from '../../lib/collections/PieceInstances'
=======
import { RundownPlaylists } from '../../lib/collections/RundownPlaylists'
... |
<<<<<<<
getRundownIDs (selector?: MongoQuery<DBRundown>, options?: FindOptions<DBRundown>): RundownId[] {
return this.getRundowns(selector, _.extend({
sort: {
_rank: 1,
_id: 1
},
fields: {
_rank: 1,
_id: 1
}
}, options)).map(i => i._id)
=======
getRundownIDs(selector?: MongoSelector<... |
<<<<<<<
rundowns.map((i) => {
const cache = waitForPromise(initCacheForRundownPlaylistFromRundown(i._id)) // todo: is this correct? - what if rundown has no playlist?
updateExpectedMediaItemsOnRundown(cache, i._id)
waitForPromise(cache.saveAllToDatabase())
})
}
})
}
=======
const cache = waitFo... |
<<<<<<<
import { PartInstance } from '../../../lib/collections/PartInstances'
import { PieceInstance } from '../../../lib/collections/PieceInstances'
=======
import { isNumber } from 'util'
>>>>>>>
import { PartInstance } from '../../../lib/collections/PartInstances'
import { PieceInstance } from '../../../lib/colle... |
<<<<<<<
import { getCurrentTime, literal, protectString, unprotectString, getRandomId, waitForPromise, unprotectStringArray } from '../../../lib/lib'
=======
import {
getCurrentTime,
literal,
protectString,
unprotectString,
getRandomId,
waitForPromise,
MeteorPromiseCall,
} from '../../../lib/lib'
>>>>>>>
impo... |
<<<<<<<
/** If true, enables security measures, access control and user accounts. */
enableUserAccounts: boolean
=======
/** Allow Segments to become unsynced, rather than the entire rundown */
allowUnsyncedSegments: boolean
>>>>>>>
/** If true, enables security measures, access control and user accounts. */
e... |
<<<<<<<
=======
let methods: Methods = {}
methods[PlayoutAPI.methods.rundownPrepareForBroadcast] = (playlistId: string) => {
return ServerPlayoutAPI.prepareRundownForBroadcast(playlistId)
}
methods[PlayoutAPI.methods.rundownResetRundown] = (playlistId: string) => {
return ServerPlayoutAPI.resetRundown(playlistId)
}... |
<<<<<<<
getRundownIDs (selector?: MongoSelector<DBRundownPlaylist>, options?: FindOptions<DBRundown>): RundownId[] {
return this.getRundowns(selector, _.extend({
sort: {
_rank: 1,
_id: 1
},
fields: {
_rank: 1,
_id: 1
}
}, options)).map(i => i._id)
=======
getRundownIDs(selector?: Mon... |
<<<<<<<
=======
import { Timeline, getTimelineId, TimelineComplete, TimelineHash } from '../../lib/collections/Timeline'
import { Studios } from '../../lib/collections/Studios'
>>>>>>>
import { Timeline, TimelineComplete, TimelineHash } from '../../lib/collections/Timeline'
<<<<<<<
import { initCacheForNoRundownPla... |
<<<<<<<
cache.saveTimelineThenAllToDatabase()
=======
if (actionContext.takeAfterExecute) {
return ServerPlayoutAPI.callTakeWithCache(context, rundownPlaylistId, now, cache)
} else {
if (
actionContext.currentPartState !== ActionPartChange.NONE ||
actionContext.nextPartState !== ActionPartC... |
<<<<<<<
import { ReloadRundownResponse } from '../../../lib/api/userActions'
import { INewsDeviceActions } from './iNewsDevice/actions'
import { waitForPromise } from '../../../lib/lib'
import { initCacheForRundownPlaylist } from '../../DatabaseCaches'
=======
import { TriggerReloadDataResponse } from '../../../lib/a... |
<<<<<<<
import { getHash, formatDateAsTimecode, formatDurationAsTimecode, unprotectString, unprotectObject, unprotectObjectArray, protectString, check, getCurrentTime } from '../../../lib/lib'
=======
import {
getHash,
formatDateAsTimecode,
formatDurationAsTimecode,
unprotectString,
unprotectObject,
unprotectOb... |
<<<<<<<
const infiniteGroup = createPartGroup(currentPartInstance, { duration: piece.piece.enable.duration || undefined })
infiniteGroup.id = getPartGroupId(unprotectString(piece._id)) + '_infinite' // This doesnt want to belong to a part, so force the ids
=======
const infiniteGroup = createPartGroup(curren... |
<<<<<<<
getRandomId,
=======
getRandomId,
applyToArray,
>>>>>>>
getRandomId,
applyToArray,
<<<<<<<
let tloldo: TimelineObjGeneric | undefined = oldTimelineObjsMap[tlo.id]
// let tlo: TimelineObjGeneric | undefined = timelineObjs.find((x) => x._id === tloldo._id)
=======
let tloldo: TimelineObjGeneric |... |
<<<<<<<
blueprint: makeMethods(BlueprintAPIMethods),
client: makeMethods(ClientAPIMethods),
externalMessages: makeMethods(ExternalMessageQueueAPIMethods),
manualPlayout: makeMethods(ManualPlayoutAPIMethods),
migration: makeMethods(MigrationAPIMethods),
peripheralDevice: makeMethods(PeripheralDeviceAPIMethods),
p... |
<<<<<<<
let parts = playlist.getParts()
let segments = playlist.getSegments()
=======
const parts = rundown.getParts()
const partsInSegments: {[segmentId: string]: Part[]} = {}
const segmentsWithParts: Segment[] = []
_.each(rundown.getSegments(), segment => {
let partsInSegment = segment.getParts()
... |
<<<<<<<
import { getCurrentTime, literal, protectString, unprotectString, getRandomId, waitForPromise } from '../../../lib/lib'
=======
import { getCurrentTime, literal, protectString, unprotectString, getRandomId, MeteorPromiseCall } from '../../../lib/lib'
>>>>>>>
import { getCurrentTime, literal, protectString, u... |
<<<<<<<
import { saveRundownCache, saveSegmentCache, loadCachedIngestSegment, loadCachedRundownData, LocalIngestRundown, LocalIngestSegment, makeNewIngestSegment, makeNewIngestPart, makeNewIngestRundown, updateIngestRundownWithData, isLocalIngestRundown } from './ingestCache'
import { getRundownId, getSegmentId, getPar... |
<<<<<<<
import { removeRundownFromCache, removeRundownPlaylistFromCache, getRundownsSegmentsAndPartsFromCache } from './playout/lib'
import { AdLibActions, AdLibAction } from '../../lib/collections/AdLibActions'
=======
import {
removeRundownFromCache,
removeRundownPlaylistFromCache,
getRundownsSegmentsAndPartsFro... |
<<<<<<<
import { RundownPlaylist, RundownPlaylists } from '../../lib/collections/RundownPlaylists'
=======
import { RundownLayouts, RundownLayoutBase } from '../../lib/collections/RundownLayouts'
>>>>>>>
import { RundownPlaylist, RundownPlaylists } from '../../lib/collections/RundownPlaylists'
import { RundownLayout... |
<<<<<<<
// export function fetchBefore<T>(
// collection: TransformedCollection<T, any>,
// selector: MongoQuery<T> = {},
// rank: number = Number.POSITIVE_INFINITY
// ): T {
// return collection
// .find(
// _.extend(selector, {
// _rank: { $lt: rank },
// }),
// {
// sort: {
// _rank: -1,
... |
<<<<<<<
import { ExpectedPlayoutItems } from '../../lib/collections/ExpectedPlayoutItems'
import { updateExpectedPlayoutItemsOnPart } from './ingest/expectedPlayoutItems'
=======
import { DBRundownPlaylist, RundownPlaylists } from '../../lib/collections/RundownPlaylists'
import { PeripheralDevice } from '../../lib/co... |
<<<<<<<
subTypeVariant: ''
=======
>>>>>>>
<<<<<<<
subTypeVariant: ''
=======
>>>>>>>
<<<<<<<
subTypeVariant: ''
=======
>>>>>>>
<<<<<<<
subTypeVariant: ''
=======
>>>>>>>
<<<<<<<
subTypeVariant: ''
=======
>>>>>>>
<<<<<<<
subTypeVariant: ''
=======
>>>>>>>
<<<<<<<
subTypeVa... |
<<<<<<<
import { saveRundownCache, saveSegmentCache, loadCachedIngestSegment } from './ingestCache'
import { getRundownId, getSegmentId, getPartId, getStudioFromDevice, getRundown, canBeUpdated, getRundownPlaylist } from './lib'
=======
import { saveRundownCache, saveSegmentCache, loadCachedIngestSegment, loadCachedR... |
<<<<<<<
import { PeripheralDeviceAPI, PeripheralDeviceAPIMethods } from '../../../../lib/api/peripheralDevice'
import { setupDefaultStudioEnvironment } from '../../../../__mocks__/helpers/database'
=======
import { PeripheralDeviceAPI } from '../../../../lib/api/peripheralDevice'
import { setupDefaultStudioEnvironmen... |
<<<<<<<
import { RundownPlaylist, RundownPlaylists } from '../../lib/collections/RundownPlaylists'
import { PartInstance, PartInstances } from '../../lib/collections/PartInstances'
import { PieceInstances, PieceInstance } from '../../lib/collections/PieceInstances'
=======
import { RundownPlaylist, RundownPlaylists }... |
<<<<<<<
import { check } from '../../lib/check'
=======
>>>>>>>
import { check } from '../../lib/check'
<<<<<<<
_.each(parts, (part) => {
let title: string | undefined = part ? part.title : undefined
if (
part &&
part.typeVariant &&
part.typeVariant.toString &&
part.typeVariant
... |
<<<<<<<
import { literal, getCurrentTime } from '../../lib/lib'
import { ensureCollectionProperty } from './lib'
import { addMigrationSteps } from './databaseMigration'
import { Rundowns } from '../../lib/collections/Rundowns'
import { RundownPlaylists, DBRundownPlaylist } from '../../lib/collections/RundownPlaylists'
... |
<<<<<<<
const DEFAULT_CONTEXT: MethodContext = {}
describe('Test blueprint management api', () => {
=======
describe('Test blueprint management api', () => {
>>>>>>>
const DEFAULT_CONTEXT: MethodContext = {}
describe('Test blueprint management api', () => {
<<<<<<<
organizationId: null,
code: `{default: (... |
<<<<<<<
return memo + (part.duration || part.expectedDuration || part.renderedDuration || (display ? DEFAULT_DISPLAY_DURATION : 0))
=======
return memo + (part.instance.part.duration || part.instance.part.expectedDuration || part.renderedDuration || 0)
>>>>>>>
return memo + (part.instance.part.duration || p... |
<<<<<<<
import { ActionUserData } from 'tv-automation-sofie-blueprints-integration'
import { AdLibActionId, AdLibActionCommon } from '../collections/AdLibActions'
import { BucketAdLibAction } from '../collections/BucketAdlibActions'
=======
import { ActionUserData } from '@sofie-automation/blueprints-integration'
>>... |
<<<<<<<
mongoFindOptions,
ProtectedString
=======
mongoFindOptions,
>>>>>>>
mongoFindOptions,
ProtectedString,
<<<<<<<
const rawDocs = ['1','2','3','4','5','6','7'].map(s => ({ _id: protectString(s) }))
=======
const rawDocs = [1, 2, 3, 4, 5, 6, 7]
>>>>>>>
const rawDocs = ['1', '2', '3', '4', '5', '6'... |
<<<<<<<
import { PieceResolved, getResolvedPieces, orderPieces } from './pieces'
=======
import {
PieceResolved,
getOrderedPiece,
getResolvedPieces,
convertAdLibToPieceInstance,
convertPieceToAdLibPiece,
orderPieces,
} from './pieces'
>>>>>>>
import {
PieceResolved,
getOrderedPiece,
getResolvedPieces,
conv... |
<<<<<<<
function setNextSegmentLine (runningOrder: RunningOrder, nextSegmentLine: DBSegmentLine | null ) {
let ps: Array<Promise<any>> = []
=======
function setNextSegmentLine (runningOrder: RunningOrder, nextSegmentLine: DBSegmentLine | null, setManually?: boolean) {
>>>>>>>
function setNextSegmentLine (runni... |
<<<<<<<
import { Rundowns, Rundown, DBRundown, RundownId } from '../../lib/collections/Rundowns'
import { Part, Parts, DBPart, PartId } from '../../lib/collections/Parts'
import { Pieces } from '../../lib/collections/Pieces'
import { AdLibPieces } from '../../lib/collections/AdLibPieces'
import { Segments, SegmentId } ... |
<<<<<<<
import { MethodContext } from '../../../lib/api/methods'
import { RundownPlaylistContentWriteAccess } from '../../security/rundownPlaylist'
import { triggerWriteAccessBecauseNoCheckNecessary } from '../../security/lib/securityVerify'
import { StudioContentWriteAccess } from '../../security/studio'
import { init... |
<<<<<<<
import {
VTContent,
SourceLayerType,
ISourceLayer,
IBlueprintPieceGeneric
} from 'tv-automation-sofie-blueprints-integration'
=======
import { VTContent, SourceLayerType, ISourceLayer } from 'tv-automation-sofie-blueprints-integration'
>>>>>>>
import {
VTContent,
SourceLayerType,
ISourceLayer,
IBluep... |
<<<<<<<
import { RundownPlaylists } from '../../../lib/collections/RundownPlaylists'
=======
import { UserActionAPI as OriginalUserActionAPI } from '../../../lib/api/userActions'
import { getHash } from '../../../lib/lib'
>>>>>>>
import { RundownPlaylists } from '../../../lib/collections/RundownPlaylists'
import { U... |
<<<<<<<
return null
=======
return this.ready()
})
Meteor.publish('peripheralDevicesAndSubDevices', function (selector) {
if (!selector) throw new Meteor.Error(400, 'selector argument missing')
const parents = PeripheralDevices.find(selector).fetch()
return PeripheralDevices.find({
$or: [
{
parentDe... |
<<<<<<<
},
top: {
scaleType: "labels",
=======
>>>>>>>
},
top: {
scaleType: "labels", |
<<<<<<<
objectType: TimelineObjType.MANUAL,
=======
objectType: TimelineObjType.RUNDOWN,
studioId: protectString('myStudio'),
>>>>>>>
objectType: TimelineObjType.RUNDOWN,
<<<<<<<
objectType: TimelineObjType.MANUAL,
=======
objectType: TimelineObjType.RUNDOWN,
studioId: protectString('m... |
<<<<<<<
import { Rundowns, RundownHoldState, RundownId } from '../../lib/collections/Rundowns'
import { getCurrentTime, getHash, Omit, makePromise, check, protectString } from '../../lib/lib'
=======
import { Rundowns, RundownHoldState, RundownId, Rundown } from '../../lib/collections/Rundowns'
import { getCurrentTim... |
<<<<<<<
.classed("filled", d => this.model.getIsFilled(d.datasetLabel, d.label, d, filled))
.classed("unfilled", d => !this.model.getIsFilled(d.datasetLabel, d.label, d, filled))
.attr("cx", (d, i) => this.services.axes.getXValue(d, i))
=======
.classed("filled", filled)
.classed("unfilled", !filled)
... |
<<<<<<<
export function initialize (context: MethodContext, deviceId: PeripheralDeviceId, token: string, options: PeripheralDeviceAPI.InitOptions): PeripheralDeviceId {
triggerWriteAccess() // This is somewhat of a hack, since we want to check if it exists at all, before checking access
=======
export function in... |
<<<<<<<
import { ClientAPI } from '../../../lib/api/client'
=======
import { MethodContextAPI } from '../../../lib/api/methods'
import { Settings } from '../../../lib/Settings'
>>>>>>>
import { ClientAPI } from '../../../lib/api/client'
import { MethodContextAPI } from '../../../lib/api/methods'
import { Settings } ... |
<<<<<<<
afterTake(runningOrder, takeSegmentLine, previousSegmentLine || null, timeOffset)
=======
afterTake(runningOrder, takeSegmentLine, previousSegmentLine || null)
>>>>>>>
afterTake(runningOrder, takeSegmentLine, previousSegmentLine || null, timeOffset)
<<<<<<<
let forceNowTime: number | undefined = u... |
<<<<<<<
import { Timeline } from '../../../lib/collections/Timeline'
=======
import {
Timeline,
TimelineObjGeneric,
TimelineObjType,
getTimelineId,
} from '../../../lib/collections/Timeline'
>>>>>>>
import { Timeline } from '../../../lib/collections/Timeline'
<<<<<<<
import { updateSourceLayerInfinitesAfterLine... |
<<<<<<<
import { Match } from 'meteor/check'
import { Rundowns, Rundown, RundownHoldState, RundownId } from '../../../lib/collections/Rundowns'
import { Part, Parts, DBPart, PartId } from '../../../lib/collections/Parts'
import { Piece, Pieces, PieceId } from '../../../lib/collections/Pieces'
=======
import { check, ... |
<<<<<<<
export function getSegmentPartNotes (rundownIds: RundownId[]): (PartNote & { rank: number; })[] {
let notes: Array<PartNote & {rank: number}> = []
const segments = Segments.find({
rundownId: {
$in: rundownIds
=======
export function getSegmentPartNotes(rundownIds: RundownId[]): (PartNote & { rank: nu... |
<<<<<<<
import { testInFiber } from '../../../../__mocks__/helpers/jest'
import { Blueprints } from '../../../../lib/collections/Blueprints'
=======
import { RundownPlaylist, RundownPlaylists } from '../../../../lib/collections/RundownPlaylists'
import { initCacheForRundownPlaylist } from '../../../DatabaseCaches'
im... |
<<<<<<<
triggerWriteAccessBecauseNoCheckNecessary() // TODO: discuss if is this ok?
logger.error(`Uncaught error happened in GUI\n in "${location}"\n on "${methodContext.connection ? methodContext.connection.clientAddress : 'N/A'}"\n at ${(new Date(timestamp)).toISOString()}:\n${JSON.stringify(errorObject)}`)
=... |
<<<<<<<
import { rundownContentAllowWrite } from '../security/rundown'
=======
import { modifyPlaylistExternalId } from './ingest/lib'
>>>>>>>
import { rundownContentAllowWrite } from '../security/rundown'
import { modifyPlaylistExternalId } from './ingest/lib'
<<<<<<<
externalId: playlistInfo.playlist.externalI... |
<<<<<<<
logger.error(`Uncaught error happened in GUI\n in "${location}"\n on "${methodContext.connection ? methodContext.connection.clientAddress : ''}"\n at ${(new Date(timestamp)).toISOString()}:\n${JSON.stringify(errorObject)}`)
=======
logger.error(
`Uncaught error happened in GUI\n in "${location}"\n ... |
<<<<<<<
=======
const span = profiler.startSpan('afterUpdateTimeline')
>>>>>>>
const span = profiler.startSpan('afterUpdateTimeline')
<<<<<<<
return statObj
}
=======
cache.Timeline.upsert(statObj._id, statObj)
if (span) span.end()
} */
>>>>>>>
return statObj
}
cache.Timeline.upsert(statObj._id, statObj)
... |
<<<<<<<
// AppProvider contains CSS that affects element level CSS (e.g. `html`, `button`)
// It should be first to ensure its CSS is first in compiled output
export {AppProvider, AppProviderProps} from './AppProvider';
export {AccountConnection, AccountConnectionProps} from './AccountConnection';
=======
export {Ac... |
<<<<<<<
let takePart = rundownData.partsMap[playlist.nextPartId]
if (!takePart) throw new Meteor.Error(404, `takePart not found! ("${playlist.nextPartId}")`)
const takeRundown: Rundown | undefined = rundownData.rundownsMap[takePart.rundownId]
if (!takeRundown) throw new Meteor.Error(500, `takeRundown: takeR... |
<<<<<<<
=======
/** Whether the rundown is active or not */
active?: boolean
/** Whether the rundown is active in rehearsal or not */
rehearsal?: boolean
/** the id of the Live Part - if empty, no part in this rundown is live */
currentPartId: string | null
/** the id of the Next Part - if empty, no segment ... |
<<<<<<<
import { extendMandadory, getHash, protectString, unprotectString, Omit, ProtectedStringProperties, literal } from '../../../lib/lib'
=======
>>>>>>>
<<<<<<<
export function postProcessPieces(innerContext: ShowStyleContext, pieces: IBlueprintPiece[], blueprintId: BlueprintId, rundownId: RundownId, partId: P... |
<<<<<<<
import Agent from 'meteor/kschingiz:meteor-elastic-apm'
=======
import { BulkWriteOperation, BulkWriteOpResultObject } from 'mongodb'
>>>>>>>
import { BulkWriteOperation, BulkWriteOpResultObject } from 'mongodb'
import Agent from 'meteor/kschingiz:meteor-elastic-apm'
<<<<<<<
async fillWithDataFromDatabase... |
<<<<<<<
import { Segments, Segment } from '../../lib/collections/Segments'
=======
import { RundownPlaylists } from '../../lib/collections/RundownPlaylists'
import { PartInstances } from '../../lib/collections/PartInstances'
import { PieceInstances, PieceInstance } from '../../lib/collections/PieceInstances'
>>>>>>>... |
<<<<<<<
ServerPlayoutAPI.onPartPlaybackStarted(playlistId0, currentPartInstanceId, now)
=======
ServerPlayoutAPI.onPartPlaybackStarted(DEFAULT_CONTEXT, rundownId0, currentPartInstanceId, now)
>>>>>>>
ServerPlayoutAPI.onPartPlaybackStarted(DEFAULT_CONTEXT, playlistId0, currentPartInstanceId, now)
<<<<<<<... |
<<<<<<<
expect(blueprint).toMatchObject(literal<Omit<Blueprint, 'created' | 'modified' | 'databaseVersion'>>({
_id: protectString('tmp_showstyle'),
name: 'tmp_showstyle',
organizationId: null,
blueprintType: BLUEPRINT_TYPE,
blueprintId: protectString('ss1'),
blueprintVersion: '0.1.0',
int... |
<<<<<<<
const playlist = rundown.getRundownPlaylist()
_.each(messages, (message: IBlueprintExternalMessageQueueObj) => {
=======
const playlist = rundown.getRundownPlaylist()
_.each(messages, (message) => {
>>>>>>>
const playlist = rundown.getRundownPlaylist()
_.each(messages, (message: IBlueprintExternalMe... |
<<<<<<<
import { ReloadRundownPlaylistResponse, ReloadRundownResponse } from '../../lib/api/userActions'
import { MethodContextAPI, MethodContext } from '../../lib/api/methods'
import { StudioContentWriteAccess, StudioReadAccess } from '../security/studio'
import { RundownPlaylistContentWriteAccess, RundownPlaylistRead... |
<<<<<<<
* 1.15.0: Release 27
* 1.16.0: Release 28
=======
* 1.15.0: Release 27 (2020-12-08)
>>>>>>>
* 1.15.0: Release 27 (2020-12-08)
* 1.16.0: Release 28 |
<<<<<<<
import {
VTContent,
SourceLayerType,
ISourceLayer,
IBlueprintPieceGeneric
} from 'tv-automation-sofie-blueprints-integration'
=======
import { VTContent, SourceLayerType, ISourceLayer } from 'tv-automation-sofie-blueprints-integration'
>>>>>>>
import {
VTContent,
SourceLayerType,
ISourceLayer,
IBluep... |
<<<<<<<
import { rundownContentAllowWrite } from '../security/rundown'
=======
import { Settings } from '../../lib/Settings'
>>>>>>>
import { rundownContentAllowWrite } from '../security/rundown'
<<<<<<<
let playlist = checkAccessAndGetPlaylist(context, rundownPlaylistId)
if (playlist.active && !playlist.rehears... |
<<<<<<<
if (playlist.holdState === RundownHoldState.COMPLETE) {
cache.RundownPlaylists.update(playlist._id, {
$set: {
holdState: RundownHoldState.NONE,
},
})
// If hold is active, then this take is to clear it
} else if (playlist.holdState === RundownHoldState.ACTIVE) {
completeHold(cache, ... |
<<<<<<<
=======
import {useAppBridge} from '../app-bridge';
>>>>>>> |
<<<<<<<
cellMenu: {
autoAdjustDrop: true,
autoAlignSide: true,
hideCloseButton: true,
hideCommandSection: false,
hideOptionSection: false,
},
=======
fadeSpeed: 0, // this should go inside columnPicker but there's a bug in that plugin and it's pulling it from grid options instead
>>>>>>>
... |
<<<<<<<
import { UnauthorizedForPricingComponent } from './auth/unauthorized-for-pricing/unauthorized-for-pricing.component';
=======
import { EventsAnalyticsComponent } from './analytics2/metriche/events-analytics/events-analytics.component';
>>>>>>>
import { UnauthorizedForPricingComponent } from './auth/unauthori... |
<<<<<<<
export {Options, User, Messages} from './EASDK';
=======
export {default as Intl} from './Intl';
>>>>>>>
export {Options, User, Messages} from './EASDK';
export {default as Intl} from './Intl'; |
<<<<<<<
const response = await wasmTerminalConfig.fetchCommand(
commandName,
commandArgs,
envEntries
);
=======
// Fetch the command
if (wasmTty) {
wasmTty.printStatus(`[INFO] Fetching the command ${commandName} ...`);
}
const response = await wasmTerminalConfig.fetchC... |
<<<<<<<
import { DeckAction } from "./app/utils/editor/deck-action";
import { SelectedElementDescription, SelectedSlideDescription } from "./app/utils/editor/selected-element.utils";
import { EditAction } from "./app/utils/editor/edit-action";
=======
import { DeckAction } from "./app/types/editor/deck-action";
impor... |
<<<<<<<
import behaviorInsertSymbol from '../behaviors/insert_symbol/insert_symbol-plugin-symbol';
import behaviorInsertSymbolEmoji from '../behaviors/insert_symbol/insert_symbol-plugin-emoji';
import behaviorOmniInsert from '../behaviors/omni_insert/omni_insert';
=======
import behaviorInsertSymbol from '../behavior... |
<<<<<<<
import { SkinTone } from './emoji';
import { AceChunkEditor } from '../optional/ace/ace_editor';
=======
>>>>>>>
import { AceChunkEditor } from '../optional/ace/ace_editor'; |
<<<<<<<
import { EditorMath } from './math';
=======
import { EditorServer } from './server';
>>>>>>>
import { EditorMath } from './math';
import { EditorServer } from './server'; |
<<<<<<<
//
const { x, y, w } = egret3d.stage.absolutePosition;
const scale = egret3d.stage.screenViewport.w / w;
egret3d.InputManager.touch.updateOffsetAndScale(x, y, scale);
egret3d.InputManager.mouse.updateOffsetAndScale(x, y, scale);
// Update b... |
<<<<<<<
const EXEC_PATH = join(__dirname, '../dist/bin')
const PROJECT = join(TEST_DIR, 'tsconfig.json')
const BIN_EXEC = `node "${EXEC_PATH}" --project "${PROJECT}"`
=======
const PROJECT = join(TEST_DIR, semver.gte(ts.version, '2.5.0') ? 'tsconfig.json5' : 'tsconfig.json')
const BIN_EXEC = `node "${join(__dirname, ... |
<<<<<<<
export interface Options {
cwd?: string | null
build?: boolean | null
=======
export interface CreateOptions {
dir?: string
scope?: boolean | null
>>>>>>>
export interface CreateOptions {
dir?: string
build?: boolean | null
scope?: boolean | null
<<<<<<<
export const DEFAULTS: Options = {
cw... |
<<<<<<<
private _itemList: { [name: string]: number };
private _itemMultipliers: { [name: string]: number };
private _mineEnergy: KnockoutObservable<number>;
private _maxMineEnergy: KnockoutObservable<number>;
private _mineEnergyGain: KnockoutObservable<number>;
private _mineInventory: Knockout... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.